Add persistent-https to contrib

[git.git] / po / zh_CN.po

# Chinese translations for Git package
# Git 软件包的简体中文翻译.
# Copyright (C) 2012 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: 2012-05-15 06:31+0800\n"
"PO-Revision-Date: 2012-01-30 00:00+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"

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

#.
#. * Message used both when 'git commit' fails and when
#. * other commands doing a merge do.
#.
#: advice.c:70
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'。"

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

#: commit.c:50
#, 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"

#  译者：注意保持前导空格
#: diff.c:105
#, c-format
msgid "  Failed to parse dirstat cut-off percentage '%.*s'\n"
msgstr "  无法解析 dirstat 阈值 '%.*s'\n"

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

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

#: diff.c:1400
msgid " 0 files changed\n"
msgstr " 0 个文件被修改\n"

#: diff.c:1404
#, c-format
msgid " %d file changed"
msgid_plural " %d files changed"
msgstr[0] " %d 个文件被修改"

#: diff.c:1421
#, c-format
msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)"
msgstr[0] "，插入 %d 行(+)"

#: diff.c:1432
#, c-format
msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)"
msgstr[0] "，删除 %d 行(-)"

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

#: gpg-interface.c:59
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 无法为数据签名"

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

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

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

#: help.c:287
#, 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 受损？"

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

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

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

#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
#: builtin/merge.c:1088 builtin/merge.c:1098
#, c-format
msgid "Could not open '%s' for writing"
msgstr "不能为写入打开 '%s'"

#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
#: builtin/merge.c:1090 builtin/merge.c:1103
#, c-format
msgid "Could not write to '%s'"
msgstr "不能写入 '%s'"

#: sequencer.c:143
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
"命令标记修正后的文件"

#: sequencer.c:146
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"

#: sequencer.c:159 sequencer.c:685 sequencer.c:768
#, c-format
msgid "Could not write to %s"
msgstr "不能写入 %s"

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

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

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

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

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

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

#: sequencer.c:301
msgid "You do not have a valid HEAD"
msgstr "您没有一个有效的 HEAD"

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

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

#: sequencer.c:328
#, 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:339
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"

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

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

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

#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719
#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#: sequencer.c:706 sequencer.c:840
msgid "no cherry-pick or revert in progress"
msgstr "没有拣选或还原操作在进行"

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

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

#: sequencer.c:732
#, c-format
msgid "cannot open %s: %s"
msgstr "不能打开 %s：%s"

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

#: sequencer.c:736
msgid "unexpected end of file"
msgstr "未预期的文件结束"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#: wt-status.c:187
#, c-format
msgid "%s files:"
msgstr "%s文件："

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#: wt-status.c:745
msgid "Untracked"
msgstr "未跟踪的"

#: wt-status.c:747
msgid "Ignored"
msgstr "忽略的"

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

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

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

#: wt-status.c:761
#, c-format
msgid "no changes added to commit%s\n"
msgstr "修改尚未加入提交%s\n"

#  译者：中文字符串拼接，可删除前导空格
#: wt-status.c:763
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"

#: wt-status.c:765
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr "空提交但存在未跟踪文件%s\n"

#  译者：中文字符串拼接，可删除前导空格
#: wt-status.c:767
msgid " (use \"git add\" to track)"
msgstr "（使用 \"git add\" 建立跟踪）"

#: wt-status.c:769 wt-status.c:772 wt-status.c:775
#, c-format
msgid "nothing to commit%s\n"
msgstr "无须提交%s\n"

#  译者：中文字符串拼接，可删除前导空格
#: wt-status.c:770
msgid " (create/copy files and use \"git add\" to track)"
msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"

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

#  译者：中文字符串拼接，可删除前导空格
#: wt-status.c:776
msgid " (working directory clean)"
msgstr "（干净的工作区）"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#: builtin/add.c:290
msgid "Could not write patch"
msgstr "不能写补丁"

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

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

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

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

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

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

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

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

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

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

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

#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr "索引文件损坏"

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

#: 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：预期一个刷新"

#  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
#: builtin/branch.c:137
#, 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:141
#, 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' 。"

#  译者：汉字之间无空格，故删除尾部空格
#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
#: builtin/branch.c:164
msgid "remote "
msgstr "远程"

#: builtin/branch.c:172
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 共用"

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

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

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

#: builtin/branch.c:201
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"

#: builtin/branch.c:207
#, 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:215
#, c-format
msgid "Error deleting %sbranch '%s'"
msgstr "删除 %s分支 '%s' 时出错"

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

#: builtin/branch.c:226
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"

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

#  译者：注意保持句尾空格
#: builtin/branch.c:396
#, c-format
msgid "behind %d] "
msgstr "落后 %d] "

#  译者：注意保持句尾空格
#: builtin/branch.c:398
#, c-format
msgid "ahead %d] "
msgstr "领先 %d] "

#  译者：注意保持句尾空格
#: builtin/branch.c:400
#, c-format
msgid "ahead %d, behind %d] "
msgstr "领先 %d，落后 %d] "

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
#: builtin/merge.c:812
msgid "unable to write new index file"
msgstr "无法写新的索引文件"

#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
msgid "diff_setup_done failed"
msgstr "diff_setup_done 失败"

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

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

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

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

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

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

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

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

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

#. The singular version
#: builtin/checkout.c:646
#, 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"

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

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

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

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

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

