# 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 工具 # 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: 2018-03-16 07:29+0800\n" "PO-Revision-Date: 2018-03-25 22:20+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:62 #, c-format msgid "hint: %.*s\n" msgstr "提示：%.*s\n" #: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" #: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" #: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" #: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" #: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" #: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" #: advice.c:108 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:116 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" #: advice.c:121 builtin/merge.c:1251 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" #: advice.c:123 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" #: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" #: advice.c:130 #, 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" #: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" #: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" #: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "--reject 和 --3way 不能同时使用。" #: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "--cached 和 --3way 不能同时使用。" #: apply.c:127 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" #: apply.c:138 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" #: apply.c:141 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" #: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" #: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" #: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" #: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" #: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" #: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" #: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" #: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式：%s" #: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头，%d 行和 %d 行" #: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" #: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" #: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " "component (line %d)" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" #: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）" #: apply.c:1763 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" #: apply.c:1765 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" #: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" #: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" #: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" #: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" #: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" #: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" #: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" #: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" #: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" #: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" #: apply.c:3055 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" #: apply.c:3067 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" #: apply.c:3073 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询：\n" "%.*s" #: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" #: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" #: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" #: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" #: apply.c:3167 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" #: apply.c:3185 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" #: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" #: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" #: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" #: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" #: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" #: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" #: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" #: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" #: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" #: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" #: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合并...\n" #: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" #: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "无法回落到三方合并...\n" #: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" #: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" #: apply.c:3640 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" #: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" #: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" #: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" #: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" #: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" #: apply.c:3945 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" #: apply.c:3950 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" #: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" #: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" #: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." #: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" #: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" #: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" #: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" #: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" #: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" #: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" #: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" #: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" #: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" #: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" #: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "无法写入 '%s'" #: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" #: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" #: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" #: apply.c:4523 msgid "internal error" msgstr "内部错误" #: apply.c:4526 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." #: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" #: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" #: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" #: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" #: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" #: apply.c:4681 msgid "unrecognized input" msgstr "未能识别的输入" #: apply.c:4700 msgid "unable to read index file" msgstr "无法读取索引文件" #: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" #: apply.c:4864 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" #: apply.c:4870 apply.c:4885 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" #: apply.c:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后，应用了 %d 行。" msgstr[1] "修复空白错误后，应用了 %d 行。" #: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "无法写入新索引文件" #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 #: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 #: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 #: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 #: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 #: git-add--interactive.perl:197 msgid "path" msgstr "路径" #: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" #: apply.c:4925 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" #: apply.c:4927 builtin/am.c:2263 msgid "num" msgstr "数字" #: apply.c:4928 msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" #: apply.c:4931 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" #: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" #: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" #: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" #: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" #: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" #: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" #: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" #: apply.c:4950 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" #: apply.c:4952 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" #: apply.c:4954 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" #: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" #: apply.c:4959 msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 #: builtin/pack-objects.c:3035 msgid "action" msgstr "动作" #: apply.c:4961 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" #: apply.c:4964 apply.c:4967 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" #: apply.c:4970 msgid "apply the patch in reverse" msgstr "反向应用补丁" #: apply.c:4972 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" #: apply.c:4974 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" #: apply.c:4976 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 #: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 #: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "冗长输出" #: apply.c:4979 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" #: apply.c:4982 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" #: apply.c:4984 builtin/am.c:2251 msgid "root" msgstr "根目录" #: apply.c:4985 msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" #: archive.c:13 msgid "git archive [] [...]" msgstr "git archive [<选项>] <树或提交> [<路径>...]" #: archive.c:14 msgid "git archive --list" msgstr "git archive --list" #: archive.c:15 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" #: archive.c:16 msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" #: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" #: archive.c:436 msgid "fmt" msgstr "格式" #: archive.c:436 msgid "archive format" msgstr "归档格式" #: archive.c:437 builtin/log.c:1462 msgid "prefix" msgstr "前缀" #: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" #: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 #: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:165 msgid "file" msgstr "文件" #: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入此文件" #: archive.c:442 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" #: archive.c:443 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" #: archive.c:444 msgid "store only" msgstr "只存储" #: archive.c:445 msgid "compress faster" msgstr "压缩速度更快" #: archive.c:453 msgid "compress better" msgstr "压缩效果更好" #: archive.c:456 msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 #: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 msgid "repo" msgstr "仓库" #: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "从远程仓库（<仓库>）提取归档文件" #: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "命令" #: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" #: archive.c:468 msgid "Unexpected option --remote" msgstr "未知参数 --remote" #: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" #: archive.c:472 msgid "Unexpected option --output" msgstr "未知参数 --output" #: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" #: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" #: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" #: bisect.c:460 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" #: bisect.c:668 #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" #: bisect.c:722 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" #: bisect.c:746 #, 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:751 #, 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:756 #, 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:764 #, 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:777 #, 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:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" #: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" #: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" #: bisect.c:920 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" #: bisect.c:950 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" #: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" #: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" #: bisect.c:996 #, 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:1002 #, 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:1758 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" #: blame.c:1769 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" #: blame.c:1789 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" #: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 #: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 #: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "版本遍历设置失败" #: blame.c:1816 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" #: blame.c:1827 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" #: blame.c:1838 #, 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:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名：'%s'。" #: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名：'%s'。" #: branch.c:305 #, 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:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" #: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" #: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" #: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" #: bundle.c:190 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用：" msgstr[1] "这个包中含有 %d 个引用：" #: bundle.c:197 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" #: bundle.c:199 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用：" msgstr[1] "这个包需要 %d 个引用：" #: bundle.c:258 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" #: bundle.c:269 msgid "pack-objects died" msgstr "pack-objects 终止" #: bundle.c:311 msgid "rev-list died" msgstr "rev-list 终止" #: bundle.c:360 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" #: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" #: bundle.c:458 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" #: bundle.c:470 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" #: bundle.c:498 msgid "index-pack died" msgstr "index-pack 终止" #: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" #: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 #: builtin/am.c:1436 builtin/am.c:2072 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" #: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交！" #: commit.c:1506 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" #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "内存耗尽" #: config.c:186 msgid "relative config include conditionals must come from files" msgstr "包含相对路径的条件引用必须来自于文件" #: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" #: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" #: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" #: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" #: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" #: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" #: config.c:868 msgid "out of range" msgstr "超出范围" #: config.c:868 msgid "invalid unit" msgstr "无效的单位" #: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" #: config.c:879 #, 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:882 #, 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:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" #: config.c:888 #, 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:891 #, 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:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展 '%s' 中的用户目录" #: config.c:998 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" #: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c:1225 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" #: config.c:1386 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" #: config.c:1582 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" #: config.c:1914 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" #: config.c:2101 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" #: config.c:2144 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'" #: config.c:2170 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" #: config.c:2195 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" #: config.c:2197 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" #: config.c:2256 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" #: config.c:2599 config.c:2816 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" #: config.c:2706 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" #: config.c:2708 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" #: connect.c:52 msgid "The remote end hung up upon initial contact" msgstr "远端在连接发起时即挂断" #: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" "Please make sure you have the correct access rights\n" "and the repository exists." msgstr "" "无法读取远程仓库。\n" "\n" "请确认您有正确的访问权限并且仓库存在。" #: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 msgid "Checking connectivity" msgstr "检查连接中" #: connected.c:78 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" #: connected.c:98 msgid "failed write to rev-list" msgstr "无法写入 rev-list" #: connected.c:105 msgid "failed to close rev-list's stdin" msgstr "无法关闭 rev-list 的标准输入" #: convert.c:205 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "文件 %s 中的 CRLF 将被 LF 替换。" #: convert.c:207 #, 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:215 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "文件 %s 中的 LF 将被 CRLF 替换" #: convert.c:217 #, 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" "在工作区中该文件仍保持原有的换行符。" #: date.c:116 msgid "in the future" msgstr "在将来" #: date.c:122 #, c-format msgid "% second ago" msgid_plural "% seconds ago" msgstr[0] "% 秒钟前" msgstr[1] "% 秒钟前" #: date.c:129 #, c-format msgid "% minute ago" msgid_plural "% minutes ago" msgstr[0] "% 分钟前" msgstr[1] "% 分钟前" #: date.c:136 #, c-format msgid "% hour ago" msgid_plural "% hours ago" msgstr[0] "% 小时前" msgstr[1] "% 小时前" #: date.c:143 #, c-format msgid "% day ago" msgid_plural "% days ago" msgstr[0] "% 天前" msgstr[1] "% 天前" #: date.c:149 #, c-format msgid "% week ago" msgid_plural "% weeks ago" msgstr[0] "% 周前" msgstr[1] "% 周前" #: date.c:156 #, c-format msgid "% month ago" msgid_plural "% months ago" msgstr[0] "% 个月前" msgstr[1] "% 个月前" #: date.c:167 #, c-format msgid "% year" msgid_plural "% years" msgstr[0] "% 年" msgstr[1] "% 年" #. TRANSLATORS: "%s" is " years" #: date.c:170 #, c-format msgid "%s, % month ago" msgid_plural "%s, % months ago" msgstr[0] "%s % 个月前" msgstr[1] "%s % 个月前" #: date.c:175 date.c:180 #, c-format msgid "% year ago" msgid_plural "% years ago" msgstr[0] "% 年前" msgstr[1] "% 年前" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "无法读取排序文件 '%s'" #: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" #: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "选项 '%s' 需要一个值" # 译者：注意保持前导空格 #: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 #: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" #: diff.c:281 msgid "" "color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " "'plain'" msgstr "" "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'" #: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" #: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" #: diff.c:3822 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" #: diff.c:4146 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" #: diff.c:4149 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" #: diff.c:4237 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" #: diff.c:4403 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" #: diff.c:4417 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" #: diff.c:5493 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多，略过不严格的重命名检查。" #: diff.c:5496 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多，只在修改的路径中查找拷贝。" #: diff.c:5499 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" #: dir.c:1866 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" #: dir.c:2108 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" #: dir.c:2232 msgid "Untracked cache is disabled on this system or location." msgstr "缓存未跟踪文件在本系统或位置中被禁用。" #: dir.c:3024 dir.c:3029 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" #: dir.c:3054 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" #: editor.c:61 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" #: entry.c:177 msgid "Filtering content" msgstr "过滤内容" #: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" #: fetch-object.c:17 msgid "Remote with no URL" msgstr "远程未设置 URL" #: fetch-pack.c:253 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" #: fetch-pack.c:265 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" #: fetch-pack.c:284 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "远程错误：%s" #: fetch-pack.c:285 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" #: fetch-pack.c:337 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" #: fetch-pack.c:428 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" #: fetch-pack.c:434 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" #: fetch-pack.c:436 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" #: fetch-pack.c:439 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" #: fetch-pack.c:441 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" #: fetch-pack.c:444 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" #: fetch-pack.c:485 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" #: fetch-pack.c:499 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" #: fetch-pack.c:532 msgid "giving up" msgstr "放弃" #: fetch-pack.c:542 progress.c:229 msgid "done" msgstr "完成" #: fetch-pack.c:554 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" #: fetch-pack.c:600 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" #: fetch-pack.c:788 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" #: fetch-pack.c:829 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" #: fetch-pack.c:837 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" #: fetch-pack.c:895 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" #: fetch-pack.c:911 #, c-format msgid "%s failed" msgstr "%s 失败" #: fetch-pack.c:913 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" #: fetch-pack.c:940 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" #: fetch-pack.c:944 msgid "Server supports multi_ack_detailed" msgstr "服务器支持 multi_ack_detailed" #: fetch-pack.c:947 msgid "Server supports no-done" msgstr "服务器支持 no-done" #: fetch-pack.c:953 msgid "Server supports multi_ack" msgstr "服务器支持 multi_ack" #: fetch-pack.c:957 msgid "Server supports side-band-64k" msgstr "服务器支持 side-band-64k" #: fetch-pack.c:961 msgid "Server supports side-band" msgstr "服务器支持 side-band" #: fetch-pack.c:965 msgid "Server supports allow-tip-sha1-in-want" msgstr "服务器支持 allow-tip-sha1-in-want" #: fetch-pack.c:969 msgid "Server supports allow-reachable-sha1-in-want" msgstr "服务器支持 allow-reachable-sha1-in-want" #: fetch-pack.c:979 msgid "Server supports ofs-delta" msgstr "服务器支持 ofs-delta" #: fetch-pack.c:985 msgid "Server supports filter" msgstr "服务器支持 filter" #: fetch-pack.c:993 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" #: fetch-pack.c:999 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" #: fetch-pack.c:1003 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" #: fetch-pack.c:1005 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" #: fetch-pack.c:1016 msgid "no common commits" msgstr "没有共同的提交" #: fetch-pack.c:1028 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" #: fetch-pack.c:1190 msgid "no matching remote head" msgstr "没有匹配的远程分支" #: fetch-pack.c:1212 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" #: fetch-pack.c:1215 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" #: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" #: gpg-interface.c:211 msgid "could not create temporary file" msgstr "不能创建临时文件" #: gpg-interface.c:214 #, 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:2022 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" #: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" #: grep.c:2050 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" #: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" #: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" #: help.c:217 msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令：" #: help.c:281 #, 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:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" #: help.c:358 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。" #: help.c:363 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "假定你想要的是 '%s' 并继续。" #: help.c:368 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。" #: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" #: help.c:380 msgid "" "\n" "The most similar command is" msgid_plural "" "\n" "The most similar commands are" msgstr[0] "" "\n" "最相似的命令是" msgstr[1] "" "\n" "最相似的命令是" #: help.c:395 msgid "git version []" msgstr "git version [<选项>]" #: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" #: help.c:466 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "您指的是这个么？" msgstr[1] "" "\n" "您指的是这其中的某一个么？" #: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" "\n" "Run\n" "\n" " git config --global user.email \"you@example.com\"\n" " git config --global user.name \"Your Name\"\n" "\n" "to set your account's default identity.\n" "Omit --global to set the identity only in this repository.\n" "\n" msgstr "" "\n" "*** 请告诉我你是谁。\n" "\n" "运行\n" "\n" " git config --global user.email \"you@example.com\"\n" " git config --global user.name \"Your Name\"\n" "\n" "来设置您账号的缺省身份标识。\n" "如果仅在本仓库设置身份标识，则省略 --global 参数。\n" #: ident.c:366 msgid "no email was given and auto-detection is disabled" msgstr "未提供邮件地址且自动探测被禁用" #: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "无法自动探测邮件地址（得到 '%s'）" #: ident.c:381 msgid "no name was given and auto-detection is disabled" msgstr "未提供姓名且自动探测被禁用" #: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "无法自动探测姓名（得到 '%s'）" #: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "不允许空的姓名（对于 <%s>）" #: ident.c:401 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符：%s" #: ident.c:416 builtin/commit.c:582 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "不能混用多种过滤规格" #: list-objects-filter-options.c:126 msgid "cannot change partial clone promisor remote" msgstr "无法修改部分克隆的 promisor 远程仓库" #: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" "\n" "Another git process seems to be running in this repository, e.g.\n" "an editor opened by 'git commit'. Please make sure all processes\n" "are terminated then try again. If it still fails, a git process\n" "may have crashed in this repository earlier:\n" "remove the file manually to continue." msgstr "" "无法创建 '%s.lock'：%s。\n" "\n" "似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n" "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n" "可能之前有一个 git 进程在这个仓库中异常退出：\n" "手动删除这个文件再继续。" #: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "不能创建 '%s.lock'：%s" #: merge.c:74 msgid "failed to read the cache" msgstr "无法读取缓存" #: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 #: builtin/checkout.c:599 builtin/clone.c:759 msgid "unable to write new index file" msgstr "无法写新的索引文件" #: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "（坏提交）\n" #: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" #: merge-recursive.c:329 msgid "error building trees" msgstr "无法创建树" #: merge-recursive.c:771 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" #: merge-recursive.c:782 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" #: merge-recursive.c:796 merge-recursive.c:815 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" #: merge-recursive.c:805 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" #: merge-recursive.c:847 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" #: merge-recursive.c:849 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" #: merge-recursive.c:873 #, c-format msgid "failed to open '%s': %s" msgstr "无法打开 '%s'：%s" #: merge-recursive.c:884 #, c-format msgid "failed to symlink '%s': %s" msgstr "无法创建符号链接 '%s'：%s" #: merge-recursive.c:889 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" #: merge-recursive.c:1029 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" #: merge-recursive.c:1034 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" #: merge-recursive.c:1146 #, 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:1151 #, 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:1158 #, 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:1163 #, 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:1197 msgid "rename" msgstr "重命名" #: merge-recursive.c:1197 msgid "renamed" msgstr "重命名" #: merge-recursive.c:1254 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" #: merge-recursive.c:1279 #, 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:1284 msgid " (left unresolved)" msgstr "（留下未解决）" #: merge-recursive.c:1346 #, 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:1379 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" #: merge-recursive.c:1582 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" #: merge-recursive.c:1597 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" #: merge-recursive.c:1604 merge-recursive.c:1834 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" #: merge-recursive.c:1661 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" #: merge-recursive.c:1664 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" #: merge-recursive.c:1733 msgid "modify" msgstr "修改" #: merge-recursive.c:1733 msgid "modified" msgstr "修改" #: merge-recursive.c:1743 msgid "content" msgstr "内容" #: merge-recursive.c:1750 msgid "add/add" msgstr "添加/添加" #: merge-recursive.c:1786 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" #: merge-recursive.c:1800 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" #: merge-recursive.c:1804 git-submodule.sh:879 msgid "submodule" msgstr "子模组" #: merge-recursive.c:1805 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" #: merge-recursive.c:1899 #, c-format msgid "Removing %s" msgstr "删除 %s" #: merge-recursive.c:1925 msgid "file/directory" msgstr "文件/目录" #: merge-recursive.c:1931 msgid "directory/file" msgstr "目录/文件" #: merge-recursive.c:1938 #, 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:1947 #, c-format msgid "Adding %s" msgstr "添加 %s" #: merge-recursive.c:1987 #, c-format msgid "Dirty index: cannot merge (dirty: %s)" msgstr "脏索引：不能合并（脏文件：%s）" #: merge-recursive.c:1991 msgid "Already up to date!" msgstr "已经是最新的！" #: merge-recursive.c:2000 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" #: merge-recursive.c:2097 msgid "Merging:" msgstr "合并：" #: merge-recursive.c:2110 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" #: merge-recursive.c:2149 msgid "merge returned no commit" msgstr "合并未返回提交" #: merge-recursive.c:2212 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" #: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 msgid "Unable to write index." msgstr "不能写入索引。" #: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" "您的前一次注释合并尚未结束（存在 %s）。\n" "在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git " "notes merge --abort' 来提交/终止前一次合并。" #: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "您尚未结束注释合并（存在 %s）。" #: notes-utils.c:43 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" #: notes-utils.c:102 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值：'%s'" #: notes-utils.c:112 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" #. TRANSLATORS: The first %s is the name of #. the environment variable, the second %s is #. its value. #. #: notes-utils.c:142 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" #: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" #: packfile.c:561 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" #: packfile.c:1694 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" #: packfile.c:1698 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" #: parse-options.c:619 msgid "..." msgstr "..." #: parse-options.c:638 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. #: parse-options.c:644 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ #: parse-options.c:647 #, c-format msgid " %s" msgstr " %s" #: parse-options.c:686 msgid "-NUM" msgstr "-数字" #: parse-options-cb.c:108 #, c-format msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" #: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" #: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" #: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." msgstr "只允许一个 'attr:' 规格。" #: pathspec.c:150 msgid "attr spec must not be empty" msgstr "属性规格不能为空" #: pathspec.c:193 #, c-format msgid "invalid attribute name %s" msgstr "无效的属性名 %s" #: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" #: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" #: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路径规格包含无效的神奇前缀" #: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" #: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" #: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" #: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不兼容" #: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s：'%s' 在仓库之外" #: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助记符：'%c'）" #: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规格神奇前缀不被此命令支持：%s" #: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" #: read-cache.c:1473 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" #: read-cache.c:1483 #, 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:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" #: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" #: read-cache.c:2461 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" #: read-cache.c:2473 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" #: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" #: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔离环境中禁止更新引用" #: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" #: refs/files-backend.c:1203 refs/packed-backend.c:1528 #: refs/packed-backend.c:1538 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" #: refs/files-backend.c:1206 refs/packed-backend.c:1541 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" #: ref-filter.c:35 wt-status.c:1842 msgid "gone" msgstr "丢失" #: ref-filter.c:36 #, c-format msgid "ahead %d" msgstr "领先 %d" #: ref-filter.c:37 #, c-format msgid "behind %d" msgstr "落后 %d" #: ref-filter.c:38 #, c-format msgid "ahead %d, behind %d" msgstr "领先 %d，落后 %d" #: ref-filter.c:107 #, c-format msgid "expected format: %%(color:)" msgstr "期望的格式：%%(color:<颜色>)" #: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色：%%(color:%s)" #: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整数值 refname:lstrip=%s" #: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" #: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) 参数：%s" #: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不带参数" #: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) 不带参数" #: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 参数：%s" #: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一个正数 contents:lines=%s" #: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) 参数：%s" #: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "期望一个正数 objectname:short=%s" #: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "未能识别的 %%(objectname) 参数：%s" #: ref-filter.c:278 #, c-format msgid "expected format: %%(align:,)" msgstr "期望的格式：%%(align:<宽度>,<位置>)" #: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的位置：%s" #: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" #: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) 参数：%s" #: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" #: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) 参数：%s" #: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "非法的字段名：%.*s" #: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "未知的字段名：%.*s" #: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素" #: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素" #: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" #: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之后" #: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素" #: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素" #: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" #: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" #: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "非法的格式化字符串 %s" #: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" #: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. #: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "（头指针分离于 %s）" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. #: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "（头指针分离自 %s）" #: ref-filter.c:1335 msgid "(no branch)" msgstr "（非分支）" #: ref-filter.c:1364 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" #: ref-filter.c:1367 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" #: ref-filter.c:1819 #, c-format msgid "malformed object at '%s'" msgstr "非法的对象于 '%s'" #: ref-filter.c:1886 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" #: ref-filter.c:1891 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" #: ref-filter.c:2152 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" #: ref-filter.c:2246 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" #: remote.c:795 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" #: remote.c:799 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" #: remote.c:803 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" #: remote.c:811 msgid "Internal error" msgstr "内部错误" #: remote.c:1726 remote.c:1828 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" #: remote.c:1735 #, c-format msgid "no such branch: '%s'" msgstr "没有此分支：'%s'" #: remote.c:1738 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" #: remote.c:1744 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" #: remote.c:1759 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" #: remote.c:1771 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置要推送的远程服务器" #: remote.c:1782 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用规格未包含 '%s'" #: remote.c:1795 msgid "push has no destination (push.default is 'nothing')" msgstr "推送无目标（push.default 是 'nothing'）" #: remote.c:1817 msgid "cannot resolve 'simple' push to a single destination" msgstr "无法解析 'simple' 推送至一个单独的目标" #: remote.c:2132 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" #: remote.c:2136 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" #: remote.c:2139 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" #: remote.c:2143 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" #: remote.c:2146 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 查看详情）\n" #: remote.c:2150 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" #: remote.c:2156 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" #: remote.c:2159 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 #: remote.c:2167 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" #: remote.c:2170 #, c-format msgid "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commit each, respectively.\n" msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" "您的分支和 '%s' 出现了偏离，\n" "并且分别有 %d 和 %d 处不同的提交。\n" msgstr[1] "" "您的分支和 '%s' 出现了偏离，\n" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 #: remote.c:2180 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" #: revision.c:2277 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" #: revision.c:2280 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" #: revision.c:2477 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" #: run-command.c:731 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" #: run-command.c:1274 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n" "配置 `git config advice.ignoredHook false` 来关闭这条警告。" #: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "读取远程解包状态时收到意外的 flush 包" #: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "不能解析远程解包状态：%s" #: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "远程解包失败：%s" #: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "无法为推送证书签名" #: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" #: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未发送推送证书，因为接收端不支持签名推送" #: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "接收端不支持原子推送" #: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" #: sequencer.c:158 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "无效的提交信息清理模式 '%s'" #: sequencer.c:267 msgid "revert" msgstr "还原" #: sequencer.c:269 msgid "cherry-pick" msgstr "拣选" #: sequencer.c:271 msgid "rebase -i" msgstr "rebase -i" #: sequencer.c:273 #, c-format msgid "Unknown action: %d" msgstr "未知动作：%d" #: sequencer.c:330 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" #: sequencer.c:333 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" #: sequencer.c:346 sequencer.c:2245 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" #: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 #: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" #: sequencer.c:353 #, c-format msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" #: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" #: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 #: builtin/commit.c:722 builtin/merge.c:1047 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" #: sequencer.c:405 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" #: sequencer.c:409 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或贮藏后再继续。" #: sequencer.c:438 #, c-format msgid "%s: fast-forward" msgstr "%s：快进" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. #: sequencer.c:526 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" #: sequencer.c:542 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" #: sequencer.c:562 msgid "unable to update cache tree" msgstr "不能更新缓存树" #: sequencer.c:658 #, c-format msgid "" "you have staged changes in your working tree\n" "If these changes are meant to be squashed into the previous commit, run:\n" "\n" " git commit --amend %s\n" "\n" "If they are meant to go into a new commit, run:\n" "\n" " git commit %s\n" "\n" "In both cases, once you're done, continue with:\n" "\n" " git rebase --continue\n" msgstr "" "您的工作区中存在已暂存的修改\n" "如果这些修改需要被并入前一个提交，执行：\n" "\n" " git commit --amend %s\n" "\n" "如果这些修改要形成一个新提交，执行：\n" "\n" " git commit %s\n" "\n" "无论哪种情况，当您完成提交，继续执行：\n" "\n" " git rebase --continue\n" #: sequencer.c:915 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 钩子失败" #: sequencer.c:922 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" "You can suppress this message by setting them explicitly. Run the\n" "following command and follow the instructions in your editor to edit\n" "your configuration file:\n" "\n" " git config --global --edit\n" "\n" "After doing this, you may fix the identity used for this commit with:\n" "\n" " git commit --amend --reset-author\n" msgstr "" "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" "中编辑您的配置文件：\n" "\n" " git config --global --edit\n" "\n" "设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n" "\n" " git commit --amend --reset-author\n" #: sequencer.c:935 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" "You can suppress this message by setting them explicitly:\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" "After doing this, you may fix the identity used for this commit with:\n" "\n" " git commit --amend --reset-author\n" msgstr "" "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" "与否。您可以对其进行设置以免再出现本提示信息：\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" "设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n" "\n" " git commit --amend --reset-author\n" #: sequencer.c:975 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" #: sequencer.c:977 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" #: sequencer.c:1023 msgid "unable to resolve HEAD after creating commit" msgstr "创建提交后，不能解析 HEAD" #: sequencer.c:1025 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 #: sequencer.c:1029 msgid " (root-commit)" msgstr "（根提交）" #: sequencer.c:1050 msgid "could not parse HEAD" msgstr "不能解析 HEAD" #: sequencer.c:1052 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交！" #: sequencer.c:1056 builtin/commit.c:1491 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" #: sequencer.c:1107 sequencer.c:1673 msgid "unable to parse commit author" msgstr "不能解析提交作者" #: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" #: sequencer.c:1134 sequencer.c:1186 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能从 '%s' 读取提交说明" #: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 #: builtin/merge.c:851 msgid "failed to write commit object" msgstr "无法写提交对象" #: sequencer.c:1213 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" #: sequencer.c:1218 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" #: sequencer.c:1347 #, c-format msgid "" "unexpected 1st line of squash message:\n" "\n" "\t%.*s" msgstr "" "意外的压缩提交首行提交信息：\n" "\n" "\t%.*s" #: sequencer.c:1353 #, c-format msgid "" "invalid 1st line of squash message:\n" "\n" "\t%.*s" msgstr "" "压缩提交的首行提交信息无效：\n" "\n" "\t%.*s" #: sequencer.c:1359 sequencer.c:1384 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" #: sequencer.c:1368 sequencer.c:3265 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" #: sequencer.c:1370 msgid "could not read HEAD" msgstr "不能读取 HEAD" #: sequencer.c:1372 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" #: sequencer.c:1378 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" #: sequencer.c:1387 git-rebase--interactive.sh:452 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明：" #: sequencer.c:1395 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" #: sequencer.c:1402 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d：" #: sequencer.c:1407 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过：" #: sequencer.c:1412 #, c-format msgid "unknown command: %d" msgstr "未知命令：%d" #: sequencer.c:1479 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" #: sequencer.c:1498 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" #: sequencer.c:1506 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" #: sequencer.c:1510 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "指定了主线，但是提交 %s 不是一个合并提交。" #: sequencer.c:1516 #, c-format msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. #: sequencer.c:1535 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" #: sequencer.c:1600 sequencer.c:2397 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" #: sequencer.c:1654 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" #: sequencer.c:1655 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" #: sequencer.c:1702 msgid "empty commit set passed" msgstr "提供了空的提交集" #: sequencer.c:1712 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" #: sequencer.c:1718 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" #: sequencer.c:1792 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数：'%s'" #: sequencer.c:1801 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" #: sequencer.c:1844 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d：%.*s" #: sequencer.c:1852 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" #: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 #, c-format msgid "could not read '%s'." msgstr "不能读取 '%s'。" #: sequencer.c:1906 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" #: sequencer.c:1908 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单：'%s'" #: sequencer.c:1913 msgid "no commits parsed." msgstr "没有解析提交。" #: sequencer.c:1924 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" #: sequencer.c:1926 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" #: sequencer.c:1993 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" #: sequencer.c:1996 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效：%s" #: sequencer.c:2062 #, c-format msgid "malformed options sheet: '%s'" msgstr "非法的选项清单：'%s'" #: sequencer.c:2100 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" #: sequencer.c:2101 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" #: sequencer.c:2104 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" #: sequencer.c:2118 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" #: sequencer.c:2173 sequencer.c:2761 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" #: sequencer.c:2175 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" #: sequencer.c:2177 sequencer.c:2212 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" #: sequencer.c:2198 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" #: sequencer.c:2200 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s'：%s" #: sequencer.c:2201 msgid "unexpected end of file" msgstr "意外的文件结束" #: sequencer.c:2207 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" #: sequencer.c:2218 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！" #: sequencer.c:2324 sequencer.c:2679 #, c-format msgid "could not update %s" msgstr "不能更新 %s" #: sequencer.c:2362 sequencer.c:2659 msgid "cannot read HEAD" msgstr "不能读取 HEAD" #: sequencer.c:2402 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" #: sequencer.c:2421 msgid "could not read index" msgstr "不能读取索引" # 译者：注意保持前导空格 #: sequencer.c:2426 #, c-format msgid "" "execution failed: %s\n" "%sYou can fix the problem, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "执行失败：%s\n" "%s您可以改正该问题，然后运行\n" "\n" " git rebase --continue\n" "\n" #: sequencer.c:2432 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" #: sequencer.c:2438 #, c-format msgid "" "execution succeeded: %s\n" "but left changes to the index and/or the working tree\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "执行成功：%s\n" "但是在索引和/或工作区中存在变更\n" "提交或贮藏修改，然后运行\n" "\n" " git rebase --continue\n" "\n" #: sequencer.c:2497 #, c-format msgid "Applied autostash.\n" msgstr "已应用 autostash。\n" #: sequencer.c:2509 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" #: sequencer.c:2512 git-rebase.sh:178 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" "应用 autostash 导致冲突。\n" "您的修改安全地保存在贮藏区中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" #: sequencer.c:2595 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" #: sequencer.c:2637 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" #: sequencer.c:2667 msgid "could not read orig-head" msgstr "不能读取 orig-head" #: sequencer.c:2672 sequencer.c:3262 msgid "could not read 'onto'" msgstr "不能读取 'onto'" #: sequencer.c:2686 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" #: sequencer.c:2770 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" #: sequencer.c:2775 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" #: sequencer.c:2784 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" #: sequencer.c:2786 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" #: sequencer.c:2788 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" #: sequencer.c:2791 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" #: sequencer.c:2801 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" #: sequencer.c:2881 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" #: sequencer.c:2885 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" #: sequencer.c:2918 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" #: sequencer.c:3023 msgid "make_script: unhandled options" msgstr "make_script：有未能处理的选项" #: sequencer.c:3026 msgid "make_script: error preparing revisions" msgstr "make_script：准备版本时错误" #: sequencer.c:3060 sequencer.c:3095 #, c-format msgid "unusable todo list: '%s'" msgstr "不可用的待办列表：'%s'" #: sequencer.c:3146 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" #: sequencer.c:3212 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" "警告：一些提交可能被意外丢弃。\n" "丢弃的提交（从新到旧）：\n" #: sequencer.c:3219 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" "Use 'git config rebase.missingCommitsCheck' to change the level of " "warnings.\n" "The possible behaviours are: ignore, warn, error.\n" "\n" msgstr "" "为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n" "\n" "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" "可选值有：ignore、warn、error。\n" "\n" #: sequencer.c:3231 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n" "或者您可以用 'git rebase --abort' 终止变基。\n" #: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 #: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" #: sequencer.c:3285 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" #: sequencer.c:3401 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" #: setup.c:122 #, c-format msgid "'%s' is outside repository" msgstr "'%s' 在仓库之外" #: setup.c:171 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git -- ...' to specify paths that do not exist locally." msgstr "" "%s：工作区中无此路径。\n" "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" #: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" "Use '--' to separate paths from revisions, like this:\n" "'git [...] -- [...]'" msgstr "" "有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" #: setup.c:233 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "选项 '%s' 必须在其他非选项参数之前" #: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" "Use '--' to separate paths from revisions, like this:\n" "'git [...] -- [...]'" msgstr "" "有歧义的参数 '%s'：可同时是版本和文件\n" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" #: setup.c:388 msgid "unable to set up work tree using invalid config" msgstr "无法使用无效配置来创建工作区" #: setup.c:395 msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" #: setup.c:506 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" #: setup.c:514 msgid "unknown repository extensions found:" msgstr "发现未知的仓库扩展：" #: setup.c:533 #, c-format msgid "error opening '%s'" msgstr "无法打开 '%s'" #: setup.c:535 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大，无法作为 .git 文件：'%s'" #: setup.c:537 #, c-format msgid "error reading %s" msgstr "无法读取 %s" #: setup.c:539 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式：%s" #: setup.c:541 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径：%s" #: setup.c:543 #, c-format msgid "not a git repository: %s" msgstr "不是一个 git 仓库：%s" #: setup.c:642 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" #: setup.c:656 #, c-format msgid "not a git repository: '%s'" msgstr "不是一个 git 仓库：'%s'" #: setup.c:685 setup.c:687 setup.c:718 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" #: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" #: setup.c:816 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一个 git 仓库（或者任何父目录）：%s" #: setup.c:827 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "无法获取 '%*s%s%s' 状态（stat）" #: setup.c:1057 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" #: setup.c:1069 setup.c:1075 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" #: setup.c:1088 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" #: setup.c:1172 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n" "文件属主必须始终拥有读写权限。" #: setup.c:1215 msgid "open /dev/null or dup failed" msgstr "不能打开或者复制 /dev/null" #: setup.c:1230 msgid "fork failed" msgstr "fork 失败" #: setup.c:1235 msgid "setsid failed" msgstr "setsid 失败" #: sha1_file.c:592 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" #: sha1_file.c:618 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" #: sha1_file.c:624 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" #: sha1_file.c:630 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" #: sha1_file.c:638 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被嫁接" #: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "短 SHA1 %s 存在歧义" #: sha1_name.c:433 msgid "The candidates are:" msgstr "候选者有：" #: sha1_name.c:693 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" "Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n" "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n" "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关闭本消息通知。" #: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" #: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "无法在 .gitmodules 中找到 path=%s 的小节" #: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 条目 %s" #: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "无法移除 %s 的 .gitmodules 条目" #: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" #: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "位于未检出的子模组 '%s'" #: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "路径规格 '%s' 在子模组 '%.*s' 中" #: submodule.c:833 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交" #: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" #: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "无法将 '%s' 识别为一个 git 仓库" #: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中启动 'git status'" #: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中执行 'git status'" #: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模组 '%s' 中有脏索引" #: submodule.c:1878 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" #: submodule.c:1890 submodule.c:1946 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" #: submodule.c:1894 builtin/submodule--helper.c:1246 #: builtin/submodule--helper.c:1256 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" #: submodule.c:1897 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" "'%s' to\n" "'%s'\n" msgstr "" "将 '%s%s' 的 git 目录从\n" "'%s' 迁移至\n" "'%s'\n" #: submodule.c:1981 #, c-format msgid "could not recurse into submodule '%s'" msgstr "无法递归进子模组路径 '%s'" #: submodule.c:2025 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" #: submodule.c:2045 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG：返回的路径和当前路径不匹配？" #: submodule.c:2064 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" #: submodule-config.c:263 msgid "negative values not allowed for submodule.fetchjobs" msgstr "submodule.fetchjobs 不允许为负值" #: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "%s 的值无效" #: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "执行 trailer 命令 '%s' 失败" #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 #: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "键 '%2$s' 的未知取值 '%1$s'" #: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "多于一个 %s" #: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "签名 '%.*s' 的键为空" #: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "不能读取输入文件 '%s'" #: trailer.c:753 msgid "could not read from stdin" msgstr "不能自标准输入读取" #: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "不能对 %s 调用 stat" #: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "文件 %s 不是一个正规文件" #: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "文件 %s 用户不可写" #: trailer.c:1024 msgid "could not open temporary file" msgstr "不能打开临时文件" #: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "不能重命名临时文件为 %s" #: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" #: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "传输：无效的深度选项 '%s'" #: transport.c:916 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" #: transport.c:920 #, c-format msgid "" "\n" "Please try\n" "\n" "\tgit push --recurse-submodules=on-demand\n" "\n" "or cd to the path and use\n" "\n" "\tgit push\n" "\n" "to push them to a remote.\n" "\n" msgstr "" "\n" "请尝试\n" "\n" "\tgit push --recurse-submodules=on-demand\n" "\n" "或者进入到子目录执行\n" "\n" "\tgit push\n" "\n" "以推送至远程。\n" "\n" #: transport.c:928 msgid "Aborting." msgstr "正在终止。" #: transport-helper.c:1079 #, c-format msgid "Could not read ref %s" msgstr "不能读取引用 %s" #: tree-walk.c:31 msgid "too-short tree object" msgstr "太短的树对象" #: tree-walk.c:37 msgid "malformed mode in tree entry" msgstr "树对象中的条目模式错误" #: tree-walk.c:41 msgid "empty filename in tree entry" msgstr "树对象条目中空的文件名" #: tree-walk.c:114 msgid "too-short tree file" msgstr "太短的树文件" #: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s请在切换分支前提交或贮藏您的修改。" #: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s" #: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s请在合并前提交或贮藏您的修改。" #: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s" #: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s请在 %s 之前提交或贮藏您的修改。" #: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s" #: unpack-trees.c:125 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" "更新如下目录将会丢失其中未跟踪的文件：\n" "%s" #: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s请在切换分支之前移动或删除。" #: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s" #: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s请在合并前移动或删除。" #: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s" #: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s请在 %s 前移动或删除。" #: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s" #: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s请在切换分支前移动或删除。" #: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" "%%s" msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s" #: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s请在合并前移动或删除。" #: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s" #: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s请在 %s 前移动或删除。" #: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s" #: unpack-trees.c:165 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" #: unpack-trees.c:168 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" "无法更新稀疏检出：如下条目不是最新：\n" "%s" #: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " "update:\n" "%s" msgstr "" "工作区中下列文件将被稀疏检出更新所覆盖：\n" "%s" #: unpack-trees.c:172 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " "update:\n" "%s" msgstr "" "工作区中下列文件将被稀疏检出更新所删除：\n" "%s" #: unpack-trees.c:174 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" "无法更新子模组：\n" "%s" #: unpack-trees.c:251 #, c-format msgid "Aborting\n" msgstr "终止中\n" #: unpack-trees.c:333 msgid "Checking out files" msgstr "正在检出文件" #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "无效的 URL 方案名称或丢失 '://' 后缀" #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "无效的 %XX 转义序列" #: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "缺失主机名且 URL 方案不是 'file:'" #: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "一个 'file:' URL 不应该包含端口号" #: urlmatch.c:247 msgid "invalid characters in host name" msgstr "主机名中包含无效的字符" #: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "无效的端口号" #: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" #: worktree.c:245 builtin/am.c:2147 #, c-format msgid "failed to read '%s'" msgstr "无法读取 '%s'" #: worktree.c:291 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" #: worktree.c:302 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" #: worktree.c:314 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" #: worktree.c:320 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件，错误码 %d" #: worktree.c:328 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" #: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "无法打开 '%s' 进行读写" #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 #: builtin/am.c:862 builtin/merge.c:1044 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" #: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" #: wrapper.c:632 msgid "unable to get current working directory" msgstr "不能获取当前工作目录" #: wt-status.c:151 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 #: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 #: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached ...\" to unstage)" msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 #: wt-status.c:184 msgid " (use \"git add ...\" to mark resolution)" msgstr " （使用 \"git add <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 #: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 #: wt-status.c:188 msgid " (use \"git rm ...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" #: wt-status.c:199 wt-status.c:1007 msgid "Changes to be committed:" msgstr "要提交的变更：" #: wt-status.c:217 wt-status.c:1016 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 #: wt-status.c:221 msgid " (use \"git add ...\" to update what will be committed)" msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 #: wt-status.c:223 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 #: wt-status.c:224 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 #: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" # 译者：注意保持前导空格 #: wt-status.c:238 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）" #: wt-status.c:253 msgid "both deleted:" msgstr "双方删除：" #: wt-status.c:255 msgid "added by us:" msgstr "由我们添加：" #: wt-status.c:257 msgid "deleted by them:" msgstr "由他们删除：" #: wt-status.c:259 msgid "added by them:" msgstr "由他们添加：" #: wt-status.c:261 msgid "deleted by us:" msgstr "由我们删除：" #: wt-status.c:263 msgid "both added:" msgstr "双方添加：" #: wt-status.c:265 msgid "both modified:" msgstr "双方修改：" #: wt-status.c:275 msgid "new file:" msgstr "新文件：" #: wt-status.c:277 msgid "copied:" msgstr "拷贝：" #: wt-status.c:279 msgid "deleted:" msgstr "删除：" #: wt-status.c:281 msgid "modified:" msgstr "修改：" #: wt-status.c:283 msgid "renamed:" msgstr "重命名：" #: wt-status.c:285 msgid "typechange:" msgstr "类型变更：" #: wt-status.c:287 msgid "unknown:" msgstr "未知：" #: wt-status.c:289 msgid "unmerged:" msgstr "未合并：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 #: wt-status.c:369 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 #: wt-status.c:371 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 #: wt-status.c:373 msgid "untracked content, " msgstr "未跟踪的内容, " #: wt-status.c:847 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的贮藏区当前有 %d 条记录" msgstr[1] "您的贮藏区当前有 %d 条记录" #: wt-status.c:879 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" #: wt-status.c:881 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" #: wt-status.c:963 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" "不要改动或删除上面的一行。\n" "其下所有内容都将被忽略。" #: wt-status.c:1076 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 #: wt-status.c:1079 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 #: wt-status.c:1081 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" #: wt-status.c:1086 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 #: wt-status.c:1089 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" #: wt-status.c:1099 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" #: wt-status.c:1102 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 #: wt-status.c:1106 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 #: wt-status.c:1108 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 #: wt-status.c:1110 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" #: wt-status.c:1242 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" #: wt-status.c:1244 msgid "No commands done." msgstr "没有命令被执行。" #: wt-status.c:1247 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最后一条命令已完成（%d 条命令被执行）：" msgstr[1] "最后的命令已完成（%d 条命令被执行）：" #: wt-status.c:1258 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" #: wt-status.c:1263 msgid "No commands remaining." msgstr "未剩下任何命令。" #: wt-status.c:1266 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 #: wt-status.c:1274 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" #: wt-status.c:1287 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" #: wt-status.c:1292 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 #: wt-status.c:1306 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 #: wt-status.c:1308 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 #: wt-status.c:1310 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 #: wt-status.c:1316 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" #: wt-status.c:1320 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" #: wt-status.c:1325 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 #: wt-status.c:1328 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" #: wt-status.c:1332 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" #: wt-status.c:1337 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 #: wt-status.c:1340 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 #: wt-status.c:1342 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" #: wt-status.c:1352 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 #: wt-status.c:1357 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 #: wt-status.c:1360 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 #: wt-status.c:1362 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" #: wt-status.c:1371 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 #: wt-status.c:1376 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 #: wt-status.c:1379 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 #: wt-status.c:1381 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" #: wt-status.c:1392 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" #: wt-status.c:1396 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 #: wt-status.c:1399 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" #: wt-status.c:1596 msgid "On branch " msgstr "位于分支 " #: wt-status.c:1602 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " #: wt-status.c:1604 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " #: wt-status.c:1609 msgid "HEAD detached at " msgstr "头指针分离于 " #: wt-status.c:1611 msgid "HEAD detached from " msgstr "头指针分离自 " #: wt-status.c:1614 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" #: wt-status.c:1634 msgid "Initial commit" msgstr "初始提交" #: wt-status.c:1635 msgid "No commits yet" msgstr "尚无提交" #: wt-status.c:1649 msgid "Untracked files" msgstr "未跟踪的文件" #: wt-status.c:1651 msgid "Ignored files" msgstr "忽略的文件" #: wt-status.c:1655 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" "may speed it up, but you have to be careful not to forget to add\n" "new files yourself (see 'git help status')." msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" #: wt-status.c:1661 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 #: wt-status.c:1663 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" #: wt-status.c:1669 msgid "No changes" msgstr "没有修改" #: wt-status.c:1674 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" #: wt-status.c:1677 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" #: wt-status.c:1680 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" #: wt-status.c:1683 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 #: wt-status.c:1686 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" #: wt-status.c:1689 wt-status.c:1694 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 #: wt-status.c:1692 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 #: wt-status.c:1696 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" #: wt-status.c:1809 msgid "No commits yet on " msgstr "尚无提交在 " #: wt-status.c:1813 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" #: wt-status.c:1844 msgid "different" msgstr "不同" # 译者：注意保持句尾空格 #: wt-status.c:1846 wt-status.c:1854 msgid "behind " msgstr "落后 " #: wt-status.c:1849 wt-status.c:1852 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" #: wt-status.c:2358 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" #: wt-status.c:2364 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" #: wt-status.c:2366 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" #: compat/precompose_utf8.c:58 builtin/clone.c:440 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" #: builtin/add.c:24 msgid "git add [] [--] ..." msgstr "git add [<选项>] [--] <路径规格>..." #: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" #: builtin/add.c:88 builtin/commit.c:257 msgid "updating files failed" msgstr "更新文件失败" #: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" #: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" #: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "不能读取索引" #: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "无法打开 '%s' 进行写入。" #: builtin/add.c:248 msgid "Could not write patch" msgstr "不能生成补丁" #: builtin/add.c:251 msgid "editing patch failed" msgstr "编辑补丁失败" #: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "不能对 '%s' 调用 stat" #: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" #: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" #: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" #: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "演习" #: builtin/add.c:294 msgid "interactive picking" msgstr "交互式拣选" #: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 msgid "select hunks interactively" msgstr "交互式挑选数据块" #: builtin/add.c:296 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" #: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" #: builtin/add.c:298 msgid "update tracked files" msgstr "更新已跟踪的文件" #: builtin/add.c:299 msgid "renormalize EOL of tracked files (implies -u)" msgstr "对已跟踪文件（暗含 -u）重新归一换行符" #: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" #: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" #: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" #: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" #: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" #: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" #: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "(+/-)x" #: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" #: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "创建一个嵌入式仓库时给予警告" #: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" "Clones of the outer repository will not contain the contents of\n" "the embedded repository and will not know how to obtain it.\n" "If you meant to add a submodule, use:\n" "\n" "\tgit submodule add %s\n" "\n" "If you added this path by mistake, you can remove it from the\n" "index with:\n" "\n" "\tgit rm --cached %s\n" "\n" "See \"git help submodule\" for more information." msgstr "" "您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并" "且不知道该如何获取它。\n" "如果您要添加一个子模组，使用：\n" "\n" "\tgit submodule add %s\n" "\n" "如果您不小心添加了这个路径，可以用下面的命令将其从索引中删除：\n" "\n" "\tgit rm --cached %s\n" "\n" "参见 \"git help submodule\" 获取更多信息。" #: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "正在添加嵌入式 git 仓库：%s" #: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" #: builtin/add.c:380 msgid "adding files failed" msgstr "添加文件失败" #: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" #: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" #: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" #: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" #: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" #: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 #: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 #: builtin/rm.c:271 builtin/submodule--helper.c:326 msgid "index file corrupt" msgstr "索引文件损坏" #: builtin/am.c:414 msgid "could not parse author script" msgstr "不能解析作者脚本" #: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" #: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" #: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" #: builtin/am.c:602 msgid "fseek failed" msgstr "fseek 失败" #: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" #: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" #: builtin/am.c:903 msgid "invalid timestamp" msgstr "无效的时间戳" #: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "无效的日期行" #: builtin/am.c:915 msgid "invalid timezone offset" msgstr "无效的时区偏移值" #: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" #: builtin/am.c:1013 builtin/clone.c:405 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" #: builtin/am.c:1018 msgid "Failed to split patches." msgstr "无法拆分补丁。" #: builtin/am.c:1148 builtin/commit.c:342 msgid "unable to write index file" msgstr "无法写入索引文件" #: builtin/am.c:1162 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" #: builtin/am.c:1163 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" #: builtin/am.c:1164 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" #: builtin/am.c:1271 msgid "Patch is empty." msgstr "补丁为空。" #: builtin/am.c:1337 #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识：%.*s" #: builtin/am.c:1359 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" #: builtin/am.c:1554 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" #: builtin/am.c:1556 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." #: builtin/am.c:1575 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" #: builtin/am.c:1581 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." #: builtin/am.c:1606 msgid "Failed to merge in the changes." msgstr "无法合并变更。" #: builtin/am.c:1637 msgid "applying to an empty history" msgstr "正应用到一个空历史上" #: builtin/am.c:1683 builtin/am.c:1687 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" #: builtin/am.c:1703 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" #: builtin/am.c:1708 msgid "Commit Body is:" msgstr "提交内容为：" # 译者：注意保持句尾空格 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. #. #: builtin/am.c:1718 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" #: builtin/am.c:1768 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" #: builtin/am.c:1808 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" #: builtin/am.c:1824 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" #: builtin/am.c:1832 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" #: builtin/am.c:1838 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" #: builtin/am.c:1882 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" "没有变更 —— 您是不是忘了执行 'git add'？\n" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" #: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " "such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "在您的索引中仍存在未合并的路径。\n" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" #: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 #: builtin/reset.c:332 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" #: builtin/am.c:2048 msgid "failed to clean index" msgstr "无法清空索引" #: builtin/am.c:2083 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" #: builtin/am.c:2174 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" #: builtin/am.c:2210 msgid "git am [] [( | )...]" msgstr "git am [<选项>] [( | )...]" #: builtin/am.c:2211 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" #: builtin/am.c:2217 msgid "run interactively" msgstr "以交互式方式运行" #: builtin/am.c:2219 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" #: builtin/am.c:2221 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:182 msgid "be quiet" msgstr "静默模式" #: builtin/am.c:2224 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" #: builtin/am.c:2227 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" #: builtin/am.c:2229 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" #: builtin/am.c:2231 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" #: builtin/am.c:2233 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" #: builtin/am.c:2235 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" #: builtin/am.c:2238 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" #: builtin/am.c:2241 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" #: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 #: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 #: builtin/am.c:2270 msgid "pass it through git-apply" msgstr "传递给 git-apply" #: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 #: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 #: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 #: parse-options.h:144 parse-options.h:146 parse-options.h:257 msgid "n" msgstr "n" #: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 #: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 msgid "format" msgstr "格式" #: builtin/am.c:2267 msgid "format the patch(es) are in" msgstr "补丁的格式" #: builtin/am.c:2273 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" #: builtin/am.c:2275 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" #: builtin/am.c:2278 msgid "synonyms for --continue" msgstr "和 --continue 同义" #: builtin/am.c:2281 msgid "skip the current patch" msgstr "跳过当前补丁" #: builtin/am.c:2284 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" #: builtin/am.c:2287 msgid "abort the patching operation but keep HEAD where it is." msgstr "终止补丁操作但保持 HEAD 不变。" #: builtin/am.c:2290 msgid "show the patch being applied." msgstr "显示正在应用的补丁。" #: builtin/am.c:2294 msgid "lie about committer date" msgstr "将作者日期作为提交日期" #: builtin/am.c:2296 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" #: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 #: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 msgid "key-id" msgstr "key-id" #: builtin/am.c:2299 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" #: builtin/am.c:2302 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" #: builtin/am.c:2320 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" #: builtin/am.c:2327 msgid "failed to read the index" msgstr "无法读取索引" #: builtin/am.c:2342 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" #: builtin/am.c:2366 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" #: builtin/am.c:2372 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" #: builtin/apply.c:8 msgid "git apply [] [...]" msgstr "git apply [<选项>] [<补丁>...]" #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" msgstr "不能创建归档文件 '%s'" #: builtin/archive.c:20 msgid "could not redirect output" msgstr "不能重定向输出" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" msgstr "git archive：未提供远程 URL" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive：期望是 ACK/NAK，却得到 flush 包" #: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "git archive：NACK %s" #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive：协议错误" #: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" #: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" #: builtin/bisect--helper.c:13 msgid "git bisect--helper --write-terms " msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" #: builtin/bisect--helper.c:14 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" #: builtin/bisect--helper.c:46 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一个有效的术语" #: builtin/bisect--helper.c:50 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用内置命令 '%s' 作为术语" #: builtin/bisect--helper.c:60 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改术语 '%s' 的含义" #: builtin/bisect--helper.c:71 msgid "please use two different terms" msgstr "请使用两个不同的术语" #: builtin/bisect--helper.c:78 msgid "could not open the file BISECT_TERMS" msgstr "不能打开文件 BISECT_TERMS" #: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "执行 'git bisect next'" #: builtin/bisect--helper.c:122 msgid "write the terms to .git/BISECT_TERMS" msgstr "将术语写入 .git/BISECT_TERMS" #: builtin/bisect--helper.c:124 msgid "cleanup the bisection state" msgstr "清除二分查找状态" #: builtin/bisect--helper.c:126 msgid "check for expected revs" msgstr "检查预期的版本" #: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非检出当前提交" #: builtin/bisect--helper.c:143 msgid "--write-terms requires two arguments" msgstr "--write-terms 需要两个参数" #: builtin/bisect--helper.c:147 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state 不需要参数" #: builtin/blame.c:27 msgid "git blame [] [] [] [--] " msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" #: builtin/blame.c:32 msgid " are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" #: builtin/blame.c:677 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" #: builtin/blame.c:678 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" #: builtin/blame.c:679 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" #: builtin/blame.c:680 msgid "Show work cost statistics" msgstr "显示命令消耗统计" #: builtin/blame.c:681 msgid "Force progress reporting" msgstr "强制进度显示" #: builtin/blame.c:682 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" #: builtin/blame.c:683 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" #: builtin/blame.c:684 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" #: builtin/blame.c:685 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" #: builtin/blame.c:686 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" #: builtin/blame.c:687 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" #: builtin/blame.c:688 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" #: builtin/blame.c:689 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" #: builtin/blame.c:690 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" #: builtin/blame.c:691 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" #: builtin/blame.c:692 msgid "Ignore whitespace differences" msgstr "忽略空白差异" #: builtin/blame.c:699 msgid "Use an experimental heuristic to improve diffs" msgstr "使用一个试验性的启发式算法改进差异显示" #: builtin/blame.c:701 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" #: builtin/blame.c:702 msgid "Use revisions from instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" #: builtin/blame.c:703 msgid "Use 's contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" #: builtin/blame.c:704 builtin/blame.c:705 msgid "score" msgstr "得分" #: builtin/blame.c:704 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" #: builtin/blame.c:705 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" #: builtin/blame.c:706 msgid "n,m" msgstr "n,m" #: builtin/blame.c:706 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" #: builtin/blame.c:753 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in #. "git blame" output. For C locale, "4 years, 11 #. months ago", which takes 22 places, is the longest #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. #. #: builtin/blame.c:804 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" #: builtin/blame.c:890 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" #: builtin/blame.c:936 msgid "Blaming lines" msgstr "追踪代码行" #: builtin/branch.c:27 msgid "git branch [] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:28 msgid "git branch [] [-l] [-f] []" msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" #: builtin/branch.c:29 msgid "git branch [] [-r] (-d | -D) ..." msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." #: builtin/branch.c:30 msgid "git branch [] (-m | -M) [] " msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" #: builtin/branch.c:31 msgid "git branch [] (-c | -C) [] " msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" #: builtin/branch.c:32 msgid "git branch [] [-r | -a] [--points-at]" msgstr "git branch [<选项>] [-r | -a] [--points-at]" #: builtin/branch.c:33 msgid "git branch [] [-r | -a] [--format]" msgstr "git branch [<选项>] [-r | -a] [--format]" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" "将要删除的分支 '%s' 已经被合并到\n" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" #: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" #: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" #: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "更新配置文件失败" #: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" #: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" #: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" #: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" #: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "无法删除远程跟踪分支 '%s'" #: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "无法删除分支 '%s'" #: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" #: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" #: builtin/branch.c:417 builtin/tag.c:58 msgid "unable to parse format string" msgstr "不能解析格式化字符串" #: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" #: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" #: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "无法拷贝当前分支因为不处于任何分支上。" #: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" #: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" #: builtin/branch.c:511 msgid "Branch rename failed" msgstr "分支重命名失败" #: builtin/branch.c:513 msgid "Branch copy failed" msgstr "分支拷贝失败" #: builtin/branch.c:517 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已为错误命名的分支 '%s' 创建了一个副本" #: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已将错误命名的分支 '%s' 重命名" #: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" #: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新配置文件失败" #: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "分支已拷贝，但更新配置文件失败" #: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" " %s\n" "Lines starting with '%c' will be stripped.\n" msgstr "" "请编辑分支的描述\n" " %s\n" "以 '%c' 开头的行将被过滤。\n" #: builtin/branch.c:586 msgid "Generic options" msgstr "通用选项" #: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" #: builtin/branch.c:589 msgid "suppress informational messages" msgstr "不显示信息" #: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" #: builtin/branch.c:592 msgid "do not use" msgstr "不要使用" #: builtin/branch.c:594 msgid "upstream" msgstr "上游" #: builtin/branch.c:594 msgid "change the upstream info" msgstr "改变上游信息" #: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "取消上游信息的设置" #: builtin/branch.c:596 msgid "use colored output" msgstr "使用彩色输出" #: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" #: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" #: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "只打印不包含该提交的分支" #: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" #: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" #: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "删除完全合并的分支" #: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" #: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" #: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" #: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "拷贝一个分支和它的引用日志" #: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "拷贝一个分支，即使目标已存在" #: builtin/branch.c:614 msgid "list branch names" msgstr "列出分支名" #: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "创建分支的引用日志" #: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "标记分支的描述" #: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" #: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "只打印已经合并的分支" #: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "只打印尚未合并的分支" #: builtin/branch.c:621 msgid "list branches in columns" msgstr "以列的方式显示分支" #: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 msgid "key" msgstr "key" #: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 msgid "field name to sort on" msgstr "排序的字段名" #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:414 msgid "object" msgstr "对象" #: builtin/branch.c:626 msgid "print only branches of the object" msgstr "只打印指向该对象的分支" #: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 msgid "sorting and filtering are case insensitive" msgstr "排序和过滤属于大小写不敏感" #: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "输出格式" #: builtin/branch.c:652 builtin/clone.c:735 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" #: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" #: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "必须提供分支名" #: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" #: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" #: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" #: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" #: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "为拷贝操作提供了太多的分支名" #: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "为重命名操作提供了太多的参数" #: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "为设置新上游提供了太多的参数" #: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" #: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" #: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" #: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" #: builtin/branch.c:789 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" #: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" #: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" #: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" #: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" #: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "需要一个仓库来创建包。" #: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "需要一个仓库来解包。" #: builtin/cat-file.c:523 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | | --textconv | --filters) [--path=] " msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" #: builtin/cat-file.c:524 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" #: builtin/cat-file.c:561 msgid " can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" #: builtin/cat-file.c:562 msgid "show object type" msgstr "显示对象类型" #: builtin/cat-file.c:563 msgid "show object size" msgstr "显示对象大小" #: builtin/cat-file.c:565 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" #: builtin/cat-file.c:566 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" #: builtin/cat-file.c:568 msgid "for blob objects, run textconv on object's content" msgstr "对于数据对象，对其内容做文本转换" #: builtin/cat-file.c:570 msgid "for blob objects, run filters on object's content" msgstr "对于数据对象，对其内容做过滤" #: builtin/cat-file.c:571 git-submodule.sh:878 msgid "blob" msgstr "数据对象" #: builtin/cat-file.c:572 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" #: builtin/cat-file.c:574 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" #: builtin/cat-file.c:575 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" #: builtin/cat-file.c:577 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" #: builtin/cat-file.c:580 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" #: builtin/cat-file.c:583 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" #: builtin/cat-file.c:585 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 参数显示所有对象" #: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | ...] [--] ..." msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." #: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | ...]" msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" #: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" #: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" #: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "从标准输入读出文件名" #: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" #: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "不显示进度报告" #: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "显示未匹配的输入路径" #: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "检查时忽略索引" #: builtin/check-ignore.c:159 msgid "cannot specify pathnames with --stdin" msgstr "不能同时指定路径及 --stdin 参数" #: builtin/check-ignore.c:162 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 参数共用才有意义" #: builtin/check-ignore.c:164 msgid "no path specified" msgstr "未指定路径" #: builtin/check-ignore.c:168 msgid "--quiet is only valid with a single pathname" msgstr "参数 --quiet 只在提供一个路径名时有效" #: builtin/check-ignore.c:170 msgid "cannot have both --quiet and --verbose" msgstr "不能同时提供 --quiet 和 --verbose 参数" #: builtin/check-ignore.c:173 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项只在使用 --verbose 时有效" #: builtin/check-mailmap.c:9 msgid "git check-mailmap [] ..." msgstr "git check-mailmap [<选项>] <联系地址>..." #: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "还从标准输入读取联系地址" #: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "不能解析联系地址：%s" #: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "未指定联系地址" #: builtin/checkout-index.c:128 msgid "git checkout-index [] [--] [...]" msgstr "git checkout-index [<选项>] [--] [<文件>...]" #: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "索引值应该取值 1 到 3 或者 all" #: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "检出索引区的所有文件" #: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" #: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的文件都没有警告" #: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "不检出新文件" #: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "更新索引中文件的状态信息" #: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "从标准输入读取路径列表" #: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "将内容写入临时文件" #: builtin/checkout-index.c:173 builtin/column.c:31 #: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 #: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 #: builtin/worktree.c:570 msgid "string" msgstr "字符串" #: builtin/checkout-index.c:174 msgid "when creating files, prepend " msgstr "在创建文件时，在前面加上 <字符串>" #: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "从指定暂存区中拷出文件" #: builtin/checkout.c:27 msgid "git checkout [] " msgstr "git checkout [<选项>] <分支>" #: builtin/checkout.c:28 msgid "git checkout [] [] -- ..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." #: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" #: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" #: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" #: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" #: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" #: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" #: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 #: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" #: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" #: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" #: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" #: builtin/checkout.c:505 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" #: builtin/checkout.c:636 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" #: builtin/checkout.c:677 msgid "HEAD is now at" msgstr "HEAD 目前位于" #: builtin/checkout.c:681 builtin/clone.c:689 msgid "unable to update HEAD" msgstr "不能更新 HEAD" #: builtin/checkout.c:685 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" #: builtin/checkout.c:688 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" #: builtin/checkout.c:692 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" #: builtin/checkout.c:694 builtin/checkout.c:1039 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" #: builtin/checkout.c:696 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 #: builtin/checkout.c:747 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #: builtin/checkout.c:753 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgid_plural "" "Warning: you are leaving %d commits behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgstr[0] "" "警告：您正丢下 %d 个提交，未和任何分支关联：\n" "\n" "%s\n" msgstr[1] "" "警告：您正丢下 %d 个提交，未和任何分支关联：\n" "\n" "%s\n" #: builtin/checkout.c:772 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch %s\n" "\n" msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch %s\n" "\n" msgstr[0] "" "如果您想要通过创建新分支保存它，这可能是一个好时候。\n" "如下操作：\n" "\n" " git branch <新分支名> %s\n" "\n" msgstr[1] "" "如果您想要通过创建新分支保存它们，这可能是一个好时候。\n" "如下操作：\n" "\n" " git branch <新分支名> %s\n" "\n" #: builtin/checkout.c:804 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" #: builtin/checkout.c:808 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" #: builtin/checkout.c:836 builtin/checkout.c:1034 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #: builtin/checkout.c:940 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" #: builtin/checkout.c:980 builtin/worktree.c:249 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" #: builtin/checkout.c:1009 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" #: builtin/checkout.c:1048 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" #: builtin/checkout.c:1051 builtin/checkout.c:1055 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" #: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 #: builtin/checkout.c:1070 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" #: builtin/checkout.c:1075 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" #: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 #: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 #: builtin/worktree.c:389 msgid "branch" msgstr "分支" #: builtin/checkout.c:1108 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" #: builtin/checkout.c:1110 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" #: builtin/checkout.c:1111 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" #: builtin/checkout.c:1112 builtin/worktree.c:391 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" #: builtin/checkout.c:1113 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" #: builtin/checkout.c:1115 msgid "new-branch" msgstr "新分支" #: builtin/checkout.c:1115 msgid "new unparented branch" msgstr "新的没有父提交的分支" #: builtin/checkout.c:1116 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" #: builtin/checkout.c:1118 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" #: builtin/checkout.c:1120 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" #: builtin/checkout.c:1122 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" #: builtin/checkout.c:1124 builtin/merge.c:239 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" #: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 msgid "style" msgstr "风格" #: builtin/checkout.c:1127 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" #: builtin/checkout.c:1130 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" #: builtin/checkout.c:1132 msgid "second guess 'git checkout '" msgstr "二次猜测'git checkout <无此分支>'" #: builtin/checkout.c:1134 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" #: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 #: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "强制显示进度报告" #: builtin/checkout.c:1168 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" #: builtin/checkout.c:1185 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" #: builtin/checkout.c:1190 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" #: builtin/checkout.c:1226 msgid "invalid path specification" msgstr "无效的路径规格" #: builtin/checkout.c:1233 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" #: builtin/checkout.c:1237 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" #: builtin/checkout.c:1241 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" #: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." #: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" #: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" #: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" #: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" #: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "无法删除 %s" #: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" " - (empty) select nothing\n" msgstr "" "帮助：\n" "1 - 通过编号选择一个选项\n" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" #: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" "3-5 - select a range of items\n" "2-3,6-9 - select multiple ranges\n" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" " - (empty) finish selecting\n" msgstr "" "帮助：\n" "1 - 选择一个选项\n" "3-5 - 选择一个范围内的所有选项\n" "2-3,6-9 - 选择多个范围内的所有选项\n" "foo - 通过唯一前缀选择一个选项\n" "-... - 反选特定的选项\n" "* - 选择所有选项\n" " - （空）结束选择\n" #: builtin/clean.c:522 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" #: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " #: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" #: builtin/clean.c:722 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" #: builtin/clean.c:788 git-add--interactive.perl:1710 #, c-format msgid "Bye.\n" msgstr "再见。\n" #: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" "select by numbers - select items to be deleted by numbers\n" "ask each - confirm each deletion (like \"rm -i\")\n" "quit - stop cleaning\n" "help - this screen\n" "? - help for prompt selection" msgstr "" "clean - 开始清理\n" "filter by pattern - 通过模版排除要删除的条目\n" "select by numbers - 通过数字选择要删除的条目\n" "ask each - 针对删除逐一询问（就像 \"rm -i\"）\n" "quit - 停止删除并退出\n" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" #: builtin/clean.c:823 git-add--interactive.perl:1786 msgid "*** Commands ***" msgstr "*** 命令 ***" #: builtin/clean.c:824 git-add--interactive.perl:1783 msgid "What now" msgstr "请选择" #: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" #: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" #: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" #: builtin/clean.c:912 msgid "force" msgstr "强制" #: builtin/clean.c:913 msgid "interactive cleaning" msgstr "交互式清除" #: builtin/clean.c:915 msgid "remove whole directories" msgstr "删除整个目录" #: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 #: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 #: builtin/show-ref.c:176 msgid "pattern" msgstr "模式" #: builtin/clean.c:917 msgid "add to ignore rules" msgstr "添加 <模式> 到忽略规则" #: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "也删除忽略的文件" #: builtin/clean.c:920 msgid "remove only ignored files" msgstr "只删除忽略的文件" #: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" #: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" #: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" #: builtin/clone.c:40 msgid "git clone [] [--] []" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" #: builtin/clone.c:85 msgid "don't create a checkout" msgstr "不创建一个检出" #: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 msgid "create a bare repository" msgstr "创建一个纯仓库" #: builtin/clone.c:90 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜像仓库（也是纯仓库）" #: builtin/clone.c:92 msgid "to clone from a local repository" msgstr "从本地仓库克隆" #: builtin/clone.c:94 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" #: builtin/clone.c:96 msgid "setup as shared repository" msgstr "设置为共享仓库" #: builtin/clone.c:98 builtin/clone.c:102 msgid "pathspec" msgstr "路径规格" #: builtin/clone.c:98 builtin/clone.c:102 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" #: builtin/clone.c:105 msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" #: builtin/clone.c:106 builtin/init-db.c:476 msgid "template-directory" msgstr "模板目录" #: builtin/clone.c:107 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "模板目录将被使用" #: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 #: builtin/submodule--helper.c:1577 msgid "reference repository" msgstr "参考仓库" #: builtin/clone.c:113 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" #: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "名称" #: builtin/clone.c:115 msgid "use instead of 'origin' to track upstream" msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" #: builtin/clone.c:117 msgid "checkout instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" #: builtin/clone.c:119 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" #: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 #: builtin/pull.c:211 msgid "depth" msgstr "深度" #: builtin/clone.c:121 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" #: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 #: parse-options.h:154 msgid "time" msgstr "时间" #: builtin/clone.c:123 msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" #: builtin/clone.c:124 builtin/fetch.c:155 msgid "revision" msgstr "版本" #: builtin/clone.c:125 builtin/fetch.c:156 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" #: builtin/clone.c:127 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" #: builtin/clone.c:129 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" #: builtin/clone.c:131 msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" #: builtin/clone.c:132 builtin/init-db.c:485 msgid "gitdir" msgstr "git目录" #: builtin/clone.c:133 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" #: builtin/clone.c:134 msgid "key=value" msgstr "key=value" #: builtin/clone.c:135 msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" #: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 #: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" #: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 #: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" #: builtin/clone.c:276 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" "无法猜到目录名。\n" "请在命令行指定一个目录" #: builtin/clone.c:329 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能为 '%s' 添加一个备用：%s\n" #: builtin/clone.c:401 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" #: builtin/clone.c:409 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" #: builtin/clone.c:423 #, c-format msgid "failed to stat %s\n" msgstr "对 %s 调用 stat 失败\n" #: builtin/clone.c:445 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" #: builtin/clone.c:449 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" #: builtin/clone.c:475 #, c-format msgid "done.\n" msgstr "完成。\n" #: builtin/clone.c:489 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" "克隆成功，但是检出失败。\n" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" #: builtin/clone.c:566 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" #: builtin/clone.c:661 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" #: builtin/clone.c:677 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" #: builtin/clone.c:726 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" #: builtin/clone.c:756 msgid "unable to checkout working tree" msgstr "不能检出工作区" #: builtin/clone.c:801 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" #: builtin/clone.c:864 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" #: builtin/clone.c:866 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" #: builtin/clone.c:906 builtin/receive-pack.c:1946 msgid "Too many arguments." msgstr "太多参数。" #: builtin/clone.c:910 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" #: builtin/clone.c:923 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" #: builtin/clone.c:926 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" #: builtin/clone.c:939 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" #: builtin/clone.c:945 builtin/fetch.c:1455 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" #: builtin/clone.c:955 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" #: builtin/clone.c:965 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" #: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 #: builtin/worktree.c:255 builtin/worktree.c:285 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" #: builtin/clone.c:985 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" #: builtin/clone.c:1005 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" #: builtin/clone.c:1007 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" #: builtin/clone.c:1031 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" #: builtin/clone.c:1093 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" #: builtin/clone.c:1095 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" #: builtin/clone.c:1097 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" #: builtin/clone.c:1099 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。" #: builtin/clone.c:1102 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" #: builtin/clone.c:1107 msgid "--local is ignored" msgstr "--local 被忽略" #: builtin/clone.c:1169 builtin/clone.c:1177 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" #: builtin/clone.c:1180 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" #: builtin/column.c:10 msgid "git column []" msgstr "git column [<选项>]" #: builtin/column.c:27 msgid "lookup config vars" msgstr "查找配置变量" #: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "要使用的布局" #: builtin/column.c:30 msgid "Maximum width" msgstr "最大宽度" #: builtin/column.c:31 msgid "Padding space on left border" msgstr "左边框的填充空间" #: builtin/column.c:32 msgid "Padding space on right border" msgstr "右边框的填充空间" #: builtin/column.c:33 msgid "Padding space between columns" msgstr "两列之间的填充空间" #: builtin/column.c:52 msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" #: builtin/commit.c:37 msgid "git commit [] [--] ..." msgstr "git commit [<选项>] [--] <路径规格>..." #: builtin/commit.c:42 msgid "git status [] [--] ..." msgstr "git status [<选项>] [--] <路径规格>..." #: builtin/commit.c:47 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" #: builtin/commit.c:52 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" "\n" " git commit --allow-empty\n" "\n" msgstr "" "之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n" "也要提交，使用命令：\n" "\n" " git commit --allow-empty\n" "\n" #: builtin/commit.c:59 msgid "Otherwise, please use 'git reset'\n" msgstr "否则，请使用命令 'git reset'\n" #: builtin/commit.c:62 msgid "" "If you wish to skip this commit, use:\n" "\n" " git reset\n" "\n" "Then \"git cherry-pick --continue\" will resume cherry-picking\n" "the remaining commits.\n" msgstr "" "如果您想跳过这个提交，使用命令：\n" "\n" " git reset\n" "\n" "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" "操作。\n" #: builtin/commit.c:284 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" #: builtin/commit.c:325 msgid "unable to create temporary index" msgstr "不能创建临时索引" #: builtin/commit.c:331 msgid "interactive add failed" msgstr "交互式添加失败" #: builtin/commit.c:344 msgid "unable to update temporary index" msgstr "无法更新临时索引" #: builtin/commit.c:346 msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" #: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" #: builtin/commit.c:427 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" #: builtin/commit.c:429 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" #: builtin/commit.c:437 msgid "cannot read the index" msgstr "无法读取索引" #: builtin/commit.c:456 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" #: builtin/commit.c:553 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" #: builtin/commit.c:555 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有非法的作者信息" #: builtin/commit.c:574 msgid "malformed --author parameter" msgstr "非法的 --author 参数" #: builtin/commit.c:626 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" #: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" #: builtin/commit.c:675 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" #: builtin/commit.c:677 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" #: builtin/commit.c:681 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" #: builtin/commit.c:710 builtin/commit.c:718 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" #: builtin/commit.c:715 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" #: builtin/commit.c:769 msgid "could not write commit template" msgstr "不能写提交模版" #: builtin/commit.c:787 #, c-format msgid "" "\n" "It looks like you may be committing a merge.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "" "\n" "似乎您正在做一个合并提交。如果不对，请删除文件\n" "\t%s\n" "然后重试。\n" #: builtin/commit.c:792 #, c-format msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "" "\n" "似乎您正在做一个拣选提交。如果不对，请删除文件\n" "\t%s\n" "然后重试。\n" #: builtin/commit.c:805 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" #: builtin/commit.c:813 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ #: builtin/commit.c:830 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ #: builtin/commit.c:838 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ #: builtin/commit.c:845 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" #: builtin/commit.c:862 msgid "Cannot read index" msgstr "无法读取索引" #: builtin/commit.c:928 msgid "Error building trees" msgstr "无法创建树对象" #: builtin/commit.c:942 builtin/tag.c:256 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" #: builtin/commit.c:986 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" #: builtin/commit.c:1000 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" #: builtin/commit.c:1014 builtin/commit.c:1264 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" #: builtin/commit.c:1052 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" #: builtin/commit.c:1085 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" #: builtin/commit.c:1094 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" #: builtin/commit.c:1097 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" #: builtin/commit.c:1099 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" #: builtin/commit.c:1102 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" #: builtin/commit.c:1112 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" #: builtin/commit.c:1114 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" #: builtin/commit.c:1122 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" #: builtin/commit.c:1139 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" #: builtin/commit.c:1141 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" #: builtin/commit.c:1155 builtin/tag.c:542 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" #: builtin/commit.c:1160 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" #: builtin/commit.c:1278 builtin/commit.c:1443 msgid "show status concisely" msgstr "以简洁的格式显示状态" #: builtin/commit.c:1280 builtin/commit.c:1445 msgid "show branch information" msgstr "显示分支信息" #: builtin/commit.c:1282 msgid "show stash information" msgstr "显示贮藏区信息" #: builtin/commit.c:1284 builtin/commit.c:1447 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" #: builtin/commit.c:1286 msgid "version" msgstr "版本" #: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 #: builtin/worktree.c:541 msgid "machine-readable output" msgstr "机器可读的输出" #: builtin/commit.c:1289 builtin/commit.c:1451 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" #: builtin/commit.c:1292 builtin/commit.c:1454 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" #: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 #: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 msgid "mode" msgstr "模式" #: builtin/commit.c:1295 builtin/commit.c:1457 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" #: builtin/commit.c:1299 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" #: builtin/commit.c:1301 parse-options.h:167 msgid "when" msgstr "何时" #: builtin/commit.c:1302 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" #: builtin/commit.c:1304 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" #: builtin/commit.c:1323 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" #: builtin/commit.c:1413 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" #: builtin/commit.c:1414 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" #: builtin/commit.c:1416 msgid "Commit message options" msgstr "提交说明选项" #: builtin/commit.c:1417 builtin/tag.c:393 msgid "read message from file" msgstr "从文件中读取提交说明" #: builtin/commit.c:1418 msgid "author" msgstr "作者" #: builtin/commit.c:1418 msgid "override author for commit" msgstr "提交时覆盖作者" #: builtin/commit.c:1419 builtin/gc.c:359 msgid "date" msgstr "日期" #: builtin/commit.c:1419 msgid "override date for commit" msgstr "提交时覆盖日期" #: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:391 msgid "message" msgstr "说明" #: builtin/commit.c:1420 msgid "commit message" msgstr "提交说明" #: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 #: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 msgid "commit" msgstr "提交" #: builtin/commit.c:1421 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" #: builtin/commit.c:1422 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" #: builtin/commit.c:1423 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" #: builtin/commit.c:1424 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" #: builtin/commit.c:1425 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" #: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 #: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" #: builtin/commit.c:1427 msgid "use specified template file" msgstr "使用指定的模板文件" #: builtin/commit.c:1428 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） #: builtin/commit.c:1429 msgid "default" msgstr "default" #: builtin/commit.c:1429 builtin/tag.c:397 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" #: builtin/commit.c:1430 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" #: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG 提交签名" #: builtin/commit.c:1435 msgid "Commit contents options" msgstr "提交内容选项" #: builtin/commit.c:1436 msgid "commit all changed files" msgstr "提交所有改动的文件" #: builtin/commit.c:1437 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" #: builtin/commit.c:1438 msgid "interactively add files" msgstr "交互式添加文件" #: builtin/commit.c:1439 msgid "interactively add changes" msgstr "交互式添加变更" #: builtin/commit.c:1440 msgid "commit only specified files" msgstr "只提交指定的文件" #: builtin/commit.c:1441 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" #: builtin/commit.c:1442 msgid "show what would be committed" msgstr "显示将要提交的内容" #: builtin/commit.c:1455 msgid "amend previous commit" msgstr "修改先前的提交" #: builtin/commit.c:1456 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" #: builtin/commit.c:1461 msgid "ok to record an empty change" msgstr "允许一个空提交" #: builtin/commit.c:1463 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" #: builtin/commit.c:1536 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" #: builtin/commit.c:1543 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" #: builtin/commit.c:1562 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" #: builtin/commit.c:1573 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" #: builtin/commit.c:1578 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" #: builtin/commit.c:1613 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" #: builtin/config.c:10 msgid "git config []" msgstr "git config [<选项>]" #: builtin/config.c:58 msgid "Config file location" msgstr "配置文件位置" #: builtin/config.c:59 msgid "use global config file" msgstr "使用全局配置文件" #: builtin/config.c:60 msgid "use system config file" msgstr "使用系统级配置文件" #: builtin/config.c:61 msgid "use repository config file" msgstr "使用仓库级配置文件" #: builtin/config.c:62 msgid "use given config file" msgstr "使用指定的配置文件" #: builtin/config.c:63 msgid "blob-id" msgstr "数据对象 ID" #: builtin/config.c:63 msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" #: builtin/config.c:64 msgid "Action" msgstr "操作" #: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "获取值：name [value-regex]" #: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" #: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "根据正则表达式获得值：name-regex [value-regex]" #: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL 取值：section[.var] URL" #: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "替换所有匹配的变量：name value [value_regex]" #: builtin/config.c:70 msgid "add a new variable: name value" msgstr "添加一个新的变量：name value" #: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "删除一个变量：name [value-regex]" #: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "删除所有匹配项：name [value-regex]" #: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" #: builtin/config.c:74 msgid "remove a section: name" msgstr "删除一个小节：name" #: builtin/config.c:75 msgid "list all" msgstr "列出所有" #: builtin/config.c:76 msgid "open an editor" msgstr "打开一个编辑器" #: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "获得配置的颜色：配置 [默认]" #: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置：配置 [stdout-is-tty]" #: builtin/config.c:79 msgid "Type" msgstr "类型" #: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" #: builtin/config.c:81 msgid "value is decimal number" msgstr "值是十进制数" #: builtin/config.c:82 msgid "value is --bool or --int" msgstr "值是 --bool or --int" #: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" #: builtin/config.c:84 msgid "value is an expiry date" msgstr "值是一个到期日期" #: builtin/config.c:85 msgid "Other" msgstr "其它" #: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "终止值是 NUL 字节" #: builtin/config.c:87 msgid "show variable names only" msgstr "只显示变量名" #: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" #: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" #: builtin/config.c:335 msgid "unable to parse default color value" msgstr "不能解析默认颜色值" #: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" "[user]\n" "# Please adapt and uncomment the following lines:\n" "#\tname = %s\n" "#\temail = %s\n" msgstr "" "# This is Git's per-user configuration file.\n" "[user]\n" "# Please adapt and uncomment the following lines:\n" "#\tname = %s\n" "#\temail = %s\n" #: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "--local 只能在一个仓库内使用" #: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" #: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" "无法用一个值覆盖多个值\n" " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" #: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" #: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" #: builtin/describe.c:22 msgid "git describe [] [...]" msgstr "git describe [<选项>] [<提交号>...]" #: builtin/describe.c:23 msgid "git describe [] --dirty" msgstr "git describe [<选项>] --dirty" #: builtin/describe.c:57 msgid "head" msgstr "头" #: builtin/describe.c:57 msgid "lightweight" msgstr "轻量级的" #: builtin/describe.c:57 msgid "annotated" msgstr "附注的" #: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "附注标签 %s 无效" #: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "附注标签 %s 没有嵌入名称" #: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "标签 '%s' 的确是在 '%s'" #: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有标签准确匹配 '%s'" #: builtin/describe.c:319 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n" #: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" #: builtin/describe.c:392 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" "没有附注标签能描述 '%s'。\n" "然而，存在未附注标签：尝试 --tags。" #: builtin/describe.c:396 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" "没有标签能描述 '%s'。\n" "尝试 --always，或者创建一些标签。" #: builtin/describe.c:426 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" #: builtin/describe.c:429 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" "发现多于 %i 个标签，列出最近的 %i 个\n" "在 %s 放弃搜索\n" #: builtin/describe.c:497 #, c-format msgid "describe %s\n" msgstr "描述 %s\n" #: builtin/describe.c:500 builtin/log.c:502 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" #: builtin/describe.c:508 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是数据对象" #: builtin/describe.c:522 msgid "find the tag that comes after the commit" msgstr "寻找该提交之后的标签" #: builtin/describe.c:523 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" #: builtin/describe.c:524 msgid "use any ref" msgstr "使用任意引用" #: builtin/describe.c:525 msgid "use any tag, even unannotated" msgstr "使用任意标签，即使未附带注释" #: builtin/describe.c:526 msgid "always use long format" msgstr "始终使用长提交号格式" #: builtin/describe.c:527 msgid "only follow first parent" msgstr "只跟随第一个父提交" #: builtin/describe.c:530 msgid "only output exact matches" msgstr "只输出精确匹配" #: builtin/describe.c:532 msgid "consider most recent tags (default: 10)" msgstr "考虑最近 个标签（默认：10）" #: builtin/describe.c:534 msgid "only consider tags matching " msgstr "只考虑匹配 <模式> 的标签" #: builtin/describe.c:536 msgid "do not consider tags matching " msgstr "不考虑匹配 <模式> 的标签" #: builtin/describe.c:538 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" #: builtin/describe.c:539 builtin/describe.c:542 msgid "mark" msgstr "标记" #: builtin/describe.c:540 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" #: builtin/describe.c:543 msgid "append on broken working tree (default: \"-broken\")" msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）" #: builtin/describe.c:561 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" #: builtin/describe.c:590 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" #: builtin/describe.c:640 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 与提交号不兼容" #: builtin/describe.c:642 msgid "--broken is incompatible with commit-ishes" msgstr "--broken 与提交号不兼容" #: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" #: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" #: builtin/diff.c:356 msgid "Not a git repository" msgstr "不是一个 git 仓库" #: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" #: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" #: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" #: builtin/difftool.c:29 msgid "git difftool [] [ []] [--] [...]" msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" #: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "失败：%d" #: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "无法读取符号链接 %s" #: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "无法读取符号链接文件 %s" #: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" #: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--" "cc'）。" #: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改：'%s' 和 '%s'。" #: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "工作区文件被留了下来。" #: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件存在于 '%s'。" #: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" #: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" #: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" #: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" #: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" #: builtin/difftool.c:706 msgid "" msgstr "<工具>" #: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" #: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" #: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出" #: builtin/difftool.c:714 msgid "" msgstr "<命令>" #: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" #: builtin/difftool.c:739 msgid "no given for --tool=" msgstr "没有为 --tool=<工具> 参数提供 <工具>" #: builtin/difftool.c:746 msgid "no given for --extcmd=" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" #: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" #: builtin/fast-export.c:998 msgid "show progress after objects" msgstr "在 个对象之后显示进度" #: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "选择如何处理签名标签" #: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "选择当标签指向被过滤对象时该标签的处理方式" #: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "把标记存储到这个文件" #: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "从这个文件导入标记" #: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "当标签缺少标记者字段时，假装提供一个" #: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "每次提交都输出整个树" #: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" #: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "跳过数据对象的输出" #: builtin/fast-export.c:1016 msgid "refspec" msgstr "引用规格" #: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "对导出的引用应用引用规格" #: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "匿名输出" #: builtin/fetch.c:25 msgid "git fetch [] [ [...]]" msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" #: builtin/fetch.c:26 msgid "git fetch [] " msgstr "git fetch [<选项>] <组>" #: builtin/fetch.c:27 msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" #: builtin/fetch.c:28 msgid "git fetch --all []" msgstr "git fetch --all [<选项>]" #: builtin/fetch.c:124 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "从所有的远程抓取" #: builtin/fetch.c:126 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" #: builtin/fetch.c:128 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" #: builtin/fetch.c:129 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" #: builtin/fetch.c:131 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" #: builtin/fetch.c:133 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" #: builtin/fetch.c:135 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" #: builtin/fetch.c:137 msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" #: builtin/fetch.c:139 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" #: builtin/fetch.c:141 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签，并且替换变更标签" # 译者：可选值，不能翻译 #: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 msgid "on-demand" msgstr "on-demand" #: builtin/fetch.c:143 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" #: builtin/fetch.c:147 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "保持下载包" #: builtin/fetch.c:149 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" #: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" #: builtin/fetch.c:154 msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" #: builtin/fetch.c:160 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" #: builtin/fetch.c:162 builtin/log.c:1466 msgid "dir" msgstr "目录" #: builtin/fetch.c:163 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" #: builtin/fetch.c:166 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获取子模组的缺省值（比配置文件优先级低）" #: builtin/fetch.c:170 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" #: builtin/fetch.c:171 builtin/pull.c:220 msgid "refmap" msgstr "引用映射" #: builtin/fetch.c:172 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" #: builtin/fetch.c:431 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" #: builtin/fetch.c:549 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "配置变量 fetch.output 包含无效值 %s" #: builtin/fetch.c:642 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" #: builtin/fetch.c:646 msgid "[up to date]" msgstr "[最新]" #: builtin/fetch.c:659 builtin/fetch.c:739 msgid "[rejected]" msgstr "[已拒绝]" #: builtin/fetch.c:660 msgid "can't fetch in current branch" msgstr "当前分支下不能执行获取操作" #: builtin/fetch.c:669 msgid "[tag update]" msgstr "[标签更新]" #: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 #: builtin/fetch.c:734 msgid "unable to update local ref" msgstr "不能更新本地引用" #: builtin/fetch.c:689 msgid "[new tag]" msgstr "[新标签]" #: builtin/fetch.c:692 msgid "[new branch]" msgstr "[新分支]" #: builtin/fetch.c:695 msgid "[new ref]" msgstr "[新引用]" #: builtin/fetch.c:734 msgid "forced update" msgstr "强制更新" #: builtin/fetch.c:739 msgid "non-fast-forward" msgstr "非快进" #: builtin/fetch.c:784 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" #: builtin/fetch.c:804 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" #: builtin/fetch.c:892 builtin/fetch.c:988 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" #: builtin/fetch.c:903 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" "一些本地引用不能被更新；尝试运行\n" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 #: builtin/fetch.c:958 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 #: builtin/fetch.c:959 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" #: builtin/fetch.c:991 msgid "[deleted]" msgstr "[已删除]" #: builtin/fetch.c:992 builtin/remote.c:1024 msgid "(none)" msgstr "（无）" #: builtin/fetch.c:1015 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯仓库的当前分支 %s" #: builtin/fetch.c:1034 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" #: builtin/fetch.c:1037 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" #: builtin/fetch.c:1277 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" #: builtin/fetch.c:1279 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" #: builtin/fetch.c:1325 builtin/fetch.c:1498 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库" #: builtin/fetch.c:1350 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。" #: builtin/fetch.c:1394 msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" #: builtin/fetch.c:1439 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" #: builtin/fetch.c:1441 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" #: builtin/fetch.c:1446 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" #: builtin/fetch.c:1448 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" #: builtin/fetch.c:1464 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" #: builtin/fetch.c:1466 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" #: builtin/fetch.c:1475 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" #: builtin/fetch.c:1482 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" #: builtin/fmt-merge-msg.c:15 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=] | --no-log] [--file <文件>]" #: builtin/fmt-merge-msg.c:666 msgid "populate log with at most entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" #: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" #: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "文本" #: builtin/fmt-merge-msg.c:673 msgid "use as start of message" msgstr "使用 <文本> 作为提交说明的开始" #: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "从文件中读取" #: builtin/for-each-ref.c:10 msgid "git for-each-ref [] []" msgstr "git for-each-ref [<选项>] [<模式>]" #: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at ]" msgstr "git for-each-ref [--points-at <对象>]" #: builtin/for-each-ref.c:12 msgid "git for-each-ref [(--merged | --no-merged) []]" msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" #: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" #: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" #: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" #: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符适用于 Tcl" #: builtin/for-each-ref.c:37 msgid "show only matched refs" msgstr "只显示 个匹配的引用" #: builtin/for-each-ref.c:39 builtin/tag.c:420 msgid "respect format colors" msgstr "遵照格式中的颜色输出" #: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "只打印指向给定对象的引用" #: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "只打印已经合并的引用" #: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "只打印没有合并的引用" #: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "只打印包含该提交的引用" #: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" #: builtin/fsck.c:568 msgid "Checking object directories" msgstr "检查对象目录中" #: builtin/fsck.c:660 msgid "git fsck [] [...]" msgstr "git fsck [<选项>] [<对象>...]" #: builtin/fsck.c:666 msgid "show unreachable objects" msgstr "显示不可达的对象" #: builtin/fsck.c:667 msgid "show dangling objects" msgstr "显示摇摆的对象" #: builtin/fsck.c:668 msgid "report tags" msgstr "报告标签" #: builtin/fsck.c:669 msgid "report root nodes" msgstr "报告根节点" #: builtin/fsck.c:670 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" #: builtin/fsck.c:671 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" #: builtin/fsck.c:672 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" #: builtin/fsck.c:673 msgid "check only connectivity" msgstr "仅检查连通性" #: builtin/fsck.c:674 msgid "enable more strict checking" msgstr "启用更严格的检查" #: builtin/fsck.c:676 msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found 中" #: builtin/fsck.c:677 builtin/prune.c:108 msgid "show progress" msgstr "显示进度" #: builtin/fsck.c:678 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" #: builtin/fsck.c:742 msgid "Checking objects" msgstr "检查对象中" #: builtin/gc.c:27 msgid "git gc []" msgstr "git gc [<选项>]" #: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败：%s" #: builtin/gc.c:312 #, c-format msgid "Can't stat %s" msgstr "不能对 %s 调用 stat" #: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" "and remove %s.\n" "Automatic cleanup will not be performed until the file is removed.\n" "\n" "%s" msgstr "" "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" "在该文件被删除之前，自动清理将不会执行。\n" "\n" "%s" #: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "清除未引用的对象" #: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" #: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" #: builtin/gc.c:366 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" #: builtin/gc.c:384 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "无法解析 gc.logexpiry 的值 %s" #: builtin/gc.c:412 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" #: builtin/gc.c:414 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" #: builtin/gc.c:415 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" #: builtin/gc.c:440 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %（如果不是，使用 --force）" #: builtin/gc.c:487 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" #: builtin/grep.c:27 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" #: builtin/grep.c:225 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" #: builtin/grep.c:283 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. #: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" #: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" #: builtin/grep.c:637 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" #: builtin/grep.c:703 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" #: builtin/grep.c:790 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" #: builtin/grep.c:792 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 #: builtin/grep.c:794 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" #: builtin/grep.c:796 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" #: builtin/grep.c:798 msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" #: builtin/grep.c:801 msgid "show non-matching lines" msgstr "显示未匹配的行" #: builtin/grep.c:803 msgid "case insensitive matching" msgstr "不区分大小写匹配" #: builtin/grep.c:805 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" #: builtin/grep.c:807 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" #: builtin/grep.c:809 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" #: builtin/grep.c:812 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" #: builtin/grep.c:814 msgid "descend at most levels" msgstr "最多以指定的深度向下寻找" #: builtin/grep.c:818 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" #: builtin/grep.c:821 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" #: builtin/grep.c:824 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" #: builtin/grep.c:827 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" #: builtin/grep.c:830 msgid "show line numbers" msgstr "显示行号" #: builtin/grep.c:831 msgid "don't show filenames" msgstr "不显示文件名" #: builtin/grep.c:832 msgid "show filenames" msgstr "显示文件名" #: builtin/grep.c:834 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" #: builtin/grep.c:836 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" #: builtin/grep.c:838 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" #: builtin/grep.c:841 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" #: builtin/grep.c:843 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" #: builtin/grep.c:846 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" #: builtin/grep.c:847 msgid "highlight matches" msgstr "高亮显示匹配项" #: builtin/grep.c:849 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" #: builtin/grep.c:851 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" #: builtin/grep.c:854 msgid "show context lines before and after matches" msgstr "显示匹配项前后的 行上下文" #: builtin/grep.c:857 msgid "show context lines before matches" msgstr "显示匹配项前 行上下文" #: builtin/grep.c:859 msgid "show context lines after matches" msgstr "显示匹配项后 行上下文" #: builtin/grep.c:861 msgid "use worker threads" msgstr "使用 个工作线程" #: builtin/grep.c:862 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" #: builtin/grep.c:865 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" #: builtin/grep.c:867 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" #: builtin/grep.c:870 msgid "read patterns from file" msgstr "从文件读取模式" #: builtin/grep.c:872 msgid "match " msgstr "匹配 <模式>" #: builtin/grep.c:874 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" #: builtin/grep.c:886 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" #: builtin/grep.c:888 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" #: builtin/grep.c:890 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" #: builtin/grep.c:894 msgid "pager" msgstr "分页" #: builtin/grep.c:894 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" #: builtin/grep.c:898 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" #: builtin/grep.c:962 msgid "no pattern given." msgstr "未提供模式匹配。" #: builtin/grep.c:994 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" #: builtin/grep.c:1001 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" #: builtin/grep.c:1036 builtin/index-pack.c:1519 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" #: builtin/grep.c:1041 msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" #: builtin/grep.c:1065 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" #: builtin/grep.c:1088 msgid "option not supported with --recurse-submodules." msgstr "选项不支持和 --recurse-submodules 共用。" #: builtin/grep.c:1094 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" #: builtin/grep.c:1100 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" #: builtin/grep.c:1108 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" #: builtin/hash-object.c:83 msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " "[--] ..." msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " "[--] <文件>..." #: builtin/hash-object.c:84 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" #: builtin/hash-object.c:96 msgid "type" msgstr "类型" #: builtin/hash-object.c:96 msgid "object type" msgstr "对象类型" #: builtin/hash-object.c:97 msgid "write the object into the object database" msgstr "将对象写入对象数据库" #: builtin/hash-object.c:99 msgid "read the object from stdin" msgstr "从标准输入读取对象" #: builtin/hash-object.c:101 msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" #: builtin/hash-object.c:102 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" #: builtin/hash-object.c:103 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" #: builtin/help.c:43 msgid "print all available commands" msgstr "打印所有可用的命令" #: builtin/help.c:44 msgid "exclude guides" msgstr "排除向导" #: builtin/help.c:45 msgid "print list of useful guides" msgstr "显示有用的指南列表" #: builtin/help.c:46 msgid "show man page" msgstr "显示 man 手册" #: builtin/help.c:47 msgid "show manual in web browser" msgstr "在 web 浏览器中显示手册" #: builtin/help.c:49 msgid "show info page" msgstr "显示 info 手册" #: builtin/help.c:55 msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" #: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" #: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" #: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" #: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" #: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "无法执行 '%s'" #: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" #: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" #: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" #: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" #: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" #: builtin/help.c:407 msgid "Defining attributes per path" msgstr "定义路径的属性" #: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "每一天 Git 常用的约 20 条命令" #: builtin/help.c:409 msgid "A Git glossary" msgstr "Git 词汇表" #: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" #: builtin/help.c:411 msgid "Defining submodule properties" msgstr "定义子模组属性" #: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" #: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程（针对 1.5.1 或更新版本）" #: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" #: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "最常用的 Git 向导有：\n" #: builtin/help.c:444 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" #: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" #: builtin/index-pack.c:157 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" #: builtin/index-pack.c:207 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" #: builtin/index-pack.c:227 #, c-format msgid "did not receive expected object %s" msgstr "未能获取预期的对象 %s" #: builtin/index-pack.c:230 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：应为类型 %s，却是 %s" #: builtin/index-pack.c:272 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" #: builtin/index-pack.c:282 msgid "early EOF" msgstr "过早的文件结束符（EOF）" #: builtin/index-pack.c:283 msgid "read error on input" msgstr "输入上的读错误" #: builtin/index-pack.c:295 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" #: builtin/index-pack.c:302 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" #: builtin/index-pack.c:305 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许值" #: builtin/index-pack.c:320 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" #: builtin/index-pack.c:326 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" #: builtin/index-pack.c:340 msgid "pack signature mismatch" msgstr "包签名不匹配" #: builtin/index-pack.c:342 #, c-format msgid "pack version % unsupported" msgstr "不支持包版本 %" #: builtin/index-pack.c:360 #, c-format msgid "pack has bad object at offset %: %s" msgstr "包中有错误的对象位于偏移量 %：%s" #: builtin/index-pack.c:481 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" #: builtin/index-pack.c:530 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" #: builtin/index-pack.c:538 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" #: builtin/index-pack.c:546 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" #: builtin/index-pack.c:577 msgid "cannot pread pack file" msgstr "无法读取包文件" #: builtin/index-pack.c:579 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "包文件过早结束，缺少 % 字节" msgstr[1] "包文件过早结束，缺少 % 字节" #: builtin/index-pack.c:605 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" #: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 #: builtin/index-pack.c:818 builtin/index-pack.c:827 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" #: builtin/index-pack.c:753 builtin/pack-objects.c:182 #: builtin/pack-objects.c:276 #, c-format msgid "unable to read %s" msgstr "不能读 %s" #: builtin/index-pack.c:816 #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" #: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" #: builtin/index-pack.c:838 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" #: builtin/index-pack.c:853 #, c-format msgid "invalid %s" msgstr "无效的 %s" #: builtin/index-pack.c:856 msgid "Error in object" msgstr "对象中出错" #: builtin/index-pack.c:858 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" #: builtin/index-pack.c:930 builtin/index-pack.c:961 msgid "failed to apply delta" msgstr "无法应用 delta" #: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "接收对象中" #: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "索引对象中" #: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" #: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" #: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" #: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" #: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "处理 delta 中" #: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" #: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "不可理喻" #: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 个本地对象" msgstr[1] "完成 %d 个本地对象" #: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" #: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" #: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" #: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" #: builtin/index-pack.c:1397 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件名 '%s' 没有以 '.pack' 结尾" #: builtin/index-pack.c:1422 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" #: builtin/index-pack.c:1430 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" #: builtin/index-pack.c:1454 msgid "error while closing pack file" msgstr "关闭包文件时出错" #: builtin/index-pack.c:1468 msgid "cannot store pack file" msgstr "无法存储包文件" #: builtin/index-pack.c:1476 msgid "cannot store index file" msgstr "无法存储索引文件" #: builtin/index-pack.c:1513 #, c-format msgid "bad pack.indexversion=%" msgstr "坏的 pack.indexversion=%" #: builtin/index-pack.c:1581 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" #: builtin/index-pack.c:1583 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" #: builtin/index-pack.c:1631 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" #: builtin/index-pack.c:1638 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" #: builtin/index-pack.c:1675 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" #: builtin/index-pack.c:1724 builtin/index-pack.c:1727 #: builtin/index-pack.c:1743 builtin/index-pack.c:1747 #, c-format msgid "bad %s" msgstr "错误选项 %s" #: builtin/index-pack.c:1763 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" #: builtin/index-pack.c:1765 msgid "--stdin requires a git repository" msgstr "--stdin 需要一个 git 仓库" #: builtin/index-pack.c:1771 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" #: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "不能对模版 '%s' 调用 stat" #: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "不能打开目录 '%s'" #: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "不能读取链接 '%s'" #: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 创建符号链接" #: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" #: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" #: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "模版未找到 %s" #: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" #: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" #: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" #: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "%s 已经存在" #: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" #: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" #: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" #: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" #: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" #: builtin/init-db.c:481 msgid "permissions" msgstr "权限" #: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" #: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" #: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" #: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" #: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" #: builtin/interpret-trailers.c:15 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "[(=|:)])...] [...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" ">])...] [<文件>...]" #: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "在原位编辑文件" #: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "删除空的尾部署名" #: builtin/interpret-trailers.c:96 msgid "where to place the new trailer" msgstr "在哪里放置新的尾部署名" #: builtin/interpret-trailers.c:98 msgid "action if trailer already exists" msgstr "当尾部署名已经存在时所采取的动作" #: builtin/interpret-trailers.c:100 msgid "action if trailer is missing" msgstr "当尾部署名缺失时所采取的动作" #: builtin/interpret-trailers.c:102 msgid "output only the trailers" msgstr "只输出尾部署名" #: builtin/interpret-trailers.c:103 msgid "do not apply config rules" msgstr "不要应用配置规则" #: builtin/interpret-trailers.c:104 msgid "join whitespace-continued values" msgstr "连接空白折行的值" #: builtin/interpret-trailers.c:105 msgid "set parsing options" msgstr "设置解析选项" #: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "尾部署名" #: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "要添加的尾部署名" #: builtin/interpret-trailers.c:117 msgid "--trailer with --only-input does not make sense" msgstr "--trailer 和 --only-input 同时使用没有意义" #: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "没有给出要原位编辑的文件" #: builtin/log.c:48 msgid "git log [] [] [[--] ...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" #: builtin/log.c:49 msgid "git show [] ..." msgstr "git show [<选项>] <对象>..." #: builtin/log.c:93 #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" #: builtin/log.c:153 msgid "suppress diff output" msgstr "不显示差异输出" #: builtin/log.c:154 msgid "show source" msgstr "显示源" #: builtin/log.c:155 msgid "Use mail map file" msgstr "使用邮件映射文件" #: builtin/log.c:157 msgid "only decorate refs that match " msgstr "只修饰与 <模式> 匹配的引用" #: builtin/log.c:159 msgid "do not decorate refs that match " msgstr "不修饰和 <模式> 匹配的引用" #: builtin/log.c:160 msgid "decorate options" msgstr "修饰选项" #: builtin/log.c:163 msgid "Process line range n,m in file, counting from 1" msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" #: builtin/log.c:259 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" #: builtin/log.c:510 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" #: builtin/log.c:525 builtin/log.c:619 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" #: builtin/log.c:643 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" #: builtin/log.c:764 msgid "format.headers without value" msgstr "format.headers 没有值" #: builtin/log.c:865 msgid "name of output directory is too long" msgstr "输出目录名太长" #: builtin/log.c:881 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" #: builtin/log.c:898 msgid "Need exactly one range." msgstr "只需要一个范围。" #: builtin/log.c:908 msgid "Not a range." msgstr "不是一个范围。" #: builtin/log.c:1014 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" #: builtin/log.c:1095 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" #: builtin/log.c:1122 msgid "git format-patch [] [ | ]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" #: builtin/log.c:1172 msgid "Two output directories?" msgstr "两个输出目录？" #: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" #: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" #: builtin/log.c:1294 msgid "Could not find exact merge base." msgstr "不能找到准确的合并基线。" #: builtin/log.c:1298 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base= manually." msgstr "" "无法得到上游地址，如果你想自动记录基线提交，请使用命令\n" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交。" #: builtin/log.c:1318 msgid "Failed to find exact merge base" msgstr "无法找到准确的合并基线" #: builtin/log.c:1329 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" #: builtin/log.c:1333 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" #: builtin/log.c:1382 msgid "cannot get patch id" msgstr "无法得到补丁 id" #: builtin/log.c:1441 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" #: builtin/log.c:1444 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" #: builtin/log.c:1448 msgid "print patches to standard out" msgstr "打印补丁到标准输出" #: builtin/log.c:1450 msgid "generate a cover letter" msgstr "生成一封附信" #: builtin/log.c:1452 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" #: builtin/log.c:1453 msgid "sfx" msgstr "后缀" #: builtin/log.c:1454 msgid "use instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" #: builtin/log.c:1456 msgid "start numbering patches at instead of 1" msgstr "补丁以 开始编号，而不是1" #: builtin/log.c:1458 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" #: builtin/log.c:1460 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" #: builtin/log.c:1463 msgid "Use [] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" #: builtin/log.c:1466 msgid "store resulting files in " msgstr "把结果文件存储在 <目录>" #: builtin/log.c:1469 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" #: builtin/log.c:1472 msgid "don't output binary diffs" msgstr "不输出二进制差异" #: builtin/log.c:1474 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" #: builtin/log.c:1476 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" #: builtin/log.c:1478 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" #: builtin/log.c:1480 msgid "Messaging" msgstr "邮件发送" #: builtin/log.c:1481 msgid "header" msgstr "header" #: builtin/log.c:1482 msgid "add email header" msgstr "添加邮件头" #: builtin/log.c:1483 builtin/log.c:1485 msgid "email" msgstr "邮件地址" #: builtin/log.c:1483 msgid "add To: header" msgstr "添加收件人" #: builtin/log.c:1485 msgid "add Cc: header" msgstr "添加抄送" #: builtin/log.c:1487 msgid "ident" msgstr "标识" #: builtin/log.c:1488 msgid "set From address to (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" #: builtin/log.c:1490 msgid "message-id" msgstr "邮件标识" #: builtin/log.c:1491 msgid "make first mail a reply to " msgstr "使第一封邮件作为对 <邮件标识> 的回复" #: builtin/log.c:1492 builtin/log.c:1495 msgid "boundary" msgstr "边界" #: builtin/log.c:1493 msgid "attach the patch" msgstr "附件方式添加补丁" #: builtin/log.c:1496 msgid "inline the patch" msgstr "内联显示补丁" #: builtin/log.c:1500 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" #: builtin/log.c:1502 msgid "signature" msgstr "签名" #: builtin/log.c:1503 msgid "add a signature" msgstr "添加一个签名" #: builtin/log.c:1504 msgid "base-commit" msgstr "基线提交" #: builtin/log.c:1505 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" #: builtin/log.c:1507 msgid "add a signature from a file" msgstr "从文件添加一个签名" #: builtin/log.c:1508 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" #: builtin/log.c:1510 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" #: builtin/log.c:1585 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" #: builtin/log.c:1600 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" #: builtin/log.c:1602 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc 和 -k 互斥。" #: builtin/log.c:1610 msgid "--name-only does not make sense" msgstr "--name-only 无意义" #: builtin/log.c:1612 msgid "--name-status does not make sense" msgstr "--name-status 无意义" #: builtin/log.c:1614 msgid "--check does not make sense" msgstr "--check 无意义" #: builtin/log.c:1646 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" #: builtin/log.c:1648 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" #: builtin/log.c:1741 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" #: builtin/log.c:1773 msgid "Generating patches" msgstr "生成补丁" #: builtin/log.c:1817 msgid "Failed to create output files" msgstr "无法创建输出文件" #: builtin/log.c:1867 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" #: builtin/log.c:1921 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" #: builtin/ls-files.c:468 msgid "git ls-files [] [...]" msgstr "git ls-files [<选项>] [<文件>...]" #: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" #: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" #: builtin/ls-files.c:521 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小写字母表示 'fsmonitor clean' 文件" #: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" #: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "显示已删除的文件" #: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "显示已修改的文件" #: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "显示其它文件" #: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "显示忽略的文件" #: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" #: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" #: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" #: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "显示文件换行符格式" #: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "不显示空目录" #: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "显示未合并的文件" #: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" #: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" #: builtin/ls-files.c:552 msgid "exclude patterns are read from " msgstr "从 <文件> 中读取排除模式" #: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in " msgstr "从 <文件> 读取额外的每个目录的排除模式" #: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" #: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" #: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "在子模组中递归" #: builtin/ls-files.c:565 msgid "if any is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" #: builtin/ls-files.c:566 msgid "tree-ish" msgstr "树或提交" #: builtin/ls-files.c:567 msgid "pretend that paths removed since are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" #: builtin/ls-files.c:569 msgid "show debugging data" msgstr "显示调试数据" #: builtin/ls-remote.c:7 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [ [...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<仓库> [<引用>...]]" #: builtin/ls-remote.c:52 msgid "do not print remote URL" msgstr "不打印远程 URL" #: builtin/ls-remote.c:53 builtin/ls-remote.c:55 msgid "exec" msgstr "exec" #: builtin/ls-remote.c:54 builtin/ls-remote.c:56 msgid "path of git-upload-pack on the remote host" msgstr "远程主机上的 git-upload-pack 路径" #: builtin/ls-remote.c:58 msgid "limit to tags" msgstr "仅限于标签" #: builtin/ls-remote.c:59 msgid "limit to heads" msgstr "仅限于分支" #: builtin/ls-remote.c:60 msgid "do not show peeled tags" msgstr "不显示已解析的标签" #: builtin/ls-remote.c:62 msgid "take url..insteadOf into account" msgstr "参考 url..insteadOf 设置" #: builtin/ls-remote.c:64 msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到匹配的引用则以退出码2退出" #: builtin/ls-remote.c:67 msgid "show underlying ref in addition to the object pointed by it" msgstr "除了显示指向的对象外，显示指向的引用名" #: builtin/ls-tree.c:29 msgid "git ls-tree [] [...]" msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" #: builtin/ls-tree.c:127 msgid "only show trees" msgstr "只显示树" #: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "递归到子树" #: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "当递归时显示树" #: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "条目以 NUL 字符终止" #: builtin/ls-tree.c:135 msgid "include object size" msgstr "包括对象大小" #: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "只列出文件名" #: builtin/ls-tree.c:142 msgid "use full path names" msgstr "使用文件的全路径" #: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" msgstr "空的 mbox：'%s'" #: builtin/merge.c:49 msgid "git merge [] [...]" msgstr "git merge [<选项>] [<提交>...]" #: builtin/merge.c:50 msgid "git merge --abort" msgstr "git merge --abort" #: builtin/merge.c:51 msgid "git merge --continue" msgstr "git merge --continue" #: builtin/merge.c:108 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" #: builtin/merge.c:145 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" #: builtin/merge.c:146 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" #: builtin/merge.c:151 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" #: builtin/merge.c:201 builtin/pull.c:137 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" #: builtin/merge.c:204 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" #: builtin/merge.c:205 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" #: builtin/merge.c:207 builtin/pull.c:146 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 条）精简提交记录" #: builtin/merge.c:210 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" #: builtin/merge.c:212 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" #: builtin/merge.c:214 builtin/pull.c:158 msgid "edit message before committing" msgstr "在提交前编辑提交说明" #: builtin/merge.c:215 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" #: builtin/merge.c:217 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" #: builtin/merge.c:221 builtin/pull.c:167 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" #: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "策略" #: builtin/merge.c:223 builtin/pull.c:172 msgid "merge strategy to use" msgstr "要使用的合并策略" #: builtin/merge.c:224 builtin/pull.c:175 msgid "option=value" msgstr "option=value" #: builtin/merge.c:225 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" #: builtin/merge.c:227 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" #: builtin/merge.c:231 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" #: builtin/merge.c:233 msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" #: builtin/merge.c:235 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" #: builtin/merge.c:241 msgid "verify commit-msg hook" msgstr "校验 commit-msg 钩子" #: builtin/merge.c:266 msgid "could not run stash." msgstr "不能运行贮藏。" #: builtin/merge.c:271 msgid "stash failed" msgstr "贮藏失败" #: builtin/merge.c:276 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" #: builtin/merge.c:298 builtin/merge.c:315 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 #: builtin/merge.c:345 msgid " (nothing to squash)" msgstr " （无可压缩）" #: builtin/merge.c:356 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" #: builtin/merge.c:406 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" #: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" #: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" #: builtin/merge.c:668 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" #: builtin/merge.c:682 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" #: builtin/merge.c:697 #, c-format msgid "unable to write %s" msgstr "不能写 %s" #: builtin/merge.c:749 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" #: builtin/merge.c:758 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" #: builtin/merge.c:764 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n" "合并到主题分支。\n" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" #: builtin/merge.c:800 msgid "Empty commit message." msgstr "空提交信息。" #: builtin/merge.c:820 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" #: builtin/merge.c:873 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" #: builtin/merge.c:912 msgid "No current branch." msgstr "没有当前分支。" #: builtin/merge.c:914 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" #: builtin/merge.c:916 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" #: builtin/merge.c:921 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" #: builtin/merge.c:974 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" #: builtin/merge.c:1076 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" #: builtin/merge.c:1110 msgid "not something we can merge" msgstr "不能合并" #: builtin/merge.c:1212 msgid "--abort expects no arguments" msgstr "--abort 不带参数" #: builtin/merge.c:1216 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" #: builtin/merge.c:1228 msgid "--continue expects no arguments" msgstr "--continue 不带参数" #: builtin/merge.c:1232 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" #: builtin/merge.c:1248 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" #: builtin/merge.c:1255 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" #: builtin/merge.c:1258 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" #: builtin/merge.c:1267 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" #: builtin/merge.c:1275 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" #: builtin/merge.c:1292 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" #: builtin/merge.c:1294 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" #: builtin/merge.c:1299 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" #: builtin/merge.c:1301 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" #: builtin/merge.c:1335 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" #: builtin/merge.c:1338 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" #: builtin/merge.c:1341 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" #: builtin/merge.c:1344 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" #: builtin/merge.c:1403 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" #: builtin/merge.c:1412 msgid "Already up to date." msgstr "已经是最新的。" #: builtin/merge.c:1422 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" #: builtin/merge.c:1463 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" #: builtin/merge.c:1470 #, c-format msgid "Nope.\n" msgstr "无。\n" #: builtin/merge.c:1495 msgid "Already up to date. Yeeah!" msgstr "已经是最新的。耶！" #: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" #: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" #: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" #: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" #: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" #: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" #: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" #: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] ..." msgstr "git merge-base [-a | --all] <提交> <提交>..." #: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus ..." msgstr "git merge-base [-a | --all] --octopus <提交>..." #: builtin/merge-base.c:32 msgid "git merge-base --independent ..." msgstr "git merge-base --independent <提交>..." #: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor <提交> <提交>" #: builtin/merge-base.c:34 msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point <引用> [<提交>]" #: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "输出所有共同的祖先" #: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路合并的祖先提交" #: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "显示不能被其他访问到的版本" #: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先提交么？" #: builtin/merge-base.c:228 msgid "find where forked from reflog of " msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" #: builtin/merge-file.c:9 msgid "" "git merge-file [] [-L [-L [-L ]]] " " " msgstr "" "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" "件> <文件2>" #: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "将结果发送到标准输出" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "使用基于 diff3 的合并" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "如果冲突，使用我们的版本" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "如果冲突，使用他们的版本" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "如果冲突，使用联合版本" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "如果冲突，使用指定长度的标记" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "不要警告冲突" #: builtin/merge-file.c:45 msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" #: builtin/merge-recursive.c:45 #, c-format msgid "unknown option %s" msgstr "未知选项 %s" #: builtin/merge-recursive.c:51 #, c-format msgid "could not parse object '%s'" msgstr "不能解析对象 '%s'" #: builtin/merge-recursive.c:55 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" #: builtin/merge-recursive.c:63 msgid "not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 #, c-format msgid "could not resolve ref '%s'" msgstr "无法解析引用 '%s'" #: builtin/merge-recursive.c:77 #, c-format msgid "Merging %s with %s\n" msgstr "合并 %s 和 %s\n" #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" #: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "输入以 NUL 字符终止" #: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "允许丢失的对象" #: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" #: builtin/mv.c:17 msgid "git mv [] ... " msgstr "git mv [<选项>] <源>... <目标>" #: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引中并且不是子模组？" #: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" #: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引中" #: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "强制移动/重命令，即使目标存在" #: builtin/mv.c:127 msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" #: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "目标 '%s' 不是一个目录" #: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" #: builtin/mv.c:183 msgid "bad source" msgstr "坏的源" #: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" #: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "不能将目录移动到文件" #: builtin/mv.c:198 msgid "source directory is empty" msgstr "源目录为空" #: builtin/mv.c:223 msgid "not under version control" msgstr "不在版本控制之下" #: builtin/mv.c:226 msgid "destination exists" msgstr "目标已存在" #: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" #: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "不能覆盖" #: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" #: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "目标目录不存在" #: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" #: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" #: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" #: builtin/name-rev.c:338 msgid "git name-rev [] ..." msgstr "git name-rev [<选项>] <提交>..." #: builtin/name-rev.c:339 msgid "git name-rev [] --all" msgstr "git name-rev [<选项>] --all" #: builtin/name-rev.c:340 msgid "git name-rev [] --stdin" msgstr "git name-rev [<选项>] --stdin" #: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "只打印名称（无 SHA-1）" #: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" #: builtin/name-rev.c:398 msgid "only use refs matching " msgstr "只使用和 <模式> 相匹配的引用" #: builtin/name-rev.c:400 msgid "ignore refs matching " msgstr "忽略和 <模式> 相匹配的引用" #: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" #: builtin/name-rev.c:403 msgid "read from stdin" msgstr "从标准输入读取" #: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" #: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" #: builtin/notes.c:26 msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" #: builtin/notes.c:27 msgid "" "git notes [--ref ] add [-f] [--allow-empty] [-m | -F " "| (-c | -C) ] []" msgstr "" "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " "| (-c | -C) <对象>] [<对象>]" #: builtin/notes.c:28 msgid "git notes [--ref ] copy [-f] " msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" #: builtin/notes.c:29 msgid "" "git notes [--ref ] append [--allow-empty] [-m | -F | " "(-c | -C) ] []" msgstr "" "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " "(-c | -C) <对象>] [<对象>]" #: builtin/notes.c:30 msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" #: builtin/notes.c:31 msgid "git notes [--ref ] show []" msgstr "git notes [--ref <注解引用>] show [<对象>]" #: builtin/notes.c:32 msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" #: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" #: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:35 msgid "git notes [--ref ] remove [...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" #: builtin/notes.c:36 msgid "git notes [--ref ] prune [-n] [-v]" msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" #: builtin/notes.c:37 msgid "git notes [--ref ] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" #: builtin/notes.c:42 msgid "git notes [list []]" msgstr "git notes [list [<对象>]]" #: builtin/notes.c:47 msgid "git notes add [] []" msgstr "git notes add [<选项>] [<对象>]" #: builtin/notes.c:52 msgid "git notes copy [] " msgstr "git notes copy [<选项>] <源对象> <目标对象>" #: builtin/notes.c:53 msgid "git notes copy --stdin [ ]..." msgstr "git notes copy --stdin [<源对象> <目标对象>]..." #: builtin/notes.c:58 msgid "git notes append [] []" msgstr "git notes append [<选项>] [<对象>]" #: builtin/notes.c:63 msgid "git notes edit []" msgstr "git notes edit [<对象>]" #: builtin/notes.c:68 msgid "git notes show []" msgstr "git notes show [<对象>]" #: builtin/notes.c:73 msgid "git notes merge [] " msgstr "git notes merge [<选项>] <注解引用>" #: builtin/notes.c:74 msgid "git notes merge --commit []" msgstr "git notes merge --commit [<选项>]" #: builtin/notes.c:75 msgid "git notes merge --abort []" msgstr "git notes merge --abort [<选项>]" #: builtin/notes.c:80 msgid "git notes remove []" msgstr "git notes remove [<对象>]" #: builtin/notes.c:85 msgid "git notes prune []" msgstr "git notes prune [<选项>]" #: builtin/notes.c:90 msgid "git notes get-ref" msgstr "git notes get-ref" #: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "为下面的对象写/编辑说明：" #: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" #: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" #: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" #: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" #: builtin/notes.c:204 msgid "unable to write note object" msgstr "不能写注解对象" #: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s 中" #: builtin/notes.c:234 builtin/tag.c:506 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" #: builtin/notes.c:236 builtin/tag.c:509 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 #: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" #: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "无法读取对象 '%s'。" #: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "不能从非数据对象 '%s' 中读取注解数据。" #: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "非法的输入行：'%s'。" #: builtin/notes.c:317 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. #: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解" #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 #: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 #: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "参数太多" #: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "未发现对象 %s 的注解。" #: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "注解内容作为一个字符串" #: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "注解内容到一个文件中" #: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" #: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "重用指定的注解对象" #: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "允许保存空白注释" #: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "替换已存在的注解" #: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" #: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" #: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" #: builtin/notes.c:488 msgid "read objects from stdin" msgstr "从标准输入读取对象" #: builtin/notes.c:490 msgid "load rewriting config for (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" #: builtin/notes.c:508 msgid "too few parameters" msgstr "参数太少" #: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" #: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" #: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" #: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "无法删除引用 NOTES_MERGE_PARTIAL" #: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "无法删除引用 NOTES_MERGE_REF" #: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "无法删除 'git notes merge' 工作区" #: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "无法读取引用 NOTES_MERGE_PARTIAL" #: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" #: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" #: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "无法解析 NOTES_MERGE_REF" #: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "无法完成注解合并" #: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的注解合并策略 %s" #: builtin/notes.c:774 msgid "General options" msgstr "通用选项" #: builtin/notes.c:776 msgid "Merge options" msgstr "合并选项" #: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" #: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "提交未合并的注解" #: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" #: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" #: builtin/notes.c:786 msgid "abort notes merge" msgstr "中止注解合并" #: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "不能混用 --commit、--abort 或 -s/--strategy" #: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "必须指定一个注解引用来合并" #: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" #: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" #: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "无法存储链接到当前的注解引用（%s）" #: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" msgstr "" "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" #: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" #: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" #: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" #: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 msgid "do not remove, show only" msgstr "不删除，只显示" #: builtin/notes.c:944 msgid "report pruned notes" msgstr "报告清除的注解" #: builtin/notes.c:986 msgid "notes-ref" msgstr "注解引用" #: builtin/notes.c:987 msgid "use notes from " msgstr "从 <注解引用> 使用注解" #: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" #: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c:34 msgid "" "git pack-objects [...] [< | < ]" msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c:195 builtin/pack-objects.c:198 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: builtin/pack-objects.c:791 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" #: builtin/pack-objects.c:804 msgid "Writing objects" msgstr "写入对象中" #: builtin/pack-objects.c:1084 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" #: builtin/pack-objects.c:2454 msgid "Compressing objects" msgstr "压缩对象中" #: builtin/pack-objects.c:2625 msgid "invalid value for --missing" msgstr "选项 --missing 的值无效" #: builtin/pack-objects.c:2928 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" #: builtin/pack-objects.c:2932 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" #: builtin/pack-objects.c:2962 msgid "do not show progress meter" msgstr "不显示进度表" #: builtin/pack-objects.c:2964 msgid "show progress meter" msgstr "显示进度表" #: builtin/pack-objects.c:2966 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" #: builtin/pack-objects.c:2969 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" #: builtin/pack-objects.c:2970 msgid "version[,offset]" msgstr "版本[,偏移]" #: builtin/pack-objects.c:2971 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" #: builtin/pack-objects.c:2974 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" #: builtin/pack-objects.c:2976 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" #: builtin/pack-objects.c:2978 msgid "ignore packed objects" msgstr "忽略包对象" #: builtin/pack-objects.c:2980 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" #: builtin/pack-objects.c:2982 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" #: builtin/pack-objects.c:2984 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" #: builtin/pack-objects.c:2986 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" #: builtin/pack-objects.c:2988 msgid "reuse existing objects" msgstr "重用已存在的对象" #: builtin/pack-objects.c:2990 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" #: builtin/pack-objects.c:2992 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" #: builtin/pack-objects.c:2994 msgid "do not create an empty pack output" msgstr "不创建空的包输出" #: builtin/pack-objects.c:2996 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" #: builtin/pack-objects.c:2998 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" #: builtin/pack-objects.c:3001 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" #: builtin/pack-objects.c:3004 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" #: builtin/pack-objects.c:3007 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" #: builtin/pack-objects.c:3010 msgid "output pack to stdout" msgstr "输出包到标准输出" #: builtin/pack-objects.c:3012 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" #: builtin/pack-objects.c:3014 msgid "keep unreachable objects" msgstr "维持不可达的对象" #: builtin/pack-objects.c:3016 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" #: builtin/pack-objects.c:3018 msgid "unpack unreachable objects newer than