# Chinese translations for Git package
# Git 软件包的简体中文翻译.
-# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com>
+# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributers:
# - Jiang Xin <worldhello.net AT gmail.com>
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-05-15 06:31+0800\n"
-"PO-Revision-Date: 2012-01-30 00:00+0800\n"
+"POT-Creation-Date: 2014-11-20 09:42+0800\n"
+"PO-Revision-Date: 2014-11-20 16:10+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: advice.c:40
+#: advice.c:55
#, c-format
msgid "hint: %.*s\n"
msgstr "提示：%.*s\n"
-#.
-#. * Message used both when 'git commit' fails and when
-#. * other commands doing a merge do.
-#.
-#: advice.c:70
+#: advice.c:88
+msgid ""
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit."
+msgstr ""
+"请在工作区改正文件，然后酌情使用 'git add/rm <file>' 命令标记\n"
+"解决方案并提交。"
+
+#: archive.c:11
+msgid "git archive [options] <tree-ish> [<path>...]"
+msgstr "git archive [选项] <树或提交> [<路径>...]"
+
+#: archive.c:12
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:13
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
+
+#: archive.c:14
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <版本库> [--exec <命令>] --list"
+
+#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "路径规则 '%s' 未匹配任何文件"
+
+#: archive.c:419
+msgid "fmt"
+msgstr "格式"
+
+#: archive.c:419
+msgid "archive format"
+msgstr "归档格式"
+
+#: archive.c:420 builtin/log.c:1204
+msgid "prefix"
+msgstr "前缀"
+
+#: archive.c:421
+msgid "prepend prefix to each pathname in the archive"
+msgstr "为归档中每个路径名加上前缀"
+
+#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517
+#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
+#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
+#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411
+#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151
+msgid "file"
+msgstr "文件"
+
+#: archive.c:423 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "归档写入此文件"
+
+#: archive.c:425
+msgid "read .gitattributes in working directory"
+msgstr "读取工作区中的 .gitattributes"
+
+#: archive.c:426
+msgid "report archived files on stderr"
+msgstr "在标准错误上报告归档文件"
+
+#: archive.c:427
+msgid "store only"
+msgstr "只存储"
+
+#: archive.c:428
+msgid "compress faster"
+msgstr "压缩速度更快"
+
+#: archive.c:436
+msgid "compress better"
+msgstr "压缩效果更好"
+
+#: archive.c:439
+msgid "list supported archive formats"
+msgstr "列出支持的归档格式"
+
+#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85
+msgid "repo"
+msgstr "版本库"
+
+#: archive.c:442 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "从远程版本库（<版本库>）提取归档文件"
+
+#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490
+msgid "command"
+msgstr "命令"
+
+#: archive.c:444 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "远程 git-upload-archive 命令的路径"
+
+#: attr.c:258
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"负值模版在 git attributes 中被忽略\n"
+"当字符串确实要以感叹号开始时，使用 '\\!'。"
+
+#: branch.c:60
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "未设置分支 %s 作为它自己的上游。"
+
+#: 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。"
+
+#: branch.c:84
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
+
+#: branch.c:88
+#, c-format
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
+
+#: branch.c:89
+#, c-format
+msgid "Branch %s set up to track local branch %s."
+msgstr "分支 %s 设置为跟踪本地分支 %s。"
+
+#: branch.c:94
+#, c-format
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
+
+#: branch.c:95
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr "分支 %s 设置为跟踪远程引用 %s。"
+
+#: branch.c:99
+#, c-format
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
+
+#: branch.c:100
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr "分支 %s 设置为跟踪本地引用 %s。"
+
+#: branch.c:133
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "未跟踪：引用 %s 有歧义"
+
+#: branch.c:162
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' 不是一个有效的分支名称。"
+
+#: branch.c:167
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "一个分支名 '%s' 已经存在。"
+
+#: branch.c:175
+msgid "Cannot force update the current branch."
+msgstr "无法强制更新当前分支。"
+
+#: branch.c:195
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
+
+#: branch.c:197
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "请求的上游分支 '%s' 不存在"
+
+#: branch.c:199
msgid ""
-"Fix them up in the work tree,\n"
-"and then use 'git add/rm <file>' as\n"
-"appropriate to mark resolution and make a commit,\n"
-"or use 'git commit -a'."
+"\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"
-"'git add/rm <file>' 标记解决方案，\n"
-"或使用 'git commit -a'。"
+"\n"
+"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
+"您可能需要执行 \"git fetch\" 来获取分支。\n"
+"\n"
+"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
+"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
+
+#: branch.c:243
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "不是一个有效的对象名：'%s'。"
+
+#: branch.c:263
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "歧义的对象名：'%s'。"
+
+#: branch.c:268
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "无效的分支点：'%s'。"
+
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' 不像是一个 v2 版本的包文件"
+
+#: bundle.c:61
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "未能识别的包头：%s%s (%d)"
+
+#: bundle.c:87 builtin/commit.c:788
+#, c-format
+msgid "could not open '%s'"
+msgstr "不能打开 '%s'"
+
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "版本库缺少这些必备的提交："
+
+#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706
+#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330
+#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357
+#: builtin/shortlog.c:158
+msgid "revision walk setup failed"
+msgstr "版本遍历设置失败"
+
+#: bundle.c:185
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "这个包中含有这个引用："
+msgstr[1] "这个包中含有 %d 个引用："
+
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "这个包记录一个完整历史。"
+
+#: bundle.c:194
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "这个包需要这个引用："
+msgstr[1] "这个包需要 %d 个引用："
+
+#: bundle.c:251
+msgid "Could not spawn pack-objects"
+msgstr "不能生成 pack-objects 进程"
+
+#: bundle.c:269
+msgid "pack-objects died"
+msgstr "pack-objects 终止"
+
+#: 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:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "未能识别的参数：%s"
+
+#: bundle.c:444
+msgid "Refusing to create empty bundle."
+msgstr "不能创建空包。"
+
+#: bundle.c:454
+#, c-format
+msgid "cannot create '%s'"
+msgstr "不能创建 '%s'"
-#: commit.c:47
+#: bundle.c:475
+msgid "index-pack died"
+msgstr "index-pack 终止"
+
+#: color.c:157
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "无效的颜色值：%.*s"
+
+#: commit.c:40
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:49
+#: commit.c:42
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
msgid "memory exhausted"
msgstr "内存耗尽"
-#: connected.c:39
+#: config.c:469 config.c:471
+#, c-format
+msgid "bad config file line %d in %s"
+msgstr "配置文件 %2$s 出错于第 %1$d 行"
+
+#: config.c:587
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
+
+#: config.c:589
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
+
+#: config.c:674
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "无法扩展 '%s' 中的用户目录"
+
+#: config.c:752 config.c:763
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "错误的 zlib 压缩级别 %d"
+
+#: config.c:885
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "无效的对象创建模式：%s"
+
+#: config.c:1201
+msgid "unable to parse command-line config"
+msgstr "无法解析命令行中的配置"
+
+#: config.c:1262
+msgid "unknown error occured while reading the configuration files"
+msgstr "在读取配置文件时遇到未知错误"
+
+#: config.c:1586
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "无法解析命令行配置中的 '%s'"
+
+#: config.c:1588
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
+
+#: config.c:1647
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s 有多个取值"
+
+#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:48
+#: connected.c:89
#, c-format
msgid "failed write to rev-list: %s"
msgstr "无法写入 rev-list：%s"
-#: connected.c:56
+#: connected.c:97
#, c-format
msgid "failed to close rev-list's stdin: %s"
msgstr "无法关闭 rev-list 的标准输入：%s"
+#: date.c:95
+msgid "in the future"
+msgstr "在将来"
+
+#: date.c:101
+#, c-format
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "%lu 秒钟前"
+msgstr[1] "%lu 秒钟前"
+
+#: date.c:108
+#, c-format
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "%lu 分钟前"
+msgstr[1] "%lu 分钟前"
+
+#: date.c:115
+#, c-format
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "%lu 小时前"
+msgstr[1] "%lu 小时前"
+
+#: date.c:122
+#, c-format
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "%lu 天前"
+msgstr[1] "%lu 天前"
+
+#: date.c:128
+#, c-format
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "%lu 周前"
+msgstr[1] "%lu 周前"
+
+#: date.c:135
+#, c-format
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "%lu 个月前"
+msgstr[1] "%lu 个月前"
+
+#: date.c:146
+#, c-format
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu 年"
+msgstr[1] "%lu 年"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:149
+#, c-format
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "%s %lu 个月前"
+msgstr[1] "%s %lu 个月前"
+
+#: date.c:154 date.c:159
+#, c-format
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "%lu 年前"
+msgstr[1] "%lu 年前"
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "无法读取排序文件 '%s'"
+
+#: diffcore-rename.c:516
+msgid "Performing inexact rename detection"
+msgstr "正在进行非精确的重命名检测"
+
# 译者：注意保持前导空格
-#: diff.c:105
+#: diff.c:114
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
-msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 译者：注意保持前导空格
-#: diff.c:110
+#: diff.c:119
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " 未知的 dirstat 参数 '%s'\n"
+
+#: diff.c:214
#, c-format
-msgid " Unknown dirstat parameter '%.*s'\n"
-msgstr " 未知 dirstat 参数 '%.*s'\n"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:210
+#: diff.c:266
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:1400
-msgid " 0 files changed\n"
-msgstr " 0 个文件被修改\n"
-
-#: diff.c:1404
+#: diff.c:2957
#, c-format
-msgid " %d file changed"
-msgid_plural " %d files changed"
-msgstr[0] " %d 个文件被修改"
+msgid "external diff died, stopping at %s"
+msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:1421
-#, c-format
-msgid ", %d insertion(+)"
-msgid_plural ", %d insertions(+)"
-msgstr[0] "，插入 %d 行(+)"
-
-#: diff.c:1432
-#, c-format
-msgid ", %d deletion(-)"
-msgid_plural ", %d deletions(-)"
-msgstr[0] "，删除 %d 行(-)"
+#: diff.c:3352
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 参数后只跟一个 pathspec"
-#: diff.c:3439
+#: diff.c:3515
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: gpg-interface.c:59
+#: diff.c:3529
+#, c-format
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "无法解析 --submodule 选项的参数：'%s'"
+
+#: gpg-interface.c:129 gpg-interface.c:200
msgid "could not run gpg."
msgstr "不能执行 gpg。"
-#: gpg-interface.c:71
+#: gpg-interface.c:141
msgid "gpg did not accept the data"
msgstr "gpg 没有接受数据"
-#: gpg-interface.c:82
+#: gpg-interface.c:152
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
-#: grep.c:1280
+#: gpg-interface.c:185
+#, c-format
+msgid "could not create temporary file '%s': %s"
+msgstr "不能创建临时文件 '%s'：%s"
+
+#: gpg-interface.c:188
+#, c-format
+msgid "failed writing detached signature to '%s': %s"
+msgstr "无法将分离式签名写入 '%s'：%s"
+
+#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:1297
+#: grep.c:1735
#, c-format
msgid "'%s': %s"
msgstr "'%s'：%s"
-#: grep.c:1308
+#: grep.c:1746
#, c-format
msgid "'%s': short read %s"
msgstr "'%s'：读取不完整 %s"
-#: help.c:287
+#: help.c:207
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "在 '%s' 下可用的 git 命令"
+
+#: help.c:214
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
+
+#: help.c:230
+msgid "The most commonly used git commands are:"
+msgstr "最常用的 git 命令有："
+
+#: help.c:289
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"'%s' 像是一个 git 命令，但却无法运行。\n"
"可能是 git-%s 受损？"
-#: remote.c:1607
+#: help.c:346
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "唉呀，您的系统中未发现 Git 命令。"
+
+#: help.c:368
#, 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"
+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'"
-#: remote.c:1613
+#: help.c:373
#, 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"
+msgid "in %0.1f seconds automatically..."
+msgstr "在 %0.1f 秒钟后自动运行..."
-#: remote.c:1621
+#: help.c:380
#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
+
+#: help.c:384 help.c:444
msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
+"\n"
+"Did you mean this?"
msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
+"\n"
+"Did you mean one of these?"
msgstr[0] ""
-"您的分支和 '%s' 出现了偏离，\n"
-"并且各自分别有 %d 和 %d 处不同的提交。\n"
+"\n"
+"您指的是这个么？"
+msgstr[1] ""
+"\n"
+"您指的是这其中的某一个么？"
-#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
-#: builtin/merge.c:1088 builtin/merge.c:1098
+#: help.c:440
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "不能为写入打开 '%s'"
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
-#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
-#: builtin/merge.c:1090 builtin/merge.c:1103
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "不能写入 '%s'"
+#: lockfile.c:275
+msgid "BUG: reopen a lockfile that is still open"
+msgstr "BUG: 重新打开一个仍打开着的锁文件"
-#: sequencer.c:143
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
-"命令标记修正后的文件"
+#: lockfile.c:277
+msgid "BUG: reopen a lockfile that has been committed"
+msgstr "BUG: 重新打开一个已提交的锁文件"
-#: sequencer.c:146
-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 <paths>' 或 'git rm <paths>'\n"
-"对修正后的文件做标记，然后用 'git commit' 提交"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "无法读取缓存"
-#: sequencer.c:159 sequencer.c:685 sequencer.c:768
-#, c-format
-msgid "Could not write to %s"
-msgstr "不能写入 %s"
+#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562
+#: builtin/clone.c:659
+msgid "unable to write new index file"
+msgstr "无法写新的索引文件"
-#: sequencer.c:162
+#: merge-recursive.c:189
#, c-format
-msgid "Error wrapping up %s"
-msgstr "错误收尾 %s"
+msgid "(bad commit)\n"
+msgstr "（坏提交）\n"
-#: sequencer.c:177
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "您的本地修改将被拣选操作覆盖。"
-
-#: sequencer.c:179
-msgid "Your local changes would be overwritten by revert."
-msgstr "您的本地修改将被还原操作覆盖。"
+#: merge-recursive.c:209
+#, c-format
+msgid "addinfo_cache failed for path '%s'"
+msgstr "为路径 '%s' addinfo_cache 失败"
-#: sequencer.c:182
-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"
+#: merge-recursive.c:270
+msgid "error building trees"
+msgstr "æ\97 æ³\95å\88\9b建æ \91"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:232
+#: merge-recursive.c:691
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s：无法写入新索引文件"
+msgid "failed to create path '%s'%s"
+msgstr "无法创建路径 '%s'%s"
-#: sequencer.c:298
-msgid "Your index file is unmerged."
-msgstr "您的索引文件未完成合并。"
+#: merge-recursive.c:702
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "删除 %s 以便为子目录留出空间\n"
-#: sequencer.c:301
-msgid "You do not have a valid HEAD"
-msgstr "您没有一个有效的 HEAD"
+#: merge-recursive.c:716 merge-recursive.c:737
+msgid ": perhaps a D/F conflict?"
+msgstr "：可能是一个目录/文件冲突？"
-#: sequencer.c:316
+#: merge-recursive.c:727
#, 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 "refusing to lose untracked file at '%s'"
+msgstr "æ\8b\92ç»\9d丢å¼\83 '%s' ä¸ç\9a\84æ\9cªè·\9f踪æ\96\87件"
-#: sequencer.c:324
+#: merge-recursive.c:767
#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "提交 %s 没有父提交 %d"
+msgid "cannot read object %s '%s'"
+msgstr "不能读取对象 %s '%s'"
-#: sequencer.c:328
+#: merge-recursive.c:769
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr "指定了主线但提交 %s 不是一个合并。"
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' 应为数据（blob）对象"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:339
+#: merge-recursive.c:792 builtin/clone.c:318
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s：不能解析父提交 %s"
+msgid "failed to open '%s'"
+msgstr "无法打开 '%s'"
-#: sequencer.c:343
+#: merge-recursive.c:800
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "不能得到 %s 的提交说明"
+msgid "failed to symlink '%s'"
+msgstr "无法创建符号链接 '%s'"
-#: sequencer.c:427
+#: merge-recursive.c:803
#, c-format
-msgid "could not revert %s... %s"
-msgstr "不能还原 %s... %s"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "不知道如何处理 %06o %s '%s'"
-#: sequencer.c:428
+#: merge-recursive.c:941
+msgid "Failed to execute internal merge"
+msgstr "无法执行内部合并"
+
+#: merge-recursive.c:945
#, c-format
-msgid "could not apply %s... %s"
-msgstr "不能应用 %s... %s"
+msgid "Unable to add %s to database"
+msgstr "不能添加 %s 至对象库"
-#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
-#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347
-#: builtin/shortlog.c:181
-msgid "revision walk setup failed"
-msgstr "版本遍历设置失败"
+#: merge-recursive.c:961
+msgid "unsupported object type in the tree"
+msgstr "在树中有不支持的对象类型"
-#: sequencer.c:453
-msgid "empty commit set passed"
-msgstr "提供了空的提交集"
+#: merge-recursive.c:1036 merge-recursive.c:1050
+#, 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 中"
+"的版本被保留。"
-#: sequencer.c:461
+#: merge-recursive.c:1042 merge-recursive.c:1055
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s：无法读取索引"
+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 中。"
-#: sequencer.c:466
+#: merge-recursive.c:1096
+msgid "rename"
+msgstr "重命名"
+
+#: merge-recursive.c:1096
+msgid "renamed"
+msgstr "重命名"
+
+#: merge-recursive.c:1152
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s：无法刷新索引"
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: sequencer.c:551
+#: merge-recursive.c:1174
#, c-format
-msgid "Cannot %s during a %s"
-msgstr "无法 %s 在一个 %s 过程中"
-
-#: sequencer.c:573
-#, c-format
-msgid "Could not parse line %d."
-msgstr "不能解析第 %d 行。"
+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"
-#: sequencer.c:578
-msgid "No commits parsed."
-msgstr "没有提交被解析。"
+#: merge-recursive.c:1179
+msgid " (left unresolved)"
+msgstr "（留下未解决）"
-#: sequencer.c:591
+#: merge-recursive.c:1233
#, c-format
-msgid "Could not open %s"
-msgstr "不能打开 %s"
+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"
-#: sequencer.c:595
+#: merge-recursive.c:1263
#, c-format
-msgid "Could not read %s."
-msgstr "不能读取 %s。"
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
-#: sequencer.c:602
+#: merge-recursive.c:1462
#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "无用的指令表单：%s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: sequencer.c:630
+#: merge-recursive.c:1472
#, c-format
-msgid "Invalid key: %s"
-msgstr "æ\97 æ\95\88é\94®å\90\8dï¼\9a%s"
+msgid "Adding merged %s"
+msgstr "æ·»å\8a å\90\88并å\90\8eç\9a\84 %s"
-#: sequencer.c:633
+#: merge-recursive.c:1477 merge-recursive.c:1675
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "无效的 %s 值：%s"
+msgid "Adding as %s instead"
+msgstr "而是以 %s 为名添加"
-#: sequencer.c:645
+#: merge-recursive.c:1528
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "非法的选项表单：%s"
-
-#: sequencer.c:666
-msgid "a cherry-pick or revert is already in progress"
-msgstr "一个拣选或还原操作已在进行"
-
-#: sequencer.c:667
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
+msgid "cannot read object %s"
+msgstr "不能读取对象 %s"
-#: sequencer.c:671
+#: merge-recursive.c:1531
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "不能创建序列目录 %s"
+msgid "object %s is not a blob"
+msgstr "对象 %s 不是一个数据（blob）对象"
-#: sequencer.c:687 sequencer.c:772
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "错误收尾 %s。"
+#: merge-recursive.c:1579
+msgid "modify"
+msgstr "修改"
-#: sequencer.c:706 sequencer.c:840
-msgid "no cherry-pick or revert in progress"
-msgstr "没有拣选或还原操作在进行"
+#: merge-recursive.c:1579
+msgid "modified"
+msgstr "修改"
-#: sequencer.c:708
-msgid "cannot resolve HEAD"
-msgstr "不能解析 HEAD"
+#: merge-recursive.c:1589
+msgid "content"
+msgstr "内容"
-#: sequencer.c:710
-msgid "cannot abort from a branch yet to be born"
-msgstr "不能从尚未建立的分支终止"
+#: merge-recursive.c:1596
+msgid "add/add"
+msgstr "添加/添加"
-#: sequencer.c:732
+#: merge-recursive.c:1630
#, c-format
-msgid "cannot open %s: %s"
-msgstr "不能打开 %s：%s"
+msgid "Skipped %s (merged same as existing)"
+msgstr "略过 %s（已经做过相同合并）"
-#: sequencer.c:735
+#: merge-recursive.c:1644
#, c-format
-msgid "cannot read %s: %s"
-msgstr "不能读取 %s：%s"
+msgid "Auto-merging %s"
+msgstr "自动合并 %s"
-#: sequencer.c:736
-msgid "unexpected end of file"
-msgstr "未预期的文件结束"
+#: merge-recursive.c:1648 git-submodule.sh:1150
+msgid "submodule"
+msgstr "子模组"
-#: sequencer.c:742
+#: merge-recursive.c:1649
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "冲突（%s）：合并冲突于 %s"
-#: sequencer.c:765
+#: merge-recursive.c:1735
#, c-format
-msgid "Could not format %s."
-msgstr "不能格式化 %s。"
-
-#: sequencer.c:927
-msgid "Can't revert as initial commit"
-msgstr "不能作为初始提交还原"
+msgid "Removing %s"
+msgstr "删除 %s"
-#: sequencer.c:928
-msgid "Can't cherry-pick into empty head"
-msgstr "不能拣选到空分支"
+#: merge-recursive.c:1760
+msgid "file/directory"
+msgstr "文件/目录"
-#: wt-status.c:134
-msgid "Unmerged paths:"
-msgstr "未合并的路径："
+#: merge-recursive.c:1766
+msgid "directory/file"
+msgstr "目录/文件"
-# 译者：注意保持前导空格
-#: wt-status.c:140 wt-status.c:157
+#: merge-recursive.c:1771
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"
-
-# 译者：注意保持前导空格
-#: wt-status.c:142 wt-status.c:159
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"
+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"
-# 译者：注意保持前导空格
-#: wt-status.c:143
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
-
-#: wt-status.c:151
-msgid "Changes to be committed:"
-msgstr "要提交的变更："
-
-#: wt-status.c:169
-msgid "Changes not staged for commit:"
-msgstr "尚未暂存以备提交的变更："
-
-# 译者：注意保持前导空格
-#: wt-status.c:173
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"
-
-# 译者：注意保持前导空格
-#: wt-status.c:175
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"
+#: merge-recursive.c:1781
+#, c-format
+msgid "Adding %s"
+msgstr "添加 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:176
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
+#: merge-recursive.c:1798
+msgid "Fatal merge failure, shouldn't happen."
+msgstr "严重的合并错误，不应发生。"
-# 译者：注意保持前导空格
-#: wt-status.c:178
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
+#: merge-recursive.c:1817
+msgid "Already up-to-date!"
+msgstr "已经是最新的！"
-#: wt-status.c:187
+#: merge-recursive.c:1826
#, c-format
-msgid "%s files:"
-msgstr "%s文件："
+msgid "merging of trees %s and %s failed"
+msgstr "无法合并树 %s 和 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:190
+#: merge-recursive.c:1856
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"
-
-#: wt-status.c:207
-msgid "bug"
-msgstr "bug"
-
-#: wt-status.c:212
-msgid "both deleted:"
-msgstr "双方删除："
-
-#: wt-status.c:213
-msgid "added by us:"
-msgstr "由我们添加："
-
-#: wt-status.c:214
-msgid "deleted by them:"
-msgstr "由他们删除："
-
-#: wt-status.c:215
-msgid "added by them:"
-msgstr "由他们添加："
+msgid "Unprocessed path??? %s"
+msgstr "未处理的路径??? %s"
-#: wt-status.c:216
-msgid "deleted by us:"
-msgstr "由我们删除："
+#: merge-recursive.c:1901
+msgid "Merging:"
+msgstr "合并："
-#: wt-status.c:217
-msgid "both added:"
-msgstr "双方添加："
+#: merge-recursive.c:1914
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "发现 %u 个共同祖先："
+msgstr[1] "发现 %u 个共同祖先："
-#: wt-status.c:218
-msgid "both modified:"
-msgstr "å\8f\8cæ\96¹ä¿®æ\94¹ï¼\9a"
+#: merge-recursive.c:1951
+msgid "merge returned no commit"
+msgstr "å\90\88并æ\9cªè¿\94å\9b\9eæ\8f\90交"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:248
-msgid "new commits, "
-msgstr "新提交, "
+#: merge-recursive.c:2008
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "不能解析对象 '%s'"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:250
-msgid "modified content, "
-msgstr "修改的内容, "
+#: merge-recursive.c:2019 builtin/merge.c:666
+msgid "Unable to write index."
+msgstr "不能写入索引。"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:252
-msgid "untracked content, "
-msgstr "未跟踪的内容, "
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "不能提交未初始化/未引用的注解树"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:266
+#: notes-utils.c:83
#, c-format
-msgid "new file: %s"
-msgstr "新文件： %s"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "坏的 notes.rewriteMode 值：'%s'"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:269
+#: notes-utils.c:93
#, c-format
-msgid "copied: %s -> %s"
-msgstr "æ\8b·è´\9dï¼\9a %s -> %s"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "æ\8b\92ç»\9då\90\91 %sï¼\88å\9c¨ refs/notes/ ä¹\8bå¤\96ï¼\89å\86\99å\85¥æ³¨è§£"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:272
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:120
#, c-format
-msgid "deleted: %s"
-msgstr "å\88 é\99¤ï¼\9a %s"
+msgid "Bad %s value: '%s'"
+msgstr "å\9d\8fç\9a\84 %s å\80¼ï¼\9a'%s'"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:275
+#: object.c:241
#, c-format
-msgid "modified: %s"
-msgstr "ä¿®æ\94¹ï¼\9a %s"
+msgid "unable to parse object: %s"
+msgstr "ä¸\8dè\83½è§£æ\9e\90对象ï¼\9a%s"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:278
-#, c-format
-msgid "renamed: %s -> %s"
-msgstr "重命名： %s -> %s"
+#: parse-options.c:546
+msgid "..."
+msgstr "..."
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:281
+#: parse-options.c:564
#, c-format
-msgid "typechange: %s"
-msgstr "ç±»å\9e\8bå\8f\98æ\9b´ï¼\9a %s"
+msgid "usage: %s"
+msgstr "ç\94¨æ³\95ï¼\9a%s"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:284
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:568
#, c-format
-msgid "unknown: %s"
-msgstr "未知： %s"
+msgid " or: %s"
+msgstr " 或：%s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:287
-#, c-format
-msgid "unmerged: %s"
-msgstr "未合并： %s"
-
-#: wt-status.c:290
+#: parse-options.c:571
#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "bug：未处理的差异状态 %c"
-
-#: wt-status.c:713
-msgid "On branch "
-msgstr "位于分支 "
+msgid " %s"
+msgstr " %s"
-#: wt-status.c:720
-msgid "Not currently on any branch."
-msgstr "当前不在任何分支上。"
+#: parse-options.c:605
+msgid "-NUM"
+msgstr "-数字"
-#: wt-status.c:731
-msgid "Initial commit"
-msgstr "å\88\9då§\8bæ\8f\90交"
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "å\85¨å±\80ç\9a\84 'glob' å\92\8c 'noglob' è·¯å¾\84è§\84å\88\99设置ä¸\8då\85¼å®¹"
-#: wt-status.c:745
-msgid "Untracked"
-msgstr "未跟踪的"
+#: pathspec.c:143
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
-#: wt-status.c:747
-msgid "Ignored"
-msgstr "忽略的"
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "路径规则包含无效的神奇前缀"
-#: wt-status.c:749
+#: pathspec.c:183
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "未跟踪的文件没有列出%s"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:751
-msgid " (use -u option to show untracked files)"
-msgstr "（使用 -u 参数显示未跟踪的文件）"
-
-#: wt-status.c:757
-msgid "No changes"
-msgstr "没有修改"
-
-#: wt-status.c:761
+#: pathspec.c:187
#, c-format
-msgid "no changes added to commit%s\n"
-msgstr "修改尚未加入提交%s\n"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:763
-msgid " (use \"git add\" and/or \"git commit -a\")"
-msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
-
-#: wt-status.c:765
+#: pathspec.c:205
#, c-format
-msgid "nothing added to commit but untracked files present%s\n"
-msgstr "空提交但存在未跟踪文件%s\n"
-
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:767
-msgid " (use \"git add\" to track)"
-msgstr "（使用 \"git add\" 建立跟踪）"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: wt-status.c:769 wt-status.c:772 wt-status.c:775
+#: pathspec.c:230
#, c-format
-msgid "nothing to commit%s\n"
-msgstr "无须提交%s\n"
-
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:770
-msgid " (create/copy files and use \"git add\" to track)"
-msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s：'literal' 和 'glob' 不兼容"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:773
-msgid " (use -u to show untracked files)"
-msgstr "（使用 -u 显示未跟踪文件）"
+#: pathspec.c:241
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s：'%s' 在版本库之外"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:776
-msgid " (working directory clean)"
-msgstr "（干净的工作区）"
+#: pathspec.c:291
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
-#: wt-status.c:884
-msgid "HEAD (no branch)"
-msgstr "HEAD（非分支）"
+#: pathspec.c:353
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s：路径规则神奇前缀不被此命令支持：%s"
-# 译者：注意保持句尾空格
-#: wt-status.c:890
-msgid "Initial commit on "
-msgstr "初始提交于 "
+#: pathspec.c:432
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "路径规则 '%s' 位于符号链接中"
-# 译者：注意保持句尾空格
-#: wt-status.c:905
-msgid "behind "
-msgstr "落后 "
+#: pathspec.c:441
+msgid ""
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
+msgstr ""
+"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
+"添加 ':/' 或 '.' ？"
-# 译者：注意保持句尾空格
-#: wt-status.c:908 wt-status.c:911
-msgid "ahead "
-msgstr "领先 "
+#: pretty.c:968
+msgid "unable to parse --pretty format"
+msgstr "不能解析 --pretty 格式"
-# 译者：注意保持句尾空格
-#: wt-status.c:913
-msgid ", behind "
-msgstr "，落后 "
+#: progress.c:225
+msgid "done"
+msgstr "完成"
-#: builtin/add.c:62
+#: read-cache.c:1261
#, c-format
-msgid "unexpected diff status %c"
-msgstr "意外的差异状态 %c"
-
-#: builtin/add.c:67 builtin/commit.c:298
-msgid "updating files failed"
-msgstr "更新文件失败"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"设置了 index.version，但是取值无效。\n"
+"使用版本 %i"
-#: builtin/add.c:77
+#: read-cache.c:1271
#, c-format
-msgid "remove '%s'\n"
-msgstr "删除 '%s'\n"
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
+"使用版本 %i"
-#: builtin/add.c:176
+#: remote.c:782
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
-msgstr "路径 '%s' 属于模组 '%.*s'"
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "不能同时获取 %s 和 %s 至 %s"
-#: builtin/add.c:192
-msgid "Unstaged changes after refreshing the index:"
-msgstr "刷新索引之后尚未被暂存的变更："
-
-#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
+#: remote.c:786
#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "路径 '%s' 未匹配任何文件"
+msgid "%s usually tracks %s, not %s"
+msgstr "%s 通常跟踪 %s，而非 %s"
-#: builtin/add.c:209
+#: remote.c:790
#, c-format
-msgid "'%s' is beyond a symbolic link"
-msgstr "'%s' 位于符号链接中"
+msgid "%s tracks both %s and %s"
+msgstr "%s 同时跟踪 %s 和 %s"
-#: builtin/add.c:276
-msgid "Could not read the index"
-msgstr "不能读取索引"
+#: remote.c:798
+msgid "Internal error"
+msgstr "内部错误"
-#: builtin/add.c:286
+#: remote.c:1968
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "不能为写入打开 '%s'。"
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: builtin/add.c:290
-msgid "Could not write patch"
-msgstr "不能写补丁"
+#: remote.c:1972
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: builtin/add.c:295
+#: remote.c:1975
#, c-format
-msgid "Could not stat '%s'"
-msgstr "不能查看文件状态 '%s'"
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: builtin/add.c:297
-msgid "Empty patch. Aborted."
-msgstr "空补丁。异常终止。"
+#: remote.c:1979
+#, 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/add.c:303
+#: remote.c:1985
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
+
+#: remote.c:1988
#, c-format
-msgid "Could not apply '%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/add.c:312
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"
+# 译者：注意保持前导空格
+#: remote.c:1996
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: builtin/add.c:352
+#: remote.c:1999
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "使用 -f 参数如果您确实要添加它们。\n"
+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/add.c:353
-msgid "no files added"
-msgstr "没有文件被添加"
+# 译者：注意保持前导空格
+#: remote.c:2009
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: builtin/add.c:359
-msgid "adding files failed"
-msgstr "添加文件失败"
+#: run-command.c:87
+msgid "open /dev/null failed"
+msgstr "不能打开 /dev/null"
-#: builtin/add.c:391
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
+#: run-command.c:89
+#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "不能调用 dup2(%d,%d)"
-#: builtin/add.c:393
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
+#: send-pack.c:265
+msgid "failed to sign the push certificate"
+msgstr "无法为推送证书签名"
+
+#: send-pack.c:322
+msgid "the receiving end does not support --signed push"
+msgstr "接收端不支持签名推送"
-#: builtin/add.c:413
+#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892
+#: builtin/merge.c:1002 builtin/merge.c:1012
#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "没有指定文件，也没有文件被添加。\n"
+msgid "Could not open '%s' for writing"
+msgstr "不能为写入打开 '%s'"
-#: builtin/add.c:414
+#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784
+#: builtin/merge.c:1004 builtin/merge.c:1017
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "ä¹\9f许æ\82¨æ\83³è¦\81æ\89§è¡\8c 'git add .'ï¼\9f\n"
+msgid "Could not write to '%s'"
+msgstr "ä¸\8dè\83½å\86\99å\85¥ '%s'"
-#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
-#: builtin/rm.c:162
-msgid "index file corrupt"
-msgstr "索引文件损坏"
+#: sequencer.c:195
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
+"命令标记修正后的文件"
-#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
-msgid "Unable to write new index file"
-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 <paths>' 或 'git rm <paths>'\n"
+"对修正后的文件做标记，然后用 'git commit' 提交"
-#: builtin/archive.c:17
+#: sequencer.c:211 sequencer.c:852 sequencer.c:935
#, c-format
-msgid "could not create archive file '%s'"
-msgstr "ä¸\8dè\83½å\88\9b建å½\92æ¡£æ\96\87件 '%s'"
+msgid "Could not write to %s"
+msgstr "ä¸\8dè\83½å\86\99å\85¥ %s"
-#: builtin/archive.c:20
-msgid "could not redirect output"
-msgstr "不能输出重定向"
+#: sequencer.c:214
+#, c-format
+msgid "Error wrapping up %s"
+msgstr "错误收尾 %s"
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
-msgstr "git archive：未提供远程URL"
+#: sequencer.c:229
+msgid "Your local changes would be overwritten by cherry-pick."
+msgstr "您的本地修改将被拣选操作覆盖。"
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive：期待ACK/NACK，却得到EOF"
+#: sequencer.c:231
+msgid "Your local changes would be overwritten by revert."
+msgstr "您的本地修改将被还原操作覆盖。"
-#: builtin/archive.c:63
-#, c-format
-msgid "git archive: NACK %s"
-msgstr "git archive：NACK %s"
+#: sequencer.c:234
+msgid "Commit your changes or stash them to proceed."
+msgstr "提交您的修改或保存进度后再继续。"
-#: builtin/archive.c:65
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:304
#, c-format
-msgid "remote error: %s"
-msgstr "远程错误：%s"
+msgid "%s: Unable to write new index file"
+msgstr "%s：无法写入新索引文件"
-#: builtin/archive.c:66
-msgid "git archive: protocol error"
-msgstr "git archive：协议错误"
+#: sequencer.c:335
+msgid "Could not resolve HEAD commit\n"
+msgstr "不能解析 HEAD 提交\n"
-#: builtin/archive.c:71
-msgid "git archive: expected a flush"
-msgstr "git archive：预期一个刷新"
+#: sequencer.c:355
+msgid "Unable to update cache tree\n"
+msgstr "不能更新缓存\n"
-# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:137
+#: sequencer.c:402
#, 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 parse commit %s\n"
+msgstr "不能解析提交 %s\n"
-# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:141
+#: sequencer.c:407
#, 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 "Could not parse parent commit %s\n"
+msgstr "不能解析父提交 %s\n"
-# 译者：汉字之间无空格，故删除尾部空格
-#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
-#: builtin/branch.c:163
-msgid "remote "
-msgstr "远程"
-
-#: builtin/branch.c:171
-msgid "cannot use -a with -d"
-msgstr "不能将 -a 和 -d 共用"
+#: sequencer.c:473
+msgid "Your index file is unmerged."
+msgstr "您的索引文件未完成合并。"
-#: builtin/branch.c:177
-msgid "Couldn't look up commit object for HEAD"
-msgstr "无法查询 HEAD 指向的提交对象"
+#: sequencer.c:492
+#, c-format
+msgid "Commit %s is a merge but no -m option was given."
+msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: builtin/branch.c:182
+#: sequencer.c:500
#, 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ç\88¶æ\8f\90交 %d"
-#: builtin/branch.c:192
+#: sequencer.c:504
#, c-format
-msgid "%sbranch '%s' not found."
-msgstr "%s分支 '%s' 未发现。"
+msgid "Mainline was specified but commit %s is not a merge."
+msgstr "指定了主线但提交 %s 不是一个合并。"
-#: builtin/branch.c:200
+#. TRANSLATORS: The first %s will be "revert" or
+#. "cherry-pick", the second %s a SHA1
+#: sequencer.c:517
#, c-format
-msgid "Couldn't look up commit object for '%s'"
-msgstr "无法查询 '%s' 指向的提交对象"
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s：不能解析父提交 %s"
-#: builtin/branch.c:206
+#: sequencer.c:521
#, c-format
-msgid ""
-"The branch '%s' is not fully merged.\n"
-"If you are sure you want to delete it, run 'git branch -D %s'."
-msgstr ""
-"分支 '%s' 没有完全合并。\n"
-"如果您确认要删除它，执行 'git branch -D %s'。"
+msgid "Cannot get commit message for %s"
+msgstr "不能得到 %s 的提交说明"
-#: builtin/branch.c:214
+#: sequencer.c:607
#, c-format
-msgid "Error deleting %sbranch '%s'"
-msgstr "删除 %s分支 '%s' 时出错"
+msgid "could not revert %s... %s"
+msgstr "不能还原 %s... %s"
-#: builtin/branch.c:219
+#: sequencer.c:608
#, c-format
-msgid "Deleted %sbranch %s (was %s).\n"
-msgstr "已删除 %s分支 %s（曾为 %s）。\n"
+msgid "could not apply %s... %s"
+msgstr "不能应用 %s... %s"
-#: builtin/branch.c:224
-msgid "Update of config-file failed"
-msgstr "æ\97 æ³\95æ\9b´æ\96° config æ\96\87件"
+#: sequencer.c:644
+msgid "empty commit set passed"
+msgstr "æ\8f\90ä¾\9bäº\86空ç\9a\84æ\8f\90交é\9b\86"
-#: builtin/branch.c:322
+#: sequencer.c:652
#, 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:394
+#: sequencer.c:656
#, c-format
-msgid "behind %d] "
-msgstr "落后 %d] "
+msgid "git %s: failed to refresh the index"
+msgstr "git %s：无法刷新索引"
-# 译者：注意保持句尾空格
-#: builtin/branch.c:396
+#: sequencer.c:716
#, c-format
-msgid "ahead %d] "
-msgstr "领先 %d] "
+msgid "Cannot %s during a %s"
+msgstr "无法 %s 在一个 %s 过程中"
-# 译者：注意保持句尾空格
-#: builtin/branch.c:398
+#: sequencer.c:738
#, c-format
-msgid "ahead %d, behind %d] "
-msgstr "领先 %d，落后 %d] "
+msgid "Could not parse line %d."
+msgstr "不能解析第 %d 行。"
-#: builtin/branch.c:501
-msgid "(no branch)"
-msgstr "（非分支）"
+#: sequencer.c:743
+msgid "No commits parsed."
+msgstr "没有提交被解析。"
-#: builtin/branch.c:566
-msgid "some refs could not be read"
-msgstr "一些引用不能读取"
+#: sequencer.c:756
+#, c-format
+msgid "Could not open %s"
+msgstr "不能打开 %s"
-#: builtin/branch.c:579
-msgid "cannot rename the current branch while not on any."
-msgstr "无法重命名当前分支因为不处于任何分支上。"
+#: sequencer.c:760
+#, c-format
+msgid "Could not read %s."
+msgstr "不能读取 %s。"
-#: builtin/branch.c:589
+#: sequencer.c:767
#, c-format
-msgid "Invalid branch name: '%s'"
-msgstr "无效的分支名：'%s'"
+msgid "Unusable instruction sheet: %s"
+msgstr "无用的指令表单：%s"
-#: builtin/branch.c:604
-msgid "Branch rename failed"
-msgstr "分支重命名失败"
+#: sequencer.c:797
+#, c-format
+msgid "Invalid key: %s"
+msgstr "无效键名：%s"
-#: builtin/branch.c:608
+#: sequencer.c:800
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
-msgstr "重命名掉一个错误命名的旧分支 '%s'"
+msgid "Invalid value for %s: %s"
+msgstr "%s 的值无效：%s"
-#: builtin/branch.c:612
+#: sequencer.c:812
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr "分支重命名为 %s，但 HEAD 没有更新！"
+msgid "Malformed options sheet: %s"
+msgstr "非法的选项表单：%s"
-#: builtin/branch.c:619
-msgid "Branch is renamed, but update of config-file failed"
-msgstr "分支被重命名，但更新 config 文件失败"
+#: sequencer.c:833
+msgid "a cherry-pick or revert is already in progress"
+msgstr "一个拣选或还原操作已在进行"
-#: builtin/branch.c:634
+#: sequencer.c:834
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
+
+#: sequencer.c:838
#, c-format
-msgid "malformed object name %s"
-msgstr "非法的对象名 %s"
+msgid "Could not create sequencer directory %s"
+msgstr "不能创建序列目录 %s"
-#: builtin/branch.c:658
+#: sequencer.c:854 sequencer.c:939
#, c-format
-msgid "could not write branch description template: %s\n"
-msgstr "不能写分支描述模版：%s\n"
+msgid "Error wrapping up %s."
+msgstr "错误收尾 %s。"
-#: builtin/branch.c:746
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "æ\97 æ³\95å°\86 HEAD 解æ\9e\90为æ\9c\89æ\95\88å¼\95ç\94¨ã\80\82"
+#: sequencer.c:873 sequencer.c:1009
+msgid "no cherry-pick or revert in progress"
+msgstr "æ\8b£é\80\89æ\88\96è¿\98å\8e\9fæ\93\8dä½\9c并æ\9cªè¿\9bè¡\8c"
-#: builtin/branch.c:751 builtin/clone.c:558
-msgid "HEAD not found below refs/heads!"
-msgstr "HEAD 没有位于 /refs/heads 之下！"
+#: sequencer.c:875
+msgid "cannot resolve HEAD"
+msgstr "不能解析 HEAD"
-#: builtin/branch.c:809
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
+#: sequencer.c:877
+msgid "cannot abort from a branch yet to be born"
+msgstr "不能从尚未建立的分支终止"
-#: builtin/bundle.c:47
+#: sequencer.c:899 builtin/apply.c:4128
#, c-format
-msgid "%s is okay\n"
-msgstr "%s 可以\n"
+msgid "cannot open %s: %s"
+msgstr "不能打开 %s：%s"
-#: builtin/bundle.c:56
-msgid "Need a repository to create a bundle."
-msgstr "需要一个版本库来创建包。"
+#: sequencer.c:902
+#, c-format
+msgid "cannot read %s: %s"
+msgstr "不能读取 %s：%s"
-#: builtin/bundle.c:60
-msgid "Need a repository to unbundle."
-msgstr "需要一个版本库来解包。"
+#: sequencer.c:903
+msgid "unexpected end of file"
+msgstr "意外的文件结束"
-#: builtin/checkout.c:113 builtin/checkout.c:146
+#: sequencer.c:909
#, c-format
-msgid "path '%s' does not have our version"
-msgstr "路径 '%s' 没有我们的版本"
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: builtin/checkout.c:115 builtin/checkout.c:148
+#: sequencer.c:932
#, c-format
-msgid "path '%s' does not have their version"
-msgstr "路径 '%s' 没有他们的版本"
+msgid "Could not format %s."
+msgstr "不能格式化 %s。"
-#: builtin/checkout.c:131
+#: sequencer.c:1077
#, c-format
-msgid "path '%s' does not have all necessary versions"
-msgstr "路径 '%s' 没有全部必须的版本"
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s：不能拣选一个%s"
-#: builtin/checkout.c:175
+#: sequencer.c:1080
#, c-format
-msgid "path '%s' does not have necessary versions"
-msgstr "路径 '%s' 没有必须的版本"
+msgid "%s: bad revision"
+msgstr "%s：错误的版本"
-#: builtin/checkout.c:192
-#, c-format
-msgid "path '%s': cannot merge"
-msgstr "path '%s'：无法合并"
+#: sequencer.c:1114
+msgid "Can't revert as initial commit"
+msgstr "不能作为初始提交还原"
-#: builtin/checkout.c:209
-#, c-format
-msgid "Unable to add merge result for '%s'"
-msgstr "无法为 '%s' 添加合并结果"
+#: sequencer.c:1115
+msgid "Can't cherry-pick into empty head"
+msgstr "不能拣选到空分支"
+
+#: sha1_name.c:440
+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"
+"\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"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
+"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
+"命令关闭本消息通知。"
-#: builtin/checkout.c:212 builtin/reset.c:158
+#: sha1_name.c:1068
+msgid "HEAD does not point to a branch"
+msgstr "HEAD 没有指向一个分支"
+
+#: sha1_name.c:1071
#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
+msgid "No such branch: '%s'"
+msgstr "没有此分支：'%s'"
-#: builtin/checkout.c:234 builtin/checkout.c:392
-msgid "corrupt index file"
-msgstr "损坏的索引文件"
+#: sha1_name.c:1073
+#, c-format
+msgid "No upstream configured for branch '%s'"
+msgstr "尚未给分支 '%s' 设置上游"
-#: builtin/checkout.c:264 builtin/checkout.c:271
+#: sha1_name.c:1077
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "路径 '%s' 未合并"
+msgid "Upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
-#: builtin/merge.c:812
-msgid "unable to write new index file"
-msgstr "无法写新的索引文件"
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
-msgid "diff_setup_done failed"
-msgstr "diff_setup_done 失败"
+#: submodule.c:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: builtin/checkout.c:414
-msgid "you need to resolve your current index first"
-msgstr "您需要先解决当前索引的冲突"
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "不能更新 .gitmodules 条目 %s"
-#: builtin/checkout.c:533
+#: submodule.c:109
#, c-format
-msgid "Can not do reflog for '%s'\n"
-msgstr "不能对 '%s' 执行 reflog 操作\n"
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "无法移除 %s 的 .gitmodules 条目"
-#: builtin/checkout.c:565
-msgid "HEAD is now at"
-msgstr "HEAD 目前位于"
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: builtin/checkout.c:572
+#: submodule.c:1111 builtin/init-db.c:363
#, c-format
-msgid "Reset branch '%s'\n"
-msgstr "重置分支 '%s'\n"
+msgid "Could not create git link %s"
+msgstr "不能创建 git link %s"
-#: builtin/checkout.c:575
+#: submodule.c:1122
#, c-format
-msgid "Already on '%s'\n"
-msgstr "已经位于 '%s'\n"
+msgid "Could not set core.worktree in %s"
+msgstr "不能在 %s 中设置 core.worktree"
-#: builtin/checkout.c:579
+#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
+#: trailer.c:569
#, c-format
-msgid "Switched to and reset branch '%s'\n"
-msgstr "切换并重置分支 '%s'\n"
+msgid "unknown value '%s' for key '%s'"
+msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: builtin/checkout.c:581
+#: trailer.c:551 trailer.c:556 builtin/remote.c:288
#, c-format
-msgid "Switched to a new branch '%s'\n"
-msgstr "å\88\87æ\8d¢å\88°ä¸\80个æ\96°å\88\86æ\94¯ '%s'\n"
+msgid "more than one %s"
+msgstr "å¤\9aäº\8eä¸\80个 %s"
-#: builtin/checkout.c:583
+#: trailer.c:589
#, c-format
-msgid "Switched to branch '%s'\n"
-msgstr "切换到分支 '%s'\n"
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "签名 '%.*s' 的键为空"
-# 译者：注意保持前导空格
-#: builtin/checkout.c:639
+#: trailer.c:709
#, c-format
-msgid " ... and %d more.\n"
-msgstr " ... 及其它 %d 个。\n"
+msgid "could not read input file '%s'"
+msgstr "不能读取输入文件 '%s'"
-#. The singular version
-#: builtin/checkout.c:645
+#: trailer.c:712
+msgid "could not read from stdin"
+msgstr "不能自标准输入读取"
+
+#: unpack-trees.c:202
+msgid "Checking out files"
+msgstr "正在检出文件"
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, 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"
+msgid "invalid %XX escape sequence"
+msgstr "无效的 %XX 转义序列"
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "缺失主机名且URL方案不是 'file:'"
+
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "一个 'file:' URL 不应该包含端口号"
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "主机名中包含无效的字符"
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "无效的端口号"
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "无效的 '..' 路径片段"
-#: builtin/checkout.c:663
+#: wrapper.c:509
#, c-format
+msgid "unable to access '%s': %s"
+msgstr "不能访问 '%s'：%s"
+
+#: wrapper.c:530
+#, c-format
+msgid "unable to access '%s'"
+msgstr "不能访问 '%s'"
+
+#: wrapper.c:541
+#, c-format
+msgid "unable to look up current user in the passwd file: %s"
+msgstr "无法在口令文件中查询到当前用户：%s"
+
+#: wrapper.c:542
+msgid "no such user"
+msgstr "无此用户"
+
+#: wrapper.c:550
+msgid "unable to get current working directory"
+msgstr "不能获取当前工作目录"
+
+#: wt-status.c:150
+msgid "Unmerged paths:"
+msgstr "未合并的路径："
+
+# 译者：注意保持前导空格
+#: wt-status.c:177 wt-status.c:204
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:179 wt-status.c:206
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:183
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " （使用 \"git add <file>...\" 标记解决方案）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:185 wt-status.c:189
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:187
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " （使用 \"git rm <file>...\" 标记解决方案）"
+
+#: wt-status.c:198
+msgid "Changes to be committed:"
+msgstr "要提交的变更："
+
+#: wt-status.c:216
+msgid "Changes not staged for commit:"
+msgstr "尚未暂存以备提交的变更："
+
+# 译者：注意保持前导空格
+#: wt-status.c:220
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:222
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:223
msgid ""
-"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"
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:225
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:237
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"
+
+#: wt-status.c:252
+msgid "both deleted:"
+msgstr "双方删除："
+
+#: wt-status.c:254
+msgid "added by us:"
+msgstr "由我们添加："
+
+#: wt-status.c:256
+msgid "deleted by them:"
+msgstr "由他们删除："
+
+#: wt-status.c:258
+msgid "added by them:"
+msgstr "由他们添加："
+
+#: wt-status.c:260
+msgid "deleted by us:"
+msgstr "由我们删除："
+
+#: wt-status.c:262
+msgid "both added:"
+msgstr "双方添加："
+
+#: wt-status.c:264
+msgid "both modified:"
+msgstr "双方修改："
+
+#: wt-status.c:266
+#, c-format
+msgid "bug: unhandled unmerged status %x"
+msgstr "bug：无法处理的未合并状态 %x"
+
+#: wt-status.c:274
+msgid "new file:"
+msgstr "新文件："
+
+#: wt-status.c:276
+msgid "copied:"
+msgstr "拷贝："
+
+#: wt-status.c:278
+msgid "deleted:"
+msgstr "删除："
+
+#: wt-status.c:280
+msgid "modified:"
+msgstr "修改："
+
+#: wt-status.c:282
+msgid "renamed:"
+msgstr "重命名："
+
+#: wt-status.c:284
+msgid "typechange:"
+msgstr "类型变更："
+
+#: wt-status.c:286
+msgid "unknown:"
+msgstr "未知："
+
+#: wt-status.c:288
+msgid "unmerged:"
+msgstr "未合并："
+
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:370
+msgid "new commits, "
+msgstr "新提交, "
+
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:372
+msgid "modified content, "
+msgstr "修改的内容, "
+
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:374
+msgid "untracked content, "
+msgstr "未跟踪的内容, "
+
+#: wt-status.c:391
+#, c-format
+msgid "bug: unhandled diff status %c"
+msgstr "bug：无法处理的差异状态 %c"
+
+#: wt-status.c:761
+msgid "Submodules changed but not updated:"
+msgstr "子模组已修改但尚未更新："
+
+#: wt-status.c:763
+msgid "Submodule changes to be committed:"
+msgstr "要提交的子模组变更："
+
+#: wt-status.c:842
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-"如果您想要通过创建新分支保存他们，这可能是一个好时候。\n"
-"如下操作：\n"
-"\n"
-" git branch new_branch_name %s\n"
-"\n"
+"不要改动上面的一行。\n"
+"下面的所有内容均将被删除。"
-#: builtin/checkout.c:693
-msgid "internal error in revision walk"
-msgstr "在版本遍历时遇到内部错误"
+#: wt-status.c:933
+msgid "You have unmerged paths."
+msgstr "您有尚未合并的路径。"
-#: builtin/checkout.c:697
-msgid "Previous HEAD position was"
-msgstr "之前的 HEAD 位置是"
+# 译者：注意保持前导空格
+#: wt-status.c:936
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " （解决冲突并运行 \"git commit\"）"
-#: builtin/checkout.c:723
-msgid "You are on a branch yet to be born"
-msgstr "您位于一个尚未初始化的分支"
+#: wt-status.c:939
+msgid "All conflicts fixed but you are still merging."
+msgstr "所有冲突已解决但您仍处于合并中。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:942
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " （使用 \"git commit\" 结束合并）"
+
+#: wt-status.c:952
+msgid "You are in the middle of an am session."
+msgstr "您正处于 am 操作过程中。"
+
+#: wt-status.c:955
+msgid "The current patch is empty."
+msgstr "当前的补丁为空。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:959
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " （解决冲突，然后运行 \"git am --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:961
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " （使用 \"git am --skip\" 跳过此补丁）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:963
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " （使用 \"git am --abort\" 恢复原有分支）"
+
+#: wt-status.c:1023 wt-status.c:1040
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
+
+#: wt-status.c:1028 wt-status.c:1045
+msgid "You are currently rebasing."
+msgstr "您在执行变基操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1031
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1033
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1035
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1048
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
+
+#: wt-status.c:1052
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
+
+#: wt-status.c:1057
+msgid "You are currently splitting a commit during a rebase."
+msgstr "您在执行变基操作时拆分提交。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1060
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
+
+#: wt-status.c:1064
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
+
+#: wt-status.c:1069
+msgid "You are currently editing a commit during a rebase."
+msgstr "您在执行变基操作时编辑提交。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1072
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " （使用 \"git commit --amend\" 修补当前提交）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1074
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
+
+#: wt-status.c:1084
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "您在执行拣选提交 %s 的操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1089
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1092
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1094
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
+
+#: wt-status.c:1103
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "您在执行反转提交 %s 的操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1108
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " （解决冲突并运行 \"git revert --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1111
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1113
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
+
+#: wt-status.c:1124
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
+
+#: wt-status.c:1128
+msgid "You are currently bisecting."
+msgstr "您在执行二分查找操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1131
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
+
+#: wt-status.c:1306
+msgid "On branch "
+msgstr "位于分支 "
+
+#: wt-status.c:1313
+msgid "rebase in progress; onto "
+msgstr "变基操作正在进行中；至 "
+
+#: wt-status.c:1320
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
+
+#: wt-status.c:1322
+msgid "HEAD detached from "
+msgstr "头指针分离自 "
+
+#: wt-status.c:1325
+msgid "Not currently on any branch."
+msgstr "当前不在任何分支上。"
+
+#: wt-status.c:1342
+msgid "Initial commit"
+msgstr "初始提交"
+
+#: wt-status.c:1356
+msgid "Untracked files"
+msgstr "未跟踪的文件"
+
+#: wt-status.c:1358
+msgid "Ignored files"
+msgstr "忽略的文件"
+
+#: wt-status.c:1362
+#, 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')."
+msgstr ""
+"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
+"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
+
+#: wt-status.c:1368
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "未跟踪的文件没有列出%s"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1370
+msgid " (use -u option to show untracked files)"
+msgstr "（使用 -u 参数显示未跟踪的文件）"
+
+#: wt-status.c:1376
+msgid "No changes"
+msgstr "没有修改"
+
+#: wt-status.c:1381
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
+
+#: wt-status.c:1384
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "修改尚未加入提交\n"
+
+#: wt-status.c:1387
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
+
+#: wt-status.c:1390
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "提交为空，但是存在尚未跟踪的文件\n"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1393
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
+
+#: wt-status.c:1396 wt-status.c:1401
+#, c-format
+msgid "nothing to commit\n"
+msgstr "无文件要提交\n"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1399
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1403
+#, c-format
+msgid "nothing to commit, working directory clean\n"
+msgstr "无文件要提交，干净的工作区\n"
+
+#: wt-status.c:1512
+msgid "HEAD (no branch)"
+msgstr "HEAD（非分支）"
+
+# 译者：注意保持句尾空格
+#: wt-status.c:1518
+msgid "Initial commit on "
+msgstr "初始提交于 "
+
+#: wt-status.c:1550
+msgid "gone"
+msgstr "丢失"
+
+# 译者：注意保持句尾空格
+#: wt-status.c:1552 wt-status.c:1560
+msgid "behind "
+msgstr "落后 "
+
+#: compat/precompose_utf8.c:55 builtin/clone.c:357
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "无法删除 '%s'"
+
+#: builtin/add.c:22
+msgid "git add [options] [--] <pathspec>..."
+msgstr "git add [选项] [--] <路径规则>..."
+
+#: builtin/add.c:65
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "意外的差异状态 %c"
+
+#: builtin/add.c:70 builtin/commit.c:275
+msgid "updating files failed"
+msgstr "更新文件失败"
+
+#: builtin/add.c:80
+#, c-format
+msgid "remove '%s'\n"
+msgstr "删除 '%s'\n"
+
+#: builtin/add.c:134
+msgid "Unstaged changes after refreshing the index:"
+msgstr "刷新索引之后尚未被暂存的变更："
+
+#: builtin/add.c:194 builtin/rev-parse.c:785
+msgid "Could not read the index"
+msgstr "不能读取索引"
+
+#: builtin/add.c:205
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "不能打开 '%s' 以写入。"
+
+#: builtin/add.c:209
+msgid "Could not write patch"
+msgstr "不能生成补丁"
+
+#: builtin/add.c:214
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "不能查看文件状态 '%s'"
+
+#: builtin/add.c:216
+msgid "Empty patch. Aborted."
+msgstr "空补丁。异常终止。"
+
+#: builtin/add.c:221
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "不能应用 '%s'"
+
+#: builtin/add.c:231
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
+
+#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375
+#: builtin/rm.c:269
+msgid "dry run"
+msgstr "演习"
+
+#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
+#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608
+#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "冗长输出"
+
+#: builtin/add.c:251
+msgid "interactive picking"
+msgstr "交互式拣选"
+
+#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "交互式挑选数据块"
+
+#: builtin/add.c:253
+msgid "edit current diff and apply"
+msgstr "编辑当前差异并应用"
+
+#: builtin/add.c:254
+msgid "allow adding otherwise ignored files"
+msgstr "允许添加忽略的文件"
+
+#: builtin/add.c:255
+msgid "update tracked files"
+msgstr "更新已跟踪的文件"
+
+#: builtin/add.c:256
+msgid "record only the fact that the path will be added later"
+msgstr "只记录，该路径稍后再添加"
+
+#: builtin/add.c:257
+msgid "add changes from all tracked and untracked files"
+msgstr "添加所有改变的已跟踪文件和未跟踪文件"
+
+#: builtin/add.c:260
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
+
+#: builtin/add.c:262
+msgid "don't add, only refresh the index"
+msgstr "不添加，只刷新索引"
+
+#: builtin/add.c:263
+msgid "just skip files which cannot be added because of errors"
+msgstr "跳过因出错不能添加的文件"
+
+#: builtin/add.c:264
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
+
+#: builtin/add.c:286
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "使用 -f 参数如果您确实要添加它们。\n"
+
+#: builtin/add.c:287
+msgid "no files added"
+msgstr "没有文件被添加"
+
+#: builtin/add.c:293
+msgid "adding files failed"
+msgstr "添加文件失败"
+
+#: builtin/add.c:329
+msgid "-A and -u are mutually incompatible"
+msgstr "-A 和 -u 选项互斥"
+
+#: builtin/add.c:336
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
+
+#: builtin/add.c:357
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "没有指定文件，也没有文件被添加。\n"
+
+#: builtin/add.c:358
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "也许您想要执行 'git add .'？\n"
+
+#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
+msgid "index file corrupt"
+msgstr "索引文件损坏"
+
+#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "无法写入新索引文件"
+
+#: builtin/apply.c:58
+msgid "git apply [options] [<patch>...]"
+msgstr "git apply [选项] [<补丁>...]"
+
+#: builtin/apply.c:111
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "未能识别的空白字符选项 '%s'"
+
+#: builtin/apply.c:126
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "未能识别的空白字符忽略选项 '%s'"
+
+#: builtin/apply.c:826
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "无法准备时间戳正则表达式 %s"
+
+#: builtin/apply.c:835
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec 返回 %d，输入为：%s"
+
+#: builtin/apply.c:916
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "不能在补丁的第 %d 行找到文件名"
+
+#: builtin/apply.c:948
+#, 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"
+
+#: builtin/apply.c:952
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
+
+#: builtin/apply.c:953
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
+
+#: builtin/apply.c:960
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
+
+#: builtin/apply.c:1423
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount：意外的行：%.*s"
+
+#: builtin/apply.c:1480
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "第 %d 行的补丁片段没有头信息：%.*s"
+
+#: builtin/apply.c:1497
+#, 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 行）"
+
+#: builtin/apply.c:1657
+msgid "new file depends on old contents"
+msgstr "新文件依赖旧内容"
+
+#: builtin/apply.c:1659
+msgid "deleted file still has contents"
+msgstr "删除的文件仍有内容"
+
+#: builtin/apply.c:1685
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "补丁在第 %d 行损坏"
+
+#: builtin/apply.c:1721
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "新文件 %s 依赖旧内容"
+
+#: builtin/apply.c:1723
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "删除的文件 %s 仍有内容"
+
+#: builtin/apply.c:1726
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** 警告：文件 %s 成为空文件但并未删除"
+
+#: builtin/apply.c:1872
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "二进制补丁在第 %d 行损坏：%.*s"
+
+#: builtin/apply.c:1901
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "未能识别的二进制补丁位于第 %d 行"
+
+#: builtin/apply.c:2052
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "补丁文件的第 %d 行只有垃圾数据"
+
+#: builtin/apply.c:2142
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "无法读取符号链接 %s"
+
+#: builtin/apply.c:2146
+#, c-format
+msgid "unable to open or read %s"
+msgstr "不能打开或读取 %s"
+
+#: builtin/apply.c:2754
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "无效的行首字符：'%c'"
+
+#: builtin/apply.c:2872
+#, 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 行）"
+
+#: builtin/apply.c:2884
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
+
+#: builtin/apply.c:2890
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"当查询：\n"
+"%.*s"
+
+#: builtin/apply.c:2909
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "缺失 '%s' 的二进制补丁数据"
+
+#: builtin/apply.c:3010
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "二进制补丁未应用到 '%s'"
+
+#: builtin/apply.c:3016
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
+
+#: builtin/apply.c:3037
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "打补丁失败：%s:%ld"
+
+#: builtin/apply.c:3161
+#, c-format
+msgid "cannot checkout %s"
+msgstr "不能检出 %s"
+
+#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
+#, c-format
+msgid "read of %s failed"
+msgstr "读取 %s 失败"
+
+#: builtin/apply.c:3240 builtin/apply.c:3462
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "路径 %s 已经被重命名/删除"
+
+#: builtin/apply.c:3321 builtin/apply.c:3476
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s：不存在于索引中"
+
+#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
+#, c-format
+msgid "%s: %s"
+msgstr "%s：%s"
+
+#: builtin/apply.c:3330 builtin/apply.c:3484
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s：和索引不匹配"
+
+#: builtin/apply.c:3432
+msgid "removal patch leaves file contents"
+msgstr "移除补丁仍留下了文件内容"
+
+#: builtin/apply.c:3501
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s：错误类型"
+
+#: builtin/apply.c:3503
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s 的类型是 %o，应为 %o"
+
+#: builtin/apply.c:3604
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s：已经存在于索引中"
+
+#: builtin/apply.c:3607
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s：已经存在于工作区中"
+
+#: builtin/apply.c:3627
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
+
+#: builtin/apply.c:3632
+#, 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）不匹配"
+
+#: builtin/apply.c:3640
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s：补丁未应用"
+
+#: builtin/apply.c:3653
+#, c-format
+msgid "Checking patch %s..."
+msgstr "检查补丁 %s..."
+
+#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
+
+#: builtin/apply.c:3889
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "不能从索引中移除 %s"
+
+#: builtin/apply.c:3918
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "子模组 %s 损坏的补丁"
+
+#: builtin/apply.c:3922
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "不能枚举新建文件 '%s' 的状态"
+
+#: builtin/apply.c:3927
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "不能为新建文件 %s 创建后端存储"
+
+#: builtin/apply.c:3930 builtin/apply.c:4038
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "无法为 %s 添加缓存条目"
+
+#: builtin/apply.c:3963
+#, c-format
+msgid "closing file '%s'"
+msgstr "关闭文件 '%s'"
+
+#: builtin/apply.c:4012
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "不能写文件 '%s' 权限 %o"
+
+#: builtin/apply.c:4099
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "成功应用补丁 %s。"
+
+#: builtin/apply.c:4107
+msgid "internal error"
+msgstr "内部错误"
+
+#: builtin/apply.c:4110
+#, 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 个被拒绝..."
+
+#: builtin/apply.c:4120
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "截短 .rej 文件名为 %.*s.rej"
+
+#: builtin/apply.c:4141
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "第 #%d 个片段成功应用。"
+
+#: builtin/apply.c:4144
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "拒绝第 #%d 个片段。"
+
+#: builtin/apply.c:4234
+msgid "unrecognized input"
+msgstr "未能识别的输入"
+
+#: builtin/apply.c:4245
+msgid "unable to read index file"
+msgstr "无法读取索引文件"
+
+#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91
+#: builtin/fetch.c:93
+msgid "path"
+msgstr "路径"
+
+#: builtin/apply.c:4363
+msgid "don't apply changes matching the given path"
+msgstr "不要应用与给出路径向匹配的变更"
+
+#: builtin/apply.c:4366
+msgid "apply changes matching the given path"
+msgstr "应用与给出路径向匹配的变更"
+
+#: builtin/apply.c:4368
+msgid "num"
+msgstr "数字"
+
+#: builtin/apply.c:4369
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
+
+#: builtin/apply.c:4372
+msgid "ignore additions made by the patch"
+msgstr "忽略补丁中的添加的文件"
+
+#: builtin/apply.c:4374
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
+
+#: builtin/apply.c:4378
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "以十进制数显示添加和删除的行数"
+
+#: builtin/apply.c:4380
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "不应用补丁，而是显示输入的概要"
+
+#: builtin/apply.c:4382
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "不应用补丁，而是查看补丁是否可应用"
+
+#: builtin/apply.c:4384
+msgid "make sure the patch is applicable to the current index"
+msgstr "确认补丁可以应用到当前索引"
+
+#: builtin/apply.c:4386
+msgid "apply a patch without touching the working tree"
+msgstr "应用补丁而不修改工作区"
+
+#: builtin/apply.c:4388
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
+
+#: builtin/apply.c:4390
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "如果一个补丁不能应用则尝试三路合并"
+
+#: builtin/apply.c:4392
+msgid "build a temporary index based on embedded index information"
+msgstr "创建一个临时索引基于嵌入的索引信息"
+
+#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
+msgid "paths are separated with NUL character"
+msgstr "路径以 NUL 字符分隔"
+
+#: builtin/apply.c:4397
+msgid "ensure at least <n> lines of context match"
+msgstr "确保至少匹配 <n> 行上下文"
+
+#: builtin/apply.c:4398
+msgid "action"
+msgstr "动作"
+
+#: builtin/apply.c:4399
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "检查新增和修改的行中间的空白字符滥用"
+
+#: builtin/apply.c:4402 builtin/apply.c:4405
+msgid "ignore changes in whitespace when finding context"
+msgstr "查找上下文时忽略空白字符的变更"
+
+#: builtin/apply.c:4408
+msgid "apply the patch in reverse"
+msgstr "反向应用补丁"
+
+#: builtin/apply.c:4410
+msgid "don't expect at least one line of context"
+msgstr "无需至少一行上下文"
+
+#: builtin/apply.c:4412
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
+
+#: builtin/apply.c:4414
+msgid "allow overlapping hunks"
+msgstr "允许重叠的补丁片段"
+
+#: builtin/apply.c:4417
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "允许不正确的文件末尾换行符"
+
+#: builtin/apply.c:4420
+msgid "do not trust the line counts in the hunk headers"
+msgstr "不信任补丁片段的头信息中的行号"
+
+#: builtin/apply.c:4422
+msgid "root"
+msgstr "根目录"
+
+#: builtin/apply.c:4423
+msgid "prepend <root> to all filenames"
+msgstr "为所有文件名前添加 <根目录>"
+
+#: builtin/apply.c:4445
+msgid "--3way outside a repository"
+msgstr "--3way 在一个版本库之外"
+
+#: builtin/apply.c:4453
+msgid "--index outside a repository"
+msgstr "--index 在一个版本库之外"
+
+#: builtin/apply.c:4456
+msgid "--cached outside a repository"
+msgstr "--cached 在一个版本库之外"
+
+#: builtin/apply.c:4472
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "不能打开补丁 '%s'"
+
+#: builtin/apply.c:4486
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "抑制下仍有 %d 个空白字符误用"
+msgstr[1] "抑制下仍有 %d 个空白字符误用"
+
+#: builtin/apply.c:4492 builtin/apply.c:4502
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d 行有空白字符误用。"
+msgstr[1] "%d 行有空白字符误用。"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "不能创建归档文件 '%s'"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "不能重定向输出"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive：未提供远程URL"
+
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got EOF"
+msgstr "git archive：应为ACK/NACK，却得到EOF"
+
+#: builtin/archive.c:61
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive：NACK %s"
+
+#: builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "远程错误：%s"
+
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
+msgstr "git archive：协议错误"
+
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
+msgstr "git archive：应为刷新"
+
+#: builtin/bisect--helper.c:7
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:17
+msgid "perform 'git bisect next'"
+msgstr "执行 'git bisect next'"
+
+#: builtin/bisect--helper.c:19
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "更新 BISECT_HEAD 而非检出当前提交"
+
+#: builtin/blame.c:30
+msgid "git blame [options] [rev-opts] [rev] [--] file"
+msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
+
+#: builtin/blame.c:35
+msgid "[rev-opts] are documented in git-rev-list(1)"
+msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
+
+#: builtin/blame.c:2501
+msgid "Show blame entries as we find them, incrementally"
+msgstr "增量式地显示发现的 blame 条目"
+
+#: builtin/blame.c:2502
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr "边界提交显示空的 SHA-1（默认：关闭）"
+
+#: builtin/blame.c:2503
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "不把根提交作为边界（默认：关闭）"
+
+#: builtin/blame.c:2504
+msgid "Show work cost statistics"
+msgstr "显示命令消耗统计"
+
+#: builtin/blame.c:2505
+msgid "Show output score for blame entries"
+msgstr "显示判断 blame 条目位移的得分诊断信息"
+
+#: builtin/blame.c:2506
+msgid "Show original filename (Default: auto)"
+msgstr "显示原始文件名（默认：自动）"
+
+#: builtin/blame.c:2507
+msgid "Show original linenumber (Default: off)"
+msgstr "显示原始的行号（默认：关闭）"
+
+#: builtin/blame.c:2508
+msgid "Show in a format designed for machine consumption"
+msgstr "显示为一个适合机器读取的格式"
+
+#: builtin/blame.c:2509
+msgid "Show porcelain format with per-line commit information"
+msgstr "为每一行显示机器适用的提交信息"
+
+#: builtin/blame.c:2510
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
+
+#: builtin/blame.c:2511
+msgid "Show raw timestamp (Default: off)"
+msgstr "显示原始时间戳（默认：关闭）"
+
+#: builtin/blame.c:2512
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "显示长的SHA1提交号（默认：关闭）"
+
+#: builtin/blame.c:2513
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "隐藏作者名字和时间戳（默认：关闭）"
+
+#: builtin/blame.c:2514
+msgid "Show author email instead of name (Default: off)"
+msgstr "显示作者的邮箱而不是名字（默认：关闭）"
+
+#: builtin/blame.c:2515
+msgid "Ignore whitespace differences"
+msgstr "忽略空白差异"
+
+#: builtin/blame.c:2516
+msgid "Spend extra cycles to find better match"
+msgstr "花费额外的循环来找到更好的匹配"
+
+#: builtin/blame.c:2517
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
+
+#: builtin/blame.c:2518
+msgid "Use <file>'s contents as the final image"
+msgstr "使用 <file> 的内容作为最终的图片"
+
+#: builtin/blame.c:2519 builtin/blame.c:2520
+msgid "score"
+msgstr "得分"
+
+#: builtin/blame.c:2519
+msgid "Find line copies within and across files"
+msgstr "找到文件内及跨文件的行拷贝"
+
+#: builtin/blame.c:2520
+msgid "Find line movements within and across files"
+msgstr "找到文件内及跨文件的行移动"
+
+#: builtin/blame.c:2521
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:2521
+msgid "Process only line range n,m, counting from 1"
+msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
+
+#. 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:2602
+msgid "4 years, 11 months ago"
+msgstr "4 年 11 个月前"
+
+#: builtin/branch.c:24
+msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:25
+msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
+msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
+
+#: builtin/branch.c:26
+msgid "git branch [options] [-r] (-d | -D) <branchname>..."
+msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
+
+#: builtin/branch.c:27
+msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
+msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
+
+# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
+#: builtin/branch.c:152
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+"将要删除的分支 '%s' 已经被合并到\n"
+" '%s'，但未合并到 HEAD。"
+
+# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
+#: builtin/branch.c:156
+#, 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/branch.c:170
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "无法查询 '%s' 指向的提交对象"
+
+#: builtin/branch.c:174
+#, 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:187
+msgid "Update of config-file failed"
+msgstr "无法更新 config 文件"
+
+#: builtin/branch.c:215
+msgid "cannot use -a with -d"
+msgstr "不能将 -a 和 -d 同时使用"
+
+#: builtin/branch.c:221
+msgid "Couldn't look up commit object for HEAD"
+msgstr "无法查询 HEAD 指向的提交对象"
+
+#: builtin/branch.c:229
+#, c-format
+msgid "Cannot delete the branch '%s' which you are currently on."
+msgstr "无法删除您当前所在的分支 '%s'。"
+
+#: builtin/branch.c:245
+#, c-format
+msgid "remote branch '%s' not found."
+msgstr "远程分支 '%s' 未发现。"
+
+#: builtin/branch.c:246
+#, c-format
+msgid "branch '%s' not found."
+msgstr "分支 '%s' 未发现。"
+
+#: builtin/branch.c:260
+#, c-format
+msgid "Error deleting remote branch '%s'"
+msgstr "删除远程分支 '%s' 时出错"
+
+#: builtin/branch.c:261
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "删除分支 '%s' 时出错"
+
+#: builtin/branch.c:268
+#, c-format
+msgid "Deleted remote branch %s (was %s).\n"
+msgstr "已删除远程分支 %s（曾为 %s）。\n"
+
+#: builtin/branch.c:269
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "已删除分支 %s（曾为 %s）。\n"
+
+#: builtin/branch.c:370
+#, c-format
+msgid "branch '%s' does not point at a commit"
+msgstr "分支 '%s' 未指向一个提交"
+
+#: builtin/branch.c:459
+#, c-format
+msgid "[%s: gone]"
+msgstr "[%s: 丢失]"
+
+#: builtin/branch.c:464
+#, c-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: builtin/branch.c:469
+#, c-format
+msgid "[%s: behind %d]"
+msgstr "[%s：落后 %d]"
+
+#: builtin/branch.c:471
+#, c-format
+msgid "[behind %d]"
+msgstr "[落后 %d]"
+
+#: builtin/branch.c:475
+#, c-format
+msgid "[%s: ahead %d]"
+msgstr "[%s：领先 %d]"
+
+#: builtin/branch.c:477
+#, c-format
+msgid "[ahead %d]"
+msgstr "[领先 %d]"
+
+#: builtin/branch.c:480
+#, c-format
+msgid "[%s: ahead %d, behind %d]"
+msgstr "[%s：领先 %d，落后 %d]"
+
+#: builtin/branch.c:483
+#, c-format
+msgid "[ahead %d, behind %d]"
+msgstr "[领先 %d，落后 %d]"
+
+#: builtin/branch.c:496
+msgid " **** invalid ref ****"
+msgstr " **** 无效引用 ****"
+
+#: builtin/branch.c:587
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "（非分支，正变基 %s）"
+
+#: builtin/branch.c:590
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "（非分支，二分查找开始于 %s）"
+
+#: builtin/branch.c:593
+#, c-format
+msgid "(detached from %s)"
+msgstr "（分离自 %s）"
+
+#: builtin/branch.c:596
+msgid "(no branch)"
+msgstr "（非分支）"
+
+#: builtin/branch.c:643
+#, c-format
+msgid "object '%s' does not point to a commit"
+msgstr "对象 '%s' 没有指向一个提交"
+
+#: builtin/branch.c:691
+msgid "some refs could not be read"
+msgstr "一些引用不能读取"
+
+#: builtin/branch.c:704
+msgid "cannot rename the current branch while not on any."
+msgstr "无法重命名当前分支因为不处于任何分支上。"
+
+#: builtin/branch.c:714
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "无效的分支名：'%s'"
+
+#: builtin/branch.c:729
+msgid "Branch rename failed"
+msgstr "分支重命名失败"
+
+#: builtin/branch.c:733
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "重命名掉一个错误命名的旧分支 '%s'"
+
+#: builtin/branch.c:737
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "分支重命名为 %s，但 HEAD 没有更新！"
+
+#: builtin/branch.c:744
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "分支被重命名，但更新 config 文件失败"
+
+#: builtin/branch.c:759
+#, c-format
+msgid "malformed object name %s"
+msgstr "非法的对象名 %s"
+
+#: builtin/branch.c:783
+#, c-format
+msgid "could not write branch description template: %s"
+msgstr "不能写分支描述模版：%s"
+
+#: builtin/branch.c:813
+msgid "Generic options"
+msgstr "通用选项"
+
+#: builtin/branch.c:815
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
+
+#: builtin/branch.c:816
+msgid "suppress informational messages"
+msgstr "不显示信息"
+
+#: builtin/branch.c:817
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "设置跟踪模式（参见 git-pull(1)）"
+
+#: builtin/branch.c:819
+msgid "change upstream info"
+msgstr "改变上游信息"
+
+#: builtin/branch.c:823
+msgid "use colored output"
+msgstr "使用彩色输出"
+
+#: builtin/branch.c:824
+msgid "act on remote-tracking branches"
+msgstr "作用于远程跟踪分支"
+
+#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
+#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623
+#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616
+#: builtin/tag.c:622
+msgid "commit"
+msgstr "提交"
+
+#: builtin/branch.c:828 builtin/branch.c:834
+msgid "print only branches that contain the commit"
+msgstr "只打印包含该提交的分支"
+
+#: builtin/branch.c:840
+msgid "Specific git-branch actions:"
+msgstr "具体的 git-branch 动作："
+
+#: builtin/branch.c:841
+msgid "list both remote-tracking and local branches"
+msgstr "列出远程跟踪及本地分支"
+
+#: builtin/branch.c:843
+msgid "delete fully merged branch"
+msgstr "删除完全合并的分支"
+
+#: builtin/branch.c:844
+msgid "delete branch (even if not merged)"
+msgstr "删除分支（即使没有合并）"
+
+#: builtin/branch.c:845
+msgid "move/rename a branch and its reflog"
+msgstr "移动/重命名一个分支，以及它的引用日志"
+
+#: builtin/branch.c:846
+msgid "move/rename a branch, even if target exists"
+msgstr "移动/重命名一个分支，即使目标已存在"
+
+#: builtin/branch.c:847
+msgid "list branch names"
+msgstr "列出分支名"
+
+#: builtin/branch.c:848
+msgid "create the branch's reflog"
+msgstr "创建分支的引用日志"
+
+#: builtin/branch.c:850
+msgid "edit the description for the branch"
+msgstr "标记分支的描述"
+
+#: builtin/branch.c:851
+msgid "force creation (when already exists)"
+msgstr "强制创建（当已经存在）"
+
+#: builtin/branch.c:854
+msgid "print only not merged branches"
+msgstr "只打印没有合并的分支"
+
+#: builtin/branch.c:860
+msgid "print only merged branches"
+msgstr "只打印合并的分支"
+
+#: builtin/branch.c:864
+msgid "list branches in columns"
+msgstr "以列的方式显示分支"
+
+#: builtin/branch.c:877
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "无法将 HEAD 解析为有效引用。"
+
+#: builtin/branch.c:881 builtin/clone.c:634
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD 没有位于 /refs/heads 之下！"
+
+#: builtin/branch.c:903
+msgid "--column and --verbose are incompatible"
+msgstr "--column 和 --verbose 不兼容"
+
+#: builtin/branch.c:909 builtin/branch.c:948
+msgid "branch name required"
+msgstr "必须提供分支名"
+
+#: builtin/branch.c:924
+msgid "Cannot give description to detached HEAD"
+msgstr "不能向分离头指针提供描述"
+
+#: builtin/branch.c:929
+msgid "cannot edit description of more than one branch"
+msgstr "不能为一个以上的分支编辑描述"
+
+#: builtin/branch.c:936
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "分支 '%s' 尚无提交。"
+
+#: builtin/branch.c:939
+#, c-format
+msgid "No branch named '%s'."
+msgstr "没有分支 '%s'。"
+
+#: builtin/branch.c:954
+msgid "too many branches for a rename operation"
+msgstr "为重命名操作提供了太多的分支名"
+
+#: builtin/branch.c:959
+msgid "too many branches to set new upstream"
+msgstr "为设置新上游提供了太多的分支名"
+
+#: builtin/branch.c:963
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
+
+#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009
+#, c-format
+msgid "no such branch '%s'"
+msgstr "没有此分支 '%s'"
+
+#: builtin/branch.c:970
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "分支 '%s' 不存在"
+
+#: builtin/branch.c:982
+msgid "too many branches to unset upstream"
+msgstr "为取消上游设置操作提供了太多的分支名"
+
+#: builtin/branch.c:986
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
+
+#: builtin/branch.c:992
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "分支 '%s' 没有上游信息"
+
+#: builtin/branch.c:1006
+msgid "it does not make sense to create 'HEAD' manually"
+msgstr "手工创建 'HEAD' 没有意义"
+
+#: builtin/branch.c:1012
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
+
+#: builtin/branch.c:1015
+#, 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/branch.c:1032
+#, c-format
+msgid ""
+"\n"
+"If you wanted to make '%s' track '%s', do this:\n"
+"\n"
+msgstr ""
+"\n"
+"如果你想用 '%s' 跟踪 '%s', 这么做：\n"
+"\n"
+
+#: builtin/branch.c:1033
+#, c-format
+msgid " git branch -d %s\n"
+msgstr " git branch -d %s\n"
+
+#: builtin/branch.c:1034
+#, c-format
+msgid " git branch --set-upstream-to %s\n"
+msgstr " git branch --set-upstream-to %s\n"
+
+#: builtin/bundle.c:47
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s 可以\n"
+
+#: builtin/bundle.c:56
+msgid "Need a repository to create a bundle."
+msgstr "需要一个版本库来创建包。"
+
+#: builtin/bundle.c:60
+msgid "Need a repository to unbundle."
+msgstr "需要一个版本库来解包。"
+
+#: builtin/cat-file.c:332
+msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
+msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
+
+#: builtin/cat-file.c:333
+msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
+msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
+
+#: builtin/cat-file.c:370
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
+
+#: builtin/cat-file.c:371
+msgid "show object type"
+msgstr "显示对象类型"
+
+#: builtin/cat-file.c:372
+msgid "show object size"
+msgstr "显示对象大小"
+
+#: builtin/cat-file.c:374
+msgid "exit with zero when there's no error"
+msgstr "当没有错误时退出并返回零"
+
+#: builtin/cat-file.c:375
+msgid "pretty-print object's content"
+msgstr "美观地打印对象的内容"
+
+#: builtin/cat-file.c:377
+msgid "for blob objects, run textconv on object's content"
+msgstr "对于数据（blob）对象，对其内容执行 textconv"
+
+#: builtin/cat-file.c:379
+msgid "show info and content of objects fed from the standard input"
+msgstr "显示从标准输入提供的对象的信息和内容"
+
+#: builtin/cat-file.c:382
+msgid "show info about objects fed from the standard input"
+msgstr "显示从标准输入提供的对象的信息"
+
+#: builtin/check-attr.c:11
+msgid "git check-attr [-a | --all | attr...] [--] pathname..."
+msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
+
+#: 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 | attr...] < <路径列表>"
+
+#: builtin/check-attr.c:19
+msgid "report all attributes set on file"
+msgstr "报告设置在文件上的所有属性"
+
+#: builtin/check-attr.c:20
+msgid "use .gitattributes only from the index"
+msgstr "只使用索引中的 .gitattributes"
+
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+msgid "read file names from stdin"
+msgstr "从标准输入读出文件名"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+msgid "terminate input and output records by a NUL character"
+msgstr "输入和输出的记录使用 NUL 字符终结"
+
+#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274
+msgid "suppress progress reporting"
+msgstr "不显示进度报告"
+
+#: builtin/check-ignore.c:26
+msgid "show non-matching input paths"
+msgstr "显示未匹配的输入路径"
+
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr "检查时忽略索引"
+
+#: builtin/check-ignore.c:154
+msgid "cannot specify pathnames with --stdin"
+msgstr "不能同时提供路径及 --stdin 参数"
+
+#: builtin/check-ignore.c:157
+msgid "-z only makes sense with --stdin"
+msgstr "-z 需要和 --stdin 参数共用才有意义"
+
+#: builtin/check-ignore.c:159
+msgid "no path specified"
+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/check-mailmap.c:24
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "不能解析联系地址：%s"
+
+#: builtin/check-mailmap.c:47
+msgid "no contacts specified"
+msgstr "未指定联系地址"
+
+#: builtin/checkout-index.c:126
+msgid "git checkout-index [options] [--] [<file>...]"
+msgstr "git checkout-index [选项] [--] [<文件>...]"
+
+#: builtin/checkout-index.c:188
+msgid "check out all files in the index"
+msgstr "检出索引区的所有文件"
+
+#: 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 "从指定暂存区中拷出文件"
+
+#: builtin/checkout.c:25
+msgid "git checkout [options] <branch>"
+msgstr "git checkout [选项] <分支>"
+
+#: builtin/checkout.c:26
+msgid "git checkout [options] [<branch>] -- <file>..."
+msgstr "git checkout [选项] [<分支>] -- <文件>..."
+
+#: builtin/checkout.c:114 builtin/checkout.c:147
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "路径 '%s' 没有我们的版本"
+
+#: builtin/checkout.c:116 builtin/checkout.c:149
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "路径 '%s' 没有他们的版本"
+
+#: builtin/checkout.c:132
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "路径 '%s' 没有全部必须的版本"
+
+#: builtin/checkout.c:176
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "路径 '%s' 没有必须的版本"
+
+#: builtin/checkout.c:193
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "path '%s'：无法合并"
+
+#: builtin/checkout.c:210
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "无法为 '%s' 添加合并结果"
+
+#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
+#: builtin/checkout.c:240
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' 不能在更新路径时使用"
+
+#: builtin/checkout.c:243 builtin/checkout.c:246
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' 不能和 %s 同时使用"
+
+#: builtin/checkout.c:249
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "不能同时更新路径并切换到分支'%s'。"
+
+#: builtin/checkout.c:260 builtin/checkout.c:449
+msgid "corrupt index file"
+msgstr "损坏的索引文件"
+
+#: builtin/checkout.c:320 builtin/checkout.c:327
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "路径 '%s' 未合并"
+
+#: builtin/checkout.c:471
+msgid "you need to resolve your current index first"
+msgstr "您需要先解决当前索引的冲突"
+
+#: builtin/checkout.c:597
+#, c-format
+msgid "Can not do reflog for '%s'\n"
+msgstr "不能对 '%s' 执行 reflog 操作\n"
+
+#: builtin/checkout.c:635
+msgid "HEAD is now at"
+msgstr "HEAD 目前位于"
+
+#: builtin/checkout.c:642
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "重置分支 '%s'\n"
+
+#: builtin/checkout.c:645
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "已经位于 '%s'\n"
+
+#: builtin/checkout.c:649
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "切换并重置分支 '%s'\n"
+
+#: builtin/checkout.c:651 builtin/checkout.c:1032
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "切换到一个新分支 '%s'\n"
+
+#: builtin/checkout.c:653
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "切换到分支 '%s'\n"
+
+# 译者：注意保持前导空格
+#: builtin/checkout.c:705
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... 及其它 %d 个。\n"
+
+#: builtin/checkout.c:711
+#, 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/checkout.c:729
+#, c-format
+msgid ""
+"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 ""
+"如果您想要通过创建新分支保存他们，这可能是一个好时候。\n"
+"如下操作：\n"
+"\n"
+" git branch new_branch_name %s\n"
+"\n"
+
+#: builtin/checkout.c:759
+msgid "internal error in revision walk"
+msgstr "在版本遍历时遇到内部错误"
+
+#: builtin/checkout.c:763
+msgid "Previous HEAD position was"
+msgstr "之前的 HEAD 位置是"
+
+#: builtin/checkout.c:790 builtin/checkout.c:1027
+msgid "You are on a branch yet to be born"
+msgstr "您位于一个尚未初始化的分支"
+
+#: builtin/checkout.c:934
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "只要一个引用，却给出了 %d 个"
+
+#: builtin/checkout.c:973
+#, c-format
+msgid "invalid reference: %s"
+msgstr "无效引用：%s"
+
+#: builtin/checkout.c:1002
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "引用不是一个树：%s"
+
+#: builtin/checkout.c:1041
+msgid "paths cannot be used with switching branches"
+msgstr "路径不能和切换分支同时使用"
+
+#: builtin/checkout.c:1044 builtin/checkout.c:1048
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' 不能和切换分支同时使用"
+
+#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
+#: builtin/checkout.c:1063
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' 不能和 '%s' 同时使用"
+
+#: builtin/checkout.c:1068
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "不能切换分支到一个非提交 '%s'"
+
+#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89
+#: builtin/remote.c:159 builtin/remote.c:161
+msgid "branch"
+msgstr "分支"
+
+#: builtin/checkout.c:1091
+msgid "create and checkout a new branch"
+msgstr "创建并检出一个新的分支"
+
+#: builtin/checkout.c:1093
+msgid "create/reset and checkout a branch"
+msgstr "创建/重置并检出一个分支"
+
+#: builtin/checkout.c:1094
+msgid "create reflog for new branch"
+msgstr "为新的分支创建引用日志"
+
+#: builtin/checkout.c:1095
+msgid "detach the HEAD at named commit"
+msgstr "成为指向该提交的分离头指针"
+
+#: builtin/checkout.c:1096
+msgid "set upstream info for new branch"
+msgstr "为新的分支设置上游信息"
+
+#: builtin/checkout.c:1098
+msgid "new-branch"
+msgstr "新分支"
+
+#: builtin/checkout.c:1098
+msgid "new unparented branch"
+msgstr "新的没有父提交的分支"
+
+#: builtin/checkout.c:1099
+msgid "checkout our version for unmerged files"
+msgstr "对尚未合并的文件检出我们的版本"
+
+#: builtin/checkout.c:1101
+msgid "checkout their version for unmerged files"
+msgstr "对尚未合并的文件检出他们的版本"
+
+#: builtin/checkout.c:1103
+msgid "force checkout (throw away local modifications)"
+msgstr "强制检出（丢弃本地修改）"
+
+#: builtin/checkout.c:1104
+msgid "perform a 3-way merge with the new branch"
+msgstr "和新的分支执行三路合并"
+
+#: builtin/checkout.c:1105 builtin/merge.c:226
+msgid "update ignored files (default)"
+msgstr "更新忽略的文件（默认）"
+
+#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245
+msgid "style"
+msgstr "风格"
+
+#: builtin/checkout.c:1107
+msgid "conflict style (merge or diff3)"
+msgstr "冲突输出风格（merge 或 diff3）"
+
+#: builtin/checkout.c:1110
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "对路径不做稀疏检出的限制"
+
+#: builtin/checkout.c:1112
+msgid "second guess 'git checkout no-such-branch'"
+msgstr "再者猜测'git checkout no-such-branch'"
+
+#: builtin/checkout.c:1135
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-b、-B 和 --orphan 是互斥的"
+
+#: builtin/checkout.c:1152
+msgid "--track needs a branch name"
+msgstr "--track 需要一个分支名"
+
+#: builtin/checkout.c:1157
+msgid "Missing branch name; try -b"
+msgstr "缺少分支名；尝试 -b"
+
+#: builtin/checkout.c:1194
+msgid "invalid path specification"
+msgstr "无效的路径规格"
+
+#: builtin/checkout.c:1201
+#, 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' 但其未能解析为提交么？"
+
+#: builtin/checkout.c:1206
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout：--detach 不能接收路径参数 '%s'"
+
+#: builtin/checkout.c:1210
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
+
+#: 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] [--] <路径>..."
+
+#: builtin/clean.c:30
+#, c-format
+msgid "Removing %s\n"
+msgstr "正删除 %s\n"
+
+#: builtin/clean.c:31
+#, c-format
+msgid "Would remove %s\n"
+msgstr "将删除 %s\n"
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "忽略版本库 %s\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "将忽略版本库 %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "failed to remove %s"
+msgstr "无法删除 %s"
+
+#: 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"
+" - （空）什么也不选择"
+
+#: builtin/clean.c:299
+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"
+msgstr ""
+"帮助：\n"
+"1 - 选择一个选项\n"
+"3-5 - 选择一个范围内的所有选项\n"
+"2-3,6-9 - 选择多个范围内的所有选项\n"
+"foo - 通过标题选择一个选项\n"
+"-... - 反选特定的选项\n"
+"* - 选择所有选项\n"
+" - （空）结束选择"
+
+#: builtin/clean.c:517
+#, c-format
+msgid "Huh (%s)?"
+msgstr "嗯（%s）？"
+
+#: builtin/clean.c:659
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "输入模版以排除条目>> "
+
+#: builtin/clean.c:696
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "警告：无法找到和 %s 匹配的条目"
+
+#: builtin/clean.c:717
+msgid "Select items to delete"
+msgstr "选择要删除的条目"
+
+#: builtin/clean.c:757
+#, c-format
+msgid "remove %s? "
+msgstr "删除 %s？"
+
+#: builtin/clean.c:782
+msgid "Bye."
+msgstr "再见。"
+
+#: builtin/clean.c:790
+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/clean.c:817
+msgid "*** Commands ***"
+msgstr "*** 命令 ***"
+
+#: builtin/clean.c:818
+msgid "What now"
+msgstr "请选择"
+
+#: builtin/clean.c:826
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "将删除如下条目："
+msgstr[1] "将删除如下条目："
+
+#: builtin/clean.c:843
+msgid "No more files to clean, exiting."
+msgstr "没有要清理的文件，退出。"
+
+#: builtin/clean.c:874
+msgid "do not print names of files removed"
+msgstr "不打印删除文件的名称"
+
+#: builtin/clean.c:876
+msgid "force"
+msgstr "强制"
+
+#: builtin/clean.c:877
+msgid "interactive cleaning"
+msgstr "交互式清除"
+
+#: builtin/clean.c:879
+msgid "remove whole directories"
+msgstr "删除整个目录"
+
+#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
+#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
+msgid "pattern"
+msgstr "模式"
+
+#: builtin/clean.c:881
+msgid "add <pattern> to ignore rules"
+msgstr "添加<模式>到忽略规则"
+
+#: builtin/clean.c:882
+msgid "remove ignored files, too"
+msgstr "也删除忽略的文件"
+
+#: builtin/clean.c:884
+msgid "remove only ignored files"
+msgstr "只删除忽略的文件"
+
+#: builtin/clean.c:902
+msgid "-x and -X cannot be used together"
+msgstr "-x 和 -X 不能同时使用"
+
+#: builtin/clean.c:906
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
+
+#: builtin/clean.c:909
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
+
+#: builtin/clone.c:37
+msgid "git clone [options] [--] <repo> [<dir>]"
+msgstr "git clone [选项] [--] <版本库> [<路径>]"
+
+#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223
+#: builtin/push.c:514
+msgid "force progress reporting"
+msgstr "强制显示进度报告"
+
+#: builtin/clone.c:67
+msgid "don't create a checkout"
+msgstr "不创建一个检出"
+
+#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
+msgid "create a bare repository"
+msgstr "创建一个纯版本库"
+
+#: builtin/clone.c:72
+msgid "create a mirror repository (implies bare)"
+msgstr "创建一个镜像版本库（也是纯版本库）"
+
+#: builtin/clone.c:74
+msgid "to clone from a local repository"
+msgstr "从本地版本库克隆"
+
+#: builtin/clone.c:76
+msgid "don't use local hardlinks, always copy"
+msgstr "不使用本地硬链接，始终复制"
+
+#: builtin/clone.c:78
+msgid "setup as shared repository"
+msgstr "设置为共享版本库"
+
+#: builtin/clone.c:80 builtin/clone.c:82
+msgid "initialize submodules in the clone"
+msgstr "在克隆时初始化子模组"
+
+#: builtin/clone.c:83 builtin/init-db.c:485
+msgid "template-directory"
+msgstr "模板目录"
+
+#: builtin/clone.c:84 builtin/init-db.c:486
+msgid "directory from which templates will be used"
+msgstr "模板目录将被使用"
+
+#: builtin/clone.c:86
+msgid "reference repository"
+msgstr "参考版本库"
+
+#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+msgid "name"
+msgstr "名称"
+
+#: builtin/clone.c:88
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "使用<名称>而不是 'origin' 去跟踪上游"
+
+#: builtin/clone.c:90
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "检出<分支>而不是远程HEAD"
+
+#: builtin/clone.c:92
+msgid "path to git-upload-pack on the remote"
+msgstr "远程 git-upload-pack 路径"
+
+#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659
+msgid "depth"
+msgstr "深度"
+
+#: builtin/clone.c:94
+msgid "create a shallow clone of that depth"
+msgstr "创建一个指定深度的浅克隆"
+
+#: builtin/clone.c:96
+msgid "clone only one branch, HEAD or --branch"
+msgstr "只克隆一个分支、HEAD 或 --branch"
+
+#: builtin/clone.c:97 builtin/init-db.c:494
+msgid "gitdir"
+msgstr "git目录"
+
+#: builtin/clone.c:98 builtin/init-db.c:495
+msgid "separate git dir from working tree"
+msgstr "git目录和工作区分离"
+
+#: builtin/clone.c:99
+msgid "key=value"
+msgstr "key=value"
+
+#: builtin/clone.c:100
+msgid "set config inside the new repository"
+msgstr "在新版本库中设置配置信息"
+
+#: builtin/clone.c:253
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "参考版本库 '%s' 不是一个本地版本库。"
+
+#: builtin/clone.c:257
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "参考版本库 '%s' 是一个浅克隆"
+
+#: builtin/clone.c:260
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "参考版本库 '%s' 已被嫁接"
+
+#: builtin/clone.c:322
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "无法创建目录 '%s'"
+
+#: builtin/clone.c:324 builtin/diff.c:84
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "无法枚举 '%s' 状态"
+
+#: builtin/clone.c:326
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s 存在且不是一个目录"
+
+#: builtin/clone.c:340
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "无法枚举 %s 状态\n"
+
+#: builtin/clone.c:362
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "无法创建链接 '%s'"
+
+#: builtin/clone.c:366
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "无法拷贝文件至 '%s'"
+
+#: builtin/clone.c:389 builtin/clone.c:563
+#, c-format
+msgid "done.\n"
+msgstr "完成。\n"
+
+#: builtin/clone.c:401
+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"
+
+#: builtin/clone.c:478
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "不能发现要克隆的远程分支 %s。"
+
+#: builtin/clone.c:558
+#, c-format
+msgid "Checking connectivity... "
+msgstr "检查连接... "
+
+#: builtin/clone.c:561
+msgid "remote did not send all necessary objects"
+msgstr "远程没有发送所有必须的对象"
+
+#: builtin/clone.c:625
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
+
+#: builtin/clone.c:656
+msgid "unable to checkout working tree"
+msgstr "不能检出工作区"
+
+#: builtin/clone.c:765
+msgid "Too many arguments."
+msgstr "太多参数。"
+
+#: builtin/clone.c:769
+msgid "You must specify a repository to clone."
+msgstr "您必须指定一个版本库来克隆。"
+
+#: builtin/clone.c:780
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare 和 --origin %s 选项不兼容。"
+
+#: builtin/clone.c:783
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare 和 --separate-git-dir 选项不兼容。"
+
+#: builtin/clone.c:796
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "版本库 '%s' 不存在"
+
+#: builtin/clone.c:802 builtin/fetch.c:1155
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "深度 %s 不是一个正数"
+
+#: builtin/clone.c:812
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
+
+#: builtin/clone.c:822
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "工作区 '%s' 已经存在。"
+
+#: builtin/clone.c:835 builtin/clone.c:847
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "不能为 '%s' 创建先导目录"
+
+#: builtin/clone.c:838
+#, c-format
+msgid "could not create work tree dir '%s'."
+msgstr "不能为 '%s' 创建工作区目录。"
+
+#: builtin/clone.c:857
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "克隆到纯版本库 '%s'...\n"
+
+#: builtin/clone.c:859
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "正克隆到 '%s'...\n"
+
+#: builtin/clone.c:895
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
+
+#: builtin/clone.c:898
+msgid "source repository is shallow, ignoring --local"
+msgstr "源版本库是浅克隆，忽略 --local"
+
+#: builtin/clone.c:903
+msgid "--local is ignored"
+msgstr "--local 被忽略"
+
+#: builtin/clone.c:907
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr "不知道如何克隆 %s"
+
+#: builtin/clone.c:958 builtin/clone.c:966
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "远程分支 %s 在上游 %s 未发现"
+
+#: builtin/clone.c:969
+msgid "You appear to have cloned an empty repository."
+msgstr "您似乎克隆了一个空版本库。"
+
+#: builtin/column.c:9
+msgid "git column [options]"
+msgstr "git column [选项]"
+
+#: builtin/column.c:26
+msgid "lookup config vars"
+msgstr "查找配置变量"
+
+#: builtin/column.c:27 builtin/column.c:28
+msgid "layout to use"
+msgstr "要使用的布局"
+
+#: builtin/column.c:29
+msgid "Maximum width"
+msgstr "最大宽度"
+
+#: builtin/column.c:30
+msgid "Padding space on left border"
+msgstr "左边框的填充空间"
+
+#: builtin/column.c:31
+msgid "Padding space on right border"
+msgstr "右边框的填充空间"
+
+#: builtin/column.c:32
+msgid "Padding space between columns"
+msgstr "两列之间的填充空间"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command 必须是第一个参数"
+
+#: builtin/commit.c:37
+msgid "git commit [options] [--] <pathspec>..."
+msgstr "git commit [选项] [--] <路径规则>..."
+
+#: builtin/commit.c:42
+msgid "git status [options] [--] <pathspec>..."
+msgstr "git status [选项] [--] <路径规则>..."
+
+#: 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/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/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/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/commit.c:84
+msgid "Otherwise, please use 'git reset'\n"
+msgstr "否则，请使用命令 'git reset'\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/commit.c:302
+msgid "failed to unpack HEAD tree object"
+msgstr "无法解包 HEAD 树对象"
+
+#: builtin/commit.c:342
+msgid "unable to create temporary index"
+msgstr "不能创建临时索引"
+
+#: builtin/commit.c:348
+msgid "interactive add failed"
+msgstr "交互式添加失败"
+
+#: builtin/commit.c:359
+msgid "unable to write index file"
+msgstr "无法写入索引文件"
+
+#: builtin/commit.c:361
+msgid "unable to update temporary index"
+msgstr "无法更新临时索引"
+
+#: builtin/commit.c:363
+msgid "Failed to update main cache tree"
+msgstr "不能更新树的主缓存"
+
+#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
+msgid "unable to write new_index file"
+msgstr "无法写 new_index 文件"
+
+#: builtin/commit.c:443
+msgid "cannot do a partial commit during a merge."
+msgstr "在合并过程中不能做部分提交。"
+
+#: builtin/commit.c:445
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "在拣选过程中不能做部分提交。"
+
+#: builtin/commit.c:454
+msgid "cannot read the index"
+msgstr "无法读取索引"
+
+#: builtin/commit.c:473
+msgid "unable to write temporary index file"
+msgstr "无法写临时索引文件"
+
+#: builtin/commit.c:592
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "提交 '%s' 缺少作者信息"
+
+#: builtin/commit.c:594
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "提交 '%s' 有非法的作者信息"
+
+#: builtin/commit.c:613
+msgid "malformed --author parameter"
+msgstr "非法的 --author 参数"
+
+#: builtin/commit.c:621
+#, c-format
+msgid "invalid date format: %s"
+msgstr "无效的日期格式：%s"
+
+#: builtin/commit.c:642
+#, c-format
+msgid "Malformed ident string: '%s'"
+msgstr "非法的身份字符串：'%s'"
+
+#: builtin/commit.c:675
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr "无法选择一个未被当前提交说明使用的注释字符"
+
+#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "不能查询提交 %s"
+
+#: builtin/commit.c:724 builtin/shortlog.c:273
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "（正从标准输入中读取日志信息）\n"
+
+#: builtin/commit.c:726
+msgid "could not read log from standard input"
+msgstr "不能从标准输入中读取日志信息"
+
+#: builtin/commit.c:730
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "不能读取日志文件 '%s'"
+
+#: builtin/commit.c:752
+msgid "could not read MERGE_MSG"
+msgstr "不能读取 MERGE_MSG"
+
+#: builtin/commit.c:756
+msgid "could not read SQUASH_MSG"
+msgstr "不能读取 SQUASH_MSG"
+
+#: builtin/commit.c:760
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能读取 '%s'"
+
+#: builtin/commit.c:831
+msgid "could not write commit template"
+msgstr "不能写提交模版"
+
+#: builtin/commit.c:849
+#, c-format
+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/commit.c:854
+#, 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/commit.c:867
+#, 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/commit.c:874
+#, 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/commit.c:888
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%s作者： %.*s <%.*s>"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: builtin/commit.c:896
+#, c-format
+msgid "%sDate: %s"
+msgstr "%s日期： %s"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: builtin/commit.c:903
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%s提交者：%.*s <%.*s>"
+
+#: builtin/commit.c:921
+msgid "Cannot read index"
+msgstr "无法读取索引"
+
+#: builtin/commit.c:978
+msgid "Error building trees"
+msgstr "无法创建树对象"
+
+#: builtin/commit.c:993 builtin/tag.c:495
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
+
+#: builtin/commit.c:1095
+#, c-format
+msgid "No existing author found with '%s'"
+msgstr "没有找到匹配 '%s' 的作者"
+
+#: builtin/commit.c:1110 builtin/commit.c:1350
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "无效的未追踪文件参数 '%s'"
+
+#: builtin/commit.c:1147
+msgid "--long and -z are incompatible"
+msgstr "--long 和 -z 选项不兼容"
+
+#: builtin/commit.c:1177
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "同时使用 --reset-author 和 --author 没有意义"
+
+#: builtin/commit.c:1186
+msgid "You have nothing to amend."
+msgstr "您没有可修补的提交。"
+
+#: builtin/commit.c:1189
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "您正处于一个合并过程中 -- 无法修补提交。"
+
+#: builtin/commit.c:1191
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
+
+#: builtin/commit.c:1194
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "选项 --squash 和 --fixup 不能同时使用"
+
+#: builtin/commit.c:1204
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
+
+#: builtin/commit.c:1206
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
+
+#: builtin/commit.c:1214
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
+
+#: builtin/commit.c:1231
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
+
+#: builtin/commit.c:1233
+msgid "No paths with --include/--only does not make sense."
+msgstr "参数 --include/--only 不跟路径没有意义。"
+
+#: builtin/commit.c:1235
+msgid "Clever... amending the last one with dirty index."
+msgstr "聪明... 在索引不干净下修补最后的提交。"
+
+#: builtin/commit.c:1237
+msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
+
+#: builtin/commit.c:1249 builtin/tag.c:728
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "无效的清理模式 %s"
+
+#: builtin/commit.c:1254
+msgid "Paths with -a does not make sense."
+msgstr "路径和 -a 选项同时使用没有意义。"
+
+#: builtin/commit.c:1364 builtin/commit.c:1644
+msgid "show status concisely"
+msgstr "以简洁的格式显示状态"
+
+#: builtin/commit.c:1366 builtin/commit.c:1646
+msgid "show branch information"
+msgstr "显示分支信息"
+
+#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500
+msgid "machine-readable output"
+msgstr "机器可读的输出"
+
+#: builtin/commit.c:1371 builtin/commit.c:1650
+msgid "show status in long format (default)"
+msgstr "以长格式显示状态（默认）"
+
+#: builtin/commit.c:1374 builtin/commit.c:1653
+msgid "terminate entries with NUL"
+msgstr "条目以NUL字符结尾"
+
+#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980
+#: builtin/fast-export.c:983 builtin/tag.c:603
+msgid "mode"
+msgstr "模式"
+
+#: builtin/commit.c:1377 builtin/commit.c:1656
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
+
+#: builtin/commit.c:1380
+msgid "show ignored files"
+msgstr "显示忽略的文件"
+
+#: builtin/commit.c:1381 parse-options.h:153
+msgid "when"
+msgstr "何时"
+
+#: builtin/commit.c:1382
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
+
+#: builtin/commit.c:1384
+msgid "list untracked files in columns"
+msgstr "以列的方式显示未跟踪的文件"
+
+#: builtin/commit.c:1471
+msgid "couldn't look up newly created commit"
+msgstr "无法找到新创建的提交"
+
+#: builtin/commit.c:1473
+msgid "could not parse newly created commit"
+msgstr "不能解析新创建的提交"
+
+#: builtin/commit.c:1518
+msgid "detached HEAD"
+msgstr "分离头指针"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/commit.c:1521
+msgid " (root-commit)"
+msgstr "（根提交）"
+
+#: builtin/commit.c:1614
+msgid "suppress summary after successful commit"
+msgstr "提交成功后不显示概述信息"
+
+#: builtin/commit.c:1615
+msgid "show diff in commit message template"
+msgstr "在提交说明模板里显示差异"
+
+#: builtin/commit.c:1617
+msgid "Commit message options"
+msgstr "提交说明选项"
+
+#: builtin/commit.c:1618 builtin/tag.c:601
+msgid "read message from file"
+msgstr "从文件中读取提交说明"
+
+#: builtin/commit.c:1619
+msgid "author"
+msgstr "作者"
+
+#: builtin/commit.c:1619
+msgid "override author for commit"
+msgstr "提交时覆盖作者"
+
+#: builtin/commit.c:1620 builtin/gc.c:275
+msgid "date"
+msgstr "日期"
+
+#: builtin/commit.c:1620
+msgid "override date for commit"
+msgstr "提交时覆盖日期"
+
+#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/tag.c:599
+msgid "message"
+msgstr "说明"
+
+#: builtin/commit.c:1621
+msgid "commit message"
+msgstr "提交说明"
+
+#: builtin/commit.c:1622
+msgid "reuse and edit message from specified commit"
+msgstr "重用并编辑指定提交的提交说明"
+
+#: builtin/commit.c:1623
+msgid "reuse message from specified commit"
+msgstr "重用指定提交的提交说明"
+
+#: builtin/commit.c:1624
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
+
+#: builtin/commit.c:1625
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
+
+#: builtin/commit.c:1626
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
+
+#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86
+msgid "add Signed-off-by:"
+msgstr "添加 Signed-off-by: 签名"
+
+#: builtin/commit.c:1628
+msgid "use specified template file"
+msgstr "使用指定的模板文件"
+
+#: builtin/commit.c:1629
+msgid "force edit of commit"
+msgstr "强制编辑提交"
+
+# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
+#: builtin/commit.c:1630
+msgid "default"
+msgstr "default"
+
+#: builtin/commit.c:1630 builtin/tag.c:604
+msgid "how to strip spaces and #comments from message"
+msgstr "设置如何删除提交说明里的空格和#注释"
+
+#: builtin/commit.c:1631
+msgid "include status in commit message template"
+msgstr "在提交说明模板里包含状态信息"
+
+#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92
+#: builtin/tag.c:605
+msgid "key-id"
+msgstr "key-id"
+
+#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93
+msgid "GPG sign commit"
+msgstr "GPG 提交签名"
+
+#: builtin/commit.c:1636
+msgid "Commit contents options"
+msgstr "提交内容选项"
+
+#: builtin/commit.c:1637
+msgid "commit all changed files"
+msgstr "提交所有改动的文件"
+
+#: builtin/commit.c:1638
+msgid "add specified files to index for commit"
+msgstr "添加指定的文件到索引区等待提交"
+
+#: builtin/commit.c:1639
+msgid "interactively add files"
+msgstr "交互式添加文件"
+
+#: builtin/commit.c:1640
+msgid "interactively add changes"
+msgstr "交互式添加变更"
+
+#: builtin/commit.c:1641
+msgid "commit only specified files"
+msgstr "只提交指定的文件"
+
+#: builtin/commit.c:1642
+msgid "bypass pre-commit hook"
+msgstr "绕过 pre-commit 钩子"
+
+#: builtin/commit.c:1643
+msgid "show what would be committed"
+msgstr "显示将要提交的内容"
+
+#: builtin/commit.c:1654
+msgid "amend previous commit"
+msgstr "修改先前的提交"
+
+#: builtin/commit.c:1655
+msgid "bypass post-rewrite hook"
+msgstr "绕过 post-rewrite 钩子"
+
+#: builtin/commit.c:1660
+msgid "ok to record an empty change"
+msgstr "允许一个空提交"
+
+#: builtin/commit.c:1662
+msgid "ok to record a change with an empty message"
+msgstr "允许空的提交说明"
+
+#: builtin/commit.c:1691
+msgid "could not parse HEAD commit"
+msgstr "不能解析 HEAD 提交"
+
+#: builtin/commit.c:1730 builtin/merge.c:518
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "不能为读入打开 '%s'"
+
+#: builtin/commit.c:1737
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "损坏的 MERGE_HEAD 文件（%s）"
+
+#: builtin/commit.c:1744
+msgid "could not read MERGE_MODE"
+msgstr "不能读取 MERGE_MODE"
+
+#: builtin/commit.c:1763
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "不能读取提交说明：%s"
+
+#: builtin/commit.c:1774
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "终止提交；您未更改来自模版的提交说明。\n"
+
+#: builtin/commit.c:1779
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "终止提交因为提交说明为空。\n"
+
+#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875
+msgid "failed to write commit object"
+msgstr "无法写提交对象"
+
+#: builtin/commit.c:1827
+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 [选项]"
+
+#: builtin/config.c:53
+msgid "Config file location"
+msgstr "配置文件位置"
+
+#: builtin/config.c:54
+msgid "use global config file"
+msgstr "使用全局配置文件"
+
+#: builtin/config.c:55
+msgid "use system config file"
+msgstr "使用系统级配置文件"
+
+#: builtin/config.c:56
+msgid "use repository config file"
+msgstr "使用版本库级配置文件"
+
+#: builtin/config.c:57
+msgid "use given config file"
+msgstr "使用指定的配置文件"
+
+#: builtin/config.c:58
+msgid "blob-id"
+msgstr "数据对象ID"
+
+#: builtin/config.c:58
+msgid "read config from given blob object"
+msgstr "从给定的数据对象读取配置"
+
+#: builtin/config.c:59
+msgid "Action"
+msgstr "操作"
+
+#: builtin/config.c:60
+msgid "get value: name [value-regex]"
+msgstr "获取值：name [value-regex]"
+
+#: builtin/config.c:61
+msgid "get all values: key [value-regex]"
+msgstr "获得所有的值：key [value-regex]"
+
+#: builtin/config.c:62
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr "根据正则表达式获得值：name-regex [value-regex]"
+
+#: builtin/config.c:63
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "获得 URL 取值：section[.var] URL"
+
+#: builtin/config.c:64
+msgid "replace all matching variables: name value [value_regex]"
+msgstr "替换所有匹配的变量：name value [value_regex]"
+
+#: builtin/config.c:65
+msgid "add a new variable: name value"
+msgstr "添加一个新的变量：name value"
+
+#: builtin/config.c:66
+msgid "remove a variable: name [value-regex]"
+msgstr "删除一个变量：name [value-regex]"
+
+#: builtin/config.c:67
+msgid "remove all matches: name [value-regex]"
+msgstr "删除所有匹配项：name [value-regex]"
+
+#: builtin/config.c:68
+msgid "rename section: old-name new-name"
+msgstr "重命名小节：old-name new-name"
+
+#: builtin/config.c:69
+msgid "remove a section: name"
+msgstr "删除一个小节：name"
+
+#: builtin/config.c:70
+msgid "list all"
+msgstr "列出所有"
+
+#: builtin/config.c:71
+msgid "open an editor"
+msgstr "打开一个编辑器"
+
+#: builtin/config.c:72 builtin/config.c:73
+msgid "slot"
+msgstr "slot"
+
+#: builtin/config.c:72
+msgid "find the color configured: [default]"
+msgstr "找到配置的颜色：[默认]"
+
+#: builtin/config.c:73
+msgid "find the color setting: [stdout-is-tty]"
+msgstr "找到颜色设置：[stdout-is-tty]"
+
+#: builtin/config.c:74
+msgid "Type"
+msgstr "类型"
+
+#: builtin/config.c:75
+msgid "value is \"true\" or \"false\""
+msgstr "值是 \"true\" 或 \"false\""
+
+#: builtin/config.c:76
+msgid "value is decimal number"
+msgstr "值是十进制数"
+
+#: builtin/config.c:77
+msgid "value is --bool or --int"
+msgstr "值是 --bool or --int"
+
+#: builtin/config.c:78
+msgid "value is a path (file or directory name)"
+msgstr "值是一个路径（文件或目录名）"
+
+#: builtin/config.c:79
+msgid "Other"
+msgstr "其它"
+
+#: builtin/config.c:80
+msgid "terminate values with NUL byte"
+msgstr "终止值是NUL字节"
+
+#: builtin/config.c:81
+msgid "respect include directives on lookup"
+msgstr "查询时参照 include 指令递归查找"
+
+#: builtin/config.c:315
+msgid "unable to parse default color value"
+msgstr "不能解析缺省的颜色值"
+
+#: builtin/config.c:455
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[core]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# This is Git's per-user configuration file.\n"
+"[core]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:590
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "不能创建配置文件 %s"
+
+#: builtin/count-objects.c:55
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:65
+msgid "print sizes in human readable format"
+msgstr "以用户可读的格式显示大小"
+
+#: builtin/describe.c:17
+msgid "git describe [options] <commit-ish>*"
+msgstr "git describe [选项] <提交号>*"
+
+#: builtin/describe.c:18
+msgid "git describe [options] --dirty"
+msgstr "git describe [选项] --dirty"
+
+#: builtin/describe.c:217
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "注释 tag %s 无效"
+
+#: builtin/describe.c:221
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "注释 tag %s 没有嵌入名称"
+
+#: builtin/describe.c:223
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "tag '%s' 的确是在 '%s'"
+
+#: builtin/describe.c:250 builtin/log.c:452
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "不是一个有效的对象名 %s"
+
+#: builtin/describe.c:253
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是一个有效的 '%s' 对象"
+
+#: builtin/describe.c:270
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "没有 tag 准确匹配 '%s'"
+
+#: builtin/describe.c:272
+#, c-format
+msgid "searching to describe %s\n"
+msgstr "搜索描述 %s\n"
+
+#: builtin/describe.c:319
+#, c-format
+msgid "finished search at %s\n"
+msgstr "完成搜索 %s\n"
+
+#: 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/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/describe.c:371
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "已遍历 %lu 个提交\n"
+
+#: 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/describe.c:396
+msgid "find the tag that comes after the commit"
+msgstr "寻找提交之后的 tag（用于描述提交）"
+
+#: builtin/describe.c:397
+msgid "debug search strategy on stderr"
+msgstr "在标准错误上调试搜索策略"
+
+#: builtin/describe.c:398
+msgid "use any ref"
+msgstr "使用任意引用"
+
+#: builtin/describe.c:399
+msgid "use any tag, even unannotated"
+msgstr "使用任意 tag，即使未带注解"
+
+#: builtin/describe.c:400
+msgid "always use long format"
+msgstr "始终使用长提交号格式"
+
+#: builtin/describe.c:401
+msgid "only follow first parent"
+msgstr "只跟随第一个父提交"
+
+#: builtin/describe.c:404
+msgid "only output exact matches"
+msgstr "只输出精确匹配"
+
+#: builtin/describe.c:406
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "考虑最近 <n> 个 tags（默认：10）"
+
+#: builtin/describe.c:408
+msgid "only consider tags matching <pattern>"
+msgstr "只考虑匹配 <模式> 的 tags"
+
+#: builtin/describe.c:410 builtin/name-rev.c:318
+msgid "show abbreviated commit object as fallback"
+msgstr "显示简写的提交号作为后备"
+
+#: builtin/describe.c:411
+msgid "mark"
+msgstr "标记"
+
+#: builtin/describe.c:412
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"
+
+#: builtin/describe.c:430
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long 与 --abbrev=0 不兼容"
+
+#: builtin/describe.c:456
+msgid "No names found, cannot describe anything."
+msgstr "没有发现名称，无法描述任何东西。"
+
+#: builtin/describe.c:476
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty 不能与提交同时使用"
+
+#: builtin/diff.c:86
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s'：不是一个正规文件或符号链接"
+
+#: builtin/diff.c:237
+#, c-format
+msgid "invalid option: %s"
+msgstr "无效选项：%s"
+
+#: builtin/diff.c:358
+msgid "Not a git repository"
+msgstr "不是一个 git 版本库"
+
+#: builtin/diff.c:401
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "提供了无效对象 '%s'。"
+
+#: builtin/diff.c:410
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "提供了超过两个数据（blob）对象：'%s'"
+
+#: builtin/diff.c:417
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "无法处理的对象 '%s'。"
+
+#: builtin/fast-export.c:24
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-opts]"
+
+#: builtin/fast-export.c:979
+msgid "show progress after <n> objects"
+msgstr "在 <n> 个对象之后显示进度"
+
+#: builtin/fast-export.c:981
+msgid "select handling of signed tags"
+msgstr "选择如何处理签名 tags"
+
+#: builtin/fast-export.c:984
+msgid "select handling of tags that tag filtered objects"
+msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
+
+#: builtin/fast-export.c:987
+msgid "Dump marks to this file"
+msgstr "把标记存储到这个文件"
+
+#: builtin/fast-export.c:989
+msgid "Import marks from this file"
+msgstr "从这个文件导入标记"
+
+#: builtin/fast-export.c:991
+msgid "Fake a tagger when tags lack one"
+msgstr "当 tags 缺少标记者字段时，假装提供一个"
+
+#: builtin/fast-export.c:993
+msgid "Output full tree for each commit"
+msgstr "每次提交都输出整个树"
+
+#: builtin/fast-export.c:995
+msgid "Use the done feature to terminate the stream"
+msgstr "使用 done 功能来终止流"
+
+#: builtin/fast-export.c:996
+msgid "Skip output of blob data"
+msgstr "跳过数据对象的输出"
+
+#: builtin/fast-export.c:997
+msgid "refspec"
+msgstr "引用表达式"
+
+#: builtin/fast-export.c:998
+msgid "Apply refspec to exported refs"
+msgstr "对导出的引用应用引用表达式"
+
+#: builtin/fast-export.c:999
+msgid "anonymize output"
+msgstr "匿名输出"
+
+#: builtin/fetch.c:20
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
+
+#: builtin/fetch.c:21
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<选项>] <组>"
+
+#: builtin/fetch.c:22
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
+
+#: builtin/fetch.c:23
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<选项>]"
+
+#: builtin/fetch.c:90
+msgid "fetch from all remotes"
+msgstr "从所有的远程抓取"
+
+#: builtin/fetch.c:92
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
+
+#: builtin/fetch.c:94
+msgid "path to upload pack on remote end"
+msgstr "上传包到远程的路径"
+
+#: builtin/fetch.c:95
+msgid "force overwrite of local branch"
+msgstr "强制覆盖本地分支"
+
+#: builtin/fetch.c:97
+msgid "fetch from multiple remotes"
+msgstr "从多个远程抓取"
+
+#: builtin/fetch.c:99
+msgid "fetch all tags and associated objects"
+msgstr "抓取所有的 tags 和关联对象"
+
+#: builtin/fetch.c:101
+msgid "do not fetch all tags (--no-tags)"
+msgstr "不抓取任何 tags (--no-tags)"
+
+#: builtin/fetch.c:103
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "清除远程已经不存在的分支的跟踪分支"
+
+# 译者：可选值，不能翻译
+#: builtin/fetch.c:104
+msgid "on-demand"
+msgstr "on-demand"
+
+#: builtin/fetch.c:105
+msgid "control recursive fetching of submodules"
+msgstr "控制子模组的递归抓取"
+
+#: builtin/fetch.c:109
+msgid "keep downloaded pack"
+msgstr "保持下载包"
+
+#: builtin/fetch.c:111
+msgid "allow updating of HEAD ref"
+msgstr "允许更新 HEAD 引用"
+
+#: builtin/fetch.c:114
+msgid "deepen history of shallow clone"
+msgstr "深化浅克隆的历史"
+
+#: builtin/fetch.c:116
+msgid "convert to a complete repository"
+msgstr "转换为一个完整的版本库"
+
+#: builtin/fetch.c:118 builtin/log.c:1208
+msgid "dir"
+msgstr "目录"
+
+#: builtin/fetch.c:119
+msgid "prepend this to submodule path output"
+msgstr "在子模组路径输出的前面加上此目录"
+
+#: builtin/fetch.c:122
+msgid "default mode for recursion"
+msgstr "递归的默认模式"
+
+#: builtin/fetch.c:124
+msgid "accept refs that update .git/shallow"
+msgstr "接受更新 .git/shallow 的引用"
+
+#: builtin/fetch.c:125
+msgid "refmap"
+msgstr "引用映射"
+
+#: builtin/fetch.c:126
+msgid "specify fetch refmap"
+msgstr "指定获取操作的引用映射"
+
+#: builtin/fetch.c:376
+msgid "Couldn't find remote ref HEAD"
+msgstr "无法发现远程 HEAD 引用"
+
+#: builtin/fetch.c:454
+#, c-format
+msgid "object %s not found"
+msgstr "对象 %s 未发现"
+
+#: builtin/fetch.c:459
+msgid "[up to date]"
+msgstr "[最新]"
+
+#: builtin/fetch.c:473
+#, c-format
+msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"
+
+#: builtin/fetch.c:474 builtin/fetch.c:560
+msgid "[rejected]"
+msgstr "[已拒绝]"
+
+#: builtin/fetch.c:485
+msgid "[tag update]"
+msgstr "[tag更新]"
+
+# 译者：注意保持前导空格
+#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
+msgid " (unable to update local ref)"
+msgstr " （不能更新本地引用）"
+
+#: builtin/fetch.c:505
+msgid "[new tag]"
+msgstr "[新tag]"
+
+#: builtin/fetch.c:508
+msgid "[new branch]"
+msgstr "[新分支]"
+
+#: builtin/fetch.c:511
+msgid "[new ref]"
+msgstr "[新引用]"
+
+#: builtin/fetch.c:556
+msgid "unable to update local ref"
+msgstr "不能更新本地引用"
+
+#: builtin/fetch.c:556
+msgid "forced update"
+msgstr "强制更新"
+
+#: builtin/fetch.c:562
+msgid "(non-fast-forward)"
+msgstr "（非快进式）"
+
+#: builtin/fetch.c:595 builtin/fetch.c:828
+#, c-format
+msgid "cannot open %s: %s\n"
+msgstr "无法打开 %s：%s\n"
+
+#: builtin/fetch.c:604
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s 未发送所有必须的对象\n"
+
+#: builtin/fetch.c:622
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "拒绝 %s 因为浅克隆不允许被更新"
+
+#: builtin/fetch.c:710 builtin/fetch.c:793
+#, c-format
+msgid "From %.*s\n"
+msgstr "来自 %.*s\n"
+
+#: builtin/fetch.c:721
+#, 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/fetch.c:773
+#, c-format
+msgid " (%s will become dangling)"
+msgstr " （%s 将成为摇摆状态）"
+
+# 译者：注意保持前导空格
+#: builtin/fetch.c:774
+#, c-format
+msgid " (%s has become dangling)"
+msgstr " （%s 已成为摇摆状态）"
+
+#: builtin/fetch.c:798
+msgid "[deleted]"
+msgstr "[已删除]"
+
+#: builtin/fetch.c:799 builtin/remote.c:1063
+msgid "(none)"
+msgstr "（无）"
+
+#: builtin/fetch.c:818
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "拒绝获取到非纯版本库的当前分支 %s"
+
+#: builtin/fetch.c:837
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
+
+#: builtin/fetch.c:840
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "选项 \"%s\" 为 %s 所忽略\n"
+
+#: builtin/fetch.c:896
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "不知道如何从 %s 获取"
+
+#: builtin/fetch.c:1058
+#, c-format
+msgid "Fetching %s\n"
+msgstr "正在获取 %s\n"
+
+#: builtin/fetch.c:1060 builtin/remote.c:90
+#, c-format
+msgid "Could not fetch %s"
+msgstr "不能获取 %s"
+
+#: builtin/fetch.c:1078
+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/fetch.c:1101
+msgid "You need to specify a tag name."
+msgstr "您需要指定一个 tag 名称。"
+
+#: builtin/fetch.c:1143
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth 和 --unshallow 不能同时使用"
+
+#: builtin/fetch.c:1145
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"
+
+#: builtin/fetch.c:1168
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all 不能带一个版本库参数"
+
+#: builtin/fetch.c:1170
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all 带引用规则没有任何意义"
+
+#: builtin/fetch.c:1181
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "没有这样的远程或远程组：%s"
+
+#: builtin/fetch.c:1189
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "获取组并指定引用规则没有意义"
+
+#: 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 <message>] [--log[=<n>]|--no-log] [--file <file>]"
+
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
+#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183
+#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590
+#: parse-options.h:132 parse-options.h:239
+msgid "n"
+msgstr "n"
+
+#: builtin/fmt-merge-msg.c:664
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
+
+#: builtin/fmt-merge-msg.c:667
+msgid "alias for --log (deprecated)"
+msgstr "参数 --log 的别名（已弃用）"
+
+#: builtin/fmt-merge-msg.c:670
+msgid "text"
+msgstr "文本"
+
+#: builtin/fmt-merge-msg.c:671
+msgid "use <text> as start of message"
+msgstr "使用 <文本> 作为提交说明的开始"
+
+#: builtin/fmt-merge-msg.c:672
+msgid "file to read from"
+msgstr "从文件中读取"
+
+#: builtin/for-each-ref.c:676
+msgid "unable to parse format"
+msgstr "不能解析格式"
+
+#: builtin/for-each-ref.c:1057
+msgid "git for-each-ref [options] [<pattern>]"
+msgstr "git for-each-ref [选项] [<模式>]"
+
+#: builtin/for-each-ref.c:1072
+msgid "quote placeholders suitably for shells"
+msgstr "引用占位符适用于 shells"
+
+#: builtin/for-each-ref.c:1074
+msgid "quote placeholders suitably for perl"
+msgstr "引用占位符适用于 perl"
+
+#: builtin/for-each-ref.c:1076
+msgid "quote placeholders suitably for python"
+msgstr "引用占位符适用于 python"
+
+#: builtin/for-each-ref.c:1078
+msgid "quote placeholders suitably for tcl"
+msgstr "引用占位符适用于 tcl"
+
+#: builtin/for-each-ref.c:1081
+msgid "show only <n> matched refs"
+msgstr "只显示 <n> 个匹配的引用"
+
+#: builtin/for-each-ref.c:1082 builtin/replace.c:438
+msgid "format"
+msgstr "格式"
+
+#: builtin/for-each-ref.c:1082
+msgid "format to use for the output"
+msgstr "输出格式"
+
+#: builtin/for-each-ref.c:1083
+msgid "key"
+msgstr "key"
+
+#: builtin/for-each-ref.c:1084
+msgid "field name to sort on"
+msgstr "排序的字段名"
+
+#: builtin/fsck.c:147 builtin/prune.c:136
+msgid "Checking connectivity"
+msgstr "检查连接中"
+
+#: builtin/fsck.c:540
+msgid "Checking object directories"
+msgstr "检查对象目录中"
+
+#: builtin/fsck.c:603
+msgid "git fsck [options] [<object>...]"
+msgstr "git fsck [选项] [<对象>...]"
+
+#: builtin/fsck.c:609
+msgid "show unreachable objects"
+msgstr "显示不可达的对象"
+
+#: builtin/fsck.c:610
+msgid "show dangling objects"
+msgstr "显示摇摆的对象"
+
+#: builtin/fsck.c:611
+msgid "report tags"
+msgstr "报告 tags"
+
+#: builtin/fsck.c:612
+msgid "report root nodes"
+msgstr "报告根节点"
+
+#: builtin/fsck.c:613
+msgid "make index objects head nodes"
+msgstr "将索引亦作为检查的头节点"
+
+#: builtin/fsck.c:614
+msgid "make reflogs head nodes (default)"
+msgstr "将引用日志作为检查的头节点（默认）"
+
+#: builtin/fsck.c:615
+msgid "also consider packs and alternate objects"
+msgstr "也考虑包和备用对象"
+
+#: builtin/fsck.c:616
+msgid "enable more strict checking"
+msgstr "启用更严格的检查"
+
+#: builtin/fsck.c:618
+msgid "write dangling objects in .git/lost-found"
+msgstr "将摇摆对象写入 .git/lost-found 中"
+
+#: builtin/fsck.c:619 builtin/prune.c:108
+msgid "show progress"
+msgstr "显示进度"
+
+#: builtin/fsck.c:669
+msgid "Checking objects"
+msgstr "检查对象中"
+
+#: builtin/gc.c:24
+msgid "git gc [options]"
+msgstr "git gc [选项]"
+
+#: builtin/gc.c:79
+#, c-format
+msgid "Invalid gc.pruneexpire: '%s'"
+msgstr "无效的 gc.pruneexpire：'%s'"
+
+#: builtin/gc.c:107
+#, c-format
+msgid "insanely long object directory %.*s"
+msgstr "不正常的长对象目录 %.*s"
+
+#: builtin/gc.c:276
+msgid "prune unreferenced objects"
+msgstr "清除未引用的对象"
+
+#: builtin/gc.c:278
+msgid "be more thorough (increased runtime)"
+msgstr "更彻底（增加运行时间）"
+
+#: builtin/gc.c:279
+msgid "enable auto-gc mode"
+msgstr "启用自动垃圾回收模式"
+
+#: builtin/gc.c:280
+msgid "force running gc even if there may be another gc running"
+msgstr "强制执行 gc 即使另外一个 gc 正在执行"
+
+#: builtin/gc.c:321
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "自动在后台执行版本库打包以求最佳性能。\n"
+
+#: builtin/gc.c:323
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "自动打包版本库以求最佳性能。\n"
+
+#: builtin/gc.c:324
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "手工维护参见 \"git help gc\"。\n"
+
+#: builtin/gc.c:342
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"
+
+#: builtin/gc.c:364
+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] <模式> [<修订>...] [[--] <路径>...]"
+
+#: builtin/grep.c:218
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep：无法创建线程：%s"
+
+#: builtin/grep.c:441 builtin/grep.c:476
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "无法读取树（%s）"
+
+#: builtin/grep.c:491
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "无法抓取来自于 %s 类型的对象"
+
+#: builtin/grep.c:547
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "开关 `%c' 期望一个数字值"
+
+#: builtin/grep.c:564
+#, c-format
+msgid "cannot open '%s'"
+msgstr "不能打开 '%s'"
+
+#: builtin/grep.c:638
+msgid "search in index instead of in the work tree"
+msgstr "在索引区搜索而不是在工作区"
+
+#: builtin/grep.c:640
+msgid "find in contents not managed by git"
+msgstr "在未被 git 管理的内容中查找"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/grep.c:642
+msgid "search in both tracked and untracked files"
+msgstr "在跟踪和未跟踪的文件中搜索"
+
+#: builtin/grep.c:644
+msgid "search also in ignored files"
+msgstr "也在忽略的文件中搜索"
+
+#: builtin/grep.c:647
+msgid "show non-matching lines"
+msgstr "显示未匹配的行"
+
+#: builtin/grep.c:649
+msgid "case insensitive matching"
+msgstr "不区分大小写匹配"
+
+#: builtin/grep.c:651
+msgid "match patterns only at word boundaries"
+msgstr "只在单词边界匹配模式"
+
+#: builtin/grep.c:653
+msgid "process binary files as text"
+msgstr "把二进制文件当做文本处理"
+
+#: builtin/grep.c:655
+msgid "don't match patterns in binary files"
+msgstr "不在二进制文件中匹配模式"
+
+#: builtin/grep.c:658
+msgid "process binary files with textconv filters"
+msgstr "用 textconv 过滤器处理二进制文件"
+
+#: builtin/grep.c:660
+msgid "descend at most <depth> levels"
+msgstr "最多以指定的深度向下寻找"
+
+#: builtin/grep.c:664
+msgid "use extended POSIX regular expressions"
+msgstr "使用扩展的 POSIX 正则表达式"
+
+#: builtin/grep.c:667
+msgid "use basic POSIX regular expressions (default)"
+msgstr "使用基本的 POSIX 正则表达式（默认）"
+
+#: builtin/grep.c:670
+msgid "interpret patterns as fixed strings"
+msgstr "把模式解析为固定的字符串"
+
+#: builtin/grep.c:673
+msgid "use Perl-compatible regular expressions"
+msgstr "使用 Perl 兼容的正则表达式"
+
+#: builtin/grep.c:676
+msgid "show line numbers"
+msgstr "显示行号"
+
+#: builtin/grep.c:677
+msgid "don't show filenames"
+msgstr "不显示文件名"
+
+#: builtin/grep.c:678
+msgid "show filenames"
+msgstr "显示文件名"
+
+#: builtin/grep.c:680
+msgid "show filenames relative to top directory"
+msgstr "显示相对于顶级目录的文件名"
+
+#: builtin/grep.c:682
+msgid "show only filenames instead of matching lines"
+msgstr "只显示文件名而不显示匹配的行"
+
+#: builtin/grep.c:684
+msgid "synonym for --files-with-matches"
+msgstr "和 --files-with-matches 同义"
+
+#: builtin/grep.c:687
+msgid "show only the names of files without match"
+msgstr "只显示未匹配的文件名"
+
+#: builtin/grep.c:689
+msgid "print NUL after filenames"
+msgstr "在文件名后输出 NUL 字符"
+
+#: builtin/grep.c:691
+msgid "show the number of matches instead of matching lines"
+msgstr "显示总匹配行数，而不显示匹配的行"
+
+#: builtin/grep.c:692
+msgid "highlight matches"
+msgstr "高亮显示匹配项"
+
+#: builtin/grep.c:694
+msgid "print empty line between matches from different files"
+msgstr "在不同文件的匹配项之间打印空行"
+
+#: builtin/grep.c:696
+msgid "show filename only once above matches from same file"
+msgstr "只在同一文件的匹配项的上面显示一次文件名"
+
+#: builtin/grep.c:699
+msgid "show <n> context lines before and after matches"
+msgstr "显示匹配项前后的 <n> 行上下文"
+
+#: builtin/grep.c:702
+msgid "show <n> context lines before matches"
+msgstr "显示匹配项前 <n> 行上下文"
+
+#: builtin/grep.c:704
+msgid "show <n> context lines after matches"
+msgstr "显示匹配项后 <n> 行上下文"
+
+#: builtin/grep.c:705
+msgid "shortcut for -C NUM"
+msgstr "快捷键 -C 数字"
+
+#: builtin/grep.c:708
+msgid "show a line with the function name before matches"
+msgstr "在匹配的前面显示一行函数名"
+
+#: builtin/grep.c:710
+msgid "show the surrounding function"
+msgstr "显示所在函数的前后内容"
+
+#: builtin/grep.c:713
+msgid "read patterns from file"
+msgstr "从文件读取模式"
+
+#: builtin/grep.c:715
+msgid "match <pattern>"
+msgstr "匹配 <模式>"
+
+#: builtin/grep.c:717
+msgid "combine patterns specified with -e"
+msgstr "组合用 -e 参数设定的模式"
+
+#: builtin/grep.c:729
+msgid "indicate hit with exit status without output"
+msgstr "不输出，而用退出码标识命中状态"
+
+#: builtin/grep.c:731
+msgid "show only matches from files that match all patterns"
+msgstr "只显示匹配所有模式的文件中的匹配"
+
+#: builtin/grep.c:733
+msgid "show parse tree for grep expression"
+msgstr "显示 grep 表达式的解析树"
+
+#: builtin/grep.c:737
+msgid "pager"
+msgstr "分页"
+
+#: builtin/grep.c:737
+msgid "show matching files in the pager"
+msgstr "分页显示匹配的文件"
+
+#: builtin/grep.c:740
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "允许调用 grep(1)（本次构建忽略）"
+
+#: builtin/grep.c:741 builtin/show-ref.c:187
+msgid "show usage"
+msgstr "显示用法"
+
+#: builtin/grep.c:808
+msgid "no pattern given."
+msgstr "未提供模式匹配。"
+
+#: builtin/grep.c:866
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager 仅用于工作区"
+
+#: builtin/grep.c:892
+msgid "--cached or --untracked cannot be used with --no-index."
+msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
+
+#: builtin/grep.c:897
+msgid "--no-index or --untracked cannot be used with revs."
+msgstr "--no-index 或 --untracked 不能和版本同时使用。"
+
+#: builtin/grep.c:900
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
+msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
+
+#: builtin/grep.c:908
+msgid "both --cached and trees are given."
+msgstr "同时给出了 --cached 和树对象。"
+
+#: builtin/hash-object.c:82
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
+"<file>..."
+msgstr ""
+"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
+"<文件>..."
+
+#: builtin/hash-object.c:83
+msgid "git hash-object --stdin-paths < <list-of-paths>"
+msgstr "git hash-object --stdin-paths < <路径列表>"
+
+#: builtin/hash-object.c:94 builtin/tag.c:610
+msgid "type"
+msgstr "类型"
+
+#: builtin/hash-object.c:94
+msgid "object type"
+msgstr "对象类型"
+
+#: builtin/hash-object.c:95
+msgid "write the object into the object database"
+msgstr "将对象写入对象数据库"
+
+#: builtin/hash-object.c:97
+msgid "read the object from stdin"
+msgstr "从标准输入读取对象"
+
+#: builtin/hash-object.c:99
+msgid "store file as is without filters"
+msgstr "原样存储文件不使用过滤器"
+
+#: builtin/hash-object.c:100
+msgid ""
+"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: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] [命令]"
+
+#: builtin/help.c:64
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "未能识别的帮助格式 '%s'"
+
+#: builtin/help.c:91
+msgid "Failed to start emacsclient."
+msgstr "无法启动 emacsclient。"
+
+#: builtin/help.c:104
+msgid "Failed to parse emacsclient version."
+msgstr "无法解析 emacsclient 版本。"
+
+#: builtin/help.c:112
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "emacsclient 版本 '%d' 太老（< 22）。"
+
+#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#, c-format
+msgid "failed to exec '%s': %s"
+msgstr "无法执行 '%s'：%s"
+
+#: builtin/help.c:215
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s'：不支持的 man 手册查看器的路径。\n"
+"请使用 'man.<tool>.cmd'。"
+
+#: builtin/help.c:227
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': 支持的 man 手册查看器命令。\n"
+"请使用 'man.<tool>.path'。"
+
+#: builtin/help.c:352
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s'：未知的 man 查看器。"
+
+#: builtin/help.c:369
+msgid "no man viewer handled the request"
+msgstr "没有 man 查看器处理此请求"
+
+#: builtin/help.c:377
+msgid "no info viewer handled the request"
+msgstr "没有 info 查看器处理此请求"
+
+#: builtin/help.c:423
+msgid "Defining attributes per path"
+msgstr "定义路径的属性"
+
+#: builtin/help.c:424
+msgid "Everyday Git With 20 Commands Or So"
+msgstr "每一天 Git 常用的约 20 条命令"
+
+#: builtin/help.c:425
+msgid "A Git glossary"
+msgstr "Git 词汇表"
+
+#: builtin/help.c:426
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "忽略指定的未跟踪文件"
+
+#: builtin/help.c:427
+msgid "Defining submodule properties"
+msgstr "定义子模组属性"
+
+#: builtin/help.c:428
+msgid "Specifying revisions and ranges for Git"
+msgstr "指定 Git 的版本和版本范围"
+
+#: builtin/help.c:429
+msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
+
+#: builtin/help.c:430
+msgid "An overview of recommended workflows with Git"
+msgstr "Git 推荐的工作流概览"
+
+#: builtin/help.c:442
+msgid "The common Git guides are:\n"
+msgstr "最常用的 Git 向导有：\n"
+
+#: builtin/help.c:463 builtin/help.c:480
+#, c-format
+msgid "usage: %s%s"
+msgstr "用法：%s%s"
+
+#: builtin/help.c:496
+#, c-format
+msgid "`git %s' is aliased to `%s'"
+msgstr "`git %s' 是 `%s' 的别名"
+
+#: builtin/index-pack.c:150
+#, c-format
+msgid "unable to open %s"
+msgstr "不能打开 %s"
+
+#: builtin/index-pack.c:200
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "%s 的对象类型不匹配"
+
+#: builtin/index-pack.c:220
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "未能获取期望的对象 %s"
+
+#: builtin/index-pack.c:223
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "对象 %s：期待类型 %s，却是 %s"
+
+#: builtin/index-pack.c:265
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "无法填充 %d 字节"
+msgstr[1] "无法填充 %d 字节"
+
+#: builtin/index-pack.c:275
+msgid "early EOF"
+msgstr "过早的文件结束符（EOF）"
+
+#: builtin/index-pack.c:276
+msgid "read error on input"
+msgstr "输入上的读错误"
+
+#: builtin/index-pack.c:288
+msgid "used more bytes than were available"
+msgstr "用掉了超过可用的字节"
+
+#: builtin/index-pack.c:295
+msgid "pack too large for current definition of off_t"
+msgstr "包太大超过了当前 off_t 的定义"
+
+#: builtin/index-pack.c:311
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能创建 '%s'"
+
+#: builtin/index-pack.c:316
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "无法打开包文件 '%s'"
+
+#: builtin/index-pack.c:330
+msgid "pack signature mismatch"
+msgstr "包签名不匹配"
+
+#: builtin/index-pack.c:332
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "不支持包版本 %<PRIu32>"
+
+#: builtin/index-pack.c:350
+#, c-format
+msgid "pack has bad object at offset %lu: %s"
+msgstr "包中有错误的对象位于 %lu：%s"
+
+#: builtin/index-pack.c:471
+#, c-format
+msgid "inflate returned %d"
+msgstr "解压缩返回 %d"
+
+#: builtin/index-pack.c:520
+msgid "offset value overflow for delta base object"
+msgstr "偏移值覆盖了 delta 基准对象"
+
+#: builtin/index-pack.c:528
+msgid "delta base offset is out of bound"
+msgstr "delta 基准偏移越界"
+
+#: builtin/index-pack.c:536
+#, c-format
+msgid "unknown object type %d"
+msgstr "未知对象类型 %d"
+
+#: builtin/index-pack.c:567
+msgid "cannot pread pack file"
+msgstr "无法读取包文件"
+
+#: builtin/index-pack.c:569
+#, 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/index-pack.c:595
+msgid "serious inflate inconsistency"
+msgstr "解压缩严重的不一致"
+
+#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
+#: builtin/index-pack.c:749 builtin/index-pack.c:758
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "发现 %s 出现 SHA1 冲突！"
+
+#: builtin/index-pack.c:689 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
+#, c-format
+msgid "unable to read %s"
+msgstr "不能读 %s"
+
+#: builtin/index-pack.c:755
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "不能读取现存对象 %s"
+
+#: builtin/index-pack.c:769
+#, c-format
+msgid "invalid blob object %s"
+msgstr "无效的数据（blob）对象 %s"
+
+#: builtin/index-pack.c:783
+#, c-format
+msgid "invalid %s"
+msgstr "无效的 %s"
+
+#: builtin/index-pack.c:787
+msgid "Error in object"
+msgstr "对象中出错"
+
+#: builtin/index-pack.c:789
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "%s 的所有子对象并非都可达"
+
+#: builtin/index-pack.c:861 builtin/index-pack.c:890
+msgid "failed to apply delta"
+msgstr "无法应用 delta"
+
+#: builtin/index-pack.c:1055
+msgid "Receiving objects"
+msgstr "接收对象中"
+
+#: builtin/index-pack.c:1055
+msgid "Indexing objects"
+msgstr "索引对象中"
+
+#: builtin/index-pack.c:1081
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "包冲突（SHA1 不匹配）"
+
+#: builtin/index-pack.c:1086
+msgid "cannot fstat packfile"
+msgstr "不能枚举包文件状态"
+
+#: builtin/index-pack.c:1089
+msgid "pack has junk at the end"
+msgstr "包的结尾有垃圾数据"
+
+#: builtin/index-pack.c:1100
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "parse_pack_objects() 中遇到不可理喻的问题"
+
+#: builtin/index-pack.c:1123
+msgid "Resolving deltas"
+msgstr "处理 delta 中"
+
+#: builtin/index-pack.c:1133
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "不能创建线程：%s"
+
+#: builtin/index-pack.c:1175
+msgid "confusion beyond insanity"
+msgstr "不可理喻"
+
+#: builtin/index-pack.c:1181
+#, c-format
+msgid "completed with %d local objects"
+msgstr "完成 %d 个本地对象"
+
+#: builtin/index-pack.c:1191
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
+
+#: builtin/index-pack.c:1195
+#, 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:1220
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "不能压缩附加对象（%d）"
+
+#: builtin/index-pack.c:1299
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "本地对象 %s 已损坏"
+
+#: builtin/index-pack.c:1323
+msgid "error while closing pack file"
+msgstr "关闭包文件时出错"
+
+#: builtin/index-pack.c:1336
+#, c-format
+msgid "cannot write keep file '%s'"
+msgstr "无法写保留文件 '%s'"
+
+#: builtin/index-pack.c:1344
+#, c-format
+msgid "cannot close written keep file '%s'"
+msgstr "无法关闭保留文件 '%s'"
+
+#: builtin/index-pack.c:1357
+msgid "cannot store pack file"
+msgstr "无法存储包文件"
+
+#: builtin/index-pack.c:1368
+msgid "cannot store index file"
+msgstr "无法存储索引文件"
+
+#: builtin/index-pack.c:1401
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "坏的 pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "指定的线程数无效（%d）"
+
+#: builtin/index-pack.c:1411 builtin/index-pack.c:1590
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "没有线程支持，忽略 %s"
+
+#: builtin/index-pack.c:1469
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "无法打开现存包文件 '%s'"
+
+#: builtin/index-pack.c:1471
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "无法为 %s 打开包索引文件"
+
+#: builtin/index-pack.c:1518
+#, 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:1525
+#, 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:1554
+msgid "Cannot come back to cwd"
+msgstr "无法返回当前工作目录"
+
+#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
+#: builtin/index-pack.c:1617 builtin/index-pack.c:1621
+#, c-format
+msgid "bad %s"
+msgstr "错误选项 %s"
+
+#: builtin/index-pack.c:1635
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin 不能和 --stdin 同时使用"
+
+#: builtin/index-pack.c:1639 builtin/index-pack.c:1648
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "包名 '%s' 没有以 '.pack' 结尾"
+
+#: builtin/index-pack.c:1656
+msgid "--verify with no packfile name given"
+msgstr "--verify 没有提供包名参数"
+
+#: builtin/init-db.c:35
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "不能设置 %s 为组可写"
+
+#: builtin/init-db.c:62
+#, c-format
+msgid "insanely long template name %s"
+msgstr "太长的模版名 %s"
+
+#: builtin/init-db.c:67
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "不能枚举 '%s' 状态"
+
+#: builtin/init-db.c:73
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "不能枚举模版 '%s' 状态"
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "不能打开目录 '%s'"
+
+#: builtin/init-db.c:97
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "不能读取链接 '%s'"
+
+#: builtin/init-db.c:99
+#, c-format
+msgid "insanely long symlink %s"
+msgstr "太长的符号链接 %s"
+
+#: builtin/init-db.c:102
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "不能自 '%s' 到 '%s' 创建符号链接"
+
+#: builtin/init-db.c:106
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "不能拷贝 '%s' 至 '%s'"
+
+#: builtin/init-db.c:110
+#, c-format
+msgid "ignoring template %s"
+msgstr "忽略模版 %s"
+
+#: builtin/init-db.c:133
+#, c-format
+msgid "insanely long template path %s"
+msgstr "太长的模版路径 %s"
+
+#: builtin/init-db.c:141
+#, c-format
+msgid "templates not found %s"
+msgstr "模版未找到 %s"
+
+#: builtin/init-db.c:154
+#, c-format
+msgid "not copying templates of a wrong format version %d from '%s'"
+msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
+
+#: builtin/init-db.c:192
+#, c-format
+msgid "insane git directory %s"
+msgstr "不正常的 git 目录 %s"
+
+#: builtin/init-db.c:323 builtin/init-db.c:326
+#, c-format
+msgid "%s already exists"
+msgstr "%s 已经存在"
+
+#: builtin/init-db.c:355
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "不能处理 %d 类型的文件"
+
+#: builtin/init-db.c:358
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "不能移动 %s 至 %s"
+
+#. 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:418
+#, c-format
+msgid "%s%s Git repository in %s%s\n"
+msgstr "%s%s Git 版本库于 %s%s\n"
+
+#: builtin/init-db.c:419
+msgid "Reinitialized existing"
+msgstr "重新初始化现存的"
+
+#: builtin/init-db.c:419
+msgid "Initialized empty"
+msgstr "初始化空的"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/init-db.c:420
+msgid " shared"
+msgstr "共享"
+
+#: builtin/init-db.c:467
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [directory]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
+"[目录]"
+
+#: builtin/init-db.c:490
+msgid "permissions"
+msgstr "权限"
+
+#: builtin/init-db.c:491
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "指定 git 版本库是多个用户之间共享的"
+
+#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172
+msgid "be quiet"
+msgstr "保持安静"
+
+#: builtin/init-db.c:525 builtin/init-db.c:530
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "不能创建目录 %s"
+
+#: builtin/init-db.c:534
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "不能切换目录到 %s"
+
+#: builtin/init-db.c:555
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"
+"dir=<directory>）"
+
+#: builtin/init-db.c:583
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "不能访问工作区 '%s'"
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
+"[<file>...]"
+msgstr ""
+"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
+">...]"
+
+#: builtin/interpret-trailers.c:25
+msgid "trim empty trailers"
+msgstr "删除空签名"
+
+#: builtin/interpret-trailers.c:26
+msgid "trailer"
+msgstr "签名"
+
+#: builtin/interpret-trailers.c:27
+msgid "trailer(s) to add"
+msgstr "要添加的签名"
+
+#: builtin/log.c:41
+msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
+msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
+
+#: builtin/log.c:42
+msgid " or: git show [options] <object>..."
+msgstr " 或者：git show [选项] <对象>..."
+
+#: builtin/log.c:81
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "无效的 --decorate 选项：%s"
+
+#: builtin/log.c:127
+msgid "suppress diff output"
+msgstr "不显示差异输出"
+
+#: builtin/log.c:128
+msgid "show source"
+msgstr "显示源"
+
+#: builtin/log.c:129
+msgid "Use mail map file"
+msgstr "使用邮件映射文件"
+
+#: builtin/log.c:130
+msgid "decorate options"
+msgstr "修饰选项"
+
+#: builtin/log.c:133
+msgid "Process line range n,m in file, counting from 1"
+msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
+
+#: builtin/log.c:229
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "最终输出：%d %s\n"
+
+#: builtin/log.c:458
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: 损坏的文件"
+
+#: builtin/log.c:472 builtin/log.c:564
+#, c-format
+msgid "Could not read object %s"
+msgstr "不能读取对象 %s"
+
+#: builtin/log.c:588
+#, c-format
+msgid "Unknown type: %d"
+msgstr "未知类型：%d"
+
+#: builtin/log.c:689
+msgid "format.headers without value"
+msgstr "format.headers 没有值"
+
+#: builtin/log.c:773
+msgid "name of output directory is too long"
+msgstr "输出目录名太长"
+
+#: builtin/log.c:789
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr "无法打开补丁文件 %s"
+
+#: builtin/log.c:803
+msgid "Need exactly one range."
+msgstr "只需要一个范围。"
+
+#: builtin/log.c:811
+msgid "Not a range."
+msgstr "不是一个范围。"
+
+#: builtin/log.c:919
+msgid "Cover letter needs email format"
+msgstr "信封需要邮件地址格式"
+
+#: builtin/log.c:998
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "不正常的 in-reply-to：%s"
+
+#: builtin/log.c:1026
+msgid "git format-patch [options] [<since> | <revision range>]"
+msgstr "git format-patch [选项] [<从> | <修订集范围>]"
+
+#: builtin/log.c:1071
+msgid "Two output directories?"
+msgstr "两个输出目录？"
+
+#: builtin/log.c:1186
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "使用 [PATCH n/m]，即使只有一个补丁"
+
+#: builtin/log.c:1189
+msgid "use [PATCH] even with multiple patches"
+msgstr "使用 [PATCH]，即使有多个补丁"
+
+#: builtin/log.c:1193
+msgid "print patches to standard out"
+msgstr "打印补丁到标准输出"
+
+#: builtin/log.c:1195
+msgid "generate a cover letter"
+msgstr "生成一封附信"
+
+#: builtin/log.c:1197
+msgid "use simple number sequence for output file names"
+msgstr "使用简单的数字序列作为输出文件名"
+
+#: builtin/log.c:1198
+msgid "sfx"
+msgstr "后缀"
+
+#: builtin/log.c:1199
+msgid "use <sfx> instead of '.patch'"
+msgstr "使用 <后缀> 代替 '.patch'"
+
+#: builtin/log.c:1201
+msgid "start numbering patches at <n> instead of 1"
+msgstr "补丁以 <n> 开始编号，而不是1"
+
+#: builtin/log.c:1203
+msgid "mark the series as Nth re-roll"
+msgstr "标记补丁系列是第几次重制"
+
+#: builtin/log.c:1205
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "使用 [<前缀>] 代替 [PATCH]"
+
+#: builtin/log.c:1208
+msgid "store resulting files in <dir>"
+msgstr "把结果文件存储在 <dir>"
+
+#: builtin/log.c:1211
+msgid "don't strip/add [PATCH]"
+msgstr "不删除/添加 [PATCH]"
+
+#: builtin/log.c:1214
+msgid "don't output binary diffs"
+msgstr "不输出二进制差异"
+
+#: builtin/log.c:1216
+msgid "don't include a patch matching a commit upstream"
+msgstr "不包含已在上游提交中的补丁"
+
+#: builtin/log.c:1218
+msgid "show patch format instead of default (patch + stat)"
+msgstr "显示纯补丁格式而非默认的（补丁+状态）"
+
+#: builtin/log.c:1220
+msgid "Messaging"
+msgstr "邮件发送"
+
+#: builtin/log.c:1221
+msgid "header"
+msgstr "header"
+
+#: builtin/log.c:1222
+msgid "add email header"
+msgstr "添加邮件头"
+
+#: builtin/log.c:1223 builtin/log.c:1225
+msgid "email"
+msgstr "邮件地址"
+
+#: builtin/log.c:1223
+msgid "add To: header"
+msgstr "添加收件人"
+
+#: builtin/log.c:1225
+msgid "add Cc: header"
+msgstr "添加抄送"
+
+#: builtin/log.c:1227
+msgid "ident"
+msgstr "ident"
+
+#: builtin/log.c:1228
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "设置 From 地址为 <ident>（如若不提供，用提交者ID做为地址）"
+
+#: builtin/log.c:1230
+msgid "message-id"
+msgstr "message-id"
+
+#: builtin/log.c:1231
+msgid "make first mail a reply to <message-id>"
+msgstr "使第一封邮件作为对 <message-id> 的回复"
+
+#: builtin/log.c:1232 builtin/log.c:1235
+msgid "boundary"
+msgstr "边界"
+
+#: builtin/log.c:1233
+msgid "attach the patch"
+msgstr "附件方式添加补丁"
+
+#: builtin/log.c:1236
+msgid "inline the patch"
+msgstr "内联显示补丁"
+
+#: builtin/log.c:1240
+msgid "enable message threading, styles: shallow, deep"
+msgstr "启用邮件线索，风格：浅，深"
+
+#: builtin/log.c:1242
+msgid "signature"
+msgstr "签名"
+
+#: builtin/log.c:1243
+msgid "add a signature"
+msgstr "添加一个签名"
+
+#: builtin/log.c:1245
+msgid "add a signature from a file"
+msgstr "从文件添加一个签名"
+
+#: builtin/log.c:1246
+msgid "don't print the patch filenames"
+msgstr "不要打印补丁文件名"
+
+#: builtin/log.c:1320
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "包含无效的身份标识：%s"
+
+#: builtin/log.c:1335
+msgid "-n and -k are mutually exclusive."
+msgstr "-n 和 -k 互斥。"
+
+#: builtin/log.c:1337
+msgid "--subject-prefix and -k are mutually exclusive."
+msgstr "--subject-prefix 和 -k 互斥。"
+
+#: builtin/log.c:1345
+msgid "--name-only does not make sense"
+msgstr "--name-only 无意义"
+
+#: builtin/log.c:1347
+msgid "--name-status does not make sense"
+msgstr "--name-status 无意义"
+
+#: builtin/log.c:1349
+msgid "--check does not make sense"
+msgstr "--check 无意义"
+
+#: builtin/log.c:1372
+msgid "standard output, or directory, which one?"
+msgstr "标准输出或目录，哪一个？"
+
+#: builtin/log.c:1374
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr "不能创建目录 '%s'"
+
+#: builtin/log.c:1472
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "无法读取签名文件 '%s'"
+
+#: builtin/log.c:1535
+msgid "Failed to create output files"
+msgstr "无法创建输出文件"
+
+#: builtin/log.c:1583
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
+
+#: builtin/log.c:1638
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
+
+#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
+#, c-format
+msgid "Unknown commit %s"
+msgstr "未知提交 %s"
+
+#: builtin/ls-files.c:401
+msgid "git ls-files [options] [<file>...]"
+msgstr "git ls-files [选项] [<文件>...]"
+
+#: builtin/ls-files.c:458
+msgid "identify the file status with tags"
+msgstr "用标签标识文件的状态"
+
+#: builtin/ls-files.c:460
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "使用小写字母表示 '假设未改变的' 文件"
+
+#: builtin/ls-files.c:462
+msgid "show cached files in the output (default)"
+msgstr "显示缓存的文件（默认）"
+
+#: builtin/ls-files.c:464
+msgid "show deleted files in the output"
+msgstr "显示已删除的文件"
+
+#: builtin/ls-files.c:466
+msgid "show modified files in the output"
+msgstr "显示已修改的文件"
+
+#: builtin/ls-files.c:468
+msgid "show other files in the output"
+msgstr "显示其它文件"
+
+#: builtin/ls-files.c:470
+msgid "show ignored files in the output"
+msgstr "显示忽略的文件"
+
+#: builtin/ls-files.c:473
+msgid "show staged contents' object name in the output"
+msgstr "显示暂存区内容的对象名称"
+
+#: builtin/ls-files.c:475
+msgid "show files on the filesystem that need to be removed"
+msgstr "显示文件系统需要删除的文件"
+
+#: builtin/ls-files.c:477
+msgid "show 'other' directories' names only"
+msgstr "只显示“其他”目录的名称"
+
+#: builtin/ls-files.c:480
+msgid "don't show empty directories"
+msgstr "不显示空目录"
+
+#: builtin/ls-files.c:483
+msgid "show unmerged files in the output"
+msgstr "显示未合并的文件"
+
+#: builtin/ls-files.c:485
+msgid "show resolve-undo information"
+msgstr "显示 resolve-undo 信息"
+
+#: builtin/ls-files.c:487
+msgid "skip files matching pattern"
+msgstr "匹配排除文件的模式"
+
+#: builtin/ls-files.c:490
+msgid "exclude patterns are read from <file>"
+msgstr "从 <文件> 中读取排除模式"
+
+#: builtin/ls-files.c:493
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "从 <文件> 读取额外的每个目录的排除模式"
+
+#: builtin/ls-files.c:495
+msgid "add the standard git exclusions"
+msgstr "添加标准的 git 排除"
+
+#: builtin/ls-files.c:498
+msgid "make the output relative to the project top directory"
+msgstr "显示相对于顶级目录的文件名"
+
+#: builtin/ls-files.c:501
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "如果任何 <文件> 都不在索引区，视为错误"
+
+#: builtin/ls-files.c:502
+msgid "tree-ish"
+msgstr "树或提交"
+
+#: builtin/ls-files.c:503
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
+
+#: builtin/ls-files.c:505
+msgid "show debugging data"
+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:44
+msgid "git merge [options] [<commit>...]"
+msgstr "git merge [选项] [<提交>...]"
+
+#: builtin/merge.c:45
+msgid "git merge [options] <msg> HEAD <commit>"
+msgstr "git merge [选项] <说明> HEAD <提交>"
+
+#: builtin/merge.c:46
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:99
+msgid "switch `m' requires a value"
+msgstr "开关 `m' 需要一个值"
+
+#: builtin/merge.c:136
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "不能找到合并策略 '%s'。\n"
+
+#: builtin/merge.c:137
+#, c-format
+msgid "Available strategies are:"
+msgstr "可用的策略有："
+
+#: builtin/merge.c:142
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "可用的自定义策略有："
+
+#: builtin/merge.c:192
+msgid "do not show a diffstat at the end of the merge"
+msgstr "在合并的最后不显示差异统计"
+
+#: builtin/merge.c:195
+msgid "show a diffstat at the end of the merge"
+msgstr "在合并的最后显示差异统计"
+
+#: builtin/merge.c:196
+msgid "(synonym to --stat)"
+msgstr "（和 --stat 同义）"
+
+#: builtin/merge.c:198
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
+
+#: builtin/merge.c:201
+msgid "create a single commit instead of doing a merge"
+msgstr "创建一个单独的提交而不是做一次合并"
+
+#: builtin/merge.c:203
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "如果合并成功，执行一次提交（默认）"
+
+#: builtin/merge.c:205
+msgid "edit message before committing"
+msgstr "在提交前编辑提交说明"
+
+#: builtin/merge.c:206
+msgid "allow fast-forward (default)"
+msgstr "允许快进（默认）"
+
+#: builtin/merge.c:208
+msgid "abort if fast-forward is not possible"
+msgstr "如果不能快进就放弃合并"
+
+#: builtin/merge.c:212
+msgid "Verify that the named commit has a valid GPG signature"
+msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
+
+#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89
+msgid "strategy"
+msgstr "策略"
+
+#: builtin/merge.c:214
+msgid "merge strategy to use"
+msgstr "要使用的合并策略"
+
+#: builtin/merge.c:215
+msgid "option=value"
+msgstr "option=value"
+
+#: builtin/merge.c:216
+msgid "option for selected merge strategy"
+msgstr "所选的合并策略的选项"
+
+#: builtin/merge.c:218
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "合并的提交说明（针对非快进式合并）"
+
+#: builtin/merge.c:222
+msgid "abort the current in-progress merge"
+msgstr "放弃当前正在进行的合并"
+
+#: builtin/merge.c:250
+msgid "could not run stash."
+msgstr "不能进行进度保存。"
+
+#: builtin/merge.c:255
+msgid "stash failed"
+msgstr "进度保存失败"
+
+#: builtin/merge.c:260
+#, c-format
+msgid "not a valid object: %s"
+msgstr "不是一个有效对象：%s"
+
+#: builtin/merge.c:279 builtin/merge.c:296
+msgid "read-tree failed"
+msgstr "读取树失败"
+
+# 译者：注意保持前导空格
+#: builtin/merge.c:326
+msgid " (nothing to squash)"
+msgstr " （无可压缩）"
+
+#: builtin/merge.c:339
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "压缩提交 -- 未更新 HEAD\n"
+
+#: builtin/merge.c:371
+msgid "Writing SQUASH_MSG"
+msgstr "写入 SQUASH_MSG"
+
+#: builtin/merge.c:373
+msgid "Finishing SQUASH_MSG"
+msgstr "完成 SQUASH_MSG"
+
+#: builtin/merge.c:396
+#, 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:558
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
+
+#: builtin/merge.c:653
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree 无法写入一树对象"
+
+#: builtin/merge.c:677
+msgid "Not handling anything other than two heads merge."
+msgstr "不能处理两个头合并之外的任何操作。"
+
+#: builtin/merge.c:691
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive 的未知选项：-X%s"
+
+#: builtin/merge.c:704
+#, c-format
+msgid "unable to write %s"
+msgstr "不能写 %s"
-#. case (1)
-#: builtin/checkout.c:854
+#: builtin/merge.c:793
#, c-format
-msgid "invalid reference: %s"
-msgstr "无效引用：%s"
+msgid "Could not read from '%s'"
+msgstr "不能从 '%s' 读取"
-#. case (1): want a tree
-#: builtin/checkout.c:893
+#: builtin/merge.c:802
#, c-format
-msgid "reference is not a tree: %s"
-msgstr "引用不是一个树：%s"
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/checkout.c:973
-msgid "-B cannot be used with -b"
-msgstr "-B 不能和 -b 共用"
+#: builtin/merge.c:808
+#, 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/checkout.c:982
-msgid "--patch is incompatible with all other options"
-msgstr "--patch 选项和其他选项不兼容"
+#: builtin/merge.c:832
+msgid "Empty commit message."
+msgstr "空提交信息。"
-#: builtin/checkout.c:985
-msgid "--detach cannot be used with -b/-B/--orphan"
-msgstr "--detach 不能和 -b/-B/--orphan 共用"
+#: builtin/merge.c:844
+#, c-format
+msgid "Wonderful.\n"
+msgstr "太棒了。\n"
-#: builtin/checkout.c:987
-msgid "--detach cannot be used with -t"
-msgstr "--detach 不能和 -t 共用"
+#: builtin/merge.c:907
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/checkout.c:993
-msgid "--track needs a branch name"
-msgstr "--track 需要一个分支名"
+#: builtin/merge.c:923
+#, c-format
+msgid "'%s' is not a commit"
+msgstr "'%s' 不是一个提交"
-#: builtin/checkout.c:1000
-msgid "Missing branch name; try -b"
-msgstr "缺少分支名；尝试 -b"
+#: builtin/merge.c:964
+msgid "No current branch."
+msgstr "没有当前分支。"
-#: builtin/checkout.c:1006
-msgid "--orphan and -b|-B are mutually exclusive"
-msgstr "--orphan 和 -b|-B 互斥"
+#: builtin/merge.c:966
+msgid "No remote for the current branch."
+msgstr "当前分支没有对应的远程版本库。"
-#: builtin/checkout.c:1008
-msgid "--orphan cannot be used with -t"
-msgstr "--orphan 不能和 -t 共用"
+#: builtin/merge.c:968
+msgid "No default upstream defined for the current branch."
+msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/checkout.c:1018
-msgid "git checkout: -f and -m are incompatible"
-msgstr "git checkout：-f 和 -m 不兼容"
+#: builtin/merge.c:973
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/checkout.c:1052
-msgid "invalid path specification"
-msgstr "æ\97 æ\95\88ç\9a\84è·¯å¾\84è§\84æ ¼"
+#: builtin/merge.c:1129
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "没æ\9c\89è¦\81ç»\88æ¢ç\9a\84å\90\88并ï¼\88MERGE_HEAD 丢失ï¼\89ã\80\82"
-#: builtin/checkout.c:1060
-#, c-format
+#: builtin/merge.c:1145
msgid ""
-"git checkout: updating paths is incompatible with switching branches.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-"git checkout：更新路径和切换分支不兼容。\n"
-"您是想要检出 '%s' 但未能将其解析为提交么？"
-
-#: builtin/checkout.c:1062
-msgid "git checkout: updating paths is incompatible with switching branches."
-msgstr "git checkout：更新路径和切换分支不兼容。"
+"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
+"请在合并前先提交您的修改。"
-#: builtin/checkout.c:1067
-msgid "git checkout: --detach does not take a path argument"
-msgstr "git checkout：--detach 不跟路径参数"
+#: builtin/merge.c:1148 git-pull.sh:34
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: builtin/checkout.c:1070
+#: builtin/merge.c:1152
msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
+"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
+"请在合并前先提交您的修改。"
-#: builtin/checkout.c:1089
-msgid "Cannot switch branch to a non-commit."
-msgstr "æ\97 æ³\95å\88\87æ\8d¢å\88\86æ\94¯å\88°ä¸\80个é\9d\9eæ\8f\90交。"
+#: builtin/merge.c:1155
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "æ\82¨å°\9aæ\9cªç»\93æ\9d\9fæ\82¨ç\9a\84æ\8b£é\80\89ï¼\88å\98å\9c¨ CHERRY_PICK_HEADï¼\89。"
-#: builtin/checkout.c:1092
-msgid "--ours/--theirs is incompatible with switching branches."
-msgstr "--ours/--theirs 和切换分支不兼容。"
+#: builtin/merge.c:1164
+msgid "You cannot combine --squash with --no-ff."
+msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-#: builtin/clean.c:78
-msgid "-x and -X cannot be used together"
-msgstr "-x 和 -X 不能共用"
+#: builtin/merge.c:1173
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/clean.c:82
-msgid ""
-"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
-msgstr ""
-"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
+#: builtin/merge.c:1205
+msgid "Can merge only exactly one commit into empty head"
+msgstr "只能将一个提交合并到空分支上"
-#: builtin/clean.c:85
-msgid ""
-"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
-"clean"
-msgstr ""
-"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
+#: builtin/merge.c:1208
+msgid "Squash commit into empty head not supported yet"
+msgstr "尚不支持到空分支的压缩提交"
-#: builtin/clean.c:155 builtin/clean.c:176
-#, c-format
-msgid "Would remove %s\n"
-msgstr "将删除 %s\n"
+#: builtin/merge.c:1210
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "到空分支的非快进式提交没有意义"
-#: builtin/clean.c:159 builtin/clean.c:179
+#: builtin/merge.c:1215
#, c-format
-msgid "Removing %s\n"
-msgstr "正删除 %s\n"
+msgid "%s - not something we can merge"
+msgstr "%s - 不能被合并"
-#: builtin/clean.c:162 builtin/clean.c:182
+#: builtin/merge.c:1266
#, c-format
-msgid "failed to remove %s"
-msgstr "æ\97 æ³\95å\88 é\99¤ %s"
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "æ\8f\90交 %s æ\9c\89ä¸\80个é\9d\9eå\8f¯ä¿¡ç\9a\84声称æ\9d¥è\87ª %s ç\9a\84 GPG ç¾å\90\8dã\80\82"
-#: builtin/clean.c:166
+#: builtin/merge.c:1269
#, c-format
-msgid "Would not remove %s\n"
-msgstr "不会删除 %s\n"
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: builtin/clean.c:168
+#: builtin/merge.c:1272
#, c-format
-msgid "Not removing %s\n"
-msgstr "æ\9cªå\88 é\99¤ %s\n"
+msgid "Commit %s does not have a GPG signature."
+msgstr "æ\8f\90交 %s 没æ\9c\89ä¸\80个 GPG ç¾å\90\8dã\80\82"
-#: builtin/clone.c:243
+#: builtin/merge.c:1275
#, c-format
-msgid "reference repository '%s' is not a local directory."
-msgstr "引用版本库 '%s' 不是一个本地目录。"
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: builtin/clone.c:302
+#: builtin/merge.c:1356
#, c-format
-msgid "failed to open '%s'"
-msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s'"
+msgid "Updating %s..%s\n"
+msgstr "æ\9b´æ\96° %s..%s\n"
-#: builtin/clone.c:306
+#: builtin/merge.c:1395
#, c-format
-msgid "failed to create directory '%s'"
-msgstr "无法创建目录 '%s'"
+msgid "Trying really trivial in-index merge...\n"
+msgstr "尝试非常小的索引内合并...\n"
-#: builtin/clone.c:308 builtin/diff.c:75
+#: builtin/merge.c:1402
#, c-format
-msgid "failed to stat '%s'"
-msgstr "无法枚举 '%s' 状态"
+msgid "Nope.\n"
+msgstr "无。\n"
-#: builtin/clone.c:310
-#, c-format
-msgid "%s exists and is not a directory"
-msgstr "%s 存在且不是一个目录"
+#: builtin/merge.c:1434
+msgid "Not possible to fast-forward, aborting."
+msgstr "无法快进，终止。"
-#: builtin/clone.c:324
+#: builtin/merge.c:1457 builtin/merge.c:1536
#, c-format
-msgid "failed to stat %s\n"
-msgstr "无法枚举 %s 状态\n"
+msgid "Rewinding the tree to pristine...\n"
+msgstr "将树回滚至原始状态...\n"
-#: builtin/clone.c:341
+#: builtin/merge.c:1461
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "无法删除 '%s'"
+msgid "Trying merge strategy %s...\n"
+msgstr "尝试合并策略 %s...\n"
-#: builtin/clone.c:346
+#: builtin/merge.c:1527
#, c-format
-msgid "failed to create link '%s'"
-msgstr "æ\97 æ³\95å\88\9b建é\93¾æ\8e¥ '%s'"
+msgid "No merge strategy handled the merge.\n"
+msgstr "没æ\9c\89å\90\88并ç\96ç\95¥å¤\84ç\90\86æ¤å\90\88并ã\80\82\n"
-#: builtin/clone.c:350
+#: builtin/merge.c:1529
#, c-format
-msgid "failed to copy file to '%s'"
-msgstr "无法拷贝文件至 '%s'"
+msgid "Merge with strategy %s failed.\n"
+msgstr "使用策略 %s 合并失败。\n"
-#: builtin/clone.c:373
+#: builtin/merge.c:1538
#, c-format
-msgid "done.\n"
-msgstr "完成。\n"
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/clone.c:440
+#: builtin/merge.c:1550
#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr "不能发现要克隆的远程分支 %s。"
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "自动合并进展顺利，按要求在提交前停止\n"
-#: builtin/clone.c:549
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
+#: builtin/merge-base.c:29
+msgid "git merge-base [-a|--all] <commit> <commit>..."
+msgstr "git merge-base [-a|--all] <提交> <提交>..."
-#: builtin/clone.c:639
-msgid "Too many arguments."
-msgstr "太多参数。"
+#: builtin/merge-base.c:30
+msgid "git merge-base [-a|--all] --octopus <commit>..."
+msgstr "git merge-base [-a|--all] --octopus <提交>..."
-#: builtin/clone.c:643
-msgid "You must specify a repository to clone."
-msgstr "您必须指定一个版本库来克隆。"
+#: builtin/merge-base.c:31
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <提交>..."
-#: builtin/clone.c:654
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s 选项不兼容。"
+#: builtin/merge-base.c:32
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <提交> <提交>"
-#: builtin/clone.c:668
-#, c-format
-msgid "repository '%s' does not exist"
-msgstr "版本库 '%s' 不存在"
+#: builtin/merge-base.c:33
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <提交> [<提交>]"
-#: builtin/clone.c:673
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
+#: builtin/merge-base.c:214
+msgid "output all common ancestors"
+msgstr "输出所有共同的祖先"
-#: builtin/clone.c:683
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
+#: builtin/merge-base.c:216
+msgid "find ancestors for a single n-way merge"
+msgstr "查找一个多路合并的祖先提交"
-#: builtin/clone.c:693
-#, c-format
-msgid "working tree '%s' already exists."
-msgstr "工作区 '%s' 已经存在。"
+#: builtin/merge-base.c:218
+msgid "list revs not reachable from others"
+msgstr "显示不能被其他访问到的版本"
-#: builtin/clone.c:706 builtin/clone.c:720
-#, c-format
-msgid "could not create leading directories of '%s'"
-msgstr "不能为 '%s' 创建先导目录"
+#: builtin/merge-base.c:220
+msgid "is the first one ancestor of the other?"
+msgstr "第一个是其他的祖先提交么？"
-#: builtin/clone.c:709
-#, c-format
-msgid "could not create work tree dir '%s'."
-msgstr "不能为 '%s' 创建工作区目录。"
+#: builtin/merge-base.c:222
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "查找 <commit> 从<引用>日志的何处分支的"
-#: builtin/clone.c:728
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
-msgstr "克隆到裸版本库 '%s'...\n"
+#: 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 name1 [-L orig [-L name2]]] file1 orig_file file2"
-#: builtin/clone.c:730
-#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr "正克隆到 '%s'...\n"
+#: builtin/merge-file.c:33
+msgid "send results to standard output"
+msgstr "将结果发送到标准输出"
-#: builtin/clone.c:786
+#: builtin/merge-file.c:34
+msgid "use a diff3 based merge"
+msgstr "使用基于 diff3 的合并"
+
+#: builtin/merge-file.c:35
+msgid "for conflicts, use our version"
+msgstr "如果冲突，使用我们的版本"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use their version"
+msgstr "如果冲突，使用他们的版本"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use a union version"
+msgstr "如果冲突，使用联合版本"
+
+#: builtin/merge-file.c:42
+msgid "for conflicts, use this marker size"
+msgstr "如果冲突，使用指定长度的标记"
+
+#: builtin/merge-file.c:43
+msgid "do not warn about conflicts"
+msgstr "不要警告冲突"
+
+#: builtin/merge-file.c:45
+msgid "set labels for file1/orig_file/file2"
+msgstr "为 file1/orig_file/file2 设置标签"
+
+#: builtin/mktree.c:64
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:150
+msgid "input is NUL terminated"
+msgstr "输入以 NUL 字符终止"
+
+#: builtin/mktree.c:151 builtin/write-tree.c:24
+msgid "allow missing objects"
+msgstr "允许丢失的对象"
+
+#: builtin/mktree.c:152
+msgid "allow creation of more than one tree"
+msgstr "允许创建一个以上的树"
+
+#: builtin/mv.c:15
+msgid "git mv [options] <source>... <destination>"
+msgstr "git mv [选项] <源>... <目标>"
+
+#: builtin/mv.c:69
#, c-format
-msgid "Don't know how to clone %s"
-msgstr "不知道如何克隆 %s"
+msgid "Directory %s is in index and no submodule?"
+msgstr "目录 %s 在索引中并且不是子模组？"
-#: builtin/clone.c:835
+#: builtin/mv.c:71
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
+
+#: builtin/mv.c:89
#, c-format
-msgid "Remote branch %s not found in upstream %s"
-msgstr "远程分支 %s 在上游 %s 未发现"
+msgid "%.*s is in index"
+msgstr "%.*s 在索引中"
-#: builtin/clone.c:842
-msgid "You appear to have cloned an empty repository."
-msgstr "您似乎克隆了一个空版本库。"
+#: builtin/mv.c:111
+msgid "force move/rename even if target exists"
+msgstr "强制移动/重命令，即使目标存在"
-#: builtin/commit.c:42
-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/mv.c:112
+msgid "skip move/rename errors"
+msgstr "跳过移动/重命名错误"
-#: builtin/commit.c:54
-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/mv.c:151
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "目标 '%s' 不是一个目录"
-#: builtin/commit.c:59
-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"
-"Otherwise, please use 'git reset'\n"
-msgstr ""
-"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
-"也要提交，使用命令：\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
-"否则，请使用命令 'git reset'\n"
+#: builtin/mv.c:162
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "检查 '%s' 到 '%s' 的重命名\n"
-#: builtin/commit.c:205 builtin/reset.c:33
-msgid "merge"
-msgstr "å\90\88并"
+#: builtin/mv.c:166
+msgid "bad source"
+msgstr "å\9d\8fç\9a\84æº\90"
-#: builtin/commit.c:208
-msgid "cherry-pick"
-msgstr "拣选"
+#: builtin/mv.c:169
+msgid "can not move directory into itself"
+msgstr "不能将目录移动到自身"
-#: builtin/commit.c:325
-msgid "failed to unpack HEAD tree object"
-msgstr "无法解包 HEAD 树对象"
+#: builtin/mv.c:172
+msgid "cannot move directory over file"
+msgstr "不能将目录移动到文件"
-#: builtin/commit.c:367
-msgid "unable to create temporary index"
-msgstr "不能创建临时索引"
+#: builtin/mv.c:181
+msgid "source directory is empty"
+msgstr "源目录为空"
-#: builtin/commit.c:373
-msgid "interactive add failed"
-msgstr "交äº\92å¼\8fæ·»å\8a 失败"
+#: builtin/mv.c:206
+msgid "not under version control"
+msgstr "ä¸\8då\9c¨ç\89\88æ\9c¬æ\8e§å\88¶ä¹\8bä¸\8b"
-#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
-msgid "unable to write new_index file"
-msgstr "无法写 new_index 文件"
+#: builtin/mv.c:209
+msgid "destination exists"
+msgstr "目标已存在"
-# 译者：%s若翻为中文，前后不需要空格
-#: builtin/commit.c:457
+#: builtin/mv.c:217
#, c-format
-msgid "cannot do a partial commit during a %s."
-msgstr "在%s过程中不能做部分提交。"
-
-#: builtin/commit.c:466
-msgid "cannot read the index"
-msgstr "无法读取索引"
+msgid "overwriting '%s'"
+msgstr "覆盖 '%s'"
-#: builtin/commit.c:486
-msgid "unable to write temporary index file"
-msgstr "无法写临时索引文件"
+#: builtin/mv.c:220
+msgid "Cannot overwrite"
+msgstr "不能覆盖"
-#: builtin/commit.c:561 builtin/commit.c:567
-#, c-format
-msgid "invalid commit: %s"
-msgstr "无效的提交：%s"
+#: builtin/mv.c:223
+msgid "multiple sources for the same target"
+msgstr "同一目标具有多个源"
-#: builtin/commit.c:590
-msgid "malformed --author parameter"
-msgstr "非法的 --author 参数"
+#: builtin/mv.c:225
+msgid "destination directory does not exist"
+msgstr "目标目录不存在"
-#: builtin/commit.c:651
+#: builtin/mv.c:232
#, c-format
-msgid "Malformed ident string: '%s'"
-msgstr "非法的身份字符串：'%s'"
+msgid "%s, source=%s, destination=%s"
+msgstr "%s，源=%s，目标=%s"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
+#: builtin/mv.c:253
#, c-format
-msgid "could not lookup commit %s"
-msgstr "不能查询提交 %s"
+msgid "Renaming %s to %s\n"
+msgstr "重命名 %s 至 %s\n"
-#: builtin/commit.c:701 builtin/shortlog.c:296
+#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358
#, c-format
-msgid "(reading log message from standard input)\n"
-msgstr "（正从标准输入中读取日志信息）\n"
+msgid "renaming '%s' failed"
+msgstr "重命名 '%s' 失败"
-#: builtin/commit.c:703
-msgid "could not read log from standard input"
-msgstr "不能从标准输入中读取日志信息"
+#: builtin/name-rev.c:255
+msgid "git name-rev [options] <commit>..."
+msgstr "git name-rev [选项] <提交>..."
-#: builtin/commit.c:707
-#, c-format
-msgid "could not read log file '%s'"
-msgstr "不能读取日志文件 '%s'"
+#: builtin/name-rev.c:256
+msgid "git name-rev [options] --all"
+msgstr "git name-rev [选项] --all"
-#: builtin/commit.c:713
-msgid "commit has empty message"
-msgstr "提交说明为空"
+#: builtin/name-rev.c:257
+msgid "git name-rev [options] --stdin"
+msgstr "git name-rev [选项] --stdin"
-#: builtin/commit.c:729
-msgid "could not read MERGE_MSG"
-msgstr "不能读取 MERGE_MSG"
+#: builtin/name-rev.c:309
+msgid "print only names (no SHA-1)"
+msgstr "只打印名称（无 SHA-1）"
-#: builtin/commit.c:733
-msgid "could not read SQUASH_MSG"
-msgstr "不能读取 SQUASH_MSG"
+#: builtin/name-rev.c:310
+msgid "only use tags to name the commits"
+msgstr "只使用 tags 来命名提交"
-#: builtin/commit.c:737
-#, c-format
-msgid "could not read '%s'"
-msgstr "不能读取 '%s'"
+#: builtin/name-rev.c:312
+msgid "only use refs matching <pattern>"
+msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/commit.c:765
-#, c-format
-msgid "could not open '%s'"
-msgstr "不能打开 '%s'"
+#: builtin/name-rev.c:314
+msgid "list all commits reachable from all refs"
+msgstr "列出可以从所有引用访问的提交"
-#: builtin/commit.c:789
-msgid "could not write commit template"
-msgstr "ä¸\8dè\83½å\86\99æ\8f\90交模ç\89\88"
+#: builtin/name-rev.c:315
+msgid "read from stdin"
+msgstr "ä»\8eæ \87å\87\86è¾\93å\85¥è¯»å\8f\96"
-# 译者：%s若翻为中文，前后不需要空格
-#: builtin/commit.c:799
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a %s.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr ""
-"\n"
-"看起来您正在提交一个%s。\n"
-"如果不是这样，请删除文件\n"
-"\t%s\n"
-"然后重试。\n"
+#: builtin/name-rev.c:316
+msgid "allow to print `undefined` names (default)"
+msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/commit.c:812
-msgid "Please enter the commit message for your changes."
-msgstr "请为您的修改输入提交说明。"
+#: builtin/name-rev.c:322
+msgid "dereference tags in the input (internal use)"
+msgstr "反向解析输入中的 tags（内部使用）"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:815
-msgid ""
-" Lines starting\n"
-"with '#' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"以 '#' 开头\n"
-"的行将被忽略，并且空的提交说明将会中止提交。\n"
+#: builtin/notes.c:24
+msgid "git notes [--ref <notes_ref>] [list [<object>]]"
+msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:820
+#: builtin/notes.c:25
msgid ""
-" Lines starting\n"
-"with '#' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
+"<object>] [<object>]"
msgstr ""
-"以 '#' 开头\n"
-"的行将被保留，您可以删除它们如果您想这样做的话。空的提交说明将会\n"
-"中止提交。\n"
+"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
+"象>] [<对象>]"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:832
-#, c-format
-msgid "%sAuthor: %s"
-msgstr "%s作者： %s"
+#: builtin/notes.c:26
+msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:839
-#, c-format
-msgid "%sCommitter: %s"
-msgstr "%s提交者： %s"
+#: builtin/notes.c:27
+msgid ""
+"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
+"<object>] [<object>]"
+msgstr ""
+"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
+">] [<对象>]"
-#: builtin/commit.c:859
-msgid "Cannot read index"
-msgstr "无法读取索引"
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes_ref>] edit [<object>]"
+msgstr "git notes [--ref <注解引用>] edit [<对象>]"
-#: builtin/commit.c:896
-msgid "Error building trees"
-msgstr "无法创建树对象"
+#: builtin/notes.c:29
+msgid "git notes [--ref <notes_ref>] show [<object>]"
+msgstr "git notes [--ref <注解引用>] show [<对象>]"
-#: builtin/commit.c:911 builtin/tag.c:357
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
-msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
+#: 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/commit.c:1008
-#, c-format
-msgid "No existing author found with '%s'"
-msgstr "没有找到匹配 '%s' 的作者"
+#: builtin/notes.c:31
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
-#: builtin/commit.c:1023 builtin/commit.c:1217
-#, c-format
-msgid "Invalid untracked files mode '%s'"
-msgstr "无效的未追踪文件参数 '%s'"
+#: builtin/notes.c:32
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
-#: builtin/commit.c:1063
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "同时使用 --reset-author 和 --author 没有意义"
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes_ref>] remove [<object>...]"
+msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
-#: builtin/commit.c:1074
-msgid "You have nothing to amend."
-msgstr "您没有可修补的提交。"
+#: builtin/notes.c:34
+msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
+msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
-# 译者：%s若翻为中文，前后不需要空格
-#: builtin/commit.c:1076
-#, c-format
-msgid "You are in the middle of a %s -- cannot amend."
-msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes_ref>] get-ref"
+msgstr "git notes [--ref <注解引用>] get-ref"
-#: builtin/commit.c:1078
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "选项 --squash 和 --fixup 不能共用"
+#: builtin/notes.c:40
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<对象>]]"
-#: builtin/commit.c:1088
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
+#: builtin/notes.c:45
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<选项>] [<对象>]"
-#: builtin/commit.c:1090
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
+#: builtin/notes.c:50
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<选项>] <源对象> <目标对象>"
-#: builtin/commit.c:1098
-msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
+#: builtin/notes.c:51
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
-#: builtin/commit.c:1115
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
+#: builtin/notes.c:56
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<选项>] [<对象>]"
-#: builtin/commit.c:1117
-msgid "No paths with --include/--only does not make sense."
-msgstr "参数 --include/--only 不跟路径没有意义。"
+#: builtin/notes.c:61
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<对象>]"
-#: builtin/commit.c:1119
-msgid "Clever... amending the last one with dirty index."
-msgstr "聪明... 在索引不干净下修补最后的提交。"
+#: builtin/notes.c:66
+msgid "git notes show [<object>]"
+msgstr "git notes show [<对象>]"
-#: builtin/commit.c:1121
-msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
-msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
+#: builtin/notes.c:71
+msgid "git notes merge [<options>] <notes_ref>"
+msgstr "git notes merge [<选项>] <注解引用>"
-#: builtin/commit.c:1131 builtin/tag.c:556
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "无效的清理模式 %s"
+#: builtin/notes.c:72
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<选项>]"
-#: builtin/commit.c:1136
-msgid "Paths with -a does not make sense."
-msgstr "路径和 -a 选项共用没有意义。"
+#: builtin/notes.c:73
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<选项>]"
-#: builtin/commit.c:1315
-msgid "couldn't look up newly created commit"
-msgstr "无法找到新创建的提交"
+#: builtin/notes.c:78
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<对象>]"
-#: builtin/commit.c:1317
-msgid "could not parse newly created commit"
-msgstr "不能解析新创建的提交"
+#: builtin/notes.c:83
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<选项>]"
-#: builtin/commit.c:1358
-msgid "detached HEAD"
-msgstr "分离头指针"
+#: builtin/notes.c:88
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:1360
-msgid " (root-commit)"
-msgstr "（根提交）"
+#: builtin/notes.c:136
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "不能为对象 '%s' 开始 'show'"
-#: builtin/commit.c:1450
-msgid "could not parse HEAD commit"
-msgstr "ä¸\8dè\83½è§£æ\9e\90 HEAD æ\8f\90交"
+#: builtin/notes.c:140
+msgid "could not read 'show' output"
+msgstr "ä¸\8dè\83½è¯»å\8f\96 'show' ç\9a\84è¾\93å\87º"
-#: builtin/commit.c:1487 builtin/merge.c:509
+#: builtin/notes.c:148
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "不能为读入打开 '%s'"
+msgid "failed to finish 'show' for object '%s'"
+msgstr "无法为对象 '%s' 完成 'show'"
-#: builtin/commit.c:1494
+#: builtin/notes.c:166 builtin/tag.c:477
#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr "损坏的 MERGE_HEAD 文件（%s）"
+msgid "could not create file '%s'"
+msgstr "不能创建文件 '%s'"
-#: builtin/commit.c:1501
-msgid "could not read MERGE_MODE"
-msgstr "不能读取 MERGE_MODE"
+#: builtin/notes.c:185
+msgid "Please supply the note contents using either -m or -F option"
+msgstr "请通过 -m 或 -F 选项为注解提供内容"
-#: builtin/commit.c:1520
+#: builtin/notes.c:206 builtin/notes.c:847
#, c-format
-msgid "could not read commit message: %s"
-msgstr "不能读取提交说明：%s"
+msgid "Removing note for object %s\n"
+msgstr "删除对象 %s 的注解\n"
-#: builtin/commit.c:1534
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "终止提交；您未更改来自模版的提交说明。\n"
+#: builtin/notes.c:211
+msgid "unable to write note object"
+msgstr "不能写注解对象"
-#: builtin/commit.c:1539
+#: builtin/notes.c:213
#, c-format
-msgid "Aborting commit due to empty commit message.\n"
-msgstr "终止提交因为提交说明为空。\n"
-
-#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
-msgid "failed to write commit object"
-msgstr "无法写提交对象"
-
-#: builtin/commit.c:1575
-msgid "cannot lock HEAD ref"
-msgstr "无法锁定 HEAD 引用"
-
-#: builtin/commit.c:1579
-msgid "cannot update HEAD ref"
-msgstr "无法更新 HEAD 引用"
-
-#: builtin/commit.c:1590
-msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full or quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
-msgstr ""
-"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
-"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
+msgid "The note contents have been left in %s"
+msgstr "注解内容被留在 %s 中"
-#: builtin/describe.c:234
+#: builtin/notes.c:247 builtin/tag.c:693
#, c-format
-msgid "annotated tag %s not available"
-msgstr "注释 tag %s 无效"
+msgid "cannot read '%s'"
+msgstr "不能读取 '%s'"
-#: builtin/describe.c:238
+#: builtin/notes.c:249 builtin/tag.c:696
#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "注释 tag %s 没有嵌入名称"
+msgid "could not open or read '%s'"
+msgstr "不能打开或读取 '%s'"
-#: builtin/describe.c:240
+#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321
+#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518
+#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640
+#: builtin/notes.c:842 builtin/tag.c:709
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "tag '%s' 的确是在 '%s'"
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/describe.c:267
+#: builtin/notes.c:271
#, c-format
-msgid "Not a valid object name %s"
-msgstr "不是一个有效的对象名 %s"
+msgid "Failed to read object '%s'."
+msgstr "无法读取对象 '%s'。"
-#: builtin/describe.c:270
+#: builtin/notes.c:275
#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一个有效的 '%s' 对象"
+msgid "Cannot read note data from non-blob object '%s'."
+msgstr "不能从非数据对象 '%s' 中读取注解数据"
-#: builtin/describe.c:287
+#: builtin/notes.c:315
#, c-format
-msgid "no tag exactly matches '%s'"
-msgstr "没有 tag 准确匹配 '%s'"
+msgid "Malformed input line: '%s'."
+msgstr "非法的输入行：'%s'。"
-#: builtin/describe.c:289
+#: builtin/notes.c:330
#, c-format
-msgid "searching to describe %s\n"
-msgstr "æ\90\9cç´¢æ\8f\8fè¿° %s\n"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "æ\97 æ³\95ä»\8e '%s' å\88° '%s' æ\8b·è´\9d注解"
-#: builtin/describe.c:329
-#, c-format
-msgid "finished search at %s\n"
-msgstr "完成搜索 %s\n"
+#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501
+#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633
+#: builtin/notes.c:907
+msgid "too many parameters"
+msgstr "参数太多"
-#: builtin/describe.c:353
+#: builtin/notes.c:387 builtin/notes.c:646
#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
-msgstr ""
-"没有注释 tag 能描述 '%s'。\n"
-"然而，有非注释 tag：尝试 --tags。"
+msgid "No note found for object %s."
+msgstr "未发现对象 %s 的注解。"
-#: builtin/describe.c:357
-#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
-msgstr ""
-"没有注释 tag 能描述 '%s'。\n"
-"尝试 --always，或者创建一些 tag。"
+#: builtin/notes.c:409 builtin/notes.c:566
+msgid "note contents as a string"
+msgstr "注解内容作为一个字符串"
-#: builtin/describe.c:378
-#, c-format
-msgid "traversed %lu commits\n"
-msgstr "已遍历 %lu 个提交\n"
+#: builtin/notes.c:412 builtin/notes.c:569
+msgid "note contents in a file"
+msgstr "注解内容到一个文件中"
-#: builtin/describe.c:381
-#, 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/notes.c:414 builtin/notes.c:417 builtin/notes.c:571
+#: builtin/notes.c:574 builtin/tag.c:628
+msgid "object"
+msgstr "对象"
-#: builtin/describe.c:436
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long 与 --abbrev=0 不兼容"
+#: builtin/notes.c:415 builtin/notes.c:572
+msgid "reuse and edit specified note object"
+msgstr "重用和编辑指定的注解对象"
-#: builtin/describe.c:462
-msgid "No names found, cannot describe anything."
-msgstr "没有发现名称，无法描述任何东西。"
+#: builtin/notes.c:418 builtin/notes.c:575
+msgid "reuse specified note object"
+msgstr "重用指定的注解对象"
-#: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
-msgstr "--dirty 不能与提交共用"
+#: builtin/notes.c:420 builtin/notes.c:488
+msgid "replace existing notes"
+msgstr "替换已存在的注解"
-#: builtin/diff.c:77
+#: builtin/notes.c:454
#, c-format
-msgid "'%s': not a regular file or symlink"
-msgstr "'%s'：不是一个正规文件或符号链接"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/diff.c:220
+#: builtin/notes.c:459 builtin/notes.c:536
#, c-format
-msgid "invalid option: %s"
-msgstr "无效选项：%s"
+msgid "Overwriting existing notes for object %s\n"
+msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/diff.c:297
-msgid "Not a git repository"
-msgstr "ä¸\8dæ\98¯ä¸\80个 git ç\89\88æ\9c¬åº\93"
+#: builtin/notes.c:489
+msgid "read objects from stdin"
+msgstr "ä»\8eæ \87å\87\86è¾\93å\85¥è¯»å\8f\96对象"
-#: builtin/diff.c:347
-#, c-format
-msgid "invalid object '%s' given."
-msgstr "提供了无效对象 '%s'。"
+#: builtin/notes.c:491
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
-#: builtin/diff.c:352
-#, c-format
-msgid "more than %d trees given: '%s'"
-msgstr "提供了超过 %d 个树对象：'%s'"
+#: builtin/notes.c:509
+msgid "too few parameters"
+msgstr "参数太少"
-#: builtin/diff.c:362
+#: builtin/notes.c:530
#, c-format
-msgid "more than two blobs given: '%s'"
-msgstr "提供了超过两个 blob 对象：'%s'"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/diff.c:370
+#: builtin/notes.c:542
#, c-format
-msgid "unhandled object '%s' given."
-msgstr "提供了无法处理的对象 '%s'。"
-
-#: builtin/fetch.c:200
-msgid "Couldn't find remote ref HEAD"
-msgstr "无法发现远程 HEAD 引用"
+msgid "Missing notes on source object %s. Cannot copy."
+msgstr "源对象 %s 缺少注解。不能拷贝。"
-#: builtin/fetch.c:253
+#: builtin/notes.c:591
#, c-format
-msgid "object %s not found"
-msgstr "对象 %s 未发现"
+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/fetch.c:259
-msgid "[up to date]"
-msgstr "[最新]"
+#: builtin/notes.c:738
+msgid "General options"
+msgstr "通用选项"
-#: builtin/fetch.c:273
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"
+#: builtin/notes.c:740
+msgid "Merge options"
+msgstr "合并选项"
-#: builtin/fetch.c:274 builtin/fetch.c:360
-msgid "[rejected]"
-msgstr "[已拒绝]"
+#: builtin/notes.c:742
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/fetch.c:285
-msgid "[tag update]"
-msgstr "[tag更新]"
+#: builtin/notes.c:744
+msgid "Committing unmerged notes"
+msgstr "提交未合并的注解"
-# 译者：注意保持前导空格
-#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
-msgid " (unable to update local ref)"
-msgstr " （不能更新本地引用）"
+#: builtin/notes.c:746
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/fetch.c:305
-msgid "[new tag]"
-msgstr "[新tag]"
+#: builtin/notes.c:748
+msgid "Aborting notes merge resolution"
+msgstr "中止注解合并的方案"
-#: builtin/fetch.c:308
-msgid "[new branch]"
-msgstr "[新分支]"
+#: builtin/notes.c:750
+msgid "abort notes merge"
+msgstr "中止注解合并"
+
+#: builtin/notes.c:845
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "对象 %s 没有注解\n"
-#: builtin/fetch.c:311
-msgid "[new ref]"
-msgstr "[新引用]"
+#: builtin/notes.c:857
+msgid "attempt to remove non-existent note is not an error"
+msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/fetch.c:356
-msgid "unable to update local ref"
-msgstr "ä¸\8dè\83½æ\9b´æ\96°æ\9c¬å\9c°å¼\95ç\94¨"
+#: builtin/notes.c:860
+msgid "read object names from the standard input"
+msgstr "ä»\8eæ \87å\87\86è¾\93å\85¥è¯»å\8f\96对象å\90\8d称"
-#: builtin/fetch.c:356
-msgid "forced update"
-msgstr "强制更新"
+#: builtin/notes.c:941
+msgid "notes-ref"
+msgstr "注解引用"
-#: builtin/fetch.c:362
-msgid "(non-fast-forward)"
-msgstr "（非快进式）"
+#: builtin/notes.c:942
+msgid "use notes from <notes_ref>"
+msgstr "从 <注解引用> 使用注解"
-#: builtin/fetch.c:393 builtin/fetch.c:685
+#: builtin/notes.c:977 builtin/remote.c:1624
#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "无法打开 %s：%s\n"
+msgid "Unknown subcommand: %s"
+msgstr "未知子命令：%s"
+
+#: builtin/pack-objects.c:28
+msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
+msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
+
+#: builtin/pack-objects.c:29
+msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
+msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
-#: builtin/fetch.c:402
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
-msgid "%s did not send all necessary objects\n"
-msgstr "%s 未发送所有必须的对象\n"
+msgid "deflate error (%d)"
+msgstr "压缩错误 (%d)"
+
+#: builtin/pack-objects.c:773
+msgid "Writing objects"
+msgstr "写入对象中"
+
+#: builtin/pack-objects.c:1015
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/fetch.c:488
+#: builtin/pack-objects.c:2175
+msgid "Compressing objects"
+msgstr "压缩对象中"
+
+#: builtin/pack-objects.c:2572
#, c-format
-msgid "From %.*s\n"
-msgstr "来自 %.*s\n"
+msgid "unsupported index version %s"
+msgstr "不支持的索引版本 %s"
-#: builtin/fetch.c:499
+#: builtin/pack-objects.c:2576
#, 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' 来删除旧的、有冲突的分支"
+msgid "bad index version '%s'"
+msgstr "坏的索引版本 '%s'"
-# 译者：注意保持前导空格
-#: builtin/fetch.c:549
+#: builtin/pack-objects.c:2599
#, c-format
-msgid " (%s will become dangling)\n"
-msgstr " （%s 将成为悬空状态）\n"
+msgid "option %s does not accept negative form"
+msgstr "选项 %s 不接受否定格式"
-# 译者：注意保持前导空格
-#: builtin/fetch.c:550
+#: builtin/pack-objects.c:2603
#, c-format
-msgid " (%s has become dangling)\n"
-msgstr " （%s 已成为悬空状态）\n"
+msgid "unable to parse value '%s' for option %s"
+msgstr "不能解析选项 %1$s 的值 '%2$s'"
-#: builtin/fetch.c:557
-msgid "[deleted]"
-msgstr "[已删除]"
+#: builtin/pack-objects.c:2622
+msgid "do not show progress meter"
+msgstr "不显示进度表"
-#: builtin/fetch.c:558
-msgid "(none)"
-msgstr "（无）"
+#: builtin/pack-objects.c:2624
+msgid "show progress meter"
+msgstr "显示进度表"
-#: builtin/fetch.c:675
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒绝获取到非裸版本库的当前分支 %s"
+#: builtin/pack-objects.c:2626
+msgid "show progress meter during object writing phase"
+msgstr "在对象写入阶段显示进度表"
-#: builtin/fetch.c:709
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "不知道如何从 %s 获取"
+#: builtin/pack-objects.c:2629
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/fetch.c:786
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
+#: builtin/pack-objects.c:2630
+msgid "version[,offset]"
+msgstr "版本[,偏移]"
-#: builtin/fetch.c:789
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "选项 \"%s\" 对于 %s 被忽略\n"
+#: builtin/pack-objects.c:2631
+msgid "write the pack index file in the specified idx format version"
+msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/fetch.c:888
-#, c-format
-msgid "Fetching %s\n"
-msgstr "正在获取 %s\n"
+#: builtin/pack-objects.c:2634
+msgid "maximum size of each output pack file"
+msgstr "每个输出包的最大尺寸"
-#: builtin/fetch.c:890
-#, c-format
-msgid "Could not fetch %s"
-msgstr "不能获取 %s"
+#: builtin/pack-objects.c:2636
+msgid "ignore borrowed objects from alternate object store"
+msgstr "忽略从替代对象存储里借用对象"
-#: builtin/fetch.c:907
-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/pack-objects.c:2638
+msgid "ignore packed objects"
+msgstr "忽略包对象"
-#: builtin/fetch.c:927
-msgid "You need to specify a tag name."
-msgstr "您需要指定一个 tag 名称。"
+#: builtin/pack-objects.c:2640
+msgid "limit pack window by objects"
+msgstr "限制打包窗口的对象数"
-#: builtin/fetch.c:979
-msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all 不能带一个版本库参数"
+#: builtin/pack-objects.c:2642
+msgid "limit pack window by memory in addition to object limit"
+msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/fetch.c:981
-msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all 带引用表达式没有任何意义"
+#: builtin/pack-objects.c:2644
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "打包允许的 delta 链的最大长度"
-#: builtin/fetch.c:992
-#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "没有这样的远程或远程组：%s"
+#: builtin/pack-objects.c:2646
+msgid "reuse existing deltas"
+msgstr "重用已存在的 deltas"
-#: builtin/fetch.c:1000
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "获取组并指定引用表达式没有意义"
+#: builtin/pack-objects.c:2648
+msgid "reuse existing objects"
+msgstr "重用已存在的对象"
-#: builtin/gc.c:63
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "无效的 %s：'%s'"
+#: builtin/pack-objects.c:2650
+msgid "use OFS_DELTA objects"
+msgstr "使用 OFS_DELTA 对象"
-#: builtin/gc.c:90
-#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "不正常的长对象目录 %.*s"
+#: builtin/pack-objects.c:2652
+msgid "use threads when searching for best delta matches"
+msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/gc.c:221
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr "自动打包版本库以求最佳性能。\n"
+#: builtin/pack-objects.c:2654
+msgid "do not create an empty pack output"
+msgstr "不创建空的包输出"
-#: builtin/gc.c:224
-#, c-format
-msgid ""
-"Auto packing the repository for optimum performance. You may also\n"
-"run \"git gc\" manually. See \"git help gc\" for more information.\n"
-msgstr ""
-"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
-"参见 \"git help gc\" 以获取更多信息。\n"
+#: builtin/pack-objects.c:2656
+msgid "read revision arguments from standard input"
+msgstr "从标准输入读取修订号参数"
-#: builtin/gc.c:251
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
+#: builtin/pack-objects.c:2658
+msgid "limit the objects to those that are not yet packed"
+msgstr "限制那些尚未打包的对象"
-#: builtin/grep.c:216
-#, c-format
-msgid "grep: failed to create thread: %s"
-msgstr "grep：无法创建线程：%s"
+#: builtin/pack-objects.c:2661
+msgid "include objects reachable from any reference"
+msgstr "包括可以从任何引用访问到的对象"
-#: builtin/grep.c:402
-#, c-format
-msgid "Failed to chdir: %s"
-msgstr "无法切换目录：%s"
+#: builtin/pack-objects.c:2664
+msgid "include objects referred by reflog entries"
+msgstr "包括被引用日志引用到的对象"
-#: builtin/grep.c:478 builtin/grep.c:512
-#, c-format
-msgid "unable to read tree (%s)"
-msgstr "无法读取树（%s）"
+#: builtin/pack-objects.c:2667
+msgid "include objects referred to by the index"
+msgstr "包括被索引引用到的对象"
-#: builtin/grep.c:526
-#, c-format
-msgid "unable to grep from object of type %s"
-msgstr "无法抓取来自于 %s 类型的对象"
+#: builtin/pack-objects.c:2670
+msgid "output pack to stdout"
+msgstr "输出包到标准输出"
-#: builtin/grep.c:584
-#, c-format
-msgid "switch `%c' expects a numerical value"
-msgstr "开关 `%c' 期望一个数字值"
+#: builtin/pack-objects.c:2672
+msgid "include tag objects that refer to objects to be packed"
+msgstr "包括引用了打包对象的 tag"
-#: builtin/grep.c:601
-#, c-format
-msgid "cannot open '%s'"
-msgstr "不能打开 '%s'"
+#: builtin/pack-objects.c:2674
+msgid "keep unreachable objects"
+msgstr "维持不可达的对象"
-#: builtin/grep.c:888
-msgid "no pattern given."
-msgstr "æ\9cªæ\8f\90ä¾\9b模å¼\8få\8c¹é\85\8dã\80\82"
+#: builtin/pack-objects.c:2675 parse-options.h:140
+msgid "time"
+msgstr "æ\97¶é\97´"
-#: builtin/grep.c:902
-#, c-format
-msgid "bad object %s"
-msgstr "坏对象 %s"
+#: builtin/pack-objects.c:2676
+msgid "unpack unreachable objects newer than <time>"
+msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/grep.c:943
-msgid "--open-files-in-pager only works on the worktree"
-msgstr "--open-files-in-pager 仅用于工作区"
+#: builtin/pack-objects.c:2679
+msgid "create thin packs"
+msgstr "创建精简包"
-#: builtin/grep.c:966
-msgid "--cached or --untracked cannot be used with --no-index."
-msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
+#: builtin/pack-objects.c:2681
+msgid "ignore packs that have companion .keep file"
+msgstr "忽略配有 .keep 文件的包"
-#: builtin/grep.c:971
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index 或 --untracked 不能和版本共用。"
+#: builtin/pack-objects.c:2683
+msgid "pack compression level"
+msgstr "打包压缩级别"
-#: builtin/grep.c:974
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
-msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
+#: builtin/pack-objects.c:2685
+msgid "do not hide commits by grafts"
+msgstr "显示被嫁接隐藏的提交"
-#: builtin/grep.c:982
-msgid "both --cached and trees are given."
-msgstr "同时给出了 --cached 和树对象。"
+#: builtin/pack-objects.c:2687
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/init-db.c:35
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "不能设置 %s 为组可写"
+#: builtin/pack-objects.c:2689
+msgid "write a bitmap index together with the pack index"
+msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/init-db.c:62
-#, c-format
-msgid "insanely long template name %s"
-msgstr "太长的模版名 %s"
+#: builtin/pack-objects.c:2778
+msgid "Counting objects"
+msgstr "对象计数中"
-#: builtin/init-db.c:67
-#, c-format
-msgid "cannot stat '%s'"
-msgstr "不能枚举 '%s' 状态"
+#: builtin/pack-refs.c:6
+msgid "git pack-refs [options]"
+msgstr "git pack-refs [选项]"
-#: builtin/init-db.c:73
-#, c-format
-msgid "cannot stat template '%s'"
-msgstr "不能枚举模版 '%s' 状态"
+#: builtin/pack-refs.c:14
+msgid "pack everything"
+msgstr "打包一切"
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot opendir '%s'"
-msgstr "不能打开目录 '%s'"
+#: builtin/pack-refs.c:15
+msgid "prune loose refs (default)"
+msgstr "清除松散的引用（默认）"
-#: builtin/init-db.c:97
-#, c-format
-msgid "cannot readlink '%s'"
-msgstr "不能读取链接 '%s'"
+#: builtin/prune-packed.c:7
+msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
+msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
-#: builtin/init-db.c:99
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "太长的符号链接 %s"
+#: builtin/prune-packed.c:40
+msgid "Removing duplicate objects"
+msgstr "正在删除重复对象"
-#: builtin/init-db.c:102
-#, c-format
-msgid "cannot symlink '%s' '%s'"
-msgstr "不能自 '%s' 到 '%s' 创建符号链接"
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
-#: builtin/init-db.c:106
-#, c-format
-msgid "cannot copy '%s' to '%s'"
-msgstr "不能拷贝 '%s' 至 '%s'"
+#: builtin/prune.c:106
+msgid "do not remove, show only"
+msgstr "不删除，只显示"
-#: builtin/init-db.c:110
-#, c-format
-msgid "ignoring template %s"
-msgstr "忽略模版 %s"
+#: builtin/prune.c:107
+msgid "report pruned objects"
+msgstr "报告清除的对象"
-#: builtin/init-db.c:133
-#, c-format
-msgid "insanely long template path %s"
-msgstr "太长的模版路径 %s"
+#: builtin/prune.c:110
+msgid "expire objects older than <time>"
+msgstr "使早于给定时间的对象过期"
-#: builtin/init-db.c:141
-#, c-format
-msgid "templates not found %s"
-msgstr "模版未找到 %s"
+#: builtin/push.c:14
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
-#: builtin/init-db.c:154
-#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "未复制错误版本 %d 的模版自 '%s'"
+#: builtin/push.c:85
+msgid "tag shorthand without <tag>"
+msgstr "tag 简写没有跟 <tag> 参数"
-#: builtin/init-db.c:192
-#, c-format
-msgid "insane git directory %s"
-msgstr "不正常的 git 目录 %s"
+#: builtin/push.c:95
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete 只接受简单的目标引用名"
+
+#: 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/init-db.c:322 builtin/init-db.c:325
+#: builtin/push.c:142
#, c-format
-msgid "%s already exists"
-msgstr "%s 已经存在"
+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/init-db.c:354
+#: builtin/push.c:157
#, c-format
-msgid "unable to handle file type %d"
-msgstr "不能处理 %d 类型的文件"
+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:<name-of-remote-branch>\n"
-#: builtin/init-db.c:357
+#: builtin/push.c:171
#, c-format
-msgid "unable to move %s to %s"
-msgstr "不能移动 %s 至 %s"
+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/init-db.c:362
+#: builtin/push.c:179
#, c-format
-msgid "Could not create git link %s"
-msgstr "不能创建 git link %s"
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
-#.
-#. * 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:419
+#: builtin/push.c:182
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s Git 版本库于 %s%s\n"
+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/init-db.c:420
-msgid "Reinitialized existing"
-msgstr "重新初始化现存的"
+# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
+#: builtin/push.c:205
+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)"
+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'）"
+
+#: builtin/push.c:272
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "您没有为推送指定任何引用规则，并且 push.default 为 \"nothing\"。"
+
+#: 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/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/init-db.c:420
-msgid "Initialized empty"
-msgstr "初始化空的"
+#: 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/init-db.c:421
-msgid " shared"
-msgstr "共享"
+#: builtin/push.c:298
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "更新被拒绝因为 tag 在远程已经存在。"
-#: builtin/init-db.c:440
-msgid "cannot tell cwd"
-msgstr "无法获知当前路径"
+#: 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/init-db.c:521 builtin/init-db.c:528
+#: builtin/push.c:360
#, c-format
-msgid "cannot mkdir %s"
-msgstr "不能创建目录 %s"
+msgid "Pushing to %s\n"
+msgstr "推送到 %s\n"
-#: builtin/init-db.c:532
+#: builtin/push.c:364
#, c-format
-msgid "cannot chdir to %s"
-msgstr "不能切换目录到 %s"
+msgid "failed to push some refs to '%s'"
+msgstr "无法推送一些引用到 '%s'"
-#: builtin/init-db.c:554
+#: builtin/push.c:394
#, c-format
+msgid "bad repository '%s'"
+msgstr "坏的版本库 '%s'"
+
+#: builtin/push.c:395
msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+"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 ""
-"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"
-"dir=<directory>）"
-
-#: builtin/init-db.c:578
-msgid "Cannot access current working directory"
-msgstr "不能访问当前工作目录"
+"没有配置推送目标。\n"
+"或通过命令行指定URL，或用下面命令配置一个远程版本库\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"然后使用该远程版本库名执行推送\n"
+"\n"
+" git push <name>\n"
-#: builtin/init-db.c:585
-#, c-format
-msgid "Cannot access work tree '%s'"
-msgstr "不能访问工作区 '%s'"
+#: builtin/push.c:410
+msgid "--all and --tags are incompatible"
+msgstr "--all 和 --tags 不兼容"
-#: builtin/log.c:187
-#, c-format
-msgid "Final output: %d %s\n"
-msgstr "最终输出：%d %s\n"
+#: builtin/push.c:411
+msgid "--all can't be combined with refspecs"
+msgstr "--all 不能和引用规则同时使用"
-#: builtin/log.c:395 builtin/log.c:483
-#, c-format
-msgid "Could not read object %s"
-msgstr "不能读取对象 %s"
+#: builtin/push.c:416
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror 和 --tags 不兼容"
-#: builtin/log.c:507
-#, c-format
-msgid "Unknown type: %d"
-msgstr "未知类型：%d"
+#: builtin/push.c:417
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror 不能和引用规则同时使用"
-#: builtin/log.c:596
-msgid "format.headers without value"
-msgstr "format.headers 没有值"
+#: builtin/push.c:422
+msgid "--all and --mirror are incompatible"
+msgstr "--all 和 --mirror 不兼容"
-#: builtin/log.c:669
-msgid "name of output directory is too long"
-msgstr "输出目录名太长"
+#: builtin/push.c:493
+msgid "repository"
+msgstr "版本库"
-#: builtin/log.c:680
-#, c-format
-msgid "Cannot open patch file %s"
-msgstr "无法打开补丁文件 %s"
+#: builtin/push.c:494
+msgid "push all refs"
+msgstr "推送所有引用"
-#: builtin/log.c:694
-msgid "Need exactly one range."
-msgstr "只需要一个范围。"
+#: builtin/push.c:495
+msgid "mirror all refs"
+msgstr "镜像所有引用"
-#: builtin/log.c:702
-msgid "Not a range."
-msgstr "不是一个范围。"
+#: builtin/push.c:497
+msgid "delete refs"
+msgstr "删除引用"
-#: builtin/log.c:739
-msgid "Could not extract email from committer identity."
-msgstr "不能从提交者身份中提取邮件地址。"
+#: builtin/push.c:498
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "推送 tags（不能使用 --all or --mirror）"
-#: builtin/log.c:785
-msgid "Cover letter needs email format"
-msgstr "信封需要邮件地址格式"
+#: builtin/push.c:501
+msgid "force updates"
+msgstr "强制更新"
-#: builtin/log.c:879
-#, c-format
-msgid "insane in-reply-to: %s"
-msgstr "不正常的 in-reply-to：%s"
+#: builtin/push.c:503
+msgid "refname>:<expect"
+msgstr "引用名>:<期望值"
-#: builtin/log.c:952
-msgid "Two output directories?"
-msgstr "两个输出目录？"
+#: builtin/push.c:504
+msgid "require old value of ref to be at this value"
+msgstr "要求引用旧的取值为设定值"
-#: builtin/log.c:1173
-#, c-format
-msgid "bogus committer info %s"
-msgstr "虚假的提交者信息 %s"
+#: builtin/push.c:507
+msgid "control recursive pushing of submodules"
+msgstr "控制子模组的递归推送"
-#: builtin/log.c:1218
-msgid "-n and -k are mutually exclusive."
-msgstr "-n 和 -k 互斥。"
+#: builtin/push.c:509
+msgid "use thin pack"
+msgstr "使用精简打包"
-#: builtin/log.c:1220
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix 和 -k 互斥。"
+#: builtin/push.c:510 builtin/push.c:511
+msgid "receive pack program"
+msgstr "接收包程序"
-#: builtin/log.c:1225 builtin/shortlog.c:284
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "未识别的参数：%s"
+#: builtin/push.c:512
+msgid "set upstream for git pull/status"
+msgstr "设置 git pull/status 的上游"
-#: builtin/log.c:1228
-msgid "--name-only does not make sense"
-msgstr "--name-only 无意义"
+#: builtin/push.c:515
+msgid "prune locally removed refs"
+msgstr "清除本地删除的引用"
-#: builtin/log.c:1230
-msgid "--name-status does not make sense"
-msgstr "--name-status 无意义"
+#: builtin/push.c:517
+msgid "bypass pre-push hook"
+msgstr "绕过 pre-push 钩子"
-#: builtin/log.c:1232
-msgid "--check does not make sense"
-msgstr "--check 无意义"
+#: builtin/push.c:518
+msgid "push missing but relevant tags"
+msgstr "推送缺失的有关的 tags"
-#: builtin/log.c:1255
-msgid "standard output, or directory, which one?"
-msgstr "标准输出或目录，哪一个？"
+#: builtin/push.c:520
+msgid "GPG sign the push"
+msgstr "用 GPG 为推送签名"
-#: builtin/log.c:1257
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "不能创建目录 '%s'"
+#: builtin/push.c:529
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/log.c:1410
-msgid "Failed to create output files"
-msgstr "无法创建输出文件"
+#: builtin/push.c:531
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete 未接任何引用没有意义"
-#: builtin/log.c:1514
-#, c-format
+#: builtin/read-tree.c:37
msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
+"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/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
-#, c-format
-msgid "Unknown commit %s"
-msgstr "未知提交 %s"
+#: builtin/read-tree.c:110
+msgid "write resulting index to <file>"
+msgstr "将索引结果写入 <file>"
-#: builtin/merge.c:90
-msgid "switch `m' requires a value"
-msgstr "å¼\80å\85³ `m' é\9c\80è¦\81ä¸\80个å\80¼"
+#: builtin/read-tree.c:113
+msgid "only empty the index"
+msgstr "å\8fªæ\98¯æ¸\85空索å¼\95"
-#: builtin/merge.c:127
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "不能找到合并策略 '%s'。\n"
+#: builtin/read-tree.c:115
+msgid "Merging"
+msgstr "合并"
-#: builtin/merge.c:128
-#, c-format
-msgid "Available strategies are:"
-msgstr "可用的策略有："
+#: builtin/read-tree.c:117
+msgid "perform a merge in addition to a read"
+msgstr "读取之余再执行一个合并"
-#: builtin/merge.c:133
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "可用的自定义策略有："
+#: builtin/read-tree.c:119
+msgid "3-way merge if no file level merging required"
+msgstr "如果没有文件级合并需要，执行三路合并"
-#: builtin/merge.c:240
-msgid "could not run stash."
-msgstr "不能进行进度保存。"
+#: builtin/read-tree.c:121
+msgid "3-way merge in presence of adds and removes"
+msgstr "存在添加和删除时，也执行三路合并"
-#: builtin/merge.c:245
-msgid "stash failed"
-msgstr "进度保存失败"
+#: builtin/read-tree.c:123
+msgid "same as -m, but discard unmerged entries"
+msgstr "类似于 -m，但丢弃未合并的条目"
-#: builtin/merge.c:250
-#, c-format
-msgid "not a valid object: %s"
-msgstr "不是一个有效对象：%s"
+#: builtin/read-tree.c:124
+msgid "<subdirectory>/"
+msgstr "<子目录>/"
-#: builtin/merge.c:269 builtin/merge.c:286
-msgid "read-tree failed"
-msgstr "读å\8f\96æ \91失败"
+#: builtin/read-tree.c:125
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "读å\8f\96æ \91对象å\88°ç´¢å¼\95ç\9a\84 <å\90ç\9b®å½\95>/ ä¸\8b"
-# 译者：注意保持前导空格
-#: builtin/merge.c:316
-msgid " (nothing to squash)"
-msgstr " （无可压缩）"
+#: builtin/read-tree.c:128
+msgid "update working tree with merge result"
+msgstr "用合并的结果更新工作区"
-#: builtin/merge.c:329
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "压缩提交 -- 未更新 HEAD\n"
+#: builtin/read-tree.c:130
+msgid "gitignore"
+msgstr "gitignore"
-#: builtin/merge.c:361
-msgid "Writing SQUASH_MSG"
-msgstr "å\86\99å\85¥ SQUASH_MSG"
+#: builtin/read-tree.c:131
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "å\85\81许忽ç\95¥æ\96\87件ä¸è®¾å®\9aç\9a\84æ\96\87件å\8f¯ä»¥è¢«è¦\86ç\9b\96"
-#: builtin/merge.c:363
-msgid "Finishing SQUASH_MSG"
-msgstr "å®\8cæ\88\90 SQUASH_MSG"
+#: 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/merge.c:386
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "无合并信息 -- 未更新 HEAD\n"
+#: builtin/read-tree.c:135
+msgid "don't update the index or the work tree"
+msgstr "不更新索引区和工作区"
-#: builtin/merge.c:437
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' 没有指向一个提交"
+#: builtin/read-tree.c:137
+msgid "skip applying sparse checkout filter"
+msgstr "跳过应用稀疏检出过滤器"
+
+#: builtin/read-tree.c:139
+msgid "debug unpack-trees"
+msgstr "调试 unpack-trees"
-#: builtin/merge.c:536
+#: builtin/reflog.c:499
#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
+msgid "%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-#: builtin/merge.c:629
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree 无法写入一树对象"
+#: builtin/reflog.c:615 builtin/reflog.c:620
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' 不是一个有效的时间戳"
-#: builtin/merge.c:679
-msgid "failed to read the cache"
-msgstr "无法读取缓存"
+#: builtin/remote.c:12
+msgid "git remote [-v | --verbose]"
+msgstr "git remote [-v | --verbose]"
-#: builtin/merge.c:697
-msgid "Unable to write index."
-msgstr "不能写索引。"
+#: 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>] <名称> <url>"
-#: builtin/merge.c:710
-msgid "Not handling anything other than two heads merge."
-msgstr "不能处理两个头合并之外的任何操作。"
+#: builtin/remote.c:14 builtin/remote.c:33
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <旧名称> <新名称>"
-#: builtin/merge.c:724
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知选项：-X%s"
+#: builtin/remote.c:15 builtin/remote.c:38
+msgid "git remote remove <name>"
+msgstr "git remote remove <名称>"
-#: builtin/merge.c:738
-#, c-format
-msgid "unable to write %s"
-msgstr "不能写 %s"
+#: builtin/remote.c:16
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
-#: builtin/merge.c:877
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "不能从 '%s' 读取"
+#: builtin/remote.c:17
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <名称>"
-#: builtin/merge.c:886
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
+#: builtin/remote.c:18
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <名称>"
-#: builtin/merge.c:892
+#: builtin/remote.c:19
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 '#' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
-"合并到主题分支。\n"
-"\n"
-"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
-#: builtin/merge.c:916
-msgid "Empty commit message."
-msgstr "空提交信息。"
+#: builtin/remote.c:20
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <名称> <分支>..."
-#: builtin/merge.c:928
-#, c-format
-msgid "Wonderful.\n"
-msgstr "太棒了。\n"
+#: builtin/remote.c:21 builtin/remote.c:69
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
-#: builtin/merge.c:993
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
+#: builtin/remote.c:22 builtin/remote.c:70
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <名称> <新的地址>"
-#: builtin/merge.c:1009
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' 不是一个提交"
+#: builtin/remote.c:23 builtin/remote.c:71
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <名称> <地址>"
-#: builtin/merge.c:1050
-msgid "No current branch."
-msgstr "没有当前分支。"
+#: builtin/remote.c:28
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<选项>] <名称> <地址>"
-#: builtin/merge.c:1052
-msgid "No remote for the current branch."
-msgstr "当前分支没有对应的远程版本库。"
+#: 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/merge.c:1054
-msgid "No default upstream defined for the current branch."
-msgstr "当前分支没有定义默认的上游分支。"
+#: builtin/remote.c:48
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <名称> <分支>..."
-#: builtin/merge.c:1059
-#, c-format
-msgid "No remote tracking branch for %s from %s"
-msgstr "%s 没有来自 %s 的远程跟踪分支"
+#: builtin/remote.c:49
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <名称> <分支>..."
-#: builtin/merge.c:1146 builtin/merge.c:1303
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - 不能被合并"
+#: builtin/remote.c:54
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<选项>] <名称>"
-#: builtin/merge.c:1214
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
+#: builtin/remote.c:59
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<选项>] <名称>"
-#: builtin/merge.c:1230 git-pull.sh:31
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
-msgstr ""
-"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
-"请在合并前先提交您的修改。"
+#: builtin/remote.c:64
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<选项>] [<组> | <远程>]..."
-#: builtin/merge.c:1233 git-pull.sh:34
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
+#: builtin/remote.c:88
+#, c-format
+msgid "Updating %s"
+msgstr "更新 %s 中"
-#: builtin/merge.c:1237
+#: builtin/remote.c:120
msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
-"请在合并前先提交您的修改。"
+"--mirror 选项危险且过时，请使用 --mirror=fetch\n"
+"\t 或 --mirror=push"
-#: builtin/merge.c:1240
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
+#: builtin/remote.c:137
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "未知的镜像参数：%s"
-#: builtin/merge.c:1249
-msgid "You cannot combine --squash with --no-ff."
-msgstr "æ\82¨ä¸\8dè\83½å°\86 --squash ä¸\8e --no-ff å\85±ç\94¨ã\80\82"
+#: builtin/remote.c:153
+msgid "fetch the remote branches"
+msgstr "æ\8a\93å\8f\96è¿\9cç¨\8bç\9a\84å\88\86æ\94¯"
-#: builtin/merge.c:1254
-msgid "You cannot combine --no-ff with --ff-only."
-msgstr "æ\82¨ä¸\8dè\83½å°\86 --no-ff ä¸\8e --ff-only å\85±ç\94¨ã\80\82"
+#: builtin/remote.c:155
+msgid "import all tags and associated objects when fetching"
+msgstr "æ\8a\93å\8f\96æ\97¶å¯¼å\85¥æ\89\80æ\9c\89ç\9a\84 tags å\92\8cå\85³è\81\94对象"
-#: builtin/merge.c:1261
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "æ\9cªæ\8c\87å®\9aæ\8f\90交并ä¸\94 merge.defaultToUpstream æ\9cªè®¾ç½®ã\80\82"
+#: builtin/remote.c:158
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "æ\88\96ä¸\8dæ\8a\93å\8f\96ä»»ä½\95 tagï¼\88--no-tagsï¼\89"
-#: builtin/merge.c:1293
-msgid "Can merge only exactly one commit into empty head"
-msgstr "只能将一个提交合并到空分支上"
+#: builtin/remote.c:160
+msgid "branch(es) to track"
+msgstr "跟踪的分支"
-#: builtin/merge.c:1296
-msgid "Squash commit into empty head not supported yet"
-msgstr "尚不支持到空分支的压缩提交"
+#: builtin/remote.c:161
+msgid "master branch"
+msgstr "主线分支"
-#: builtin/merge.c:1298
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "到空分支的非快进式提交没有意义"
+#: builtin/remote.c:162
+msgid "push|fetch"
+msgstr "push|fetch"
-#: builtin/merge.c:1413
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "更新 %s..%s\n"
+#: builtin/remote.c:163
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "把远程设置为用以推送或抓取的镜像"
-#: builtin/merge.c:1451
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "尝试非常小的索引内合并...\n"
+#: builtin/remote.c:175
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
-#: builtin/merge.c:1458
-#, c-format
-msgid "Nope.\n"
-msgstr "无。\n"
+#: builtin/remote.c:177
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/merge.c:1490
-msgid "Not possible to fast-forward, aborting."
-msgstr "无法快进，终止。"
+#: builtin/remote.c:185 builtin/remote.c:641
+#, c-format
+msgid "remote %s already exists."
+msgstr "远程 %s 已经存在。"
-#: builtin/merge.c:1513 builtin/merge.c:1592
+#: builtin/remote.c:189 builtin/remote.c:645
#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "将树回滚至原始状态...\n"
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' 不是一个有效的远程名称"
-#: builtin/merge.c:1517
+#: builtin/remote.c:233
#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "尝试合并策略 %s...\n"
+msgid "Could not setup master '%s'"
+msgstr "无法设置 master '%s'"
-#: builtin/merge.c:1583
+#: builtin/remote.c:333
#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "没æ\9c\89å\90\88并ç\96ç\95¥å¤\84ç\90\86æ¤å\90\88并ã\80\82\n"
+msgid "Could not get fetch map for refspec %s"
+msgstr "æ\97 æ³\95å¾\97å\88°å¼\95ç\94¨è§\84å\88\99 %s ç\9a\84è\8e·å\8f\96å\88\97表"
-#: builtin/merge.c:1585
+#: builtin/remote.c:434 builtin/remote.c:442
+msgid "(matching)"
+msgstr "（匹配）"
+
+#: builtin/remote.c:446
+msgid "(delete)"
+msgstr "（删除）"
+
+#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "使ç\94¨ç\96ç\95¥ %s å\90\88并失败ã\80\82\n"
+msgid "Could not append '%s' to '%s'"
+msgstr "ä¸\8dè\83½æ·»å\8a '%s' è\87³ '%s'"
-#: builtin/merge.c:1594
+#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "使用 %s 以准备手工解决。\n"
+msgid "No such remote: %s"
+msgstr "没有这样的远程：%s"
-#: builtin/merge.c:1606
+#: builtin/remote.c:651
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "自动合并进展顺利，按要求在提交前停止\n"
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/mv.c:108
+#: builtin/remote.c:657 builtin/remote.c:850
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
-msgstr "检查 '%s' 到 '%s' 的重命名\n"
+msgid "Could not remove config section '%s'"
+msgstr "不能移除配置小节 '%s'"
-#: builtin/mv.c:112
-msgid "bad source"
-msgstr "坏的源"
+#: builtin/remote.c:672
+#, 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/mv.c:115
-msgid "can not move directory into itself"
-msgstr "不能将目录移动到自身"
+#: builtin/remote.c:678
+#, c-format
+msgid "Could not append '%s'"
+msgstr "不能追加 '%s'"
-#: builtin/mv.c:118
-msgid "cannot move directory over file"
-msgstr "不能将目录移动到文件"
+#: builtin/remote.c:689
+#, c-format
+msgid "Could not set '%s'"
+msgstr "不能设置 '%s'"
-#: builtin/mv.c:128
+#: builtin/remote.c:711
#, c-format
-msgid "Huh? %.*s is in index?"
-msgstr "å\97¯ï¼\9f%.*s å\9c¨ç´¢å¼\95ä¸ï¼\9f"
+msgid "deleting '%s' failed"
+msgstr "å\88 é\99¤ '%s' 失败"
-#: builtin/mv.c:140
-msgid "source directory is empty"
-msgstr "源目录为空"
+#: builtin/remote.c:745
+#, c-format
+msgid "creating '%s' failed"
+msgstr "创建 '%s' 失败"
-#: builtin/mv.c:171
-msgid "not under version control"
-msgstr "不在版本控制之下"
+#: builtin/remote.c:769
+#, c-format
+msgid "Could not remove branch %s"
+msgstr "无法移除分支 %s"
-#: builtin/mv.c:173
-msgid "destination exists"
-msgstr "目标已存在"
+#: builtin/remote.c:836
+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/mv.c:181
+#: builtin/remote.c:951
#, c-format
-msgid "overwriting '%s'"
-msgstr "覆盖 '%s'"
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/mv.c:184
-msgid "Cannot overwrite"
-msgstr "不能覆盖"
+#: builtin/remote.c:954
+msgid " tracked"
+msgstr " 已跟踪"
-#: builtin/mv.c:187
-msgid "multiple sources for the same target"
-msgstr "同一目标具有多个源"
+#: builtin/remote.c:956
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/mv.c:202
-#, c-format
-msgid "%s, source=%s, destination=%s"
-msgstr "%s，源=%s，目标=%s"
+#: builtin/remote.c:958
+msgid " ???"
+msgstr " ???"
-#: builtin/mv.c:212
+#: builtin/remote.c:999
#, c-format
-msgid "Renaming %s to %s\n"
-msgstr "重命名 %s 至 %s\n"
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/mv.c:215
+#: builtin/remote.c:1006
#, c-format
-msgid "renaming '%s' failed"
-msgstr "重命名 '%s' 失败"
+msgid "rebases onto remote %s"
+msgstr "变基到远程 %s"
-#: builtin/notes.c:139
+#: builtin/remote.c:1009
#, c-format
-msgid "unable to start 'show' for object '%s'"
-msgstr "不能为对象 '%s' 开始 'show'"
+msgid " merges with remote %s"
+msgstr " 与远程 %s 合并"
-#: builtin/notes.c:145
-msgid "can't fdopen 'show' output fd"
-msgstr "不能打开 'show' 输出文件句柄"
+#: builtin/remote.c:1010
+msgid " and with remote"
+msgstr " 且有远程"
-#: builtin/notes.c:155
+#: builtin/remote.c:1012
#, c-format
-msgid "failed to close pipe to 'show' for object '%s'"
-msgstr "无法为对象 '%s' 的 'show' 关闭管道"
+msgid "merges with remote %s"
+msgstr "与远程 %s 合并"
-#: builtin/notes.c:158
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
-msgstr "无法为对象 '%s' 完成 'show'"
+#: builtin/remote.c:1013
+msgid " and with remote"
+msgstr " 且有远程"
-#: builtin/notes.c:175 builtin/tag.c:343
-#, c-format
-msgid "could not create file '%s'"
-msgstr "不能创建文件 '%s'"
+#: builtin/remote.c:1059
+msgid "create"
+msgstr "创建"
-#: builtin/notes.c:189
-msgid "Please supply the note contents using either -m or -F option"
-msgstr "请通过 -m 或 -F 选项为注解提供内容"
+#: builtin/remote.c:1062
+msgid "delete"
+msgstr "删除"
-#: builtin/notes.c:210 builtin/notes.c:973
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr "删除对象 %s 的注解\n"
+#: builtin/remote.c:1066
+msgid "up to date"
+msgstr "最新"
-#: builtin/notes.c:215
-msgid "unable to write note object"
-msgstr "不能写注解对象"
+#: builtin/remote.c:1069
+msgid "fast-forwardable"
+msgstr "可快进"
-#: builtin/notes.c:217
-#, c-format
-msgid "The note contents has been left in %s"
-msgstr "注解内容被留在文件 %s 中"
+#: builtin/remote.c:1072
+msgid "local out of date"
+msgstr "本地已过时"
-#: builtin/notes.c:251 builtin/tag.c:521
+#: builtin/remote.c:1079
#, c-format
-msgid "cannot read '%s'"
-msgstr "不能读取 '%s'"
+msgid " %-*s forces to %-*s (%s)"
+msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/notes.c:253 builtin/tag.c:524
+#: builtin/remote.c:1082
#, c-format
-msgid "could not open or read '%s'"
-msgstr "不能打开或读取 '%s'"
+msgid " %-*s pushes to %-*s (%s)"
+msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
-#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
-#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
-#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
+#: builtin/remote.c:1086
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "无法解析 '%s' 为一个有效引用。"
+msgid " %-*s forces to %s"
+msgstr " %-*s 强制推送至 %s"
-#: builtin/notes.c:275
+#: builtin/remote.c:1089
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "无法读取对象 '%s'。"
-
-#: builtin/notes.c:299
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的注解树"
+msgid " %-*s pushes to %s"
+msgstr " %-*s 推送至 %s"
-#: builtin/notes.c:340
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "坏的 notes.rewriteMode 值：'%s'"
+#: builtin/remote.c:1157
+msgid "do not query remotes"
+msgstr "不查询远程"
-#: builtin/notes.c:350
+#: builtin/remote.c:1184
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
+msgid "* remote %s"
+msgstr "* 远程 %s"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: builtin/notes.c:377
+#: builtin/remote.c:1185
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "坏的 %s 值：'%s'"
+msgid " Fetch URL: %s"
+msgstr " 获取地址：%s"
-#: builtin/notes.c:441
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "非法的输入行：'%s'。"
+#: builtin/remote.c:1186 builtin/remote.c:1333
+msgid "(no URL)"
+msgstr "(无 URL)"
-#: builtin/notes.c:456
+#: builtin/remote.c:1195 builtin/remote.c:1197
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "无法从 '%s' 到 '%s' 拷贝注解"
-
-#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
-#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
-#: builtin/notes.c:1033
-msgid "too many parameters"
-msgstr "参数太多"
+msgid " Push URL: %s"
+msgstr " 推送地址：%s"
-#: builtin/notes.c:513 builtin/notes.c:772
+#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203
#, c-format
-msgid "No note found for object %s."
-msgstr "未发现对象 %s 的注解。"
+msgid " HEAD branch: %s"
+msgstr " HEAD分支：%s"
-#: builtin/notes.c:580
+#: builtin/remote.c:1205
#, c-format
msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/notes.c:585 builtin/notes.c:662
+#: builtin/remote.c:1217
#, c-format
-msgid "Overwriting existing notes for object %s\n"
-msgstr "覆盖对象 %s 现存注解\n"
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] " 远程分支：%s"
+msgstr[1] " 远程分支：%s"
-#: builtin/notes.c:635
-msgid "too few parameters"
-msgstr "参数太少"
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/remote.c:1220 builtin/remote.c:1247
+msgid " (status not queried)"
+msgstr "（状态未查询）"
+
+#: builtin/remote.c:1229
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] " 为 'git pull' 配置的本地分支："
+msgstr[1] " 为 'git pull' 配置的本地分支："
-#: builtin/notes.c:656
+#: builtin/remote.c:1237
+msgid " Local refs will be mirrored by 'git push'"
+msgstr " 本地引用将在 'git push' 时被镜像"
+
+#: builtin/remote.c:1244
#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
+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:1265
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
+
+#: builtin/remote.c:1267
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "删除 refs/remotes/<名称>/HEAD"
+
+#: builtin/remote.c:1282
+msgid "Cannot determine remote HEAD"
+msgstr "无法确定远程 HEAD"
-#: builtin/notes.c:668
+#: builtin/remote.c:1284
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
+
+#: builtin/remote.c:1294
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "æº\90对象 %s 缺å°\91注解ã\80\82ä¸\8dè\83½æ\8b·è´\9dã\80\82"
+msgid "Could not delete %s"
+msgstr "æ\97 æ³\95å\88 é\99¤ %s"
-#: builtin/notes.c:717
+#: builtin/remote.c:1302
#, 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 "Not a valid ref: %s"
+msgstr "不是一个有效引用：%s"
-#: builtin/notes.c:971
+#: builtin/remote.c:1304
#, c-format
-msgid "Object %s has no note\n"
-msgstr "对象 %s 没有注解\n"
+msgid "Could not setup %s"
+msgstr "不能设置 %s"
-#: builtin/notes.c:1103
+# 译者：注意保持前导空格
+#: builtin/remote.c:1322
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "未知子命令：%s"
+msgid " %s will become dangling!"
+msgstr " %s 将成为摇摆状态！"
-#: builtin/pack-objects.c:2315
+# 译者：注意保持前导空格
+#: builtin/remote.c:1323
#, c-format
-msgid "unsupported index version %s"
-msgstr "不支持的索引版本 %s"
+msgid " %s has become dangling!"
+msgstr " %s 已成为摇摆状态！"
-#: builtin/pack-objects.c:2319
+#: builtin/remote.c:1329
#, c-format
-msgid "bad index version '%s'"
-msgstr "坏的索引版本 '%s'"
+msgid "Pruning %s"
+msgstr "修剪 %s"
-#: builtin/pack-objects.c:2342
+#: builtin/remote.c:1330
#, c-format
-msgid "option %s does not accept negative form"
-msgstr "选项 %s 不接受否定格式"
+msgid "URL: %s"
+msgstr "URL：%s"
-#: builtin/pack-objects.c:2346
+#: builtin/remote.c:1357
#, c-format
-msgid "unable to parse value '%s' for option %s"
-msgstr "不能解析值 '%s' 针对于选项 %s"
+msgid " * [would prune] %s"
+msgstr " * [将删除] %s"
-#: builtin/push.c:45
-msgid "tag shorthand without <tag>"
-msgstr "tag 简写没有跟 <tag> 参数"
+#: builtin/remote.c:1360
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [已删除] %s"
-#: builtin/push.c:64
-msgid "--delete only accepts plain target ref names"
-msgstr "--delete 只接受简单的目标引用名"
+#: builtin/remote.c:1405
+msgid "prune remotes after fetching"
+msgstr "抓取后清除远程"
-#: builtin/push.c:84
+#: builtin/remote.c:1471 builtin/remote.c:1545
#, 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:<name-of-remote-branch>\n"
+msgid "No such remote '%s'"
+msgstr "没有此远程 '%s'"
+
+#: builtin/remote.c:1491
+msgid "add branch"
+msgstr "添加分支"
+
+#: builtin/remote.c:1498
+msgid "no remote specified"
+msgstr "未指定远程"
+
+#: builtin/remote.c:1520
+msgid "manipulate push URLs"
+msgstr "操作推送 URLS"
+
+#: builtin/remote.c:1522
+msgid "add URL"
+msgstr "添加 URL"
+
+#: builtin/remote.c:1524
+msgid "delete URLs"
+msgstr "删除 URLS"
-#: builtin/push.c:91
+#: builtin/remote.c:1531
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete 无意义"
+
+#: builtin/remote.c:1571
#, 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 "Invalid old URL pattern: %s"
+msgstr "无效的旧URL匹配模版：%s"
-#: builtin/push.c:99
+#: builtin/remote.c:1579
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
+msgid "No such URL found: %s"
+msgstr "未找到此URL：%s"
+
+#: builtin/remote.c:1581
+msgid "Will not delete all non-push URLs"
+msgstr "将不会删除所有非推送URL地址"
+
+#: builtin/remote.c:1595
+msgid "be verbose; must be placed before a subcommand"
+msgstr "冗长输出；必须置于子命令之前"
+
+#: builtin/repack.c:17
+msgid "git repack [options]"
+msgstr "git repack [选项]"
+
+#: builtin/repack.c:160
+msgid "pack everything in a single pack"
+msgstr "所有内容打包到一个包文件中"
+
+#: builtin/repack.c:162
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "和 -a 相同，并将不可达的对象设为松散对象"
+
+#: builtin/repack.c:165
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "删除多余的包，运行 git-prune-packed"
+
+#: builtin/repack.c:167
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
+
+#: builtin/repack.c:169
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
+
+#: builtin/repack.c:171
+msgid "do not run git-update-server-info"
+msgstr "不运行 git-update-server-info"
+
+#: builtin/repack.c:174
+msgid "pass --local to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --local"
+
+#: builtin/repack.c:176
+msgid "write bitmap index"
+msgstr "写 bitmap 索引"
+
+#: builtin/repack.c:177
+msgid "approxidate"
+msgstr "近似日期"
+
+#: builtin/repack.c:178
+msgid "with -A, do not loosen objects older than this"
+msgstr "使用 -A，不要将早于给定时间的对象过期"
+
+#: builtin/repack.c:180
+msgid "size of the window used for delta compression"
+msgstr "用于增量压缩的窗口值"
+
+#: builtin/repack.c:181 builtin/repack.c:185
+msgid "bytes"
+msgstr "字节"
+
+#: builtin/repack.c:182
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "和上面的相似，但限制内存大小而非条目数"
+
+#: builtin/repack.c:184
+msgid "limits the maximum delta depth"
+msgstr "限制最大增量深度"
+
+#: builtin/repack.c:186
+msgid "maximum size of each packfile"
+msgstr "每个包的最大尺寸"
+
+#: builtin/repack.c:188
+msgid "repack objects in packs marked with .keep"
+msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/push.c:102
+#: builtin/repack.c:374
#, 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"
-"而没有告诉我要推送什么、更新哪个远程分支。"
+msgid "removing '%s' failed"
+msgstr "删除 '%s' 失败"
-#: builtin/push.c:131
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
+#: builtin/replace.c:19
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <对象> <替换物>"
-#: builtin/push.c:138
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
-"before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
-"再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
-"'git push --help' 中的 'Note about fast-forwards' 小节。"
+#: builtin/replace.c:20
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <对象>"
-#: builtin/push.c:144
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. If you did not intend to push that branch, you may want to\n"
-"specify branches to push or set the 'push.default' configuration\n"
-"variable to 'current' or 'upstream' to push only the current branch."
-msgstr ""
-"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
-"如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
-"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送"
-"当前分支。"
+#: builtin/replace.c:21
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <提交> [<父提交>...]"
-#: builtin/push.c:150
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and merge 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/replace.c:22
+msgid "git replace -d <object>..."
+msgstr "git replace -d <对象>..."
+
+#: builtin/replace.c:23
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<格式>] [-l [<模式>]]"
-#: builtin/push.c:190
+#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
#, c-format
-msgid "Pushing to %s\n"
-msgstr "推送到 %s\n"
+msgid "Not a valid object name: '%s'"
+msgstr "不是一个有效的对象名：'%s'"
-#: builtin/push.c:194
+#: builtin/replace.c:355
#, c-format
-msgid "failed to push some refs to '%s'"
-msgstr "æ\97 æ³\95æ\8e¨é\80\81ä¸\80äº\9bå¼\95ç\94¨å\88° '%s'"
+msgid "bad mergetag in commit '%s'"
+msgstr "æ\8f\90交 '%s' ä¸æ\8d\9få\9d\8fç\9a\84 mergetag"
-#: builtin/push.c:226
+#: builtin/replace.c:357
#, c-format
-msgid "bad repository '%s'"
-msgstr "坏的版本库 '%s'"
+msgid "malformed mergetag in commit '%s'"
+msgstr "提交 '%s' 中非法的 mergetag"
-#: builtin/push.c:227
+#: builtin/replace.c:368
+#, c-format
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 <name> <url>\n"
-"\n"
-"然后使用该远程版本库名执行推送\n"
-"\n"
-" git push <name>\n"
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s'，使用 --edit 代替 --graft"
-#: builtin/push.c:242
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags 不兼容"
+#: builtin/replace.c:401
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr "原始提交 '%s' 中包含一个 GPG 签名"
-#: builtin/push.c:243
-msgid "--all can't be combined with refspecs"
-msgstr "--all 不能和引用表达式共用"
+#: builtin/replace.c:402
+msgid "the signature will be removed in the replacement commit!"
+msgstr "在替换的提交中签名将被移除！"
-#: builtin/push.c:248
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags 不兼容"
+#: builtin/replace.c:408
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "不能为 '%s' 写替换提交"
+
+#: builtin/replace.c:432
+msgid "list replace refs"
+msgstr "列出替换的引用"
+
+#: builtin/replace.c:433
+msgid "delete replace refs"
+msgstr "删除替换的引用"
+
+#: builtin/replace.c:434
+msgid "edit existing object"
+msgstr "编辑现存的对象"
+
+#: builtin/replace.c:435
+msgid "change a commit's parents"
+msgstr "修改一个提交的父提交"
+
+#: builtin/replace.c:436
+msgid "replace the ref if it exists"
+msgstr "如果存在则替换引用"
+
+#: builtin/replace.c:437
+msgid "do not pretty-print contents for --edit"
+msgstr "不要为 --edit 操作美观显示内容"
+
+#: builtin/replace.c:438
+msgid "use this format"
+msgstr "使用此格式"
-#: builtin/push.c:249
-msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror 不能和引用表达式共用"
+#: builtin/rerere.c:12
+msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
-#: builtin/push.c:254
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror 不兼容"
+#: builtin/rerere.c:57
+msgid "register clean resolutions in index"
+msgstr "在索引中注册干净的解决方案"
-#: builtin/push.c:334
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
+#: builtin/reset.c:26
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
-#: builtin/push.c:336
-msgid "--delete doesn't make sense without any refs"
-msgstr "--delete 未接任何引用没有意义"
+#: builtin/reset.c:27
+msgid "git reset [-q] <tree-ish> [--] <paths>..."
+msgstr "git reset [-q] <树或提交> [--] <路径>..."
-#: builtin/reset.c:33
+#: builtin/reset.c:28
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
+
+#: builtin/reset.c:34
msgid "mixed"
msgstr "混杂"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "soft"
msgstr "软性"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "hard"
msgstr "硬性"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
+msgid "merge"
+msgstr "合并"
+
+#: builtin/reset.c:34
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:77
+#: builtin/reset.c:74
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:79
+#: builtin/reset.c:76
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:85
+#: builtin/reset.c:82
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
-#: builtin/reset.c:96
-msgid "Could not write new index file."
-msgstr "不能写入新的索引文件。"
-
-#: builtin/reset.c:106
+#: builtin/reset.c:100
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
-#: builtin/reset.c:130
-msgid "Could not read index"
-msgstr "不能读取索引"
-
-#: builtin/reset.c:133
-msgid "Unstaged changes after reset:"
-msgstr "重置后撤出暂存区的变更："
-
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:223
+#: builtin/reset.c:183
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:297
+#: builtin/reset.c:276
+msgid "be quiet, only report errors"
+msgstr "安静模式，只报告错误"
+
+#: builtin/reset.c:278
+msgid "reset HEAD and index"
+msgstr "重置 HEAD 和索引"
+
+#: builtin/reset.c:279
+msgid "reset only HEAD"
+msgstr "只重置 HEAD"
+
+#: 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/reset.c:305
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "无法将 '%s' 解析为一个有效的版本。"
+
+#: builtin/reset.c:308 builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/reset.c:302
+#: builtin/reset.c:313
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "无法将 '%s' 解析为一个有效的树对象。"
+
+#: builtin/reset.c:322
msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
+msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/reset.c:311
+#: builtin/reset.c:331
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr "--mixed 带路径已弃用，
代之以 'git reset -- <paths>'。"
+msgstr "--mixed 带路径已弃用，
而是用 'git reset -- <paths>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:313
+#: builtin/reset.c:333
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:325
+#: builtin/reset.c:343
#, c-format
msgid "%s reset is not allowed in a bare repository"
-msgstr "不能对裸版本库进行%s重置"
+msgstr "不能对纯版本库进行%s重置"
-#: builtin/reset.c:341
+#: builtin/reset.c:347
+msgid "-N can only be used with --mixed"
+msgstr "-N 只能和 --mixed 同时使用"
+
+#: builtin/reset.c:364
+msgid "Unstaged changes after reset:"
+msgstr "重置后撤出暂存区的变更："
+
+#: builtin/reset.c:370
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/revert.c:70 builtin/revert.c:92
+#: builtin/reset.c:374
+msgid "Could not write new index file."
+msgstr "不能写入新的索引文件。"
+
+#: builtin/rev-parse.c:361
+msgid "git rev-parse --parseopt [options] -- [<args>...]"
+msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
+
+#: builtin/rev-parse.c:366
+msgid "keep the `--` passed as an arg"
+msgstr "保持 `--` 作为一个参数传递"
+
+#: builtin/rev-parse.c:368
+msgid "stop parsing after the first non-option argument"
+msgstr "遇到第一个非选项参数后停止解析"
+
+#: builtin/rev-parse.c:371
+msgid "output in stuck long form"
+msgstr "以固定长格式输出"
+
+#: 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/revert.c:22
+msgid "git revert [options] <commit-ish>..."
+msgstr "git revert [选项] <提交号>..."
+
+#: builtin/revert.c:23
+msgid "git revert <subcommand>"
+msgstr "git revert <子命令>"
+
+#: builtin/revert.c:28
+msgid "git cherry-pick [options] <commit-ish>..."
+msgstr "git cherry-pick [选项] <提交号>..."
+
+#: builtin/revert.c:29
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <子命令>"
+
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
-msgstr "%s：%s 不能和 %s 共用"
+msgstr "%s：%s 不能和 %s 同时使用"
+
+#: builtin/revert.c:80
+msgid "end revert or cherry-pick sequence"
+msgstr "终止反转或拣选操作"
+
+#: builtin/revert.c:81
+msgid "resume revert or cherry-pick sequence"
+msgstr "继续反转或拣选操作"
+
+#: builtin/revert.c:82
+msgid "cancel revert or cherry-pick sequence"
+msgstr "取消反转或拣选操作"
+
+#: builtin/revert.c:83
+msgid "don't automatically commit"
+msgstr "不要自动提交"
+
+#: builtin/revert.c:84
+msgid "edit the commit message"
+msgstr "编辑提交说明"
+
+#: builtin/revert.c:87
+msgid "parent number"
+msgstr "父编号"
+
+#: builtin/revert.c:89
+msgid "merge strategy"
+msgstr "合并策略"
+
+#: builtin/revert.c:90
+msgid "option"
+msgstr "选项"
+
+#: builtin/revert.c:91
+msgid "option for merge strategy"
+msgstr "合并策略的选项"
+
+#: builtin/revert.c:104
+msgid "append commit name"
+msgstr "追加提交名称"
+
+#: builtin/revert.c:105
+msgid "allow fast-forward"
+msgstr "允许快进式"
+
+#: builtin/revert.c:106
+msgid "preserve initially empty commits"
+msgstr "保留初始化的空提交"
-#: builtin/revert.c:127
+#: builtin/revert.c:107
+msgid "allow commits with empty messages"
+msgstr "允许提交说明为空"
+
+#: builtin/revert.c:108
+msgid "keep redundant, empty commits"
+msgstr "保持多余的、空的提交"
+
+#: builtin/revert.c:112
msgid "program error"
msgstr "程序错误"
-#: builtin/revert.c:213
+#: builtin/revert.c:197
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:228
+#: builtin/revert.c:212
msgid "cherry-pick failed"
msgstr "拣选失败"
-#: builtin/rm.c:109
-#, c-format
+#: builtin/rm.c:17
+msgid "git rm [options] [--] <file>..."
+msgstr "git rm [选项] [--] <文件>..."
+
+#: builtin/rm.c:65
msgid ""
-"'%s' has staged content different from both the file and the HEAD\n"
-"(use -f to force removal)"
+"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/rm.c:71
+msgid ""
+"\n"
+"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
-"（使用 -f 强制删除）"
+"\n"
+"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
-#: builtin/rm.c:115
-#, c-format
+#: builtin/rm.c:231
msgid ""
-"'%s' has changes staged in the index\n"
-"(use --cached to keep the file, or -f to force removal)"
+"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/rm.c:236
+msgid ""
+"\n"
+"(use -f to force removal)"
msgstr ""
-"'%s' 有变更已暂存至索引中\n"
-"（使用 --cached 保存文件，或用 -f 强制删除）"
+"\n"
+"（使用 -f 强制删除）"
-#: builtin/rm.c:119
-#, c-format
+#: builtin/rm.c:240
+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/rm.c:244 builtin/rm.c:255
msgid ""
-"'%s' has local modifications\n"
+"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-"'%s' 有本地修改\n"
-"（使用 --cached 保存文件，或用 -f 强制删除）"
+"\n"
+"（使用 --cached 保留本地文件，或用 -f 强制删除）"
-#: builtin/rm.c:194
+#: builtin/rm.c:252
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "如下文件有本地修改："
+msgstr[1] "如下文件有本地修改："
+
+#: builtin/rm.c:270
+msgid "do not list removed files"
+msgstr "不列出删除的文件"
+
+#: builtin/rm.c:271
+msgid "only remove from the index"
+msgstr "只从索引区删除"
+
+#: builtin/rm.c:272
+msgid "override the up-to-date check"
+msgstr "忽略文件更新状态检查"
+
+#: builtin/rm.c:273
+msgid "allow recursive removal"
+msgstr "允许递归删除"
+
+#: builtin/rm.c:275
+msgid "exit with a zero status even if nothing matched"
+msgstr "即使没有匹配，也以零状态退出"
+
+#: builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
+
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/rm.c:230
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
-#: builtin/shortlog.c:157
+#: builtin/shortlog.c:13
+msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
+msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
+
+#: builtin/shortlog.c:131
#, c-format
msgid "Missing author: %s"
msgstr "缺少作者：%s"
-#: builtin/tag.c:58
+#: builtin/shortlog.c:230
+msgid "sort output according to the number of commits per author"
+msgstr "根据每个作者的提交数量排序"
+
+#: builtin/shortlog.c:232
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr "隐藏提交说明，只提供提交数量"
+
+#: builtin/shortlog.c:234
+msgid "Show the email address of each author"
+msgstr "显示每个作者的电子邮件地址"
+
+#: builtin/shortlog.c:235
+msgid "w[,i1[,i2]]"
+msgstr "w[,i1[,i2]]"
+
+#: builtin/shortlog.c:236
+msgid "Linewrap output"
+msgstr "折行输出"
+
+#: builtin/show-branch.c:9
+msgid ""
+"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
+"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
+"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
+"<glob>)...]"
+msgstr ""
+"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
+"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
+"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
+"<glob>)...]"
+
+#: builtin/show-branch.c:10
+msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
+
+#: builtin/show-branch.c:649
+msgid "show remote-tracking and local branches"
+msgstr "显示远程跟踪的和本地的分支"
+
+#: builtin/show-branch.c:651
+msgid "show remote-tracking branches"
+msgstr "显示远程跟踪的分支"
+
+#: builtin/show-branch.c:653
+msgid "color '*!+-' corresponding to the branch"
+msgstr "着色 '*!+-' 到相应的分支"
+
+#: builtin/show-branch.c:655
+msgid "show <n> more commits after the common ancestor"
+msgstr "显示共同祖先后的 <n> 个提交"
+
+#: builtin/show-branch.c:657
+msgid "synonym to more=-1"
+msgstr "和 more=-1 同义"
+
+#: builtin/show-branch.c:658
+msgid "suppress naming strings"
+msgstr "不显示字符串命名"
+
+#: builtin/show-branch.c:660
+msgid "include the current branch"
+msgstr "包括当前分支"
+
+#: builtin/show-branch.c:662
+msgid "name commits with their object names"
+msgstr "以对象名字命名提交"
+
+#: builtin/show-branch.c:664
+msgid "show possible merge bases"
+msgstr "显示可能合并的基线"
+
+#: builtin/show-branch.c:666
+msgid "show refs unreachable from any other ref"
+msgstr "显示没有任何引用的的引用"
+
+#: builtin/show-branch.c:668
+msgid "show commits in topological order"
+msgstr "以拓扑顺序显示提交"
+
+#: builtin/show-branch.c:671
+msgid "show only commits not on the first branch"
+msgstr "只显示不在第一个分支上的提交"
+
+#: builtin/show-branch.c:673
+msgid "show merges reachable from only one tip"
+msgstr "显示仅一个分支可访问的合并提交"
+
+#: builtin/show-branch.c:675
+msgid "topologically sort, maintaining date order where possible"
+msgstr "拓扑方式排序，并尽可能地保持日期顺序"
+
+#: builtin/show-branch.c:678
+msgid "<n>[,<base>]"
+msgstr "<n>[,<base>]"
+
+#: builtin/show-branch.c:679
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
+
+#: 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] [--] [pattern*] "
+
+#: builtin/show-ref.c:11
+msgid "git show-ref --exclude-existing[=pattern] < ref-list"
+msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
+
+#: builtin/show-ref.c:168
+msgid "only show tags (can be combined with heads)"
+msgstr "只显示 tags（可以和头共用）"
+
+#: builtin/show-ref.c:169
+msgid "only show heads (can be combined with tags)"
+msgstr "只显示头（可以和 tags 共用）"
+
+#: builtin/show-ref.c:170
+msgid "stricter reference checking, requires exact ref path"
+msgstr "更严格的引用检测，需要精确的引用路径"
+
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "显示 HEAD 引用，即使被过滤掉"
+
+#: builtin/show-ref.c:177
+msgid "dereference tags into object IDs"
+msgstr "转换 tags 到对象ID"
+
+#: builtin/show-ref.c:179
+msgid "only show SHA1 hash using <n> digits"
+msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
+
+#: builtin/show-ref.c:183
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
+
+#: builtin/show-ref.c:185
+msgid "show refs from stdin that aren't in local repository"
+msgstr "显示从标准输入中读入的不在本地版本库中的引用"
+
+#: builtin/symbolic-ref.c:7
+msgid "git symbolic-ref [options] name [ref]"
+msgstr "git symbolic-ref [选项] 名称 [引用]"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref -d [-q] name"
+msgstr "git symbolic-ref -d [-q] 名称"
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "不显示非符号（分离的）引用的错误信息"
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "删除符号引用"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "简短的引用输出"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason"
+msgstr "原因"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason of the update"
+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/tag.c:23
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <标签名>..."
+
+#: builtin/tag.c:24
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
+"\t\t[<pattern>...]"
+msgstr ""
+"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
+"\t\t[<模式>...]"
+
+#: builtin/tag.c:26
+msgid "git tag -v <tagname>..."
+msgstr "git tag -v <标签名>..."
+
+#: builtin/tag.c:69
#, c-format
msgid "malformed object at '%s'"
msgstr "非法的对象于 '%s'"
-#: builtin/tag.c:205
+#: builtin/tag.c:301
#, c-format
msgid "tag name too long: %.*s..."
msgstr "tag 名字太长：%.*s..."
-#: builtin/tag.c:210
+#: builtin/tag.c:306
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' 未发现。"
-#: builtin/tag.c:225
+#: builtin/tag.c:321
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除 tag '%s'（曾为 %s）\n"
-#: builtin/tag.c:237
+#: builtin/tag.c:333
#, c-format
msgid "could not verify the tag '%s'"
msgstr "不能校验 tag '%s'"
-#: builtin/tag.c:247
+#: builtin/tag.c:343
+#, c-format
msgid ""
"\n"
-"#\n"
-"# Write a tag message\n"
-"# Lines starting with '#' will be ignored.\n"
-"#\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
"\n"
-"#\n"
-"# 输入一个 tag 说明\n"
-"# 以 '#' 开头的行将被忽略。\n"
-"#\n"
+"输入一个 tag 说明：\n"
+" %s\n"
+"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:254
+#: builtin/tag.c:347
+#, c-format
msgid ""
"\n"
-"#\n"
-"# Write a tag message\n"
-"# Lines starting with '#' will be kept; you may remove them yourself if you "
+"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"
-"#\n"
msgstr ""
"\n"
-"#\n"
-"# 输入一个 tag 说明\n"
-"# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"
-"#\n"
+"输入一个 tag 说明：\n"
+" %s\n"
+"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
+
+#: builtin/tag.c:371
+#, c-format
+msgid "unsupported sort specification '%s'"
+msgstr "不支持的排序规格 '%s'"
-#: builtin/tag.c:294
+#: builtin/tag.c:373
+#, c-format
+msgid "unsupported sort specification '%s' in variable '%s'"
+msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
+
+#: builtin/tag.c:428
msgid "unable to sign the tag"
msgstr "无法签署 tag"
-#: builtin/tag.c:296
+#: builtin/tag.c:430
msgid "unable to write tag file"
msgstr "无法写 tag 文件"
-#: builtin/tag.c:321
+#: builtin/tag.c:455
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:334
+#: builtin/tag.c:468
msgid "tag header too big."
msgstr "tag 头信息太大。"
-#: builtin/tag.c:366
+#: builtin/tag.c:504
msgid "no tag message?"
msgstr "无 tag 说明？"
-#: builtin/tag.c:372
+#: builtin/tag.c:510
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "tag 说明被保留在 %s\n"
-#: builtin/tag.c:421
+#: builtin/tag.c:559
msgid "switch 'points-at' requires an object"
msgstr "开关 'points-at' 需要一个对象"
-#: builtin/tag.c:423
+#: builtin/tag.c:561
#, c-format
msgid "malformed object name '%s'"
msgstr "非法的对象名 '%s'"
-#: builtin/tag.c:502
+#: builtin/tag.c:589
+msgid "list tag names"
+msgstr "列出tag名称"
+
+#: builtin/tag.c:591
+msgid "print <n> lines of each tag message"
+msgstr "每个 tag 信息打印 <n> 行"
+
+#: builtin/tag.c:593
+msgid "delete tags"
+msgstr "删除 tags"
+
+#: builtin/tag.c:594
+msgid "verify tags"
+msgstr "验证 tags"
+
+#: builtin/tag.c:596
+msgid "Tag creation options"
+msgstr "Tag 创建选项"
+
+#: builtin/tag.c:598
+msgid "annotated tag, needs a message"
+msgstr "注解 tag，需要一个说明"
+
+#: builtin/tag.c:600
+msgid "tag message"
+msgstr "tag 说明"
+
+#: builtin/tag.c:602
+msgid "annotated and GPG-signed tag"
+msgstr "注解并 GPG 签名的 tag"
+
+#: builtin/tag.c:606
+msgid "use another key to sign the tag"
+msgstr "使用另外的私钥签名 tag"
+
+#: builtin/tag.c:607
+msgid "replace the tag if exists"
+msgstr "如果存在，替换现有的 tag"
+
+#: builtin/tag.c:608
+msgid "show tag list in columns"
+msgstr "以列的方式显示 tag"
+
+#: builtin/tag.c:610
+msgid "sort tags"
+msgstr "排序 tags"
+
+#: builtin/tag.c:614
+msgid "Tag listing options"
+msgstr "Tag 列表选项"
+
+#: builtin/tag.c:617 builtin/tag.c:623
+msgid "print only tags that contain the commit"
+msgstr "只打印包含提交的tags"
+
+#: builtin/tag.c:629
+msgid "print only tags of the object"
+msgstr "只打印tags对象"
+
+#: builtin/tag.c:655
+msgid "--column and -n are incompatible"
+msgstr "--column 和 -n 不兼容"
+
+#: builtin/tag.c:667
+msgid "--sort and -n are incompatible"
+msgstr "--sort 和 -n 不兼容"
+
+#: builtin/tag.c:674
msgid "-n option is only allowed with -l."
-msgstr "-n é\80\89项å\8fªå\85\81许å\92\8c -l å\85±用。"
+msgstr "-n é\80\89项å\8fªå\85\81许å\92\8c -l å\90\8cæ\97¶ä½¿用。"
-#: builtin/tag.c:504
+#: builtin/tag.c:676
msgid "--contains option is only allowed with -l."
-msgstr "--contains é\80\89项å\8fªå\85\81许å\92\8c -l å\85±用。"
+msgstr "--contains é\80\89项å\8fªå\85\81许å\92\8c -l å\90\8cæ\97¶ä½¿用。"
-#: builtin/tag.c:506
+#: builtin/tag.c:678
msgid "--points-at option is only allowed with -l."
-msgstr "--points-at é\80\89项å\8fªå\85\81许å\92\8c -l å\85±用。"
+msgstr "--points-at é\80\89项å\8fªå\85\81许å\92\8c -l å\90\8cæ\97¶ä½¿用。"
-#: builtin/tag.c:514
+#: builtin/tag.c:686
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:534
+#: builtin/tag.c:706
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:540
+#: builtin/tag.c:712
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的tag名称。"
-#: builtin/tag.c:545
+#: builtin/tag.c:717
#, c-format
msgid "tag '%s' already exists"
msgstr "tag '%s' 已存在"
-#: builtin/tag.c:563
-#, c-format
-msgid "%s: cannot lock the ref"
-msgstr "%s：不能锁定引用"
+#: builtin/tag.c:741
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "已更新tag '%s'（曾为 %s）\n"
+
+#: builtin/unpack-objects.c:489
+msgid "Unpacking objects"
+msgstr "展开对象中"
+
+#: builtin/update-index.c:403
+msgid "git update-index [options] [--] [<file>...]"
+msgstr "git update-index [选项] [--] [<文件>...]"
+
+#: builtin/update-index.c:756
+msgid "continue refresh even when index needs update"
+msgstr "当索引需要更新时继续刷新"
+
+#: builtin/update-index.c:759
+msgid "refresh: ignore submodules"
+msgstr "刷新：忽略子模组"
+
+#: builtin/update-index.c:762
+msgid "do not ignore new files"
+msgstr "不忽略新的文件"
+
+#: builtin/update-index.c:764
+msgid "let files replace directories and vice-versa"
+msgstr "让文件替换目录（反之亦然）"
+
+#: builtin/update-index.c:766
+msgid "notice files missing from worktree"
+msgstr "通知文件从工作区丢失"
+
+#: builtin/update-index.c:768
+msgid "refresh even if index contains unmerged entries"
+msgstr "即使索引区包含未合并的条目也执行刷新"
+
+#: builtin/update-index.c:771
+msgid "refresh stat information"
+msgstr "刷新统计信息"
+
+#: builtin/update-index.c:775
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
+
+#: builtin/update-index.c:779
+msgid "<mode>,<object>,<path>"
+msgstr "<mode>,<object>,<path>"
+
+#: builtin/update-index.c:780
+msgid "add the specified entry to the index"
+msgstr "添加指定的条目到索引区"
+
+#: builtin/update-index.c:784
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/update-index.c:785
+msgid "override the executable bit of the listed files"
+msgstr "覆盖列表里文件的可执行位"
+
+#: builtin/update-index.c:789
+msgid "mark files as \"not changing\""
+msgstr "把文件标记为 \"没有变更\""
+
+#: builtin/update-index.c:792
+msgid "clear assumed-unchanged bit"
+msgstr "清除 assumed-unchanged 位"
+
+#: builtin/update-index.c:795
+msgid "mark files as \"index-only\""
+msgstr "把文件标记为 \"仅索引\""
+
+#: builtin/update-index.c:798
+msgid "clear skip-worktree bit"
+msgstr "清除 skip-worktree 位"
+
+#: builtin/update-index.c:801
+msgid "add to index only; do not add content to object database"
+msgstr "只添加到索引区；不添加对象到对象库"
+
+#: builtin/update-index.c:803
+msgid "remove named paths even if present in worktree"
+msgstr "即使存在工作区里，也删除路径"
+
+#: builtin/update-index.c:805
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "携带 --stdin：输入的行以 null 字符终止"
+
+#: builtin/update-index.c:807
+msgid "read list of paths to be updated from standard input"
+msgstr "从标准输入中读取需要更新的路径列表"
+
+#: builtin/update-index.c:811
+msgid "add entries from standard input to the index"
+msgstr "从标准输入添加条目到索引区"
+
+#: builtin/update-index.c:815
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "为指定文件重新生成第2和第3暂存区"
+
+#: builtin/update-index.c:819
+msgid "only update entries that differ from HEAD"
+msgstr "只更新与 HEAD 不同的条目"
+
+#: builtin/update-index.c:823
+msgid "ignore files missing from worktree"
+msgstr "忽略工作区丢失的文件"
+
+#: builtin/update-index.c:826
+msgid "report actions to standard output"
+msgstr "在标准输出显示操作"
+
+#: builtin/update-index.c:828
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(for porcelains) 忘记保存的未解决的冲突"
+
+#: builtin/update-index.c:832
+msgid "write index in this format"
+msgstr "以这种格式写入索引区"
+
+#: builtin/update-index.c:834
+msgid "enable or disable split index"
+msgstr "启用或禁用索引拆分"
+
+#: builtin/update-ref.c:9
+msgid "git update-ref [options] -d <refname> [<oldval>]"
+msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [options] <refname> <newval> [<oldval>]"
+msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr "git update-ref [选项] --stdin [-z]"
+
+#: builtin/update-ref.c:363
+msgid "delete the reference"
+msgstr "删除引用"
+
+#: builtin/update-ref.c:365
+msgid "update <refname> not the one it points to"
+msgstr "更新 <引用名> 本身而不是它指向的引用"
+
+#: builtin/update-ref.c:366
+msgid "stdin has NUL-terminated arguments"
+msgstr "标准输入有以 NUL 字符终止的参数"
+
+#: builtin/update-ref.c:367
+msgid "read updates from stdin"
+msgstr "从标准输入读取更新"
+
+#: builtin/update-server-info.c:6
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:14
+msgid "update the info files from scratch"
+msgstr "从头开始更新文件信息"
+
+#: builtin/verify-commit.c:17
+msgid "git verify-commit [-v|--verbose] <commit>..."
+msgstr "git verify-commit [-v|--verbose] <提交>..."
+
+#: builtin/verify-commit.c:75
+msgid "print commit contents"
+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] <pack>..."
+
+#: builtin/verify-pack.c:64
+msgid "verbose"
+msgstr "冗长输出"
+
+#: builtin/verify-pack.c:66
+msgid "show statistics only"
+msgstr "只显示统计"
+
+#: builtin/verify-tag.c:17
+msgid "git verify-tag [-v|--verbose] <tag>..."
+msgstr "git verify-tag [-v|--verbose] <tag>..."
+
+#: builtin/verify-tag.c:73
+msgid "print tag contents"
+msgstr "打印 tag 内容"
+
+#: builtin/write-tree.c:13
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
+
+#: builtin/write-tree.c:26
+msgid "<prefix>/"
+msgstr "<前缀>/"
+
+#: builtin/write-tree.c:27
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "将 <前缀> 子目录内容写到一个树对象"
+
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
+msgstr "只对调试有用"
+
+#: credential-cache--daemon.c:267
+msgid "print debugging messages to stderr"
+msgstr "调试信息输出到标准错误"
+
+#: git.c:17
+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"
+"帮助。"
+
+#: common-cmds.h:8
+msgid "Add file contents to the index"
+msgstr "添加文件内容至索引"
+
+#: common-cmds.h:9
+msgid "Find by binary search the change that introduced a bug"
+msgstr "通过二分查找定位引入 bug 的变更"
+
+#: common-cmds.h:10
+msgid "List, create, or delete branches"
+msgstr "列出、创建或删除分支"
+
+#: common-cmds.h:11
+msgid "Checkout a branch or paths to the working tree"
+msgstr "检出一个分支或路径到工作区"
+
+#: common-cmds.h:12
+msgid "Clone a repository into a new directory"
+msgstr "克隆一个版本库到一个新目录"
+
+#: common-cmds.h:13
+msgid "Record changes to the repository"
+msgstr "记录变更到版本库"
+
+#: common-cmds.h:14
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "显示提交之间、提交和工作区之间等的差异"
+
+#: common-cmds.h:15
+msgid "Download objects and refs from another repository"
+msgstr "从另外一个版本库下载对象和引用"
+
+#: common-cmds.h:16
+msgid "Print lines matching a pattern"
+msgstr "输出和模式匹配的行"
+
+#: common-cmds.h:17
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
+
+#: common-cmds.h:18
+msgid "Show commit logs"
+msgstr "显示提交日志"
+
+#: common-cmds.h:19
+msgid "Join two or more development histories together"
+msgstr "合并两个或更多开发历史"
+
+#: common-cmds.h:20
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "移动或重命名一个文件、目录或符号链接"
+
+#: common-cmds.h:21
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "获取并整合另外的版本库或一个本地分支"
+
+#: common-cmds.h:22
+msgid "Update remote refs along with associated objects"
+msgstr "更新远程引用和相关的对象"
+
+#: common-cmds.h:23
+msgid "Forward-port local commits to the updated upstream head"
+msgstr "本地提交转移至更新后的上游分支中"
+
+#: common-cmds.h:24
+msgid "Reset current HEAD to the specified state"
+msgstr "重置当前HEAD到指定状态"
+
+#: common-cmds.h:25
+msgid "Remove files from the working tree and from the index"
+msgstr "从工作区和索引中删除文件"
+
+#: common-cmds.h:26
+msgid "Show various types of objects"
+msgstr "显示各种类型的对象"
+
+#: common-cmds.h:27
+msgid "Show the working tree status"
+msgstr "显示工作区状态"
+
+#: common-cmds.h:28
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
+
+#: parse-options.h:143
+msgid "expiry-date"
+msgstr "到期时间"
+
+#: parse-options.h:158
+msgid "no-op (backward compatibility)"
+msgstr "空操作（向后兼容）"
+
+#: parse-options.h:232
+msgid "be more verbose"
+msgstr "更加详细"
+
+#: parse-options.h:234
+msgid "be more quiet"
+msgstr "更加安静"
-#: builtin/tag.c:565
-#, c-format
-msgid "%s: cannot update the ref"
-msgstr "%s：不能更新引用"
+#: parse-options.h:240
+msgid "use <n> digits to display SHA-1s"
+msgstr "用 <n> 位数字显示 SHA-1 哈希值"
-#: builtin/tag.c:567
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
-msgstr "已更新tag '%s'（曾为 %s）\n"
+#: rerere.h:27
+msgid "update the index with reused conflict resolution if possible"
+msgstr "如果可能，重用冲突解决更新索引"
-#: git-am.sh:49
+#: git-am.sh:52
msgid "You need to set your committer info first"
msgstr "您需要先设置你的提交者信息"
-#: git-am.sh:136
+#: git-am.sh:97
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
+
+#: git-am.sh:107
+#, 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-am.sh:123
+msgid "Cannot fall back to three-way merge."
+msgstr "无法求助于三路合并。"
+
+#: git-am.sh:139
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
+msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。"
-#: git-am.sh:147
+#: git-am.sh:141
+msgid "Using index info to reconstruct a base tree..."
+msgstr "使用索引来重建一个（三路合并的）基础目录树..."
+
+#: git-am.sh:156
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
"您是否曾手动编辑过您的补丁？\n"
-"无法应用补丁到索引中的数据上。"
+"无法应用补丁到索引中的数据（blob）对象上。"
-#: git-am.sh:156
+#: git-am.sh:165
msgid "Falling back to patching base and 3-way merge..."
-msgstr "回退到补丁基础版本并使用三路合并..."
+msgstr "转而在基础版本上打补丁及进行三路合并..."
+
+#: git-am.sh:181
+msgid "Failed to merge in the changes."
+msgstr "无法合并变更。"
-#: git-am.sh:268
+#: git-am.sh:276
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: git-am.sh:355
+#: git-am.sh:363
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr "不支持 $patch_format 补丁格式。"
-#: git-am.sh:357
+#: git-am.sh:365
msgid "Patch format detection failed."
msgstr "补丁格式检测失败。"
-#: git-am.sh:411
-msgid "-d option is no longer supported. Do not use."
-msgstr "不再支持 -d 选项。不要使用。"
+#: git-am.sh:392
+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."
+msgstr ""
+"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n"
+"请不要再使用它了。"
-#: git-am.sh:474
+#: git-am.sh:486
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
-msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
+msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。"
-#: git-am.sh:479
+#: git-am.sh:491
msgid "Please make up your mind. --skip or --abort?"
msgstr "请下决心。--skip 或是 --abort ？"
-#: git-am.sh:506
+#: git-am.sh:527
+#, sh-format
+msgid ""
+"Stray $dotest directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"发现了错误的 $dotest 目录。\n"
+"使用 \"git am --abort\" 删除它。"
+
+#: git-am.sh:535
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
-#: git-am.sh:572
+#: git-am.sh:601
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr "脏的索引：不能应用补丁（脏文件：$files）"
-#: git-am.sh:748
+#: git-am.sh:705
+#, 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\"。"
+
+#: git-am.sh:732
+msgid "Patch does not have a valid e-mail address."
+msgstr "补丁中没有一个有效的邮件地址。"
+
+#: git-am.sh:779
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联，不能进行交互式操作。"
+#: git-am.sh:783
+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.
-#: git-am.sh:759
+#: git-am.sh:790
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-am.sh:795
+#: git-am.sh:826
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr "正应用：$FIRSTLINE"
-#: git-am.sh:840
+#: git-am.sh:847
+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"
+"您也许想要跳过这个补丁。"
+
+#: git-am.sh:855
+msgid ""
+"You still have unmerged paths in your index\n"
+"did you forget to use 'git add'?"
+msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
+
+#: git-am.sh:871
msgid "No changes -- Patch already applied."
-msgstr "没有变更 -- 补丁已经应用过。"
+msgstr "没有变更 —— 补丁已经应用过。"
+
+#: git-am.sh:881
+#, sh-format
+msgid "Patch failed at $msgnum $FIRSTLINE"
+msgstr "补丁失败于 $msgnum $FIRSTLINE"
+
+#: git-am.sh:884
+#, sh-format
+msgid ""
+"The copy of the patch that failed is found in:\n"
+" $dotest/patch"
+msgstr ""
+"失败的补丁文件副本位于：\n"
+" $dotest/patch"
-#: git-am.sh:866
+#: git-am.sh:902
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
+#: git-bisect.sh:48
+msgid "You need to start by \"git bisect start\""
+msgstr "您需要执行 \"git bisect start\" 来开始"
+
# 译者：注意保持句尾空格
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#: git-bisect.sh:95
#, sh-format
msgid "unrecognised option: '$arg'"
-msgstr "未识别的选项：'$arg'"
+msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84é\80\89项ï¼\9a'$arg'"
#: git-bisect.sh:99
#, sh-format
msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
#: git-bisect.sh:140
-msgid "won't bisect on seeked tree"
-msgstr "ä¸\8dä¼\9aå\9c¨å·²æ\9f¥æ\89¾è¿\87ç\9a\84æ \91ä¸\8a二分查找"
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "ä¸\8dä¼\9aå\9c¨å\81\9aäº\86 cg-seek ç\9a\84æ \91ä¸\8aå\81\9a二分查找"
#: git-bisect.sh:144
msgid "Bad HEAD - strange symbolic ref"
msgid "'git bisect bad' can take only one argument."
msgstr "'git bisect bad' 只能带一个参数。"
+#: git-bisect.sh:273
+msgid "Warning: bisecting only with a bad commit."
+msgstr "警告：在仅有一个坏提交下进行二分查找。"
+
# 译者：注意保持句尾空格
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]？ "
-#: git-bisect.sh:354
+#: git-bisect.sh:289
+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-bisect.sh:292
+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-bisect.sh:363 git-bisect.sh:490
+msgid "We are not bisecting."
+msgstr "我们没有在二分查找。"
+
+#: git-bisect.sh:370
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' 不是一个有效的提交"
-#: git-bisect.sh:363
+#: git-bisect.sh:379
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
"不能检出原始 HEAD '$branch'。\n"
-"尝试 'git bisect reset <commit>'。"
+"尝试 'git bisect reset <提交>'。"
-#: git-bisect.sh:390
+#: git-bisect.sh:406
msgid "No logfile given"
msgstr "未提供日志文件"
-#: git-bisect.sh:391
+#: git-bisect.sh:407
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"
-#: git-bisect.sh:408
+#: git-bisect.sh:424
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
-#: git-bisect.sh:474
-msgid "We are not bisecting."
-msgstr "我们没有在二分查找。"
+#: git-bisect.sh:436
+#, sh-format
+msgid "running $command"
+msgstr "运行 $command"
+
+#: git-bisect.sh:443
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+"二分查找运行失败：\n"
+"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
+
+#: git-bisect.sh:469
+msgid "bisect run cannot continue any more"
+msgstr "二分查找不能继续运行"
+
+#: git-bisect.sh:475
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+"二分查找运行失败：\n"
+"'bisect_state $state' 退出码为 $res"
+
+#: git-bisect.sh:482
+msgid "bisect run success"
+msgstr "二分查找运行成功"
#: git-pull.sh:21
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, or use 'git commit -a'."
+"as appropriate to mark resolution and make a commit."
msgstr ""
"Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n"
-"然后酌情使用 'git add/rm <file>' 标记解决方案，\n"
-"或者使用 'git commit -a'。"
+"然后酌情使用 'git add/rm <file>' 标记解决方案，再做提交。"
#: git-pull.sh:25
msgid "Pull is not possible because you have unmerged files."
msgstr "Pull 不可用，因为您尚有未合并的文件。"
-#: git-pull.sh:197
+#: git-pull.sh:31
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
+"请在合并前先提交您的修改。"
+
+#: git-pull.sh:245
msgid "updating an unborn branch with changes added to the index"
msgstr "更新尚未诞生的分支，变更添加至索引"
-#: git-pull.sh:253
+#: git-pull.sh:269
+#, sh-format
+msgid ""
+"Warning: fetch updated the current branch head.\n"
+"Warning: fast-forwarding your working tree from\n"
+"Warning: commit $orig_head."
+msgstr ""
+"警告：fetch 更新了当前的分支。您的工作区\n"
+"警告：从原提交 $orig_head 快进。"
+
+#: git-pull.sh:294
msgid "Cannot merge multiple branches into empty head"
msgstr "无法将多个分支合并到空分支"
-#: git-pull.sh:257
+#: git-pull.sh:298
msgid "Cannot rebase onto multiple branches"
msgstr "无法变基到多个分支"
+#: 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.sh:165
+msgid "Applied autostash."
+msgstr "成功应用 autostash。"
+
+#: git-rebase.sh:168
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "无法保存 $stash_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.sh:208
+msgid "The pre-rebase hook refused to rebase."
+msgstr "钩子 pre-rebase 拒绝变基操作。"
+
+#: git-rebase.sh:213
+msgid "It looks like git-am is in progress. Cannot rebase."
+msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
+
+#: git-rebase.sh:351
+msgid "The --exec option must be used with the --interactive option"
+msgstr "选项 --exec 必须和选项 --interactive 同时使用"
+
+#: git-rebase.sh:356
+msgid "No rebase in progress?"
+msgstr "没有正在进行的变基？"
+
+#: git-rebase.sh:367
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
+
+#: git-rebase.sh:374
+msgid "Cannot read HEAD"
+msgstr "不能读取 HEAD"
+
+#: 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.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "无法移回 $head_name"
+
+#: git-rebase.sh:414
+#, 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"
+"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
+
+#: git-rebase.sh:465
+#, sh-format
+msgid "invalid upstream $upstream_name"
+msgstr "无效的上游 $upstream_name"
+
+#: git-rebase.sh:489
+#, sh-format
+msgid "$onto_name: there are more than one merge bases"
+msgstr "$onto_name: 有一个以上的合并基准"
+
+#: git-rebase.sh:492 git-rebase.sh:496
+#, sh-format
+msgid "$onto_name: there is no merge base"
+msgstr "$onto_name: 没有合并基准"
+
+#: git-rebase.sh:501
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
+msgstr "没有指向一个有效的提交：$onto_name"
+
+#: git-rebase.sh:524
+#, sh-format
+msgid "fatal: no such branch: $branch_name"
+msgstr "严重错误：无此分支：$branch_name"
+
+#: git-rebase.sh:557
+msgid "Cannot autostash"
+msgstr "无法 autostash"
+
+#: git-rebase.sh:562
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
+msgstr "创建了 autostash: $stash_abbrev"
+
+#: git-rebase.sh:566
+msgid "Please commit or stash them."
+msgstr "请提交或为它们保存进度。"
+
+#: git-rebase.sh:586
+#, sh-format
+msgid "Current branch $branch_name is up to date."
+msgstr "当前分支 $branch_name 是最新的。"
+
+#: git-rebase.sh:590
+#, sh-format
+msgid "Current branch $branch_name is up to date, rebase forced."
+msgstr "当前分支 $branch_name 是最新的，强制变基。"
+
+#: git-rebase.sh:601
+#, sh-format
+msgid "Changes from $mb to $onto:"
+msgstr "变更从 $mb 到 $onto："
+
+#: git-rebase.sh:610
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr "首先，重置头指针以便在上面重放您的工作..."
+
+#: git-rebase.sh:620
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
+msgstr "快进 $branch_name 至 $onto_name。"
+
#: git-stash.sh:51
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:124 git-stash.sh:137
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: git-stash.sh:140
+#: git-stash.sh:141
msgid "No changes selected"
msgstr "没有选择变更"
-#: git-stash.sh:143
+#: git-stash.sh:144
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引（不应发生）"
-#: git-stash.sh:156
+#: git-stash.sh:157
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: git-stash.sh:223
+#: git-stash.sh:191
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "无法用 $w_commit 更新 $ref_stash"
+
+#. 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:238
+#, 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'"
+
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: git-stash.sh:227
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "无法初始化 stash"
-#: git-stash.sh:235
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: git-stash.sh:253
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: git-stash.sh:352
+#: git-stash.sh:384
msgid "No stash found."
msgstr "未发现 stash。"
-#: git-stash.sh:359
+#: git-stash.sh:391
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"
-#: git-stash.sh:365
+#: git-stash.sh:397
#, sh-format
-msgid "$reference is not valid reference"
-msgstr "$reference 不是有效的引用"
+msgid "$reference is not a valid reference"
+msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:393
+#: git-stash.sh:425
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是 stash 样提交"
-#: git-stash.sh:404
+#: git-stash.sh:436
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个 stash 引用"
-#: git-stash.sh:412
+#: git-stash.sh:444
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:416
+#: git-stash.sh:448
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中恢复进度"
-#: git-stash.sh:424
+#: git-stash.sh:456
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:426
+#: git-stash.sh:458
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:460
+#: git-stash.sh:492
msgid "Cannot unstage modified files"
msgstr "无法还原修改的文件"
-#: git-stash.sh:491
+#: git-stash.sh:507
+msgid "Index was not unstashed."
+msgstr "索引的进度没有被恢复。"
+
+#: git-stash.sh:530
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:492
+#: git-stash.sh:531
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：不能丢弃进度条目"
-#: git-stash.sh:499
+#: git-stash.sh:539
msgid "No branch name specified"
msgstr "未指定分支名"
-#: git-stash.sh:570
+#: git-stash.sh:611
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
-#: git-submodule.sh:56
+#: git-submodule.sh:95
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "无法从 url '$remoteurl' 剥离一个组件"
-#: git-submodule.sh:108
+#: git-submodule.sh:237
#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$path'"
-msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射"
+msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
+msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
-#: git-submodule.sh:149
+#: git-submodule.sh:287
#, sh-format
-msgid "Clone of '$url' into submodule path '$path' failed"
-msgstr "无法克隆 '$url' 到子模组路径 '$path'"
+msgid "Clone of '$url' into submodule path '$sm_path' failed"
+msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
-#: git-submodule.sh:159
+#: git-submodule.sh:296
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
+msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
-#: git-submodule.sh:248
+#: git-submodule.sh:406
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "只能在工作区的顶级目录中使用相对路径"
+
+#: git-submodule.sh:416
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:265
+#: git-submodule.sh:433
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr "'$sm_path' 已经存在于索引中"
+
+#: git-submodule.sh:437
#, sh-format
-msgid "'$path' already exists in the index"
-msgstr "'$path' 已经存在于索引中"
+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."
+msgstr ""
+"以下路径被您的一个 .gitignore 文件所忽略：\n"
+"$sm_path\n"
+"如果您确实想添加它，使用 -f 参数。"
-#: git-submodule.sh:282
+#: git-submodule.sh:455
#, sh-format
-msgid "'$path' already exists and is not a valid git repo"
-msgstr "'$path' 已存在且不是一个有效的 git 版本库"
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr "添加位于 '$sm_path' 的现存版本库到索引"
-#: git-submodule.sh:296
+#: git-submodule.sh:457
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
+
+#: git-submodule.sh:465
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库："
+
+#: git-submodule.sh:467
+#, sh-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from"
+msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
+
+#: git-submodule.sh:469
+#, sh-format
+msgid ""
+"use the '--force' option. If the local git directory is not the correct repo"
+msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
+
+#: git-submodule.sh:470
+#, sh-format
+msgid ""
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
+
+#: git-submodule.sh:472
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "激活本地 git 目录到子模组 '$sm_name'。"
+
+#: git-submodule.sh:484
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "不能检出子模组 '$sm_path'"
+
+#: git-submodule.sh:489
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "无法添加子模组 '$sm_path'"
+
+#: git-submodule.sh:498
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "无法注册子模组 '$sm_path'"
+
+#: git-submodule.sh:542
+#, sh-format
+msgid "Entering '$prefix$displaypath'"
+msgstr "正在进入 '$prefix$displaypath'"
+
+#: git-submodule.sh:562
+#, sh-format
+msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。"
+
+#: git-submodule.sh:608
+#, sh-format
+msgid "No url found for submodule path '$displaypath' in .gitmodules"
+msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
+
+#: git-submodule.sh:617
+#, sh-format
+msgid "Failed to register url for submodule path '$displaypath'"
+msgstr "无法为子模组路径 '$displaypath' 注册 url"
+
+#: git-submodule.sh:619
+#, sh-format
+msgid "Submodule '$name' ($url) registered for path '$displaypath'"
+msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
+
+#: git-submodule.sh:636
#, sh-format
-msgid "Unable to checkout submodule '$path'"
-msgstr "不能检出子模组 '$path'"
+msgid "Failed to register update mode for submodule path '$displaypath'"
+msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
-#: git-submodule.sh:301
+#: git-submodule.sh:674
#, sh-format
-msgid "Failed to add submodule '$path'"
-msgstr "无法添加子模组 '$path'"
+msgid "Use '.' if you really want to deinitialize all submodules"
+msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
-#: git-submodule.sh:306
+#: git-submodule.sh:691
#, sh-format
-msgid "Failed to register submodule '$path'"
-msgstr "无法注册子模组 '$path'"
+msgid "Submodule work tree '$displaypath' contains a .git directory"
+msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
-#: git-submodule.sh:348
+#: git-submodule.sh:692
#, sh-format
-msgid "Entering '$prefix$path'"
-msgstr "正在进入 '$prefix$path'"
+msgid ""
+"(use 'rm -rf' if you really want to remove it including all of its history)"
+msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
-#: git-submodule.sh:360
+#: git-submodule.sh:698
#, sh-format
-msgid "Stopping at '$path'; script returned non-zero status."
-msgstr "停止于 '$path'，脚本返回非零值。"
+msgid ""
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
+"discard them"
+msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
-#: git-submodule.sh:402
+#: git-submodule.sh:701
#, sh-format
-msgid "No url found for submodule path '$path' in .gitmodules"
-msgstr "å\9c¨ .gitmodules ä¸æ\9cªæ\89¾å\88°å\90模ç»\84è·¯å¾\84 '$path' ç\9a\84 url"
+msgid "Cleared directory '$displaypath'"
+msgstr "å·²æ¸\85é\99¤ç\9b®å½\95 '$displaypath'"
-#: git-submodule.sh:411
+#: git-submodule.sh:702
#, sh-format
-msgid "Failed to register url for submodule path '$path'"
-msgstr "无法为子模组路径 '$path' 注册 url"
+msgid "Could not remove submodule work tree '$displaypath'"
+msgstr "无法移除子模组工作区 '$displaypath'"
-#: git-submodule.sh:419
+#: git-submodule.sh:705
#, sh-format
-msgid "Failed to register update mode for submodule path '$path'"
-msgstr "无法为子模组路径 '$path' 注册更新模式"
+msgid "Could not create empty submodule directory '$displaypath'"
+msgstr "不能创建空的子模组目录 '$displaypath'"
-#: git-submodule.sh:421
+#: git-submodule.sh:714
#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$path'"
-msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册"
+msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:520
+#: git-submodule.sh:830
#, sh-format
msgid ""
-"Submodule path '$path' not initialized\n"
+"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-"子模组路径 '$path' 没有初始化\n"
+"子模组路径 '$displaypath' 没有初始化\n"
"也许您想用 'update --init'？"
-#: git-submodule.sh:533
+#: git-submodule.sh:843
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
+
+#: git-submodule.sh:852
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "无法在子模组路径 '$sm_path' 中获取"
+
+#: git-submodule.sh:876
+#, sh-format
+msgid "Unable to fetch in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中获取"
+
+#: git-submodule.sh:890
#, sh-format
-msgid "Unable to find current revision in submodule path '$path'"
-msgstr "无法在子模组路径 '$path' 中找到当前版本"
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:552
+#: git-submodule.sh:891
#, sh-format
-msgid "Unable to fetch in submodule path '$path'"
-msgstr "无法在子模组路径 '$path' 中获取"
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:566
+#: git-submodule.sh:895
#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$path'"
-msgstr "无法在子模组路径 '$path' 中变基 '$sha1'"
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:567
+#: git-submodule.sh:896
#, sh-format
-msgid "Submodule path '$path': rebased into '$sha1'"
-msgstr "子模组路径 '$path'：变基至 '$sha1'"
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:572
+#: git-submodule.sh:901
#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$path'"
-msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中"
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:573
+#: git-submodule.sh:902
#, sh-format
-msgid "Submodule path '$path': merged in '$sha1'"
-msgstr "子模组路径 '$path'：已合并入 '$sha1'"
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:578
+#: git-submodule.sh:907
#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$path'"
-msgstr "无法在子模组路径 '$path' 中检出 '$sha1'"
+msgid ""
+"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:579
+#: git-submodule.sh:908
#, sh-format
-msgid "Submodule path '$path': checked out '$sha1'"
-msgstr "子模组路径 '$path'：检出 '$sha1'"
+msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
+msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
-#: git-submodule.sh:601 git-submodule.sh:924
+#: git-submodule.sh:938
#, sh-format
-msgid "Failed to recurse into submodule path '$path'"
-msgstr "无法递归进子模组路径 '$path'"
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:709
-msgid "--"
-msgstr "--"
+#: git-submodule.sh:1046
+msgid "The --cached option cannot be used with the --files option"
+msgstr "选项 --cached 不能和选项 --files 同时使用"
+
+#: git-submodule.sh:1098
+#, sh-format
+msgid "unexpected mode $mod_dst"
+msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:767
+#: git-submodule.sh:1118
#, sh-format
-msgid " Warn: $name doesn't contain commit $sha1_src"
-msgstr " 警告：$name 未包含提交 $sha1_src"
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
+msgstr " 警告：$display_name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:770
+#: git-submodule.sh:1121
#, sh-format
-msgid " Warn: $name doesn't contain commit $sha1_dst"
-msgstr " 警告：$name 未包含提交 $sha1_dst"
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr " 警告：$display_name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:773
+#: git-submodule.sh:1124
#, sh-format
-msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-submodule.sh:798
+#: git-submodule.sh:1149
msgid "blob"
-msgstr "blob"
+msgstr "数据对象"
-#: git-submodule.sh:799
-msgid "submodule"
-msgstr "子模组"
+#: git-submodule.sh:1267
+#, sh-format
+msgid "Failed to recurse into submodule path '$sm_path'"
+msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:970
+#: git-submodule.sh:1331
#, sh-format
-msgid "Synchronizing submodule url for '$name'"
-msgstr "为 '$name' 同步子模组 url"
+msgid "Synchronizing submodule url for '$displaypath'"
+msgstr "为 '$displaypath' 同步子模组 url"
+
+#~ msgid "Failed to lock ref for update"
+#~ msgstr "无法为更新锁定引用"
+
+#~ msgid "Failed to write ref"
+#~ msgstr "不能写引用"
+
+#~ msgid "Failed to lock HEAD during fast_forward_to"
+#~ msgstr "在快进时无法为 HEAD 加锁"
+
+#~ msgid "invalid commit: %s"
+#~ msgstr "无效的提交：%s"
+
+#~ msgid "cannot lock HEAD ref"
+#~ msgstr "无法锁定 HEAD 引用"
+
+#~ msgid "cannot update HEAD ref"
+#~ msgstr "无法更新 HEAD 引用"
+
+#~ msgid "Invalid %s: '%s'"
+#~ msgstr "无效的 %s：'%s'"
+
+#~ msgid "cannot tell cwd"
+#~ msgstr "无法获知当前路径"
+
+#~ msgid "%s: cannot lock the ref"
+#~ msgstr "%s：不能锁定引用"
+
+#~ msgid "%s: cannot update the ref"
+#~ msgstr "%s：不能更新引用"
+
+#~ msgid "commit has empty message"
+#~ msgstr "提交说明为空"
+
+#~ msgid "Failed to chdir: %s"
+#~ msgstr "无法切换目录：%s"
+
+#~ msgid "key id"
+#~ msgstr "key id"
+
+#~ msgid "Tracking not set up: name too long: %s"
+#~ msgstr "跟踪未设置：名字太长：%s"
+
+#~ msgid "bug"
+#~ msgstr "bug"
+
+# 译者：注意保持句尾空格
+#~ msgid "ahead "
+#~ msgstr "领先 "
+
+# 译者：注意保持句尾空格
+#~ msgid ", behind "
+#~ msgstr "，落后 "
+
+#~ msgid "could not find .gitmodules in index"
+#~ msgstr "无法在索引中找到 .gitmodules"
+
+#~ msgid "reading updated .gitmodules failed"
+#~ msgstr "读取更新后的 .gitmodules 失败"
+
+#~ msgid "unable to stat updated .gitmodules"
+#~ msgstr "不能枚举更新后的 .gitmodules"
+
+#~ msgid "unable to remove .gitmodules from index"
+#~ msgstr "不能从索引中移除 .gitmodules"
+
+#~ msgid "adding updated .gitmodules failed"
+#~ msgstr "添加更新后的 .gitmodules 失败"
+
+# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
+#~ msgid ""
+#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
+#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
+#~ "anymore.\n"
+#~ "To add content for the whole tree, run:\n"
+#~ "\n"
+#~ " git add %s :/\n"
+#~ " (or git add %s :/)\n"
+#~ "\n"
+#~ "To restrict the command to the current directory, run:\n"
+#~ "\n"
+#~ " git add %s .\n"
+#~ " (or git add %s .)\n"
+#~ "\n"
+#~ "With the current Git version, the command is restricted to the current "
+#~ "directory.\n"
+#~ msgstr ""
+#~ "在 Git 2.0 版本，位于一个子目录下不带任何路径参数地执行命令\n"
+#~ "'git add %s (或 %s)' 的行为将被改变，不要再继续使用了。\n"
+#~ "如果要添加整个目录树的内容，执行：\n"
+#~ "\n"
+#~ " git add %s :/\n"
+#~ " (或 git add %s :/)\n"
+#~ "\n"
+#~ "如果要限制该命令只作用于当前目录，执行：\n"
+#~ "\n"
+#~ " git add %s .\n"
+#~ " (或 git add %s .)\n"
+#~ "\n"
+#~ "对于当前版本的 Git，这条命令只作用于当前目录。\n"
+
+#~ msgid ""
+#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
+#~ "whose behaviour will change in Git 2.0 with respect to paths you "
+#~ "removed.\n"
+#~ "Paths like '%s' that are\n"
+#~ "removed from your working tree are ignored with this version of Git.\n"
+#~ "\n"
+#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
+#~ " ignores paths you removed from your working tree.\n"
+#~ "\n"
+#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
+#~ "\n"
+#~ "Run 'git status' to check the paths you removed from your working tree.\n"
+#~ msgstr ""
+#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n"
+#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
+#~ "像本地工作区移除的路径 '%s'\n"
+#~ "在此版本的 Git 中被忽略。\n"
+#~ "\n"
+#~ "* 'git add --ignore-removal <路径规则>'，是当前版本的默认操作，\n"
+#~ " 忽略您本地工作区中移除的文件。\n"
+#~ "\n"
+#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
+#~ "\n"
+#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
+
+#~ msgid ""
+#~ "Auto packing the repository for optimum performance. You may also\n"
+#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
+#~ msgstr ""
+#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
+#~ "参见 \"git help gc\" 以获取更多信息。\n"
+
+#~ msgid ""
+#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
+#~ "counterpart. If you did not intend to push that branch, you may want to\n"
+#~ "specify branches to push or set the 'push.default' configuration "
+#~ "variable\n"
+#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
+#~ msgstr ""
+#~ "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
+#~ "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
+#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
+#~ "以便只推送当前分支。"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#~ msgid "copied: %s -> %s"
+#~ msgstr "拷贝： %s -> %s"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#~ msgid "deleted: %s"
+#~ msgstr "删除： %s"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#~ msgid "modified: %s"
+#~ msgstr "修改： %s"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#~ msgid "renamed: %s -> %s"
+#~ msgstr "重命名： %s -> %s"
+
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#~ msgid "unmerged: %s"
+#~ msgstr "未合并： %s"
+
+# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
+#~ msgid ""
+#~ "push.default is unset; its implicit value is changing in\n"
+#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
+#~ "and maintain the current behavior after the default changes, 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"
+#~ "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)"
+#~ 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"
+#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
+#~ "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"
+#~ "为保持兼容，请用 'current' 代替 'simple'）"
+
+#~ msgid "input paths are terminated by a null character"
+#~ msgstr "输入路径以null字符终止"
+
+#~ msgid ""
+#~ "The following untracked files would NOT be saved but need to be removed "
+#~ "by stash save:"
+#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除："
+
+#~ msgid ""
+#~ "Aborting. Consider using either the --force or --include-untracked option."
+#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
+
+#~ msgid ""
+#~ "the following submodule (or one of its nested submodule)\n"
+#~ "uses a .git directory:"
+#~ msgid_plural ""
+#~ "the following submodules (or one of its nested submodule)\n"
+#~ "use a .git directory:"
+#~ msgstr[0] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录："
+#~ msgstr[1] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录："
+
+# 译者：注意保持前导空格
+#~ msgid " (fix conflicts and then run \"git am --resolved\")"
+#~ msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
+
+# 译者：注意保持前导空格
+#~ msgid " (all conflicts fixed: run \"git commit\")"
+#~ msgstr " （解决所有冲突后，执行 \"git commit\"）"
+
+#~ msgid "more than %d trees given: '%s'"
+#~ msgstr "提供了超过 %d 个树对象：'%s'"
+
+#~ msgid "You cannot combine --no-ff with --ff-only."
+#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
+
+#~ msgid ""
+#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n"
+#~ "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
+
+#~ msgid ""
+#~ "'%s' has changes staged in the index\n"
+#~ "(use --cached to keep the file, or -f to force removal)"
+#~ msgstr ""
+#~ "'%s' 有变更已暂存至索引中\n"
+#~ "（使用 --cached 保存文件，或用 -f 强制删除）"
+
+#~ msgid "show commits where no parent comes before its children"
+#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
+
+#~ msgid "show the HEAD reference"
+#~ msgstr "显示 HEAD 引用"
+
+#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
+#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
+
+#~ msgid "Change flags"
+#~ msgstr "修改参数"
+
+#~ msgid ""
+#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
+#~ msgstr "注意：没有要清理的文件；尝试按 \"t\" 切换 git-clean 的选项。"
+
+#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
+#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
+
+#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
+#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
+
+#~ msgid "See 'git help <command>' for more information on a specific command."
+#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
+
+#~ msgid "BUG: impossible combination of %d and %p"
+#~ msgstr "BUG: 无法组合 %d 和 %p"
+
+# 译者：以下三条实际为一个段落
+#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
+#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
+
+# 译者：为对齐，下面两句内容有调整
+#~ msgid "may speed it up, but you have to be careful not to forget to add"
+#~ msgstr "也许能提高速度，但您需要小心不要忘了添加新文件"
+
+#~ msgid "new files yourself (see 'git help status')."
+#~ msgstr "（参见 'git help status'）。"
+
+#~ msgid "use any ref in .git/refs"
+#~ msgstr "使用 .git/refs 里的任意引用"
+
+#~ msgid "use any tag in .git/refs/tags"
+#~ msgstr "使用 .git/refs/tags 里的任意 tag"
+
+#~ msgid "bad object %s"
+#~ msgstr "坏对象 %s"
+
+#~ msgid "bogus committer info %s"
+#~ msgstr "虚假的提交者信息 %s"
+
+#~ msgid "can't fdopen 'show' output fd"
+#~ msgstr "不能打开 'show' 输出文件句柄"
+
+#~ msgid "failed to close pipe to 'show' for object '%s'"
+#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
+
+#~ msgid " 0 files changed"
+#~ msgstr " 0 个文件被修改"
+
+#~ msgid " %d file changed"
+#~ msgid_plural " %d files changed"
+#~ msgstr[0] " %d 个文件被修改"
+#~ msgstr[1] " %d 个文件被修改"
+
+#~ msgid ", %d insertion(+)"
+#~ msgid_plural ", %d insertions(+)"
+#~ msgstr[0] "，插入 %d 行(+)"
+#~ msgstr[1] "，插入 %d 行(+)"
+
+#~ msgid ", %d deletion(-)"
+#~ msgid_plural ", %d deletions(-)"
+#~ msgstr[0] "，删除 %d 行(-)"
+#~ msgstr[1] "，删除 %d 行(-)"
+
+#~ msgid "You do not have a valid HEAD"
+#~ msgstr "您没有一个有效的 HEAD"
+
+#~ msgid "oops"
+#~ msgstr "哎哟"
+
+#~ msgid "Would not remove %s\n"
+#~ msgstr "不会删除 %s\n"
+
+#~ msgid "Not removing %s\n"
+#~ msgstr "未删除 %s\n"
+
+#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
+#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
+
+#~ msgid "Could not read index"
+#~ msgstr "不能读取索引"
+
+# 译者：中文字符串拼接，可删除前导空格
+#~ msgid " (use \"git add\" to track)"
+#~ msgstr "（使用 \"git add\" 建立跟踪）"
+
+#~ msgid "--detach cannot be used with -b/-B/--orphan"
+#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
+
+#~ msgid "--detach cannot be used with -t"
+#~ msgstr "--detach 不能和 -t 同时使用"
+
+#~ msgid "--orphan and -b|-B are mutually exclusive"
+#~ msgstr "--orphan 和 -b|-B 互斥"
+
+#~ msgid "--orphan cannot be used with -t"
+#~ msgstr "--orphan 不能和 -t 同时使用"
+
+#~ msgid "git checkout: -f and -m are incompatible"
+#~ msgstr "git checkout：-f 和 -m 不兼容"
+
+#~ msgid ""
+#~ "git checkout: updating paths is incompatible with switching branches."
+#~ msgstr "git checkout：更新路径和切换分支不兼容。"
+
+#~ msgid "diff setup failed"
+#~ msgstr "diff 设置失败"
+
+#~ msgid "merge-recursive: disk full?"
+#~ msgstr "merge-recursive：磁盘已满？"
-#~ msgid "Too many options specified"
-#~ msgstr "指定了太多的选项"
+#~ msgid "diff_setup_done failed"
+#~ msgstr "diff_setup_done 失败"
projects / platform / upstream / git.git / blobdiff