#: builtin/checkout.c:973
msgid "-B cannot be used with -b"
msgstr "-B 不能和 -b 共用"

#: builtin/checkout.c:982
msgid "--patch is incompatible with all other options"
msgstr "--patch 选项和其他选项不兼容"

#: builtin/checkout.c:985
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr "--detach 不能和 -b/-B/--orphan 共用"

#: builtin/checkout.c:987
msgid "--detach cannot be used with -t"
msgstr "--detach 不能和 -t 共用"

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

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

#: builtin/checkout.c:1006
msgid "--orphan and -b|-B are mutually exclusive"
msgstr "--orphan 和 -b|-B 互斥"

#: builtin/checkout.c:1008
msgid "--orphan cannot be used with -t"
msgstr "--orphan 不能和 -t 共用"

#: builtin/checkout.c:1018
msgid "git checkout: -f and -m are incompatible"
msgstr "git checkout：-f 和 -m 不兼容"

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

#: builtin/checkout.c:1060
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
"git checkout：更新路径和切换分支不兼容。\n"
"您是想要检出 '%s' 但未能将其解析为提交么？"

#: builtin/checkout.c:1062
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr "git checkout：更新路径和切换分支不兼容。"

#: builtin/checkout.c:1067
msgid "git checkout: --detach does not take a path argument"
msgstr "git checkout：--detach 不跟路径参数"

#: builtin/checkout.c:1070
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/checkout.c:1089
msgid "Cannot switch branch to a non-commit."
msgstr "无法切换分支到一个非提交。"

#: builtin/checkout.c:1092
msgid "--ours/--theirs is incompatible with switching branches."
msgstr "--ours/--theirs 和切换分支不兼容。"

#: builtin/clean.c:78
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能共用"

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

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

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

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

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

#: builtin/clean.c:166
#, c-format
msgid "Would not remove %s\n"
msgstr "不会删除 %s\n"

#: builtin/clean.c:168
#, c-format
msgid "Not removing %s\n"
msgstr "未删除 %s\n"

#: builtin/clone.c:243
#, c-format
msgid "reference repository '%s' is not a local directory."
msgstr "引用版本库 '%s' 不是一个本地目录。"

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

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

#: builtin/clone.c:308 builtin/diff.c:75
#, 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:341
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"

#: 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:440
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#: builtin/clone.c:842
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空版本库。"

#: builtin/commit.c:42
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly:\n"
"\n"
"    git config --global user.name \"Your Name\"\n"
"    git config --global user.email you@example.com\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
"    git commit --amend --reset-author\n"
msgstr ""
"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息：\n"
"\n"
"    git config --global user.name \"Your Name\"\n"
"    git config --global user.email you@example.com\n"
"\n"
"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
"\n"
"    git commit --amend --reset-author\n"

#: builtin/commit.c:54
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"

#: builtin/commit.c:59
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
"    git commit --allow-empty\n"
"\n"
"Otherwise, please use 'git reset'\n"
msgstr ""
"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
"也要提交，使用命令：\n"
"\n"
"    git commit --allow-empty\n"
"\n"
"否则，请使用命令 'git reset'\n"

#: builtin/commit.c:205 builtin/reset.c:33
msgid "merge"
msgstr "合并"

#: builtin/commit.c:208
msgid "cherry-pick"
msgstr "拣选"

#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"

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

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

#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"

#  译者：%s若翻为中文，前后不需要空格
#: builtin/commit.c:457
#, c-format
msgid "cannot do a partial commit during a %s."
msgstr "在%s过程中不能做部分提交。"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#  译者：%s若翻为中文，前后不需要空格
#: builtin/commit.c:799
#, c-format
msgid ""
"\n"
"It looks like you may be committing a %s.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
"\n"
"看起来您正在提交一个%s。\n"
"如果不是这样，请删除文件\n"
"\t%s\n"
"然后重试。\n"

#: builtin/commit.c:812
msgid "Please enter the commit message for your changes."
msgstr "请为您的修改输入提交说明。"

#  译者：中文字符串拼接，可删除前导空格
#: builtin/commit.c:815
msgid ""
" Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
"以 '#' 开头\n"
"的行将被忽略，并且空的提交说明将会中止提交。\n"

#  译者：中文字符串拼接，可删除前导空格
#: builtin/commit.c:820
msgid ""
" Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
"以 '#' 开头\n"
"的行将被保留，您可以删除它们如果您想这样做的话。空的提交说明将会\n"
"中止提交。\n"

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

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

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

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

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

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

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

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

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

#  译者：%s若翻为中文，前后不需要空格
#: builtin/commit.c:1076
#, c-format
msgid "You are in the middle of a %s -- cannot amend."
msgstr "您正处于一个%s的过程中 -- 无法修补提交。"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
msgid "failed to write commit object"
msgstr "无法写提交对象"

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

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

#: builtin/commit.c:1590
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"

#: 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:436
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"

#: builtin/describe.c:462
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"

#: builtin/describe.c:482
msgid "--dirty is incompatible with committishes"
msgstr "--dirty 不能与提交共用"

#: builtin/diff.c:77
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s'：不是一个正规文件或符号链接"

#: builtin/diff.c:220
#, c-format
msgid "invalid option: %s"
msgstr "无效选项：%s"

#: builtin/diff.c:297
msgid "Not a git repository"
msgstr "不是一个 git 版本库"

#: builtin/diff.c:347
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"

