From 33b62fba4d61d604b30942fb4ec22b6e2782726b Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Sat, 5 Jun 2021 17:54:23 +0800 Subject: [PATCH] l10n: zh_CN: for git v2.32.0 l10n round 1 Translate 126 new messages (5204t0f0u) for git 2.32.0. Signed-off-by: Jiang Xin --- po/zh_CN.po | 6994 +++++++++++++++++++++++++++------------------------ 1 file changed, 3721 insertions(+), 3273 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index fdaaea81974..7ede0553818 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -115,7 +115,7 @@ # shallow repository | 浅（克隆）仓库 # signed tag | 签名标签 # smart HTTP protocol | 智能 HTTP 协议 -# squash | 压缩 +# squash | 挤压 # stage | n. 暂存区（即索引）; v. 暂存 # stash | n. 贮藏区; v. 贮藏 # submodule | 子模组 @@ -141,8 +141,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2021-03-04 22:41+0800\n" -"PO-Revision-Date: 2021-03-14 23:21+0800\n" +"POT-Creation-Date: 2021-05-17 16:02+0800\n" +"PO-Revision-Date: 2021-06-05 22:10+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -156,9 +156,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "不能读取索引" @@ -186,7 +186,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 msgid "could not write index" msgstr "不能写入索引" @@ -202,7 +202,7 @@ msgstr[1] "更新了 %d 个路径\n" msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -342,12 +342,12 @@ msgstr "缓存" msgid "unstaged" msgstr "未缓存" -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 #: git-add--interactive.perl:213 msgid "path" msgstr "路径" @@ -854,7 +854,7 @@ msgstr "对不起，不能编辑这个块" msgid "'git apply' failed" msgstr "'git apply' 失败" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" @@ -863,37 +863,37 @@ msgstr "" "\n" "使用 \"git config advice.%s false\" 来关闭此消息" -#: advice.c:159 +#: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:250 +#: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" -#: advice.c:252 +#: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" -#: advice.c:254 +#: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" -#: advice.c:256 +#: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" -#: advice.c:258 +#: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" -#: advice.c:260 +#: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" -#: advice.c:268 +#: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -901,23 +901,36 @@ msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "如果您打算更新此类条目，请禁用或修改稀疏规则。" + +#: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -964,82 +977,78 @@ msgstr "命令行以 \\ 结尾" msgid "unclosed quote" msgstr "未关闭的引号" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject 和 --3way 不能同时使用。" -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached 和 --3way 不能同时使用。" - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: apply.c:922 +#: apply.c:921 #, 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:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: apply.c:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式：%s" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头，%d 行和 %d 行" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1050,92 +1059,92 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: apply.c:3057 +#: apply.c:3056 #, 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:3069 +#: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: apply.c:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" @@ -1144,432 +1153,438 @@ msgstr "" "当查询：\n" "%.*s" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: apply.c:3105 +#: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" -#: apply.c:3152 +#: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" -#: apply.c:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" -#: apply.c:3171 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" -#: apply.c:3189 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" -#: apply.c:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: apply.c:3209 +#: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: apply.c:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" -#: apply.c:3413 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "仓库缺乏必要的数据对象以进行三方合并。" +#: apply.c:3571 +msgid "repository lacks the necessary blob to perform 3-way merge." +msgstr "仓库缺乏执行三方合并所必需的数据对象。" -#: apply.c:3575 +#: apply.c:3574 #, c-format -msgid "Falling back to three-way merge...\n" -msgstr "回落到三方合并...\n" +msgid "Performing three-way merge...\n" +msgstr "执行三方合并...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c:3607 +#: apply.c:3606 #, c-format -msgid "Failed to fall back on three-way merge...\n" -msgstr "无法回落到三方合并...\n" +msgid "Failed to perform three-way merge...\n" +msgstr "无法执行三方合并...\n" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c:3652 +#: apply.c:3642 +#, c-format +msgid "Falling back to direct application...\n" +msgstr "回落到直接应用...\n" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 +#: read-cache.c:1351 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: apply.c:3954 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: apply.c:3979 +#: apply.c:3981 #, 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:3999 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: apply.c:4018 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." -#: apply.c:4110 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4117 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" -#: apply.c:4120 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" -#: apply.c:4129 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4139 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4277 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4311 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4317 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4325 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4331 apply.c:4476 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" -#: apply.c:4378 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4448 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4546 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4554 +#: apply.c:4556 msgid "internal error" msgstr "内部错误" -#: apply.c:4557 +#: apply.c:4559 #, 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:4568 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4590 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4594 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4718 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4726 +#: apply.c:4733 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4746 +#: apply.c:4753 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4903 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" -#: apply.c:4930 +#: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4936 apply.c:4951 +#: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4944 +#: apply.c:4951 #, 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:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4988 +#: apply.c:4995 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:4991 +#: apply.c:4998 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2317 msgid "num" msgstr "数字" -#: apply.c:4994 +#: apply.c:5001 msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:4997 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:4999 +#: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: apply.c:5003 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:5005 +#: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: apply.c:5007 +#: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: apply.c:5009 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:5011 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c:5013 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:5015 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:5018 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: apply.c:5020 -msgid "attempt three-way merge if a patch does not apply" -msgstr "如果一个补丁不能应用则尝试三方合并" +#: apply.c:5027 +msgid "attempt three-way merge, fall back on normal patch if that fails" +msgstr "尝试三路合并，如果失败则尝试正常补丁模式" -#: apply.c:5022 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:5027 +#: apply.c:5034 msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/rebase.c:1347 msgid "action" msgstr "动作" -#: apply.c:5029 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:5032 apply.c:5035 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:5038 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:5040 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:5042 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:5044 +#: apply.c:5051 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" -#: apply.c:5047 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:5050 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2305 msgid "root" msgstr "根目录" -#: apply.c:5053 +#: apply.c:5060 msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" @@ -1635,141 +1650,141 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" msgstr "不能读取 %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" -#: archive.c:454 +#: archive.c:451 #, c-format msgid "no such ref: %.*s" msgstr "无此引用：%.*s" -#: archive.c:460 +#: archive.c:457 #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" -#: archive.c:473 +#: archive.c:470 #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" -#: archive.c:485 +#: archive.c:482 msgid "current working directory is untracked" msgstr "当前工作目录未被跟踪" -#: archive.c:526 +#: archive.c:523 #, c-format msgid "File not found: %s" msgstr "文件未找到：%s" -#: archive.c:528 +#: archive.c:525 #, c-format msgid "Not a regular file: %s" msgstr "不是一个常规文件：%s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" msgstr "格式" -#: archive.c:555 +#: archive.c:552 msgid "archive format" msgstr "归档格式" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:553 builtin/log.c:1772 msgid "prefix" msgstr "前缀" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "文件" -#: archive.c:559 +#: archive.c:556 msgid "add untracked file to archive" msgstr "将未跟踪文件添加到归档" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:567 +#: archive.c:564 msgid "set compression level" msgstr "设置压缩级别" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 msgid "repo" msgstr "仓库" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 #: builtin/notes.c:498 msgid "command" msgstr "命令" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: archive.c:582 +#: archive.c:579 msgid "Unexpected option --remote" msgstr "未知参数 --remote" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" msgstr "未知参数 --output" -#: archive.c:588 +#: archive.c:585 msgid "Options --add-file and --remote cannot be used together" msgstr "选项 --add-file 和 --remote 不能同时使用" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" @@ -1779,12 +1794,12 @@ msgstr "参数不支持此格式 '%s'：-%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" -#: attr.c:359 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s：%s:%d" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1866,7 +1881,7 @@ msgstr "二分查找中：合并基线必须是经过测试的\n" msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" @@ -1911,37 +1926,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 -#: builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" @@ -2069,12 +2084,12 @@ msgstr "歧义的对象名：'%s'。" msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" @@ -2099,8 +2114,8 @@ msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -2158,7 +2173,7 @@ msgstr "不支持的归档包版本 %d" msgid "cannot write bundle version %d with algorithm %s" msgstr "不能写入，归档包版本 %d 不支持算法 %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -2200,252 +2215,252 @@ msgstr "最终块有非零 ID %" msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit-graph.c:197 midx.c:46 +#: commit-graph.c:204 midx.c:47 msgid "invalid hash version" msgstr "无效的哈希版本" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "提交图形文件太小" -#: commit-graph.c:348 +#: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交图形签名 %X 和签名 %X 不匹配" -#: commit-graph.c:355 +#: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交图形版本 %X 和版本 %X 不匹配" -#: commit-graph.c:362 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" -#: commit-graph.c:379 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "提交图形文件太小，容不下 %u 个块" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "提交图形没有基础图形块" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "提交图形链不匹配" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "无法找到所有提交图形文件" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "无效的提交位置。提交图形可能已损坏" -#: commit-graph.c:756 +#: commit-graph.c:766 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:789 +#: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" msgstr "提交图需要溢出世代数据，但是没有" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1075 builtin/am.c:1340 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1337 builtin/pack-objects.c:2897 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:1358 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" -#: commit-graph.c:1375 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:1395 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" -#: commit-graph.c:1414 +#: commit-graph.c:1424 msgid "Computing commit graph topological levels" msgstr "正在计算提交图拓扑级别" -#: commit-graph.c:1467 +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:1548 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "计算提交变更路径的布隆过滤器" -#: commit-graph.c:1625 +#: commit-graph.c:1635 msgid "Collecting referenced commits" msgstr "正在收集引用的提交" -#: commit-graph.c:1650 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 个包中查找提交图的提交" msgstr[1] "正在 %d 个包中查找提交图的提交" -#: commit-graph.c:1663 +#: commit-graph.c:1673 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:1667 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:1704 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" -#: commit-graph.c:1722 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" -#: commit-graph.c:1771 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1812 midx.c:906 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1815 +#: commit-graph.c:1825 msgid "unable to create temporary graph layer" msgstr "无法创建临时图层" -#: commit-graph.c:1820 +#: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "无法为 '%s' 调整共享权限" -#: commit-graph.c:1879 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步写出提交图" msgstr[1] "正在用 %d 步写出提交图" -#: commit-graph.c:1915 +#: commit-graph.c:1923 msgid "unable to open commit-graph chain file" msgstr "无法打开提交图形链文件" -#: commit-graph.c:1931 +#: commit-graph.c:1939 msgid "failed to rename base commit-graph file" msgstr "无法重命名基础提交图形文件" -#: commit-graph.c:1951 +#: commit-graph.c:1959 msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" -#: commit-graph.c:2084 +#: commit-graph.c:2092 msgid "Scanning merged commits" msgstr "正在扫描合并提交" -#: commit-graph.c:2128 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "正在合并提交图形" -#: commit-graph.c:2235 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用" -#: commit-graph.c:2342 +#: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:2440 +#: commit-graph.c:2450 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:2450 +#: commit-graph.c:2460 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2470 commit-graph.c:2485 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2467 +#: commit-graph.c:2477 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" -#: commit-graph.c:2485 +#: commit-graph.c:2495 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2500 +#: commit-graph.c:2510 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2507 +#: commit-graph.c:2517 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2517 +#: commit-graph.c:2527 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2526 +#: commit-graph.c:2536 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2540 +#: commit-graph.c:2550 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2545 +#: commit-graph.c:2555 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" -#: commit-graph.c:2549 +#: commit-graph.c:2559 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" -#: commit-graph.c:2566 +#: commit-graph.c:2576 #, c-format msgid "commit-graph generation for commit %s is % < %" msgstr "提交图形中的提交 %s 的世代号是 % < %" -#: commit-graph.c:2572 +#: commit-graph.c:2582 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "提交图形中提交 %s 的提交日期是 % != %" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2475,27 +2490,27 @@ msgstr "" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" -#: commit.c:1223 +#: commit.c:1237 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: commit.c:1227 +#: commit.c:1241 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: commit.c:1230 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" -#: commit.c:1233 +#: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: commit.c:1487 +#: commit.c:1501 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" @@ -2562,7 +2577,7 @@ msgstr "键名没有包含一个小节名称：%s" msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名：%s" -#: config.c:472 sequencer.c:2588 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" @@ -2679,70 +2694,70 @@ msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:1194 +#: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "'%2$s' 的错误的布尔取值 '%1$s'" -#: config.c:1289 +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展用户目录：'%s'" -#: config.c:1298 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" -#: config.c:1391 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "缩写长度超出范围：%d" -#: config.c:1405 config.c:1416 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:1508 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "core.commentChar 应该是一个字符" -#: config.c:1541 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1613 +#: config.c:1599 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式错误" -#: config.c:1639 +#: config.c:1625 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式错误：%s" -#: config.c:1640 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1701 builtin/pack-objects.c:3666 +#: config.c:1687 builtin/pack-objects.c:3924 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1823 +#: config.c:1809 #, c-format msgid "unable to load config blob object '%s'" msgstr "无法从数据对象 '%s' 加载配置" -#: config.c:1826 +#: config.c:1812 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 没有指向一个数据对象" -#: config.c:1843 +#: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" @@ -2752,105 +2767,105 @@ msgstr "不能解析配置对象 '%s'" msgid "failed to parse %s" msgstr "解析 %s 失败" -#: config.c:1927 +#: config.c:1929 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2290 +#: config.c:2293 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2464 +#: config.c:2467 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2509 +#: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2555 +#: config.c:2558 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2557 +#: config.c:2560 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2641 +#: config.c:2644 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2673 +#: config.c:2676 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2702 +#: config.c:2705 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2954 config.c:3280 +#: config.c:2957 config.c:3283 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2965 +#: config.c:2968 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:3002 builtin/config.c:361 +#: config.c:3005 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:3027 +#: config.c:3030 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:3040 config.c:3293 +#: config.c:3043 config.c:3296 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:3051 +#: config.c:3054 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:3060 config.c:3298 +#: config.c:3063 config.c:3301 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:3145 config.c:3395 +#: config.c:3148 config.c:3398 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:3179 +#: config.c:3182 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3271 +#: config.c:3274 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3438 +#: config.c:3441 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -3026,7 +3041,7 @@ msgstr "已阻止奇怪的路径名 '%s'" msgid "unable to fork" msgstr "无法 fork" -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在检查连通性" @@ -3042,17 +3057,17 @@ msgstr "写入 rev-list 失败" msgid "failed to close rev-list's stdin" msgstr "关闭 rev-list 的标准输入失败" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "非法的 crlf 动作 %d" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "%s 中的 CRLF 将被 LF 替换" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3061,12 +3076,12 @@ msgstr "" "%s 中的 CRLF 将被 LF 替换。<\n" "在工作区中该文件仍保持原有的换行符。" -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "文件 %s 中的 LF 将被 CRLF 替换" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3075,12 +3090,12 @@ msgstr "" "%s 中的 LF 将被 CRLF 替换。\n" "在工作区中该文件仍保持原有的换行符" -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " @@ -3088,12 +3103,12 @@ msgid "" msgstr "" "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。" -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -3102,66 +3117,66 @@ msgstr "" "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字" "节序）作为工作区编码。" -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" -#: convert.c:665 +#: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以执行外部过滤器 '%s'" -#: convert.c:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能将输入传递给外部过滤器 '%s'" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "外部过滤器 '%s' 失败码 %d" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "从外部过滤器 '%s' 读取失败" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "外部过滤器 '%s' 失败" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "意外的过滤类型" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" -#: convert.c:940 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" -#: convert.c:1240 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" -#: convert.c:1428 convert.c:1462 +#: convert.c:1414 convert.c:1447 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 过滤器 '%s' 失败" -#: convert.c:1508 +#: convert.c:1490 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 过滤器 %s 失败" @@ -3286,28 +3301,28 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" -#: diff-merges.c:70 +#: diff-merges.c:80 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "未知的 --diff-merges 取值：%s" -#: diff-lib.c:534 +#: diff-lib.c:538 msgid "--merge-base does not work with ranges" msgstr "--merge-base 不适用于范围" -#: diff-lib.c:536 +#: diff-lib.c:540 msgid "--merge-base only works with commits" msgstr "--merge-base 仅适用于提交" -#: diff-lib.c:553 +#: diff-lib.c:557 msgid "unable to get HEAD" msgstr "不能解析 HEAD" -#: diff-lib.c:560 +#: diff-lib.c:564 msgid "no merge base found" msgstr "未找到合并基线" -#: diff-lib.c:562 +#: diff-lib.c:566 msgid "multiple merge bases found" msgstr "找到了多条合并基线" @@ -3370,35 +3385,35 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:4276 +#: diff.c:4278 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4628 +#: diff.c:4630 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4631 +#: diff.c:4633 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4710 +#: diff.c:4712 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4758 +#: diff.c:4760 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" -#: diff.c:4795 +#: diff.c:4797 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3407,200 +3422,200 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4880 +#: diff.c:4882 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" -#: diff.c:4904 +#: diff.c:4906 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" -#: diff.c:4918 +#: diff.c:4920 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4968 diff.c:4974 +#: diff.c:4970 diff.c:4976 #, c-format msgid "%s expects / form" msgstr "%s 期望 / 格式" -#: diff.c:4986 +#: diff.c:4988 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" -#: diff.c:5007 +#: diff.c:5009 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" -#: diff.c:5026 +#: diff.c:5028 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c:5066 +#: diff.c:5068 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5102 diff.c:5122 +#: diff.c:5104 diff.c:5124 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" -#: diff.c:5226 +#: diff.c:5228 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "选项 -I 的正则表达式无效：'%s'" -#: diff.c:5275 +#: diff.c:5277 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5331 +#: diff.c:5333 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" -#: diff.c:5367 +#: diff.c:5369 msgid "Diff output format options" msgstr "差异输出格式化选项" -#: diff.c:5369 diff.c:5375 +#: diff.c:5371 diff.c:5377 msgid "generate patch" msgstr "生成补丁" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5374 builtin/log.c:179 msgid "suppress diff output" msgstr "不显示差异输出" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5379 diff.c:5493 diff.c:5500 msgid "" msgstr "" -#: diff.c:5378 diff.c:5381 +#: diff.c:5380 diff.c:5383 msgid "generate diffs with lines context" msgstr "生成含 行上下文的差异" -#: diff.c:5383 +#: diff.c:5385 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" -#: diff.c:5386 +#: diff.c:5388 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" -#: diff.c:5390 +#: diff.c:5392 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" -#: diff.c:5394 +#: diff.c:5396 msgid "machine friendly --stat" msgstr "机器友好的 --stat" -#: diff.c:5397 +#: diff.c:5399 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" -#: diff.c:5399 diff.c:5407 +#: diff.c:5401 diff.c:5409 msgid "..." msgstr "<参数1,参数2>..." -#: diff.c:5400 +#: diff.c:5402 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" -#: diff.c:5404 +#: diff.c:5406 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" -#: diff.c:5408 +#: diff.c:5410 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" -#: diff.c:5412 +#: diff.c:5414 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" -#: diff.c:5415 +#: diff.c:5417 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" -#: diff.c:5418 +#: diff.c:5420 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" -#: diff.c:5421 +#: diff.c:5423 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" -#: diff.c:5423 +#: diff.c:5425 msgid "[,[,]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" -#: diff.c:5424 +#: diff.c:5426 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5428 diff.c:5431 diff.c:5434 msgid "" msgstr "<宽度>" -#: diff.c:5427 +#: diff.c:5429 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" -#: diff.c:5430 +#: diff.c:5432 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" -#: diff.c:5433 +#: diff.c:5435 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" -#: diff.c:5435 +#: diff.c:5437 msgid "" msgstr "<次数>" -#: diff.c:5436 +#: diff.c:5438 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" -#: diff.c:5439 +#: diff.c:5441 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" -#: diff.c:5442 +#: diff.c:5444 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" -#: diff.c:5445 +#: diff.c:5447 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" -#: diff.c:5447 +#: diff.c:5449 msgid "show colored diff" msgstr "显示带颜色的差异" -#: diff.c:5448 +#: diff.c:5450 msgid "" msgstr "<类型>" -#: diff.c:5449 +#: diff.c:5451 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" -#: diff.c:5452 +#: diff.c:5454 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3608,311 +3623,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 msgid "" msgstr "<前缀>" -#: diff.c:5456 +#: diff.c:5458 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" -#: diff.c:5459 +#: diff.c:5461 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" -#: diff.c:5462 +#: diff.c:5464 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" -#: diff.c:5465 +#: diff.c:5467 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" -#: diff.c:5468 +#: diff.c:5470 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" -#: diff.c:5472 diff.c:5477 diff.c:5482 +#: diff.c:5474 diff.c:5479 diff.c:5484 msgid "" msgstr "<字符>" -#: diff.c:5473 +#: diff.c:5475 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" -#: diff.c:5478 +#: diff.c:5480 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" -#: diff.c:5483 +#: diff.c:5485 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" -#: diff.c:5486 +#: diff.c:5488 msgid "Diff rename options" msgstr "差异重命名选项" -#: diff.c:5487 +#: diff.c:5489 msgid "[/]" msgstr "[/]" -#: diff.c:5488 +#: diff.c:5490 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" -#: diff.c:5492 +#: diff.c:5494 msgid "detect renames" msgstr "检测重命名" -#: diff.c:5496 +#: diff.c:5498 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" -#: diff.c:5499 +#: diff.c:5501 msgid "detect copies" msgstr "检测拷贝" -#: diff.c:5503 +#: diff.c:5505 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" -#: diff.c:5505 +#: diff.c:5507 msgid "disable rename detection" msgstr "禁用重命名探测" -#: diff.c:5508 +#: diff.c:5510 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" -#: diff.c:5510 +#: diff.c:5512 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" -#: diff.c:5513 +#: diff.c:5515 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" -#: diff.c:5515 +#: diff.c:5517 msgid "Diff algorithm options" msgstr "差异算法选项" -#: diff.c:5517 +#: diff.c:5519 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" -#: diff.c:5520 +#: diff.c:5522 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" -#: diff.c:5523 +#: diff.c:5525 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" -#: diff.c:5526 +#: diff.c:5528 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" -#: diff.c:5529 +#: diff.c:5531 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" -#: diff.c:5532 +#: diff.c:5534 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 msgid "" msgstr "<正则>" -#: diff.c:5535 +#: diff.c:5537 msgid "ignore changes whose all lines match " msgstr "忽略所有行都和正则表达式匹配的变更" -#: diff.c:5538 +#: diff.c:5540 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" -#: diff.c:5541 +#: diff.c:5543 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" -#: diff.c:5545 +#: diff.c:5547 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c:5547 +#: diff.c:5549 msgid "" msgstr "<算法>" -#: diff.c:5548 +#: diff.c:5550 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: diff.c:5550 +#: diff.c:5552 msgid "" msgstr "<文本>" -#: diff.c:5551 +#: diff.c:5553 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5555 diff.c:5564 diff.c:5567 msgid "" msgstr "<模式>" -#: diff.c:5554 +#: diff.c:5556 msgid "show word diff, using to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" -#: diff.c:5557 +#: diff.c:5559 msgid "use to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" -#: diff.c:5560 +#: diff.c:5562 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" -#: diff.c:5563 +#: diff.c:5565 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" -#: diff.c:5566 +#: diff.c:5568 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" -#: diff.c:5569 +#: diff.c:5571 msgid "Other diff options" msgstr "其它差异选项" -#: diff.c:5571 +#: diff.c:5573 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" -#: diff.c:5575 +#: diff.c:5577 msgid "treat all files as text" msgstr "把所有文件当做文本处理" -#: diff.c:5577 +#: diff.c:5579 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" -#: diff.c:5579 +#: diff.c:5581 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" -#: diff.c:5581 +#: diff.c:5583 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" -#: diff.c:5583 +#: diff.c:5585 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" -#: diff.c:5585 +#: diff.c:5587 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" -#: diff.c:5587 +#: diff.c:5589 msgid "" msgstr "<何时>" -#: diff.c:5588 +#: diff.c:5590 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" -#: diff.c:5591 +#: diff.c:5593 msgid "" msgstr "<格式>" -#: diff.c:5592 +#: diff.c:5594 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" -#: diff.c:5596 +#: diff.c:5598 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" -#: diff.c:5599 +#: diff.c:5601 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" -#: diff.c:5601 +#: diff.c:5603 msgid "" msgstr "<字符串>" -#: diff.c:5602 +#: diff.c:5604 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" -#: diff.c:5605 +#: diff.c:5607 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" -#: diff.c:5608 +#: diff.c:5610 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" -#: diff.c:5611 +#: diff.c:5613 msgid "treat in -S as extended POSIX regular expression" msgstr "将 -S 的 当做扩展的 POSIX 正则表达式" -#: diff.c:5614 +#: diff.c:5616 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" -#: diff.c:5615 diff.c:5618 +#: diff.c:5617 diff.c:5620 msgid "" msgstr "<路径>" -#: diff.c:5616 +#: diff.c:5618 msgid "show the change in the specified path first" msgstr "先显示指定路径的变更" -#: diff.c:5619 +#: diff.c:5621 msgid "skip the output to the specified path" msgstr "跳过指定路径的输出" -#: diff.c:5621 +#: diff.c:5623 msgid "" msgstr "<对象 ID>" -#: diff.c:5622 +#: diff.c:5624 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" -#: diff.c:5624 +#: diff.c:5626 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5625 +#: diff.c:5627 msgid "select files by diff type" msgstr "通过差异类型选择文件" -#: diff.c:5627 +#: diff.c:5629 msgid "" msgstr "<文件>" -#: diff.c:5628 +#: diff.c:5630 msgid "Output to a specific file" msgstr "输出到一个指定的文件" -#: diff.c:6285 +#: diff.c:6287 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多，略过不严格的重命名检查。" -#: diff.c:6288 +#: diff.c:6290 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多，只在修改的路径中查找拷贝。" -#: diff.c:6291 +#: diff.c:6293 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3923,7 +3938,7 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令 msgid "failed to read orderfile '%s'" msgstr "读取排序文件 '%s' 失败" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1418 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" @@ -3956,35 +3971,35 @@ msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" msgid "disabling cone pattern matching" msgstr "禁止 cone 模式匹配" -#: dir.c:1198 +#: dir.c:1206 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:2305 +#: dir.c:2314 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2605 +#: dir.c:2614 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2729 +#: dir.c:2738 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3534 +#: dir.c:3543 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3579 dir.c:3584 +#: dir.c:3590 dir.c:3595 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3613 +#: dir.c:3624 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" @@ -3994,11 +4009,11 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "过滤内容" -#: entry.c:478 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" @@ -4018,249 +4033,257 @@ msgstr "不能设置 GIT_DIR 为 '%s'" msgid "too many args to run %s" msgstr "执行 %s 的参数太多" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" -#: fetch-pack.c:180 +#: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包" -#: fetch-pack.c:191 +#: fetch-pack.c:196 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" -#: fetch-pack.c:211 +#: fetch-pack.c:216 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" -#: fetch-pack.c:222 +#: fetch-pack.c:227 msgid "unable to write to remote" msgstr "无法写到远程" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "完成" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:844 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:852 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:946 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:952 +#: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack：无效的 index-pack 输出" -#: fetch-pack.c:969 +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:971 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:1031 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "服务器支持 %s" -#: fetch-pack.c:1041 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" -#: fetch-pack.c:1101 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:1106 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:1110 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:1112 +#: fetch-pack.c:1100 msgid "Server does not support this repository's object format" msgstr "服务器不支持这个仓库的对象格式" -#: fetch-pack.c:1125 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +msgid "source repository is shallow, reject to clone." +msgstr "源仓库是浅克隆，拒绝克隆。" + +#: fetch-pack.c:1128 fetch-pack.c:1651 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1265 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "不匹配的算法：客户端 %s，服务端 %s" -#: fetch-pack.c:1269 +#: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" msgstr "服务器不支持算法 '%s'" -#: fetch-pack.c:1289 +#: fetch-pack.c:1279 msgid "Server does not support shallow requests" msgstr "服务器不支持 shalllow 请求" -#: fetch-pack.c:1296 +#: fetch-pack.c:1286 msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:1335 +#: fetch-pack.c:1329 fetch-pack.c:2034 msgid "unable to write request to remote" msgstr "无法将请求写到远程" -#: fetch-pack.c:1353 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" -#: fetch-pack.c:1359 +#: fetch-pack.c:1353 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s'，得到 '%s'" -#: fetch-pack.c:1420 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行：'%s'" -#: fetch-pack.c:1425 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错：%d" -#: fetch-pack.c:1435 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" -#: fetch-pack.c:1437 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" -#: fetch-pack.c:1479 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错：%d" -#: fetch-pack.c:1526 +#: fetch-pack.c:1494 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1531 +#: fetch-pack.c:1499 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1536 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错：%d" -#: fetch-pack.c:1566 +#: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack：预期响应结束包" -#: fetch-pack.c:1960 +#: fetch-pack.c:1930 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1953 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:2010 +#: fetch-pack.c:2056 +msgid "unexpected 'ready' from remote" +msgstr "来自远程的意外的 'ready'" + +#: fetch-pack.c:2079 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:2013 +#: fetch-pack.c:2082 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" @@ -4283,7 +4306,7 @@ msgstr "gpg 数据签名失败" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" -#: grep.c:543 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" @@ -4291,18 +4314,18 @@ msgstr "" "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" "功能" -#: grep.c:1906 +#: grep.c:1893 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" -#: grep.c:1934 +#: grep.c:1921 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" @@ -4524,47 +4547,52 @@ msgstr "不允许空的姓名（对于 <%s>）" msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符：%s" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:'" msgstr "期望 'tree:<深度>'" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "sparse:path 过滤器支持已被删除" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, c-format +msgid "'%s' for 'object:type=' isnot a valid object type" +msgstr "'object:type=' 的值 '%s' 不是有效的对象类型" + +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "无效的过滤器表达式 '%s'" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "期望在组合后有一些东西：" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "不能混用多种过滤规格" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "无法升级仓库格式以支持部分克隆" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "不能访问 '%s' 中的稀疏数据对象" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "无法解析 %s 中的稀疏过滤器数据" @@ -4579,7 +4607,7 @@ msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对 msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象" -#: list-objects.c:375 +#: list-objects.c:395 #, c-format msgid "unable to load root tree for commit %s" msgstr "无法为提交 %s 加载根树" @@ -4616,32 +4644,41 @@ msgstr "lsrefs.unborn 的取值 '%s' 无效" msgid "expected flush after ls-refs arguments" msgstr "在 ls-refs 参数后应该有一个 flush 包" -#: merge-ort.c:888 merge-recursive.c:1191 +#: mailinfo.c:1050 +msgid "quoted CRLF detected" +msgstr "检测到引号中的换行符" + +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "'%2$s' 的错误动作 '%1$s'" + +#: merge-ort.c:1116 merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s （没有检出）" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1125 merge-recursive.c:1212 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "无法合并子模组 %s（提交不存在）" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1134 merge-recursive.c:1219 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s （提交未跟随合并基线）" -#: merge-ort.c:916 merge-ort.c:923 +#: merge-ort.c:1144 merge-ort.c:1151 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "注意：快进子模组 %s 到 %s" -#: merge-ort.c:944 +#: merge-ort.c:1172 #, c-format msgid "Failed to merge submodule %s" msgstr "无法合并子模组 %s" -#: merge-ort.c:951 +#: merge-ort.c:1179 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4650,7 +4687,7 @@ msgstr "" "无法合并子模组 %s，但是存在一个可能的合并方案：\n" "%s\n" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1183 merge-recursive.c:1273 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4666,7 +4703,7 @@ msgstr "" "\n" "以接受此建议。\n" -#: merge-ort.c:968 +#: merge-ort.c:1196 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4675,21 +4712,21 @@ msgstr "" "无法合并子模组 %s，但是存在多个可能的合并：\n" "%s" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1415 merge-recursive.c:1362 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1420 merge-recursive.c:1367 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1427 merge-recursive.c:1400 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:1566 merge-recursive.c:2122 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4698,7 +4735,7 @@ msgstr "" "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" "在：%s。" -#: merge-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:1576 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4707,22 +4744,24 @@ msgstr "" "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" "径放置于此：%s" -#: merge-ort.c:1471 +#: merge-ort.c:1634 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " "renamed to multiple other directories, with no destination getting a " "majority of the files." -msgstr "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目录中，没有一个目标目录中包含多数文件。" +msgstr "" +"冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目" +"录中，没有一个目标目录中包含多数文件。" -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:1788 merge-recursive.c:2468 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。" -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:1932 merge-recursive.c:3244 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4730,7 +4769,7 @@ msgid "" msgstr "" "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:1939 merge-recursive.c:3251 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4739,7 +4778,7 @@ msgstr "" "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" "动到 %5$s。" -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:1952 merge-recursive.c:3247 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4748,7 +4787,7 @@ msgstr "" "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" "到 %s。" -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:1960 merge-recursive.c:3254 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4757,79 +4796,100 @@ msgstr "" "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" "建议将其移动到 %5$s。" -#: merge-ort.c:1952 +#: merge-ort.c:2103 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." -msgstr "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。" +msgstr "" +"冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。" -#: merge-ort.c:2047 +#: merge-ort.c:2198 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " "conflicts AND collides with another path; this may result in nested conflict " "markers." -msgstr "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这可能导致嵌套的冲突标签。" +msgstr "" +"冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这" +"可能导致嵌套的冲突标签。" -#: merge-ort.c:2066 merge-ort.c:2090 +#: merge-ort.c:2217 merge-ort.c:2241 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。" -#: merge-ort.c:2735 +#: merge-ort.c:2550 merge-recursive.c:3002 +#, c-format +msgid "cannot read object %s" +msgstr "不能读取对象 %s" + +#: merge-ort.c:2553 merge-recursive.c:3005 +#, c-format +msgid "object %s is not a blob" +msgstr "对象 %s 不是一个数据对象" + +#: merge-ort.c:2981 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。" -#: merge-ort.c:2808 +#: merge-ort.c:3055 #, c-format msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." -msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的%s以便每个被记录在不同位置。" +msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，把它们都重命名以便每个能记录在不同位置。" -#: merge-ort.c:2812 -msgid "both" -msgstr "双方" +#: merge-ort.c:3062 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的一个以便每个被记录在不同位置。" -#: merge-ort.c:2812 -msgid "one" -msgstr "一个" - -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3162 merge-recursive.c:3081 msgid "content" msgstr "内容" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3164 merge-recursive.c:3085 msgid "add/add" msgstr "添加/添加" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3166 merge-recursive.c:3130 msgid "submodule" msgstr "子模组" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3168 merge-recursive.c:3131 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-ort.c:2938 +#: merge-ort.c:3198 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " "of %s left in tree." -msgstr "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本在树中被保留。" +msgstr "" +"冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本" +"在树中被保留。" + +#: merge-ort.c:3433 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "注意：%s 不是最新的，并且正在检出冲突的版本。旧副本重命名为 %s" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3406 +#: merge-ort.c:3730 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "无法收集树 %s、%s、%s 的合并信息" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4838,10 +4898,9 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format -msgid "Already up to date!" -msgstr "已经是最新的！" +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +msgid "Already up to date." +msgstr "已经是最新的。" #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4857,85 +4916,85 @@ msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。" msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" -#: merge-recursive.c:874 +#: merge-recursive.c:876 #, c-format msgid "failed to create path '%s'%s" msgstr "创建路径 '%s'%s 失败" -#: merge-recursive.c:885 +#: merge-recursive.c:887 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:901 merge-recursive.c:920 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:908 +#: merge-recursive.c:910 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:951 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:954 +#: merge-recursive.c:956 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "failed to open '%s': %s" msgstr "打开 '%s' 失败：%s" -#: merge-recursive.c:990 +#: merge-recursive.c:992 #, c-format msgid "failed to symlink '%s': %s" msgstr "创建符号链接 '%s' 失败：%s" -#: merge-recursive.c:995 +#: merge-recursive.c:997 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1227 merge-recursive.c:1239 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交：" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1230 merge-recursive.c:1242 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快进子模组 %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "无法合并子模组 %s （没发现合并跟随的提交）" -#: merge-recursive.c:1255 +#: merge-recursive.c:1269 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "无法合并子模组 %s（非快进）" -#: merge-recursive.c:1256 +#: merge-recursive.c:1270 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案：\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1282 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" -#: merge-recursive.c:1402 +#: merge-recursive.c:1424 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。" -#: merge-recursive.c:1474 +#: merge-recursive.c:1496 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4944,7 +5003,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1479 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4953,7 +5012,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1486 +#: merge-recursive.c:1508 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4962,7 +5021,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1491 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4971,40 +5030,40 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" -#: merge-recursive.c:1587 +#: merge-recursive.c:1609 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" -#: merge-recursive.c:1645 +#: merge-recursive.c:1667 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1698 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1681 +#: merge-recursive.c:1703 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s" -#: merge-recursive.c:1708 +#: merge-recursive.c:1730 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5013,18 +5072,18 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1735 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1805 +#: merge-recursive.c:1827 #, 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:2068 +#: merge-recursive.c:2090 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5034,7 +5093,7 @@ msgstr "" "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" "其它目录，没有目录包含大部分文件。" -#: merge-recursive.c:2202 +#: merge-recursive.c:2224 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5043,89 +5102,79 @@ msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " "%4$s->%5$s" -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "不能读取对象 %s" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "对象 %s 不是一个数据对象" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modify" msgstr "修改" -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modified" msgstr "修改" -#: merge-recursive.c:3079 +#: merge-recursive.c:3108 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:3132 +#: merge-recursive.c:3161 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:3339 +#: merge-recursive.c:3368 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:3362 +#: merge-recursive.c:3391 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:3367 +#: merge-recursive.c:3396 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:3374 +#: merge-recursive.c:3403 #, 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:3383 +#: merge-recursive.c:3412 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:3392 +#: merge-recursive.c:3421 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "冲突（add/add）：合并冲突于 %s" -#: merge-recursive.c:3445 +#: merge-recursive.c:3474 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3539 +#: merge-recursive.c:3568 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:3552 +#: merge-recursive.c:3581 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:3602 +#: merge-recursive.c:3631 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3758 +#: merge-recursive.c:3796 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "不能写入索引。" @@ -5133,176 +5182,195 @@ msgstr "不能写入索引。" msgid "failed to read the cache" msgstr "读取缓存失败" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: midx.c:62 +#: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "多包索引的对象ID扇出表大小错误" -#: midx.c:93 +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" -#: midx.c:109 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" -#: midx.c:114 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" -#: midx.c:119 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" -#: midx.c:136 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" -#: midx.c:138 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的对象 ID 扇出块" -#: midx.c:140 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的对象 ID 查询块" -#: midx.c:142 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" -#: midx.c:158 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序：'%s' 在 '%s' 之前" -#: midx.c:202 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" -#: midx.c:252 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" -#: midx.c:467 +#: midx.c:490 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" -#: midx.c:473 +#: midx.c:496 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" -#: midx.c:533 +#: midx.c:564 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:821 +#: midx.c:880 builtin/index-pack.c:1535 +msgid "cannot store reverse index file" +msgstr "无法存储反向索引文件" + +#: midx.c:933 msgid "Adding packfiles to multi-pack-index" msgstr "添加包文件到多包索引" -#: midx.c:855 +#: midx.c:979 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" -#: midx.c:904 +#: midx.c:1024 +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "未知的首选包：'%s'" + +#: midx.c:1029 +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "首选包 '%s' 已过期" + +#: midx.c:1045 msgid "no pack files to index." msgstr "没有要索引的包文件。" -#: midx.c:965 +#: midx.c:1125 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "删除 %s 失败" + +#: midx.c:1156 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:1021 +#: midx.c:1214 msgid "multi-pack-index file exists, but failed to parse" msgstr "多包索引文件存在，但无法解析" -#: midx.c:1029 +#: midx.c:1222 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c:1044 +#: midx.c:1237 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = % > % = fanout[%d]" -#: midx.c:1049 +#: midx.c:1242 msgid "the midx contains no oid" msgstr "midx 不包含 oid" -#: midx.c:1058 +#: midx.c:1251 msgid "Verifying OID order in multi-pack-index" msgstr "校验多包索引中的 OID 顺序" -#: midx.c:1067 +#: midx.c:1260 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1087 +#: midx.c:1280 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" -#: midx.c:1094 +#: midx.c:1287 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1110 +#: midx.c:1303 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1116 +#: midx.c:1309 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1125 +#: midx.c:1318 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "oid[%d] = %s 错误的对象偏移：% != %" -#: midx.c:1150 +#: midx.c:1343 msgid "Counting referenced objects" msgstr "正在对引用对象计数" -#: midx.c:1160 +#: midx.c:1353 msgid "Finding and deleting unreferenced packfiles" msgstr "正在查找和删除未引用的包文件" -#: midx.c:1351 +#: midx.c:1544 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" -#: midx.c:1371 +#: midx.c:1564 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "不能创建 lazy_dir 线程：%s" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "不能创建 lazy_name 线程：%s" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "不能加入 lasy_name 线程：%s" @@ -5346,256 +5414,256 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object-file.c:480 +#: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" -#: object-file.c:531 +#: object-file.c:577 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径：%s" -#: object-file.c:603 +#: object-file.c:649 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" -#: object-file.c:610 +#: object-file.c:656 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" -#: object-file.c:653 +#: object-file.c:699 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" -#: object-file.c:671 +#: object-file.c:717 msgid "unable to read alternates file" msgstr "无法读取替代文件" -#: object-file.c:678 +#: object-file.c:724 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" -#: object-file.c:713 +#: object-file.c:759 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: object-file.c:734 +#: object-file.c:780 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: object-file.c:740 +#: object-file.c:786 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: object-file.c:746 +#: object-file.c:792 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: object-file.c:754 +#: object-file.c:800 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" -#: object-file.c:814 +#: object-file.c:860 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析备用引用时无效的行：%s" -#: object-file.c:964 +#: object-file.c:1010 #, c-format msgid "attempting to mmap % over limit %" msgstr "尝试 mmap %，超过了最大值 %" -#: object-file.c:985 +#: object-file.c:1031 msgid "mmap failed" msgstr "mmap 失败" -#: object-file.c:1149 +#: object-file.c:1195 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1330 object-file.c:2524 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1332 object-file.c:2528 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" -#: object-file.c:1328 +#: object-file.c:1374 msgid "invalid object type" msgstr "无效的对象类型" -#: object-file.c:1412 +#: object-file.c:1458 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" -#: object-file.c:1415 +#: object-file.c:1461 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" -#: object-file.c:1421 +#: object-file.c:1467 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" -#: object-file.c:1424 +#: object-file.c:1470 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: object-file.c:1651 +#: object-file.c:1697 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" -#: object-file.c:1655 +#: object-file.c:1701 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: object-file.c:1659 +#: object-file.c:1705 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" -#: object-file.c:1663 +#: object-file.c:1709 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" -#: object-file.c:1768 +#: object-file.c:1814 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" -#: object-file.c:1775 +#: object-file.c:1821 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: object-file.c:1782 +#: object-file.c:1828 msgid "file write error" msgstr "文件写错误" -#: object-file.c:1802 +#: object-file.c:1848 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" -#: object-file.c:1867 +#: object-file.c:1913 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: object-file.c:1869 +#: object-file.c:1915 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: object-file.c:1893 +#: object-file.c:1939 msgid "unable to write loose object file" msgstr "不能写松散对象文件" -#: object-file.c:1899 +#: object-file.c:1945 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" -#: object-file.c:1903 +#: object-file.c:1949 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: object-file.c:1907 +#: object-file.c:1953 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1963 builtin/pack-objects.c:1097 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: object-file.c:1994 +#: object-file.c:2040 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" -#: object-file.c:2045 +#: object-file.c:2091 msgid "corrupt commit" msgstr "损坏的提交" -#: object-file.c:2053 +#: object-file.c:2099 msgid "corrupt tag" msgstr "损坏的标签" -#: object-file.c:2153 +#: object-file.c:2199 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: object-file.c:2156 +#: object-file.c:2202 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2275 object-file.c:2285 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入数据库失败" -#: object-file.c:2245 +#: object-file.c:2291 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" -#: object-file.c:2269 +#: object-file.c:2315 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: object-file.c:2271 +#: object-file.c:2317 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2344 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2535 object-file.c:2588 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配（预期 %s）" -#: object-file.c:2512 +#: object-file.c:2559 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: object-file.c:2517 +#: object-file.c:2564 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: object-file.c:2523 +#: object-file.c:2570 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: object-file.c:2534 +#: object-file.c:2581 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" @@ -5706,71 +5774,71 @@ msgstr "无效的对象类型 \"%s\"" msgid "object %s is a %s, not a %s" msgstr "对象 %s 是一个 %s，不是一个 %s" -#: object.c:233 +#: object.c:232 #, c-format msgid "object %s has unknown type id %d" msgstr "对象 %s 有未知的类型 id %d" -#: object.c:246 +#: object.c:245 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: object.c:266 object.c:278 +#: object.c:265 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 #, c-format msgid "unable to get size of %s" msgstr "无法得到 %s 的大小" -#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#: pack-bitmap.c:1547 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "无法得到 %s 的磁盘使用量" -#: pack-revindex.c:220 +#: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" msgstr "反向索引文件 %s 太小" -#: pack-revindex.c:225 +#: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" msgstr "反向索引文件 %s 损坏" -#: pack-revindex.c:233 +#: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" msgstr "反向索引文件 %s 有错误的签名" -#: pack-revindex.c:237 +#: pack-revindex.c:238 #, c-format msgid "reverse-index file %s has unsupported version %" msgstr "反向索引文件 %s 不支持的版本 %" -#: pack-revindex.c:242 +#: pack-revindex.c:243 #, c-format msgid "reverse-index file %s has unsupported hash id %" msgstr "反向索引文件 %s 有不支持的哈希 ID %" -#: pack-write.c:236 +#: pack-write.c:250 msgid "cannot both write and verify reverse index" msgstr "无法同时写入和校验反向索引" -#: pack-write.c:257 +#: pack-write.c:271 #, c-format msgid "could not stat: %s" msgstr "不能调用 stat：%s" -#: pack-write.c:269 +#: pack-write.c:283 #, c-format msgid "failed to make %s readable" msgstr "无法设置 %s 为可读" -#: pack-write.c:508 +#: pack-write.c:522 #, c-format msgid "could not write '%s' promisor file" msgstr "无法写入 '%s' 承诺者文件" @@ -5779,12 +5847,12 @@ msgstr "无法写入 '%s' 承诺者文件" msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: packfile.c:1934 +#: packfile.c:1937 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: packfile.c:1938 +#: packfile.c:1941 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" @@ -5849,31 +5917,31 @@ msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" msgid "did you mean `--%s` (with two dashes)?" msgstr "你的意思是 `--%s`（有两个短线）？" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "--%s 的别名" -#: parse-options.c:862 +#: parse-options.c:879 #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" -#: parse-options.c:864 +#: parse-options.c:881 #, c-format msgid "unknown switch `%c'" msgstr "未知开关 `%c'" -#: parse-options.c:866 +#: parse-options.c:883 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字符串中未知的非 ascii 字符选项：`%s'" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "..." -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -5881,18 +5949,18 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "-数字" @@ -5901,78 +5969,78 @@ msgstr "-数字" msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "只允许一个 'attr:' 规格。" -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "属性规格不能为空" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "无效的属性名 %s" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路径规格包含无效的神奇前缀" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" -#: pathspec.c:332 +#: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" -#: pathspec.c:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不兼容" -#: pathspec.c:445 +#: pathspec.c:466 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s：'%s' 在位于 '%s' 的仓库之外" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助记符：'%c'）" -#: pathspec.c:531 +#: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规格神奇前缀不被此命令支持：%s" -#: pathspec.c:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "行被错误地引用：%s" @@ -5993,7 +6061,7 @@ msgstr "无法写入无状态分隔符数据包" msgid "flush packet write failed" msgstr "flush 包写错误" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "协议错误：不可能的长行" @@ -6001,33 +6069,34 @@ msgstr "协议错误：不可能的长行" msgid "packet write with format failed" msgstr "格式化包写入错误" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "写数据包失败：数据超过了包的最大长度" -#: pkt-line.c:210 pkt-line.c:217 -msgid "packet write failed" -msgstr "数据包写入失败" +#: pkt-line.c:222 +#, c-format +msgid "packet write failed: %s" +msgstr "数据包写入失败：%s" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 msgid "read error" msgstr "读取错误" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 msgid "the remote end hung up unexpectedly" msgstr "远端意外挂断了" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "协议错误：错误的行长度字符串：%.4s" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, c-format msgid "protocol error: bad line length %d" msgstr "协议错误：错误的行长度 %d" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "远程错误：%s" @@ -6041,7 +6110,7 @@ msgstr "正在刷新索引" msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat：%s" -#: pretty.c:984 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" @@ -6062,6 +6131,10 @@ msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 远程名称不能以 '/' 开始：%s" +#: protocol-caps.c:103 +msgid "object-info: expected flush after arguments" +msgstr "object-info：在参数之后应有一个 flush" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "正在删除重复对象" @@ -6074,7 +6147,7 @@ msgstr "不能启动 `log`" msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:101 sequencer.c:5551 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6104,50 +6177,50 @@ msgstr "--left-only 和 --right-only 互斥" msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" -#: read-cache.c:682 +#: read-cache.c:708 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" -#: read-cache.c:698 +#: read-cache.c:724 msgid "cannot create an empty blob in the object database" msgstr "不能在对象数据库中创建空的数据对象" -#: read-cache.c:720 +#: read-cache.c:746 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能添加常规文件、符号链接或 git 目录" -#: read-cache.c:725 +#: read-cache.c:751 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 没有检出一个提交" -#: read-cache.c:777 +#: read-cache.c:803 #, c-format msgid "unable to index file '%s'" msgstr "无法索引文件 '%s'" -#: read-cache.c:796 +#: read-cache.c:822 #, c-format msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" -#: read-cache.c:807 +#: read-cache.c:833 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" -#: read-cache.c:1318 +#: read-cache.c:1356 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" -#: read-cache.c:1532 +#: read-cache.c:1571 msgid "Refresh index" msgstr "刷新索引" -#: read-cache.c:1657 +#: read-cache.c:1700 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6156,7 +6229,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1667 +#: read-cache.c:1710 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6165,140 +6238,144 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1723 +#: read-cache.c:1766 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" -#: read-cache.c:1726 +#: read-cache.c:1769 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" -#: read-cache.c:1735 +#: read-cache.c:1778 msgid "bad index file sha1 signature" msgstr "坏的索引文件 sha1 签名" -#: read-cache.c:1765 +#: read-cache.c:1812 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # -#: read-cache.c:1767 +#: read-cache.c:1814 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" -#: read-cache.c:1804 +#: read-cache.c:1851 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" -#: read-cache.c:1820 +#: read-cache.c:1867 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" -#: read-cache.c:1877 +#: read-cache.c:1924 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" -#: read-cache.c:1880 +#: read-cache.c:1927 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" -#: read-cache.c:1883 +#: read-cache.c:1930 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "索引文件损坏" -#: read-cache.c:2133 +#: read-cache.c:2180 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程：%s" -#: read-cache.c:2146 +#: read-cache.c:2193 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程：%s" -#: read-cache.c:2179 +#: read-cache.c:2226 #, c-format msgid "%s: index file open failed" msgstr "%s：打开索引文件失败" -#: read-cache.c:2183 +#: read-cache.c:2230 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能对打开的索引执行 stat 操作" -#: read-cache.c:2187 +#: read-cache.c:2234 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引文件比预期的小" -#: read-cache.c:2191 +#: read-cache.c:2238 #, c-format msgid "%s: unable to map index file" msgstr "%s：无法对索引文件执行 map 操作" -#: read-cache.c:2233 +#: read-cache.c:2280 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程：%s" -#: read-cache.c:2260 +#: read-cache.c:2307 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程：%s" -#: read-cache.c:2292 +#: read-cache.c:2345 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" -#: read-cache.c:2339 +#: read-cache.c:2392 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3138 +msgid "failed to convert to a sparse-index" +msgstr "无法转换为稀疏索引" + +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:3151 +#: read-cache.c:3222 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" -#: read-cache.c:3163 +#: read-cache.c:3234 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" -#: read-cache.c:3188 +#: read-cache.c:3263 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" -#: read-cache.c:3337 +#: read-cache.c:3412 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" @@ -6326,7 +6403,10 @@ msgid "" "r, reword = use commit, but edit the commit message\n" "e, edit = use commit, but stop for amending\n" "s, squash = use commit, but meld into previous commit\n" -"f, fixup = like \"squash\", but discard this commit's log message\n" +"f, fixup [-C | -c] = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" "x, exec = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop = remove commit\n" @@ -6335,17 +6415,20 @@ msgid "" "m, merge [-C | -c ]