po/zh_CN.po - jrn/git - Git at Google

 # Chinese translations for Git package
 # Git 软件包的简体中文翻译.
 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
 # This file is distributed under the same license as the Git package.
 # Contributers:
 #   - Jiang Xin <worldhello.net AT gmail.com>
 #   - Riku <lu.riku AT gmail.com>
 #   - Zhuang Ya <zhuangya AT me.com>
 #   - Lian Cheng <rhythm.mail AT gmail.com>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2013-02-19 13:32+0800\n"
 "PO-Revision-Date: 2013-02-19 14:44+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=2; plural=(n != 1);\n"

 #: advice.c:49
 #, 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:79
 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'."
 msgstr ""
 "请先在工作区改正文件，然后酌情使用\n"
 "'git add/rm <file>' 标记解决方案，\n"
 "或使用 'git commit -a'。"

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

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

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

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

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

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

 #: archive.c:324 builtin/log.c:1115
 msgid "prefix"
 msgstr "前缀"

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

 #: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366
 #: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653
 #: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77
 #: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536
 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
 msgid "file"
 msgstr "文件"

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

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

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

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

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

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

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

 #: archive.c:345 builtin/archive.c:93 builtin/clone.c:85
 msgid "repo"
 msgstr "版本库"

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

 #: archive.c:347 builtin/archive.c:95 builtin/notes.c:615
 msgid "command"
 msgstr "命令"

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

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

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

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

 #: bundle.c:89 builtin/commit.c:674
 #, c-format
 msgid "could not open '%s'"
 msgstr "不能打开 '%s'"

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

 #: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299
 #: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347
 #: builtin/shortlog.c:157
 msgid "revision walk setup failed"
 msgstr "版本遍历设置失败"

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

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

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

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

 #: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的参数：%s"

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

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

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

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

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

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

 #: commit.c:50
 #, c-format
 msgid "could not parse %s"
 msgstr "不能解析 %s"

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

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

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

 #: connected.c:48
 #, c-format
 msgid "failed write to rev-list: %s"
 msgstr "无法写入 rev-list：%s"

 #: connected.c:56
 #, 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 年"

 #: 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 年前"

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

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

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

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

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

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

 #: gpg-interface.c:59 gpg-interface.c:127
 msgid "could not run gpg."
 msgstr "不能执行 gpg。"

 #: gpg-interface.c:71
 msgid "gpg did not accept the data"
 msgstr "gpg 没有接受数据"

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

 #: gpg-interface.c:112
 #, c-format
 msgid "could not create temporary file '%s': %s"
 msgstr "不能创建临时文件 '%s'：%s"

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

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

 #: grep.c:1639
 #, c-format
 msgid "'%s': %s"
 msgstr "'%s'：%s"

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

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

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

 #: help.c:235
 msgid "The most commonly used git commands are:"
 msgstr "最常用的 git 命令有："

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

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

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

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

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

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

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

 #: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
 #: builtin/clone.c:586
 msgid "unable to write new index file"
 msgstr "无法写新的索引文件"

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

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

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

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

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

 #. something else exists
 #. .. but not some other error (who really cares what?)
 #: merge-recursive.c:697 merge-recursive.c:718
 msgid ": perhaps a D/F conflict?"
 msgstr "：可能是一个目录/文件冲突？"

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

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

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

 #: merge-recursive.c:773 builtin/clone.c:302
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"

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

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

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

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

 #: merge-recursive.c:942
 msgid "unsupported object type in the tree"
 msgstr "在树中有不支持的对象类型"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #: merge-recursive.c:1787
 msgid "Fatal merge failure, shouldn't happen."
 msgstr "严重的合并错误，不应发生。"

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

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

 #: merge-recursive.c:1845
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr "未处理的路径??? %s"

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

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

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

 #: merge-recursive.c:1997
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "不能解析对象 '%s'"

 #: merge-recursive.c:2009 builtin/merge.c:643
 msgid "Unable to write index."
 msgstr "不能写入索引。"

 #: parse-options.c:489
 msgid "..."
 msgstr "..."

 #: parse-options.c:507
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"

 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
 #: parse-options.c:511
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: parse-options.c:514
 #, c-format
 msgid "    %s"
 msgstr "    %s"

 #: parse-options.c:548
 msgid "-NUM"
 msgstr "-数字"

 #: pathspec.c:83
 #, c-format
 msgid "Path '%s' is in submodule '%.*s'"
 msgstr "路径 '%s' 属于模组 '%.*s'"

 #: pathspec.c:99
 #, c-format
 msgid "'%s' is beyond a symbolic link"
 msgstr "'%s' 位于符号链接中"

 #: remote.c:1653
 #, 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"

 #: remote.c:1659
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" 来发布您的本地提交）\n"

 #: remote.c:1662
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

 #  译者：注意保持前导空格
 #: remote.c:1670
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" 来更新您的本地分支）\n"

 #: remote.c:1673
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
 "and have %d and %d different commit each, respectively.\n"
 msgid_plural ""
 "Your branch and '%s' have diverged,\n"
 "and have %d and %d different commits each, respectively.\n"
 msgstr[0] ""
 "您的分支和 '%s' 出现了偏离，\n"
 "并且分别有 %d 和 %d 处不同的提交。\n"
 msgstr[1] ""
 "您的分支和 '%s' 出现了偏离，\n"
 "并且分别有 %d 和 %d 处不同的提交。\n"

 #  译者：注意保持前导空格
 #: remote.c:1683
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" 来合并远程分支）\n"

 #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
 #: builtin/merge.c:994
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "不能为写入打开 '%s'"

 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
 #: builtin/merge.c:999
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "不能写入 '%s'"

 #: sequencer.c:146
 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"
 "命令标记修正后的文件"

 #: sequencer.c:149
 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' 提交"

 #: sequencer.c:162 sequencer.c:774 sequencer.c:857
 #, c-format
 msgid "Could not write to %s"
 msgstr "不能写入 %s"

 #: sequencer.c:165
 #, c-format
 msgid "Error wrapping up %s"
 msgstr "错误收尾 %s"

 #: sequencer.c:180
 msgid "Your local changes would be overwritten by cherry-pick."
 msgstr "您的本地修改将被拣选操作覆盖。"

 #: sequencer.c:182
 msgid "Your local changes would be overwritten by revert."
 msgstr "您的本地修改将被还原操作覆盖。"

 #: sequencer.c:185
 msgid "Commit your changes or stash them to proceed."
 msgstr "提交您的修改或保存进度后再继续。"

 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
 #: sequencer.c:236
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"

 #: sequencer.c:267
 msgid "Could not resolve HEAD commit\n"
 msgstr "不能解析 HEAD 提交\n"

 #: sequencer.c:288
 msgid "Unable to update cache tree\n"
 msgstr "不能更新缓存\n"

 #: sequencer.c:333
 #, c-format
 msgid "Could not parse commit %s\n"
 msgstr "不能解析提交 %s\n"

 #: sequencer.c:338
 #, c-format
 msgid "Could not parse parent commit %s\n"
 msgstr "不能解析父提交 %s\n"

 #: sequencer.c:404
 msgid "Your index file is unmerged."
 msgstr "您的索引文件未完成合并。"

 #: sequencer.c:423
 #, c-format
 msgid "Commit %s is a merge but no -m option was given."
 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

 #: sequencer.c:431
 #, c-format
 msgid "Commit %s does not have parent %d"
 msgstr "提交 %s 没有父提交 %d"

 #: sequencer.c:435
 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
 msgstr "指定了主线但提交 %s 不是一个合并。"

 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1
 #: sequencer.c:448
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：不能解析父提交 %s"

 #: sequencer.c:452
 #, c-format
 msgid "Cannot get commit message for %s"
 msgstr "不能得到 %s 的提交说明"

 #: sequencer.c:536
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "不能还原 %s... %s"

 #: sequencer.c:537
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "不能应用 %s... %s"

 #: sequencer.c:569
 msgid "empty commit set passed"
 msgstr "提供了空的提交集"

 #: sequencer.c:577
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读取索引"

 #: sequencer.c:582
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"

 #: sequencer.c:640
 #, c-format
 msgid "Cannot %s during a %s"
 msgstr "无法 %s 在一个 %s 过程中"

 #: sequencer.c:662
 #, c-format
 msgid "Could not parse line %d."
 msgstr "不能解析第 %d 行。"

 #: sequencer.c:667
 msgid "No commits parsed."
 msgstr "没有提交被解析。"

 #: sequencer.c:680
 #, c-format
 msgid "Could not open %s"
 msgstr "不能打开 %s"

 #: sequencer.c:684
 #, c-format
 msgid "Could not read %s."
 msgstr "不能读取 %s。"

 #: sequencer.c:691
 #, c-format
 msgid "Unusable instruction sheet: %s"
 msgstr "无用的指令表单：%s"

 #: sequencer.c:719
 #, c-format
 msgid "Invalid key: %s"
 msgstr "无效键名：%s"

 #: sequencer.c:722
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "%s 的值无效：%s"

 #: sequencer.c:734
 #, c-format
 msgid "Malformed options sheet: %s"
 msgstr "非法的选项表单：%s"

 #: sequencer.c:755
 msgid "a cherry-pick or revert is already in progress"
 msgstr "一个拣选或还原操作已在进行"

 #: sequencer.c:756
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

 #: sequencer.c:760
 #, c-format
 msgid "Could not create sequencer directory %s"
 msgstr "不能创建序列目录 %s"

 #: sequencer.c:776 sequencer.c:861
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "错误收尾 %s。"

 #: sequencer.c:795 sequencer.c:929
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原操作并未进行"

 #: sequencer.c:797
 msgid "cannot resolve HEAD"
 msgstr "不能解析 HEAD"

 #: sequencer.c:799
 msgid "cannot abort from a branch yet to be born"
 msgstr "不能从尚未建立的分支终止"

 #: sequencer.c:821 builtin/apply.c:4056
 #, c-format
 msgid "cannot open %s: %s"
 msgstr "不能打开 %s：%s"

 #: sequencer.c:824
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "不能读取 %s：%s"

 #: sequencer.c:825
 msgid "unexpected end of file"
 msgstr "意外的文件结束"

 #: sequencer.c:831
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

 #: sequencer.c:854
 #, c-format
 msgid "Could not format %s."
 msgstr "不能格式化 %s。"

 #: sequencer.c:1016
 msgid "Can't revert as initial commit"
 msgstr "不能作为初始提交还原"

 #: sequencer.c:1017
 msgid "Can't cherry-pick into empty head"
 msgstr "不能拣选到空分支"

 #: sha1_name.c:1044
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指向一个分支"

 #: sha1_name.c:1047
 #, c-format
 msgid "No such branch: '%s'"
 msgstr "没有此分支：'%s'"

 #: sha1_name.c:1049
 #, c-format
 msgid "No upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"

 #: sha1_name.c:1052
 #, c-format
 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

 #: wrapper.c:408
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "不能访问 '%s'：%s"

 #: wrapper.c:423
 #, c-format
 msgid "unable to access '%s'"
 msgstr "不能访问 '%s'"

 #: wrapper.c:434
 #, c-format
 msgid "unable to look up current user in the passwd file: %s"
 msgstr "无法在口令文件中查询到当前用户：%s"

 #: wrapper.c:435
 msgid "no such user"
 msgstr "无此用户"

 #: wt-status.c:140
 msgid "Unmerged paths:"
 msgstr "未合并的路径："

 #  译者：注意保持前导空格
 #: wt-status.c:167 wt-status.c:194
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <file>...\" 撤出暂存区）"

 #  译者：注意保持前导空格
 #: wt-status.c:169 wt-status.c:196
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <file>...\" 撤出暂存区）"

 #  译者：注意保持前导空格
 #: wt-status.c:173
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  （使用 \"git add <file>...\" 标记解决方案）"

 #  译者：注意保持前导空格
 #: wt-status.c:175 wt-status.c:179
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <file>...\" 标记解决方案）"

 #  译者：注意保持前导空格
 #: wt-status.c:177
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <file>...\" 标记解决方案）"

 #: wt-status.c:188
 msgid "Changes to be committed:"
 msgstr "要提交的变更："

 #: wt-status.c:206
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备提交的变更："

 #  译者：注意保持前导空格
 #: wt-status.c:210
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <file>...\" 更新要提交的内容）"

 #  译者：注意保持前导空格
 #: wt-status.c:212
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <file>...\" 更新要提交的内容）"

 #  译者：注意保持前导空格
 #: wt-status.c:213
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"

 #  译者：注意保持前导空格
 #: wt-status.c:215
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"

 #  译者：注意保持前导空格
 #: wt-status.c:227
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <file>...\" 以包含要提交的内容）"

 #: wt-status.c:244
 msgid "bug"
 msgstr "bug"

 #: wt-status.c:249
 msgid "both deleted:"
 msgstr "双方删除："

 #: wt-status.c:250
 msgid "added by us:"
 msgstr "由我们添加："

 #: wt-status.c:251
 msgid "deleted by them:"
 msgstr "由他们删除："

 #: wt-status.c:252
 msgid "added by them:"
 msgstr "由他们添加："

 #: wt-status.c:253
 msgid "deleted by us:"
 msgstr "由我们删除："

 #: wt-status.c:254
 msgid "both added:"
 msgstr "双方添加："

 #: wt-status.c:255
 msgid "both modified:"
 msgstr "双方修改："

 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 #: wt-status.c:285
 msgid "new commits, "
 msgstr "新提交, "

 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 #: wt-status.c:287
 msgid "modified content, "
 msgstr "修改的内容, "

 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 #: wt-status.c:289
 msgid "untracked content, "
 msgstr "未跟踪的内容, "

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:303
 #, c-format
 msgid "new file:   %s"
 msgstr "新文件：    %s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:306
 #, c-format
 msgid "copied:     %s -> %s"
 msgstr "拷贝：      %s -> %s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:309
 #, c-format
 msgid "deleted:    %s"
 msgstr "删除：      %s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:312
 #, c-format
 msgid "modified:   %s"
 msgstr "修改：      %s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:315
 #, c-format
 msgid "renamed:    %s -> %s"
 msgstr "重命名：    %s -> %s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:318
 #, c-format
 msgid "typechange: %s"
 msgstr "类型变更：  %s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:321
 #, c-format
 msgid "unknown:    %s"
 msgstr "未知：      %s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:324
 #, c-format
 msgid "unmerged:   %s"
 msgstr "未合并：    %s"

 #: wt-status.c:327
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "bug：未处理的差异状态 %c"

 #: wt-status.c:789
 msgid "You have unmerged paths."
 msgstr "您有尚未合并的路径。"

 #  译者：注意保持前导空格
 #: wt-status.c:792 wt-status.c:944
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲突并运行 \"git commit\"）"

 #: wt-status.c:795
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲突已解决但您仍处于合并中。"

 #  译者：注意保持前导空格
 #: wt-status.c:798
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结束合并）"

 #: wt-status.c:808
 msgid "You are in the middle of an am session."
 msgstr "您正处于一个 am 过程中。"

 #: wt-status.c:811
 msgid "The current patch is empty."
 msgstr "当前的补丁为空。"

 #  译者：注意保持前导空格
 #: wt-status.c:815
 msgid "  (fix conflicts and then run \"git am --resolved\")"
 msgstr "  （解决冲突，然后运行 \"git am --resolved\"）"

 #  译者：注意保持前导空格
 #: wt-status.c:817
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补丁）"

 #  译者：注意保持前导空格
 #: wt-status.c:819
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" 恢复原有分支）"

 #: wt-status.c:879 wt-status.c:896
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您正在将分支 '%s' 变基到 '%s'。"

 #: wt-status.c:884 wt-status.c:901
 msgid "You are currently rebasing."
 msgstr "您正在变基。"

 #  译者：注意保持前导空格
 #: wt-status.c:887
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"

 #  译者：注意保持前导空格
 #: wt-status.c:889
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"

 #  译者：注意保持前导空格
 #: wt-status.c:891
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"

 #  译者：注意保持前导空格
 #: wt-status.c:904
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"

 #: wt-status.c:908
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"

 #: wt-status.c:913
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您正在变基过程中拆分一个提交。"

 #  译者：注意保持前导空格
 #: wt-status.c:916
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

 #: wt-status.c:920
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"

 #: wt-status.c:925
 msgid "You are currently editing a commit during a rebase."
 msgstr "您正在变基过程中编辑一个提交。"

 #  译者：注意保持前导空格
 #: wt-status.c:928
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修补当前提交）"

 #  译者：注意保持前导空格
 #: wt-status.c:930
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （当您对您的修改满意后执行 \"git rebase --continue\"）"

 #: wt-status.c:940
 msgid "You are currently cherry-picking."
 msgstr "您正在做拣选操作。"

 #  译者：注意保持前导空格
 #: wt-status.c:947
 msgid "  (all conflicts fixed: run \"git commit\")"
 msgstr "  （解决所有冲突后，执行 \"git commit\"）"

 #: wt-status.c:958
 #, c-format
 msgid "You are currently bisecting branch '%s'."
 msgstr "您正在分支 '%s' 中做二分查找。"

 #: wt-status.c:962
 msgid "You are currently bisecting."
 msgstr "您正在做二分查找。"

 #  译者：注意保持前导空格
 #: wt-status.c:965
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"

 #: wt-status.c:1064
 msgid "On branch "
 msgstr "位于分支 "

 #: wt-status.c:1071
 msgid "Not currently on any branch."
 msgstr "当前不在任何分支上。"

 #: wt-status.c:1083
 msgid "Initial commit"
 msgstr "初始提交"

 #: wt-status.c:1097
 msgid "Untracked files"
 msgstr "未跟踪的文件"

 #: wt-status.c:1099
 msgid "Ignored files"
 msgstr "忽略的文件"

 #: wt-status.c:1101
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"

 #  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:1103
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u 参数显示未跟踪的文件）"

 #: wt-status.c:1109
 msgid "No changes"
 msgstr "没有修改"

 #  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:1114
 #, 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:1117
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入提交\n"

 #: wt-status.c:1120
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

 #: wt-status.c:1123
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "提交为空，但是存在尚未跟踪的文件\n"

 #  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:1126
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

 #: wt-status.c:1129 wt-status.c:1134
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件要提交\n"

 #  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:1132
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

 #  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:1136
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr "无文件要提交，干净的工作区\n"

 #: wt-status.c:1244
 msgid "HEAD (no branch)"
 msgstr "HEAD（非分支）"

 #  译者：注意保持句尾空格
 #: wt-status.c:1250
 msgid "Initial commit on "
 msgstr "初始提交于 "

 #  译者：注意保持句尾空格
 #: wt-status.c:1265
 msgid "behind "
 msgstr "落后 "

 #  译者：注意保持句尾空格
 #: wt-status.c:1268 wt-status.c:1271
 msgid "ahead "
 msgstr "领先 "

 #  译者：注意保持句尾空格
 #: wt-status.c:1273
 msgid ", behind "
 msgstr "，落后 "

 #: compat/precompose_utf8.c:58 builtin/clone.c:341
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "无法删除 '%s'"

 #: builtin/add.c:20
 msgid "git add [options] [--] <pathspec>..."
 msgstr "git add [选项] [--] <路径匹配>..."

 #: builtin/add.c:63
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "意外的差异状态 %c"

 #: builtin/add.c:68 builtin/commit.c:231
 msgid "updating files failed"
 msgstr "更新文件失败"

 #: builtin/add.c:78
 #, c-format
 msgid "remove '%s'\n"
 msgstr "删除 '%s'\n"

 #: builtin/add.c:148
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之后尚未被暂存的变更："

 #: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路径 '%s' 未匹配任何文件"

 #: builtin/add.c:234
 msgid "Could not read the index"
 msgstr "不能读取索引"

 #: builtin/add.c:244
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "不能打开 '%s' 以写入。"

 #: builtin/add.c:248
 msgid "Could not write patch"
 msgstr "不能生成补丁"

 #: builtin/add.c:253
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "不能查看文件状态 '%s'"

 #: builtin/add.c:255
 msgid "Empty patch. Aborted."
 msgstr "空补丁。异常终止。"

 #: builtin/add.c:261
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "不能应用 '%s'"

 #: builtin/add.c:271
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

 #: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
 #: builtin/rm.c:206
 msgid "dry run"
 msgstr "演习"

 #: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19
 #: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
 #: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
 msgid "be verbose"
 msgstr "冗长输出"

 #: builtin/add.c:280
 msgid "interactive picking"
 msgstr "交互式拣选"

 #: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258
 msgid "select hunks interactively"
 msgstr "交互式挑选数据块"

 #: builtin/add.c:282
 msgid "edit current diff and apply"
 msgstr "编辑当前差异并应用"

 #: builtin/add.c:283
 msgid "allow adding otherwise ignored files"
 msgstr "允许添加忽略的文件"

 #: builtin/add.c:284
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"

 #: builtin/add.c:285
 msgid "record only the fact that the path will be added later"
 msgstr "只记录，该路径稍后再添加"

 #: builtin/add.c:286
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改变的已跟踪文件和未跟踪文件"

 #: builtin/add.c:287
 msgid "don't add, only refresh the index"
 msgstr "不添加，只刷新索引"

 #: builtin/add.c:288
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错不能添加的文件"

 #: builtin/add.c:289
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"

 #: builtin/add.c:311
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "使用 -f 参数如果您确实要添加它们。\n"

 #: builtin/add.c:312
 msgid "no files added"
 msgstr "没有文件被添加"

 #: builtin/add.c:318
 msgid "adding files failed"
 msgstr "添加文件失败"

 #  译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
 #.
 #. * To be consistent with "git add -p" and most Git
 #. * commands, we should default to being tree-wide, but
 #. * this is not the original behavior and can't be
 #. * changed until users trained themselves not to type
 #. * "git add -u" or "git add -A". For now, we warn and
 #. * keep the old behavior. Later, this warning can be
 #. * turned into a die(...), and eventually we may
 #. * reallow the command with a new behavior.
 #.
 #: builtin/add.c:335
 #, c-format
 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."
 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，这条命令只作用于当前目录。"

 #: builtin/add.c:381
 msgid "-A and -u are mutually incompatible"
 msgstr "-A 和 -u 选项互斥"

 #: builtin/add.c:383
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

 #: builtin/add.c:414
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"

 #: builtin/add.c:415
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "也许您想要执行 'git add .'？\n"

 #: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
 #: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235
 msgid "index file corrupt"
 msgstr "索引文件损坏"

 #: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"

 #: builtin/apply.c:57
 msgid "git apply [options] [<patch>...]"
 msgstr "git apply [选项] [<补丁>...]"

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

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

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

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

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

 #: builtin/apply.c:945
 #, 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:949
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

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

 #: builtin/apply.c:957
 #, 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:1422
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount：意外的行：%.*s"

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

 #: builtin/apply.c:1496
 #, 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:1656
 msgid "new file depends on old contents"
 msgstr "新文件依赖旧内容"

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

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

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

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

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

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

 #. there has to be one hunk (forward hunk)
 #: builtin/apply.c:1900
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "未能识别的二进制补丁位于第 %d 行"

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

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

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

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

 #: builtin/apply.c:2802
 #, 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:2814
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

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

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

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

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

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

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

 #: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189
 #, c-format
 msgid "read of %s failed"
 msgstr "读取 %s 失败"

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

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

 #: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419
 #, c-format
 msgid "%s: %s"
 msgstr "%s：%s"

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

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

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

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

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

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

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

 #: builtin/apply.c:3561
 #, 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:3569
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补丁未应用"

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

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

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

 #: builtin/apply.c:3846
 #, c-format
 msgid "corrupt patch for subproject %s"
 msgstr "子项目 %s 损坏的补丁"

 #: builtin/apply.c:3850
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "不能枚举新建文件 '%s' 的状态"

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

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

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

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

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

 #: builtin/apply.c:4035
 msgid "internal error"
 msgstr "内部错误"

 #. Say this even without --verbose
 #: builtin/apply.c:4038
 #, 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:4048
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件名为 %.*s.rej"

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

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

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

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

 #: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91
 #: builtin/fetch.c:63
 msgid "path"
 msgstr "路径"

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

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

 #: builtin/apply.c:4358
 msgid "num"
 msgstr "数字"

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

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

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

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

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

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

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

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

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

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

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

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

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

 #: builtin/apply.c:4388
 msgid "action"
 msgstr "动作"

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

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

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

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

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

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

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

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

 #: builtin/apply.c:4412
 msgid "root"
 msgstr "根目录"

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

 #: builtin/apply.c:4435
 msgid "--3way outside a repository"
 msgstr "--3way 在一个版本库之外"

 #: builtin/apply.c:4443
 msgid "--index outside a repository"
 msgstr "--index 在一个版本库之外"

 #: builtin/apply.c:4446
 msgid "--cached outside a repository"
 msgstr "--cached 在一个版本库之外"

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

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

 #: builtin/apply.c:4482 builtin/apply.c:4492
 #, 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:63
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive：NACK %s"

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

 #: builtin/archive.c:66
 msgid "git archive: protocol error"
 msgstr "git archive：协议错误"

 #: builtin/archive.c:71
 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:25
 msgid "git blame [options] [rev-opts] [rev] [--] file"
 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"

 #: builtin/blame.c:30 builtin/shortlog.c:15
 msgid "[rev-opts] are documented in git-rev-list(1)"
 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"

 #: builtin/blame.c:2350
 msgid "Show blame entries as we find them, incrementally"
 msgstr "增量式地显示发现的 blame 条目"

 #: builtin/blame.c:2351
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "边界提交显示空的 SHA-1（默认：关闭）"

 #: builtin/blame.c:2352
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "不把根提交作为边界（默认：关闭）"

 #: builtin/blame.c:2353
 msgid "Show work cost statistics"
 msgstr "显示命令消耗统计"

 #: builtin/blame.c:2354
 msgid "Show output score for blame entries"
 msgstr "显示判断 blame 条目位移的得分诊断信息"

 #: builtin/blame.c:2355
 msgid "Show original filename (Default: auto)"
 msgstr "显示原始文件名（默认：自动）"

 #: builtin/blame.c:2356
 msgid "Show original linenumber (Default: off)"
 msgstr "显示原始的行号（默认：关闭）"

 #: builtin/blame.c:2357
 msgid "Show in a format designed for machine consumption"
 msgstr "显示为一个适合机器读取的格式"

 #: builtin/blame.c:2358
 msgid "Show porcelain format with per-line commit information"
 msgstr "为每一行显示机器适用的提交信息"

 #: builtin/blame.c:2359
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"

 #: builtin/blame.c:2360
 msgid "Show raw timestamp (Default: off)"
 msgstr "显示原始时间戳（默认：关闭）"

 #: builtin/blame.c:2361
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "显示长的SHA1提交号（默认：关闭）"

 #: builtin/blame.c:2362
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "隐藏作者名字和时间戳（默认：关闭）"

 #: builtin/blame.c:2363
 msgid "Show author email instead of name (Default: off)"
 msgstr "显示作者的邮箱而不是名字（默认：关闭）"

 #: builtin/blame.c:2364
 msgid "Ignore whitespace differences"
 msgstr "忽略空白差异"

 #: builtin/blame.c:2365
 msgid "Spend extra cycles to find better match"
 msgstr "花费额外的循环来找到更好的匹配"

 #: builtin/blame.c:2366
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"

 #: builtin/blame.c:2367
 msgid "Use <file>'s contents as the final image"
 msgstr "使用 <file> 的内容作为最终的图片"

 #: builtin/blame.c:2368 builtin/blame.c:2369
 msgid "score"
 msgstr "得分"

 #: builtin/blame.c:2368
 msgid "Find line copies within and across files"
 msgstr "找到文件内及跨文件的行拷贝"

 #: builtin/blame.c:2369
 msgid "Find line movements within and across files"
 msgstr "找到文件内及跨文件的行移动"

 #: builtin/blame.c:2370
 msgid "n,m"
 msgstr "n,m"

 #: builtin/blame.c:2370
 msgid "Process only line range n,m, counting from 1"
 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

 #: builtin/branch.c:23
 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"

 #: builtin/branch.c:24
 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"

 #: builtin/branch.c:25
 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."

 #: builtin/branch.c:26
 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"

 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
 #: builtin/branch.c:145
 #, 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:149
 #, 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:163
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指向的提交对象"

 #: builtin/branch.c:167
 #, 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:180
 msgid "Update of config-file failed"
 msgstr "无法更新 config 文件"

 #: builtin/branch.c:208
 msgid "cannot use -a with -d"
 msgstr "不能将 -a 和 -d 同时使用"

 #: builtin/branch.c:214
 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指向的提交对象"

 #: builtin/branch.c:222
 #, c-format
 msgid "Cannot delete the branch '%s' which you are currently on."
 msgstr "无法删除您当前所在的分支 '%s'。"

 #: builtin/branch.c:235
 #, c-format
 msgid "remote branch '%s' not found."
 msgstr "远程分支 '%s' 未发现。"

 #: builtin/branch.c:236
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未发现。"

 #: builtin/branch.c:250
 #, c-format
 msgid "Error deleting remote branch '%s'"
 msgstr "删除远程分支 '%s' 时出错"

 #: builtin/branch.c:251
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "删除分支 '%s' 时出错"

 #: builtin/branch.c:258
 #, c-format
 msgid "Deleted remote branch %s (was %s).\n"
 msgstr "已删除远程分支 %s（曾为 %s）。\n"

 #: builtin/branch.c:259
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已删除分支 %s（曾为 %s）。\n"

 #: builtin/branch.c:361
 #, c-format
 msgid "branch '%s' does not point at a commit"
 msgstr "分支 '%s' 未指向一个提交"

 #: builtin/branch.c:433
 #, c-format
 msgid "[%s: behind %d]"
 msgstr "[%s：落后 %d]"

 #: builtin/branch.c:435
 #, c-format
 msgid "[behind %d]"
 msgstr "[落后 %d]"

 #: builtin/branch.c:439
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr "[%s：领先 %d]"

 #: builtin/branch.c:441
 #, c-format
 msgid "[ahead %d]"
 msgstr "[领先 %d]"

 #: builtin/branch.c:444
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr "[%s：领先 %d，落后 %d]"

 #: builtin/branch.c:447
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr "[领先 %d，落后 %d]"

 #: builtin/branch.c:469
 msgid " **** invalid ref ****"
 msgstr " **** 无效引用 ****"

 #: builtin/branch.c:560
 msgid "(no branch)"
 msgstr "（非分支）"

 #: builtin/branch.c:593
 #, c-format
 msgid "object '%s' does not point to a commit"
 msgstr "对象 '%s' 没有指向一个提交"

 #: builtin/branch.c:625
 msgid "some refs could not be read"
 msgstr "一些引用不能读取"

 #: builtin/branch.c:638
 msgid "cannot rename the current branch while not on any."
 msgstr "无法重命名当前分支因为不处于任何分支上。"

 #: builtin/branch.c:648
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支名：'%s'"

 #: builtin/branch.c:663
 msgid "Branch rename failed"
 msgstr "分支重命名失败"

 #: builtin/branch.c:667
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "重命名掉一个错误命名的旧分支 '%s'"

 #: builtin/branch.c:671
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

 #: builtin/branch.c:678
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被重命名，但更新 config 文件失败"

 #: builtin/branch.c:693
 #, c-format
 msgid "malformed object name %s"
 msgstr "非法的对象名 %s"

 #: builtin/branch.c:717
 #, c-format
 msgid "could not write branch description template: %s"
 msgstr "不能写分支描述模版：%s"

 #: builtin/branch.c:747
 msgid "Generic options"
 msgstr "通用选项"

 #: builtin/branch.c:749
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"

 #: builtin/branch.c:750
 msgid "suppress informational messages"
 msgstr "不显示信息"

 #: builtin/branch.c:751
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "设置跟踪模式（参见 git-pull(1)）"

 #: builtin/branch.c:753
 msgid "change upstream info"
 msgstr "改变上游信息"

 #: builtin/branch.c:757
 msgid "use colored output"
 msgstr "使用彩色输出"

 #: builtin/branch.c:758
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"

 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
 #: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367
 #: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468
 msgid "commit"
 msgstr "提交"

 #: builtin/branch.c:762 builtin/branch.c:768
 msgid "print only branches that contain the commit"
 msgstr "只打印包含该提交的分支"

 #: builtin/branch.c:774
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："

 #: builtin/branch.c:775
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪及本地分支"

 #: builtin/branch.c:777
 msgid "delete fully merged branch"
 msgstr "删除完全合并的分支"

 #: builtin/branch.c:778
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（即使没有合并）"

 #: builtin/branch.c:779
 msgid "move/rename a branch and its reflog"
 msgstr "移动/重命名一个分支，以及它的引用日志"

 #: builtin/branch.c:780
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/重命名一个分支，即使目标已存在"

 #: builtin/branch.c:781
 msgid "list branch names"
 msgstr "列出分支名"

 #: builtin/branch.c:782
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"

 #: builtin/branch.c:784
 msgid "edit the description for the branch"
 msgstr "标记分支的描述"

 #: builtin/branch.c:785
 msgid "force creation (when already exists)"
 msgstr "强制创建（当已经存在）"

 #: builtin/branch.c:788
 msgid "print only not merged branches"
 msgstr "只打印没有合并的分支"

 #: builtin/branch.c:794
 msgid "print only merged branches"
 msgstr "只打印合并的分支"

 #: builtin/branch.c:798
 msgid "list branches in columns"
 msgstr "以列的方式显示分支"

 #: builtin/branch.c:811
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解析为有效引用。"

 #: builtin/branch.c:816 builtin/clone.c:561
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有位于 /refs/heads 之下！"

 #: builtin/branch.c:839
 msgid "--column and --verbose are incompatible"
 msgstr "--column 和 --verbose 不兼容"

 #: builtin/branch.c:845
 msgid "branch name required"
 msgstr "必须提供分支名"

 #: builtin/branch.c:860
 msgid "Cannot give description to detached HEAD"
 msgstr "不能向分离头指针提供描述"

 #: builtin/branch.c:865
 msgid "cannot edit description of more than one branch"
 msgstr "不能为一个以上的分支编辑描述"

 #: builtin/branch.c:872
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无提交。"

 #: builtin/branch.c:875
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"

 #: builtin/branch.c:888
 msgid "too many branches for a rename operation"
 msgstr "为重命名操作提供了太多的分支名"

 #: builtin/branch.c:893
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' 不存在"

 #: builtin/branch.c:905
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信息"

 #: builtin/branch.c:920
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

 #: builtin/branch.c:923
 #, 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:940
 #, 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:941
 #, c-format
 msgid "    git branch -d %s\n"
 msgstr "    git branch -d %s\n"

 #: builtin/branch.c:942
 #, 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:247
 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"

 #: builtin/cat-file.c:248
 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"

 #: builtin/cat-file.c:266
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"

 #: builtin/cat-file.c:267
 msgid "show object type"
 msgstr "显示对象类型"

 #: builtin/cat-file.c:268
 msgid "show object size"
 msgstr "显示对象大小"

 #: builtin/cat-file.c:270
 msgid "exit with zero when there's no error"
 msgstr "当没有错误时退出并返回零"

 #: builtin/cat-file.c:271
 msgid "pretty-print object's content"
 msgstr "美观地打印对象的内容"

 #: builtin/cat-file.c:273
 msgid "for blob objects, run textconv on object's content"
 msgstr "对于数据（blob）对象，对其内容执行 textconv"

 #: builtin/cat-file.c:275
 msgid "show info and content of objects fed from the standard input"
 msgstr "显示从标准输入提供的对象的信息和内容"

 #: builtin/cat-file.c:278
 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:75
 msgid "read file names from stdin"
 msgstr "从标准输入读出文件名"

 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
 msgid "input paths are terminated by a null character"
 msgstr "输入路径以null字符终止"

 #: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177
 msgid "suppress progress reporting"
 msgstr "不显示进度报告"

 #: builtin/check-ignore.c:151
 msgid "cannot specify pathnames with --stdin"
 msgstr "不能同时提供路径及 --stdin 参数"

 #: builtin/check-ignore.c:154
 msgid "-z only makes sense with --stdin"
 msgstr "-z 需要和 --stdin 参数共用才有意义"

 #: builtin/check-ignore.c:156
 msgid "no path specified"
 msgstr "未指定路径"

 #: builtin/check-ignore.c:160
 msgid "--quiet is only valid with a single pathname"
 msgstr "参数 --quiet 只在提供一个路径名时有效"

 #: builtin/check-ignore.c:162
 msgid "cannot have both --quiet and --verbose"
 msgstr "不能同时提供 --quiet 和 --verbose 参数"

 #: builtin/checkout-index.c:126
 msgid "git checkout-index [options] [--] [<file>...]"
 msgstr "git checkout-index [选项] [--] [<文件>...]"

 #: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "检出索引区的所有文件"

 #: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "强制覆盖现有的文件"

 #: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr "存在或不在索引中的文件都没有警告"

 #: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "不检出新文件"

 #: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "更新索引中文件的状态信息"

 #: builtin/checkout-index.c:200
 msgid "read list of paths from the standard input"
 msgstr "从标准输入读取路径列表"

 #: builtin/checkout-index.c:202
 msgid "write the content to temporary files"
 msgstr "将内容写入临时文件"

 #: builtin/checkout-index.c:203 builtin/column.c:30
 msgid "string"
 msgstr "字符串"

 #: builtin/checkout-index.c:204
 msgid "when creating files, prepend <string>"
 msgstr "在创建文件时，在前面加上<字符串>"

 #: builtin/checkout-index.c:207
 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:116 builtin/checkout.c:149
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路径 '%s' 没有我们的版本"

 #: builtin/checkout.c:118 builtin/checkout.c:151
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路径 '%s' 没有他们的版本"

 #: builtin/checkout.c:134
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路径 '%s' 没有全部必须的版本"

 #: builtin/checkout.c:178
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路径 '%s' 没有必须的版本"

 #: builtin/checkout.c:195
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：无法合并"

 #: builtin/checkout.c:212
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加合并结果"

 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
 #: builtin/checkout.c:245
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' 不能在更新路径时使用"

 #: builtin/checkout.c:248 builtin/checkout.c:251
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' 不能和 %s 同时使用"

 #: builtin/checkout.c:254
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "不能同时更新路径并切换到分支'%s'。"

 #: builtin/checkout.c:265 builtin/checkout.c:426
 msgid "corrupt index file"
 msgstr "损坏的索引文件"

 #: builtin/checkout.c:295 builtin/checkout.c:302
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未合并"

 #: builtin/checkout.c:448
 msgid "you need to resolve your current index first"
 msgstr "您需要先解决当前索引的冲突"

 #: builtin/checkout.c:569
 #, c-format
 msgid "Can not do reflog for '%s'\n"
 msgstr "不能对 '%s' 执行 reflog 操作\n"

 #: builtin/checkout.c:602
 msgid "HEAD is now at"
 msgstr "HEAD 目前位于"

 #: builtin/checkout.c:609
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "重置分支 '%s'\n"

 #: builtin/checkout.c:612
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已经位于 '%s'\n"

 #: builtin/checkout.c:616
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切换并重置分支 '%s'\n"

 #: builtin/checkout.c:618 builtin/checkout.c:955
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切换到一个新分支 '%s'\n"

 #: builtin/checkout.c:620
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切换到分支 '%s'\n"

 #  译者：注意保持前导空格
 #: builtin/checkout.c:676
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 及其它 %d 个。\n"

 #. The singular version
 #: builtin/checkout.c:682
 #, 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:700
 #, 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:730
 msgid "internal error in revision walk"
 msgstr "在版本遍历时遇到内部错误"

 #: builtin/checkout.c:734
 msgid "Previous HEAD position was"
 msgstr "之前的 HEAD 位置是"

 #: builtin/checkout.c:761 builtin/checkout.c:950
 msgid "You are on a branch yet to be born"
 msgstr "您位于一个尚未初始化的分支"

 #. case (1)
 #: builtin/checkout.c:886
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"

 #. case (1): want a tree
 #: builtin/checkout.c:925
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用不是一个树：%s"

 #: builtin/checkout.c:964
 msgid "paths cannot be used with switching branches"
 msgstr "路径不能和切换分支同时使用"

 #: builtin/checkout.c:967 builtin/checkout.c:971
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 不能和切换分支同时使用"

 #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
 #: builtin/checkout.c:986
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 不能和 '%s' 同时使用"

 #: builtin/checkout.c:991
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "不能切换分支到一个非提交 '%s'"

 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
 #: builtin/remote.c:169 builtin/remote.c:171
 msgid "branch"
 msgstr "分支"

 #: builtin/checkout.c:1014
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"

 #: builtin/checkout.c:1016
 msgid "create/reset and checkout a branch"
 msgstr "创建/重置并检出一个分支"

 #: builtin/checkout.c:1017
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"

 #: builtin/checkout.c:1018
 msgid "detach the HEAD at named commit"
 msgstr "成为指向该提交的分离头指针"

 #: builtin/checkout.c:1019
 msgid "set upstream info for new branch"
 msgstr "为新的分支设置上游信息"

 #: builtin/checkout.c:1021
 msgid "new branch"
 msgstr "新分支"

 #: builtin/checkout.c:1021
 msgid "new unparented branch"
 msgstr "新的没有父提交的分支"

 #: builtin/checkout.c:1022
 msgid "checkout our version for unmerged files"
 msgstr "对尚未合并的文件检出我们的版本"

 #: builtin/checkout.c:1024
 msgid "checkout their version for unmerged files"
 msgstr "对尚未合并的文件检出他们的版本"

 #: builtin/checkout.c:1026
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"

 #: builtin/checkout.c:1027
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三路合并"

 #: builtin/checkout.c:1028 builtin/merge.c:215
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"

 #: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
 msgid "style"
 msgstr "风格"

 #: builtin/checkout.c:1030
 msgid "conflict style (merge or diff3)"
 msgstr "冲突输出风格（merge 或 diff3）"

 #: builtin/checkout.c:1033
 msgid "second guess 'git checkout no-such-branch'"
 msgstr "再者猜测'git checkout no-such-branch'"

 #: builtin/checkout.c:1057
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b、-B 和 --orphan 是互斥的"

 #: builtin/checkout.c:1074
 msgid "--track needs a branch name"
 msgstr "--track 需要一个分支名"

 #: builtin/checkout.c:1081
 msgid "Missing branch name; try -b"
 msgstr "缺少分支名；尝试 -b"

 #: builtin/checkout.c:1116
 msgid "invalid path specification"
 msgstr "无效的路径规格"

 #: builtin/checkout.c:1123
 #, 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:1128
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

 #: builtin/checkout.c:1132
 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:20
 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."

 #: builtin/clean.c:24
 #, c-format
 msgid "Removing %s\n"
 msgstr "正删除 %s\n"

 #: builtin/clean.c:25
 #, c-format
 msgid "Would remove %s\n"
 msgstr "将删除 %s\n"

 #: builtin/clean.c:26
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "忽略版本库 %s\n"

 #: builtin/clean.c:27
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "将忽略版本库 %s\n"

 #: builtin/clean.c:28
 #, c-format
 msgid "failed to remove %s"
 msgstr "无法删除 %s"

 #: builtin/clean.c:160
 msgid "do not print names of files removed"
 msgstr "不打印删除文件的名称"

 #: builtin/clean.c:162
 msgid "force"
 msgstr "强制"

 #: builtin/clean.c:164
 msgid "remove whole directories"
 msgstr "删除整个目录"

 #: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717
 #: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
 msgid "pattern"
 msgstr "模式"

 #: builtin/clean.c:166
 msgid "add <pattern> to ignore rules"
 msgstr "添加<模式>到忽略规则"

 #: builtin/clean.c:167
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"

 #: builtin/clean.c:169
 msgid "remove only ignored files"
 msgstr "只删除忽略的文件"

 #: builtin/clean.c:187
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X 不能同时使用"

 #: builtin/clean.c:191
 msgid ""
 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
 msgstr ""
 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"

 #: builtin/clean.c:194
 msgid ""
 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"

 #: builtin/clone.c:36
 msgid "git clone [options] [--] <repo> [<dir>]"
 msgstr "git clone [选项] [--] <版本库> [<路径>]"

 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
 #: builtin/push.c:436
 msgid "force progress reporting"
 msgstr "强制显示进度报告"

 #: builtin/clone.c:66
 msgid "don't create a checkout"
 msgstr "不创建一个检出"

 #: builtin/clone.c:67 builtin/clone.c:69 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:83 builtin/grep.c:662
 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:243
 #, c-format
 msgid "reference repository '%s' is not a local directory."
 msgstr "引用版本库 '%s' 不是一个本地目录。"

 #: builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "无法创建目录 '%s'"

 #: builtin/clone.c:308 builtin/diff.c:77
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "无法枚举 '%s' 状态"

 #: builtin/clone.c:310
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且不是一个目录"

 #: builtin/clone.c:324
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "无法枚举 %s 状态\n"

 #: builtin/clone.c:346
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "无法创建链接 '%s'"

 #: builtin/clone.c:350
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "无法拷贝文件至 '%s'"

 #: builtin/clone.c:373
 #, c-format
 msgid "done.\n"
 msgstr "完成。\n"

 #: builtin/clone.c:443
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "不能发现要克隆的远程分支 %s。"

 #: builtin/clone.c:552
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

 #: builtin/clone.c:690
 msgid "Too many arguments."
 msgstr "太多参数。"

 #: builtin/clone.c:694
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个版本库来克隆。"

 #: builtin/clone.c:705
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare 和 --origin %s 选项不兼容。"

 #: builtin/clone.c:708
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

 #: builtin/clone.c:721
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "版本库 '%s' 不存在"

 #: builtin/clone.c:726
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

 #: builtin/clone.c:736
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

 #: builtin/clone.c:746
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已经存在。"

 #: builtin/clone.c:759 builtin/clone.c:771
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "不能为 '%s' 创建先导目录"

 #: builtin/clone.c:762
 #, c-format
 msgid "could not create work tree dir '%s'."
 msgstr "不能为 '%s' 创建工作区目录。"

 #: builtin/clone.c:781
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到裸版本库 '%s'...\n"

 #: builtin/clone.c:783
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"

 #: builtin/clone.c:818
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "不知道如何克隆 %s"

 #: builtin/clone.c:867
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未发现"

 #: builtin/clone.c:874
 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:34
 msgid "git commit [options] [--] <pathspec>..."
 msgstr "git commit [选项] [--] <路径匹配>..."

 #: builtin/commit.c:39
 msgid "git status [options] [--] <pathspec>..."
 msgstr "git status [选项] [--] <路径匹配>..."

 #: builtin/commit.c:44
 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:56
 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:61
 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/commit.c:258
 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"

 #: builtin/commit.c:300
 msgid "unable to create temporary index"
 msgstr "不能创建临时索引"

 #: builtin/commit.c:306
 msgid "interactive add failed"
 msgstr "交互式添加失败"

 #: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"

 #: builtin/commit.c:391
 msgid "cannot do a partial commit during a merge."
 msgstr "在合并过程中不能做部分提交。"

 #: builtin/commit.c:393
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中不能做部分提交。"

 #: builtin/commit.c:403
 msgid "cannot read the index"
 msgstr "无法读取索引"

 #: builtin/commit.c:423
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"

 #: builtin/commit.c:511 builtin/commit.c:517
 #, c-format
 msgid "invalid commit: %s"
 msgstr "无效的提交：%s"

 #: builtin/commit.c:540
 msgid "malformed --author parameter"
 msgstr "非法的 --author 参数"

 #: builtin/commit.c:560
 #, c-format
 msgid "Malformed ident string: '%s'"
 msgstr "非法的身份字符串：'%s'"

 #: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "不能查询提交 %s"

 #: builtin/commit.c:610 builtin/shortlog.c:272
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读取日志信息）\n"

 #: builtin/commit.c:612
 msgid "could not read log from standard input"
 msgstr "不能从标准输入中读取日志信息"

 #: builtin/commit.c:616
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "不能读取日志文件 '%s'"

 #: builtin/commit.c:622
 msgid "commit has empty message"
 msgstr "提交说明为空"

 #: builtin/commit.c:638
 msgid "could not read MERGE_MSG"
 msgstr "不能读取 MERGE_MSG"

 #: builtin/commit.c:642
 msgid "could not read SQUASH_MSG"
 msgstr "不能读取 SQUASH_MSG"

 #: builtin/commit.c:646
 #, c-format
 msgid "could not read '%s'"
 msgstr "不能读取 '%s'"

 #: builtin/commit.c:707
 msgid "could not write commit template"
 msgstr "不能写提交模版"

 #: builtin/commit.c:718
 #, 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:723
 #, 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:735
 #, 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:740
 #, 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:753
 #, c-format
 msgid "%sAuthor:    %s"
 msgstr "%s作者：     %s"

 #  译者：为保证在输出中对齐，注意调整句中空格！
 #: builtin/commit.c:760
 #, c-format
 msgid "%sCommitter: %s"
 msgstr "%s提交者：   %s"

 #: builtin/commit.c:780
 msgid "Cannot read index"
 msgstr "无法读取索引"

 #: builtin/commit.c:817
 msgid "Error building trees"
 msgstr "无法创建树对象"

 #: builtin/commit.c:832 builtin/tag.c:359
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

 #: builtin/commit.c:929
 #, c-format
 msgid "No existing author found with '%s'"
 msgstr "没有找到匹配 '%s' 的作者"

 #: builtin/commit.c:944 builtin/commit.c:1138
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件参数 '%s'"

 #: builtin/commit.c:974
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "同时使用 --reset-author 和 --author 没有意义"

 #: builtin/commit.c:985
 msgid "You have nothing to amend."
 msgstr "您没有可修补的提交。"

 #: builtin/commit.c:988
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

 #: builtin/commit.c:990
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

 #: builtin/commit.c:993
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup 不能同时使用"

 #: builtin/commit.c:1003
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

 #: builtin/commit.c:1005
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

 #: builtin/commit.c:1013
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

 #: builtin/commit.c:1030
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

 #: builtin/commit.c:1032
 msgid "No paths with --include/--only does not make sense."
 msgstr "参数 --include/--only 不跟路径没有意义。"

 #: builtin/commit.c:1034
 msgid "Clever... amending the last one with dirty index."
 msgstr "聪明... 在索引不干净下修补最后的提交。"

 #: builtin/commit.c:1036
 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

 #: builtin/commit.c:1046 builtin/tag.c:575
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清理模式 %s"

 #: builtin/commit.c:1051
 msgid "Paths with -a does not make sense."
 msgstr "路径和 -a 选项同时使用没有意义。"

 #: builtin/commit.c:1057 builtin/commit.c:1192
 msgid "--long and -z are incompatible"
 msgstr "--long 和 -z 选项不兼容"

 #: builtin/commit.c:1152 builtin/commit.c:1388
 msgid "show status concisely"
 msgstr "以简洁的格式显示状态"

 #: builtin/commit.c:1154 builtin/commit.c:1390
 msgid "show branch information"
 msgstr "显示分支信息"

 #: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426
 msgid "machine-readable output"
 msgstr "机器可读的输出"

 #: builtin/commit.c:1159 builtin/commit.c:1394
 msgid "show status in long format (default)"
 msgstr "以长格式显示状态（默认）"

 #: builtin/commit.c:1162 builtin/commit.c:1397
 msgid "terminate entries with NUL"
 msgstr "条目以NUL字符结尾"

 #: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647
 #: builtin/fast-export.c:650 builtin/tag.c:459
 msgid "mode"
 msgstr "模式"

 #: builtin/commit.c:1165 builtin/commit.c:1400
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

 #: builtin/commit.c:1168
 msgid "show ignored files"
 msgstr "显示忽略的文件"

 #: builtin/commit.c:1169 parse-options.h:151
 msgid "when"
 msgstr "何时"

 #: builtin/commit.c:1170
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

 #: builtin/commit.c:1172
 msgid "list untracked files in columns"
 msgstr "以列的方式显示未跟踪的文件"

 #: builtin/commit.c:1246
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的提交"

 #: builtin/commit.c:1248
 msgid "could not parse newly created commit"
 msgstr "不能解析新创建的提交"

 #: builtin/commit.c:1289
 msgid "detached HEAD"
 msgstr "分离头指针"

 #  译者：中文字符串拼接，可删除前导空格
 #: builtin/commit.c:1291
 msgid " (root-commit)"
 msgstr "（根提交）"

 #: builtin/commit.c:1358
 msgid "suppress summary after successful commit"
 msgstr "提交成功后不显示概述信息"

 #: builtin/commit.c:1359
 msgid "show diff in commit message template"
 msgstr "在提交说明模板里显示差异"

 #: builtin/commit.c:1361
 msgid "Commit message options"
 msgstr "提交说明选项"

 #: builtin/commit.c:1362 builtin/tag.c:457
 msgid "read message from file"
 msgstr "从文件中读取提交说明"

 #: builtin/commit.c:1363
 msgid "author"
 msgstr "作者"

 #: builtin/commit.c:1363
 msgid "override author for commit"
 msgstr "提交时覆盖作者"

 #: builtin/commit.c:1364 builtin/gc.c:178
 msgid "date"
 msgstr "日期"

 #: builtin/commit.c:1364
 msgid "override date for commit"
 msgstr "提交时覆盖日期"

 #: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533
 #: builtin/notes.c:690 builtin/tag.c:455
 msgid "message"
 msgstr "说明"

 #: builtin/commit.c:1365
 msgid "commit message"
 msgstr "提交说明"

 #: builtin/commit.c:1366
 msgid "reuse and edit message from specified commit"
 msgstr "重用并编辑指定提交的提交说明"

 #: builtin/commit.c:1367
 msgid "reuse message from specified commit"
 msgstr "重用指定提交的提交说明"

 #: builtin/commit.c:1368
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

 #: builtin/commit.c:1369
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

 #: builtin/commit.c:1370
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

 #: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109
 msgid "add Signed-off-by:"
 msgstr "添加 Signed-off-by: 签名"

 #: builtin/commit.c:1372
 msgid "use specified template file"
 msgstr "使用指定的模板文件"

 #: builtin/commit.c:1373
 msgid "force edit of commit"
 msgstr "强制编辑提交"

 #  译者：可选值，不能翻译（或是原文中笔误，应为 mode）
 #: builtin/commit.c:1374
 msgid "default"
 msgstr "default"

 #: builtin/commit.c:1374 builtin/tag.c:460
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除提交说明里的空格和#注释"

 #: builtin/commit.c:1375
 msgid "include status in commit message template"
 msgstr "在提交说明模板里包含状态信息"

 #: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461
 msgid "key id"
 msgstr "key id"

 #: builtin/commit.c:1377 builtin/merge.c:214
 msgid "GPG sign commit"
 msgstr "GPG 提交签名"

 #. end commit message options
 #: builtin/commit.c:1380
 msgid "Commit contents options"
 msgstr "提交内容选项"

 #: builtin/commit.c:1381
 msgid "commit all changed files"
 msgstr "提交所有改动的文件"

 #: builtin/commit.c:1382
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待提交"

 #: builtin/commit.c:1383
 msgid "interactively add files"
 msgstr "交互式添加文件"

 #: builtin/commit.c:1384
 msgid "interactively add changes"
 msgstr "交互式添加变更"

 #: builtin/commit.c:1385
 msgid "commit only specified files"
 msgstr "只提交指定的文件"

 #: builtin/commit.c:1386
 msgid "bypass pre-commit hook"
 msgstr "绕过 pre-commit 钩子"

 #: builtin/commit.c:1387
 msgid "show what would be committed"
 msgstr "显示将要提交的内容"

 #: builtin/commit.c:1398
 msgid "amend previous commit"
 msgstr "修改先前的提交"

 #: builtin/commit.c:1399
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩子"

 #: builtin/commit.c:1404
 msgid "ok to record an empty change"
 msgstr "允许一个空提交"

 #: builtin/commit.c:1407
 msgid "ok to record a change with an empty message"
 msgstr "允许空的提交说明"

 #: builtin/commit.c:1439
 msgid "could not parse HEAD commit"
 msgstr "不能解析 HEAD 提交"

 #: builtin/commit.c:1477 builtin/merge.c:508
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "不能为读入打开 '%s'"

 #: builtin/commit.c:1484
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "损坏的 MERGE_HEAD 文件（%s）"

 #: builtin/commit.c:1491
 msgid "could not read MERGE_MODE"
 msgstr "不能读取 MERGE_MODE"

 #: builtin/commit.c:1510
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "不能读取提交说明：%s"

 #: builtin/commit.c:1524
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止提交；您未更改来自模版的提交说明。\n"

 #: builtin/commit.c:1529
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止提交因为提交说明为空。\n"

 #: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857
 msgid "failed to write commit object"
 msgstr "无法写提交对象"

 #: builtin/commit.c:1565
 msgid "cannot lock HEAD ref"
 msgstr "无法锁定 HEAD 引用"

 #: builtin/commit.c:1569
 msgid "cannot update HEAD ref"
 msgstr "无法更新 HEAD 引用"

 #: builtin/commit.c:1580
 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\" 恢复。"

 #: builtin/config.c:7
 msgid "git config [options]"
 msgstr "git config [选项]"

 #: builtin/config.c:51
 msgid "Config file location"
 msgstr "配置文件位置"

 #: builtin/config.c:52
 msgid "use global config file"
 msgstr "使用全局配置文件"

 #: builtin/config.c:53
 msgid "use system config file"
 msgstr "使用系统级配置文件"

 #: builtin/config.c:54
 msgid "use repository config file"
 msgstr "使用版本库级配置文件"

 #: builtin/config.c:55
 msgid "use given config file"
 msgstr "使用指定的配置文件"

 #: builtin/config.c:56
 msgid "Action"
 msgstr "操作"

 #: builtin/config.c:57
 msgid "get value: name [value-regex]"
 msgstr "获取值：name [value-regex]"

 #: builtin/config.c:58
 msgid "get all values: key [value-regex]"
 msgstr "获得所有的值：key [value-regex]"

 #: builtin/config.c:59
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "根据正则表达式获得值：name-regex [value-regex]"

 #: builtin/config.c:60
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "替换所有匹配的变量：name value [value_regex]"

 #: builtin/config.c:61
 msgid "add a new variable: name value"
 msgstr "添加一个新的变量：name value"

 #: builtin/config.c:62
 msgid "remove a variable: name [value-regex]"
 msgstr "删除一个变量：name [value-regex]"

 #: builtin/config.c:63
 msgid "remove all matches: name [value-regex]"
 msgstr "删除所有匹配项：name [value-regex]"

 #: builtin/config.c:64
 msgid "rename section: old-name new-name"
 msgstr "重命名小节：old-name new-name"

 #: builtin/config.c:65
 msgid "remove a section: name"
 msgstr "删除一个小节：name"

 #: builtin/config.c:66
 msgid "list all"
 msgstr "列出所有"

 #: builtin/config.c:67
 msgid "open an editor"
 msgstr "打开一个编辑器"

 #: builtin/config.c:68 builtin/config.c:69
 msgid "slot"
 msgstr "slot"

 #: builtin/config.c:68
 msgid "find the color configured: [default]"
 msgstr "找到配置的颜色：[默认]"

 #: builtin/config.c:69
 msgid "find the color setting: [stdout-is-tty]"
 msgstr "找到颜色设置：[stdout-is-tty]"

 #: builtin/config.c:70
 msgid "Type"
 msgstr "类型"

 #: builtin/config.c:71
 msgid "value is \"true\" or \"false\""
 msgstr "值是 \"true\" 或 \"false\""

 #: builtin/config.c:72
 msgid "value is decimal number"
 msgstr "值是十进制数"

 #: builtin/config.c:73
 msgid "value is --bool or --int"
 msgstr "值是 --bool or --int"

 #: builtin/config.c:74
 msgid "value is a path (file or directory name)"
 msgstr "值是一个路径（文件或目录名）"

 #: builtin/config.c:75
 msgid "Other"
 msgstr "其它"

 #: builtin/config.c:76
 msgid "terminate values with NUL byte"
 msgstr "终止值是NUL字节"

 #: builtin/config.c:77
 msgid "respect include directives on lookup"
 msgstr "查询时参照 include 指令递归查找"

 #: builtin/count-objects.c:69
 msgid "git count-objects [-v]"
 msgstr "git count-objects [-v]"

 #: builtin/describe.c:15
 msgid "git describe [options] <committish>*"
 msgstr "git describe [选项] <提交号>*"

 #: builtin/describe.c:16
 msgid "git describe [options] --dirty"
 msgstr "git describe [选项] --dirty"

 #: builtin/describe.c:234
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "注释 tag %s 无效"

 #: builtin/describe.c:238
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "注释 tag %s 没有嵌入名称"

 #: builtin/describe.c:240
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "tag '%s' 的确是在 '%s'"

 #: builtin/describe.c:267
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "不是一个有效的对象名 %s"

 #: builtin/describe.c:270
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s 不是一个有效的 '%s' 对象"

 #: builtin/describe.c:287
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "没有 tag 准确匹配 '%s'"

 #: builtin/describe.c:289
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "搜索描述 %s\n"

 #: builtin/describe.c:329
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完成搜索 %s\n"

 #: builtin/describe.c:353
 #, 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:357
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 "没有注释 tag 能描述 '%s'。\n"
 "尝试 --always，或者创建一些 tag。"

 #: builtin/describe.c:378
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已遍历 %lu 个提交\n"

 #: 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/describe.c:403
 msgid "find the tag that comes after the commit"
 msgstr "寻找提交之后的 tag（用于描述提交）"

 #: builtin/describe.c:404
 msgid "debug search strategy on stderr"
 msgstr "在标准错误上调试搜索策略"

 #: builtin/describe.c:405
 msgid "use any ref in .git/refs"
 msgstr "使用 .git/refs 里的任意引用"

 #: builtin/describe.c:406
 msgid "use any tag in .git/refs/tags"
 msgstr "使用 .git/refs/tags 里的任意 tag"

 #: builtin/describe.c:407
 msgid "always use long format"
 msgstr "始终使用长提交号格式"