#: builtin/diff.c:352
#, c-format
msgid "more than %d trees given: '%s'"
msgstr "提供了超过 %d 个树对象：'%s'"

#: builtin/diff.c:362
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个 blob 对象：'%s'"

#: builtin/diff.c:370
#, c-format
msgid "unhandled object '%s' given."
msgstr "提供了无法处理的对象 '%s'。"

#: builtin/fetch.c:200
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"

#: builtin/fetch.c:253
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"

#: builtin/fetch.c:259
msgid "[up to date]"
msgstr "[最新]"

#: builtin/fetch.c:273
#, c-format
msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s  （在当前分支下不能获取）"

#: builtin/fetch.c:274 builtin/fetch.c:360
msgid "[rejected]"
msgstr "[已拒绝]"

#: builtin/fetch.c:285
msgid "[tag update]"
msgstr "[tag更新]"

#  译者：注意保持前导空格
#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
msgid "  (unable to update local ref)"
msgstr "  （不能更新本地引用）"

#: builtin/fetch.c:305
msgid "[new tag]"
msgstr "[新tag]"

#: builtin/fetch.c:308
msgid "[new branch]"
msgstr "[新分支]"

#: builtin/fetch.c:311
msgid "[new ref]"
msgstr "[新引用]"

#: builtin/fetch.c:356
msgid "unable to update local ref"
msgstr "不能更新本地引用"

#: builtin/fetch.c:356
msgid "forced update"
msgstr "强制更新"

#: builtin/fetch.c:362
msgid "(non-fast-forward)"
msgstr "（非快进式）"

#: builtin/fetch.c:393 builtin/fetch.c:685
#, c-format
msgid "cannot open %s: %s\n"
msgstr "无法打开 %s：%s\n"

#: builtin/fetch.c:402
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"

#: builtin/fetch.c:488
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"

#: builtin/fetch.c:499
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
"一些本地引用不能被更新；尝试运行\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"

#  译者：注意保持前导空格
#: builtin/fetch.c:549
#, c-format
msgid "   (%s will become dangling)\n"
msgstr "   （%s 将成为悬空状态）\n"

#  译者：注意保持前导空格
#: builtin/fetch.c:550
#, c-format
msgid "   (%s has become dangling)\n"
msgstr "   （%s 已成为悬空状态）\n"

#: builtin/fetch.c:557
msgid "[deleted]"
msgstr "[已删除]"

#: builtin/fetch.c:558
msgid "(none)"
msgstr "（无）"

#: builtin/fetch.c:675
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非裸版本库的当前分支 %s"

#: builtin/fetch.c:709
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "不知道如何从 %s 获取"

#: builtin/fetch.c:786
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

#: builtin/fetch.c:789
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 对于 %s 被忽略\n"

#: builtin/fetch.c:888
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"

#: builtin/fetch.c:890
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"

#: builtin/fetch.c:907
msgid ""
"No remote repository specified.  Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

#: builtin/fetch.c:927
msgid "You need to specify a tag name."
msgstr "您需要指定一个 tag 名称。"

#: builtin/fetch.c:979
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个版本库参数"

#: builtin/fetch.c:981
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用表达式没有任何意义"

#: builtin/fetch.c:992
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"

#: builtin/fetch.c:1000
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用表达式没有意义"

#: builtin/gc.c:63
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效的 %s：'%s'"

#: builtin/gc.c:90
#, c-format
msgid "insanely long object directory %.*s"
msgstr "不正常的长对象目录 %.*s"

#: builtin/gc.c:221
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包版本库以求最佳性能。\n"

#: builtin/gc.c:224
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
msgstr ""
"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
"参见 \"git help gc\" 以获取更多信息。\n"

#: builtin/gc.c:251
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

#: builtin/grep.c:216
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"

#: builtin/grep.c:402
#, c-format
msgid "Failed to chdir: %s"
msgstr "无法切换目录：%s"

#: builtin/grep.c:478 builtin/grep.c:512
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"

#: builtin/grep.c:526
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"

#: builtin/grep.c:584
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"

#: builtin/grep.c:601
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"

#: builtin/grep.c:888
msgid "no pattern given."
msgstr "未提供模式匹配。"

#: builtin/grep.c:902
#, c-format
msgid "bad object %s"
msgstr "坏对象 %s"

#: builtin/grep.c:943
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"

#: builtin/grep.c:966
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 共用。"

#: builtin/grep.c:971
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 或 --untracked 不能和版本共用。"

#: builtin/grep.c:974
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

#: builtin/grep.c:982
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"

#: builtin/init-db.c:35
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"

#: builtin/init-db.c:62
#, c-format
msgid "insanely long template name %s"
msgstr "太长的模版名 %s"

#: builtin/init-db.c:67
#, c-format
msgid "cannot stat '%s'"
msgstr "不能枚举 '%s' 状态"

#: builtin/init-db.c:73
#, c-format
msgid "cannot stat template '%s'"
msgstr "不能枚举模版 '%s' 状态"

#: builtin/init-db.c:80
#, c-format
msgid "cannot opendir '%s'"
msgstr "不能打开目录 '%s'"

#: builtin/init-db.c:97
#, c-format
msgid "cannot readlink '%s'"
msgstr "不能读取链接 '%s'"

#: builtin/init-db.c:99
#, c-format
msgid "insanely long symlink %s"
msgstr "太长的符号链接 %s"

