blob: 239a54a7e3f7fa12bda5af07b4af1c56150a306b [file] [log] [blame]
# 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.
# Contributors:
# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>
# - Jiang Xin <worldhello.net AT gmail.com>
# - Lian Cheng <rhythm.mail AT gmail.com>
# - Ray Chen <oldsharp AT gmail.com>
# - Riku <lu.riku AT gmail.com>
# - Thynson <lanxingcan AT gmail.com>
# - ws3389 <willsmith3389 AT gmail.com>
# - Wang Sheng <wangsheng2008love AT 163.com>
# - 依云 <lilydjwg AT gmail.com>
# - Yichao Yu <yyc1992 AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
#
# Git glossary for Chinese translators
#
# English | Chinese
# ---------------------------------+--------------------------------------
# 3-way merge | 三方合并
# abbreviate | 简写(的 SHA-1 值)
# alternate object database | 备用对象库
# amend | 修补
# ancestor | 祖先,祖先提交
# annotated tag | 附注标签
# bare repository | 纯仓库
# bisect | 二分查找
# blob object | 数据对象
# branch | 分支
# bundle | 包
# bypass | 绕过
# cache | 索引(的别称)
# chain | (提交)链
# changeset | 变更集
# checkout | 检出
# checksum | 校验,校验和
# cherry-picking | 拣选
# clean | 干净(的工作区)
# clone | 克隆
# commit | 提交
# commit message | 提交说明
# commit object | 提交对象
# commit-ish (also committish) | 提交号
# conflict | 冲突
# core Git | 核心 Git 工具
# DAG | 有向无环图
# dangling object | 摇摆对象
# detached HEAD | 分离头指针
# directory | 目录
# dirty | 脏(的工作区)
# dumb HTTP protocol | 哑 HTTP 协议
# evil merge | 坏合并(合并引入了父提交没有的修改)
# fast-forward | 快进
# fetch | 获取
# file system | 文件系统
# fork | 派生
# Git archive | 仓库(对于 arch 用户)
# gitfile | gitfile(仓库链接文件)
# grafts | (提交)移植
# hash | 哈希值
# HEAD | HEAD(头指针,亦即当前分支)
# head | 头、分支
# head ref | 分支
# header | 头信息
# hook | 钩子
# hunk | 补丁片段
# index | 索引
# index entry | 索引条目
# loose object | 松散对象
# loose refs | 松散引用
# master | master(默认分支名)
# merge | 合并
# object | 对象
# object database | 对象库
# object identifier | 对象标识符
# object name | 对象名称
# object type | 对象类型
# octopus | 章鱼式合并(两分支以上的合并)
# origin | origin(默认的远程名称)
# pack | 包
# pack index | 包索引
# packfile | 包文件
# parent | 父提交
# patch | 补丁
# pathspec | 路径规格
# pattern | 模式
# pickaxe | 挖掘
# plumbing | 管件(Git 底层核心命令的别称)
# porcelain | 瓷件(Git 上层封装命令的别称)
# precious-objects repo | 珍品仓库
# prune | 清除
# pull | 拉,拉取
# push | 推,推送
# reachable | 可达
# rebase | 变基
# ref | 引用
# reflog | 引用日志
# refspec | 引用规格
# remote | 远程,远程仓库
# remote-tracking branch | 远程跟踪分支
# replay | 重放
# repo | 仓库
# repository | 仓库
# resolve | (冲突)解决
# revert | 还原
# revision | 版本
# rewind | 回退
# SCM | 源代码管理(工具)
# SHA-1 | SHA-1(安全哈希算法1)
# shallow repository | 浅(克隆)仓库
# signed tag | 签名标签
# smart HTTP protocol | 智能 HTTP 协议
# squash | 压缩
# stage | n. 暂存区(即索引); v. 暂存
# stash | n. 贮藏区; v. 贮藏
# submodule | 子模组
# symref | 符号引用
# tag | n. 标签; v. 打标签
# tag object | 标签对象
# tagger | 打标签者
# topic branch | 主题分支
# track | 跟踪
# trailer | 尾部署名
# tree | 树(工作区或树对象)
# tree object | 树对象
# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
# unmerged index | 未合并索引
# unpack | 解包
# unreachable object | 不可达对象
# unstage | 取消暂存
# upstream | 上游
# upstream branch | 上游分支
# working tree | 工作区
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2018-06-16 22:06+0800\n"
"PO-Revision-Date: 2018-06-18 00:28+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/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:92
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示:%.*s%s\n"
#: advice.c:137
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选,因为您有未合并的文件。"
#: advice.c:139
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交,因为您有未合并的文件。"
#: advice.c:141
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并,因为您有未合并的文件。"
#: advice.c:143
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取,因为您有未合并的文件。"
#: advice.c:145
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退,因为您有未合并的文件。"
#: advice.c:147
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s,因为您有未合并的文件。"
#: advice.c:155
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"
"解决方案并提交。"
#: advice.c:163
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
#: advice.c:168 builtin/merge.c:1250
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
#: advice.c:170
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
#: advice.c:171
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
#: advice.c:177
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
"state without impacting any branches by performing another checkout.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
"do so (now or later) by using -b with the checkout command again. Example:\n"
"\n"
" git checkout -b <new-branch-name>\n"
"\n"
msgstr ""
"注意:正在检出 '%s'。\n"
"\n"
"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
"外\n"
"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
"\n"
"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
"参数 -b 来实现(现在或稍后)。例如:\n"
"\n"
" git checkout -b <新分支名>\n"
"\n"
#: apply.c:58
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
#: apply.c:74
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr "--reject 和 --3way 不能同时使用。"
#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"
#: apply.c:127
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
#: apply.c:138
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
#: apply.c:141
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d,输入为:%s"
#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
#: apply.c:942
#, 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"
#: apply.c:948
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
#: apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式:%s"
#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头,%d 行和 %d 行"
#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount:意外的行:%.*s"
#: apply.c:1542
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息:%.*s"
#: apply.c:1562
#, 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 行)"
#: apply.c:1575
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
#: apply.c:1763
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
#: apply.c:1765
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
#: apply.c:1841
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:文件 %s 成为空文件但并未删除"
#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏:%.*s"
#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符:'%c'"
#: apply.c:3055
#, 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 行)"
#: apply.c:3067
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
"当查询:\n"
"%.*s"
#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
#: apply.c:3103
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
#: apply.c:3149
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
#: apply.c:3159
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
#: apply.c:3167
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s',但其并非空文件"
#: apply.c:3185
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
#: apply.c:3204
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败:%s:%ld"
#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:不存在于索引中"
#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引不匹配"
#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s:错误类型"
#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o,应为 %o"
#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已经存在于索引中"
#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已经存在于工作区中"
#: apply.c:3945
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
#: apply.c:3950
#, 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)不匹配"
#: apply.c:3970
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:补丁未应用"
#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
#: apply.c:4080
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
#: apply.c:4087
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更,但它不在当前 HEAD 中"
#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效(%s)。"
#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
#: apply.c:4296
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "无法写入 '%s'"
#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
#: apply.c:4523
msgid "internal error"
msgstr "内部错误"
#: apply.c:4526
#, 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 个被拒绝..."
#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
#: apply.c:4681
msgid "unrecognized input"
msgstr "未能识别的输入"
#: apply.c:4700
msgid "unable to read index file"
msgstr "无法读取索引文件"
#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s':%s"
#: apply.c:4864
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
#: apply.c:4870 apply.c:4885
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
#: apply.c:4878
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后,应用了 %d 行。"
msgstr[1] "修复空白错误后,应用了 %d 行。"
#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198
#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210
#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584
#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807
#: git-add--interactive.perl:197
msgid "path"
msgstr "路径"
#: apply.c:4922
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
#: apply.c:4925
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
#: apply.c:4927 builtin/am.c:2263
msgid "num"
msgstr "数字"
#: apply.c:4928
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
#: apply.c:4931
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
#: apply.c:4933
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
#: apply.c:4937
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
#: apply.c:4939
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁,而是显示输入的概要"
#: apply.c:4941
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁,而是查看补丁是否可应用"
#: apply.c:4943
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
#: apply.c:4945
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
#: apply.c:4947
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
#: apply.c:4950
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
#: apply.c:4952
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
#: apply.c:4954
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
#: apply.c:4959
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
#: builtin/pack-objects.c:3177
msgid "action"
msgstr "动作"
#: apply.c:4961
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
#: apply.c:4964 apply.c:4967
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
#: apply.c:4970
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
#: apply.c:4972
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
#: apply.c:4974
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
#: apply.c:4976
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21
#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666
#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124
msgid "be verbose"
msgstr "冗长输出"
#: apply.c:4979
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
#: apply.c:4982
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
#: apply.c:4984 builtin/am.c:2251
msgid "root"
msgstr "根目录"
#: apply.c:4985
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
#: archive.c:13
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<选项>] <树或提交> [<路径>...]"
#: archive.c:14
msgid "git archive --list"
msgstr "git archive --list"
#: archive.c:15
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
#: archive.c:16
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
#: archive.c:434
msgid "fmt"
msgstr "格式"
#: archive.c:434
msgid "archive format"
msgstr "归档格式"
#: archive.c:435 builtin/log.c:1462
msgid "prefix"
msgstr "前缀"
#: archive.c:436
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
#: parse-options.h:165
msgid "file"
msgstr "文件"
#: archive.c:438 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
#: archive.c:440
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
#: archive.c:441
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
#: archive.c:442
msgid "store only"
msgstr "只存储"
#: archive.c:443
msgid "compress faster"
msgstr "压缩速度更快"
#: archive.c:451
msgid "compress better"
msgstr "压缩效果更好"
#: archive.c:454
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
msgid "repo"
msgstr "仓库"
#: archive.c:457 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库(<仓库>)提取归档文件"
#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "命令"
#: archive.c:459 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
#: archive.c:466
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
#: archive.c:468
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
#: archive.c:470
msgid "Unexpected option --output"
msgstr "未知参数 --output"
#: archive.c:492
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
#: archive.c:499
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s':-%d"
#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时,使用 '\\!'。"
#: bisect.c:461
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式:%s"
#: bisect.c:669
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找!\n"
#: bisect.c:723
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
#: bisect.c:747
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
#: bisect.c:752
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
#: bisect.c:757
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
#: bisect.c:765
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
"一些 %s 版本不是 %s 版本的祖先。\n"
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本?\n"
#: bisect.c:778
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"So we cannot be sure the first %s commit is between %s and %s.\n"
"We continue anyway."
msgstr ""
"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
#: bisect.c:811
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中:合并基线必须是经过测试的\n"
#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
#: bisect.c:921
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
#: bisect.c:951
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
#: bisect.c:970
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
#: bisect.c:978
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数?\n"
#: bisect.c:997
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
msgstr[0] "(大概 %d 步)"
msgstr[1] "(大概 %d 步)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
#: bisect.c:1003
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
#: blame.c:1756
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
#: blame.c:1767
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
#: blame.c:1787
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
#: blame.c:1814
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
#: blame.c:1825
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
#: blame.c:1836
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
#: branch.c:54
#, c-format
msgid ""
"\n"
"After fixing the error cause you may try to fix up\n"
"the remote tracking information by invoking\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
"\n"
"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
"\"git branch --set-upstream-to=%s%s%s\" 。"
#: branch.c:68
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "未设置分支 %s 作为它自己的上游。"
#: branch.c:94
#, 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:95
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
#: branch.c:100
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
#: branch.c:106
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
#: branch.c:111
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
#: branch.c:120
msgid "Unable to write upstream branch configuration"
msgstr "无法写入上游分支配置"
#: branch.c:157
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪:引用 %s 有歧义"
#: branch.c:190
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"
#: branch.c:209
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
#: branch.c:214
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
#: branch.c:234
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
#: branch.c:236
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
#: branch.c:238
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:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名:'%s'。"
#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名:'%s'。"
#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点:'%s'。"
#: branch.c:360
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
#: branch.c:383
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' 不像是一个 v2 版本的包文件"
#: bundle.c:62
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交:"
#: bundle.c:190
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用:"
msgstr[1] "这个包中含有 %d 个引用:"
#: bundle.c:197
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
#: bundle.c:199
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用:"
msgstr[1] "这个包需要 %d 个引用:"
#: bundle.c:258
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
#: bundle.c:269
msgid "pack-objects died"
msgstr "pack-objects 终止"
#: bundle.c:311
msgid "rev-list died"
msgstr "rev-list 终止"
#: bundle.c:360
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数:%s"
#: bundle.c:458
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
#: bundle.c:470
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
#: bundle.c:498
msgid "index-pack died"
msgstr "index-pack 终止"
#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
#: builtin/replace.c:448
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
#: commit.c:45
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
#: commit.c:182
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\n"
"Please use \"git replace --convert-graft-file\"\n"
"to convert the grafts into replace refs.\n"
"\n"
"Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
"对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
"未来的Git版本中被移除。\n"
"\n"
"请使用 \"git replace --convert-graft-file\" 将\n"
"grafts 转换为替换引用。\n"
"\n"
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
#: commit.c:1540
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
"警告:提交说明不符合 UTF-8 字符编码。\n"
"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"
#: commit-graph.c:669
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "提交图形格式不能写入 %d 个提交"
#: commit-graph.c:696
msgid "too many commits to write graph"
msgstr "提交太多不能画图"
#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"
#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "内存耗尽"
#: config.c:187
msgid "relative config include conditionals must come from files"
msgstr "包含相对路径的条件引用必须来自于文件"
#: config.c:788
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
#: config.c:792
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
#: config.c:796
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
#: config.c:800
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
#: config.c:804
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
#: config.c:808
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
#: config.c:936
msgid "out of range"
msgstr "超出范围"
#: config.c:936
msgid "invalid unit"
msgstr "无效的单位"
#: config.c:942
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
#: config.c:947
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
#: config.c:950
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
#: config.c:953
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
#: config.c:956
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
#: config.c:959
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
#: config.c:962
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
#: config.c:1057
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
#: config.c:1066
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
#: config.c:1171 config.c:1182
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
#: config.c:1307
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式:%s"
#: config.c:1473
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
#: config.c:1681
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
#: config.c:2013
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
#: config.c:2200
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s:'%s'"
#: config.c:2243
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
#: config.c:2269
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
#: config.c:2294
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
#: config.c:2296
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
#: config.c:2402
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
#: config.c:2766 config.c:3019
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
#: config.c:2905
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
#: config.c:2907 builtin/remote.c:779
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
#: connect.c:61
msgid "The remote end hung up upon initial contact"
msgstr "远端在连接发起时即挂断"
#: connect.c:63
msgid ""
"Could not read from remote repository.\n"
"\n"
"Please make sure you have the correct access rights\n"
"and the repository exists."
msgstr ""
"无法读取远程仓库。\n"
"\n"
"请确认您有正确的访问权限并且仓库存在。"
#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145
msgid "Checking connectivity"
msgstr "检查连接中"
#: connected.c:78
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
#: connected.c:98
msgid "failed write to rev-list"
msgstr "无法写入 rev-list"
#: connected.c:105
msgid "failed to close rev-list's stdin"
msgstr "无法关闭 rev-list 的标准输入"
#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s."
msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory."
msgstr ""
"文件 %s 中的 CRLF 将被 LF 替换。\n"
"在工作区中该文件仍保持原有的换行符。"
#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "文件 %s 中的 LF 将被 CRLF 替换"
#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory."
msgstr ""
"文件 %s 中的 LF 将被 CRLF 替换。\n"
"在工作区中该文件仍保持原有的换行符。"
#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。"
#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
"节序)作为工作区编码。"
#: convert.c:424
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
#: convert.c:1225
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false 不是有效的工作区编码"
#: date.c:116
msgid "in the future"
msgstr "在将来"
#: date.c:122
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> 秒钟前"
msgstr[1] "%<PRIuMAX> 秒钟前"
#: date.c:129
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> 分钟前"
msgstr[1] "%<PRIuMAX> 分钟前"
#: date.c:136
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> 小时前"
msgstr[1] "%<PRIuMAX> 小时前"
#: date.c:143
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> 天前"
msgstr[1] "%<PRIuMAX> 天前"
#: date.c:149
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> 周前"
msgstr[1] "%<PRIuMAX> 周前"
#: date.c:156
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> 个月前"
msgstr[1] "%<PRIuMAX> 个月前"
#: date.c:167
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] "%<PRIuMAX> 年"
msgstr[1] "%<PRIuMAX> 年"
#. TRANSLATORS: "%s" is "<n> years"
#: date.c:170
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s %<PRIuMAX> 个月前"
msgstr[1] "%s %<PRIuMAX> 个月前"
#: date.c:175 date.c:180
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "%<PRIuMAX> 年前"
msgstr[1] "%<PRIuMAX> 年前"
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "无法读取排序文件 '%s'"
#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "选项 '%s' 需要一个值"
# 译者:注意保持前导空格
#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
# 译者:注意保持前导空格
#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
#: diff.c:281
msgid ""
"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
"'plain'"
msgstr ""
"代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
"发现配置变量 'diff.dirstat' 中的错误:\n"
"%s"
#: diff.c:3823
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出,停止在 %s"
#: diff.c:4153
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
#: diff.c:4156
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
#: diff.c:4244
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
#: diff.c:4410
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
"无法解析 --dirstat/-X 选项的参数:\n"
"%s"
#: diff.c:4424
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数:'%s'"
#: diff.c:5500
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多,略过不严格的重命名检查。"
#: diff.c:5503
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多,只在修改的路径中查找拷贝。"
#: diff.c:5506
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
#: dir.c:1867
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
#: dir.c:2109
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
#: dir.c:2233
msgid "Untracked cache is disabled on this system or location."
msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
#: dir.c:3075 dir.c:3080
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
#: dir.c:3109
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
#: editor.c:61
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示:等待您的编辑器关闭文件...%c"
#: entry.c:177
msgid "Filtering content"
msgstr "过滤内容"
#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
#: fetch-object.c:17
msgid "Remote with no URL"
msgstr "远程未设置 URL"
#: fetch-pack.c:254
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack:应为 shallow 列表"
#: fetch-pack.c:266
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
#: fetch-pack.c:285 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "远程错误:%s"
#: fetch-pack.c:286
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
#: fetch-pack.c:338
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
#: fetch-pack.c:429 fetch-pack.c:1310
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息:%s"
#: fetch-pack.c:435 fetch-pack.c:1316
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息:%s"
#: fetch-pack.c:437 fetch-pack.c:1318
#, c-format
msgid "object not found: %s"
msgstr "对象未找到:%s"
#: fetch-pack.c:440 fetch-pack.c:1321
#, c-format
msgid "error in object: %s"
msgstr "对象中出错:%s"
#: fetch-pack.c:442 fetch-pack.c:1323
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow:%s"
#: fetch-pack.c:445 fetch-pack.c:1326
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow,却得到 %s"
#: fetch-pack.c:486
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
#: fetch-pack.c:500
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
#: fetch-pack.c:533
msgid "giving up"
msgstr "放弃"
#: fetch-pack.c:543 progress.c:229
msgid "done"
msgstr "完成"
#: fetch-pack.c:555
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
#: fetch-pack.c:601
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
#: fetch-pack.c:828
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s(%s)"
#: fetch-pack.c:869
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack:无法派生 sideband 多路输出"
#: fetch-pack.c:877
msgid "protocol error: bad pack header"
msgstr "协议错误:坏的包头"
#: fetch-pack.c:944
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack:无法派生进程 %s"
#: fetch-pack.c:960
#, c-format
msgid "%s failed"
msgstr "%s 失败"
#: fetch-pack.c:962
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
#: fetch-pack.c:989
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
#: fetch-pack.c:993
msgid "Server supports multi_ack_detailed"
msgstr "服务器支持 multi_ack_detailed"
#: fetch-pack.c:996
msgid "Server supports no-done"
msgstr "服务器支持 no-done"
#: fetch-pack.c:1002
msgid "Server supports multi_ack"
msgstr "服务器支持 multi_ack"
#: fetch-pack.c:1006
msgid "Server supports side-band-64k"
msgstr "服务器支持 side-band-64k"
#: fetch-pack.c:1010
msgid "Server supports side-band"
msgstr "服务器支持 side-band"
#: fetch-pack.c:1014
msgid "Server supports allow-tip-sha1-in-want"
msgstr "服务器支持 allow-tip-sha1-in-want"
#: fetch-pack.c:1018
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "服务器支持 allow-reachable-sha1-in-want"
#: fetch-pack.c:1028
msgid "Server supports ofs-delta"
msgstr "服务器支持 ofs-delta"
#: fetch-pack.c:1034 fetch-pack.c:1204
msgid "Server supports filter"
msgstr "服务器支持 filter"
#: fetch-pack.c:1042
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
#: fetch-pack.c:1048
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
#: fetch-pack.c:1052
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
#: fetch-pack.c:1054
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
#: fetch-pack.c:1065
msgid "no common commits"
msgstr "没有共同的提交"
#: fetch-pack.c:1077 fetch-pack.c:1414
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack:获取失败。"
#: fetch-pack.c:1199
msgid "Server does not support shallow requests"
msgstr "服务器不支持 shalllow 请求"
#: fetch-pack.c:1584
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
#: fetch-pack.c:1610
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
#: fetch-pack.c:1613
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
#: gpg-interface.c:210
msgid "could not create temporary file"
msgstr "不能创建临时文件"
#: gpg-interface.c:213
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
#: graph.c:97
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
#: grep.c:2020
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':无法读取 %s"
#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81
#: builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
#: grep.c:2048
#, c-format
msgid "'%s': short read"
msgstr "'%s':读取不完整"
#: help.c:23
msgid "start a working area (see also: git help tutorial)"
msgstr "开始一个工作区(参见:git help tutorial)"
#: help.c:24
msgid "work on the current change (see also: git help everyday)"
msgstr "在当前变更上工作(参见:git help everyday)"
#: help.c:25
msgid "examine the history and state (see also: git help revisions)"
msgstr "检查历史和状态(参见:git help revisions)"
#: help.c:26
msgid "grow, mark and tweak your common history"
msgstr "扩展、标记和调校您的历史记录"
#: help.c:27
msgid "collaborate (see also: git help workflows)"
msgstr "协同(参见:git help workflows)"
#: help.c:31
msgid "Main Porcelain Commands"
msgstr "主要的上层命令"
#: help.c:32
msgid "Ancillary Commands / Manipulators"
msgstr "辅助命令/操作者"
#: help.c:33
msgid "Ancillary Commands / Interrogators"
msgstr "辅助命令/询问者"
#: help.c:34
msgid "Interacting with Others"
msgstr "与其它系统交互"
#: help.c:35
msgid "Low-level Commands / Manipulators"
msgstr "低级命令/操作者"
#: help.c:36
msgid "Low-level Commands / Interrogators"
msgstr "低级命令/询问者"
#: help.c:37
msgid "Low-level Commands / Synching Repositories"
msgstr "低级命令/同步仓库"
#: help.c:38
msgid "Low-level Commands / Internal Helpers"
msgstr "低级命令/内部助手"
#: help.c:293
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"
#: help.c:300
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
#: help.c:309
msgid "These are common Git commands used in various situations:"
msgstr "这些是各种场合常见的 Git 命令:"
#: help.c:358 git.c:90
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支持的命令列表类型 '%s'"
#: help.c:405
msgid "The common Git guides are:"
msgstr "最常用的 Git 向导有:"
#: help.c:467
#, 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:526
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀,您的系统中未发现 Git 命令。"
#: help.c:548
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
#: help.c:553
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "假定你想要的是 '%s' 并继续。"
#: help.c:558
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
#: help.c:566
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
#: help.c:570
msgid ""
"\n"
"The most similar command is"
msgid_plural ""
"\n"
"The most similar commands are"
msgstr[0] ""
"\n"
"最相似的命令是"
msgstr[1] ""
"\n"
"最相似的命令是"
#: help.c:585
msgid "git version [<options>]"
msgstr "git version [<选项>]"
#: help.c:652
#, c-format
msgid "%s: %s - %s"
msgstr "%s:%s - %s"
#: help.c:656
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
"\n"
"您指的是这个么?"
msgstr[1] ""
"\n"
"您指的是这其中的某一个么?"
#: ident.c:342
msgid ""
"\n"
"*** Please tell me who you are.\n"
"\n"
"Run\n"
"\n"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
"to set your account's default identity.\n"
"Omit --global to set the identity only in this repository.\n"
"\n"
msgstr ""
"\n"
"*** 请告诉我你是谁。\n"
"\n"
"运行\n"
"\n"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
"来设置您账号的缺省身份标识。\n"
"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
#: ident.c:366
msgid "no email was given and auto-detection is disabled"
msgstr "未提供邮件地址且自动探测被禁用"
#: ident.c:371
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "无法自动探测邮件地址(得到 '%s')"
#: ident.c:381
msgid "no name was given and auto-detection is disabled"
msgstr "未提供姓名且自动探测被禁用"
#: ident.c:387
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "无法自动探测姓名(得到 '%s')"
#: ident.c:395
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "不允许空的姓名(对于 <%s>)"
#: ident.c:401
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符:%s"
#: ident.c:416 builtin/commit.c:587
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式:%s"
#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "不能混用多种过滤规格"
#: list-objects-filter-options.c:126
msgid "cannot change partial clone promisor remote"
msgstr "无法修改部分克隆的 promisor 远程仓库"
#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"\n"
"Another git process seems to be running in this repository, e.g.\n"
"an editor opened by 'git commit'. Please make sure all processes\n"
"are terminated then try again. If it still fails, a git process\n"
"may have crashed in this repository earlier:\n"
"remove the file manually to continue."
msgstr ""
"无法创建 '%s.lock':%s。\n"
"\n"
"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
"可能之前有一个 git 进程在这个仓库中异常退出:\n"
"手动删除这个文件再继续。"
#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "不能创建 '%s.lock':%s"
#: merge.c:71
msgid "failed to read the cache"
msgstr "无法读取缓存"
#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
#: builtin/checkout.c:606 builtin/clone.c:761
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
#: merge-recursive.c:298
msgid "(bad commit)\n"
msgstr "(坏提交)\n"
#: merge-recursive.c:320
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "addinfo_cache 对路径 '%s' 执行失败,合并终止。"
#: merge-recursive.c:328
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "addinfo_cache 无法刷新路径 '%s',合并终止。"
#: merge-recursive.c:410
msgid "error building trees"
msgstr "无法创建树"
#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ":可能是一个目录/文件冲突?"
#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
#: merge-recursive.c:957 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
#: merge-recursive.c:959
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
#: merge-recursive.c:983
#, c-format
msgid "failed to open '%s': %s"
msgstr "无法打开 '%s':%s"
#: merge-recursive.c:994
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "无法创建符号链接 '%s':%s"
#: merge-recursive.c:999
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
#: merge-recursive.c:1186
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "无法合并子模组 %s (没有检出)"
#: merge-recursive.c:1193
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "无法合并子模组 %s(提交不存在)"
#: merge-recursive.c:1200
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "无法合并子模组 %s (提交未跟随合并基线)"
#: merge-recursive.c:1208 merge-recursive.c:1220
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模组 %s 快进到如下提交:"
#: merge-recursive.c:1211 merge-recursive.c:1223
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快进子模组 %s"
#: merge-recursive.c:1245
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
#: merge-recursive.c:1249
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "无法合并子模组 %s(非快进)"
#: merge-recursive.c:1250
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模组的一个可能的合并方案:\n"
#: merge-recursive.c:1253
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"by using:\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
"which will accept this suggestion.\n"
msgstr ""
"如果这个正确,将其添加到索引,例如使用命令:\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
"以接受此建议。\n"
#: merge-recursive.c:1262
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "无法合并子模组 %s (发现多个合并)"
#: merge-recursive.c:1321
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
#: merge-recursive.c:1326
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
#: merge-recursive.c:1358
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
#: merge-recursive.c:1423
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
#: merge-recursive.c:1475
#, 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:1480
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
#: merge-recursive.c:1487
#, 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:1492
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
#: merge-recursive.c:1526
msgid "rename"
msgstr "重命名"
#: merge-recursive.c:1526
msgid "renamed"
msgstr "重命名"
#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
#: merge-recursive.c:3086
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
#: merge-recursive.c:1594
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
#: merge-recursive.c:1599
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
#: merge-recursive.c:1625
#, 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:1630
msgid " (left unresolved)"
msgstr "(留下未解决)"
#: merge-recursive.c:1694
#, 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:1733
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
#: merge-recursive.c:1745
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒绝丢失未跟踪文件 '%s',即使它妨碍了。"
#: merge-recursive.c:1951
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"directory %s was renamed to multiple other directories, with no destination "
"getting a majority of the files."
msgstr ""
"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
"其它目录,没有一个目录包含主要的文件。"
#: merge-recursive.c:1983
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
"在:%s。"
#: merge-recursive.c:1993
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
"径放置于此:%s"
#: merge-recursive.c:2085
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
"%4$s->%5$s"
#: merge-recursive.c:2330
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
#: merge-recursive.c:2736
#, 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:2751
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
#: merge-recursive.c:2758 merge-recursive.c:3089
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
#: merge-recursive.c:2914
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
#: merge-recursive.c:2917
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
#: merge-recursive.c:2986
msgid "modify"
msgstr "修改"
#: merge-recursive.c:2986
msgid "modified"
msgstr "修改"
#: merge-recursive.c:2997
msgid "content"
msgstr "内容"
#: merge-recursive.c:3004
msgid "add/add"
msgstr "添加/添加"
#: merge-recursive.c:3046
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s(已经做过相同合并)"
#: merge-recursive.c:3055 git-submodule.sh:895
msgid "submodule"
msgstr "子模组"
#: merge-recursive.c:3056
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突(%s):合并冲突于 %s"
#: merge-recursive.c:3178
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
#: merge-recursive.c:3204
msgid "file/directory"
msgstr "文件/目录"
#: merge-recursive.c:3210
msgid "directory/file"
msgstr "目录/文件"
#: merge-recursive.c:3217
#, 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:3226
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
#: merge-recursive.c:3267
#, c-format
msgid "Dirty index: cannot merge (dirty: %s)"
msgstr "脏索引:不能合并(脏文件:%s)"
#: merge-recursive.c:3271
msgid "Already up to date!"
msgstr "已经是最新的!"
#: merge-recursive.c:3280
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
#: merge-recursive.c:3379
msgid "Merging:"
msgstr "合并:"
#: merge-recursive.c:3392
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先:"
msgstr[1] "发现 %u 个共同祖先:"
#: merge-recursive.c:3431
msgid "merge returned no commit"
msgstr "合并未返回提交"
#: merge-recursive.c:3495
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816
msgid "Unable to write index."
msgstr "不能写入索引。"
#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
"您的前一次注释合并尚未结束(存在 %s)。\n"
"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 来提交/终止前一次合并。"
#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "您尚未结束注释合并(存在 %s)。"
#: notes-utils.c:43
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "不能提交未初始化/未引用的注解树"
#: notes-utils.c:102
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "坏的 notes.rewriteMode 值:'%s'"
#: notes-utils.c:112
#, 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:142
#, c-format
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值:'%s'"
#: object.c:242
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象:%s"
#: packfile.c:563
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
#: packfile.c:1742
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
#: packfile.c:1746
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
#: parse-options.c:621
msgid "..."
msgstr "..."
#: parse-options.c:640
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
#: parse-options.c:646
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: parse-options.c:649
#, c-format
msgid " %s"
msgstr " %s"
#: parse-options.c:688
msgid "-NUM"
msgstr "-数字"
#: parse-options-cb.c:44
#, c-format
msgid "malformed expiration date '%s'"
msgstr "格式错误的到期时间:'%s'"
#: parse-options-cb.c:112
#, c-format
msgid "malformed object name '%s'"
msgstr "格式错误的对象名 '%s'"
#: path.c:892
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
#: pathspec.c:129
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
#: pathspec.c:147
msgid "Only one 'attr:' specification is allowed."
msgstr "只允许一个 'attr:' 规格。"
#: pathspec.c:150
msgid "attr spec must not be empty"
msgstr "属性规格不能为空"
#: pathspec.c:193
#, c-format
msgid "invalid attribute name %s"
msgstr "无效的属性名 %s"
#: pathspec.c:258
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
#: pathspec.c:265
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
#: pathspec.c:305
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规格包含无效的神奇前缀"
#: pathspec.c:326
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
#: pathspec.c:331
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
#: pathspec.c:369
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
#: pathspec.c:428
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s:'literal' 和 'glob' 不兼容"
#: pathspec.c:441
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s:'%s' 在仓库之外"
#: pathspec.c:515
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'(助记符:'%c')"
#: pathspec.c:525
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
#: read-cache.c:1500
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"设置了 index.version,但是取值无效。\n"
"使用版本 %i"
#: read-cache.c:1510
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
"使用版本 %i"
#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
#: read-cache.c:2490
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录:%s"
#: read-cache.c:2502
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除:%s"
#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
#: builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
#: refs.c:1880
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
#: refs/files-backend.c:1191
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
#: refs/files-backend.c:1205 refs/packed-backend.c:1531
#: refs/packed-backend.c:1541
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s:%s"
#: refs/files-backend.c:1208 refs/packed-backend.c:1544
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用:%s"
#: ref-filter.c:35 wt-status.c:1850
msgid "gone"
msgstr "丢失"
#: ref-filter.c:36
#, c-format
msgid "ahead %d"
msgstr "领先 %d"
#: ref-filter.c:37
#, c-format
msgid "behind %d"
msgstr "落后 %d"
#: ref-filter.c:38
#, c-format
msgid "ahead %d, behind %d"
msgstr "领先 %d,落后 %d"
#: ref-filter.c:121
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式:%%(color:<颜色>)"
#: ref-filter.c:123
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色:%%(color:%s)"
#: ref-filter.c:145
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
#: ref-filter.c:149
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
#: ref-filter.c:151
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数:%s"
#: ref-filter.c:206
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
#: ref-filter.c:215
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
#: ref-filter.c:235
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 参数:%s"
#: ref-filter.c:264
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
#: ref-filter.c:266
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数:%s"
#: ref-filter.c:281
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "期望一个正数 objectname:short=%s"
#: ref-filter.c:285
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数:%s"
#: ref-filter.c:315
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式:%%(align:<宽度>,<位置>)"
#: ref-filter.c:327
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置:%s"
#: ref-filter.c:334
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度:%s"
#: ref-filter.c:343
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数:%s"
#: ref-filter.c:351
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数:%s"
#: ref-filter.c:464
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式错误的字段名:%.*s"
#: ref-filter.c:491
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名:%.*s"
#: ref-filter.c:608
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
#: ref-filter.c:671
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
#: ref-filter.c:673
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式:%%(then) 元素用了多次"
#: ref-filter.c:675
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
#: ref-filter.c:703
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
#: ref-filter.c:705
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
#: ref-filter.c:707
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式:%%(else) 元素用了多次"
#: ref-filter.c:722
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
#: ref-filter.c:779
#, c-format
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
#: ref-filter.c:1387
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(非分支,正变基 %s)"
#: ref-filter.c:1390
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(非分支,正变基分离头指针 %s)"
#: ref-filter.c:1393
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(非分支,二分查找开始于 %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
#: ref-filter.c:1401
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(头指针分离于 %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
#: ref-filter.c:1408
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(头指针分离自 %s)"
#: ref-filter.c:1412
msgid "(no branch)"
msgstr "(非分支)"
#: ref-filter.c:1442
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
#: ref-filter.c:1445
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
#: ref-filter.c:1902
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
#: ref-filter.c:1984
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
#: ref-filter.c:1989
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
#: ref-filter.c:2261
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式:缺少 %%(end) 元素"
#: ref-filter.c:2365
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
#: remote.c:605
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
#: remote.c:609
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s,而非 %s"
#: remote.c:613
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
#: remote.c:621
msgid "Internal error"
msgstr "内部错误"
#: remote.c:1534 remote.c:1635
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
#: remote.c:1543
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支:'%s'"
#: remote.c:1546
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
#: remote.c:1552
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
#: remote.c:1567
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
#: remote.c:1579
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
#: remote.c:1589
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
#: remote.c:1602
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标(push.default 是 'nothing')"
#: remote.c:1624
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
#: remote.c:1939
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
#: remote.c:1943
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
#: remote.c:1946
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
#: remote.c:1950
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
#: remote.c:1953
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (使用 \"%s\" 查看详情)\n"
#: remote.c:1957
#, 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:1963
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
#: remote.c:1966
#, 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:1974
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
#: remote.c:1977
#, 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:1987
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" 来合并远程分支)\n"
#: revision.c:2289
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
#: revision.c:2292
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
#: revision.c:2489
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect 不兼容"
#: run-command.c:728
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
#: run-command.c:1271
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr "读取远程解包状态时收到意外的 flush 包"
#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析远程解包状态:%s"
#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "远程解包失败:%s"
#: send-pack.c:308
msgid "failed to sign the push certificate"
msgstr "无法为推送证书签名"
#: send-pack.c:421
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
#: send-pack.c:423
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书,因为接收端不支持签名推送"
#: send-pack.c:435
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
#: send-pack.c:440
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
#: sequencer.c:175
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "无效的提交信息清理模式 '%s'"
#: sequencer.c:275
#, c-format
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
#: sequencer.c:301
msgid "revert"
msgstr "还原"
#: sequencer.c:303
msgid "cherry-pick"
msgstr "拣选"
#: sequencer.c:305
msgid "rebase -i"
msgstr "rebase -i"
#: sequencer.c:307
#, c-format
msgid "Unknown action: %d"
msgstr "未知动作:%d"
#: sequencer.c:364
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:367
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:380 sequencer.c:2468
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
#: sequencer.c:387
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
#: sequencer.c:2702
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
#: builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
#: sequencer.c:441
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
#: sequencer.c:445
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
#: sequencer.c:474
#, c-format
msgid "%s: fast-forward"
msgstr "%s:快进"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
#: sequencer.c:563
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s:无法写入新索引文件"
#: sequencer.c:579
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
#: sequencer.c:592
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
#: sequencer.c:749
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"If these changes are meant to be squashed into the previous commit, run:\n"
"\n"
" git commit --amend %s\n"
"\n"
"If they are meant to go into a new commit, run:\n"
"\n"
" git commit %s\n"
"\n"
"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
"您的工作区中存在已暂存的修改\n"
"如果这些修改需要被并入前一个提交,执行:\n"
"\n"
" git commit --amend %s\n"
"\n"
"如果这些修改要形成一个新提交,执行:\n"
"\n"
" git commit %s\n"
"\n"
"无论哪种情况,当您完成提交,继续执行:\n"
"\n"
" git rebase --continue\n"
#: sequencer.c:818
msgid "writing root commit"
msgstr "写根提交"
#: sequencer.c:1043
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
#: sequencer.c:1050
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly. Run the\n"
"following command and follow the instructions in your editor to edit\n"
"your configuration file:\n"
"\n"
" git config --global --edit\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
"中编辑您的配置文件:\n"
"\n"
" git config --global --edit\n"
"\n"
"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
"\n"
" git commit --amend --reset-author\n"
#: sequencer.c:1063
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"
#: sequencer.c:1103
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
#: sequencer.c:1105
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
#: sequencer.c:1151
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后,不能解析 HEAD"
#: sequencer.c:1153
msgid "detached HEAD"
msgstr "分离头指针"
# 译者:中文字符串拼接,可删除前导空格
#: sequencer.c:1157
msgid " (root-commit)"
msgstr "(根提交)"
#: sequencer.c:1178
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
#: sequencer.c:1180
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交!"
#: sequencer.c:1184 builtin/commit.c:1528
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
#: sequencer.c:1235 sequencer.c:1832
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
#: sequencer.c:1262 sequencer.c:1317
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "无法写提交对象"
#: sequencer.c:1344
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
#: sequencer.c:1349
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
#: sequencer.c:1500 sequencer.c:1525
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
#: sequencer.c:1510 sequencer.c:4355
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
#: sequencer.c:1512 sequencer.c:2729
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
#: sequencer.c:1514
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
#: sequencer.c:1520
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
#: sequencer.c:1527 git-rebase--interactive.sh:457
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明:"
#: sequencer.c:1535
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
#: sequencer.c:1542
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d:"
#: sequencer.c:1548
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过:"
#: sequencer.c:1553
#, c-format
msgid "unknown command: %d"
msgstr "未知命令:%d"
#: sequencer.c:1631
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
#: sequencer.c:1638
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
#: sequencer.c:1657
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
#: sequencer.c:1665
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
#: sequencer.c:1669
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
#: sequencer.c:1675
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
#: sequencer.c:1694
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:不能解析父提交 %s"
#: sequencer.c:1759
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
#: sequencer.c:1813
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
#: sequencer.c:1814
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
#: sequencer.c:1864
msgid "empty commit set passed"
msgstr "提供了空的提交集"
#: sequencer.c:1874
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s:无法读取索引"
#: sequencer.c:1881
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s:无法刷新索引"
#: sequencer.c:1961
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数:'%s'"
#: sequencer.c:1970
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
#: sequencer.c:2029
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d:%.*s"
#: sequencer.c:2037
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
#: sequencer.c:2108
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
#: sequencer.c:2110
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单:'%s'"
#: sequencer.c:2115
msgid "no commits parsed."
msgstr "没有解析提交。"
#: sequencer.c:2126
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
#: sequencer.c:2128
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
#: sequencer.c:2195
#, c-format
msgid "invalid key: %s"
msgstr "无效键名:%s"
#: sequencer.c:2198
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效:%s"
#: sequencer.c:2269
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
#: sequencer.c:2285
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单:'%s'"
#: sequencer.c:2323
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
#: sequencer.c:2324
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
#: sequencer.c:2327
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
#: sequencer.c:2341
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
#: sequencer.c:2396 sequencer.c:3403
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
#: sequencer.c:2398
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
#: sequencer.c:2400 sequencer.c:2435
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
#: sequencer.c:2421 builtin/grep.c:720
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
#: sequencer.c:2423
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s':%s"
#: sequencer.c:2424
msgid "unexpected end of file"
msgstr "意外的文件结束"
#: sequencer.c:2430
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
#: sequencer.c:2441
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
#: sequencer.c:2545 sequencer.c:3321
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
#: sequencer.c:2583 sequencer.c:3301
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
#: sequencer.c:2641
msgid "could not read index"
msgstr "不能读取索引"
# 译者:注意保持前导空格
#: sequencer.c:2646
#, c-format
msgid ""
"execution failed: %s\n"
"%sYou can fix the problem, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
"执行失败:%s\n"
"%s您可以改正该问题,然后运行\n"
"\n"
" git rebase --continue\n"
"\n"
#: sequencer.c:2652
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
#: sequencer.c:2658
#, c-format
msgid ""
"execution succeeded: %s\n"
"but left changes to the index and/or the working tree\n"
"Commit or stash your changes, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
"执行成功:%s\n"
"但是在索引和/或工作区中存在变更\n"
"提交或贮藏修改,然后运行\n"
"\n"
" git rebase --continue\n"
"\n"
#: sequencer.c:2771
msgid "writing fake root commit"
msgstr "写伪根提交"
#: sequencer.c:2776
msgid "writing squash-onto"
msgstr "写入 squash-onto"
#: sequencer.c:2811
#, c-format
msgid "failed to find tree of %s"
msgstr "无法找到 %s 指向的树。"
#: sequencer.c:2829
msgid "could not write index"
msgstr "不能写入索引"
#: sequencer.c:2861
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
#: sequencer.c:2884
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
#: sequencer.c:2906
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
#: sequencer.c:2916 sequencer.c:2941
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
#: sequencer.c:3005
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
#: sequencer.c:3021
msgid "merge: Unable to write new index file"
msgstr "合并:无法写入新索引文件"
#: sequencer.c:3088
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
#: sequencer.c:3100
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
#: sequencer.c:3103 git-rebase.sh:188
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
"应用 autostash 导致冲突。\n"
"您的修改安全地保存在贮藏区中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
#: sequencer.c:3134
#, c-format
msgid ""
"Could not execute the todo command\n"
"\n"
" %.*s\n"
"It has been rescheduled; To edit the command before continuing, please\n"
"edit the todo list first:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
msgstr ""
"无法执行待办命令\n"
"\n"
" %.*s\n"
"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
#: sequencer.c:3202
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
#: sequencer.c:3264
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
#: sequencer.c:3309
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
#: sequencer.c:3314 sequencer.c:4352
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
#: sequencer.c:3328
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
#: sequencer.c:3414
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基:您有未暂存的变更。"
#: sequencer.c:3423
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
#: sequencer.c:3425
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件:'%s'"
#: sequencer.c:3427
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容:'%s'"
#: sequencer.c:3430
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
#: sequencer.c:3455 sequencer.c:3493
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件:'%s'"
#: sequencer.c:3508
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
#: sequencer.c:3515
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
#: sequencer.c:3612
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s:不能拣选一个%s"
#: sequencer.c:3616
#, c-format
msgid "%s: bad revision"
msgstr "%s:错误的版本"
#: sequencer.c:3649
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
#: sequencer.c:4098
msgid "make_script: unhandled options"
msgstr "make_script:有未能处理的选项"
#: sequencer.c:4101
msgid "make_script: error preparing revisions"
msgstr "make_script:准备版本时错误"
#: sequencer.c:4142 sequencer.c:4177
#, c-format
msgid "unusable todo list: '%s'"
msgstr "不可用的待办列表:'%s'"
#: sequencer.c:4236
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
#: sequencer.c:4302
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
"警告:一些提交可能被意外丢弃。\n"
"丢弃的提交(从新到旧):\n"
#: sequencer.c:4309
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"Use 'git config rebase.missingCommitsCheck' to change the level of "
"warnings.\n"
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
"\n"
"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
"可选值有:ignore、warn、error。\n"
"\n"
#: sequencer.c:4321
#, c-format
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
"或者您可以用 'git rebase --abort' 终止变基。\n"
#: sequencer.c:4375
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
#: sequencer.c:4490
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
#: setup.c:123
#, c-format
msgid "'%s' is outside repository"
msgstr "'%s' 在仓库之外"
#: setup.c:172
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s:工作区中无此路径。\n"
"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
#: setup.c:185
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Use '--' to separate paths from revisions, like this:\n"