Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Fetching contributors…

Cannot retrieve contributors at this time

11366 lines (8983 sloc) 318.022 kb
# Chinese translations for Git package
# Git 软件包的简体中文翻译.
# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributers:
# - Jiang Xin <worldhello.net AT gmail.com>
# - Riku <lu.riku AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
# - Lian Cheng <rhythm.mail AT gmail.com>
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2015-01-21 14:21+0800\n"
"PO-Revision-Date: 2015-01-21 14:58+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:55
#, c-format
msgid "hint: %.*s\n"
msgstr "提示:%.*s\n"
#: advice.c:88
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
#: archive.c:11
msgid "git archive [options] <tree-ish> [<path>...]"
msgstr "git archive [选项] <树或提交> [<路径>...]"
#: archive.c:12
msgid "git archive --list"
msgstr "git archive --list"
#: archive.c:13
msgid ""
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
#: archive.c:14
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <版本库> [--exec <命令>] --list"
#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规则 '%s' 未匹配任何文件"
#: archive.c:427
msgid "fmt"
msgstr "格式"
#: archive.c:427
msgid "archive format"
msgstr "归档格式"
#: archive.c:428 builtin/log.c:1204
msgid "prefix"
msgstr "前缀"
#: archive.c:429
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517
#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394
#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
msgid "file"
msgstr "文件"
#: archive.c:431 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
#: archive.c:433
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
#: archive.c:434
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
#: archive.c:435
msgid "store only"
msgstr "只存储"
#: archive.c:436
msgid "compress faster"
msgstr "压缩速度更快"
#: archive.c:444
msgid "compress better"
msgstr "压缩效果更好"
#: archive.c:447
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86
msgid "repo"
msgstr "版本库"
#: archive.c:450 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程版本库(<版本库>)提取归档文件"
#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
msgid "command"
msgstr "命令"
#: archive.c:452 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
#: attr.c:258
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时,使用 '\\!'。"
#: branch.c:60
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "未设置分支 %s 作为它自己的上游。"
#: branch.c:83
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
#: branch.c:88
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "分支 %s 设置为跟踪本地分支 %s。"
#: branch.c:94
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "分支 %s 设置为跟踪远程引用 %s。"
#: branch.c:99
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "分支 %s 设置为跟踪本地引用 %s。"
#: branch.c:133
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪:引用 %s 有歧义"
#: branch.c:162
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"
#: branch.c:167
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
#: branch.c:175
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
#: branch.c:195
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
#: branch.c:197
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
#: branch.c:199
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"branch that already exists at the remote, you may need to\n"
"run \"git fetch\" to retrieve it.\n"
"\n"
"If you are planning to push out a new local branch that\n"
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
"您可能需要执行 \"git fetch\" 来获取分支。\n"
"\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
#: branch.c:243
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名:'%s'。"
#: branch.c:263
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名:'%s'。"
#: branch.c:268
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点:'%s'。"
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' 不像是一个 v2 版本的包文件"
#: bundle.c:61
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
#: bundle.c:87 builtin/commit.c:770
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
msgstr "版本库缺少这些必备的提交:"
#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706
#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330
#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
#: bundle.c:185
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用:"
msgstr[1] "这个包中含有 %d 个引用:"
#: bundle.c:192
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
#: bundle.c:194
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用:"
msgstr[1] "这个包需要 %d 个引用:"
#: bundle.c:251
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
#: bundle.c:269
msgid "pack-objects died"
msgstr "pack-objects 终止"
#: bundle.c:309
msgid "rev-list died"
msgstr "rev-list 终止"
#: bundle.c:358
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数:%s"
#: bundle.c:444
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
#: bundle.c:454
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
#: bundle.c:475
msgid "index-pack died"
msgstr "index-pack 终止"
#: color.c:260
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
#: commit.c:40
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
#: commit.c:42
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "内存耗尽"
#: config.c:469 config.c:471
#, c-format
msgid "bad config file line %d in %s"
msgstr "配置文件 %2$s 出错于第 %1$d 行"
#: config.c:587
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
#: config.c:589
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
#: config.c:674
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
#: config.c:752 config.c:763
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
#: config.c:885
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式:%s"
#: config.c:1211
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
#: config.c:1272
msgid "unknown error occured while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
#: config.c:1596
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
#: config.c:1598
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
#: config.c:1657
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
#: connected.c:89
#, c-format
msgid "failed write to rev-list: %s"
msgstr "无法写入 rev-list:%s"
#: connected.c:97
#, c-format
msgid "failed to close rev-list's stdin: %s"
msgstr "无法关闭 rev-list 的标准输入:%s"
#: date.c:95
msgid "in the future"
msgstr "在将来"
#: date.c:101
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "%lu 秒钟前"
msgstr[1] "%lu 秒钟前"
#: date.c:108
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "%lu 分钟前"
msgstr[1] "%lu 分钟前"
#: date.c:115
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "%lu 小时前"
msgstr[1] "%lu 小时前"
#: date.c:122
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "%lu 天前"
msgstr[1] "%lu 天前"
#: date.c:128
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "%lu 周前"
msgstr[1] "%lu 周前"
#: date.c:135
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "%lu 个月前"
msgstr[1] "%lu 个月前"
#: date.c:146
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
msgstr[0] "%lu 年"
msgstr[1] "%lu 年"
#. TRANSLATORS: "%s" is "<n> years"
#: date.c:149
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "%s %lu 个月前"
msgstr[1] "%s %lu 个月前"
#: date.c:154 date.c:159
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
msgstr[0] "%lu 年前"
msgstr[1] "%lu 年前"
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "无法读取排序文件 '%s'"
#: diffcore-rename.c:516
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名检测"
# 译者:注意保持前导空格
#: diff.c:114
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
# 译者:注意保持前导空格
#: diff.c:119
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
#: diff.c:214
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
#: diff.c:266
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
"发现配置变量 'diff.dirstat' 中的错误:\n"
"%s"
#: diff.c:2957
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出,停止在 %s"
#: diff.c:3352
msgid "--follow requires exactly one pathspec"
msgstr "--follow 参数后只跟一个 pathspec"
#: diff.c:3515
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
"无法解析 --dirstat/-X 选项的参数:\n"
"%s"
#: diff.c:3529
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数:'%s'"
#: gpg-interface.c:129 gpg-interface.c:200
msgid "could not run gpg."
msgstr "不能执行 gpg。"
#: gpg-interface.c:141
msgid "gpg did not accept the data"
msgstr "gpg 没有接受数据"
#: gpg-interface.c:152
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
#: gpg-interface.c:185
#, c-format
msgid "could not create temporary file '%s': %s"
msgstr "不能创建临时文件 '%s':%s"
#: gpg-interface.c:188
#, c-format
msgid "failed writing detached signature to '%s': %s"
msgstr "无法将分离式签名写入 '%s':%s"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':无法读取 %s"
#: grep.c:1735
#, c-format
msgid "'%s': %s"
msgstr "'%s':%s"
#: grep.c:1746
#, c-format
msgid "'%s': short read %s"
msgstr "'%s':读取不完整 %s"
#: help.c:207
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"
#: help.c:214
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
#: help.c:230
msgid "The most commonly used git commands are:"
msgstr "最常用的 git 命令有:"
#: help.c:289
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
"'%s' 像是一个 git 命令,但却无法运行。\n"
"可能是 git-%s 受损?"
#: help.c:346
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀,您的系统中未发现 Git 命令。"
#: help.c:368
#, 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:373
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "在 %0.1f 秒钟后自动运行..."
#: help.c:380
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
#: help.c:384 help.c:444
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
"\n"
"您指的是这个么?"
msgstr[1] ""
"\n"
"您指的是这其中的某一个么?"
#: help.c:440
#, c-format
msgid "%s: %s - %s"
msgstr "%s:%s - %s"
#: lockfile.c:283
msgid "BUG: reopen a lockfile that is still open"
msgstr "BUG: 重新打开一个仍打开着的锁文件"
#: lockfile.c:285
msgid "BUG: reopen a lockfile that has been committed"
msgstr "BUG: 重新打开一个已提交的锁文件"
#: merge.c:41
msgid "failed to read the cache"
msgstr "无法读取缓存"
#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
#: builtin/clone.c:662
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
#: merge-recursive.c:189
#, c-format
msgid "(bad commit)\n"
msgstr "(坏提交)\n"
#: merge-recursive.c:209
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "为路径 '%s' addinfo_cache 失败"
#: merge-recursive.c:270
msgid "error building trees"
msgstr "无法创建树"
#: merge-recursive.c:688
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
#: merge-recursive.c:699
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
#: merge-recursive.c:713 merge-recursive.c:734
msgid ": perhaps a D/F conflict?"
msgstr ":可能是一个目录/文件冲突?"
#: merge-recursive.c:724
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
#: merge-recursive.c:764
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
#: merge-recursive.c:766
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据(blob)对象"
#: merge-recursive.c:789 builtin/clone.c:321
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
#: merge-recursive.c:797
#, c-format
msgid "failed to symlink '%s'"
msgstr "无法创建符号链接 '%s'"
#: merge-recursive.c:800
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
#: merge-recursive.c:938
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
#: merge-recursive.c:942
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
#: merge-recursive.c:958
msgid "unsupported object type in the tree"
msgstr "在树中有不支持的对象类型"
#: merge-recursive.c:1033 merge-recursive.c:1047
#, 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:1039 merge-recursive.c:1052
#, 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:1093
msgid "rename"
msgstr "重命名"
#: merge-recursive.c:1093
msgid "renamed"
msgstr "重命名"
#: merge-recursive.c:1149
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
#: merge-recursive.c:1171
#, 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:1176
msgid " (left unresolved)"
msgstr "(留下未解决)"
#: merge-recursive.c:1230
#, 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:1260
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
#: merge-recursive.c:1459
#, 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:1469
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
#: merge-recursive.c:1474 merge-recursive.c:1672
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
#: merge-recursive.c:1525
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
#: merge-recursive.c:1528
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据(blob)对象"
#: merge-recursive.c:1576
msgid "modify"
msgstr "修改"
#: merge-recursive.c:1576
msgid "modified"
msgstr "修改"
#: merge-recursive.c:1586
msgid "content"
msgstr "内容"
#: merge-recursive.c:1593
msgid "add/add"
msgstr "添加/添加"
#: merge-recursive.c:1627
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s(已经做过相同合并)"
#: merge-recursive.c:1641
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
#: merge-recursive.c:1645 git-submodule.sh:1150
msgid "submodule"
msgstr "子模组"
#: merge-recursive.c:1646
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突(%s):合并冲突于 %s"
#: merge-recursive.c:1732
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
#: merge-recursive.c:1757
msgid "file/directory"
msgstr "文件/目录"
#: merge-recursive.c:1763
msgid "directory/file"
msgstr "目录/文件"
#: merge-recursive.c:1768
#, 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:1778
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
#: merge-recursive.c:1795
msgid "Fatal merge failure, shouldn't happen."
msgstr "严重的合并错误,不应发生。"
#: merge-recursive.c:1814
msgid "Already up-to-date!"
msgstr "已经是最新的!"
#: merge-recursive.c:1823
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
#: merge-recursive.c:1853
#, c-format
msgid "Unprocessed path??? %s"
msgstr "未处理的路径??? %s"
#: merge-recursive.c:1898
msgid "Merging:"
msgstr "合并:"
#: merge-recursive.c:1911
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先:"
msgstr[1] "发现 %u 个共同祖先:"
#: merge-recursive.c:1948
msgid "merge returned no commit"
msgstr "合并未返回提交"
#: merge-recursive.c:2005
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
#: merge-recursive.c:2016 builtin/merge.c:667
msgid "Unable to write index."
msgstr "不能写入索引。"
#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "不能提交未初始化/未引用的注解树"
#: notes-utils.c:82
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "坏的 notes.rewriteMode 值:'%s'"
#: notes-utils.c:92
#, 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
#: notes-utils.c:119
#, c-format
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值:'%s'"
#: object.c:241
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象:%s"
#: parse-options.c:546
msgid "..."
msgstr "..."
#: parse-options.c:564
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
#: parse-options.c:568
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: parse-options.c:571
#, c-format
msgid " %s"
msgstr " %s"
#: parse-options.c:605
msgid "-NUM"
msgstr "-数字"
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
#: pathspec.c:143
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
#: pathspec.c:177
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规则包含无效的神奇前缀"
#: pathspec.c:183
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
#: pathspec.c:187
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
#: pathspec.c:205
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
#: pathspec.c:230
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s:'literal' 和 'glob' 不兼容"
#: pathspec.c:241
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s:'%s' 在版本库之外"
#: pathspec.c:291
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
#: pathspec.c:353
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
#: pathspec.c:432
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规则 '%s' 位于符号链接中"
#: pathspec.c:441
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
"添加 ':/' 或 '.' ?"
#: pretty.c:968
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
#: progress.c:225
msgid "done"
msgstr "完成"
#: read-cache.c:1267
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"设置了 index.version,但是取值无效。\n"
"使用版本 %i"
#: read-cache.c:1277
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
"使用版本 %i"
#: remote.c:782
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
#: remote.c:786
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s,而非 %s"
#: remote.c:790
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
#: remote.c:798
msgid "Internal error"
msgstr "内部错误"
#: remote.c:1980
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
#: remote.c:1984
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
#: remote.c:1987
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
#: remote.c:1991
#, 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:1997
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
#: remote.c:2000
#, 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:2008
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
#: remote.c:2011
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commit each, respectively.\n"
msgid_plural ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"您的分支和 '%s' 出现了偏离,\n"
"并且分别有 %d 和 %d 处不同的提交。\n"
msgstr[1] ""
"您的分支和 '%s' 出现了偏离,\n"
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者:注意保持前导空格
#: remote.c:2021
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" 来合并远程分支)\n"
#: run-command.c:87
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
#: run-command.c:89
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "不能调用 dup2(%d,%d)"
#: send-pack.c:268
msgid "failed to sign the push certificate"
msgstr "无法为推送证书签名"
#: send-pack.c:325
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
#: builtin/merge.c:1005
#, c-format
msgid "Could not open '%s' for writing"
msgstr "不能为写入打开 '%s'"
#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
#: builtin/merge.c:1010
#, c-format
msgid "Could not write to '%s'"
msgstr "不能写入 '%s'"
#: sequencer.c:195
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
#: sequencer.c:198
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记,然后用 'git commit' 提交"
#: sequencer.c:211 sequencer.c:856 sequencer.c:939
#, c-format
msgid "Could not write to %s"
msgstr "不能写入 %s"
#: sequencer.c:214
#, c-format
msgid "Error wrapping up %s"
msgstr "错误收尾 %s"
#: sequencer.c:229
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "您的本地修改将被拣选操作覆盖。"
#: sequencer.c:231
msgid "Your local changes would be overwritten by revert."
msgstr "您的本地修改将被还原操作覆盖。"
#: sequencer.c:234
msgid "Commit your changes or stash them to proceed."
msgstr "提交您的修改或保存进度后再继续。"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
#: sequencer.c:321
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s:无法写入新索引文件"
#: sequencer.c:339
msgid "Could not resolve HEAD commit\n"
msgstr "不能解析 HEAD 提交\n"
#: sequencer.c:359
msgid "Unable to update cache tree\n"
msgstr "不能更新缓存\n"
#: sequencer.c:406
#, c-format
msgid "Could not parse commit %s\n"
msgstr "不能解析提交 %s\n"
#: sequencer.c:411
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "不能解析父提交 %s\n"
#: sequencer.c:477
msgid "Your index file is unmerged."
msgstr "您的索引文件未完成合并。"
#: sequencer.c:496
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
#: sequencer.c:504
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "提交 %s 没有父提交 %d"
#: sequencer.c:508
#, 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:521
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:不能解析父提交 %s"
#: sequencer.c:525
#, c-format
msgid "Cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#: sequencer.c:611
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
#: sequencer.c:612
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
#: sequencer.c:648
msgid "empty commit set passed"
msgstr "提供了空的提交集"
#: sequencer.c:656
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s:无法读取索引"
#: sequencer.c:660
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s:无法刷新索引"
#: sequencer.c:720
#, c-format
msgid "Cannot %s during a %s"
msgstr "无法 %s 在一个 %s 过程中"
#: sequencer.c:742
#, c-format
msgid "Could not parse line %d."
msgstr "不能解析第 %d 行。"
#: sequencer.c:747
msgid "No commits parsed."
msgstr "没有提交被解析。"
#: sequencer.c:760
#, c-format
msgid "Could not open %s"
msgstr "不能打开 %s"
#: sequencer.c:764
#, c-format
msgid "Could not read %s."
msgstr "不能读取 %s。"
#: sequencer.c:771
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "无用的指令表单:%s"
#: sequencer.c:801
#, c-format
msgid "Invalid key: %s"
msgstr "无效键名:%s"
#: sequencer.c:804
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%s 的值无效:%s"
#: sequencer.c:816
#, c-format
msgid "Malformed options sheet: %s"
msgstr "非法的选项表单:%s"
#: sequencer.c:837
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
#: sequencer.c:838
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
#: sequencer.c:842
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "不能创建序列目录 %s"
#: sequencer.c:858 sequencer.c:943
#, c-format
msgid "Error wrapping up %s."
msgstr "错误收尾 %s。"
#: sequencer.c:877 sequencer.c:1013
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
#: sequencer.c:879
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
#: sequencer.c:881
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
#: sequencer.c:903 builtin/apply.c:4128
#, c-format
msgid "cannot open %s: %s"
msgstr "不能打开 %s:%s"
#: sequencer.c:906
#, c-format
msgid "cannot read %s: %s"
msgstr "不能读取 %s:%s"
#: sequencer.c:907
msgid "unexpected end of file"
msgstr "意外的文件结束"
#: sequencer.c:913
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
#: sequencer.c:936
#, c-format
msgid "Could not format %s."
msgstr "不能格式化 %s。"
#: sequencer.c:1081
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s:不能拣选一个%s"
#: sequencer.c:1084
#, c-format
msgid "%s: bad revision"
msgstr "%s:错误的版本"
#: sequencer.c:1118
msgid "Can't revert as initial commit"
msgstr "不能作为初始提交还原"
#: sequencer.c:1119
msgid "Can't cherry-pick into empty head"
msgstr "不能拣选到空分支"
#: sha1_name.c:440
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
" git checkout -b $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
"\n"
" git checkout -b $br $(git rev-parse ...)\n"
"\n"
"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
"命令关闭本消息通知。"
#: sha1_name.c:1068
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
#: sha1_name.c:1071
#, c-format
msgid "No such branch: '%s'"
msgstr "没有此分支:'%s'"
#: sha1_name.c:1073
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
#: sha1_name.c:1077
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s 的 .gitmodules 条目"
#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
#: submodule.c:1111 builtin/init-db.c:371
#, c-format
msgid "Could not create git link %s"
msgstr "不能创建 git link %s"
#: submodule.c:1122
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "不能在 %s 中设置 core.worktree"
#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
#: trailer.c:570
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'"
#: trailer.c:552 trailer.c:557 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
#: trailer.c:590
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "签名 '%.*s' 的键为空"
#: trailer.c:710
#, c-format
msgid "could not read input file '%s'"
msgstr "不能读取输入文件 '%s'"
#: trailer.c:713
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
#: unpack-trees.c:202
msgid "Checking out files"
msgstr "正在检出文件"
#: urlmatch.c:120
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, c-format
msgid "invalid %XX escape sequence"
msgstr "无效的 %XX 转义序列"
#: urlmatch.c:172
msgid "missing host and scheme is not 'file:'"
msgstr "缺失主机名且URL方案不是 'file:'"
#: urlmatch.c:189
msgid "a 'file:' URL may not have a port number"
msgstr "一个 'file:' URL 不应该包含端口号"
#: urlmatch.c:199
msgid "invalid characters in host name"
msgstr "主机名中包含无效的字符"
#: urlmatch.c:244 urlmatch.c:255
msgid "invalid port number"
msgstr "无效的端口号"
#: urlmatch.c:322
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
#: wrapper.c:509
#, c-format
msgid "unable to access '%s': %s"
msgstr "不能访问 '%s':%s"
#: wrapper.c:530
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
#: wrapper.c:541
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "无法在口令文件中查询到当前用户:%s"
#: wrapper.c:542
msgid "no such user"
msgstr "无此用户"
#: wrapper.c:550
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "未合并的路径:"
# 译者:注意保持前导空格
#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
# 译者:注意保持前导空格
#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
# 译者:注意保持前导空格
#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
# 译者:注意保持前导空格
#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
# 译者:注意保持前导空格
#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
#: wt-status.c:198
msgid "Changes to be committed:"
msgstr "要提交的变更:"
#: wt-status.c:216
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更:"
# 译者:注意保持前导空格
#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
# 译者:注意保持前导空格
#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
# 译者:注意保持前导空格
#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
# 译者:注意保持前导空格
#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
# 译者:注意保持前导空格
#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
#: wt-status.c:252
msgid "both deleted:"
msgstr "双方删除:"
#: wt-status.c:254
msgid "added by us:"
msgstr "由我们添加:"
#: wt-status.c:256
msgid "deleted by them:"
msgstr "由他们删除:"
#: wt-status.c:258
msgid "added by them:"
msgstr "由他们添加:"
#: wt-status.c:260
msgid "deleted by us:"
msgstr "由我们删除:"
#: wt-status.c:262
msgid "both added:"
msgstr "双方添加:"
#: wt-status.c:264
msgid "both modified:"
msgstr "双方修改:"
#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "bug:无法处理的未合并状态 %x"
#: wt-status.c:274
msgid "new file:"
msgstr "新文件:"
#: wt-status.c:276
msgid "copied:"
msgstr "拷贝:"
#: wt-status.c:278
msgid "deleted:"
msgstr "删除:"
#: wt-status.c:280
msgid "modified:"
msgstr "修改:"
#: wt-status.c:282
msgid "renamed:"
msgstr "重命名:"
#: wt-status.c:284
msgid "typechange:"
msgstr "类型变更:"
#: wt-status.c:286
msgid "unknown:"
msgstr "未知:"
#: wt-status.c:288
msgid "unmerged:"
msgstr "未合并:"
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
#: wt-status.c:370
msgid "new commits, "
msgstr "新提交, "
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
#: wt-status.c:372
msgid "modified content, "
msgstr "修改的内容, "
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
#: wt-status.c:374
msgid "untracked content, "
msgstr "未跟踪的内容, "
#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "bug:无法处理的差异状态 %c"
#: wt-status.c:758
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新:"
#: wt-status.c:760
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更:"
#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
"不要改动上面的一行。\n"
"下面的所有内容均将被删除。"
#: wt-status.c:930
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者:注意保持前导空格
#: wt-status.c:933
msgid " (fix conflicts and run \"git commit\")"
msgstr " (解决冲突并运行 \"git commit\")"
#: wt-status.c:936
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者:注意保持前导空格
#: wt-status.c:939
msgid " (use \"git commit\" to conclude merge)"
msgstr " (使用 \"git commit\" 结束合并)"
#: wt-status.c:949
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
#: wt-status.c:952
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者:注意保持前导空格
#: wt-status.c:956
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (解决冲突,然后运行 \"git am --continue\")"
# 译者:注意保持前导空格
#: wt-status.c:958
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (使用 \"git am --skip\" 跳过此补丁)"
# 译者:注意保持前导空格
#: wt-status.c:960
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (使用 \"git am --abort\" 恢复原有分支)"
#: wt-status.c:1020 wt-status.c:1037
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
#: wt-status.c:1025 wt-status.c:1042
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者:注意保持前导空格
#: wt-status.c:1028
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
# 译者:注意保持前导空格
#: wt-status.c:1030
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
# 译者:注意保持前导空格
#: wt-status.c:1032
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
# 译者:注意保持前导空格
#: wt-status.c:1045
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
#: wt-status.c:1049
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
#: wt-status.c:1054
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者:注意保持前导空格
#: wt-status.c:1057
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
#: wt-status.c:1061
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
#: wt-status.c:1066
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者:注意保持前导空格
#: wt-status.c:1069
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (使用 \"git commit --amend\" 修补当前提交)"
# 译者:注意保持前导空格
#: wt-status.c:1071
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
#: wt-status.c:1081
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者:注意保持前导空格
#: wt-status.c:1086
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
# 译者:注意保持前导空格
#: wt-status.c:1089
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
# 译者:注意保持前导空格
#: wt-status.c:1091
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
#: wt-status.c:1100
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者:注意保持前导空格
#: wt-status.c:1105
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (解决冲突并运行 \"git revert --continue\")"
# 译者:注意保持前导空格
#: wt-status.c:1108
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
# 译者:注意保持前导空格
#: wt-status.c:1110
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
#: wt-status.c:1121
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
#: wt-status.c:1125
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者:注意保持前导空格
#: wt-status.c:1128
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
#: wt-status.c:1303
msgid "On branch "
msgstr "位于分支 "
#: wt-status.c:1310
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中;至 "
#: wt-status.c:1317
msgid "HEAD detached at "
msgstr "头指针分离于 "
#: wt-status.c:1319
msgid "HEAD detached from "
msgstr "头指针分离自 "
#: wt-status.c:1322
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
#: wt-status.c:1339
msgid "Initial commit"
msgstr "初始提交"
#: wt-status.c:1353
msgid "Untracked files"
msgstr "未跟踪的文件"
#: wt-status.c:1355
msgid "Ignored files"
msgstr "忽略的文件"
#: wt-status.c:1359
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"may speed it up, but you have to be careful not to forget to add\n"
"new files yourself (see 'git help status')."
msgstr ""
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
"但您需要小心不要忘了添加新文件(参见 'git help status')。"
#: wt-status.c:1365
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1367
msgid " (use -u option to show untracked files)"
msgstr "(使用 -u 参数显示未跟踪的文件)"
#: wt-status.c:1373
msgid "No changes"
msgstr "没有修改"
#: wt-status.c:1378
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
#: wt-status.c:1381
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
#: wt-status.c:1384
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
#: wt-status.c:1387
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空,但是存在尚未跟踪的文件\n"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1390
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
#: wt-status.c:1393 wt-status.c:1398
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1396
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1400
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "无文件要提交,干净的工作区\n"
#: wt-status.c:1509
msgid "HEAD (no branch)"
msgstr "HEAD(非分支)"
# 译者:注意保持句尾空格
#: wt-status.c:1515
msgid "Initial commit on "
msgstr "初始提交于 "
#: wt-status.c:1547
msgid "gone"
msgstr "丢失"
# 译者:注意保持句尾空格
#: wt-status.c:1549 wt-status.c:1557
msgid "behind "
msgstr "落后 "
#: compat/precompose_utf8.c:55 builtin/clone.c:360
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
#: builtin/add.c:22
msgid "git add [options] [--] <pathspec>..."
msgstr "git add [选项] [--] <路径规则>..."
#: builtin/add.c:65
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
#: builtin/add.c:70 builtin/commit.c:275
msgid "updating files failed"
msgstr "更新文件失败"
#: builtin/add.c:80
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
#: builtin/add.c:134
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更:"
#: builtin/add.c:194 builtin/rev-parse.c:785
msgid "Could not read the index"
msgstr "不能读取索引"
#: builtin/add.c:205
#, c-format
msgid "Could not open '%s' for writing."
msgstr "不能打开 '%s' 以写入。"
#: builtin/add.c:209
msgid "Could not write patch"
msgstr "不能生成补丁"
#: builtin/add.c:214
#, c-format
msgid "Could not stat '%s'"
msgstr "不能查看文件状态 '%s'"
#: builtin/add.c:216
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
#: builtin/add.c:221
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
#: builtin/add.c:231
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372
#: builtin/rm.c:269
msgid "dry run"
msgstr "演习"
#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608
#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "冗长输出"
#: builtin/add.c:251
msgid "interactive picking"
msgstr "交互式拣选"
#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
#: builtin/add.c:253
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
#: builtin/add.c:254
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
#: builtin/add.c:255
msgid "update tracked files"
msgstr "更新已跟踪的文件"
#: builtin/add.c:256
msgid "record only the fact that the path will be added later"
msgstr "只记录,该路径稍后再添加"
#: builtin/add.c:257
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
#: builtin/add.c:260
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
#: builtin/add.c:262
msgid "don't add, only refresh the index"
msgstr "不添加,只刷新索引"
#: builtin/add.c:263
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
#: builtin/add.c:264
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
#: builtin/add.c:286
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
#: builtin/add.c:293
msgid "adding files failed"
msgstr "添加文件失败"
#: builtin/add.c:329
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
#: builtin/add.c:336
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
#: builtin/add.c:357
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件,也没有文件被添加。\n"
#: builtin/add.c:358
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'?\n"
#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
msgid "index file corrupt"
msgstr "索引文件损坏"
#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
#: builtin/apply.c:58
msgid "git apply [options] [<patch>...]"
msgstr "git apply [选项] [<补丁>...]"
#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
#: builtin/apply.c:826
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
#: builtin/apply.c:835
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d,输入为:%s"
#: builtin/apply.c:916
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
#: builtin/apply.c:948
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
#: builtin/apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
#: builtin/apply.c:960
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
#: builtin/apply.c:1423
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount:意外的行:%.*s"
#: builtin/apply.c:1480
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息:%.*s"
#: builtin/apply.c:1497
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"component (line %d)"
msgid_plural ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
#: builtin/apply.c:1657
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
#: builtin/apply.c:1659
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
#: builtin/apply.c:1685
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
#: builtin/apply.c:1721
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
#: builtin/apply.c:1723
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
#: builtin/apply.c:1726
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:文件 %s 成为空文件但并未删除"
#: builtin/apply.c:1872
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏:%.*s"
#: builtin/apply.c:1901
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
#: builtin/apply.c:2052
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
#: builtin/apply.c:2142
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
#: builtin/apply.c:2146
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
#: builtin/apply.c:2754
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符:'%c'"
#: builtin/apply.c:2872
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
#: builtin/apply.c:2884
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
#: builtin/apply.c:2890
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
"当查询:\n"
"%.*s"
#: builtin/apply.c:2909
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
#: builtin/apply.c:3010
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
#: builtin/apply.c:3016
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
#: builtin/apply.c:3037
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败:%s:%ld"
#: builtin/apply.c:3161
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
#, c-format
msgid "read of %s failed"
msgstr "读取 %s 失败"
#: builtin/apply.c:3240 builtin/apply.c:3462
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
#: builtin/apply.c:3321 builtin/apply.c:3476
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:不存在于索引中"
#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
#, c-format
msgid "%s: %s"
msgstr "%s:%s"
#: builtin/apply.c:3330 builtin/apply.c:3484
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引不匹配"
#: builtin/apply.c:3432
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
#: builtin/apply.c:3501
#, c-format
msgid "%s: wrong type"
msgstr "%s:错误类型"
#: builtin/apply.c:3503
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o,应为 %o"
#: builtin/apply.c:3604
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已经存在于索引中"
#: builtin/apply.c:3607
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已经存在于工作区中"
#: builtin/apply.c:3627
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
#: builtin/apply.c:3632
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
#: builtin/apply.c:3640
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:补丁未应用"
#: builtin/apply.c:3653
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
#: builtin/apply.c:3889
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
#: builtin/apply.c:3918
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
#: builtin/apply.c:3922
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能枚举新建文件 '%s' 的状态"
#: builtin/apply.c:3927
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
#: builtin/apply.c:3930 builtin/apply.c:4038
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
#: builtin/apply.c:3963
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
#: builtin/apply.c:4012
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
#: builtin/apply.c:4099
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
#: builtin/apply.c:4107
msgid "internal error"
msgstr "内部错误"
#: builtin/apply.c:4110
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
#: builtin/apply.c:4120
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
#: builtin/apply.c:4141
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
#: builtin/apply.c:4144
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
#: builtin/apply.c:4234
msgid "unrecognized input"
msgstr "未能识别的输入"
#: builtin/apply.c:4245
msgid "unable to read index file"
msgstr "无法读取索引文件"
#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92
#: builtin/fetch.c:93
msgid "path"
msgstr "路径"
#: builtin/apply.c:4363
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
#: builtin/apply.c:4366
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
#: builtin/apply.c:4368
msgid "num"
msgstr "数字"
#: builtin/apply.c:4369
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
#: builtin/apply.c:4372
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
#: builtin/apply.c:4374
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
#: builtin/apply.c:4378
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
#: builtin/apply.c:4380
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁,而是显示输入的概要"
#: builtin/apply.c:4382
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁,而是查看补丁是否可应用"
#: builtin/apply.c:4384
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
#: builtin/apply.c:4386
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
#: builtin/apply.c:4388
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
#: builtin/apply.c:4390
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三路合并"
#: builtin/apply.c:4392
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
#: builtin/apply.c:4397
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
#: builtin/apply.c:4398
msgid "action"
msgstr "动作"
#: builtin/apply.c:4399
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
#: builtin/apply.c:4402 builtin/apply.c:4405
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
#: builtin/apply.c:4408
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
#: builtin/apply.c:4410
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
#: builtin/apply.c:4412
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
#: builtin/apply.c:4414
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
#: builtin/apply.c:4417
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
#: builtin/apply.c:4420
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
#: builtin/apply.c:4422
msgid "root"
msgstr "根目录"
#: builtin/apply.c:4423
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
#: builtin/apply.c:4445
msgid "--3way outside a repository"
msgstr "--3way 在一个版本库之外"
#: builtin/apply.c:4453
msgid "--index outside a repository"
msgstr "--index 在一个版本库之外"
#: builtin/apply.c:4456
msgid "--cached outside a repository"
msgstr "--cached 在一个版本库之外"
#: builtin/apply.c:4472
#, c-format
msgid "can't open patch '%s'"
msgstr "不能打开补丁 '%s'"
#: builtin/apply.c:4486
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
#: builtin/apply.c:4492 builtin/apply.c:4502
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行有空白字符误用。"
msgstr[1] "%d 行有空白字符误用。"
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
msgstr "不能创建归档文件 '%s'"
#: builtin/archive.c:20
msgid "could not redirect output"
msgstr "不能重定向输出"
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
msgstr "git archive:未提供远程URL"
#: builtin/archive.c:58
msgid "git archive: expected ACK/NAK, got EOF"
msgstr "git archive:应为ACK/NACK,却得到EOF"
#: builtin/archive.c:61
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive:NACK %s"
#: builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "远程错误:%s"
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive:协议错误"
#: builtin/archive.c:68
msgid "git archive: expected a flush"
msgstr "git archive:应为刷新"
#: builtin/bisect--helper.c:7
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
#: builtin/bisect--helper.c:17
msgid "perform 'git bisect next'"
msgstr "执行 'git bisect next'"
#: builtin/bisect--helper.c:19
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "更新 BISECT_HEAD 而非检出当前提交"
#: builtin/blame.c:30
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
#: builtin/blame.c:35
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
#: builtin/blame.c:2501
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
#: builtin/blame.c:2502
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1(默认:关闭)"
#: builtin/blame.c:2503
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界(默认:关闭)"
#: builtin/blame.c:2504
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
#: builtin/blame.c:2505
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
#: builtin/blame.c:2506
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名(默认:自动)"
#: builtin/blame.c:2507
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号(默认:关闭)"
#: builtin/blame.c:2508
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
#: builtin/blame.c:2509
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
#: builtin/blame.c:2510
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
#: builtin/blame.c:2511
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳(默认:关闭)"
#: builtin/blame.c:2512
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的SHA1提交号(默认:关闭)"
#: builtin/blame.c:2513
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳(默认:关闭)"
#: builtin/blame.c:2514
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字(默认:关闭)"
#: builtin/blame.c:2515
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
#: builtin/blame.c:2516
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
#: builtin/blame.c:2517
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
#: builtin/blame.c:2518
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
#: builtin/blame.c:2519 builtin/blame.c:2520
msgid "score"
msgstr "得分"
#: builtin/blame.c:2519
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
#: builtin/blame.c:2520
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
#: builtin/blame.c:2521
msgid "n,m"
msgstr "n,m"
#: builtin/blame.c:2521
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
#. TRANSLATORS: This string is used to tell us the maximum
#. display width for a relative timestamp in "git blame"
#. output. For C locale, "4 years, 11 months ago", which
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
#: builtin/blame.c:2602
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
#: builtin/branch.c:24
msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:25
msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
#: builtin/branch.c:26
msgid "git branch [options] [-r] (-d | -D) <branchname>..."
msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
#: builtin/branch.c:27
msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
#: builtin/branch.c:152
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
"将要删除的分支 '%s' 已经被合并到\n"
" '%s',但未合并到 HEAD。"
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
#: builtin/branch.c:156
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
" 然而却尚未被合并到分支 '%s' 。"
#: builtin/branch.c:170
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
#: builtin/branch.c:174
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它,执行 'git branch -D %s'。"
#: builtin/branch.c:187
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
#: builtin/branch.c:215
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
#: builtin/branch.c:221
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
#: builtin/branch.c:229
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "无法删除您当前所在的分支 '%s'。"
#: builtin/branch.c:245
#, c-format
msgid "remote branch '%s' not found."
msgstr "远程分支 '%s' 未发现。"
#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
#: builtin/branch.c:260
#, c-format
msgid "Error deleting remote branch '%s'"
msgstr "删除远程分支 '%s' 时出错"
#: builtin/branch.c:261
#, c-format
msgid "Error deleting branch '%s'"
msgstr "删除分支 '%s' 时出错"
#: builtin/branch.c:268
#, c-format
msgid "Deleted remote branch %s (was %s).\n"
msgstr "已删除远程分支 %s(曾为 %s)。\n"
#: builtin/branch.c:269
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s(曾为 %s)。\n"
#: builtin/branch.c:370
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr "分支 '%s' 未指向一个提交"
#: builtin/branch.c:459
#, c-format
msgid "[%s: gone]"
msgstr "[%s: 丢失]"
#: builtin/branch.c:464
#, c-format
msgid "[%s]"
msgstr "[%s]"
#: builtin/branch.c:469
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s:落后 %d]"
#: builtin/branch.c:471
#, c-format
msgid "[behind %d]"
msgstr "[落后 %d]"
#: builtin/branch.c:475
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s:领先 %d]"
#: builtin/branch.c:477
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
#: builtin/branch.c:480
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s:领先 %d,落后 %d]"
#: builtin/branch.c:483
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d,落后 %d]"
#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr " **** 无效引用 ****"
#: builtin/branch.c:587
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(非分支,正变基 %s)"
#: builtin/branch.c:590
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(非分支,二分查找开始于 %s)"
#: builtin/branch.c:593
#, c-format
msgid "(detached from %s)"
msgstr "(分离自 %s)"
#: builtin/branch.c:596
msgid "(no branch)"
msgstr "(非分支)"
#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "对象 '%s' 没有指向一个提交"
#: builtin/branch.c:691
msgid "some refs could not be read"
msgstr "一些引用不能读取"
#: builtin/branch.c:704
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
#: builtin/branch.c:714
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名:'%s'"
#: builtin/branch.c:729
msgid "Branch rename failed"
msgstr "分支重命名失败"
#: builtin/branch.c:733
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"
#: builtin/branch.c:737
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s,但 HEAD 没有更新!"
#: builtin/branch.c:744
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名,但更新 config 文件失败"
#: builtin/branch.c:759
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
#: builtin/branch.c:783
#, c-format
msgid "could not write branch description template: %s"
msgstr "不能写分支描述模版:%s"
#: builtin/branch.c:813
msgid "Generic options"
msgstr "通用选项"
#: builtin/branch.c:815
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
#: builtin/branch.c:816
msgid "suppress informational messages"
msgstr "不显示信息"
#: builtin/branch.c:817
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式(参见 git-pull(1))"
#: builtin/branch.c:819
msgid "change upstream info"
msgstr "改变上游信息"
#: builtin/branch.c:823
msgid "use colored output"
msgstr "使用彩色输出"
#: builtin/branch.c:824
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587
#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616
#: builtin/tag.c:622
msgid "commit"
msgstr "提交"
#: builtin/branch.c:828 builtin/branch.c:834
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
#: builtin/branch.c:840
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作:"
#: builtin/branch.c:841
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
#: builtin/branch.c:843
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
#: builtin/branch.c:844
msgid "delete branch (even if not merged)"
msgstr "删除分支(即使没有合并)"
#: builtin/branch.c:845
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支,以及它的引用日志"
#: builtin/branch.c:846
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支,即使目标已存在"
#: builtin/branch.c:847
msgid "list branch names"
msgstr "列出分支名"
#: builtin/branch.c:848
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
#: builtin/branch.c:850
msgid "edit the description for the branch"
msgstr "标记分支的描述"
#: builtin/branch.c:851
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
#: builtin/branch.c:854
msgid "print only not merged branches"
msgstr "只打印没有合并的分支"
#: builtin/branch.c:860
msgid "print only merged branches"
msgstr "只打印合并的分支"
#: builtin/branch.c:864
msgid "list branches in columns"
msgstr "以列的方式显示分支"
#: builtin/branch.c:877
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
#: builtin/branch.c:881 builtin/clone.c:637
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下!"
#: builtin/branch.c:903
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
#: builtin/branch.c:914 builtin/branch.c:953
msgid "branch name required"
msgstr "必须提供分支名"
#: builtin/branch.c:929
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
#: builtin/branch.c:934
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
#: builtin/branch.c:941
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
#: builtin/branch.c:944
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
#: builtin/branch.c:959
msgid "too many branches for a rename operation"
msgstr "为重命名操作提供了太多的分支名"
#: builtin/branch.c:964
msgid "too many branches to set new upstream"
msgstr "为设置新上游提供了太多的分支名"
#: builtin/branch.c:968
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
#: builtin/branch.c:975
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
#: builtin/branch.c:987
msgid "too many branches to unset upstream"
msgstr "为取消上游设置操作提供了太多的分支名"
#: builtin/branch.c:991
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
#: builtin/branch.c:997
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
#: builtin/branch.c:1011
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有意义"
#: builtin/branch.c:1017
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
#: builtin/branch.c:1020
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
#: builtin/branch.c:1037
#, c-format
msgid ""
"\n"
"If you wanted to make '%s' track '%s', do this:\n"
"\n"
msgstr ""
"\n"
"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
"\n"
#: builtin/branch.c:1038
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
#: builtin/branch.c:1039
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
#: builtin/bundle.c:47
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"