blob: 46d158ffd1ef5d819c5411d0d9906724fa57c215 [file] [log] [blame]
# 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-09-15 10:21+0800\n"
"PO-Revision-Date: 2012-09-07 17:56+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: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'。"
#: archive.c:10
#, fuzzy
msgid "git archive [options] <tree-ish> [<path>...]"
msgstr "git apply [选项] [<补丁>...]"
#: archive.c:11
#, fuzzy
msgid "git archive --list"
msgstr "git archive:NACK %s"
#: archive.c:12
msgid ""
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
msgstr ""
#: archive.c:13
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
#: archive.c:322
msgid "fmt"
msgstr ""
#: archive.c:322
msgid "archive format"
msgstr ""
#: archive.c:323 builtin/log.c:1079
msgid "prefix"
msgstr ""
#: archive.c:324
msgid "prepend prefix to each pathname in the archive"
msgstr ""
#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332
#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642
#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77
#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537
#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149
msgid "file"
msgstr "文件"
#: archive.c:326 builtin/archive.c:92
msgid "write the archive to this file"
msgstr ""
#: archive.c:328
#, fuzzy
msgid "read .gitattributes in working directory"
msgstr "%s:已经存在于工作区中"
#: archive.c:329
msgid "report archived files on stderr"
msgstr ""
#: archive.c:330
msgid "store only"
msgstr ""
#: archive.c:331
msgid "compress faster"
msgstr ""
#: archive.c:339
msgid "compress better"
msgstr ""
#: archive.c:342
msgid "list supported archive formats"
msgstr ""
#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85
msgid "repo"
msgstr ""
#: archive.c:345 builtin/archive.c:94
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616
#, fuzzy
msgid "command"
msgstr "运行 $command"
#: archive.c:347 builtin/archive.c:96
msgid "path to the remote git-upload-archive command"
msgstr ""
#: 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:714
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
msgstr "版本库缺少这些必备的提交:"
#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290
#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
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:1209 builtin/shortlog.c:284
#, 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: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"
#: 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: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:1401
msgid " 0 files changed"
msgstr " 0 个文件被修改"
#: diff.c:1405
#, c-format
msgid " %d file changed"
msgid_plural " %d files changed"
msgstr[0] " %d 个文件被修改"
msgstr[1] " %d 个文件被修改"
#: diff.c:1422
#, c-format
msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)"
msgstr[0] ",插入 %d 行(+)"
msgstr[1] ",插入 %d 行(+)"
#: diff.c:1433
#, c-format
msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)"
msgstr[0] ",删除 %d 行(-)"
msgstr[1] ",删除 %d 行(-)"
#: diff.c:3460
#, 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:1320
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':无法读取 %s"
#: grep.c:1337
#, c-format
msgid "'%s': %s"
msgstr "'%s':%s"
#: grep.c:1348
#, 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:275
#, 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:332
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀,您的系统中未发现 Git 命令。"
#: help.c:354
#, 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:359
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "在 %0.1f 秒钟后自动运行..."
#: help.c:366
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
#: help.c:370
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
"\n"
"您指的是这个么?"
msgstr[1] ""
"\n"
"您指的是这其中的某一个么?"
#: 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:869
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:696
msgid "Unable to write index."
msgstr "不能写入索引。"
#: parse-options.c:494
msgid "..."
msgstr "..."
#: parse-options.c:512
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
#: parse-options.c:516
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: parse-options.c:519
#, c-format
msgid " %s"
msgstr " %s"
#: remote.c:1632
#, 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:1638
#, 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:1646
#, 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"
#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
#: builtin/merge.c:1087 builtin/merge.c:1097
#, c-format
msgid "Could not open '%s' for writing"
msgstr "不能为写入打开 '%s'"
#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867
#: builtin/merge.c:1089 builtin/merge.c:1102
#, c-format
msgid "Could not write to '%s'"
msgstr "不能写入 '%s'"
#: sequencer.c:144
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:147
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:160 sequencer.c:765 sequencer.c:848
#, c-format
msgid "Could not write to %s"
msgstr "不能写入 %s"
#: sequencer.c:163
#, c-format
msgid "Error wrapping up %s"
msgstr "错误收尾 %s"
#: sequencer.c:178
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "您的本地修改将被拣选操作覆盖。"
#: sequencer.c:180
msgid "Your local changes would be overwritten by revert."
msgstr "您的本地修改将被还原操作覆盖。"
#: sequencer.c:183
msgid "Commit your changes or stash them to proceed."
msgstr "提交您的修改或保存进度后再继续。"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
#: sequencer.c:233
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s:无法写入新索引文件"
#: sequencer.c:261
msgid "Could not resolve HEAD commit\n"
msgstr "不能解析 HEAD 提交\n"
#: sequencer.c:282
msgid "Unable to update cache tree\n"
msgstr "不能更新缓存\n"
#: sequencer.c:327
#, c-format
msgid "Could not parse commit %s\n"
msgstr "不能解析提交 %s\n"
#: sequencer.c:332
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "不能解析父提交 %s\n"
#: sequencer.c:398
msgid "Your index file is unmerged."
msgstr "您的索引文件未完成合并。"
#: sequencer.c:401
msgid "You do not have a valid HEAD"
msgstr "您没有一个有效的 HEAD"
#: sequencer.c:416
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
#: sequencer.c:424
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "提交 %s 没有父提交 %d"
#: sequencer.c:428
#, 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:439
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:不能解析父提交 %s"
#: sequencer.c:443
#, c-format
msgid "Cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#: sequencer.c:527
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
#: sequencer.c:528
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
#: sequencer.c:560
msgid "empty commit set passed"
msgstr "提供了空的提交集"
#: sequencer.c:568
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s:无法读取索引"
#: sequencer.c:573
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s:无法刷新索引"
#: sequencer.c:631
#, c-format
msgid "Cannot %s during a %s"
msgstr "无法 %s 在一个 %s 过程中"
#: sequencer.c:653
#, c-format
msgid "Could not parse line %d."
msgstr "不能解析第 %d 行。"
#: sequencer.c:658
msgid "No commits parsed."
msgstr "没有提交被解析。"
#: sequencer.c:671
#, c-format
msgid "Could not open %s"
msgstr "不能打开 %s"
#: sequencer.c:675
#, c-format
msgid "Could not read %s."
msgstr "不能读取 %s。"
#: sequencer.c:682
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "无用的指令表单:%s"
#: sequencer.c:710
#, c-format
msgid "Invalid key: %s"
msgstr "无效键名:%s"
#: sequencer.c:713
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%s 的值无效:%s"
#: sequencer.c:725
#, c-format
msgid "Malformed options sheet: %s"
msgstr "非法的选项表单:%s"
#: sequencer.c:746
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
#: sequencer.c:747
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
#: sequencer.c:751
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "不能创建序列目录 %s"
#: sequencer.c:767 sequencer.c:852
#, c-format
msgid "Error wrapping up %s."
msgstr "错误收尾 %s。"
#: sequencer.c:786 sequencer.c:920
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
#: sequencer.c:788
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
#: sequencer.c:790
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
#: sequencer.c:812 builtin/apply.c:4005
#, c-format
msgid "cannot open %s: %s"
msgstr "不能打开 %s:%s"
#: sequencer.c:815
#, c-format
msgid "cannot read %s: %s"
msgstr "不能读取 %s:%s"
#: sequencer.c:816
msgid "unexpected end of file"
msgstr "意外的文件结束"
#: sequencer.c:822
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
#: sequencer.c:845
#, c-format
msgid "Could not format %s."
msgstr "不能格式化 %s。"
#: sequencer.c:1007
msgid "Can't revert as initial commit"
msgstr "不能作为初始提交还原"
#: sequencer.c:1008
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
#, fuzzy, c-format
msgid "unable to access '%s': %s"
msgstr "不能创建 '%s'"
#: wrapper.c:426
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "无法在 passwd 文件中查询到该用户:%s"
#: wrapper.c:427
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:785
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者:注意保持前导空格
#: wt-status.c:788 wt-status.c:912
msgid " (fix conflicts and run \"git commit\")"
msgstr " (解决冲突并运行 \"git commit\")"
#: wt-status.c:791
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者:注意保持前导空格
#: wt-status.c:794
msgid " (use \"git commit\" to conclude merge)"
msgstr " (使用 \"git commit\" 结束合并)"
#: wt-status.c:804
msgid "You are in the middle of an am session."
msgstr "您正处于一个 am 过程中。"
#: wt-status.c:807
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者:注意保持前导空格
#: wt-status.c:811
msgid " (fix conflicts and then run \"git am --resolved\")"
msgstr " (解决冲突,然后运行 \"git am --resolved\")"
# 译者:注意保持前导空格
#: wt-status.c:813
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (使用 \"git am --skip\" 跳过此补丁)"
# 译者:注意保持前导空格
#: wt-status.c:815
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (使用 \"git am --abort\" 恢复原有分支)"
#: wt-status.c:873 wt-status.c:883
msgid "You are currently rebasing."
msgstr "您正在变基。"
# 译者:注意保持前导空格
#: wt-status.c:876
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
# 译者:注意保持前导空格
#: wt-status.c:878
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
# 译者:注意保持前导空格
#: wt-status.c:880
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
# 译者:注意保持前导空格
#: wt-status.c:886
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
#: wt-status.c:888
msgid "You are currently splitting a commit during a rebase."
msgstr "您正在变基过程中拆分一个提交。"
# 译者:注意保持前导空格
#: wt-status.c:891
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
#: wt-status.c:893
msgid "You are currently editing a commit during a rebase."
msgstr "您正在变基过程中编辑一个提交。"
# 译者:注意保持前导空格
#: wt-status.c:896
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (使用 \"git commit --amend\" 修补当前提交)"
# 译者:注意保持前导空格
#: wt-status.c:898
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
#: wt-status.c:908
msgid "You are currently cherry-picking."
msgstr "您正在做拣选操作。"
# 译者:注意保持前导空格
#: wt-status.c:915
msgid " (all conflicts fixed: run \"git commit\")"
msgstr " (解决所有冲突后,执行 \"git commit\")"
#: wt-status.c:924
msgid "You are currently bisecting."
msgstr "您正在做二分查找。"
# 译者:注意保持前导空格
#: wt-status.c:927
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
#: wt-status.c:978
msgid "On branch "
msgstr "位于分支 "
#: wt-status.c:985
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
#: wt-status.c:997
msgid "Initial commit"
msgstr "初始提交"
#: wt-status.c:1011
#, fuzzy
msgid "Untracked files"
msgstr "未跟踪的"
#: wt-status.c:1013
#, fuzzy
msgid "Ignored files"
msgstr "忽略的"
#: wt-status.c:1015
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1017
msgid " (use -u option to show untracked files)"
msgstr "(使用 -u 参数显示未跟踪的文件)"
#: wt-status.c:1023
msgid "No changes"
msgstr "没有修改"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1028
#, fuzzy, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
#: wt-status.c:1031
#, fuzzy, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交%s\n"
#: wt-status.c:1034
#, fuzzy, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "空提交但存在未跟踪文件%s\n"
#: wt-status.c:1037
#, fuzzy, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "空提交但存在未跟踪文件%s\n"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1040
#, fuzzy, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
#: wt-status.c:1043 wt-status.c:1048
#, fuzzy, c-format
msgid "nothing to commit\n"
msgstr "无须提交%s\n"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1046
#, fuzzy, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "(使用 -u 显示未跟踪文件)"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1050
#, fuzzy, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "(干净的工作区)"
#: wt-status.c:1158
msgid "HEAD (no branch)"
msgstr "HEAD(非分支)"
# 译者:注意保持句尾空格
#: wt-status.c:1164
msgid "Initial commit on "
msgstr "初始提交于 "
# 译者:注意保持句尾空格
#: wt-status.c:1179
msgid "behind "
msgstr "落后 "
# 译者:注意保持句尾空格
#: wt-status.c:1182 wt-status.c:1185
msgid "ahead "
msgstr "领先 "
# 译者:注意保持句尾空格
#: wt-status.c:1187
msgid ", behind "
msgstr ",落后 "
#: compat/precompose_utf8.c:58 builtin/clone.c:341
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
#: builtin/add.c:19
#, fuzzy
msgid "git add [options] [--] <filepattern>..."
msgstr "git apply [选项] [<补丁>...]"
#: builtin/add.c:62
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
#: builtin/add.c:67 builtin/commit.c:229
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:460 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:313
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
#: builtin/rm.c:133
msgid "dry run"
msgstr ""
#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187
#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
#: builtin/mv.c:62 builtin/read-tree.c:112
msgid "be verbose"
msgstr "冗长输出"
#: builtin/add.c:322
#, fuzzy
msgid "interactive picking"
msgstr "交互式添加失败"
#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248
msgid "select hunks interactively"
msgstr ""
#: builtin/add.c:324
msgid "edit current diff and apply"
msgstr ""
#: builtin/add.c:325
msgid "allow adding otherwise ignored files"
msgstr ""
#: builtin/add.c:326
#, fuzzy
msgid "update tracked files"
msgstr "无法存储包文件"
#: builtin/add.c:327
msgid "record only the fact that the path will be added later"
msgstr ""
#: builtin/add.c:328
msgid "add changes from all tracked and untracked files"
msgstr ""
#: builtin/add.c:329
#, fuzzy
msgid "don't add, only refresh the index"
msgstr "git %s:无法刷新索引"
#: builtin/add.c:330
msgid "just skip files which cannot be added because of errors"
msgstr ""
#: builtin/add.c:331
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
#: builtin/add.c:353
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
#: builtin/add.c:354
msgid "no files added"
msgstr "没有文件被添加"
#: builtin/add.c:360
msgid "adding files failed"
msgstr "添加文件失败"
#: builtin/add.c:392
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
#: builtin/add.c:394
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/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr "索引文件损坏"
#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260
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:1420
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount:意外的行:%.*s"
#: builtin/apply.c:1477
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息:%.*s"
#: builtin/apply.c:1494
#, 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:1654
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
#: builtin/apply.c:1656
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
#: builtin/apply.c:1682
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
#: builtin/apply.c:1718
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
#: builtin/apply.c:1720
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
#: builtin/apply.c:1723
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:文件 %s 成为空文件但并未删除"
#: builtin/apply.c:1869
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏:%.*s"
#. there has to be one hunk (forward hunk)
#: builtin/apply.c:1898
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
#: builtin/apply.c:1984
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
#: builtin/apply.c:2074
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
#: builtin/apply.c:2078
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
#: builtin/apply.c:2149
msgid "oops"
msgstr "哎哟"
#: builtin/apply.c:2671
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符:'%c'"
#: builtin/apply.c:2789
#, 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:2801
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
#: builtin/apply.c:2807
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
"当查询:\n"
"%.*s"
#: builtin/apply.c:2826
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
#: builtin/apply.c:2929
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
#: builtin/apply.c:2935
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
#: builtin/apply.c:2956
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败:%s:%ld"
#: builtin/apply.c:3078
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176
#, c-format
msgid "read of %s failed"
msgstr "读取 %s 失败"
#: builtin/apply.c:3156 builtin/apply.c:3378
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
#: builtin/apply.c:3237 builtin/apply.c:3392
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:不存在于索引中"
#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406
#, c-format
msgid "%s: %s"
msgstr "%s:%s"
#: builtin/apply.c:3246 builtin/apply.c:3400
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引不匹配"
#: builtin/apply.c:3348
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
#: builtin/apply.c:3417
#, c-format
msgid "%s: wrong type"
msgstr "%s:错误类型"
#: builtin/apply.c:3419
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o,应为 %o"
#: builtin/apply.c:3520
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已经存在于索引中"
#: builtin/apply.c:3523
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已经存在于工作区中"
#: builtin/apply.c:3543
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
#: builtin/apply.c:3548
#, 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:3556
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:补丁未应用"
#: builtin/apply.c:3569
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
#: builtin/apply.c:3767
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
#: builtin/apply.c:3795
#, c-format
msgid "corrupt patch for subproject %s"
msgstr "子项目 %s 损坏的补丁"
#: builtin/apply.c:3799
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能枚举新建文件 '%s' 的状态"
#: builtin/apply.c:3804
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
#: builtin/apply.c:3807 builtin/apply.c:3915
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
#: builtin/apply.c:3840
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
#: builtin/apply.c:3889
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
#: builtin/apply.c:3976
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
#: builtin/apply.c:3984
msgid "internal error"
msgstr "内部错误"
#. Say this even without --verbose
#: builtin/apply.c:3987
#, 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:3997
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
#: builtin/apply.c:4018
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
#: builtin/apply.c:4021
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
#: builtin/apply.c:4171
msgid "unrecognized input"
msgstr "未能识别的输入"
#: builtin/apply.c:4182
msgid "unable to read index file"
msgstr "无法读取索引文件"
#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91
#: builtin/fetch.c:63
msgid "path"
msgstr "路径"
#: builtin/apply.c:4302
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
#: builtin/apply.c:4305
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
#: builtin/apply.c:4307
msgid "num"
msgstr "数字"
#: builtin/apply.c:4308
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
#: builtin/apply.c:4311
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
#: builtin/apply.c:4313
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
#: builtin/apply.c:4317
#, fuzzy
msgid "show number of added and deleted lines in decimal notation"
msgstr "以数字方式显示添加或删除行的数量"
#: builtin/apply.c:4319
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁,而是显示输入的概要"
#: builtin/apply.c:4321
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁,而是查看补丁是否可应用"
#: builtin/apply.c:4323
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
#: builtin/apply.c:4325
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
#: builtin/apply.c:4327
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
#: builtin/apply.c:4329
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三路合并"
#: builtin/apply.c:4331
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
#: builtin/apply.c:4336
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
#: builtin/apply.c:4337
msgid "action"
msgstr "动作"
#: builtin/apply.c:4338
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
#: builtin/apply.c:4341 builtin/apply.c:4344
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
#: builtin/apply.c:4347
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
#: builtin/apply.c:4349
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
#: builtin/apply.c:4351
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
#: builtin/apply.c:4353
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
#: builtin/apply.c:4356
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
#: builtin/apply.c:4359
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
#: builtin/apply.c:4361
msgid "root"
msgstr "根目录"
#: builtin/apply.c:4362
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
#: builtin/apply.c:4384
msgid "--3way outside a repository"
msgstr "--3way 在一个版本库之外"
#: builtin/apply.c:4392
msgid "--index outside a repository"
msgstr "--index 在一个版本库之外"
#: builtin/apply.c:4395
msgid "--cached outside a repository"
msgstr "--cached 在一个版本库之外"
#: builtin/apply.c:4411
#, c-format
msgid "can't open patch '%s'"
msgstr "不能打开补丁 '%s'"
#: builtin/apply.c:4425
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
#: builtin/apply.c:4431 builtin/apply.c:4441
#, 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 ""
#: builtin/bisect--helper.c:17
msgid "perform 'git bisect next'"
msgstr ""
#: builtin/bisect--helper.c:19
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
#: builtin/blame.c:25
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr ""
#: builtin/blame.c:30 builtin/shortlog.c:15
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr ""
#: builtin/blame.c:2316
msgid "Show blame entries as we find them, incrementally"
msgstr ""
#: builtin/blame.c:2317
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
#: builtin/blame.c:2318
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
#: builtin/blame.c:2319
#, fuzzy
msgid "Show work cost statistics"
msgstr "显示工作区状态"
#: builtin/blame.c:2320
msgid "Show output score for blame entries"
msgstr ""
#: builtin/blame.c:2321
msgid "Show original filename (Default: auto)"
msgstr ""
#: builtin/blame.c:2322
msgid "Show original linenumber (Default: off)"
msgstr ""
#: builtin/blame.c:2323
msgid "Show in a format designed for machine consumption"
msgstr ""
#: builtin/blame.c:2324
msgid "Show porcelain format with per-line commit information"
msgstr ""
#: builtin/blame.c:2325
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
#: builtin/blame.c:2326
msgid "Show raw timestamp (Default: off)"
msgstr ""
#: builtin/blame.c:2327
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
#: builtin/blame.c:2328
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
#: builtin/blame.c:2329
msgid "Show author email instead of name (Default: off)"
msgstr ""
#: builtin/blame.c:2330
msgid "Ignore whitespace differences"
msgstr ""
#: builtin/blame.c:2331
msgid "Spend extra cycles to find better match"
msgstr ""
#: builtin/blame.c:2332
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
#: builtin/blame.c:2333
#, fuzzy
msgid "Use <file>'s contents as the final image"
msgstr "添加文件内容至索引"
#: builtin/blame.c:2334 builtin/blame.c:2335
msgid "score"
msgstr ""
#: builtin/blame.c:2334
msgid "Find line copies within and across files"
msgstr ""
#: builtin/blame.c:2335
msgid "Find line movements within and across files"
msgstr ""
#: builtin/blame.c:2336
#, fuzzy
msgid "n,m"
msgstr "数字"
#: builtin/blame.c:2336
msgid "Process only line range n,m, counting from 1"
msgstr ""
#: builtin/branch.c:23
msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
msgstr ""
#: builtin/branch.c:24
msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
msgstr ""
#: builtin/branch.c:25
#, fuzzy
msgid "git branch [options] [-r] (-d | -D) <branchname>..."
msgstr "git apply [选项] [<补丁>...]"
#: builtin/branch.c:26
msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
msgstr ""
# 译者:保持原换行格式,在输出时 %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:181
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
#: builtin/branch.c:187
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
#: builtin/branch.c:192
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "无法删除您当前所在的分支 '%s'。"
#: builtin/branch.c:203
#, c-format
msgid "remote branch '%s' not found."
msgstr "远程分支 '%s' 未发现。"
#: builtin/branch.c:204
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
#: builtin/branch.c:211
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
#: builtin/branch.c:217
#, 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:226
#, c-format
msgid "Error deleting remote branch '%s'"
msgstr "删除远程分支 '%s' 时出错"
#: builtin/branch.c:227
#, c-format
msgid "Error deleting branch '%s'"
msgstr "删除分支 '%s' 时出错"
#: builtin/branch.c:234
#, c-format
msgid "Deleted remote branch %s (was %s).\n"
msgstr "已删除远程分支 %s(曾为 %s)。\n"
#: builtin/branch.c:235
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s(曾为 %s)。\n"
#: builtin/branch.c:240
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
#: builtin/branch.c:338
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr "分支 '%s' 未指向一个提交"
#: builtin/branch.c:410
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s:落后 %d]"
#: builtin/branch.c:412
#, c-format
msgid "[behind %d]"
msgstr "[落后 %d]"
#: builtin/branch.c:416
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s:领先 %d]"
#: builtin/branch.c:418
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
#: builtin/branch.c:421
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s:领先 %d,落后 %d]"
#: builtin/branch.c:424
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d,落后 %d]"
#: builtin/branch.c:537
msgid "(no branch)"
msgstr "(非分支)"
#: builtin/branch.c:602
msgid "some refs could not be read"
msgstr "一些引用不能读取"
#: builtin/branch.c:615
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
#: builtin/branch.c:625
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名:'%s'"
#: builtin/branch.c:640
msgid "Branch rename failed"
msgstr "分支重命名失败"
#: builtin/branch.c:644
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"
#: builtin/branch.c:648
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s,但 HEAD 没有更新!"
#: builtin/branch.c:655
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名,但更新 config 文件失败"
#: builtin/branch.c:670
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
#: builtin/branch.c:694
#, c-format
msgid "could not write branch description template: %s"
msgstr "不能写分支描述模版:%s"
#: builtin/branch.c:724
#, fuzzy
msgid "Generic options"
msgstr "无效选项:%s"
#: builtin/branch.c:726
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
#: builtin/branch.c:727
msgid "suppress informational messages"
msgstr ""
#: builtin/branch.c:728
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
#: builtin/branch.c:730
msgid "change upstream info"
msgstr ""
#: builtin/branch.c:734
#, fuzzy
msgid "use colored output"
msgstr "不能输出重定向"
#: builtin/branch.c:735
#, fuzzy
msgid "act on remote-tracking branches"
msgstr "%s 没有来自 %s 的远程跟踪分支"
#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396
#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470
#, fuzzy
msgid "commit"
msgstr "(坏提交)\n"
#: builtin/branch.c:739 builtin/branch.c:745
msgid "print only branches that contain the commit"
msgstr ""
#: builtin/branch.c:751
msgid "Specific git-branch actions:"
msgstr ""
#: builtin/branch.c:752
msgid "list both remote-tracking and local branches"
msgstr ""
#: builtin/branch.c:754
msgid "delete fully merged branch"
msgstr ""
#: builtin/branch.c:755
msgid "delete branch (even if not merged)"
msgstr ""
#: builtin/branch.c:756
msgid "move/rename a branch and its reflog"
msgstr ""
#: builtin/branch.c:757
msgid "move/rename a branch, even if target exists"
msgstr ""
#: builtin/branch.c:758
#, fuzzy
msgid "list branch names"
msgstr "无效的分支名:'%s'"
#: builtin/branch.c:759
msgid "create the branch's reflog"
msgstr ""
#: builtin/branch.c:761
msgid "edit the description for the branch"
msgstr ""
#: builtin/branch.c:762
#, fuzzy
msgid "force creation (when already exists)"
msgstr "远程 %s 已经存在。"
#: builtin/branch.c:765
#, fuzzy
msgid "print only not merged branches"
msgstr "无法移除分支 %s"
#: builtin/branch.c:771
msgid "print only merged branches"
msgstr ""
#: builtin/branch.c:775
msgid "list branches in columns"
msgstr ""
#: builtin/branch.c:788
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
#: builtin/branch.c:793 builtin/clone.c:561
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下!"
#: builtin/branch.c:813
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
#: builtin/branch.c:864
#, fuzzy, c-format
msgid "branch '%s' does not exist"
msgstr "版本库 '%s' 不存在"
#: builtin/branch.c:876
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
#: builtin/branch.c:891
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
#: builtin/branch.c:894
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
#: builtin/branch.c:911
#, c-format
msgid ""
"\n"
"If you wanted to make '%s' track '%s', do this:\n"
"\n"
msgstr ""
#: builtin/branch.c:912
#, fuzzy, c-format
msgid " git branch -d %s\n"
msgstr " HEAD分支:%s"
#: builtin/branch.c:913
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr ""
#: 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 ""
#: builtin/cat-file.c:248
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr ""
#: builtin/cat-file.c:266
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
#: builtin/cat-file.c:267
#, fuzzy
msgid "show object type"
msgstr "坏的对象类型。"
#: builtin/cat-file.c:268
#, fuzzy
msgid "show object size"
msgstr "坏对象 %s"
#: 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 ""
#: builtin/cat-file.c:275
msgid "show info and content of objects fed from the standard input"
msgstr ""
#: builtin/cat-file.c:278
#, fuzzy
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 ""
#: builtin/check-attr.c:12
msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"
msgstr ""
#: 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 ""
#: builtin/check-attr.c:21 builtin/hash-object.c:75
#, fuzzy
msgid "read file names from stdin"
msgstr "(正从标准输入中读取日志信息)\n"
#: builtin/check-attr.c:23
#, fuzzy
msgid "input paths are terminated by a null character"
msgstr "路径以 NUL 字符分隔"
#: builtin/checkout-index.c:126
msgid "git checkout-index [options] [--] [<file>...]"
msgstr ""
#: 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
#, fuzzy
msgid "don't checkout new files"
msgstr "不能检出 %s"
#: builtin/checkout-index.c:194
#, fuzzy
msgid "update stat information in the index file"
msgstr "无法写新的索引文件"
#: builtin/checkout-index.c:200
#, fuzzy
msgid "read list of paths from the standard input"
msgstr "(正从标准输入中读取日志信息)\n"
#: 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
#, fuzzy
msgid "git checkout [options] <branch>"
msgstr "git apply [选项] [<补丁>...]"
#: builtin/checkout.c:26
#, fuzzy
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr "git apply [选项] [<补丁>...]"
#: 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
#, fuzzy, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "%s:%s 不能和 %s 同时使用"
#: builtin/checkout.c:248 builtin/checkout.c:251
#, fuzzy, c-format
msgid "'%s' cannot be used with %s"
msgstr "%s:%s 不能和 %s 同时使用"
#: builtin/checkout.c:254
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
#: 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:333 builtin/checkout.c:534 builtin/clone.c:586
#: builtin/merge.c:811
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
#: 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
#, 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:961
#, fuzzy
msgid "paths cannot be used with switching branches"
msgstr "--ours/--theirs 和切换分支不兼容。"
#: builtin/checkout.c:964 builtin/checkout.c:968
#, fuzzy, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "%s:%s 不能和 %s 同时使用"
#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980
#: builtin/checkout.c:983
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s:%s 不能和 %s 同时使用"
#: builtin/checkout.c:988
#, fuzzy, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "无法切换分支到一个非提交。"
#: builtin/checkout.c:1009 builtin/gc.c:177
msgid "suppress progress reporting"
msgstr ""
#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89
#: builtin/remote.c:169 builtin/remote.c:171
#, fuzzy
msgid "branch"
msgstr "位于分支 "
#: builtin/checkout.c:1011
msgid "create and checkout a new branch"
msgstr ""
#: builtin/checkout.c:1013
msgid "create/reset and checkout a branch"
msgstr ""
#: builtin/checkout.c:1014
#, fuzzy
msgid "create reflog for new branch"
msgstr "列出、创建或删除分支"
#: builtin/checkout.c:1015
msgid "detach the HEAD at named commit"
msgstr ""
#: builtin/checkout.c:1016
#, fuzzy
msgid "set upstream info for new branch"
msgstr "尚未给分支 '%s' 设置上游"
#: builtin/checkout.c:1018
#, fuzzy
msgid "new branch"
msgstr "[新分支]"
#: builtin/checkout.c:1018
#, fuzzy
msgid "new unparented branch"
msgstr "没有当前分支。"
#: builtin/checkout.c:1019
msgid "checkout our version for unmerged files"
msgstr ""
#: builtin/checkout.c:1021
msgid "checkout their version for unmerged files"
msgstr ""
#: builtin/checkout.c:1023
msgid "force checkout (throw away local modifications)"
msgstr ""
#: builtin/checkout.c:1024
msgid "perform a 3-way merge with the new branch"
msgstr ""
#: builtin/checkout.c:1025 builtin/merge.c:215
#, fuzzy
msgid "update ignored files (default)"
msgstr "更新文件失败"
#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241
msgid "style"
msgstr ""
#: builtin/checkout.c:1027
msgid "conflict style (merge or diff3)"
msgstr ""
#: builtin/checkout.c:1030
msgid "second guess 'git checkout no-such-branch'"
msgstr ""
#: builtin/checkout.c:1054
#, fuzzy
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-n 和 -k 互斥。"
#: builtin/checkout.c:1071
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
#: builtin/checkout.c:1078
msgid "Missing branch name; try -b"
msgstr "缺少分支名;尝试 -b"
#: builtin/checkout.c:1113
msgid "invalid path specification"
msgstr "无效的路径规格"
#: builtin/checkout.c:1120
#, fuzzy, 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 ""
"git checkout:更新路径和切换分支不兼容。\n"
"您是想要检出 '%s' 但未能将其解析为提交么?"
#: builtin/checkout.c:1125
#, fuzzy, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach 不跟路径参数"
#: builtin/checkout.c:1129
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:19
msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
#: builtin/clean.c:51
msgid "do not print names of files removed"
msgstr ""
#: builtin/clean.c:53
msgid "force"
msgstr ""
#: builtin/clean.c:55
#, fuzzy
msgid "remove whole directories"
msgstr "两个输出目录?"
#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802
#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
msgid "pattern"
msgstr ""
#: builtin/clean.c:57
msgid "add <pattern> to ignore rules"
msgstr ""
#: builtin/clean.c:58
msgid "remove ignored files, too"
msgstr ""
#: builtin/clean.c:60
msgid "remove only ignored files"
msgstr ""
#: 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:36
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr ""
#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
#: builtin/push.c:399
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
#, fuzzy
msgid "create a bare repository"
msgstr "不是一个 git 版本库"
#: 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
#, fuzzy
msgid "setup as shared repository"
msgstr "不是一个 git 版本库"
#: builtin/clone.c:80 builtin/clone.c:82
msgid "initialize submodules in the clone"
msgstr ""
#: builtin/clone.c:83 builtin/init-db.c:485
#, fuzzy
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
#, fuzzy
msgid "name"
msgstr "重命名"
#: builtin/clone.c:88
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
#: builtin/clone.c:90
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
#: builtin/clone.c:92
msgid "path to git-upload-pack on the remote"
msgstr ""
#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747
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 ""
#: builtin/clone.c:97 builtin/init-db.c:494
msgid "gitdir"
msgstr ""
#: builtin/clone.c:98 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr ""
#: builtin/clone.c:99
msgid "key=value"
msgstr ""
#: builtin/clone.c:100
#, fuzzy
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:642
msgid "Too many arguments."
msgstr "太多参数。"
#: builtin/clone.c:646
msgid "You must specify a repository to clone."
msgstr "您必须指定一个版本库来克隆。"
#: builtin/clone.c:657
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
#: builtin/clone.c:671
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本库 '%s' 不存在"
#: builtin/clone.c:676
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
#: builtin/clone.c:686
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
#: builtin/clone.c:696
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
#: builtin/clone.c:709 builtin/clone.c:723
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
#: builtin/clone.c:712
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "不能为 '%s' 创建工作区目录。"
#: builtin/clone.c:731
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到裸版本库 '%s'...\n"
#: builtin/clone.c:733
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
#: builtin/clone.c:789
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
#: builtin/clone.c:838
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
#: builtin/clone.c:845
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空版本库。"
#: builtin/column.c:9
msgid "git column [options]"
msgstr ""
#: builtin/column.c:26
msgid "lookup config vars"
msgstr ""
#: builtin/column.c:27 builtin/column.c:28
#, fuzzy
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:33
#, fuzzy
msgid "git commit [options] [--] <filepattern>..."
msgstr "git apply [选项] [<补丁>...]"
#: builtin/commit.c:38
#, fuzzy
msgid "git status [options] [--] <filepattern>..."
msgstr "git apply [选项] [<补丁>...]"
#: builtin/commit.c:43
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:55
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:60
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:256
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
#: builtin/commit.c:298
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
#: builtin/commit.c:304
msgid "interactive add failed"
msgstr "交互式添加失败"
#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
#: builtin/commit.c:389
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
#: builtin/commit.c:391
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
#: builtin/commit.c:401
msgid "cannot read the index"
msgstr "无法读取索引"
#: builtin/commit.c:421
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
#: builtin/commit.c:510 builtin/commit.c:516
#, c-format
msgid "invalid commit: %s"
msgstr "无效的提交:%s"
#: builtin/commit.c:539
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
#: builtin/commit.c:600
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "非法的身份字符串:'%s'"
#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
#: builtin/commit.c:650 builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正从标准输入中读取日志信息)\n"
#: builtin/commit.c:652
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
#: builtin/commit.c:656
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
#: builtin/commit.c:662
msgid "commit has empty message"
msgstr "提交说明为空"
#: builtin/commit.c:678
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
#: builtin/commit.c:682
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
#: builtin/commit.c:686
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
#: builtin/commit.c:738
msgid "could not write commit template"
msgstr "不能写提交模版"
#: builtin/commit.c:749
#, 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:754
#, 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:766
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
"请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
"说明将会终止提交。\n"
#: builtin/commit.c:771
msgid ""
"Please enter the commit message for your changes. 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"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: builtin/commit.c:784
#, c-format
msgid "%sAuthor: %s"
msgstr "%s作者: %s"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: builtin/commit.c:791
#, c-format
msgid "%sCommitter: %s"
msgstr "%s提交者: %s"
#: builtin/commit.c:811
msgid "Cannot read index"
msgstr "无法读取索引"
#: builtin/commit.c:848
msgid "Error building trees"
msgstr "无法创建树对象"
#: builtin/commit.c:863 builtin/tag.c:361
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
#: builtin/commit.c:960
#, c-format
msgid "No existing author found with '%s'"
msgstr "没有找到匹配 '%s' 的作者"
#: builtin/commit.c:975 builtin/commit.c:1175
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
#: builtin/commit.c:1015
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
#: builtin/commit.c:1026
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
#: builtin/commit.c:1029
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
#: builtin/commit.c:1031
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
#: builtin/commit.c:1034
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
#: builtin/commit.c:1044
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
#: builtin/commit.c:1046
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
#: builtin/commit.c:1054
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
#: builtin/commit.c:1071
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
#: builtin/commit.c:1073
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
#: builtin/commit.c:1075
msgid "Clever... amending the last one with dirty index."
msgstr "聪明... 在索引不干净下修补最后的提交。"
#: builtin/commit.c:1077
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
#: builtin/commit.c:1087 builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
#: builtin/commit.c:1092
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
#: builtin/commit.c:1189 builtin/commit.c:1417
msgid "show status concisely"
msgstr ""
#: builtin/commit.c:1191 builtin/commit.c:1419
msgid "show branch information"
msgstr ""
#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389
msgid "machine-readable output"
msgstr ""
#: builtin/commit.c:1196 builtin/commit.c:1423
msgid "terminate entries with NUL"
msgstr ""
#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636
#: builtin/fast-export.c:639 builtin/tag.c:461
msgid "mode"
msgstr ""
#: builtin/commit.c:1199 builtin/commit.c:1426
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
#: builtin/commit.c:1202
msgid "show ignored files"
msgstr ""
#: builtin/commit.c:1203 parse-options.h:151
msgid "when"
msgstr "何时"
#: builtin/commit.c:1204
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
#: builtin/commit.c:1206
#, fuzzy
msgid "list untracked files in columns"
msgstr "无效的未追踪文件参数 '%s'"
#: builtin/commit.c:1275
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
#: builtin/commit.c:1277
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
#: builtin/commit.c:1318
msgid "detached HEAD"
msgstr "分离头指针"
# 译者:中文字符串拼接,可删除前导空格
#: builtin/commit.c:1320
msgid " (root-commit)"
msgstr "(根提交)"
#: builtin/commit.c:1387