#: builtin/init-db.c:102
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "不能自 '%s' 到 '%s' 创建符号链接"

#: builtin/init-db.c:106
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"

#: builtin/init-db.c:110
#, c-format
msgid "ignoring template %s"
msgstr "忽略模版 %s"

#: builtin/init-db.c:133
#, c-format
msgid "insanely long template path %s"
msgstr "太长的模版路径 %s"

#: builtin/init-db.c:141
#, c-format
msgid "templates not found %s"
msgstr "模版未找到 %s"

#: builtin/init-db.c:154
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "未复制错误版本 %d 的模版自 '%s'"

#: builtin/init-db.c:192
#, c-format
msgid "insane git directory %s"
msgstr "不正常的 git 目录 %s"

#: builtin/init-db.c:322 builtin/init-db.c:325
#, c-format
msgid "%s already exists"
msgstr "%s 已经存在"

#: builtin/init-db.c:354
#, c-format
msgid "unable to handle file type %d"
msgstr "不能处理 %d 类型的文件"

#: builtin/init-db.c:357
#, c-format
msgid "unable to move %s to %s"
msgstr "不能移动 %s 至 %s"

#: builtin/init-db.c:362
#, c-format
msgid "Could not create git link %s"
msgstr "不能创建 git link %s"

#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
#. * "", and the last '%s%s' is the verbatim directory name.
#.
#: builtin/init-db.c:419
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git 版本库于 %s%s\n"

#: builtin/init-db.c:420
msgid "Reinitialized existing"
msgstr "重新初始化现存的"

#: builtin/init-db.c:420
msgid "Initialized empty"
msgstr "初始化空的"

#  译者：中文字符串拼接，可删除前导空格
#: builtin/init-db.c:421
msgid " shared"
msgstr "共享"

#: builtin/init-db.c:440
msgid "cannot tell cwd"
msgstr "无法获知当前路径"

#: builtin/init-db.c:521 builtin/init-db.c:528
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"

#: builtin/init-db.c:532
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"

#: builtin/init-db.c:554
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"
"dir=<directory>）"

#: builtin/init-db.c:578
msgid "Cannot access current working directory"
msgstr "不能访问当前工作目录"

#: builtin/init-db.c:585
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"

#: builtin/log.c:188
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"

#: builtin/log.c:401 builtin/log.c:489
#, c-format
msgid "Could not read object %s"
msgstr "不能读取对象 %s"

#: builtin/log.c:513
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型：%d"

#: builtin/log.c:602
msgid "format.headers without value"
msgstr "format.headers 没有值"

#: builtin/log.c:675
msgid "name of output directory is too long"
msgstr "输出目录名太长"

#: builtin/log.c:686
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"

#: builtin/log.c:700
msgid "Need exactly one range."
msgstr "只需要一个范围。"

#: builtin/log.c:708
msgid "Not a range."
msgstr "不是一个范围。"

#: builtin/log.c:745
msgid "Could not extract email from committer identity."
msgstr "不能从提交者身份中提取邮件地址。"

#: builtin/log.c:791
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"

#: builtin/log.c:885
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"

#: builtin/log.c:958
msgid "Two output directories?"
msgstr "两个输出目录？"

#: builtin/log.c:1179
#, c-format
msgid "bogus committer info %s"
msgstr "虚假的提交者信息 %s"

#: builtin/log.c:1224
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"

#: builtin/log.c:1226
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"

#: builtin/log.c:1231 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr "未识别的参数：%s"

#: builtin/log.c:1234
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"

#: builtin/log.c:1236
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"

#: builtin/log.c:1238
msgid "--check does not make sense"
msgstr "--check 无意义"

#: builtin/log.c:1261
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"

#: builtin/log.c:1263
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"

#: builtin/log.c:1416
msgid "Failed to create output files"
msgstr "无法创建输出文件"

#: builtin/log.c:1520
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"

#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"

#: builtin/merge.c:90
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"

#: builtin/merge.c:127
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"

#: builtin/merge.c:128
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："

#: builtin/merge.c:133
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："

#: builtin/merge.c:240
msgid "could not run stash."
msgstr "不能进行进度保存。"

#: builtin/merge.c:245
msgid "stash failed"
msgstr "进度保存失败"

#: builtin/merge.c:250
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"

#: builtin/merge.c:269 builtin/merge.c:286
msgid "read-tree failed"
msgstr "读取树失败"

#  译者：注意保持前导空格
#: builtin/merge.c:316
msgid " (nothing to squash)"
msgstr " （无可压缩）"

#: builtin/merge.c:329
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"

#: builtin/merge.c:361
msgid "Writing SQUASH_MSG"
msgstr "写入 SQUASH_MSG"

#: builtin/merge.c:363
msgid "Finishing SQUASH_MSG"
msgstr "完成 SQUASH_MSG"

#: builtin/merge.c:386
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"

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

#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"

#: builtin/merge.c:629
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"

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

#: builtin/merge.c:697
msgid "Unable to write index."
msgstr "不能写索引。"

#: builtin/merge.c:710
msgid "Not handling anything other than two heads merge."
msgstr "不能处理两个头合并之外的任何操作。"

#: builtin/merge.c:724
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项：-X%s"

#: builtin/merge.c:738
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"

#: builtin/merge.c:877
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"

#: builtin/merge.c:886
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

