# Chinese translations for Git package # Git 软件包的简体中文翻译. # Copyright (C) 2012,2013 Jiang Xin # This file is distributed under the same license as the Git package. # Contributors: # - Fangyi Zhou # - Jiang Xin # - Lian Cheng # - Ray Chen # - Riku # - Thynson # - ws3389 # - Wang Sheng # - 依云 # - Yichao Yu # - Zhuang Ya # # 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 工具 # cover letter | 附函 # 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 \n" "POT-Creation-Date: 2019-06-04 08:24+0800\n" "PO-Revision-Date: 2019-06-04 09:04+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: GitHub \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:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示:%.*s%s\n" #: advice.c:156 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选,因为您有未合并的文件。" #: advice.c:158 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交,因为您有未合并的文件。" #: advice.c:160 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并,因为您有未合并的文件。" #: advice.c:162 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取,因为您有未合并的文件。" #: advice.c:164 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退,因为您有未合并的文件。" #: advice.c:166 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s,因为您有未合并的文件。" #: advice.c:174 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" #: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" #: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" #: advice.c:189 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" #: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" #: advice.c:196 #, 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 \n" "\n" msgstr "" "注意:正在检出 '%s'。\n" "\n" "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另" "外\n" "的检出分支操作丢弃在这个状态下所做的任何提交。\n" "\n" "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n" "参数 -b 来实现(现在或稍后)。例如:\n" "\n" " git checkout -b <新分支名>\n" "\n" #: alias.c:50 msgid "cmdline ends with \\" msgstr "命令行以 \\ 结尾" #: alias.c:51 msgid "unclosed quote" msgstr "未关闭的引号" #: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" #: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" #: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "--reject 和 --3way 不能同时使用。" #: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "--cached 和 --3way 不能同时使用。" #: apply.c:134 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" #: apply.c:145 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" #: apply.c:148 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" #: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" #: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" #: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" #: apply.c:950 #, 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:956 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" #: apply.c:957 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" #: apply.c:962 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" #: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式:%s" #: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头,%d 行和 %d 行" #: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:意外的行:%.*s" #: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息:%.*s" #: apply.c:1571 #, 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:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" #: apply.c:1772 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" #: apply.c:1774 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" #: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" #: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" #: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" #: apply.c:1850 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告:文件 %s 成为空文件但并未删除" #: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏:%.*s" #: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" #: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" #: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" #: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" #: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符:'%c'" #: apply.c:3066 #, 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:3078 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" #: apply.c:3084 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询:\n" "%.*s" #: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" #: apply.c:3114 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" #: apply.c:3161 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" #: apply.c:3171 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" #: apply.c:3179 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s',但其并非空文件" #: apply.c:3197 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" #: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" #: apply.c:3216 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" #: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败:%s:%ld" #: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" #: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" #: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" #: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" #: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" msgstr "%s:不存在于索引中" #: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" msgstr "%s:和索引不匹配" #: apply.c:3579 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" #: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合并...\n" #: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" #: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "无法回落到三方合并...\n" #: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" #: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" #: apply.c:3659 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" #: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" #: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,应为 %o" #: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" #: apply.c:3943 #, c-format msgid "%s: already exists in index" msgstr "%s:已经存在于索引中" #: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已经存在于工作区中" #: apply.c:3966 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" #: apply.c:3971 #, 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:3991 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" #: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "%s:补丁未应用" #: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." #: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" #: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更,但它不在当前 HEAD 中" #: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效(%s)。" #: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" #: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" #: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" #: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" #: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" #: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" #: apply.c:4317 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" #: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" #: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" #: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" #: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" #: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" #: apply.c:4546 msgid "internal error" msgstr "内部错误" #: apply.c:4549 #, 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:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" #: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" #: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" #: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" #: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" #: apply.c:4704 msgid "unrecognized input" msgstr "未能识别的输入" #: apply.c:4724 msgid "unable to read index file" msgstr "无法读取索引文件" #: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s':%s" #: apply.c:4906 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" #: apply.c:4912 apply.c:4927 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" #: apply.c:4920 #, 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:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "无法写入新索引文件" #: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 #: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271 #: builtin/pull.c:207 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 #: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 #: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 msgid "path" msgstr "路径" #: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" #: apply.c:4967 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" #: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "数字" #: apply.c:4970 msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" #: apply.c:4973 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" #: apply.c:4975 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" #: apply.c:4979 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" #: apply.c:4981 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁,而是显示输入的概要" #: apply.c:4983 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁,而是查看补丁是否可应用" #: apply.c:4985 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" #: apply.c:4987 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" #: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" #: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" #: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" #: apply.c:4996 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" #: apply.c:4998 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" #: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" #: apply.c:5003 msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" #: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 #: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "动作" #: apply.c:5005 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" #: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" #: apply.c:5014 msgid "apply the patch in reverse" msgstr "反向应用补丁" #: apply.c:5016 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" #: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" #: apply.c:5020 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 #: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" #: apply.c:5023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" #: apply.c:5026 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" #: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "根目录" #: apply.c:5029 msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" #: archive.c:14 msgid "git archive [] [...]" msgstr "git archive [<选项>] <树或提交> [<路径>...]" #: archive.c:15 msgid "git archive --list" msgstr "git archive --list" #: archive.c:16 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" #: archive.c:17 msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" #: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" #: archive.c:396 #, c-format msgid "no such ref: %.*s" msgstr "无此引用:%.*s" #: archive.c:401 #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名:%s" #: archive.c:414 #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象:%s" #: archive.c:424 msgid "current working directory is untracked" msgstr "当前工作目录未被跟踪" #: archive.c:455 msgid "fmt" msgstr "格式" #: archive.c:455 msgid "archive format" msgstr "归档格式" #: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "前缀" #: archive.c:457 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" #: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 #: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "文件" #: archive.c:459 builtin/archive.c:90 msgid "write the archive to this file" msgstr "归档写入此文件" #: archive.c:461 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" #: archive.c:462 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" #: archive.c:463 msgid "store only" msgstr "只存储" #: archive.c:464 msgid "compress faster" msgstr "压缩速度更快" #: archive.c:472 msgid "compress better" msgstr "压缩效果更好" #: archive.c:475 msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113 #: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 msgid "repo" msgstr "仓库" #: archive.c:478 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "从远程仓库(<仓库>)提取归档文件" #: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "命令" #: archive.c:480 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" #: archive.c:487 msgid "Unexpected option --remote" msgstr "未知参数 --remote" #: archive.c:489 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" #: archive.c:491 msgid "Unexpected option --output" msgstr "未知参数 --output" #: archive.c:513 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" #: archive.c:520 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s':-%d" #: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "不能打开数据对象 %s" #: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式:0%o (SHA1: %s)" #: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "不能读取 %s" #: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" #: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "无法重定向描述符" #: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" #: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路径不是有效的 UTF-8:%s" #: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长(%d 字符,SHA1:%s):%s" #: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %" msgstr "对于本系统时间戳太大:%" #: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" #: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s:%s:%d" #: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时,使用 '\\!'。" #: bisect.c:468 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式:%s" #: bisect.c:678 #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找!\n" #: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" #: bisect.c:758 #, 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:763 #, 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:768 #, 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:776 #, 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:789 #, 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:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中:合并基线必须是经过测试的\n" #: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" #: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" #: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" #: bisect.c:958 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" #: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" #: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数?\n" #: bisect.c:1004 #, 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:1010 #, 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:1794 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" #: blame.c:1808 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" #: blame.c:1829 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" #: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 #: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 #: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 #: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "版本遍历设置失败" #: blame.c:1856 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" #: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" #: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" #: branch.c:53 #, 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:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" #: branch.c:93 #, 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:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" #: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" #: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" #: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" #: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" #: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" #: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" #: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "无法写入上游分支配置" #: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪:引用 %s 有歧义" #: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' 不是一个有效的分支名称。" #: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支名 '%s' 已经存在。" #: branch.c:213 msgid "Cannot force update the current branch." msgstr "无法强制更新当前分支。" #: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" #: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" #: branch.c:237 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:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" #: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" #: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" #: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 #: builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" #: bundle.c:143 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交:" #: bundle.c:194 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用:" msgstr[1] "这个包中含有 %d 个引用:" #: bundle.c:201 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" #: bundle.c:203 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用:" msgstr[1] "这个包需要 %d 个引用:" #: bundle.c:269 msgid "unable to dup bundle descriptor" msgstr "无法复制 bundle 描述符" #: bundle.c:276 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" #: bundle.c:287 msgid "pack-objects died" msgstr "pack-objects 终止" #: bundle.c:329 msgid "rev-list died" msgstr "rev-list 终止" #: bundle.c:378 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" #: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数:%s" #: bundle.c:465 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" #: bundle.c:475 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" #: bundle.c:500 msgid "index-pack died" msgstr "index-pack 终止" #: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "无效的颜色值:%.*s" #: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 #: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" #: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" #: commit.c:193 msgid "" "Support for /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 "" "对 /info/grafts 的支持已被弃用,并将在\n" "未来的Git版本中被移除。\n" "\n" "请使用 \"git replace --convert-graft-file\" 将\n" "grafts 转换为替换引用。\n" "\n" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" #: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" #: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" #: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" #: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" #: commit.c:1391 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:105 msgid "commit-graph file is too small" msgstr "提交图形文件太小" #: commit-graph.c:170 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交图形签名 %X 和签名 %X 不匹配" #: commit-graph.c:177 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交图形版本 %X 和版本 %X 不匹配" #: commit-graph.c:184 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" #: commit-graph.c:207 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "提交图形块查找表条目丢失,文件可能不完整" #: commit-graph.c:218 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "提交图形不正确的块偏移 %08x%08x" #: commit-graph.c:255 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "提交图形块 id %08x 出现了多次" #: commit-graph.c:390 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" #: commit-graph.c:732 builtin/pack-objects.c:2649 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" #: commit-graph.c:765 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" #: commit-graph.c:781 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" #: commit-graph.c:793 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" #: commit-graph.c:813 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" #: commit-graph.c:930 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 个包中查找提交图的提交" msgstr[1] "正在 %d 个包中查找提交图的提交" #: commit-graph.c:943 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" #: commit-graph.c:945 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" #: commit-graph.c:959 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "正在从 %d 个引用中查找提交图的提交" msgstr[1] "正在从 %d 个引用中查找提交图的提交" #: commit-graph.c:991 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" #: commit-graph.c:1004 msgid "Counting distinct commits in commit graph" msgstr "正在计算提交图中不同的提交" #: commit-graph.c:1017 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "提交图格式不能写入 %d 个提交" #: commit-graph.c:1026 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" #: commit-graph.c:1050 msgid "too many commits to write graph" msgstr "提交太多不能画图" #: commit-graph.c:1057 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" #: commit-graph.c:1097 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步写出提交图" msgstr[1] "正在用 %d 步写出提交图" #: commit-graph.c:1162 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误,可能已经损坏" #: commit-graph.c:1172 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s" #: commit-graph.c:1182 commit-graph.c:1197 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u" #: commit-graph.c:1189 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" #: commit-graph.c:1206 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" #: commit-graph.c:1219 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" #: commit-graph.c:1226 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" #: commit-graph.c:1236 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" #: commit-graph.c:1242 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" #: commit-graph.c:1255 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" #: commit-graph.c:1260 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零" #: commit-graph.c:1264 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零" #: commit-graph.c:1279 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "提交图形中的提交 %s 的世代号是 %u != %u" #: commit-graph.c:1285 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "提交图形中提交 %s 的提交日期是 % != %" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "内存耗尽" #: config.c:123 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" "\t%s\n" "from\n" "\t%s\n" "This might be due to circular includes." msgstr "" "超过了最大包含深度(%1$d),当从\n" "\t%3$s\n" "包含\n" "\t%2$s\n" "这可能是因为循环包含。" #: config.c:139 #, c-format msgid "could not expand include path '%s'" msgstr "无法扩展包含路径 '%s'" #: config.c:150 msgid "relative config includes must come from files" msgstr "相对路径的配置文件引用必须来自于文件" #: config.c:190 msgid "relative config include conditionals must come from files" msgstr "相对路径的配置文件条件引用必须来自于文件" #: config.c:348 #, c-format msgid "key does not contain a section: %s" msgstr "键名没有包含一个小节名称:%s" #: config.c:354 #, c-format msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名:%s" #: config.c:378 sequencer.c:2459 #, c-format msgid "invalid key: %s" msgstr "无效键名:%s" #: config.c:384 #, c-format msgid "invalid key (newline): %s" msgstr "无效键名(有换行符):%s" #: config.c:420 config.c:432 #, c-format msgid "bogus config parameter: %s" msgstr "伪配置参数:%s" #: config.c:467 #, c-format msgid "bogus format in %s" msgstr "%s 中格式错误" #: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" #: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" #: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" #: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" #: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" #: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" #: config.c:952 msgid "out of range" msgstr "超出范围" #: config.c:952 msgid "invalid unit" msgstr "无效的单位" #: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" #: config.c:963 #, 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:966 #, 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:969 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" #: config.c:972 #, 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:975 #, 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:978 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" #: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展用户目录:'%s'" #: config.c:1082 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" #: config.c:1173 #, c-format msgid "abbrev length out of range: %d" msgstr "缩写长度超出范围:%d" #: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c:1290 msgid "core.commentChar should only be one character" msgstr "core.commentChar 应该是一个字符" #: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式:%s" #: config.c:1395 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式错误" #: config.c:1421 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式错误:%s" #: config.c:1422 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" #: config.c:1483 builtin/pack-objects.c:3397 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" #: config.c:1604 #, c-format msgid "unable to load config blob object '%s'" msgstr "无法从数据对象 '%s' 加载配置" #: config.c:1607 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 没有指向一个数据对象" #: config.c:1624 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" #: config.c:1654 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" #: config.c:1710 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" #: config.c:2059 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" #: config.c:2229 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s:'%s'" #: config.c:2272 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" #: config.c:2298 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" #: config.c:2344 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" #: config.c:2346 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" #: config.c:2427 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" #: config.c:2459 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" #: config.c:2488 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" #: config.c:2740 config.c:3064 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" #: config.c:2751 #, c-format msgid "opening %s" msgstr "打开 %s" #: config.c:2786 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "无效模式:%s" #: config.c:2811 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" #: config.c:2824 config.c:3077 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" #: config.c:2835 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" #: config.c:2844 config.c:3082 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" #: config.c:2929 config.c:3179 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" #: config.c:2963 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" #: config.c:2965 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" #: config.c:3055 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称:%s" #: config.c:3222 #, c-format msgid "missing value for '%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" "请确认您有正确的访问权限并且仓库存在。" #: connect.c:81 #, c-format msgid "server doesn't support '%s'" msgstr "服务器不支持 '%s'" #: connect.c:103 #, c-format msgid "server doesn't support feature '%s'" msgstr "服务器不支持特性 '%s'" #: connect.c:114 msgid "expected flush after capabilities" msgstr "在能力之后应为一个 flush 包" #: connect.c:233 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "忽略第一行 '%s' 之后的能力字段" #: connect.c:252 msgid "protocol error: unexpected capabilities^{}" msgstr "协议错误:意外的 capabilities^{}" #: connect.c:273 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'" #: connect.c:275 msgid "repository on the other end cannot be shallow" msgstr "另一端的仓库不能是浅克隆仓库" #: connect.c:313 msgid "invalid packet" msgstr "无效数据包" #: connect.c:333 #, c-format msgid "protocol error: unexpected '%s'" msgstr "协议错误:意外的 '%s'" #: connect.c:441 #, c-format msgid "invalid ls-refs response: %s" msgstr "无效的 ls-refs 响应:%s" #: connect.c:445 msgid "expected flush after ref listing" msgstr "在引用列表之后应该有一个 flush 包" #: connect.c:544 #, c-format msgid "protocol '%s' is not supported" msgstr "不支持 '%s' 协议" #: connect.c:595 msgid "unable to set SO_KEEPALIVE on socket" msgstr "无法为 socket 设置 SO_KEEPALIVE" #: connect.c:635 connect.c:698 #, c-format msgid "Looking up %s ... " msgstr "查找 %s ..." #: connect.c:639 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "无法查找 %s(端口 %s)(%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " #: connect.c:643 connect.c:714 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" "完成。\n" "连接到 %s(端口 %s)... " #: connect.c:665 connect.c:742 #, c-format msgid "" "unable to connect to %s:\n" "%s" msgstr "" "无法连接到 %s:\n" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " #: connect.c:671 connect.c:748 msgid "done." msgstr "完成。" #: connect.c:702 #, c-format msgid "unable to look up %s (%s)" msgstr "无法查找 %s(%s)" #: connect.c:708 #, c-format msgid "unknown port %s" msgstr "未知端口 %s" #: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "已阻止奇怪的主机名 '%s'" #: connect.c:847 #, c-format msgid "strange port '%s' blocked" msgstr "已阻止奇怪的端口号 '%s'" #: connect.c:857 #, c-format msgid "cannot start proxy %s" msgstr "不能启动代理 %s" #: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法" #: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "ssh 变体 'simple' 不支持 -4" #: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "ssh 变体 'simple' 不支持 -6" #: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh 变体 'simple' 不支持设置端口" #: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "已阻止奇怪的路径名 '%s'" #: connect.c:1307 msgid "unable to fork" msgstr "无法 fork" #: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "正在检查连通性" #: connected.c:97 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" #: connected.c:117 msgid "failed write to rev-list" msgstr "写入 rev-list 失败" #: connected.c:124 msgid "failed to close rev-list's stdin" msgstr "关闭 rev-list 的标准输入失败" #: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "非法的 crlf 动作 %d" #: 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 convert.c:495 #, 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:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以执行外部过滤器 '%s'" #: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能将输入传递给外部过滤器 '%s'" #: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "外部过滤器 '%s' 失败码 %d" #: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "从外部过滤器 '%s' 读取失败" #: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "外部过滤器 '%s' 失败" #: convert.c:844 msgid "unexpected filter type" msgstr "意外的过滤类型" #: convert.c:855 msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" #: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤" #: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" #: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s:clean 过滤器 '%s' 失败" #: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s:smudge 过滤器 %s 失败" #: date.c:137 msgid "in the future" msgstr "在将来" #: date.c:143 #, c-format msgid "% second ago" msgid_plural "% seconds ago" msgstr[0] "% 秒钟前" msgstr[1] "% 秒钟前" #: date.c:150 #, c-format msgid "% minute ago" msgid_plural "% minutes ago" msgstr[0] "% 分钟前" msgstr[1] "% 分钟前" #: date.c:157 #, c-format msgid "% hour ago" msgid_plural "% hours ago" msgstr[0] "% 小时前" msgstr[1] "% 小时前" #: date.c:164 #, c-format msgid "% day ago" msgid_plural "% days ago" msgstr[0] "% 天前" msgstr[1] "% 天前" #: date.c:170 #, c-format msgid "% week ago" msgid_plural "% weeks ago" msgstr[0] "% 周前" msgstr[1] "% 周前" #: date.c:177 #, c-format msgid "% month ago" msgid_plural "% months ago" msgstr[0] "% 个月前" msgstr[1] "% 个月前" #: date.c:188 #, c-format msgid "% year" msgid_plural "% years" msgstr[0] "% 年" msgstr[1] "% 年" #. TRANSLATORS: "%s" is " years" #: date.c:191 #, c-format msgid "%s, % month ago" msgid_plural "%s, % months ago" msgstr[0] "%s % 个月前" msgstr[1] "%s % 个月前" #: date.c:196 date.c:201 #, c-format msgid "% year ago" msgid_plural "% years ago" msgstr[0] "% 年前" msgstr[1] "% 年前" #: delta-islands.c:272 msgid "Propagating island marks" msgstr "正在传播数据岛标记" #: delta-islands.c:290 #, c-format msgid "bad tree object %s" msgstr "坏的树对象 %s" #: delta-islands.c:334 #, c-format msgid "failed to load island regex for '%s': %s" msgstr "未能加载 '%s' 的数据岛正则表达式:%s" #: delta-islands.c:390 #, c-format msgid "island regex from config has too many capture groups (max=%d)" msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)" #: delta-islands.c:466 #, c-format msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛,结束。\n" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "读取排序文件 '%s' 失败" #: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" #: diff-no-index.c:238 msgid "git diff --no-index [] " msgstr "git diff --no-index [<选项>] <路径> <路径>" #: diff-no-index.c:263 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径" # 译者:注意保持前导空格 #: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" # 译者:注意保持前导空格 #: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" #: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " "'plain'" #: diff.c:324 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" "未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-" "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" #: diff.c:332 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用" #: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" #: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "发现配置变量 'diff.dirstat' 中的错误:\n" "%s" #: diff.c:4210 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出,停止在 %s" #: diff.c:4555 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" #: diff.c:4558 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" #: diff.c:4636 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" #: diff.c:4684 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值:%s" #: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" #: diff.c:4721 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" "无法解析 --dirstat/-X 选项的参数:\n" "%s" #: diff.c:4806 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" #: diff.c:4830 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" #: diff.c:4844 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" #: diff.c:4894 diff.c:4900 #, c-format msgid "%s expects / form" msgstr "%s 期望 / 格式" #: diff.c:4912 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符,得到 '%s'" #: diff.c:4933 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数:%s" #: diff.c:4952 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " #: diff.c:4992 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" #: diff.c:5028 diff.c:5048 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" #: diff.c:5186 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数:'%s'" #: diff.c:5242 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数:%s" #: diff.c:5265 msgid "Diff output format options" msgstr "差异输出格式化选项" #: diff.c:5267 diff.c:5273 msgid "generate patch" msgstr "生成补丁" #: diff.c:5270 builtin/log.c:167 msgid "suppress diff output" msgstr "不显示差异输出" #: diff.c:5275 diff.c:5389 diff.c:5396 msgid "" msgstr "" #: diff.c:5276 diff.c:5279 msgid "generate diffs with lines context" msgstr "生成含 行上下文的差异" #: diff.c:5281 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" #: diff.c:5284 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" #: diff.c:5288 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" #: diff.c:5292 msgid "machine friendly --stat" msgstr "机器友好的 --stat" #: diff.c:5295 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" #: diff.c:5297 diff.c:5305 msgid "..." msgstr "<参数1,参数2>..." #: diff.c:5298 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" #: diff.c:5302 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" #: diff.c:5306 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" #: diff.c:5310 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误,给出警告" #: diff.c:5313 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要,例如创建、重命名和模式变更" #: diff.c:5316 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" #: diff.c:5319 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" #: diff.c:5321 msgid "[,[,]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" #: diff.c:5322 msgid "generate diffstat" msgstr "生成差异统计(diffstat)" #: diff.c:5324 diff.c:5327 diff.c:5330 msgid "" msgstr "<宽度>" #: diff.c:5325 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" #: diff.c:5328 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" #: diff.c:5331 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" #: diff.c:5333 msgid "" msgstr "<次数>" #: diff.c:5334 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" #: diff.c:5337 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" #: diff.c:5340 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" #: diff.c:5343 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" #: diff.c:5345 msgid "show colored diff" msgstr "显示带颜色的差异" #: diff.c:5346 msgid "" msgstr "<类型>" #: diff.c:5347 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符" #: diff.c:5350 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" "在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" #: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465 msgid "" msgstr "<前缀>" #: diff.c:5354 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" #: diff.c:5357 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" #: diff.c:5360 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" #: diff.c:5363 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" #: diff.c:5366 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" #: diff.c:5370 diff.c:5375 diff.c:5380 msgid "" msgstr "<字符>" #: diff.c:5371 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" #: diff.c:5376 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" #: diff.c:5381 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" #: diff.c:5384 msgid "Diff rename options" msgstr "差异重命名选项" #: diff.c:5385 msgid "[/]" msgstr "[/]" #: diff.c:5386 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" #: diff.c:5390 msgid "detect renames" msgstr "检测重命名" #: diff.c:5394 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" #: diff.c:5397 msgid "detect copies" msgstr "检测拷贝" #: diff.c:5401 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" #: diff.c:5403 msgid "disable rename detection" msgstr "禁用重命名探测" #: diff.c:5406 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" #: diff.c:5408 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" #: diff.c:5411 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测" #: diff.c:5413 msgid "Diff algorithm options" msgstr "差异算法选项" #: diff.c:5415 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" #: diff.c:5418 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" #: diff.c:5421 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" #: diff.c:5424 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" #: diff.c:5427 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符(CR)" #: diff.c:5430 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" #: diff.c:5433 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" #: diff.c:5436 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" #: diff.c:5440 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" #: diff.c:5442 msgid "" msgstr "<算法>" #: diff.c:5443 msgid "choose a diff algorithm" msgstr "选择一个差异算法" #: diff.c:5445 msgid "" msgstr "<文本>" #: diff.c:5446 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" #: diff.c:5448 diff.c:5457 diff.c:5460 msgid "" msgstr "<模式>" #: diff.c:5449 msgid "show word diff, using to delimit changed words" msgstr "显示单词差异,使用 <模式> 分隔变更的单词" #: diff.c:5451 diff.c:5454 diff.c:5499 msgid "" msgstr "<正则>" #: diff.c:5452 msgid "use to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" #: diff.c:5455 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" #: diff.c:5458 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" #: diff.c:5461 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" #: diff.c:5464 msgid "Other diff options" msgstr "其它差异选项" #: diff.c:5466 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行,排除目录之外的变更并显示相对路径" #: diff.c:5470 msgid "treat all files as text" msgstr "把所有文件当做文本处理" #: diff.c:5472 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入,反转差异" #: diff.c:5474 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1,否则为 0" #: diff.c:5476 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" #: diff.c:5478 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" #: diff.c:5480 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时,运行外部的文本转换过滤器" #: diff.c:5482 msgid "" msgstr "<何时>" #: diff.c:5483 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时,忽略子模组的更改" #: diff.c:5486 msgid "" msgstr "<格式>" #: diff.c:5487 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" #: diff.c:5491 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" #: diff.c:5494 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" #: diff.c:5496 msgid "" msgstr "<字符串>" #: diff.c:5497 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" #: diff.c:5500 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" #: diff.c:5503 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" #: diff.c:5506 msgid "treat in -S as extended POSIX regular expression" msgstr "将 -S 的 当做扩展的 POSIX 正则表达式" #: diff.c:5509 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" #: diff.c:5510 msgid "" msgstr "<对象 ID>" #: diff.c:5511 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" #: diff.c:5513 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" #: diff.c:5514 msgid "select files by diff type" msgstr "通过差异类型选择文件" #: diff.c:5516 msgid "" msgstr "<文件>" #: diff.c:5517 msgid "Output to a specific file" msgstr "输出到一个指定的文件" #: diff.c:6150 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多,略过不严格的重命名检查。" #: diff.c:6153 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多,只在修改的路径中查找拷贝。" #: diff.c:6156 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" #: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路径规格 '%s' 未匹配任何 git 已知文件" #: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" #: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" #: dir.c:2085 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" #: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" #: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" #: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" #: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" #: editor.c:73 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示:等待您的编辑器关闭文件...%c" #: entry.c:178 msgid "Filtering content" msgstr "过滤内容" #: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" #: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" #: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能设置 GIT_DIR 为 '%s'" #: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "执行 %s 的参数太多" #: fetch-object.c:17 msgid "Remote with no URL" msgstr "远程未设置 URL" #: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack:应为 shallow 列表" #: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包" #: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" #: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" #: fetch-pack.c:196 msgid "unable to write to remote" msgstr "无法写到远程" #: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" #: fetch-pack.c:360 fetch-pack.c:1271 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息:%s" #: fetch-pack.c:366 fetch-pack.c:1277 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息:%s" #: fetch-pack.c:368 fetch-pack.c:1279 #, c-format msgid "object not found: %s" msgstr "对象未找到:%s" #: fetch-pack.c:371 fetch-pack.c:1282 #, c-format msgid "error in object: %s" msgstr "对象中出错:%s" #: fetch-pack.c:373 fetch-pack.c:1284 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow:%s" #: fetch-pack.c:376 fetch-pack.c:1288 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow,却得到 %s" #: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" #: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" #: fetch-pack.c:465 msgid "giving up" msgstr "放弃" #: fetch-pack.c:477 progress.c:284 msgid "done" msgstr "完成" #: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" #: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" #: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s(%s)" #: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack:无法派生 sideband 多路输出" #: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "协议错误:坏的包头" #: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack:无法派生进程 %s" #: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s 失败" #: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" #: fetch-pack.c:906 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" #: fetch-pack.c:910 msgid "Server supports multi_ack_detailed" msgstr "服务器支持 multi_ack_detailed" #: fetch-pack.c:913 msgid "Server supports no-done" msgstr "服务器支持 no-done" #: fetch-pack.c:919 msgid "Server supports multi_ack" msgstr "服务器支持 multi_ack" #: fetch-pack.c:923 msgid "Server supports side-band-64k" msgstr "服务器支持 side-band-64k" #: fetch-pack.c:927 msgid "Server supports side-band" msgstr "服务器支持 side-band" #: fetch-pack.c:931 msgid "Server supports allow-tip-sha1-in-want" msgstr "服务器支持 allow-tip-sha1-in-want" #: fetch-pack.c:935 msgid "Server supports allow-reachable-sha1-in-want" msgstr "服务器支持 allow-reachable-sha1-in-want" #: fetch-pack.c:945 msgid "Server supports ofs-delta" msgstr "服务器支持 ofs-delta" #: fetch-pack.c:951 fetch-pack.c:1144 msgid "Server supports filter" msgstr "服务器支持 filter" #: fetch-pack.c:959 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" #: fetch-pack.c:965 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" #: fetch-pack.c:969 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" #: fetch-pack.c:971 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" #: fetch-pack.c:988 msgid "no common commits" msgstr "没有共同的提交" #: fetch-pack.c:1000 fetch-pack.c:1449 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack:获取失败。" #: fetch-pack.c:1138 msgid "Server does not support shallow requests" msgstr "服务器不支持 shalllow 请求" #: fetch-pack.c:1171 msgid "unable to write request to remote" msgstr "无法将请求写到远程" #: fetch-pack.c:1189 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" #: fetch-pack.c:1195 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s',得到 '%s'" #: fetch-pack.c:1234 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行:'%s'" #: fetch-pack.c:1239 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错:%d" #: fetch-pack.c:1249 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" #: fetch-pack.c:1251 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" #: fetch-pack.c:1293 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错:%d" #: fetch-pack.c:1340 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref,得到 '%s'" #: fetch-pack.c:1345 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref:'%s'" #: fetch-pack.c:1350 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错:%d" #: fetch-pack.c:1676 msgid "no matching remote head" msgstr "没有匹配的远程分支" #: fetch-pack.c:1699 builtin/clone.c:673 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" #: fetch-pack.c:1726 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" #: fetch-pack.c:1729 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" #: gpg-interface.c:318 msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" #: gpg-interface.c:344 msgid "could not create temporary file" msgstr "不能创建临时文件" #: gpg-interface.c:347 #, 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:2113 #, c-format msgid "'%s': unable to read %s" msgstr "'%s':无法读取 %s" #: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" #: grep.c:2141 #, 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:298 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" #: help.c:305 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" #: help.c:314 msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令:" #: help.c:363 git.c:97 #, c-format msgid "unsupported command listing type '%s'" msgstr "不支持的命令列表类型 '%s'" #: help.c:403 msgid "The common Git guides are:" msgstr "最常用的 Git 向导有:" #: help.c:512 msgid "See 'git help ' to read about a specific subcommand" msgstr "执行 'git help ' 来查看特定子命令" #: help.c:517 msgid "External commands" msgstr "外部命令" #: help.c:532 msgid "Command aliases" msgstr "命令别名" #: help.c:596 #, 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:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀,您的系统中未发现 Git 命令。" #: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" #: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "假定你想要的是 '%s' 并继续。" #: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" #: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" #: help.c:699 msgid "" "\n" "The most similar command is" msgid_plural "" "\n" "The most similar commands are" msgstr[0] "" "\n" "最相似的命令是" msgstr[1] "" "\n" "最相似的命令是" #: help.c:714 msgid "git version []" msgstr "git version [<选项>]" #: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s:%s - %s" #: help.c:786 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "您指的是这个么?" msgstr[1] "" "\n" "您指的是这其中的某一个么?" #: ident.c:349 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:379 msgid "no email was given and auto-detection is disabled" msgstr "未提供邮件地址且自动探测被禁用" #: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "无法自动探测邮件地址(得到 '%s')" #: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "未提供姓名且自动探测被禁用" #: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "无法自动探测姓名(得到 '%s')" #: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "不允许空的姓名(对于 <%s>)" #: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符:%s" #: ident.c:436 builtin/commit.c:608 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式:%s" #: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象" #: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象" #: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "无法为提交 %s 加载根树" #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "不能混用多种过滤规格" #: list-objects-filter-options.c:58 msgid "expected 'tree:'" msgstr "期望 'tree:<深度>'" #: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "sparse:path 过滤器支持已被删除" #: list-objects-filter-options.c:158 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:41 msgid "failed to read the cache" msgstr "读取缓存失败" #: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 #: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "无法写新的索引文件" #: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(坏提交)\n" #: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" #: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" #: merge-recursive.c:437 msgid "error building trees" msgstr "创建树出错" #: merge-recursive.c:861 #, c-format msgid "failed to create path '%s'%s" msgstr "创建路径 '%s'%s 失败" #: merge-recursive.c:872 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" #: merge-recursive.c:886 merge-recursive.c:905 msgid ": perhaps a D/F conflict?" msgstr ":可能是一个目录/文件冲突?" #: merge-recursive.c:895 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" #: merge-recursive.c:936 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" #: merge-recursive.c:939 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" #: merge-recursive.c:963 #, c-format msgid "failed to open '%s': %s" msgstr "打开 '%s' 失败:%s" #: merge-recursive.c:974 #, c-format msgid "failed to symlink '%s': %s" msgstr "创建符号链接 '%s' 失败:%s" #: merge-recursive.c:979 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" #: merge-recursive.c:1175 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s (没有检出)" #: merge-recursive.c:1182 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "无法合并子模组 %s(提交不存在)" #: merge-recursive.c:1189 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s (提交未跟随合并基线)" #: merge-recursive.c:1197 merge-recursive.c:1209 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交:" #: merge-recursive.c:1200 merge-recursive.c:1212 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快进子模组 %s" #: merge-recursive.c:1235 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "无法合并子模组 %s (没发现合并跟随的提交)" #: merge-recursive.c:1239 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "无法合并子模组 %s(非快进)" #: merge-recursive.c:1240 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案:\n" #: merge-recursive.c:1243 #, 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:1252 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s (发现多个合并)" #: merge-recursive.c:1325 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" #: merge-recursive.c:1330 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" #: merge-recursive.c:1362 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" #: merge-recursive.c:1385 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" #: merge-recursive.c:1457 #, 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:1462 #, 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:1469 #, 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:1474 #, 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:1509 msgid "rename" msgstr "重命名" #: merge-recursive.c:1509 msgid "renamed" msgstr "重命名" #: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" #: merge-recursive.c:1599 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" #: merge-recursive.c:1657 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" #: merge-recursive.c:1687 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" #: merge-recursive.c:1692 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" #: merge-recursive.c:1711 #, 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:1716 msgid " (left unresolved)" msgstr "(留下未解决)" #: merge-recursive.c:1825 #, 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:2030 #, 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:2062 #, 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:2072 #, 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:2164 #, 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:2408 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" #: merge-recursive.c:2929 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" #: merge-recursive.c:2932 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" #: merge-recursive.c:2996 msgid "modify" msgstr "修改" #: merge-recursive.c:2996 msgid "modified" msgstr "修改" #: merge-recursive.c:3008 msgid "content" msgstr "内容" #: merge-recursive.c:3012 msgid "add/add" msgstr "添加/添加" #: merge-recursive.c:3035 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s(已经做过相同合并)" #: merge-recursive.c:3057 git-submodule.sh:937 msgid "submodule" msgstr "子模组" #: merge-recursive.c:3058 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突(%s):合并冲突于 %s" #: merge-recursive.c:3088 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" #: merge-recursive.c:3170 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" "路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。" #: merge-recursive.c:3173 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" "冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动" "到 %s。" #: merge-recursive.c:3177 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" "路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移" "动到 %5$s。" #: merge-recursive.c:3180 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" "冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中," "建议将其移动到 %5$s。" #: merge-recursive.c:3294 #, c-format msgid "Removing %s" msgstr "删除 %s" #: merge-recursive.c:3317 msgid "file/directory" msgstr "文件/目录" #: merge-recursive.c:3322 msgid "directory/file" msgstr "目录/文件" #: merge-recursive.c:3329 #, 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:3338 #, c-format msgid "Adding %s" msgstr "添加 %s" #: merge-recursive.c:3347 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "冲突(add/add):合并冲突于 %s" #: merge-recursive.c:3385 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" "您对下列文件的本地修改将被合并操作覆盖:\n" " %s" #: merge-recursive.c:3396 msgid "Already up to date!" msgstr "已经是最新的!" #: merge-recursive.c:3405 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" #: merge-recursive.c:3504 msgid "Merging:" msgstr "合并:" #: merge-recursive.c:3517 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先:" msgstr[1] "发现 %u 个共同祖先:" #: merge-recursive.c:3556 msgid "merge returned no commit" msgstr "合并未返回提交" #: merge-recursive.c:3622 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" #: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 msgid "Unable to write index." msgstr "不能写入索引。" #: midx.c:66 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" #: midx.c:82 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" #: midx.c:87 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" #: midx.c:92 #, c-format msgid "hash version %u does not match" msgstr "散列版本 %u 不匹配" #: midx.c:106 msgid "invalid chunk offset (too large)" msgstr "无效的块偏移(太大)" #: midx.c:130 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "终止多包索引块 id 出现时间早于预期" #: midx.c:143 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" #: midx.c:145 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的对象 ID 扇出块" #: midx.c:147 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的对象 ID 查询块" #: midx.c:149 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" #: midx.c:163 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序:'%s' 在 '%s' 之前" #: midx.c:208 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id:%u(共有 %u 个包)" #: midx.c:258 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移,但是 off_t 太小" #: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "从多包索引准备 packfile 出错" #: midx.c:457 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" #: midx.c:463 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" #: midx.c:557 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" #: midx.c:993 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" #: midx.c:1048 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" #: midx.c:1063 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "对象 ID 扇出无序:fanout[%d] = % > % = fanout[%d]" #: midx.c:1067 msgid "Verifying OID order in MIDX" msgstr "正在校验 MIDX 中的对象 ID 顺序" #: midx.c:1076 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]" #: midx.c:1095 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" #: midx.c:1101 msgid "Verifying object offsets" msgstr "校验对象偏移" #: midx.c:1117 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" #: midx.c:1123 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" #: midx.c:1132 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "oid[%d] = %s 错误的对象偏移:% != %" #: name-hash.c:531 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "不能创建 lazy_dir 线程:%s" #: name-hash.c:553 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "不能创建 lazy_name 线程:%s" #: name-hash.c:559 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "不能加入 lasy_name 线程:%s" #: notes-merge.c:277 #, 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:284 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "您尚未结束注释合并(存在 %s)。" #: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" #: notes-utils.c:105 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值:'%s'" #: notes-utils.c:115 #, 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:145 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值:'%s'" #: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "无效的对象类型 \"%s\"" #: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "对象 %s 是一个 %s,不是一个 %s" #: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "对象 %s 有未知的类型 id %d" #: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象:%s" #: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" #: packfile.c:617 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前(损坏的 .idx?)" #: packfile.c:1868 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" #: packfile.c:1872 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" #: parse-options.c:38 #, c-format msgid "%s requires a value" msgstr "%s 需要一个值" #: parse-options.c:73 #, c-format msgid "%s is incompatible with %s" msgstr "%s 与 %s 不兼容" #: parse-options.c:78 #, c-format msgid "%s : incompatible with something else" msgstr "%s:和其它的不兼容" #: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s 不取值" #: parse-options.c:94 #, c-format msgid "%s isn't available" msgstr "%s 不可用" #: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" #: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)" #: parse-options.c:423 parse-options.c:431 #, c-format msgid "did you mean `--%s` (with two dashes ?)" msgstr "你的意思是 `--%s`(有两个短线?)" #: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" #: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "未知开关 `%c'" #: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字符串中未知的非 ascii 字符选项:`%s'" #: parse-options.c:887 msgid "..." msgstr "..." #: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "用法:%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. #: parse-options.c:912 #, c-format msgid " or: %s" msgstr " 或:%s" # 译者:为保证在输出中对齐,注意调整句中空格! #: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" #: parse-options.c:954 msgid "-NUM" msgstr "-数字" #: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "--%s 的别名" #: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format msgid "option `%s' expects a numerical value" msgstr "选项 `%s' 期望一个数字值" #: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" msgstr "格式错误的到期时间:'%s'" #: parse-options-cb.c:54 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" #: parse-options-cb.c:130 parse-options-cb.c:147 #, c-format msgid "malformed object name '%s'" msgstr "格式错误的对象名 '%s'" #: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" #: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" #: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "只允许一个 'attr:' 规格。" #: pathspec.c:149 msgid "attr spec must not be empty" msgstr "属性规格不能为空" #: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "无效的属性名 %s" #: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" #: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" #: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路径规格包含无效的神奇前缀" #: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" #: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" #: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" #: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s:'literal' 和 'glob' 不兼容" #: pathspec.c:440 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s:'%s' 在仓库之外" #: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'(助记符:'%c')" #: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s:路径规格神奇前缀不被此命令支持:%s" #: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "无法写 flush 包" #: pkt-line.c:99 msgid "unable to write delim packet" msgstr "无法写 delim 包" #: pkt-line.c:106 msgid "flush packet write failed" msgstr "flush 包写错误" #: pkt-line.c:146 pkt-line.c:232 msgid "protocol error: impossibly long line" msgstr "协议错误:不可能的长行" #: pkt-line.c:162 pkt-line.c:164 msgid "packet write with format failed" msgstr "格式化包写入错误" #: pkt-line.c:196 msgid "packet write failed - data exceeds max packet size" msgstr "写数据包失败:数据超过了包的最大长度" #: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "数据包写入失败" #: pkt-line.c:295 msgid "read error" msgstr "读取错误" #: pkt-line.c:303 msgid "the remote end hung up unexpectedly" msgstr "远端意外挂断了" #: pkt-line.c:331 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "协议错误:错误的行长度字符串:%.4s" #: pkt-line.c:341 pkt-line.c:346 #, c-format msgid "protocol error: bad line length %d" msgstr "协议错误:错误的行长度 %d" #: pkt-line.c:362 #, c-format msgid "remote error: %s" msgstr "远程错误:%s" #: preload-index.c:119 msgid "Refreshing index" msgstr "正在刷新索引" #: preload-index.c:138 #, c-format msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat:%s" #: pretty.c:966 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" #: range-diff.c:56 msgid "could not start `log`" msgstr "不能启动 `log`" #: range-diff.c:59 msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" #: range-diff.c:74 sequencer.c:4897 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" #: range-diff.c:224 msgid "failed to generate diff" msgstr "生成 diff 失败" #: range-diff.c:455 range-diff.c:457 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" #: read-cache.c:680 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)" #: read-cache.c:696 msgid "cannot create an empty blob in the object database" msgstr "不能在对象数据库中创建空的数据对象" #: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s:只能添加常规文件、符号链接或 git 目录" #: read-cache.c:723 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 没有检出一个提交" #: read-cache.c:775 #, c-format msgid "unable to index file '%s'" msgstr "无法索引文件 '%s'" #: read-cache.c:794 #, c-format msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" #: read-cache.c:805 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" #: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" #: read-cache.c:1499 msgid "Refresh index" msgstr "刷新索引" #: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" "设置了 index.version,但是取值无效。\n" "使用版本 %i" #: read-cache.c:1623 #, 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:1679 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" #: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" #: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "坏的索引文件 sha1 签名" #: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # #: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" #: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" #: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" #: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" #: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" #: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 #: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358 #: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955 #: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498 #: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271 #: builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "索引文件损坏" #: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程:%s" #: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程:%s" #: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s:打开索引文件失败" #: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s:不能对打开的索引执行 stat 操作" #: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s:索引文件比预期的小" #: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s:无法对索引文件执行 map 操作" #: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程:%s" #: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程:%s" #: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" #: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s" #: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" #: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" #: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录:%s" #: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "无法删除:%s" #: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" #: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s:不能落到暂存区 #0" #: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" #: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" "p, pick = use commit\n" "r, reword = use commit, but edit the commit message\n" "e, edit = use commit, but stop for amending\n" "s, squash = use commit, but meld into previous commit\n" "f, fixup = like \"squash\", but discard this commit's log message\n" "x, exec = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop = remove commit\n" "l, label