#: builtin/merge.c:892
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
"Lines starting with '#' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
"合并到主题分支。\n"
"\n"
"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

#: builtin/merge.c:916
msgid "Empty commit message."
msgstr "空提交信息。"

#: builtin/merge.c:928
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"

#: builtin/merge.c:993
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

#: builtin/merge.c:1009
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' 不是一个提交"

#: builtin/merge.c:1050
msgid "No current branch."
msgstr "没有当前分支。"

#: builtin/merge.c:1052
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程版本库。"

#: builtin/merge.c:1054
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"

#: builtin/merge.c:1059
#, c-format
msgid "No remote tracking branch for %s from %s"
msgstr "%s 没有来自 %s 的远程跟踪分支"

#: builtin/merge.c:1146 builtin/merge.c:1303
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"

#: builtin/merge.c:1214
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"

#: builtin/merge.c:1230 git-pull.sh:31
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"

#: builtin/merge.c:1233 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

#: builtin/merge.c:1237
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"

#: builtin/merge.c:1240
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

#: builtin/merge.c:1249
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 共用。"

#: builtin/merge.c:1254
msgid "You cannot combine --no-ff with --ff-only."
msgstr "您不能将 --no-ff 与 --ff-only 共用。"

#: builtin/merge.c:1261
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"

#: builtin/merge.c:1293
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"

#: builtin/merge.c:1296
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"

#: builtin/merge.c:1298
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"

#: builtin/merge.c:1413
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"

#: builtin/merge.c:1451
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"

#: builtin/merge.c:1458
#, c-format
msgid "Nope.\n"
msgstr "无。\n"

#: builtin/merge.c:1490
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"

#: builtin/merge.c:1513 builtin/merge.c:1592
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"

#: builtin/merge.c:1517
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"

#: builtin/merge.c:1583
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"

#: builtin/merge.c:1585
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"

#: builtin/merge.c:1594
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"

#: builtin/merge.c:1606
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"

#: builtin/mv.c:108
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"

#: builtin/mv.c:112
msgid "bad source"
msgstr "坏的源"

#: builtin/mv.c:115
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"

#: builtin/mv.c:118
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"

#: builtin/mv.c:128
#, c-format
msgid "Huh? %.*s is in index?"
msgstr "嗯？%.*s 在索引中？"

#: builtin/mv.c:140
msgid "source directory is empty"
msgstr "源目录为空"

#: builtin/mv.c:171
msgid "not under version control"
msgstr "不在版本控制之下"

#: builtin/mv.c:173
msgid "destination exists"
msgstr "目标已存在"

#: builtin/mv.c:181
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"

#: builtin/mv.c:184
msgid "Cannot overwrite"
msgstr "不能覆盖"

#: builtin/mv.c:187
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"

#: builtin/mv.c:202
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s，源=%s，目标=%s"

#: builtin/mv.c:212
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"

#: builtin/mv.c:215
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"

#: builtin/notes.c:139
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "不能为对象 '%s' 开始 'show'"

#: builtin/notes.c:145
msgid "can't fdopen 'show' output fd"
msgstr "不能打开 'show' 输出文件句柄"

#: builtin/notes.c:155
#, c-format
msgid "failed to close pipe to 'show' for object '%s'"
msgstr "无法为对象 '%s' 的 'show' 关闭管道"

#: builtin/notes.c:158
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' 完成 'show'"

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

#: builtin/notes.c:189
msgid "Please supply the note contents using either -m or -F option"
msgstr "请通过 -m 或 -F 选项为注解提供内容"

#: builtin/notes.c:210 builtin/notes.c:973
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"

#: builtin/notes.c:215
msgid "unable to write note object"
msgstr "不能写注解对象"

#: builtin/notes.c:217
#, c-format
msgid "The note contents has been left in %s"
msgstr "注解内容被留在文件 %s 中"

#: builtin/notes.c:251 builtin/tag.c:521
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"

#: builtin/notes.c:253 builtin/tag.c:524
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"

#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"

#: builtin/notes.c:275
#, c-format
msgid "Failed to read object '%s'."
msgstr "无法读取对象 '%s'。"

#: builtin/notes.c:299
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "不能提交未初始化/未引用的注解树"

#: builtin/notes.c:340
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "坏的 notes.rewriteMode 值：'%s'"

#: builtin/notes.c:350
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
#: builtin/notes.c:377
#, c-format
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"

#: builtin/notes.c:441
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"

#: builtin/notes.c:456
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "无法从 '%s' 到 '%s' 拷贝注解"

#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
#: builtin/notes.c:1033
msgid "too many parameters"
msgstr "参数太多"

#: builtin/notes.c:513 builtin/notes.c:772
#, c-format
msgid "No note found for object %s."
msgstr "未发现对象 %s 的注解。"

#: builtin/notes.c:580
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

#: builtin/notes.c:585 builtin/notes.c:662
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"

#: builtin/notes.c:635
msgid "too few parameters"
msgstr "参数太少"

#: builtin/notes.c:656
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

#: builtin/notes.c:668
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"

#: builtin/notes.c:717
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"

#: builtin/notes.c:971
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"

#: builtin/notes.c:1103
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"

#: builtin/pack-objects.c:2315
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"

#: builtin/pack-objects.c:2319
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"

#: builtin/pack-objects.c:2342
#, c-format
msgid "option %s does not accept negative form"
msgstr "选项 %s 不接受否定格式"

#: builtin/pack-objects.c:2346
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "不能解析值 '%s' 针对于选项 %s"

#: builtin/push.c:45
msgid "tag shorthand without <tag>"
msgstr "tag 简写没有跟 <tag> 参数"

#: builtin/push.c:64
msgid "--delete only accepts plain target ref names"
msgstr "--delete 只接受简单的目标引用名"

#: builtin/push.c:84
#, c-format
msgid ""
"You are not currently on a branch.\n"
"To push the history leading to the current (detached HEAD)\n"
"state now, use\n"
"\n"
"    git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
"您当前不在一个分支上。\n"
"现在为推送当前（分离头指针）的历史，使用\n"
"\n"
"    git push %s HEAD:<name-of-remote-branch>\n"

#: builtin/push.c:91
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"To push the current branch and set the remote as upstream, use\n"
"\n"
"    git push --set-upstream %s %s\n"
msgstr ""
"当前分支 %s 没有对应的上游分支。\n"
"为推送当前分支并建立与远程上游的跟踪，使用\n"
"\n"
"    git push --set-upstream %s %s\n"

#: builtin/push.c:99
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当前分支 %s 有多个上游分支，拒绝推送。"

#: builtin/push.c:102
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
"而没有告诉我要推送什么、更新哪个远程分支。"

#: builtin/push.c:131
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"

#: builtin/push.c:138
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
"before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
"再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"

#: builtin/push.c:144
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
"specify branches to push or set the 'push.default' configuration\n"
"variable to 'current' or 'upstream' to push only the current branch."
msgstr ""
"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
"如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送"
"当前分支。"

#: builtin/push.c:150
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and merge the remote changes\n"
"(e.g. 'git pull') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
"检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"

#: builtin/push.c:190
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"

#: builtin/push.c:194
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "无法推送一些引用到 '%s'"

#: builtin/push.c:226
#, c-format
msgid "bad repository '%s'"
msgstr "坏的版本库 '%s'"

#: builtin/push.c:227
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"repository using\n"
"\n"
"    git remote add <name> <url>\n"
"\n"
"and then push using the remote name\n"
"\n"
"    git push <name>\n"
msgstr ""
"没有配置推送目标。\n"
"或者通过命令行指定URL，或者用下面命令配置一个远程版本库\n"
"\n"
"    git remote add <name> <url>\n"
"\n"
"然后使用该远程版本库名执行推送\n"
"\n"
"    git push <name>\n"

#: builtin/push.c:242
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"

#: builtin/push.c:243
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用表达式共用"

#: builtin/push.c:248
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"

#: builtin/push.c:249
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用表达式共用"

#: builtin/push.c:254
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"

#: builtin/push.c:334
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

#: builtin/push.c:336
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"

#: builtin/reset.c:33
msgid "mixed"
msgstr "混杂"

#: builtin/reset.c:33
msgid "soft"
msgstr "软性"

#: builtin/reset.c:33
msgid "hard"
msgstr "硬性"

#: builtin/reset.c:33
msgid "keep"
msgstr "保持"

#: builtin/reset.c:77
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"

#: builtin/reset.c:79
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"

#: builtin/reset.c:85
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"

#: builtin/reset.c:96
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"

#: builtin/reset.c:106
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"

#: builtin/reset.c:130
msgid "Could not read index"
msgstr "不能读取索引"

#: builtin/reset.c:133
msgid "Unstaged changes after reset:"
msgstr "重置后撤出暂存区的变更："

#  译者：汉字之间无空格，故删除%s前后空格
#: builtin/reset.c:223
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"

#: builtin/reset.c:297
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"

#: builtin/reset.c:302
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard,mixed,soft} 不兼容"

#: builtin/reset.c:311
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。"

#  译者：汉字之间无空格，故删除%s前后空格
#: builtin/reset.c:313
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"

#  译者：汉字之间无空格，故删除%s前后空格
#: builtin/reset.c:325
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对裸版本库进行%s重置"

#: builtin/reset.c:341
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"

#: builtin/revert.c:70 builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s：%s 不能和 %s 共用"

#: builtin/revert.c:127
msgid "program error"
msgstr "程序错误"

#: builtin/revert.c:213
msgid "revert failed"
msgstr "还原失败"

#: builtin/revert.c:228
msgid "cherry-pick failed"
msgstr "拣选失败"

#: builtin/rm.c:109
#, c-format
msgid ""
"'%s' has staged content different from both the file and the HEAD\n"
"(use -f to force removal)"
msgstr ""
"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
"（使用 -f 强制删除）"

#: builtin/rm.c:115
#, c-format
msgid ""
"'%s' has changes staged in the index\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
"'%s' 有变更已暂存至索引中\n"
"（使用 --cached 保存文件，或用 -f 强制删除）"

#: builtin/rm.c:119
#, c-format
msgid ""
"'%s' has local modifications\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
"'%s' 有本地修改\n"
"（使用 --cached 保存文件，或用 -f 强制删除）"

#: builtin/rm.c:194
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"

#: builtin/rm.c:230
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"

#: builtin/shortlog.c:157
#, c-format
msgid "Missing author: %s"
msgstr "缺少作者：%s"

#: builtin/tag.c:58
#, c-format
msgid "malformed object at '%s'"
msgstr "非法的对象于 '%s'"

#: builtin/tag.c:205
#, c-format
msgid "tag name too long: %.*s..."
msgstr "tag 名字太长：%.*s..."

#: builtin/tag.c:210
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' 未发现。"

#: builtin/tag.c:225
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除 tag '%s'（曾为 %s）\n"

#: builtin/tag.c:237
#, c-format
msgid "could not verify the tag '%s'"
msgstr "不能校验 tag '%s'"

#: builtin/tag.c:247
msgid ""
"\n"
"#\n"
"# Write a tag message\n"
"# Lines starting with '#' will be ignored.\n"
"#\n"
msgstr ""
"\n"
"#\n"
"# 输入一个 tag 说明\n"
"# 以 '#' 开头的行将被忽略。\n"
"#\n"

#: builtin/tag.c:254
msgid ""
"\n"
"#\n"
"# Write a tag message\n"
"# Lines starting with '#' will be kept; you may remove them yourself if you "
"want to.\n"
"#\n"
msgstr ""
"\n"
"#\n"
"# 输入一个 tag 说明\n"
"# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"
"#\n"

#: builtin/tag.c:294
msgid "unable to sign the tag"
msgstr "无法签署 tag"

#: builtin/tag.c:296
msgid "unable to write tag file"
msgstr "无法写 tag 文件"

#: builtin/tag.c:321
msgid "bad object type."
msgstr "坏的对象类型。"

#: builtin/tag.c:334
msgid "tag header too big."
msgstr "tag 头信息太大。"

#: builtin/tag.c:366
msgid "no tag message?"
msgstr "无 tag 说明？"

#: builtin/tag.c:372
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "tag 说明被保留在 %s\n"

#: builtin/tag.c:421
msgid "switch 'points-at' requires an object"
msgstr "开关 'points-at' 需要一个对象"

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

#: builtin/tag.c:502
msgid "-n option is only allowed with -l."
msgstr "-n 选项只允许和 -l 共用。"

#: builtin/tag.c:504
msgid "--contains option is only allowed with -l."
msgstr "--contains 选项只允许和 -l 共用。"

#: builtin/tag.c:506
msgid "--points-at option is only allowed with -l."
msgstr "--points-at 选项只允许和 -l 共用。"

#: builtin/tag.c:514
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"

#: builtin/tag.c:534
msgid "too many params"
msgstr "太多参数"

#: builtin/tag.c:540
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的tag名称。"

#: builtin/tag.c:545
#, c-format
msgid "tag '%s' already exists"
msgstr "tag '%s' 已存在"

#: builtin/tag.c:563
#, c-format
msgid "%s: cannot lock the ref"
msgstr "%s：不能锁定引用"

#: builtin/tag.c:565
#, c-format
msgid "%s: cannot update the ref"
msgstr "%s：不能更新引用"

#: builtin/tag.c:567
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新tag '%s'（曾为 %s）\n"

#: git-am.sh:50
msgid "You need to set your committer info first"
msgstr "您需要先设置你的提交者信息"

#: git-am.sh:137
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"

#: git-am.sh:154
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据上。"

#: git-am.sh:163
msgid "Falling back to patching base and 3-way merge..."
msgstr "回退到补丁基础版本并使用三路合并..."

#: git-am.sh:275
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"

#: git-am.sh:362
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr "不支持 $patch_format 补丁格式。"

#: git-am.sh:364
msgid "Patch format detection failed."
msgstr "补丁格式检测失败。"

#: git-am.sh:418
msgid "-d option is no longer supported.  Do not use."
msgstr "不再支持 -d 选项。不要使用。"

#: git-am.sh:481
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"

#: git-am.sh:486
msgid "Please make up your mind. --skip or --abort?"
msgstr "请下决心。--skip 或是 --abort ？"

#: git-am.sh:513
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"

#: git-am.sh:579
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr "脏的索引：不能应用补丁（脏文件：$files）"

#: git-am.sh:755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联，不能进行交互式操作。"

#  译者：注意保持句尾空格
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
#: git-am.sh:766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

#: git-am.sh:802
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr "正应用：$FIRSTLINE"

#: git-am.sh:847
msgid "No changes -- Patch already applied."
msgstr "没有变更 -- 补丁已经应用过。"

#: git-am.sh:873
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"

#  译者：注意保持句尾空格
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:54
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样做么[Y/n]？ "

#: git-bisect.sh:95
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "未识别的选项：'$arg'"

#: git-bisect.sh:99
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' 看起来不像是一个有效的版本"

#: git-bisect.sh:117
msgid "Bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"

#: git-bisect.sh:130
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"

#: git-bisect.sh:140
msgid "won't bisect on seeked tree"
msgstr "不会在已查找过的树上二分查找"

#: git-bisect.sh:144
msgid "Bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"

#: git-bisect.sh:189
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "坏的 bisect_write 参数：$state"

#: git-bisect.sh:218
#, sh-format
msgid "Bad rev input: $arg"
msgstr "输入坏的版本：$arg"

#: git-bisect.sh:232
msgid "Please call 'bisect_state' with at least one argument."
msgstr "请在调用 'bisect_state' 时跟至少一个参数。"

#: git-bisect.sh:244
#, sh-format
msgid "Bad rev input: $rev"
msgstr "输入坏的版本：$rev"

#: git-bisect.sh:250
msgid "'git bisect bad' can take only one argument."
msgstr "'git bisect bad' 只能带一个参数。"

#  译者：注意保持句尾空格
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:279
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]？ "

#: git-bisect.sh:354
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' 不是一个有效的提交"

#: git-bisect.sh:363
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
"不能检出原始 HEAD '$branch'。\n"
"尝试 'git bisect reset <commit>'。"

#: git-bisect.sh:390
msgid "No logfile given"
msgstr "未提供日志文件"

#: git-bisect.sh:391
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"

#: git-bisect.sh:408
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"

#: git-bisect.sh:474
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"

#: git-pull.sh:21
msgid ""
"Pull is not possible because you have unmerged files.\n"
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution, or use 'git commit -a'."
msgstr ""
"Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n"
"然后酌情使用 'git add/rm <file>' 标记解决方案，\n"
"或者使用 'git commit -a'。"

#: git-pull.sh:25
msgid "Pull is not possible because you have unmerged files."
msgstr "Pull 不可用，因为您尚有未合并的文件。"

#: git-pull.sh:197
msgid "updating an unborn branch with changes added to the index"
msgstr "更新尚未诞生的分支，变更添加至索引"

#: git-pull.sh:253
msgid "Cannot merge multiple branches into empty head"
msgstr "无法将多个分支合并到空分支"

#: git-pull.sh:257
msgid "Cannot rebase onto multiple branches"
msgstr "无法变基到多个分支"

#: git-stash.sh:51
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"

#: git-stash.sh:74
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"

#: git-stash.sh:89
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"

#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"

#: git-stash.sh:140
msgid "No changes selected"
msgstr "没有选择变更"

#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引（不应发生）"

#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"

#: git-stash.sh:223
msgid "No local changes to save"
msgstr "没有要保存的本地修改"

#: git-stash.sh:227
msgid "Cannot initialize stash"
msgstr "无法初始化 stash"

#: git-stash.sh:235
msgid "Cannot save the current status"
msgstr "无法保存当前状态"

#: git-stash.sh:253
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"

#: git-stash.sh:352
msgid "No stash found."
msgstr "未发现 stash。"

#: git-stash.sh:359
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"

#: git-stash.sh:365
#, sh-format
msgid "$reference is not valid reference"
msgstr "$reference 不是有效的引用"

#: git-stash.sh:393
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是 stash 样提交"

#: git-stash.sh:404
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个 stash 引用"

#: git-stash.sh:412
msgid "unable to refresh index"
msgstr "无法刷新索引"

#: git-stash.sh:416
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中恢复进度"

#: git-stash.sh:424
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"

#: git-stash.sh:426
msgid "Could not save index tree"
msgstr "不能保存索引树"

#: git-stash.sh:460
msgid "Cannot unstage modified files"
msgstr "无法还原修改的文件"

#: git-stash.sh:491
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"

#: git-stash.sh:492
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：不能丢弃进度条目"

#: git-stash.sh:499
msgid "No branch name specified"
msgstr "未指定分支名"

#: git-stash.sh:570
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"

#: git-submodule.sh:56
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "无法从 url '$remoteurl' 剥离一个组件"

#: git-submodule.sh:109
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"

#: git-submodule.sh:150
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"

#: git-submodule.sh:160
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"

#: git-submodule.sh:248
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"

#: git-submodule.sh:265
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"

#: git-submodule.sh:282
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"

#: git-submodule.sh:296
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"

#: git-submodule.sh:301
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"

#: git-submodule.sh:306
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"

#: git-submodule.sh:348
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr "正在进入 '$prefix$sm_path'"

#: git-submodule.sh:360
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr "停止于 '$sm_path'，脚本返回非零值。"

#: git-submodule.sh:402
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"

#: git-submodule.sh:411
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr "无法为子模组路径 '$sm_path' 注册 url"

#: git-submodule.sh:419
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr "无法为子模组路径 '$sm_path' 注册更新模式"

#: git-submodule.sh:421
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"

#: git-submodule.sh:520
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
"子模组路径 '$sm_path' 没有初始化\n"
"也许您想用 'update --init'？"

#: git-submodule.sh:533
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"

#: git-submodule.sh:552
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"

#: git-submodule.sh:566
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"

#: git-submodule.sh:567
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"

#: git-submodule.sh:572
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"

#: git-submodule.sh:573
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"

#: git-submodule.sh:578
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"

#: git-submodule.sh:579
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr "子模组路径 '$sm_path'：检出 '$sha1'"

#: git-submodule.sh:601 git-submodule.sh:924
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"

#: git-submodule.sh:709
msgid "--"
msgstr "--"

#  译者：注意保持前导空格
#: git-submodule.sh:767
#, sh-format
msgid "  Warn: $name doesn't contain commit $sha1_src"
msgstr "  警告：$name 未包含提交 $sha1_src"

#  译者：注意保持前导空格
#: git-submodule.sh:770
#, sh-format
msgid "  Warn: $name doesn't contain commit $sha1_dst"
msgstr "  警告：$name 未包含提交 $sha1_dst"

#  译者：注意保持前导空格
#: git-submodule.sh:773
#, sh-format
msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr "  警告：$name 未包含提交 $sha1_src 和 $sha1_dst"

#: git-submodule.sh:798
msgid "blob"
msgstr "blob"

#: git-submodule.sh:799
msgid "submodule"
msgstr "子模组"

#: git-submodule.sh:970
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr "为 '$name' 同步子模组 url"

#~ msgid "Too many options specified"
#~ msgstr "指定了太多的选项"