diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 6982 |
1 files changed, 3664 insertions, 3318 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 622b61c95a..51f5bc9a40 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,6 +10,7 @@ # - Thynson <lanxingcan AT gmail.com> # - ws3389 <willsmith3389 AT gmail.com> # - Wang Sheng <wangsheng2008love AT 163.com> +# - 依云 <lilydjwg AT gmail.com> # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> # @@ -112,7 +113,7 @@ # smart HTTP protocol | 智能 HTTP 协议 # squash | 压缩 # stage | n. 暂存区（即索引）; v. 暂存 -# stash | n. 进度保存; v. 保存进度 +# stash | n. 贮藏区; v. 贮藏 # submodule | 子模组 # symref | 符号引用 # tag | n. 标签; v. 打标签 @@ -135,8 +136,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-02-18 01:00+0800\n" -"PO-Revision-Date: 2017-02-25 00:10+0800\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" +"PO-Revision-Date: 2017-08-02 08:00+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -145,37 +146,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:55 +#: advice.c:58 #, c-format msgid "hint: %.*s\n" msgstr "提示：%.*s\n" -#: advice.c:83 +#: advice.c:86 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" -#: advice.c:85 +#: advice.c:88 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" -#: advice.c:87 +#: advice.c:90 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" -#: advice.c:89 +#: advice.c:92 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" -#: advice.c:91 +#: advice.c:94 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" -#: advice.c:93 +#: advice.c:96 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" -#: advice.c:101 +#: advice.c:104 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -183,23 +184,23 @@ msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:109 +#: advice.c:112 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:114 builtin/merge.c:1206 +#: advice.c:117 builtin/merge.c:1184 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: advice.c:116 +#: advice.c:119 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c:117 +#: advice.c:120 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c:123 +#: advice.c:126 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -226,82 +227,92 @@ msgstr "" " git checkout -b <new-branch-name>\n" "\n" -#: apply.c:57 +#: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: apply.c:73 +#: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c:125 +#: apply.c:126 msgid "--reject and --3way cannot be used together." msgstr "--reject 和 --3say 不能同时使用。" -#: apply.c:127 +#: apply.c:128 msgid "--cached and --3way cannot be used together." msgstr "--cached 和 --3way 不能同时使用。" -#: apply.c:130 +#: apply.c:131 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" -#: apply.c:141 +#: apply.c:142 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" -#: apply.c:144 +#: apply.c:145 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" -#: apply.c:845 +#: apply.c:836 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: apply.c:854 +#: apply.c:845 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: apply.c:938 +#: apply.c:929 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: apply.c:977 +#: apply.c:967 #, 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:983 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: apply.c:984 +#: apply.c:974 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: apply.c:990 +#: apply.c:979 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: apply.c:1488 +#: apply.c:1008 +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "第 %d 行包含无效文件模式：%s" + +#: apply.c:1326 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "不一致的文件头，%d 行和 %d 行" + +#: apply.c:1498 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: apply.c:1557 +#: apply.c:1567 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: apply.c:1577 +#: apply.c:1587 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -312,82 +323,82 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: apply.c:1589 +#: apply.c:1600 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）" -#: apply.c:1759 +#: apply.c:1770 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: apply.c:1761 +#: apply.c:1772 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: apply.c:1795 +#: apply.c:1806 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: apply.c:1832 +#: apply.c:1843 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: apply.c:1834 +#: apply.c:1845 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: apply.c:1837 +#: apply.c:1848 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: apply.c:1984 +#: apply.c:1995 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: apply.c:2021 +#: apply.c:2032 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: apply.c:2182 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: apply.c:2265 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: apply.c:2269 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: apply.c:2922 +#: apply.c:2933 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: apply.c:3041 +#: apply.c:3052 #, 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:3053 +#: apply.c:3064 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: apply.c:3059 +#: apply.c:3070 #, c-format msgid "" "while searching for:\n" @@ -396,556 +407,561 @@ msgstr "" "当查询：\n" "%.*s" -#: apply.c:3081 +#: apply.c:3092 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: apply.c:3089 +#: apply.c:3100 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" -#: apply.c:3135 +#: apply.c:3146 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" -#: apply.c:3145 +#: apply.c:3156 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" -#: apply.c:3153 +#: apply.c:3164 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" -#: apply.c:3171 +#: apply.c:3182 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" -#: apply.c:3184 +#: apply.c:3195 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: apply.c:3190 +#: apply.c:3201 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: apply.c:3211 +#: apply.c:3222 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: apply.c:3333 +#: apply.c:3344 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248 +#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" -#: apply.c:3389 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c:3418 apply.c:3658 +#: apply.c:3429 apply.c:3669 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c:3501 apply.c:3672 +#: apply.c:3512 apply.c:3683 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: apply.c:3510 apply.c:3680 +#: apply.c:3521 apply.c:3691 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: apply.c:3545 +#: apply.c:3556 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: apply.c:3548 +#: apply.c:3559 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合并...\n" -#: apply.c:3564 apply.c:3568 +#: apply.c:3575 apply.c:3579 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c:3580 +#: apply.c:3591 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "无法回落到三方合并...\n" -#: apply.c:3594 +#: apply.c:3605 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c:3599 +#: apply.c:3610 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c:3625 +#: apply.c:3636 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c:3697 +#: apply.c:3708 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: apply.c:3699 +#: apply.c:3710 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3850 apply.c:3852 +#: apply.c:3860 apply.c:3862 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3908 +#: apply.c:3918 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: apply.c:3911 +#: apply.c:3921 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: apply.c:3931 +#: apply.c:3941 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: apply.c:3936 +#: apply.c:3946 #, 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:3956 +#: apply.c:3966 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:3960 +#: apply.c:3970 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: apply.c:3975 +#: apply.c:3985 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: apply.c:4066 +#: apply.c:4076 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4073 +#: apply.c:4083 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式被改变，但它不在当前 HEAD 中" -#: apply.c:4076 +#: apply.c:4086 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135 +#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: apply.c:4085 +#: apply.c:4095 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4095 +#: apply.c:4105 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4233 +#: apply.c:4243 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4268 +#: apply.c:4278 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4274 +#: apply.c:4284 #, c-format msgid "unable to stat newly created file '%s'" -msgstr "不能枚举新建文件 '%s' 的状态" +msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4288 apply.c:4432 +#: apply.c:4298 apply.c:4442 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4329 +#: apply.c:4339 #, c-format msgid "failed to write to '%s'" msgstr "无法写入 '%s'" -#: apply.c:4333 +#: apply.c:4343 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4403 +#: apply.c:4413 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4501 +#: apply.c:4511 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4509 +#: apply.c:4519 msgid "internal error" msgstr "内部错误" -#: apply.c:4512 +#: apply.c:4522 #, 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:4523 +#: apply.c:4533 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986 +#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4545 +#: apply.c:4555 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4549 +#: apply.c:4559 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4659 +#: apply.c:4669 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4667 +#: apply.c:4677 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4686 +#: apply.c:4696 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4824 +#: apply.c:4833 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" -#: apply.c:4849 +#: apply.c:4860 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4855 apply.c:4870 +#: apply.c:4866 apply.c:4881 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d 行有空白字符误用。" -msgstr[1] "%d 行有空白字符误用。" +msgstr[0] "%d 行新增了空白字符误用。" +msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4863 +#: apply.c:4874 #, 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:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 -#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 -#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 -#: git-add--interactive.perl:239 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: git-add--interactive.perl:197 msgid "path" msgstr "路径" -#: apply.c:4911 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:4914 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4916 builtin/am.c:2286 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "数字" -#: apply.c:4917 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:4920 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:4922 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: apply.c:4926 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:4928 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: apply.c:4930 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: apply.c:4932 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:4934 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:4936 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:4938 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: apply.c:4940 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" -#: apply.c:4942 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507 +#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:4947 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:4948 builtin/am.c:2265 +#: apply.c:4959 builtin/am.c:2245 msgid "action" msgstr "动作" -#: apply.c:4949 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:4952 apply.c:4955 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:4958 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:4960 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:4962 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:4964 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 +#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 +#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 +#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "冗长输出" -#: apply.c:4967 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:4970 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:4972 builtin/am.c:2274 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "根目录" -#: apply.c:4973 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: archive.c:12 +#: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<选项>] <树或提交> [<路径>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:14 +#: archive.c:15 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" -#: archive.c:15 +#: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" -#: archive.c:429 +#: archive.c:418 msgid "fmt" msgstr "格式" -#: archive.c:429 +#: archive.c:418 msgid "archive format" msgstr "归档格式" -#: archive.c:430 builtin/log.c:1429 +#: archive.c:419 builtin/log.c:1446 msgid "prefix" msgstr "前缀" -#: archive.c:431 +#: archive.c:420 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 +#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "文件" -#: archive.c:433 builtin/archive.c:89 +#: archive.c:422 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:435 +#: archive.c:424 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:436 +#: archive.c:425 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:437 +#: archive.c:426 msgid "store only" msgstr "只存储" -#: archive.c:438 +#: archive.c:427 msgid "compress faster" msgstr "压缩速度更快" -#: archive.c:446 +#: archive.c:435 msgid "compress better" msgstr "压缩效果更好" -#: archive.c:449 +#: archive.c:438 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 +#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "仓库" -#: archive.c:452 builtin/archive.c:91 +#: archive.c:441 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 msgid "command" msgstr "命令" -#: archive.c:454 builtin/archive.c:93 +#: archive.c:443 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: archive.c:461 +#: archive.c:450 msgid "Unexpected option --remote" msgstr "未知参数 --remote" -#: archive.c:463 +#: archive.c:452 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" -#: archive.c:465 +#: archive.c:454 msgid "Unexpected option --output" msgstr "未知参数 --output" -#: archive.c:487 +#: archive.c:476 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" -#: archive.c:494 +#: archive.c:483 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" -#: attr.c:263 +#: attr.c:214 +#, c-format +msgid "%.*s is not a valid attribute name" +msgstr "%.*s 不是一个有效的属性名" + +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -953,12 +969,7 @@ msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" -#: bisect.c:441 -#, c-format -msgid "Could not open file '%s'" -msgstr "不能打开文件 '%s'" - -#: bisect.c:446 +#: bisect.c:447 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" @@ -1032,7 +1043,7 @@ msgstr "二分查找中：合并基线必须是经过测试的\n" msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 +#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" @@ -1067,15 +1078,50 @@ msgid_plural "(roughly %d steps)" msgstr[0] "（大概 %d 步）" msgstr[1] "（大概 %d 步）" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation -#: bisect.c:998 +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. +#: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" +#: blame.c:1757 +msgid "--contents and --reverse do not blend well." +msgstr "--contents 和 --reverse 不能混用。" + +#: blame.c:1768 +msgid "cannot use --contents with final commit object name" +msgstr "不能将 --contents 和最终的提交对象名共用" + +#: blame.c:1788 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" + +#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 +#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 +#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 +#: builtin/shortlog.c:177 +msgid "revision walk setup failed" +msgstr "版本遍历设置失败" + +#: blame.c:1815 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" + +#: blame.c:1826 +#, c-format +msgid "no such path %s in %s" +msgstr "在 %2$s 中无此路径 %1$s" + +#: blame.c:1837 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "不能为路径 %2$s 读取数据对象 %1$s" + #: branch.c:53 #, c-format msgid "" @@ -1204,7 +1250,7 @@ msgstr "无效的分支点：'%s'。" msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" -#: branch.c:363 +#: branch.c:366 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" @@ -1214,97 +1260,90 @@ msgstr "工作区 %s 的 HEAD 指向没有被更新" msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" -#: bundle.c:61 +#: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 +#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:139 +#: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" -#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 -#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 -#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:360 builtin/shortlog.c:177 -msgid "revision walk setup failed" -msgstr "版本遍历设置失败" - -#: bundle.c:185 +#: bundle.c:186 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用：" msgstr[1] "这个包中含有 %d 个引用：" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" -#: bundle.c:194 +#: bundle.c:195 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用：" msgstr[1] "这个包需要 %d 个引用：" -#: bundle.c:253 +#: bundle.c:254 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:264 +#: bundle.c:265 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:304 +#: bundle.c:307 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:353 +#: bundle.c:356 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 +#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:451 +#: bundle.c:454 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:463 +#: bundle.c:466 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:491 +#: bundle.c:494 msgid "index-pack died" msgstr "index-pack 终止" -#: color.c:300 +#: color.c:301 #, c-format msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 +#: builtin/am.c:1469 builtin/am.c:2107 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:42 +#: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" -#: commit.c:1514 +#: commit.c:1511 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" @@ -1318,142 +1357,161 @@ msgstr "" msgid "memory exhausted" msgstr "内存耗尽" -#: config.c:518 +#: config.c:186 +msgid "relative config include conditionals must come from files" +msgstr "包含相对路径的条件引用必须来自于文件" + +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:522 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" -#: config.c:526 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" -#: config.c:530 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:534 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" -#: config.c:538 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" -#: config.c:657 +#: config.c:868 msgid "out of range" msgstr "超出范围" -#: config.c:657 +#: config.c:868 msgid "invalid unit" msgstr "无效的单位" -#: config.c:663 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" -#: config.c:668 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:671 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:674 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" -#: config.c:677 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:680 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:683 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:770 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展 '%s' 中的用户目录" -#: config.c:865 config.c:876 +#: config.c:1084 config.c:1095 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:993 +#: config.c:1212 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1149 +#: config.c:1368 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1339 +#: config.c:1564 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:1389 +#: config.c:1894 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:1743 +#: config.c:2064 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "无效 %s：'%s'" + +#: config.c:2085 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'" + +#: config.c:2111 +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" + +#: config.c:2122 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:1745 +#: config.c:2124 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:1804 +#: config.c:2183 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2225 config.c:2450 +#: config.c:2517 config.c:2745 #, c-format msgid "fstat on %s failed" -msgstr "在 %s 上执行 fstat 失败" +msgstr "对 %s 调用 fstat 失败" -#: config.c:2343 +#: config.c:2635 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:2345 +#: config.c:2637 builtin/remote.c:775 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: connect.c:49 +#: connect.c:50 msgid "The remote end hung up upon initial contact" msgstr "远端在连接发起时即挂断" -#: connect.c:51 +#: connect.c:52 msgid "" "Could not read from remote repository.\n" "\n" @@ -1464,7 +1522,7 @@ msgstr "" "\n" "请确认您有正确的访问权限并且仓库存在。" -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 msgid "Checking connectivity" msgstr "检查连接中" @@ -1480,7 +1538,7 @@ msgstr "无法写入 rev-list" msgid "failed to close rev-list's stdin" msgstr "无法关闭 rev-list 的标准输入" -#: convert.c:201 +#: convert.c:205 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -1489,12 +1547,12 @@ msgstr "" "文件 %s 中的 CRLF 将被 LF 替换。\n" "在工作区中该文件仍保持原有的换行符。" -#: convert.c:205 +#: convert.c:209 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "文件 %s 中的 CRLF 将被 LF 替换。" -#: convert.c:211 +#: convert.c:215 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -1503,78 +1561,78 @@ msgstr "" "文件 %s 中的 LF 将被 CRLF 替换。\n" "在工作区中该文件仍保持原有的换行符。" -#: convert.c:215 +#: convert.c:219 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "文件 %s 中的 LF 将被 CRLF 替换" -#: date.c:97 +#: date.c:116 msgid "in the future" msgstr "在将来" -#: date.c:103 +#: date.c:122 #, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" -msgstr[0] "%lu 秒钟前" -msgstr[1] "%lu 秒钟前" +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "%<PRIuMAX> 秒钟前" +msgstr[1] "%<PRIuMAX> 秒钟前" -#: date.c:110 +#: date.c:129 #, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" -msgstr[0] "%lu 分钟前" -msgstr[1] "%lu 分钟前" +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "%<PRIuMAX> 分钟前" +msgstr[1] "%<PRIuMAX> 分钟前" -#: date.c:117 +#: date.c:136 #, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" -msgstr[0] "%lu 小时前" -msgstr[1] "%lu 小时前" +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "%<PRIuMAX> 小时前" +msgstr[1] "%<PRIuMAX> 小时前" -#: date.c:124 +#: date.c:143 #, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" -msgstr[0] "%lu 天前" -msgstr[1] "%lu 天前" +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "%<PRIuMAX> 天前" +msgstr[1] "%<PRIuMAX> 天前" -#: date.c:130 +#: date.c:149 #, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" -msgstr[0] "%lu 周前" -msgstr[1] "%lu 周前" +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "%<PRIuMAX> 周前" +msgstr[1] "%<PRIuMAX> 周前" -#: date.c:137 +#: date.c:156 #, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" -msgstr[0] "%lu 个月前" -msgstr[1] "%lu 个月前" +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "%<PRIuMAX> 个月前" +msgstr[1] "%<PRIuMAX> 个月前" -#: date.c:148 +#: date.c:167 #, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "%lu 年" -msgstr[1] "%lu 年" +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> 年" +msgstr[1] "%<PRIuMAX> 年" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:151 +#: date.c:170 #, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "%s %lu 个月前" -msgstr[1] "%s %lu 个月前" +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s %<PRIuMAX> 个月前" +msgstr[1] "%s %<PRIuMAX> 个月前" -#: date.c:156 date.c:161 +#: date.c:175 date.c:180 #, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "%lu 年前" -msgstr[1] "%lu 年前" +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "%<PRIuMAX> 年前" +msgstr[1] "%<PRIuMAX> 年前" #: diffcore-order.c:24 #, c-format @@ -1583,31 +1641,31 @@ msgstr "无法读取排序文件 '%s'" #: diffcore-rename.c:536 msgid "Performing inexact rename detection" -msgstr "正在进行非精确的重命名检测" +msgstr "正在进行非精确的重命名探测" -#: diff.c:62 +#: diff.c:63 #, c-format msgid "option '%s' requires a value" msgstr "选项 '%s' 需要一个值" # 译者：注意保持前导空格 -#: diff.c:124 +#: diff.c:125 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:129 +#: diff.c:130 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" -#: diff.c:281 +#: diff.c:282 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" -#: diff.c:344 +#: diff.c:342 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1616,20 +1674,20 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:3085 +#: diff.c:3101 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:3411 +#: diff.c:3427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:3501 +#: diff.c:3517 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:3664 +#: diff.c:3680 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1638,252 +1696,277 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3678 +#: diff.c:3694 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:4696 +#: diff.c:4716 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多，略过不严格的重命名检查。" -#: diff.c:4699 +#: diff.c:4719 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多，只在修改的路径中查找拷贝。" -#: diff.c:4702 +#: diff.c:4722 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" -#: dir.c:1862 +#: dir.c:1948 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:1981 +#: dir.c:2067 msgid "Untracked cache is disabled on this system or location." msgstr "缓存未跟踪文件在本系统或位置中被禁用。" -#: dir.c:2759 +#: dir.c:2846 dir.c:2851 +#, c-format +msgid "could not create directories for %s" +msgstr "不能为 %s 创建目录" + +#: dir.c:2876 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" -#: fetch-pack.c:213 +#: entry.c:281 +#, c-format +msgid "could not stat file '%s'" +msgstr "不能对文件 '%s' 调用 stat" + +#: fetch-pack.c:251 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" -#: fetch-pack.c:225 +#: fetch-pack.c:263 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF" -#: fetch-pack.c:243 +#: fetch-pack.c:282 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "远程错误：%s" + +#: fetch-pack.c:283 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" -#: fetch-pack.c:295 +#: fetch-pack.c:335 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:381 +#: fetch-pack.c:421 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:387 +#: fetch-pack.c:427 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:389 +#: fetch-pack.c:429 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:392 +#: fetch-pack.c:432 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:394 +#: fetch-pack.c:434 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:397 +#: fetch-pack.c:437 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" -#: fetch-pack.c:436 +#: fetch-pack.c:476 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:450 +#: fetch-pack.c:490 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:483 +#: fetch-pack.c:523 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:493 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "完成" -#: fetch-pack.c:505 +#: fetch-pack.c:545 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:551 +#: fetch-pack.c:591 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:697 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:735 +#: fetch-pack.c:813 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:743 +#: fetch-pack.c:821 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:799 +#: fetch-pack.c:877 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:815 +#: fetch-pack.c:893 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:817 +#: fetch-pack.c:895 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:844 +#: fetch-pack.c:922 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" -#: fetch-pack.c:848 +#: fetch-pack.c:926 msgid "Server supports multi_ack_detailed" msgstr "服务器支持 multi_ack_detailed" -#: fetch-pack.c:851 +#: fetch-pack.c:929 msgid "Server supports no-done" msgstr "服务器支持 no-done" -#: fetch-pack.c:857 +#: fetch-pack.c:935 msgid "Server supports multi_ack" msgstr "服务器支持 multi_ack" -#: fetch-pack.c:861 +#: fetch-pack.c:939 msgid "Server supports side-band-64k" msgstr "服务器支持 side-band-64k" -#: fetch-pack.c:865 +#: fetch-pack.c:943 msgid "Server supports side-band" msgstr "服务器支持 side-band" -#: fetch-pack.c:869 +#: fetch-pack.c:947 msgid "Server supports allow-tip-sha1-in-want" msgstr "服务器支持 allow-tip-sha1-in-want" -#: fetch-pack.c:873 +#: fetch-pack.c:951 msgid "Server supports allow-reachable-sha1-in-want" msgstr "服务器支持 allow-reachable-sha1-in-want" -#: fetch-pack.c:883 +#: fetch-pack.c:961 msgid "Server supports ofs-delta" msgstr "服务器支持 ofs-delta" -#: fetch-pack.c:890 +#: fetch-pack.c:968 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:896 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:900 +#: fetch-pack.c:978 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:902 +#: fetch-pack.c:980 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:913 +#: fetch-pack.c:991 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:925 +#: fetch-pack.c:1003 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1087 +#: fetch-pack.c:1165 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: gpg-interface.c:185 +#: fetch-pack.c:1187 +#, c-format +msgid "no such remote ref %s" +msgstr "没有这样的远程引用 %s" + +#: fetch-pack.c:1190 +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "服务器不允许请求未公开的对象 %s" + +#: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: gpg-interface.c:215 +#: gpg-interface.c:211 msgid "could not create temporary file" msgstr "不能创建临时文件" -#: gpg-interface.c:217 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" -#: graph.c:96 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" -#: grep.c:1794 +#: grep.c:1981 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" -msgstr "无法枚举 '%s' 状态" +msgstr "对 '%s' 调用 stat 失败" -#: grep.c:1822 +#: grep.c:2009 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" -#: help.c:218 +#: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:225 +#: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:256 +#: help.c:217 msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令：" -#: help.c:321 +#: help.c:281 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1892,30 +1975,50 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:376 +#: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:398 +#: help.c:358 #, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" -msgstr "" -"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" -"是 '%s'" +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。" -#: help.c:403 +#: help.c:363 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "在 %0.1f 秒钟后自动运行..." +msgid "Continuing under the assumption that you meant '%s'." +msgstr "假定你想要的是 '%s' 并继续。" -#: help.c:410 +#: help.c:368 +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。" + +#: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:414 help.c:480 +#: help.c:380 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "\n最相似的命令是" +msgstr[1] "\n最相似的命令是" + +#: help.c:395 +msgid "git version [<options>]" +msgstr "git version [<选项>]" + +#: help.c:456 +#, c-format +msgid "%s: %s - %s" +msgstr "%s：%s - %s" + +#: help.c:460 msgid "" "\n" "Did you mean this?" @@ -1929,12 +2032,7 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" -#: help.c:476 -#, c-format -msgid "%s: %s - %s" -msgstr "%s：%s - %s" - -#: ident.c:334 +#: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1959,6 +2057,39 @@ msgstr "" "来设置您账号的缺省身份标识。\n" "如果仅在本仓库设置身份标识，则省略 --global 参数。\n" +#: ident.c:366 +msgid "no email was given and auto-detection is disabled" +msgstr "未提供邮件地址且自动探测被禁用" + +#: ident.c:371 +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "无法自动探测邮件地址（得到 '%s'）" + +#: ident.c:381 +msgid "no name was given and auto-detection is disabled" +msgstr "未提供姓名且自动探测被禁用" + +#: ident.c:387 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "无法自动探测姓名（得到 '%s'）" + +#: ident.c:395 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "不允许空的姓名（对于 <%s>）" + +#: ident.c:401 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "姓名中仅包含禁用字符：%s" + +#: ident.c:416 builtin/commit.c:612 +#, c-format +msgid "invalid date format: %s" +msgstr "无效的日期格式：%s" + #: lockfile.c:152 #, c-format msgid "" @@ -1986,109 +2117,127 @@ msgstr "不能创建 '%s.lock'：%s" msgid "failed to read the cache" msgstr "无法读取缓存" -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 -#: builtin/checkout.c:588 builtin/clone.c:731 +#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 +#: builtin/checkout.c:591 builtin/clone.c:753 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: merge-recursive.c:209 +#: merge-recursive.c:210 msgid "(bad commit)\n" msgstr "（坏提交）\n" -#: merge-recursive.c:231 merge-recursive.c:239 +#: merge-recursive.c:232 merge-recursive.c:240 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" -#: merge-recursive.c:303 +#: merge-recursive.c:304 msgid "error building trees" msgstr "无法创建树" -#: merge-recursive.c:727 +#: merge-recursive.c:728 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" -#: merge-recursive.c:738 +#: merge-recursive.c:739 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:752 merge-recursive.c:771 +#: merge-recursive.c:753 merge-recursive.c:772 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:761 +#: merge-recursive.c:762 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:803 builtin/cat-file.c:34 +#: merge-recursive.c:804 builtin/cat-file.c:36 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:805 +#: merge-recursive.c:806 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:829 +#: merge-recursive.c:830 #, c-format msgid "failed to open '%s': %s" msgstr "无法打开 '%s'：%s" -#: merge-recursive.c:840 +#: merge-recursive.c:841 #, c-format msgid "failed to symlink '%s': %s" msgstr "无法创建符号链接 '%s'：%s" -#: merge-recursive.c:845 +#: merge-recursive.c:846 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:985 +#: merge-recursive.c:986 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:989 +#: merge-recursive.c:990 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:1088 merge-recursive.c:1102 +#: merge-recursive.c:1093 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" -"的版本被保留。" +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" +"本被保留。" + +#: merge-recursive.c:1098 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " +"%7$s 版本被保留。" -#: merge-recursive.c:1094 merge-recursive.c:1107 +#: merge-recursive.c:1105 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" -"的版本保留于 %8$s 中。" +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" +"本保留在 %8$s 中。" + +#: merge-recursive.c:1110 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " +"%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1150 +#: merge-recursive.c:1144 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1150 +#: merge-recursive.c:1144 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1207 +#: merge-recursive.c:1201 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1232 +#: merge-recursive.c:1226 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2097,135 +2246,135 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1231 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1299 +#: merge-recursive.c:1293 #, 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:1332 +#: merge-recursive.c:1326 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" -#: merge-recursive.c:1535 +#: merge-recursive.c:1529 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1550 +#: merge-recursive.c:1544 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" -#: merge-recursive.c:1557 merge-recursive.c:1771 +#: merge-recursive.c:1551 merge-recursive.c:1781 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:1614 +#: merge-recursive.c:1608 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:1617 +#: merge-recursive.c:1611 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" -#: merge-recursive.c:1670 +#: merge-recursive.c:1680 msgid "modify" msgstr "修改" -#: merge-recursive.c:1670 +#: merge-recursive.c:1680 msgid "modified" msgstr "修改" -#: merge-recursive.c:1680 +#: merge-recursive.c:1690 msgid "content" msgstr "内容" -#: merge-recursive.c:1687 +#: merge-recursive.c:1697 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:1723 +#: merge-recursive.c:1733 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:1737 +#: merge-recursive.c:1747 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1741 git-submodule.sh:930 +#: merge-recursive.c:1751 git-submodule.sh:945 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:1742 +#: merge-recursive.c:1752 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:1836 +#: merge-recursive.c:1846 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:1862 +#: merge-recursive.c:1872 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1868 +#: merge-recursive.c:1878 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1874 +#: merge-recursive.c:1884 #, 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:1883 +#: merge-recursive.c:1893 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:1920 +#: merge-recursive.c:1930 msgid "Already up-to-date!" msgstr "已经是最新的！" -#: merge-recursive.c:1929 +#: merge-recursive.c:1939 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:2012 +#: merge-recursive.c:2022 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:2025 +#: merge-recursive.c:2035 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:2064 +#: merge-recursive.c:2074 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:2127 +#: merge-recursive.c:2137 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 msgid "Unable to write index." msgstr "不能写入索引。" @@ -2245,23 +2394,25 @@ msgstr "" msgid "You have not concluded your notes merge (%s exists)." msgstr "您尚未结束注释合并（存在 %s）。" -#: notes-utils.c:41 +#: notes-utils.c:42 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" -#: notes-utils.c:100 +#: notes-utils.c:101 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值：'%s'" -#: notes-utils.c:110 +#: notes-utils.c:111 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c:141 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" @@ -2271,29 +2422,30 @@ msgstr "坏的 %s 值：'%s'" msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: parse-options.c:572 +#: parse-options.c:573 msgid "..." msgstr "..." -#: parse-options.c:590 +#: parse-options.c:591 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#. +#: parse-options.c:597 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:597 +#: parse-options.c:600 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:631 +#: parse-options.c:634 msgid "-NUM" msgstr "-数字" @@ -2302,66 +2454,78 @@ msgstr "-数字" msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: path.c:826 +#: path.c:890 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" -#: pathspec.c:142 +#: pathspec.c:129 +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" + +#: pathspec.c:147 +msgid "Only one 'attr:' specification is allowed." +msgstr "只允许一个 'attr:' 规格。" + +#: pathspec.c:150 +msgid "attr spec must not be empty" +msgstr "属性规格不能为空" + +#: pathspec.c:193 +#, c-format +msgid "invalid attribute name %s" +msgstr "无效的属性名 %s" + +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" -#: pathspec.c:149 +#: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" -#: pathspec.c:188 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路径规格包含无效的神奇前缀" -#: pathspec.c:201 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" -#: pathspec.c:206 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" -#: pathspec.c:238 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" -#: pathspec.c:293 pathspec.c:315 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "路径规格 '%s' 在子模组 '%.*s' 中" - -#: pathspec.c:350 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不兼容" -#: pathspec.c:363 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s：'%s' 在仓库之外" -#: pathspec.c:451 +#: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助记符：'%c'）" -#: pathspec.c:461 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规格神奇前缀不被此命令支持：%s" -#: pathspec.c:511 +#: pathspec.c:575 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2369,24 +2533,16 @@ msgstr "" "在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n" "请代之以 ." -#: pathspec.c:535 +#: pathspec.c:599 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" -#: pathspec.c:544 -msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" -msgstr "" -"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" -"添加 ':/' 或 '.' ？" - -#: pretty.c:982 +#: pretty.c:963 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: read-cache.c:1307 +#: read-cache.c:1443 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2395,7 +2551,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1317 +#: read-cache.c:1453 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2404,252 +2560,366 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: refs.c:576 builtin/merge.c:844 +#: read-cache.c:2308 builtin/merge.c:1019 +#, c-format +msgid "could not close '%s'" +msgstr "不能关闭 '%s'" + +#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 +#, c-format +msgid "could not stat '%s'" +msgstr "不能对 '%s' 调用 stat" + +#: read-cache.c:2396 +#, c-format +msgid "unable to open git dir: %s" +msgstr "不能打开 git 目录：%s" + +#: read-cache.c:2408 +#, c-format +msgid "unable to unlink: %s" +msgstr "无法删除：%s" + +#: refs.c:622 #, c-format msgid "Could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: refs/files-backend.c:2481 +#: refs.c:1769 +msgid "ref updates forbidden inside quarantine environment" +msgstr "在隔离环境中禁止更新引用" + +#: refs/files-backend.c:1664 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c:2484 +#: refs/files-backend.c:1667 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" -#: refs/files-backend.c:2493 +#: refs/files-backend.c:1676 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" -#: ref-filter.c:56 +#: ref-filter.c:35 wt-status.c:1811 +msgid "gone" +msgstr "丢失" + +#: ref-filter.c:36 +#, c-format +msgid "ahead %d" +msgstr "领先 %d" + +#: ref-filter.c:37 +#, c-format +msgid "behind %d" +msgstr "落后 %d" + +#: ref-filter.c:38 +#, c-format +msgid "ahead %d, behind %d" +msgstr "领先 %d，落后 %d" + +#: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<color>)" -#: ref-filter.c:58 +#: ref-filter.c:107 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色：%%(color:%s)" -#: ref-filter.c:72 +#: ref-filter.c:121 +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "期望整数值 refname:lstrip=%s" + +#: ref-filter.c:125 #, c-format -msgid "unrecognized format: %%(%s)" -msgstr "未能识别的格式：%%(%s)" +msgid "Integer value expected refname:rstrip=%s" +msgstr "期望整数值 refname:rstrip=%s" -#: ref-filter.c:78 +#: ref-filter.c:127 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "未能识别的 %%(%s) 参数：%s" + +#: ref-filter.c:167 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不带参数" -#: ref-filter.c:85 +#: ref-filter.c:174 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) 不带参数" -#: ref-filter.c:92 +#: ref-filter.c:181 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) 不带参数" -#: ref-filter.c:111 +#: ref-filter.c:200 #, c-format msgid "positive value expected contents:lines=%s" -msgstr "要为 contents:lines=%s 提供一个正数" +msgstr "期望一个正数 contents:lines=%s" -#: ref-filter.c:113 +#: ref-filter.c:202 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) 参数：%s" -#: ref-filter.c:123 +#: ref-filter.c:215 +#, c-format +msgid "positive value expected objectname:short=%s" +msgstr "期望一个正数 objectname:short=%s" + +#: ref-filter.c:219 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "未能识别的 %%(objectname) 参数：%s" -#: ref-filter.c:145 +#: ref-filter.c:246 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<width>,<position>)" -#: ref-filter.c:157 +#: ref-filter.c:258 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的位置：%s" -#: ref-filter.c:161 +#: ref-filter.c:262 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" -#: ref-filter.c:167 +#: ref-filter.c:268 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) 参数：%s" -#: ref-filter.c:171 +#: ref-filter.c:272 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" -#: ref-filter.c:255 +#: ref-filter.c:287 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "未能识别的 %%(if) 参数：%s" + +#: ref-filter.c:378 #, c-format msgid "malformed field name: %.*s" msgstr "非法的字段名：%.*s" -#: ref-filter.c:281 +#: ref-filter.c:404 #, c-format msgid "unknown field name: %.*s" msgstr "未知的字段名：%.*s" -#: ref-filter.c:383 +#: ref-filter.c:508 +#, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素" + +#: ref-filter.c:568 +#, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素" + +#: ref-filter.c:570 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "格式：%%(then) 元素用了多次" + +#: ref-filter.c:572 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "格式：%%(then) 元素用在了 %%(else) 之后" + +#: ref-filter.c:598 +#, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素" + +#: ref-filter.c:600 +#, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素" + +#: ref-filter.c:602 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "格式：%%(else) 元素用了多次" + +#: ref-filter.c:615 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" -#: ref-filter.c:435 +#: ref-filter.c:670 #, c-format msgid "malformed format string %s" msgstr "非法的格式化字符串 %s" -#: ref-filter.c:898 -msgid ":strip= requires a positive integer argument" -msgstr ":strip= 需要一个正整型参数" +#: ref-filter.c:1254 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "（非分支，正变基 %s）" + +#: ref-filter.c:1257 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "（非分支，二分查找开始于 %s）" -#: ref-filter.c:903 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1265 #, c-format -msgid "ref '%s' does not have %ld components to :strip" -msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件" +msgid "(HEAD detached at %s)" +msgstr "（头指针分离于 %s）" -#: ref-filter.c:1066 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1272 #, c-format -msgid "unknown %.*s format %s" -msgstr "未知的 %.*s 格式 %s" +msgid "(HEAD detached from %s)" +msgstr "（头指针分离自 %s）" + +#: ref-filter.c:1276 +msgid "(no branch)" +msgstr "（非分支）" -#: ref-filter.c:1086 ref-filter.c:1117 +#: ref-filter.c:1426 ref-filter.c:1457 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1089 ref-filter.c:1120 +#: ref-filter.c:1429 ref-filter.c:1460 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" -#: ref-filter.c:1343 +#: ref-filter.c:1760 #, c-format msgid "malformed object at '%s'" msgstr "非法的对象于 '%s'" -#: ref-filter.c:1410 +#: ref-filter.c:1827 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:1415 +#: ref-filter.c:1832 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" -#: ref-filter.c:1670 +#: ref-filter.c:2095 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:1734 +#: ref-filter.c:2176 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: remote.c:754 +#: remote.c:747 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:758 +#: remote.c:751 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:762 +#: remote.c:755 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:770 +#: remote.c:763 msgid "Internal error" msgstr "内部错误" -#: remote.c:1685 remote.c:1787 +#: remote.c:1680 remote.c:1782 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: remote.c:1694 +#: remote.c:1689 #, c-format msgid "no such branch: '%s'" msgstr "没有此分支：'%s'" -#: remote.c:1697 +#: remote.c:1692 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: remote.c:1703 +#: remote.c:1698 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: remote.c:1718 +#: remote.c:1713 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" -#: remote.c:1730 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置要推送的远程服务器" -#: remote.c:1741 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用规格未包含 '%s'" -#: remote.c:1754 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "推送无目标（push.default 是 'nothing'）" -#: remote.c:1776 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "无法解析 'simple' 推送至一个单独的目标" -#: remote.c:2081 +#: remote.c:2076 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:2085 +#: remote.c:2080 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:2088 +#: remote.c:2083 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:2092 +#: remote.c:2087 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:2098 +#: remote.c:2093 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:2101 +#: remote.c:2096 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2658,11 +2928,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:2109 +#: remote.c:2104 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:2112 +#: remote.c:2107 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2678,72 +2948,77 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:2122 +#: remote.c:2117 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: revision.c:2158 +#: revision.c:2187 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2161 +#: revision.c:2190 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2355 +#: revision.c:2384 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" -#: run-command.c:125 +#: run-command.c:644 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:127 +#: send-pack.c:151 #, c-format -msgid "dup2(%d,%d) failed" -msgstr "不能调用 dup2(%d,%d)" +msgid "unable to parse remote unpack status: %s" +msgstr "不能解析远程解包状态：%s" -#: send-pack.c:297 +#: send-pack.c:153 +#, c-format +msgid "remote unpack failed: %s" +msgstr "远程解包失败：%s" + +#: send-pack.c:316 msgid "failed to sign the push certificate" msgstr "无法为推送证书签名" -#: send-pack.c:410 +#: send-pack.c:429 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" -#: send-pack.c:412 +#: send-pack.c:431 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未发送推送证书，因为接收端不支持签名推送" -#: send-pack.c:424 +#: send-pack.c:443 msgid "the receiving end does not support --atomic push" msgstr "接收端不支持原子推送" -#: send-pack.c:429 +#: send-pack.c:448 msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" -#: sequencer.c:215 +#: sequencer.c:216 msgid "revert" msgstr "还原" -#: sequencer.c:217 +#: sequencer.c:218 msgid "cherry-pick" msgstr "拣选" -#: sequencer.c:219 +#: sequencer.c:220 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:221 +#: sequencer.c:222 #, c-format msgid "Unknown action: %d" msgstr "未知动作：%d" -#: sequencer.c:278 +#: sequencer.c:279 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2751,7 +3026,7 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" -#: sequencer.c:281 +#: sequencer.c:282 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2760,63 +3035,63 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:294 sequencer.c:1667 +#: sequencer.c:295 sequencer.c:1685 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" -#: sequencer.c:301 +#: sequencer.c:302 #, c-format msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 #, c-format msgid "failed to finalize '%s'." msgstr "无法完成 '%s'。" -#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 -#: builtin/commit.c:749 builtin/merge.c:1036 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 +#: builtin/commit.c:750 builtin/merge.c:1017 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: sequencer.c:355 +#: sequencer.c:356 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" -#: sequencer.c:359 +#: sequencer.c:360 msgid "commit your changes or stash them to proceed." -msgstr "提交您的修改或保存进度后再继续。" +msgstr "提交您的修改或贮藏后再继续。" -#: sequencer.c:388 +#: sequencer.c:389 #, c-format msgid "%s: fast-forward" msgstr "%s：快进" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". +#. "rebase -i". #. -#: sequencer.c:470 +#: sequencer.c:472 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:489 +#: sequencer.c:491 msgid "could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" -#: sequencer.c:509 +#: sequencer.c:511 msgid "unable to update cache tree\n" msgstr "不能更新缓存树\n" -#: sequencer.c:592 +#: sequencer.c:595 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2845,17 +3120,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:688 +#: sequencer.c:697 #, c-format msgid "could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:693 +#: sequencer.c:702 #, c-format msgid "could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:815 +#: sequencer.c:824 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2866,7 +3141,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:821 +#: sequencer.c:830 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2877,230 +3152,230 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:827 sequencer.c:852 +#: sequencer.c:836 sequencer.c:861 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" -#: sequencer.c:836 +#: sequencer.c:845 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:838 +#: sequencer.c:847 msgid "could not read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:840 +#: sequencer.c:849 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" -#: sequencer.c:846 +#: sequencer.c:855 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" -#: sequencer.c:855 git-rebase--interactive.sh:445 +#: sequencer.c:864 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明：" -#: sequencer.c:863 +#: sequencer.c:872 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" -#: sequencer.c:870 +#: sequencer.c:879 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d：" -#: sequencer.c:875 +#: sequencer.c:884 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过：" -#: sequencer.c:880 +#: sequencer.c:889 #, c-format msgid "unknown command: %d" msgstr "未知命令：%d" -#: sequencer.c:946 +#: sequencer.c:955 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:964 +#: sequencer.c:973 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:972 +#: sequencer.c:981 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:976 +#: sequencer.c:985 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "指定了主线，但是提交 %s 不是一个合并提交。" -#: sequencer.c:982 +#: sequencer.c:991 #, c-format msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1001 +#: sequencer.c:1012 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1063 sequencer.c:1812 +#: sequencer.c:1075 sequencer.c:1830 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" -#: sequencer.c:1114 +#: sequencer.c:1126 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:1115 +#: sequencer.c:1127 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:1157 +#: sequencer.c:1169 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:1167 +#: sequencer.c:1179 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:1174 +#: sequencer.c:1186 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:1294 +#: sequencer.c:1306 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d：%.*s" -#: sequencer.c:1302 +#: sequencer.c:1314 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:1334 +#: sequencer.c:1347 #, c-format msgid "could not read '%s'." msgstr "不能读取 '%s'。" -#: sequencer.c:1341 +#: sequencer.c:1359 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:1343 +#: sequencer.c:1361 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单：'%s'" -#: sequencer.c:1348 +#: sequencer.c:1366 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:1359 +#: sequencer.c:1377 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:1361 +#: sequencer.c:1379 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:1424 +#: sequencer.c:1442 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:1427 +#: sequencer.c:1445 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:1484 +#: sequencer.c:1502 #, c-format msgid "malformed options sheet: '%s'" msgstr "非法的选项清单：'%s'" -#: sequencer.c:1522 +#: sequencer.c:1540 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:1523 +#: sequencer.c:1541 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1526 +#: sequencer.c:1544 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:1540 +#: sequencer.c:1558 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:1596 sequencer.c:2150 +#: sequencer.c:1614 sequencer.c:2188 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:1598 +#: sequencer.c:1616 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1600 sequencer.c:1634 +#: sequencer.c:1618 sequencer.c:1652 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:1620 builtin/grep.c:904 +#: sequencer.c:1638 builtin/grep.c:929 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:1622 +#: sequencer.c:1640 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s'：%s" -#: sequencer.c:1623 +#: sequencer.c:1641 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:1629 +#: sequencer.c:1647 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:1640 +#: sequencer.c:1658 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！" -#: sequencer.c:1777 sequencer.c:2049 +#: sequencer.c:1795 sequencer.c:2086 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1817 builtin/difftool.c:574 +#: sequencer.c:1835 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: sequencer.c:1833 +#: sequencer.c:1851 msgid "could not read index" msgstr "不能读取索引" # 译者：注意保持前导空格 -#: sequencer.c:1838 +#: sequencer.c:1856 #, c-format msgid "" "execution failed: %s\n" @@ -3115,11 +3390,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1844 +#: sequencer.c:1862 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:1850 +#: sequencer.c:1868 #, c-format msgid "" "execution succeeded: %s\n" @@ -3131,22 +3406,22 @@ msgid "" msgstr "" "执行成功：%s\n" "但是在索引和/或工作区中存在变更\n" -"提交或暂存修改，然后运行\n" +"提交或贮藏修改，然后运行\n" "\n" " git rebase --continue\n" "\n" -#: sequencer.c:1905 git-rebase.sh:168 +#: sequencer.c:1925 #, c-format -msgid "Applied autostash." -msgstr "成功应用 autostash。" +msgid "Applied autostash.\n" +msgstr "已应用 autostash。\n" -#: sequencer.c:1917 +#: sequencer.c:1937 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:1919 git-rebase.sh:172 +#: sequencer.c:1940 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3154,85 +3429,87 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" "应用 autostash 导致冲突。\n" -"您的修改安全地保存在 stash 中。\n" +"您的修改安全地保存在贮藏区中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:2000 +#: sequencer.c:2022 #, c-format -msgid "stopped at %s... %.*s" -msgstr "停止在 %s... %.*s" +msgid "Stopped at %s... %.*s\n" +msgstr "停止在 %s... %.*s\n" -#: sequencer.c:2027 +#: sequencer.c:2064 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:2057 +#: sequencer.c:2094 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:2061 +#: sequencer.c:2099 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:2068 +#: sequencer.c:2106 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:2075 +#: sequencer.c:2113 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:2159 +#: sequencer.c:2197 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:2164 +#: sequencer.c:2202 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:2173 +#: sequencer.c:2211 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:2175 +#: sequencer.c:2213 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:2177 +#: sequencer.c:2215 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:2180 +#: sequencer.c:2218 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." -msgstr "\n您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" +msgstr "" +"\n" +"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:2190 +#: sequencer.c:2228 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:2270 +#: sequencer.c:2308 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:2274 +#: sequencer.c:2312 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:2307 +#: sequencer.c:2345 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: setup.c:160 +#: setup.c:171 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3241,7 +3518,7 @@ msgstr "" "%s：工作区中无此路径。\n" "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。" -#: setup.c:173 +#: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3252,7 +3529,7 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <command> [<revision>...] -- [<file>...]'" -#: setup.c:223 +#: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3263,29 +3540,34 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <command> [<revision>...] -- [<file>...]'" -#: setup.c:470 +#: setup.c:504 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" -#: setup.c:478 +#: setup.c:512 msgid "unknown repository extensions found:" msgstr "发现未知的仓库扩展：" -#: setup.c:768 +#: setup.c:810 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "不是一个 git 仓库（或者任何父目录）：%s" -#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 +#: setup.c:812 builtin/index-pack.c:1652 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:852 +#: setup.c:1050 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:927 +#: setup.c:1062 setup.c:1068 +#, c-format +msgid "Cannot change to '%s'" +msgstr "不能切换到 '%s'" + +#: setup.c:1081 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3294,12 +3576,7 @@ msgstr "" "不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:934 -#, c-format -msgid "Cannot change to '%s/..'" -msgstr "不能切换到 '%s/..'" - -#: setup.c:996 +#: setup.c:1173 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3308,55 +3585,55 @@ msgstr "" "参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: sha1_file.c:490 +#: sha1_file.c:560 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: sha1_file.c:516 +#: sha1_file.c:586 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: sha1_file.c:522 +#: sha1_file.c:592 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: sha1_file.c:528 +#: sha1_file.c:598 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: sha1_file.c:536 +#: sha1_file.c:606 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被嫁接" -#: sha1_file.c:1176 +#: sha1_file.c:1245 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: sha1_file.c:2637 +#: sha1_file.c:2729 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: sha1_file.c:2641 +#: sha1_file.c:2733 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" -#: sha1_name.c:407 +#: sha1_name.c:419 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "短 SHA1 %s 存在歧义" -#: sha1_name.c:418 +#: sha1_name.c:430 msgid "The candidates are:" msgstr "候选者有：" -#: sha1_name.c:578 +#: sha1_name.c:589 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3377,61 +3654,81 @@ msgstr "" "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关闭本消息通知。" -#: submodule.c:65 submodule.c:99 +#: submodule.c:70 submodule.c:104 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" -#: submodule.c:69 submodule.c:103 +#: submodule.c:74 submodule.c:108 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "无法在 .gitmodules 中找到 path=%s 的小节" -#: submodule.c:77 +#: submodule.c:82 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 条目 %s" -#: submodule.c:110 +#: submodule.c:115 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "无法移除 %s 的 .gitmodules 条目" -#: submodule.c:121 +#: submodule.c:126 msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" -#: submodule.c:159 +#: submodule.c:165 msgid "negative values not allowed for submodule.fetchJobs" msgstr "submodule.fetchJobs 不允许为负值" -#: submodule.c:1184 +#: submodule.c:376 +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "位于未检出的子模组 '%s'" + +#: submodule.c:407 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "路径规格 '%s' 在子模组 '%.*s' 中" + +#: submodule.c:1337 #, c-format -msgid "could not start 'git status in submodule '%s'" -msgstr "无法在子模组 '%s' 中启动 git status" +msgid "'%s' not recognized as a git repository" +msgstr "无法将 '%s' 识别为一个 git 仓库" -#: submodule.c:1197 +#: submodule.c:1475 #, c-format -msgid "could not run 'git status in submodule '%s'" -msgstr "无法在子模组 '%s' 中执行 git status" +msgid "could not start 'git status' in submodule '%s'" +msgstr "无法在子模组 '%s' 中启动 'git status'" -#: submodule.c:1398 +#: submodule.c:1488 +#, c-format +msgid "could not run 'git status' in submodule '%s'" +msgstr "无法在子模组 '%s' 中执行 'git status'" + +#: submodule.c:1581 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "子模组 '%s' 中有脏索引" + +#: submodule.c:1845 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" -#: submodule.c:1410 submodule.c:1471 +#: submodule.c:1857 submodule.c:1913 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" -#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 -#: builtin/submodule--helper.c:650 +#: submodule.c:1861 builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: submodule.c:1420 +#: submodule.c:1864 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3442,88 +3739,101 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:1512 +#: submodule.c:1948 #, c-format msgid "could not recurse into submodule '%s'" msgstr "无法递归进子模组路径 '%s'" -#: submodule-config.c:360 +#: submodule.c:1992 +msgid "could not start ls-files in .." +msgstr "无法在 .. 中启动 ls-files" + +#: submodule.c:2012 +msgid "BUG: returned path string doesn't match cwd?" +msgstr "BUG：返回的路径和当前路径不匹配？" + +#: submodule.c:2031 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree 返回未知返回值 %d" + +#: submodule-config.c:420 #, c-format msgid "invalid value for %s" msgstr "%s 的值无效" -#: trailer.c:240 +#: trailer.c:241 #, c-format msgid "running trailer command '%s' failed" msgstr "执行 trailer 命令 '%s' 失败" -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 -#: trailer.c:543 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 +#: trailer.c:544 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "键 '%2$s' 的未知取值 '%1$s'" -#: trailer.c:525 trailer.c:530 builtin/remote.c:289 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "多于一个 %s" -#: trailer.c:702 +#: trailer.c:703 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "签名 '%.*s' 的键为空" -#: trailer.c:722 +#: trailer.c:723 #, c-format msgid "could not read input file '%s'" msgstr "不能读取输入文件 '%s'" -#: trailer.c:725 +#: trailer.c:726 msgid "could not read from stdin" msgstr "不能自标准输入读取" -#: trailer.c:949 builtin/am.c:44 +#: trailer.c:950 builtin/am.c:45 #, c-format msgid "could not stat %s" -msgstr "不能获取 %s 的文件状态" +msgstr "不能对 %s 调用 stat" -#: trailer.c:951 +#: trailer.c:952 #, c-format msgid "file %s is not a regular file" msgstr "文件 %s 不是一个正规文件" -#: trailer.c:953 +#: trailer.c:954 #, c-format msgid "file %s is not writable by user" msgstr "文件 %s 用户不可写" -#: trailer.c:965 +#: trailer.c:966 msgid "could not open temporary file" msgstr "不能打开临时文件" -#: trailer.c:1001 +#: trailer.c:1002 #, c-format msgid "could not rename temporary file to %s" msgstr "不能重命名临时文件为 %s" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "传输：无效的深度选项 '%s'" -#: transport.c:885 +#: transport.c:890 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" -#: transport.c:889 +#: transport.c:894 #, c-format msgid "" "\n" @@ -3550,11 +3860,11 @@ msgstr "" "以推送至远程。\n" "\n" -#: transport.c:897 +#: transport.c:902 msgid "Aborting." msgstr "正在终止。" -#: transport-helper.c:1082 +#: transport-helper.c:1071 #, c-format msgid "Could not read ref %s" msgstr "不能读取引用 %s" @@ -3575,16 +3885,16 @@ msgstr "树对象条目中空的文件名" msgid "too-short tree file" msgstr "太短的树文件" -#: unpack-trees.c:99 +#: unpack-trees.c:105 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" -"%%s请在切换分支前提交您的修改或者保存进度。" +"%%s请在切换分支前提交或贮藏您的修改。" -#: unpack-trees.c:101 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3593,16 +3903,16 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s" -#: unpack-trees.c:104 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" -"%%s请在合并前提交您的修改或者保存进度。" +"%%s请在合并前提交或贮藏您的修改。" -#: unpack-trees.c:106 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3611,16 +3921,16 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" -"%%s请在 %s 之前提交您的修改或者保存进度。" +"%%s请在 %s 之前提交或贮藏您的修改。" -#: unpack-trees.c:111 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3629,7 +3939,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:122 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3638,7 +3948,7 @@ msgstr "" "更新如下目录将会丢失其中未跟踪的文件：\n" "%s" -#: unpack-trees.c:120 +#: unpack-trees.c:126 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3647,7 +3957,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s请在切换分支之前移动或删除。" -#: unpack-trees.c:122 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3656,7 +3966,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3665,7 +3975,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:127 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3674,7 +3984,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3683,7 +3993,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:132 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3692,7 +4002,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3702,7 +4012,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s请在切换分支前移动或删除。" -#: unpack-trees.c:139 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3712,7 +4022,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3721,7 +4031,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:144 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3730,7 +4040,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3739,7 +4049,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:149 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3748,12 +4058,12 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:162 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" -#: unpack-trees.c:159 +#: unpack-trees.c:165 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3762,7 +4072,7 @@ msgstr "" "无法更新稀疏检出：如下条目不是最新：\n" "%s" -#: unpack-trees.c:161 +#: unpack-trees.c:167 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3772,7 +4082,7 @@ msgstr "" "工作区中下列文件将被稀疏检出更新所覆盖：\n" "%s" -#: unpack-trees.c:163 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3782,234 +4092,254 @@ msgstr "" "工作区中下列文件将被稀疏检出更新所删除：\n" "%s" -#: unpack-trees.c:240 +#: unpack-trees.c:171 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"无法更新子模组：\n" +"%s" + +#: unpack-trees.c:248 #, c-format msgid "Aborting\n" msgstr "终止中\n" -#: unpack-trees.c:270 +#: unpack-trees.c:277 +#, c-format +msgid "submodule update strategy not supported for submodule '%s'" +msgstr "子模组 %s 不支持子模组更新策略" + +#: unpack-trees.c:346 msgid "Checking out files" msgstr "正在检出文件" -#: urlmatch.c:120 +#: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "无效的 URL 方案名称或丢失 '://' 后缀" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "无效的 %XX 转义序列" -#: urlmatch.c:172 +#: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "缺失主机名且 URL 方案不是 'file:'" -#: urlmatch.c:189 +#: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "一个 'file:' URL 不应该包含端口号" -#: urlmatch.c:199 +#: urlmatch.c:247 msgid "invalid characters in host name" msgstr "主机名中包含无效的字符" -#: urlmatch.c:244 urlmatch.c:255 +#: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "无效的端口号" -#: urlmatch.c:322 +#: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" -#: worktree.c:282 +#: worktree.c:245 #, c-format msgid "failed to read '%s'" msgstr "无法读取 '%s'" -#: wrapper.c:222 wrapper.c:392 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "无法打开 '%s' 进行读写" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 -#: builtin/pull.c:341 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 +#: builtin/am.c:849 builtin/merge.c:1014 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: wrapper.c:605 wrapper.c:626 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:634 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "不能获取当前工作目录" -#: wrapper.c:658 +#: wrapper.c:656 #, c-format msgid "could not write to %s" msgstr "不能写入 %s" -#: wrapper.c:660 +#: wrapper.c:658 #, c-format msgid "could not close %s" msgstr "不能关闭 %s" -#: wt-status.c:151 +#: wt-status.c:152 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:181 wt-status.c:208 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 -#: wt-status.c:184 +#: wt-status.c:185 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:187 wt-status.c:191 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:199 wt-status.c:945 +#: wt-status.c:200 wt-status.c:981 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:217 wt-status.c:954 +#: wt-status.c:218 wt-status.c:990 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:223 +#: wt-status.c:224 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:224 +#: wt-status.c:225 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:226 +#: wt-status.c:227 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" # 译者：注意保持前导空格 -#: wt-status.c:238 +#: wt-status.c:239 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）" -#: wt-status.c:253 +#: wt-status.c:254 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:255 +#: wt-status.c:256 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:257 +#: wt-status.c:258 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:265 +#: wt-status.c:266 msgid "both modified:" msgstr "双方修改：" -#: wt-status.c:275 +#: wt-status.c:276 msgid "new file:" msgstr "新文件：" -#: wt-status.c:277 +#: wt-status.c:278 msgid "copied:" msgstr "拷贝：" -#: wt-status.c:279 +#: wt-status.c:280 msgid "deleted:" msgstr "删除：" -#: wt-status.c:281 +#: wt-status.c:282 msgid "modified:" msgstr "修改：" -#: wt-status.c:283 +#: wt-status.c:284 msgid "renamed:" msgstr "重命名：" -#: wt-status.c:285 +#: wt-status.c:286 msgid "typechange:" msgstr "类型变更：" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unknown:" msgstr "未知：" -#: wt-status.c:289 +#: wt-status.c:290 msgid "unmerged:" msgstr "未合并：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:371 +#: wt-status.c:372 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:373 +#: wt-status.c:374 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:375 +#: wt-status.c:376 msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:818 +#: wt-status.c:821 +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "您的贮藏区当前有 %d 条记录" +msgstr[1] "您的贮藏区当前有 %d 条记录" + +#: wt-status.c:853 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:820 +#: wt-status.c:855 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:901 +#: wt-status.c:937 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -4017,77 +4347,77 @@ msgstr "" "不要改动上面的一行。\n" "下面的所有内容均将被删除。" -#: wt-status.c:1013 +#: wt-status.c:1049 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:1016 +#: wt-status.c:1052 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 -#: wt-status.c:1018 +#: wt-status.c:1054 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" -#: wt-status.c:1023 +#: wt-status.c:1059 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:1026 +#: wt-status.c:1062 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:1036 +#: wt-status.c:1072 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:1039 +#: wt-status.c:1075 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:1043 +#: wt-status.c:1079 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1045 +#: wt-status.c:1081 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1047 +#: wt-status.c:1083 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1176 +#: wt-status.c:1214 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1178 +#: wt-status.c:1216 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1181 +#: wt-status.c:1219 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最后一条命令已完成（%d 条命令被执行）：" msgstr[1] "最后的命令已完成（%d 条命令被执行）：" -#: wt-status.c:1192 +#: wt-status.c:1230 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" -#: wt-status.c:1197 +#: wt-status.c:1235 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1200 +#: wt-status.c:1238 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -4095,165 +4425,169 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 -#: wt-status.c:1208 +#: wt-status.c:1246 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" -#: wt-status.c:1221 +#: wt-status.c:1259 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1226 +#: wt-status.c:1264 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1240 +#: wt-status.c:1278 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1242 +#: wt-status.c:1280 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1244 +#: wt-status.c:1282 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1250 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1254 +#: wt-status.c:1292 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1259 +#: wt-status.c:1297 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1262 +#: wt-status.c:1300 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1266 +#: wt-status.c:1304 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1271 +#: wt-status.c:1309 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1274 +#: wt-status.c:1312 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1276 +#: wt-status.c:1314 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1286 +#: wt-status.c:1324 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1291 +#: wt-status.c:1329 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1294 +#: wt-status.c:1332 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1296 +#: wt-status.c:1334 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1305 +#: wt-status.c:1343 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1310 +#: wt-status.c:1348 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1313 +#: wt-status.c:1351 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1315 +#: wt-status.c:1353 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1326 +#: wt-status.c:1364 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1330 +#: wt-status.c:1368 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1333 +#: wt-status.c:1371 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1530 +#: wt-status.c:1568 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1536 +#: wt-status.c:1574 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1538 +#: wt-status.c:1576 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1543 +#: wt-status.c:1581 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1545 +#: wt-status.c:1583 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1548 +#: wt-status.c:1586 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1566 +#: wt-status.c:1606 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1580 +#: wt-status.c:1607 +msgid "No commits yet" +msgstr "尚无提交" + +#: wt-status.c:1621 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1582 +#: wt-status.c:1623 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1586 +#: wt-status.c:1627 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4263,360 +4597,392 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1592 +#: wt-status.c:1633 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1594 +#: wt-status.c:1635 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1600 +#: wt-status.c:1641 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1605 +#: wt-status.c:1646 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1608 +#: wt-status.c:1649 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1611 +#: wt-status.c:1652 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1614 +#: wt-status.c:1655 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1617 +#: wt-status.c:1658 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1620 wt-status.c:1625 +#: wt-status.c:1661 wt-status.c:1666 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1623 +#: wt-status.c:1664 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1627 +#: wt-status.c:1668 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -# 译者：注意保持句尾空格 -#: wt-status.c:1734 -msgid "Initial commit on " -msgstr "初始提交于 " +#: wt-status.c:1780 +msgid "No commits yet on " +msgstr "尚无提交在 " -#: wt-status.c:1738 +#: wt-status.c:1784 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1767 -msgid "gone" -msgstr "丢失" - # 译者：注意保持句尾空格 -#: wt-status.c:1769 wt-status.c:1777 +#: wt-status.c:1813 wt-status.c:1821 msgid "behind " msgstr "落后 " -#: wt-status.c:1772 wt-status.c:1775 +#: wt-status.c:1816 wt-status.c:1819 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2277 +#: wt-status.c:2311 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" -#: wt-status.c:2283 +#: wt-status.c:2317 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" -#: wt-status.c:2285 +#: wt-status.c:2319 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: compat/precompose_utf8.c:57 builtin/clone.c:414 +#: compat/precompose_utf8.c:58 builtin/clone.c:436 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" -#: builtin/add.c:22 +#: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<选项>] [--] <路径规格>..." -#: builtin/add.c:80 +#: builtin/add.c:82 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:85 builtin/commit.c:291 +#: builtin/add.c:87 builtin/commit.c:292 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:95 +#: builtin/add.c:97 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:149 +#: builtin/add.c:151 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:209 builtin/rev-parse.c:845 +#: builtin/add.c:211 builtin/rev-parse.c:873 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:220 +#: builtin/add.c:222 #, c-format msgid "Could not open '%s' for writing." msgstr "无法打开 '%s' 进行写入。" -#: builtin/add.c:224 +#: builtin/add.c:226 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:227 +#: builtin/add.c:229 msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c:230 +#: builtin/add.c:232 #, c-format msgid "Could not stat '%s'" -msgstr "不能查看文件状态 '%s'" +msgstr "不能对 '%s' 调用 stat" -#: builtin/add.c:232 +#: builtin/add.c:234 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:237 +#: builtin/add.c:239 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:247 +#: builtin/add.c:249 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 +#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "演习" -#: builtin/add.c:269 +#: builtin/add.c:272 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 +#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:271 +#: builtin/add.c:274 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:272 +#: builtin/add.c:275 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:273 +#: builtin/add.c:276 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:274 +#: builtin/add.c:277 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:275 +#: builtin/add.c:278 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:278 +#: builtin/add.c:281 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:280 +#: builtin/add.c:283 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:281 +#: builtin/add.c:284 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:282 +#: builtin/add.c:285 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:283 builtin/update-index.c:947 +#: builtin/add.c:286 builtin/update-index.c:952 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:948 +#: builtin/add.c:286 builtin/update-index.c:953 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/add.c:305 +#: builtin/add.c:288 +msgid "warn when adding an embedded repository" +msgstr "创建一个嵌入式仓库时给予警告" + +#: builtin/add.c:303 +#, c-format +msgid "" +"You've added another git repository inside your current repository.\n" +"Clones of the outer repository will not contain the contents of\n" +"the embedded repository and will not know how to obtain it.\n" +"If you meant to add a submodule, use:\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"If you added this path by mistake, you can remove it from the\n" +"index with:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"See \"git help submodule\" for more information." +msgstr "" +"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并且不知道该如何获取它。\n" +"如果您要添加一个子模组，使用：\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"如果您不小心添加了这个路径，可以用下面的命令将其从索引中删除：\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"参见 \"git help submodule\" 获取更多信息。" + +#: builtin/add.c:331 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "正在添加嵌入式 git 仓库：%s" + +#: builtin/add.c:349 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:312 +#: builtin/add.c:357 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:348 +#: builtin/add.c:394 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:355 +#: builtin/add.c:401 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:359 +#: builtin/add.c:405 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:374 +#: builtin/add.c:420 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:375 +#: builtin/add.c:421 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 +#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 +#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/am.c:414 +#: builtin/am.c:413 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:491 +#: builtin/am.c:489 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:532 +#: builtin/am.c:530 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:569 +#: builtin/am.c:567 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:595 +#: builtin/am.c:593 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:775 +#: builtin/am.c:777 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:840 +#: builtin/am.c:842 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:887 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:892 builtin/am.c:900 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:895 +#: builtin/am.c:897 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:984 +#: builtin/am.c:986 msgid "Patch format detection failed." -msgstr "补丁格式检测失败。" +msgstr "补丁格式探测失败。" -#: builtin/am.c:989 builtin/clone.c:379 +#: builtin/am.c:991 builtin/clone.c:401 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/am.c:993 +#: builtin/am.c:995 msgid "Failed to split patches." msgstr "无法拆分补丁。" -#: builtin/am.c:1125 builtin/commit.c:376 +#: builtin/am.c:1120 builtin/commit.c:377 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1176 +#: builtin/am.c:1171 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1177 +#: builtin/am.c:1172 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1178 +#: builtin/am.c:1173 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1316 -msgid "Patch is empty. Was it split wrong?" -msgstr "补丁为空。是不是切分错误？" +#: builtin/am.c:1304 +msgid "Patch is empty." +msgstr "补丁为空。" -#: builtin/am.c:1390 builtin/log.c:1550 +#: builtin/am.c:1370 #, c-format -msgid "invalid ident line: %s" -msgstr "包含无效的身份标识：%s" +msgid "invalid ident line: %.*s" +msgstr "无效的身份标识：%.*s" -#: builtin/am.c:1417 +#: builtin/am.c:1392 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: builtin/am.c:1610 +#: builtin/am.c:1586 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1612 +#: builtin/am.c:1588 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1631 +#: builtin/am.c:1607 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4624,37 +4990,37 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1637 +#: builtin/am.c:1613 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1662 +#: builtin/am.c:1638 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1686 builtin/merge.c:632 +#: builtin/am.c:1662 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/am.c:1693 +#: builtin/am.c:1669 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 -#: builtin/merge.c:827 +#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 +#: builtin/merge.c:828 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1715 builtin/am.c:1719 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1759 +#: builtin/am.c:1735 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: builtin/am.c:1764 +#: builtin/am.c:1740 msgid "Commit Body is:" msgstr "提交内容为：" @@ -4663,35 +5029,35 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1750 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c:1824 +#: builtin/am.c:1800 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1840 builtin/am.c:1912 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1877 +#: builtin/am.c:1856 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1885 +#: builtin/am.c:1864 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1891 +#: builtin/am.c:1870 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "失败的补丁文件副本位于：%s" -#: builtin/am.c:1936 +#: builtin/am.c:1915 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4701,157 +5067,161 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1943 +#: builtin/am.c:1922 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" +"You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -"您的索引中仍有未合并的路径。\n" -"您是否忘了执行 'git add'？" +"在您的索引中仍存在未合并的路径。\n" +"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" +"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 -#: builtin/reset.c:316 +#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 +#: builtin/reset.c:331 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:2103 +#: builtin/am.c:2083 msgid "failed to clean index" msgstr "无法清空索引" -#: builtin/am.c:2137 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c:2200 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2233 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2234 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2240 +#: builtin/am.c:2220 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2242 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2244 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:178 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:180 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2247 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2250 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2252 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2254 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2256 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2258 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2261 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2264 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 +#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 +#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 +#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 +#: parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:387 builtin/verify-tag.c:38 +#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 msgid "format" msgstr "格式" -#: builtin/am.c:2290 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2296 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2298 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2301 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2304 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2307 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2311 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2313 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 +#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2316 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2319 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2334 +#: builtin/am.c:2317 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -4859,16 +5229,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2341 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "无法读取索引" -#: builtin/am.c:2356 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2380 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -4877,7 +5247,7 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2386 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" @@ -4907,11 +5277,6 @@ msgstr "git archive：应为 ACK/NACK，却得到 EOF" msgid "git archive: NACK %s" msgstr "git archive：NACK %s" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "远程错误：%s" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive：协议错误" @@ -4932,188 +5297,167 @@ msgstr "执行 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非检出当前提交" -#: builtin/blame.c:33 +#: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: builtin/blame.c:38 +#: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:1786 -msgid "Blaming lines" -msgstr "追踪代码行" - -#: builtin/blame.c:2582 +#: builtin/blame.c:668 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:2583 +#: builtin/blame.c:669 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:2584 +#: builtin/blame.c:670 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:2585 +#: builtin/blame.c:671 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2586 +#: builtin/blame.c:672 msgid "Force progress reporting" msgstr "强制进度显示" -#: builtin/blame.c:2587 +#: builtin/blame.c:673 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:2588 +#: builtin/blame.c:674 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:2589 +#: builtin/blame.c:675 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:2590 +#: builtin/blame.c:676 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:2591 +#: builtin/blame.c:677 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:2592 +#: builtin/blame.c:678 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:2593 +#: builtin/blame.c:679 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:2594 +#: builtin/blame.c:680 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: builtin/blame.c:2595 +#: builtin/blame.c:681 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:2596 +#: builtin/blame.c:682 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:2597 +#: builtin/blame.c:683 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2604 +#: builtin/blame.c:690 msgid "Use an experimental heuristic to improve diffs" msgstr "使用一个试验性的启发式算法改进差异显示" -#: builtin/blame.c:2606 +#: builtin/blame.c:692 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:2607 +#: builtin/blame.c:693 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:2608 +#: builtin/blame.c:694 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:2609 builtin/blame.c:2610 +#: builtin/blame.c:695 builtin/blame.c:696 msgid "score" msgstr "得分" -#: builtin/blame.c:2609 +#: builtin/blame.c:695 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:2610 +#: builtin/blame.c:696 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:2611 +#: builtin/blame.c:697 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2611 +#: builtin/blame.c:697 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" -#: builtin/blame.c:2658 +#: builtin/blame.c:744 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" -#. TRANSLATORS: This string is used to tell us the maximum -#. display width for a relative timestamp in "git blame" -#. output. For C locale, "4 years, 11 months ago", which -#. takes 22 places, is the longest among various forms of -#. relative timestamps, but your language may need more or -#. fewer display columns. -#: builtin/blame.c:2706 +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c:795 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/blame.c:2786 -msgid "--contents and --reverse do not blend well." -msgstr "--contents 和 --reverse 不能混用。" - -#: builtin/blame.c:2806 -msgid "cannot use --contents with final commit object name" -msgstr "不能将 --contents 和最终的提交对象名共用" - -#: builtin/blame.c:2811 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" - -#: builtin/blame.c:2838 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" - -#: builtin/blame.c:2849 -#, c-format -msgid "no such path %s in %s" -msgstr "在 %2$s 中无此路径 %1$s" - -#: builtin/blame.c:2860 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "不能为路径 %2$s 读取数据对象 %1$s" - -#: builtin/blame.c:2879 +#: builtin/blame.c:882 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" -#: builtin/branch.c:26 +#: builtin/blame.c:928 +msgid "Blaming lines" +msgstr "追踪代码行" + +#: builtin/branch.c:27 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<选项>] [-r | -a] [--points-at]" +#: builtin/branch.c:32 +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "git branch [<选项>] [-r | -a] [--format]" + # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:143 +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5123,7 +5467,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:147 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5132,12 +5476,12 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:161 +#: builtin/branch.c:163 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c:165 +#: builtin/branch.c:167 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5146,163 +5490,91 @@ msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" -#: builtin/branch.c:178 +#: builtin/branch.c:180 msgid "Update of config-file failed" msgstr "无法更新 config 文件" -#: builtin/branch.c:206 +#: builtin/branch.c:211 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:212 +#: builtin/branch.c:217 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:226 +#: builtin/branch.c:231 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" -#: builtin/branch.c:242 +#: builtin/branch.c:247 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:257 +#: builtin/branch.c:262 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "无法删除远程跟踪分支 '%s'" -#: builtin/branch.c:258 +#: builtin/branch.c:263 #, c-format msgid "Error deleting branch '%s'" msgstr "无法删除分支 '%s'" -#: builtin/branch.c:265 +#: builtin/branch.c:270 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" -#: builtin/branch.c:266 +#: builtin/branch.c:271 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:312 -#, c-format -msgid "[%s: gone]" -msgstr "[%s: 丢失]" - -#: builtin/branch.c:317 -#, c-format -msgid "[%s]" -msgstr "[%s]" - -#: builtin/branch.c:322 -#, c-format -msgid "[%s: behind %d]" -msgstr "[%s：落后 %d]" - -#: builtin/branch.c:324 -#, c-format -msgid "[behind %d]" -msgstr "[落后 %d]" - -#: builtin/branch.c:328 -#, c-format -msgid "[%s: ahead %d]" -msgstr "[%s：领先 %d]" - -#: builtin/branch.c:330 -#, c-format -msgid "[ahead %d]" -msgstr "[领先 %d]" - -#: builtin/branch.c:333 -#, c-format -msgid "[%s: ahead %d, behind %d]" -msgstr "[%s：领先 %d，落后 %d]" - -#: builtin/branch.c:336 -#, c-format -msgid "[ahead %d, behind %d]" -msgstr "[领先 %d，落后 %d]" - -#: builtin/branch.c:349 -msgid " **** invalid ref ****" -msgstr " **** 无效引用 ****" - -#: builtin/branch.c:375 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "（非分支，正变基 %s）" - -#: builtin/branch.c:378 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "（非分支，二分查找开始于 %s）" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: builtin/branch.c:384 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "（头指针分离于 %s）" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: builtin/branch.c:389 -#, c-format -msgid "(HEAD detached from %s)" -msgstr "（头指针分离自 %s）" - -#: builtin/branch.c:393 -msgid "(no branch)" -msgstr "（非分支）" - -#: builtin/branch.c:535 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" -#: builtin/branch.c:539 +#: builtin/branch.c:449 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" -#: builtin/branch.c:554 +#: builtin/branch.c:464 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:564 +#: builtin/branch.c:474 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:581 +#: builtin/branch.c:491 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:585 +#: builtin/branch.c:494 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:588 +#: builtin/branch.c:497 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:595 +#: builtin/branch.c:506 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:611 +#: builtin/branch.c:522 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5313,204 +5585,213 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被过滤。\n" -#: builtin/branch.c:643 +#: builtin/branch.c:555 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:645 +#: builtin/branch.c:557 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:646 +#: builtin/branch.c:558 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:647 +#: builtin/branch.c:559 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:649 +#: builtin/branch.c:561 msgid "change upstream info" msgstr "改变上游信息" -#: builtin/branch.c:651 +#: builtin/branch.c:563 msgid "upstream" msgstr "上游" -#: builtin/branch.c:651 +#: builtin/branch.c:563 msgid "change the upstream info" msgstr "改变上游信息" -#: builtin/branch.c:652 +#: builtin/branch.c:564 msgid "Unset the upstream info" msgstr "取消上游信息的设置" -#: builtin/branch.c:653 +#: builtin/branch.c:565 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:654 +#: builtin/branch.c:566 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:656 builtin/branch.c:657 +#: builtin/branch.c:568 builtin/branch.c:570 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:660 +#: builtin/branch.c:569 builtin/branch.c:571 +msgid "print only branches that don't contain the commit" +msgstr "只打印不包含该提交的分支" + +#: builtin/branch.c:574 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:661 +#: builtin/branch.c:575 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:663 +#: builtin/branch.c:577 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:664 +#: builtin/branch.c:578 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:665 +#: builtin/branch.c:579 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:666 +#: builtin/branch.c:580 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:667 +#: builtin/branch.c:581 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:668 +#: builtin/branch.c:582 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:670 +#: builtin/branch.c:584 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:671 +#: builtin/branch.c:585 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c:672 +#: builtin/branch.c:586 msgid "print only branches that are merged" msgstr "只打印已经合并的分支" -#: builtin/branch.c:673 +#: builtin/branch.c:587 msgid "print only branches that are not merged" msgstr "只打印尚未合并的分支" -#: builtin/branch.c:674 +#: builtin/branch.c:588 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 +#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "key" msgstr "key" -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 +#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 msgid "field name to sort on" msgstr "排序的字段名" -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 -#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:384 +#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 +#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 +#: builtin/tag.c:430 msgid "object" msgstr "对象" -#: builtin/branch.c:679 +#: builtin/branch.c:593 msgid "print only branches of the object" msgstr "只打印指向该对象的分支" -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 msgid "sorting and filtering are case insensitive" msgstr "排序和过滤属于大小写不敏感" -#: builtin/branch.c:698 +#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/verify-tag.c:39 +msgid "format to use for the output" +msgstr "输出格式" + +#: builtin/branch.c:615 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:702 builtin/clone.c:706 +#: builtin/branch.c:619 builtin/clone.c:728 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:724 +#: builtin/branch.c:642 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:735 builtin/branch.c:787 +#: builtin/branch.c:653 builtin/branch.c:705 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:763 +#: builtin/branch.c:681 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:768 +#: builtin/branch.c:686 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:775 +#: builtin/branch.c:693 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:778 +#: builtin/branch.c:696 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:793 +#: builtin/branch.c:711 msgid "too many branches for a rename operation" msgstr "为重命名操作提供了太多的分支名" -#: builtin/branch.c:798 +#: builtin/branch.c:716 msgid "too many branches to set new upstream" msgstr "为设置新上游提供了太多的分支名" -#: builtin/branch.c:802 +#: builtin/branch.c:720 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 +#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:809 +#: builtin/branch.c:727 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:821 +#: builtin/branch.c:739 msgid "too many branches to unset upstream" msgstr "为取消上游设置操作提供了太多的分支名" -#: builtin/branch.c:825 +#: builtin/branch.c:743 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:831 +#: builtin/branch.c:749 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:845 +#: builtin/branch.c:763 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有意义" -#: builtin/branch.c:851 +#: builtin/branch.c:769 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:854 +#: builtin/branch.c:772 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5518,7 +5799,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:871 +#: builtin/branch.c:789 #, c-format msgid "" "\n" @@ -5529,20 +5810,20 @@ msgstr "" "如果你想用 '%s' 跟踪 '%s', 这么做：\n" "\n" -#: builtin/bundle.c:51 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:64 +#: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "需要一个仓库来创建包。" -#: builtin/bundle.c:68 +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "需要一个仓库来解包。" -#: builtin/cat-file.c:513 +#: builtin/cat-file.c:519 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5550,7 +5831,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" -#: builtin/cat-file.c:514 +#: builtin/cat-file.c:520 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5558,302 +5839,302 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:551 +#: builtin/cat-file.c:557 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:552 +#: builtin/cat-file.c:558 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:553 +#: builtin/cat-file.c:559 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:555 +#: builtin/cat-file.c:561 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:556 +#: builtin/cat-file.c:562 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:564 msgid "for blob objects, run textconv on object's content" msgstr "对于数据对象，对其内容做文本转换" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:566 msgid "for blob objects, run filters on object's content" msgstr "对于数据对象，对其内容做过滤" -#: builtin/cat-file.c:561 git-submodule.sh:929 +#: builtin/cat-file.c:567 git-submodule.sh:944 msgid "blob" msgstr "数据对象" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:568 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:570 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:571 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:573 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:576 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:579 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:581 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 参数显示所有对象" -#: builtin/check-attr.c:11 +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 msgid "read file names from stdin" msgstr "从标准输入读出文件名" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 +#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 msgid "suppress progress reporting" msgstr "不显示进度报告" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "显示未匹配的输入路径" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "检查时忽略索引" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:158 msgid "cannot specify pathnames with --stdin" msgstr "不能同时指定路径及 --stdin 参数" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:161 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 参数共用才有意义" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:163 msgid "no path specified" msgstr "未指定路径" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:167 msgid "--quiet is only valid with a single pathname" msgstr "参数 --quiet 只在提供一个路径名时有效" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:169 msgid "cannot have both --quiet and --verbose" msgstr "不能同时提供 --quiet 和 --verbose 参数" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:172 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项只在使用 --verbose 时有效" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<选项>] <联系地址>..." -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "还从标准输入读取联系地址" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "不能解析联系地址：%s" -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "未指定联系地址" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<选项>] [--] [<文件>...]" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:145 msgid "stage should be between 1 and 3 or all" msgstr "索引值应该取值 1 到 3 或者 all" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:161 msgid "check out all files in the index" msgstr "检出索引区的所有文件" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:162 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:164 msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的文件都没有警告" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:166 msgid "don't checkout new files" msgstr "不检出新文件" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:168 msgid "update stat information in the index file" msgstr "更新索引中文件的状态信息" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:172 msgid "read list of paths from the standard input" msgstr "从标准输入读取路径列表" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:174 msgid "write the content to temporary files" msgstr "将内容写入临时文件" -#: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 -#: builtin/worktree.c:471 +#: builtin/checkout-index.c:175 builtin/column.c:31 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 +#: builtin/worktree.c:478 msgid "string" msgstr "字符串" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:176 msgid "when creating files, prepend <string>" msgstr "在创建文件时，在前面加上 <字符串>" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:178 msgid "copy out the files from named stage" msgstr "从指定暂存区中拷出文件" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<选项>] <分支>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:137 builtin/checkout.c:170 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:152 +#: builtin/checkout.c:153 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" -#: builtin/checkout.c:196 +#: builtin/checkout.c:197 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" -#: builtin/checkout.c:213 +#: builtin/checkout.c:214 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:230 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 -#: builtin/checkout.c:259 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:262 builtin/checkout.c:265 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:268 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:339 builtin/checkout.c:346 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:494 +#: builtin/checkout.c:497 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:625 +#: builtin/checkout.c:628 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:666 +#: builtin/checkout.c:669 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:670 builtin/clone.c:660 +#: builtin/checkout.c:673 builtin/clone.c:682 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:674 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:681 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:683 builtin/checkout.c:1072 +#: builtin/checkout.c:686 builtin/checkout.c:1075 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:736 +#: builtin/checkout.c:739 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:742 +#: builtin/checkout.c:745 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5874,7 +6155,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:764 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5901,202 +6182,198 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:797 +#: builtin/checkout.c:800 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:801 +#: builtin/checkout.c:804 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:828 builtin/checkout.c:1067 +#: builtin/checkout.c:832 builtin/checkout.c:1070 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:973 +#: builtin/checkout.c:976 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c:1013 builtin/worktree.c:214 +#: builtin/checkout.c:1016 builtin/worktree.c:215 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1045 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1084 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1084 builtin/checkout.c:1088 +#: builtin/checkout.c:1087 builtin/checkout.c:1091 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 +#: builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1111 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 -#: builtin/worktree.c:326 +#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 +#: builtin/worktree.c:330 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1148 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1146 builtin/worktree.c:328 +#: builtin/checkout.c:1149 builtin/worktree.c:332 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1153 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1155 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1157 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1158 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1156 builtin/merge.c:235 +#: builtin/checkout.c:1159 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 msgid "style" msgstr "风格" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1164 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1166 msgid "second guess 'git checkout <no-such-branch>'" msgstr "二次猜测'git checkout <无此分支>'" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1168 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:168 +#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 +#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1203 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1220 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1225 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1255 +#: builtin/checkout.c:1261 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1268 #, c-format -msgid "" -"Cannot update paths and switch to branch '%s' at the same time.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" -msgstr "" -"不能同时更新路径并切换到分支'%s'。\n" -"您是想要检出 '%s' 但其未能解析为提交么？" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1272 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1271 +#: builtin/checkout.c:1276 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/clean.c:25 +#: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." -#: builtin/clean.c:29 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "无法删除 %s" -#: builtin/clean.c:291 git-add--interactive.perl:623 +#: builtin/clean.c:298 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6109,7 +6386,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c:295 git-add--interactive.perl:632 +#: builtin/clean.c:302 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6130,38 +6407,38 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择\n" -#: builtin/clean.c:511 git-add--interactive.perl:598 -#: git-add--interactive.perl:603 +#: builtin/clean.c:518 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:653 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:690 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:711 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:752 +#: builtin/clean.c:759 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c:777 git-add--interactive.perl:1669 +#: builtin/clean.c:784 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: builtin/clean.c:785 +#: builtin/clean.c:792 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6179,203 +6456,212 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:812 git-add--interactive.perl:1745 +#: builtin/clean.c:819 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: builtin/clean.c:813 git-add--interactive.perl:1742 +#: builtin/clean.c:820 git-add--interactive.perl:1689 msgid "What now" msgstr "请选择" -#: builtin/clean.c:821 +#: builtin/clean.c:828 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:838 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:869 +#: builtin/clean.c:906 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:871 +#: builtin/clean.c:908 msgid "force" msgstr "强制" -#: builtin/clean.c:872 +#: builtin/clean.c:909 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:874 +#: builtin/clean.c:911 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176 +#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 +#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "模式" -#: builtin/clean.c:876 +#: builtin/clean.c:913 msgid "add <pattern> to ignore rules" msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c:877 +#: builtin/clean.c:914 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:879 +#: builtin/clean.c:916 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:897 +#: builtin/clean.c:934 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:901 +#: builtin/clean.c:938 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:904 +#: builtin/clean.c:941 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clone.c:37 +#: builtin/clone.c:38 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: builtin/clone.c:65 +#: builtin/clone.c:82 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 +#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 msgid "create a bare repository" msgstr "创建一个纯仓库" -#: builtin/clone.c:70 +#: builtin/clone.c:87 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜像仓库（也是纯仓库）" -#: builtin/clone.c:72 +#: builtin/clone.c:89 msgid "to clone from a local repository" msgstr "从本地仓库克隆" -#: builtin/clone.c:74 +#: builtin/clone.c:91 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c:76 +#: builtin/clone.c:93 msgid "setup as shared repository" msgstr "设置为共享仓库" -#: builtin/clone.c:78 builtin/clone.c:80 +#: builtin/clone.c:95 builtin/clone.c:99 +msgid "pathspec" +msgstr "路径规格" + +#: builtin/clone.c:95 builtin/clone.c:99 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:82 +#: builtin/clone.c:102 msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" -#: builtin/clone.c:83 builtin/init-db.c:475 +#: builtin/clone.c:103 builtin/init-db.c:476 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:84 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 -#: builtin/submodule--helper.c:970 +#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 +#: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:90 +#: builtin/clone.c:110 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "名称" -#: builtin/clone.c:92 +#: builtin/clone.c:112 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" -#: builtin/clone.c:94 +#: builtin/clone.c:114 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" -#: builtin/clone.c:96 +#: builtin/clone.c:116 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 -#: builtin/pull.c:202 +#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/pull.c:205 msgid "depth" msgstr "深度" -#: builtin/clone.c:98 +#: builtin/clone.c:118 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 +#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 #: parse-options.h:142 msgid "time" msgstr "时间" -#: builtin/clone.c:100 +#: builtin/clone.c:120 msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c:101 builtin/fetch.c:124 +#: builtin/clone.c:121 builtin/fetch.c:119 msgid "revision" msgstr "版本" -#: builtin/clone.c:102 builtin/fetch.c:125 +#: builtin/clone.c:122 builtin/fetch.c:120 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" -#: builtin/clone.c:104 +#: builtin/clone.c:124 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:106 +#: builtin/clone.c:126 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" + +#: builtin/clone.c:128 msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c:107 builtin/init-db.c:484 +#: builtin/clone.c:129 builtin/init-db.c:485 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:108 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:109 +#: builtin/clone.c:131 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:110 +#: builtin/clone.c:132 msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" -#: builtin/clone.c:250 +#: builtin/clone.c:272 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6383,42 +6669,42 @@ msgstr "" "无法猜到目录名。\n" "请在命令行指定一个目录" -#: builtin/clone.c:303 +#: builtin/clone.c:325 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能为 '%s' 添加一个备用：%s\n" -#: builtin/clone.c:375 +#: builtin/clone.c:397 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: builtin/clone.c:383 +#: builtin/clone.c:405 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:397 +#: builtin/clone.c:419 #, c-format msgid "failed to stat %s\n" -msgstr "无法枚举 %s 状态\n" +msgstr "对 %s 调用 stat 失败\n" -#: builtin/clone.c:419 +#: builtin/clone.c:441 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:423 +#: builtin/clone.c:445 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:448 +#: builtin/clone.c:470 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:460 +#: builtin/clone.c:482 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6428,180 +6714,179 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" -#: builtin/clone.c:537 +#: builtin/clone.c:559 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:632 +#: builtin/clone.c:654 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" -#: builtin/clone.c:648 +#: builtin/clone.c:670 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:697 +#: builtin/clone.c:719 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:728 +#: builtin/clone.c:750 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:768 +#: builtin/clone.c:792 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" -#: builtin/clone.c:831 +#: builtin/clone.c:855 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c:833 +#: builtin/clone.c:857 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:866 builtin/receive-pack.c:1895 +#: builtin/clone.c:890 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:870 +#: builtin/clone.c:894 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:883 +#: builtin/clone.c:907 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:886 +#: builtin/clone.c:910 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:899 +#: builtin/clone.c:923 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:905 builtin/fetch.c:1335 +#: builtin/clone.c:929 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:915 +#: builtin/clone.c:939 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:925 +#: builtin/clone.c:949 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 -#: builtin/submodule--helper.c:659 builtin/worktree.c:222 -#: builtin/worktree.c:249 +#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 +#: builtin/worktree.c:222 builtin/worktree.c:252 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:943 +#: builtin/clone.c:967 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:955 +#: builtin/clone.c:979 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:957 +#: builtin/clone.c:981 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:963 +#: builtin/clone.c:1005 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" -#: builtin/clone.c:1019 +#: builtin/clone.c:1067 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1021 +#: builtin/clone.c:1069 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1023 +#: builtin/clone.c:1071 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1026 +#: builtin/clone.c:1074 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" -#: builtin/clone.c:1031 +#: builtin/clone.c:1079 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1035 +#: builtin/clone.c:1083 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:1090 builtin/clone.c:1098 +#: builtin/clone.c:1138 builtin/clone.c:1146 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1101 +#: builtin/clone.c:1149 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<选项>]" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "查找配置变量" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "要使用的布局" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "最大宽度" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "左边框的填充空间" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "右边框的填充空间" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "两列之间的填充空间" -#: builtin/column.c:51 +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit.c:38 +#: builtin/commit.c:39 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<选项>] [--] <路径规格>..." -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<选项>] [--] <路径规格>..." -#: builtin/commit.c:48 +#: builtin/commit.c:49 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6625,7 +6910,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6648,7 +6933,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:73 +#: builtin/commit.c:74 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -6657,7 +6942,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:78 +#: builtin/commit.c:79 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -6671,11 +6956,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:85 +#: builtin/commit.c:86 msgid "Otherwise, please use 'git reset'\n" msgstr "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:88 +#: builtin/commit.c:89 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6691,103 +6976,98 @@ msgstr "" "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" "操作。\n" -#: builtin/commit.c:318 +#: builtin/commit.c:319 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:359 +#: builtin/commit.c:360 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:365 +#: builtin/commit.c:366 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:378 +#: builtin/commit.c:379 msgid "unable to update temporary index" msgstr "无法更新临时索引" -#: builtin/commit.c:380 +#: builtin/commit.c:381 msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" -#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 +#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:458 +#: builtin/commit.c:459 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:460 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:469 +#: builtin/commit.c:470 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:488 +#: builtin/commit.c:489 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:582 +#: builtin/commit.c:583 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" -#: builtin/commit.c:584 +#: builtin/commit.c:585 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有非法的作者信息" -#: builtin/commit.c:603 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:611 -#, c-format -msgid "invalid date format: %s" -msgstr "无效的日期格式：%s" - -#: builtin/commit.c:655 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:704 builtin/shortlog.c:295 +#: builtin/commit.c:705 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:706 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:710 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:743 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:814 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -6801,7 +7081,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:819 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -6815,7 +7095,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:832 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6824,7 +7104,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:839 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6835,346 +7115,346 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:859 +#: builtin/commit.c:857 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:867 +#: builtin/commit.c:865 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:874 +#: builtin/commit.c:872 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:889 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:954 +#: builtin/commit.c:951 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:968 builtin/tag.c:280 +#: builtin/commit.c:965 builtin/tag.c:274 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1071 +#: builtin/commit.c:1068 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1086 builtin/commit.c:1325 +#: builtin/commit.c:1083 builtin/commit.c:1328 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1124 +#: builtin/commit.c:1121 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1154 +#: builtin/commit.c:1151 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1163 +#: builtin/commit.c:1160 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1166 +#: builtin/commit.c:1163 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1168 +#: builtin/commit.c:1165 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1171 +#: builtin/commit.c:1168 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1181 +#: builtin/commit.c:1178 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1183 +#: builtin/commit.c:1180 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1191 +#: builtin/commit.c:1188 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1208 +#: builtin/commit.c:1205 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1210 +#: builtin/commit.c:1207 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1212 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." - -#: builtin/commit.c:1224 builtin/tag.c:495 +#: builtin/commit.c:1219 builtin/tag.c:552 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1229 +#: builtin/commit.c:1224 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1339 builtin/commit.c:1612 +#: builtin/commit.c:1342 builtin/commit.c:1617 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1341 builtin/commit.c:1614 +#: builtin/commit.c:1344 builtin/commit.c:1619 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1343 +#: builtin/commit.c:1346 +msgid "show stash information" +msgstr "显示贮藏区信息" + +#: builtin/commit.c:1348 msgid "version" msgstr "版本" -#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:442 +#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 +#: builtin/worktree.c:449 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1346 builtin/commit.c:1618 +#: builtin/commit.c:1351 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1349 builtin/commit.c:1621 +#: builtin/commit.c:1354 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:368 +#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 +#: builtin/fast-export.c:986 builtin/tag.c:412 msgid "mode" msgstr "模式" -#: builtin/commit.c:1352 builtin/commit.c:1624 +#: builtin/commit.c:1357 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1355 +#: builtin/commit.c:1360 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1356 parse-options.h:155 +#: builtin/commit.c:1361 parse-options.h:155 msgid "when" msgstr "何时" -#: builtin/commit.c:1357 +#: builtin/commit.c:1362 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1359 +#: builtin/commit.c:1364 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1435 +#: builtin/commit.c:1440 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1437 +#: builtin/commit.c:1442 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1582 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1583 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1585 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1586 builtin/tag.c:366 +#: builtin/commit.c:1591 builtin/tag.c:410 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "author" msgstr "作者" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1588 builtin/gc.c:333 +#: builtin/commit.c:1593 builtin/gc.c:358 msgid "date" msgstr "日期" -#: builtin/commit.c:1588 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:364 +#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 +#: builtin/notes.c:564 builtin/tag.c:408 msgid "message" msgstr "说明" -#: builtin/commit.c:1589 +#: builtin/commit.c:1594 msgid "commit message" msgstr "提交说明" -#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "提交" -#: builtin/commit.c:1590 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1592 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1593 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1594 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1596 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1597 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "default" msgstr "default" -#: builtin/commit.c:1598 builtin/tag.c:369 +#: builtin/commit.c:1603 builtin/tag.c:413 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1599 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 -#: builtin/revert.c:93 +#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG 提交签名" -#: builtin/commit.c:1604 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1605 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1606 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1607 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1608 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1609 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1610 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1611 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1622 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1623 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1628 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1630 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1659 +#: builtin/commit.c:1665 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1707 +#: builtin/commit.c:1710 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1714 +#: builtin/commit.c:1717 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1733 +#: builtin/commit.c:1736 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1744 +#: builtin/commit.c:1747 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1749 +#: builtin/commit.c:1752 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1797 +#: builtin/commit.c:1800 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7183,135 +7463,135 @@ msgstr "" "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" -#: builtin/config.c:9 +#: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<选项>]" -#: builtin/config.c:55 +#: builtin/config.c:57 msgid "Config file location" msgstr "配置文件位置" -#: builtin/config.c:56 +#: builtin/config.c:58 msgid "use global config file" msgstr "使用全局配置文件" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "use system config file" msgstr "使用系统级配置文件" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "use repository config file" msgstr "使用仓库级配置文件" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "use given config file" msgstr "使用指定的配置文件" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "blob-id" msgstr "数据对象 ID" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" -#: builtin/config.c:61 +#: builtin/config.c:63 msgid "Action" msgstr "操作" -#: builtin/config.c:62 +#: builtin/config.c:64 msgid "get value: name [value-regex]" msgstr "获取值：name [value-regex]" -#: builtin/config.c:63 +#: builtin/config.c:65 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:64 +#: builtin/config.c:66 msgid "get values for regexp: name-regex [value-regex]" msgstr "根据正则表达式获得值：name-regex [value-regex]" -#: builtin/config.c:65 +#: builtin/config.c:67 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL 取值：section[.var] URL" -#: builtin/config.c:66 +#: builtin/config.c:68 msgid "replace all matching variables: name value [value_regex]" msgstr "替换所有匹配的变量：name value [value_regex]" -#: builtin/config.c:67 +#: builtin/config.c:69 msgid "add a new variable: name value" msgstr "添加一个新的变量：name value" -#: builtin/config.c:68 +#: builtin/config.c:70 msgid "remove a variable: name [value-regex]" msgstr "删除一个变量：name [value-regex]" -#: builtin/config.c:69 +#: builtin/config.c:71 msgid "remove all matches: name [value-regex]" msgstr "删除所有匹配项：name [value-regex]" -#: builtin/config.c:70 +#: builtin/config.c:72 msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" -#: builtin/config.c:71 +#: builtin/config.c:73 msgid "remove a section: name" msgstr "删除一个小节：name" -#: builtin/config.c:72 +#: builtin/config.c:74 msgid "list all" msgstr "列出所有" -#: builtin/config.c:73 +#: builtin/config.c:75 msgid "open an editor" msgstr "打开一个编辑器" -#: builtin/config.c:74 +#: builtin/config.c:76 msgid "find the color configured: slot [default]" msgstr "获得配置的颜色：配置 [默认]" -#: builtin/config.c:75 +#: builtin/config.c:77 msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置：配置 [stdout-is-tty]" -#: builtin/config.c:76 +#: builtin/config.c:78 msgid "Type" msgstr "类型" -#: builtin/config.c:77 +#: builtin/config.c:79 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:78 +#: builtin/config.c:80 msgid "value is decimal number" msgstr "值是十进制数" -#: builtin/config.c:79 +#: builtin/config.c:81 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:80 +#: builtin/config.c:82 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c:81 +#: builtin/config.c:83 msgid "Other" msgstr "其它" -#: builtin/config.c:82 +#: builtin/config.c:84 msgid "terminate values with NUL byte" msgstr "终止值是 NUL 字节" -#: builtin/config.c:83 +#: builtin/config.c:85 msgid "show variable names only" msgstr "只显示变量名" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" @@ -7334,12 +7614,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:613 +#: builtin/config.c:499 +msgid "--local can only be used inside a git repository" +msgstr "--local 只能在一个仓库内使用" + +#: builtin/config.c:621 #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" -#: builtin/config.c:625 +#: builtin/config.c:633 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7348,63 +7632,75 @@ msgstr "" "无法用一个值覆盖多个值\n" " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" -#: builtin/count-objects.c:86 +#: builtin/count-objects.c:87 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:96 +#: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" -#: builtin/describe.c:17 +#: builtin/describe.c:19 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<选项>] [<提交号>...]" -#: builtin/describe.c:18 +#: builtin/describe.c:20 msgid "git describe [<options>] --dirty" msgstr "git describe [<选项>] --dirty" -#: builtin/describe.c:217 +#: builtin/describe.c:54 +msgid "head" +msgstr "头" + +#: builtin/describe.c:54 +msgid "lightweight" +msgstr "轻量级的" + +#: builtin/describe.c:54 +msgid "annotated" +msgstr "附注的" + +#: builtin/describe.c:253 #, c-format msgid "annotated tag %s not available" msgstr "附注标签 %s 无效" -#: builtin/describe.c:221 +#: builtin/describe.c:257 #, c-format msgid "annotated tag %s has no embedded name" msgstr "附注标签 %s 没有嵌入名称" -#: builtin/describe.c:223 +#: builtin/describe.c:259 #, c-format msgid "tag '%s' is really '%s' here" msgstr "标签 '%s' 的确是在 '%s'" -#: builtin/describe.c:250 builtin/log.c:480 +#: builtin/describe.c:286 builtin/log.c:489 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:253 +#: builtin/describe.c:289 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: builtin/describe.c:270 +#: builtin/describe.c:306 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有标签准确匹配 '%s'" -#: builtin/describe.c:272 +#: builtin/describe.c:308 #, c-format msgid "searching to describe %s\n" msgstr "搜索描述 %s\n" -#: builtin/describe.c:319 +#: builtin/describe.c:355 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:346 +#: builtin/describe.c:382 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7413,7 +7709,7 @@ msgstr "" "没有附注标签能描述 '%s'。\n" "然而，存在未附注标签：尝试 --tags。" -#: builtin/describe.c:350 +#: builtin/describe.c:386 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7422,12 +7718,12 @@ msgstr "" "没有标签能描述 '%s'。\n" "尝试 --always，或者创建一些标签。" -#: builtin/describe.c:371 +#: builtin/describe.c:416 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:374 +#: builtin/describe.c:419 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7436,406 +7732,437 @@ msgstr "" "发现多于 %i 个标签，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:396 +#: builtin/describe.c:441 msgid "find the tag that comes after the commit" msgstr "寻找该提交之后的标签" -#: builtin/describe.c:397 +#: builtin/describe.c:442 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c:398 +#: builtin/describe.c:443 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:399 +#: builtin/describe.c:444 msgid "use any tag, even unannotated" msgstr "使用任意标签，即使未附带注释" -#: builtin/describe.c:400 +#: builtin/describe.c:445 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c:401 +#: builtin/describe.c:446 msgid "only follow first parent" msgstr "只跟随第一个父提交" -#: builtin/describe.c:404 +#: builtin/describe.c:449 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c:406 +#: builtin/describe.c:451 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> 个标签（默认：10）" -#: builtin/describe.c:408 +#: builtin/describe.c:453 msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的标签" -#: builtin/describe.c:410 builtin/name-rev.c:320 +#: builtin/describe.c:455 +msgid "do not consider tags matching <pattern>" +msgstr "不考虑匹配 <模式> 的标签" + +#: builtin/describe.c:457 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c:411 +#: builtin/describe.c:458 builtin/describe.c:461 msgid "mark" msgstr "标记" -#: builtin/describe.c:412 +#: builtin/describe.c:459 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c:430 +#: builtin/describe.c:462 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）" + +#: builtin/describe.c:480 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:456 +#: builtin/describe.c:509 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:476 +#: builtin/describe.c:552 msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty 不能与提交同时使用" +msgstr "--dirty 与提交号不兼容" + +#: builtin/describe.c:554 +msgid "--broken is incompatible with commit-ishes" +msgstr "--broken 与提交号不兼容" #: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:358 +#: builtin/diff.c:359 msgid "Not a git repository" msgstr "不是一个 git 仓库" -#: builtin/diff.c:401 +#: builtin/diff.c:402 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:410 +#: builtin/diff.c:411 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" -#: builtin/difftool.c:28 +#: builtin/difftool.c:29 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" -#: builtin/difftool.c:241 +#: builtin/difftool.c:249 #, c-format msgid "failed: %d" msgstr "失败：%d" -#: builtin/difftool.c:342 +#: builtin/difftool.c:291 +#, c-format +msgid "could not read symlink %s" +msgstr "无法读取符号链接 %s" + +#: builtin/difftool.c:293 +#, c-format +msgid "could not read symlink file %s" +msgstr "无法读取符号链接文件 %s" + +#: builtin/difftool.c:301 +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" + +#: builtin/difftool.c:403 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." -msgstr "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--cc'）。" +msgstr "" +"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--" +"cc'）。" -#: builtin/difftool.c:567 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c:569 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "工作区文件被留了下来。" -#: builtin/difftool.c:580 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件存在于 '%s'。" -#: builtin/difftool.c:581 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" -#: builtin/difftool.c:626 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:628 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c:630 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" -#: builtin/difftool.c:636 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" -#: builtin/difftool.c:637 +#: builtin/difftool.c:700 msgid "<tool>" msgstr "<工具>" -#: builtin/difftool.c:638 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c:640 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" -#: builtin/difftool.c:643 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出" -#: builtin/difftool.c:645 +#: builtin/difftool.c:708 msgid "<command>" msgstr "<命令>" -#: builtin/difftool.c:646 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" -#: builtin/difftool.c:670 +#: builtin/difftool.c:733 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> 参数提供 <工具>" -#: builtin/difftool.c:677 +#: builtin/difftool.c:740 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" -#: builtin/fast-export.c:25 +#: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:982 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之后显示进度" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:984 msgid "select handling of signed tags" msgstr "选择如何处理签名标签" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:987 msgid "select handling of tags that tag filtered objects" msgstr "选择当标签指向被过滤对象时该标签的处理方式" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:990 msgid "Dump marks to this file" msgstr "把标记存储到这个文件" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:992 msgid "Import marks from this file" msgstr "从这个文件导入标记" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:994 msgid "Fake a tagger when tags lack one" msgstr "当标签缺少标记者字段时，假装提供一个" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:996 msgid "Output full tree for each commit" msgstr "每次提交都输出整个树" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:998 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:999 msgid "Skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "refspec" msgstr "引用规格" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1001 msgid "Apply refspec to exported refs" msgstr "对导出的引用应用引用规格" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "anonymize output" msgstr "匿名输出" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:95 builtin/pull.c:175 +#: builtin/fetch.c:90 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:97 builtin/pull.c:178 +#: builtin/fetch.c:92 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:99 builtin/pull.c:181 +#: builtin/fetch.c:94 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:100 builtin/pull.c:183 +#: builtin/fetch.c:95 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/fetch.c:102 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:104 builtin/pull.c:185 +#: builtin/fetch.c:99 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c:106 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" -#: builtin/fetch.c:108 +#: builtin/fetch.c:103 msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:110 builtin/pull.c:188 +#: builtin/fetch.c:105 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" # 译者：可选值，不能翻译 -#: builtin/fetch.c:111 builtin/pull.c:191 +#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:112 builtin/pull.c:192 +#: builtin/fetch.c:107 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:116 builtin/pull.c:200 +#: builtin/fetch.c:111 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:118 +#: builtin/fetch.c:113 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 +#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:123 +#: builtin/fetch.c:118 msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" -#: builtin/fetch.c:129 builtin/pull.c:206 +#: builtin/fetch.c:124 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:131 builtin/log.c:1433 +#: builtin/fetch.c:126 builtin/log.c:1450 msgid "dir" msgstr "目录" -#: builtin/fetch.c:132 +#: builtin/fetch.c:127 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:135 -msgid "default mode for recursion" -msgstr "递归的默认模式" +#: builtin/fetch.c:130 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "递归获取子模组的缺省值（比配置文件优先级低）" -#: builtin/fetch.c:137 builtin/pull.c:209 +#: builtin/fetch.c:134 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:138 builtin/pull.c:211 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:139 builtin/pull.c:212 +#: builtin/fetch.c:136 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:395 +#: builtin/fetch.c:394 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "配置变量 fetch.output 包含无效值 %s" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:608 +#: builtin/fetch.c:609 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:621 builtin/fetch.c:701 +#: builtin/fetch.c:622 builtin/fetch.c:702 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 msgid "can't fetch in current branch" msgstr "当前分支下不能执行获取操作" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[tag update]" msgstr "[标签更新]" -#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 -#: builtin/fetch.c:696 +#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 +#: builtin/fetch.c:697 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:651 +#: builtin/fetch.c:652 msgid "[new tag]" msgstr "[新标签]" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:658 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:696 +#: builtin/fetch.c:697 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:701 +#: builtin/fetch.c:702 msgid "non-fast-forward" msgstr "非快进" -#: builtin/fetch.c:746 +#: builtin/fetch.c:747 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:766 +#: builtin/fetch.c:767 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:853 builtin/fetch.c:949 +#: builtin/fetch.c:855 builtin/fetch.c:951 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:864 +#: builtin/fetch.c:866 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7845,179 +8172,179 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:919 +#: builtin/fetch.c:921 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:920 +#: builtin/fetch.c:922 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:952 +#: builtin/fetch.c:954 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:953 builtin/remote.c:1020 +#: builtin/fetch.c:955 builtin/remote.c:1023 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:976 +#: builtin/fetch.c:978 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯仓库的当前分支 %s" -#: builtin/fetch.c:995 +#: builtin/fetch.c:997 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:998 +#: builtin/fetch.c:1000 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1076 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:1234 +#: builtin/fetch.c:1236 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1236 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1254 +#: builtin/fetch.c:1256 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。" -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1279 msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1321 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1323 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1326 +#: builtin/fetch.c:1328 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1330 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1349 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1351 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:1363 +#: builtin/fetch.c:1362 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1371 +#: builtin/fetch.c:1370 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fmt-merge-msg.c:14 +#: builtin/fmt-merge-msg.c:15 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "从文件中读取" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<选项>] [<模式>]" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <对象>]" -#: builtin/for-each-ref.c:11 -msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]" - #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [--contains [<object>]]" -msgstr "git for-each-ref [--contains [<对象>]]" +msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:13 +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" + +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符适用于 Tcl" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 -msgid "format to use for the output" -msgstr "输出格式" - -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "只打印指向给定对象的引用" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "只打印已经合并的引用" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "只打印没有合并的引用" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "只打印包含该提交的引用" +#: builtin/for-each-ref.c:47 +msgid "print only refs which don't contain the commit" +msgstr "只打印不包含该提交的引用" + #: builtin/fsck.c:554 msgid "Checking object directories" msgstr "检查对象目录中" @@ -8078,21 +8405,21 @@ msgstr "显示可达对象的详细名称" msgid "Checking objects" msgstr "检查对象中" -#: builtin/gc.c:25 +#: builtin/gc.c:26 msgid "git gc [<options>]" msgstr "git gc [<选项>]" -#: builtin/gc.c:72 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "无效 %s：'%s'" +msgid "Failed to fstat %s: %s" +msgstr "对 %s 调用 fstat 失败：%s" -#: builtin/gc.c:139 +#: builtin/gc.c:311 #, c-format -msgid "insanely long object directory %.*s" -msgstr "不正常的长对象目录 %.*s" +msgid "Can't stat %s" +msgstr "不能对 %s 调用 stat" -#: builtin/gc.c:297 +#: builtin/gc.c:320 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8106,297 +8433,320 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:334 +#: builtin/gc.c:359 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:336 +#: builtin/gc.c:361 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:337 +#: builtin/gc.c:362 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:338 +#: builtin/gc.c:363 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" #: builtin/gc.c:380 #, c-format +msgid "Failed to parse gc.logexpiry value %s" +msgstr "无法解析 gc.logexpiry 的值 %s" + +#: builtin/gc.c:408 +#, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c:382 +#: builtin/gc.c:410 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:383 +#: builtin/gc.c:411 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:404 +#: builtin/gc.c:436 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）" -#: builtin/gc.c:448 +#: builtin/gc.c:480 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" -#: builtin/grep.c:25 +#: builtin/grep.c:27 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" -#: builtin/grep.c:232 +#: builtin/grep.c:235 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" -#: builtin/grep.c:290 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "为 %2$s 设定的线程数 (%1$d) 无效" -#: builtin/grep.c:763 builtin/grep.c:804 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "没有线程支持，忽略 %s" + +#: builtin/grep.c:788 builtin/grep.c:829 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:823 +#: builtin/grep.c:848 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:887 +#: builtin/grep.c:912 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:973 +#: builtin/grep.c:999 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:975 +#: builtin/grep.c:1001 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:977 +#: builtin/grep.c:1003 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:979 +#: builtin/grep.c:1005 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:981 -msgid "recursivley search in each submodule" +#: builtin/grep.c:1007 +msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" -#: builtin/grep.c:983 +#: builtin/grep.c:1009 msgid "basename" msgstr "基本名" -#: builtin/grep.c:984 +#: builtin/grep.c:1010 msgid "prepend parent project's basename to output" msgstr "在输出中以父项目的基本名为前缀" -#: builtin/grep.c:987 +#: builtin/grep.c:1013 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:989 +#: builtin/grep.c:1015 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:991 +#: builtin/grep.c:1017 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:993 +#: builtin/grep.c:1019 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:995 +#: builtin/grep.c:1021 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:998 +#: builtin/grep.c:1024 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:1000 +#: builtin/grep.c:1026 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:1004 +#: builtin/grep.c:1030 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:1007 +#: builtin/grep.c:1033 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:1010 +#: builtin/grep.c:1036 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:1013 +#: builtin/grep.c:1039 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:1016 +#: builtin/grep.c:1042 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:1017 +#: builtin/grep.c:1043 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:1018 +#: builtin/grep.c:1044 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:1020 +#: builtin/grep.c:1046 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:1022 +#: builtin/grep.c:1048 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:1024 +#: builtin/grep.c:1050 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:1027 +#: builtin/grep.c:1053 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:1029 +#: builtin/grep.c:1055 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:1031 +#: builtin/grep.c:1057 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:1032 +#: builtin/grep.c:1058 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:1034 +#: builtin/grep.c:1060 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:1036 +#: builtin/grep.c:1062 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:1039 +#: builtin/grep.c:1065 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:1042 +#: builtin/grep.c:1068 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:1044 +#: builtin/grep.c:1070 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:1046 +#: builtin/grep.c:1072 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:1047 +#: builtin/grep.c:1073 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:1050 +#: builtin/grep.c:1076 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:1052 +#: builtin/grep.c:1078 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:1055 +#: builtin/grep.c:1081 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:1057 +#: builtin/grep.c:1083 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:1059 +#: builtin/grep.c:1085 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:1071 +#: builtin/grep.c:1097 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:1073 +#: builtin/grep.c:1099 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:1075 +#: builtin/grep.c:1101 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:1079 +#: builtin/grep.c:1105 msgid "pager" msgstr "分页" -#: builtin/grep.c:1079 +#: builtin/grep.c:1105 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:1082 +#: builtin/grep.c:1108 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:1146 +#: builtin/grep.c:1172 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:1178 builtin/index-pack.c:1482 +#: builtin/grep.c:1204 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "--no-index 或 --untracked 不能和版本同时使用" + +#: builtin/grep.c:1211 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "不能解析版本：%s" + +#: builtin/grep.c:1245 builtin/index-pack.c:1490 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:1215 +#: builtin/grep.c:1250 +msgid "no threads support, ignoring --threads" +msgstr "没有线程支持，忽略 --threads" + +#: builtin/grep.c:1281 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:1238 +#: builtin/grep.c:1304 msgid "option not supported with --recurse-submodules." msgstr "选项不支持和 --recurse-submodules 共用。" -#: builtin/grep.c:1244 +#: builtin/grep.c:1310 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:1249 -msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index 或 --untracked 不能和版本同时使用。" - -#: builtin/grep.c:1252 +#: builtin/grep.c:1316 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:1260 +#: builtin/grep.c:1324 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -8404,91 +8754,91 @@ msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " "[--] <文件>..." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "type" msgstr "类型" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "object type" msgstr "对象类型" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "write the object into the object database" msgstr "将对象写入对象数据库" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "read the object from stdin" msgstr "从标准输入读取对象" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" -#: builtin/help.c:42 +#: builtin/help.c:43 msgid "print all available commands" msgstr "打印所有可用的命令" -#: builtin/help.c:43 +#: builtin/help.c:44 msgid "exclude guides" msgstr "排除向导" -#: builtin/help.c:44 +#: builtin/help.c:45 msgid "print list of useful guides" msgstr "显示有用的指南列表" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "show man page" msgstr "显示 man 手册" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "show manual in web browser" msgstr "在 web 浏览器中显示手册" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "show info page" msgstr "显示 info 手册" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" -#: builtin/help.c:66 +#: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 +#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 #, c-format msgid "failed to exec '%s'" msgstr "无法执行 '%s'" -#: builtin/help.c:207 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8497,7 +8847,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" -#: builtin/help.c:219 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8506,435 +8856,435 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" -#: builtin/help.c:336 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:353 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:361 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:403 +#: builtin/help.c:404 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: builtin/help.c:404 +#: builtin/help.c:405 msgid "Everyday Git With 20 Commands Or So" msgstr "每一天 Git 常用的约 20 条命令" -#: builtin/help.c:405 +#: builtin/help.c:406 msgid "A Git glossary" msgstr "Git 词汇表" -#: builtin/help.c:406 +#: builtin/help.c:407 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: builtin/help.c:407 +#: builtin/help.c:408 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: builtin/help.c:408 +#: builtin/help.c:409 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: builtin/help.c:409 +#: builtin/help.c:410 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程（针对 1.5.1 或更新版本）" -#: builtin/help.c:410 +#: builtin/help.c:411 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" -#: builtin/help.c:422 +#: builtin/help.c:423 msgid "The common Git guides are:\n" msgstr "最常用的 Git 向导有：\n" -#: builtin/help.c:440 +#: builtin/help.c:441 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" -#: builtin/help.c:462 builtin/help.c:479 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/index-pack.c:154 +#: builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, c-format msgid "did not receive expected object %s" msgstr "未能获取预期的对象 %s" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：应为类型 %s，却是 %s" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:270 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:293 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:299 +#: builtin/index-pack.c:300 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许值" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:322 +#: builtin/index-pack.c:324 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:336 +#: builtin/index-pack.c:338 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:340 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:356 +#: builtin/index-pack.c:358 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:478 +#: builtin/index-pack.c:479 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:528 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:535 +#: builtin/index-pack.c:536 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:543 +#: builtin/index-pack.c:544 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:574 +#: builtin/index-pack.c:575 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:577 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节" msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节" -#: builtin/index-pack.c:602 +#: builtin/index-pack.c:603 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:813 builtin/index-pack.c:822 +#: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:751 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:751 builtin/pack-objects.c:167 +#: builtin/pack-objects.c:261 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:819 +#: builtin/index-pack.c:814 +#, c-format +msgid "cannot read existing object info %s" +msgstr "不能读取现存对象信息 %s" + +#: builtin/index-pack.c:822 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:836 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:851 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:854 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:856 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:924 builtin/index-pack.c:955 +#: builtin/index-pack.c:928 builtin/index-pack.c:959 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1130 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1130 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1164 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1169 msgid "cannot fstat packfile" -msgstr "不能枚举包文件状态" +msgstr "不能对包文件调用 fstat" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1172 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1176 +#: builtin/index-pack.c:1184 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1199 +#: builtin/index-pack.c:1207 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1210 +#: builtin/index-pack.c:1218 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1260 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1258 +#: builtin/index-pack.c:1266 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 个本地对象" msgstr[1] "完成 %d 个本地对象" -#: builtin/index-pack.c:1270 +#: builtin/index-pack.c:1278 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1282 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1306 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1382 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1408 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1411 +#: builtin/index-pack.c:1420 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1419 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1432 +#: builtin/index-pack.c:1438 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1443 +#: builtin/index-pack.c:1446 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1484 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "没有线程支持，忽略 %s" - -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1552 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1546 +#: builtin/index-pack.c:1554 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1602 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" -#: builtin/index-pack.c:1600 +#: builtin/index-pack.c:1609 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1613 +#: builtin/index-pack.c:1622 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 -#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 +#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 +#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1734 +#: builtin/index-pack.c:1743 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1736 +#: builtin/index-pack.c:1745 msgid "--stdin requires a git repository" msgstr "--stdin 需要一个 git 仓库" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1753 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/init-db.c:54 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" -msgstr "不能枚举 '%s' 状态" +msgstr "不能对 '%s' 调用 stat" -#: builtin/init-db.c:60 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" -msgstr "不能枚举模版 '%s' 状态" +msgstr "不能对模版 '%s' 调用 stat" -#: builtin/init-db.c:65 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "不能打开目录 '%s'" -#: builtin/init-db.c:76 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "不能读取链接 '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 创建符号链接" -#: builtin/init-db.c:84 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" -#: builtin/init-db.c:119 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "模版未找到 %s" -#: builtin/init-db.c:134 +#: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:327 +#: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:330 +#: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:347 builtin/init-db.c:350 +#: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:457 +#: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -8942,32 +9292,32 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:515 builtin/init-db.c:520 +#: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:524 +#: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:545 +#: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" -#: builtin/init-db.c:573 +#: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -9000,112 +9350,112 @@ msgstr "要添加的签名" msgid "no input file given for in-place editing" msgstr "没有给出要原位编辑的文件" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git show [<options>] <object>..." msgstr "git show [<选项>] <对象>..." -#: builtin/log.c:84 +#: builtin/log.c:90 #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" -#: builtin/log.c:139 +#: builtin/log.c:147 msgid "suppress diff output" msgstr "不显示差异输出" -#: builtin/log.c:140 +#: builtin/log.c:148 msgid "show source" msgstr "显示源" -#: builtin/log.c:141 +#: builtin/log.c:149 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:142 +#: builtin/log.c:150 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:145 +#: builtin/log.c:153 msgid "Process line range n,m in file, counting from 1" msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" -#: builtin/log.c:241 +#: builtin/log.c:249 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:486 +#: builtin/log.c:497 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:500 builtin/log.c:594 +#: builtin/log.c:512 builtin/log.c:606 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:618 +#: builtin/log.c:630 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:739 +#: builtin/log.c:751 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:839 +#: builtin/log.c:852 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:854 +#: builtin/log.c:868 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:868 +#: builtin/log.c:885 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:878 +#: builtin/log.c:895 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:984 +#: builtin/log.c:1001 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:1063 +#: builtin/log.c:1081 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1091 +#: builtin/log.c:1108 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1141 +#: builtin/log.c:1158 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 +#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 +#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/log.c:1263 +#: builtin/log.c:1280 msgid "Could not find exact merge base." msgstr "不能找到准确的合并基线。" -#: builtin/log.c:1267 +#: builtin/log.c:1284 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -9115,315 +9465,320 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" "参数 --base=<base-commit-id> 手动指定一个基线提交。" -#: builtin/log.c:1287 +#: builtin/log.c:1304 msgid "Failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1298 +#: builtin/log.c:1315 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1302 +#: builtin/log.c:1319 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1351 +#: builtin/log.c:1368 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1408 +#: builtin/log.c:1425 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1411 +#: builtin/log.c:1428 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1415 +#: builtin/log.c:1432 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1417 +#: builtin/log.c:1434 msgid "generate a cover letter" msgstr "生成一封附信" -#: builtin/log.c:1419 +#: builtin/log.c:1436 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1420 +#: builtin/log.c:1437 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1421 +#: builtin/log.c:1438 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1423 +#: builtin/log.c:1440 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1425 +#: builtin/log.c:1442 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1427 +#: builtin/log.c:1444 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1430 +#: builtin/log.c:1447 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1433 +#: builtin/log.c:1450 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1436 +#: builtin/log.c:1453 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1439 +#: builtin/log.c:1456 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1441 +#: builtin/log.c:1458 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1443 +#: builtin/log.c:1460 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1445 +#: builtin/log.c:1462 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1447 +#: builtin/log.c:1464 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1448 +#: builtin/log.c:1465 msgid "header" msgstr "header" -#: builtin/log.c:1449 +#: builtin/log.c:1466 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1450 builtin/log.c:1452 +#: builtin/log.c:1467 builtin/log.c:1469 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1450 +#: builtin/log.c:1467 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1452 +#: builtin/log.c:1469 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1454 +#: builtin/log.c:1471 msgid "ident" msgstr "标识" -#: builtin/log.c:1455 +#: builtin/log.c:1472 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1457 +#: builtin/log.c:1474 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1458 +#: builtin/log.c:1475 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1459 builtin/log.c:1462 +#: builtin/log.c:1476 builtin/log.c:1479 msgid "boundary" msgstr "边界" -#: builtin/log.c:1460 +#: builtin/log.c:1477 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1463 +#: builtin/log.c:1480 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1467 +#: builtin/log.c:1484 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1469 +#: builtin/log.c:1486 msgid "signature" msgstr "签名" -#: builtin/log.c:1470 +#: builtin/log.c:1487 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1471 +#: builtin/log.c:1488 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1472 +#: builtin/log.c:1489 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1474 +#: builtin/log.c:1491 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1475 +#: builtin/log.c:1492 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1565 +#: builtin/log.c:1567 +#, c-format +msgid "invalid ident line: %s" +msgstr "包含无效的身份标识：%s" + +#: builtin/log.c:1582 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1567 +#: builtin/log.c:1584 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc 和 -k 互斥。" -#: builtin/log.c:1575 +#: builtin/log.c:1592 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1577 +#: builtin/log.c:1594 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1579 +#: builtin/log.c:1596 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1609 +#: builtin/log.c:1626 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1611 +#: builtin/log.c:1628 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1705 +#: builtin/log.c:1722 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:1777 +#: builtin/log.c:1794 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1826 +#: builtin/log.c:1843 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:1880 +#: builtin/log.c:1897 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:511 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:513 +#: builtin/ls-files.c:521 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:523 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:525 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:527 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:529 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:524 +#: builtin/ls-files.c:532 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:534 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:536 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:538 msgid "show line endings of files" msgstr "显示文件换行符格式" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:540 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:543 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:545 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:547 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:550 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:553 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:555 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:558 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:561 msgid "recurse through submodules" msgstr "在子模组中递归" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:563 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:564 msgid "tree-ish" msgstr "树或提交" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:565 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:567 msgid "show debugging data" msgstr "显示调试数据" @@ -9437,85 +9792,86 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<仓库> [<引用>...]]" -#: builtin/ls-remote.c:50 +#: builtin/ls-remote.c:52 msgid "do not print remote URL" msgstr "不打印远程 URL" -#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 msgid "exec" msgstr "exec" -#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 msgid "path of git-upload-pack on the remote host" msgstr "远程主机上的 git-upload-pack 路径" -#: builtin/ls-remote.c:56 +#: builtin/ls-remote.c:58 msgid "limit to tags" msgstr "仅限于标签" -#: builtin/ls-remote.c:57 +#: builtin/ls-remote.c:59 msgid "limit to heads" msgstr "仅限于分支" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:60 msgid "do not show peeled tags" msgstr "不显示已解析的标签" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:62 msgid "take url.<base>.insteadOf into account" msgstr "参考 url.<base>.insteadOf 设置" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:64 msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到匹配的引用则以退出码2退出" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:66 msgid "show underlying ref in addition to the object pointed by it" msgstr "除了显示指向的对象外，显示指向的引用名" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "只显示树" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "递归到子树" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "当递归时显示树" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "条目以 NUL 字符终止" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "包括对象大小" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "只列出文件名" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "使用文件的全路径" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" -#: builtin/merge.c:46 -msgid "git merge [<options>] [<commit>...]" -msgstr "git merge [<选项>] [<提交>...]" +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "空的 mbox：'%s'" #: builtin/merge.c:47 -msgid "git merge [<options>] <msg> HEAD <commit>" -msgstr "git merge [<选项>] <说明> HEAD <提交>" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<选项>] [<提交>...]" #: builtin/merge.c:48 msgid "git merge --abort" @@ -9544,31 +9900,31 @@ msgstr "可用的策略有：" msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:197 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:200 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:201 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:203 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:206 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:208 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:210 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:152 msgid "edit message before committing" msgstr "在提交前编辑提交说明" @@ -9576,28 +9932,28 @@ msgstr "在提交前编辑提交说明" msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:213 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:217 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 -#: builtin/revert.c:89 +#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/revert.c:109 msgid "strategy" msgstr "策略" -#: builtin/merge.c:219 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:166 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:220 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:169 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:221 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" @@ -9613,17 +9969,17 @@ msgstr "放弃当前正在进行的合并" msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c:231 builtin/pull.c:170 +#: builtin/merge.c:231 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" #: builtin/merge.c:259 msgid "could not run stash." -msgstr "不能进行进度保存。" +msgstr "不能运行贮藏。" #: builtin/merge.c:264 msgid "stash failed" -msgstr "进度保存失败" +msgstr "贮藏失败" #: builtin/merge.c:269 #, c-format @@ -9659,31 +10015,31 @@ msgstr "'%s' 没有指向一个提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:656 +#: builtin/merge.c:657 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c:670 +#: builtin/merge.c:671 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:685 +#: builtin/merge.c:686 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:737 +#: builtin/merge.c:738 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:746 +#: builtin/merge.c:747 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:752 +#: builtin/merge.c:753 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9697,78 +10053,68 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:776 +#: builtin/merge.c:777 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:796 +#: builtin/merge.c:797 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:851 +#: builtin/merge.c:850 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:867 -#, c-format -msgid "'%s' is not a commit" -msgstr "'%s' 不是一个提交" - -#: builtin/merge.c:908 +#: builtin/merge.c:889 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:910 +#: builtin/merge.c:891 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:912 +#: builtin/merge.c:893 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:917 +#: builtin/merge.c:898 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:964 +#: builtin/merge.c:945 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1038 -#, c-format -msgid "could not close '%s'" -msgstr "不能关闭 '%s'" - -#: builtin/merge.c:1065 +#: builtin/merge.c:1046 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c:1099 +#: builtin/merge.c:1080 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1167 +#: builtin/merge.c:1145 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1171 +#: builtin/merge.c:1149 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1183 +#: builtin/merge.c:1161 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1187 +#: builtin/merge.c:1165 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1203 +#: builtin/merge.c:1181 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9776,7 +10122,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1210 +#: builtin/merge.c:1188 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9784,157 +10130,157 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1213 +#: builtin/merge.c:1191 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1222 +#: builtin/merge.c:1200 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1230 +#: builtin/merge.c:1208 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1247 +#: builtin/merge.c:1225 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1249 +#: builtin/merge.c:1227 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1254 +#: builtin/merge.c:1232 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1256 +#: builtin/merge.c:1234 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1312 +#: builtin/merge.c:1268 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1315 +#: builtin/merge.c:1271 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1318 +#: builtin/merge.c:1274 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" -#: builtin/merge.c:1321 +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: builtin/merge.c:1383 +#: builtin/merge.c:1339 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1392 +#: builtin/merge.c:1348 msgid "Already up-to-date." msgstr "已经是最新的。" -#: builtin/merge.c:1402 +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1443 +#: builtin/merge.c:1399 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1406 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1431 msgid "Already up-to-date. Yeeah!" msgstr "已经是最新的。耶！" -#: builtin/merge.c:1481 +#: builtin/merge.c:1437 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1504 builtin/merge.c:1583 +#: builtin/merge.c:1460 builtin/merge.c:1539 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1508 +#: builtin/merge.c:1464 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1530 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1576 +#: builtin/merge.c:1532 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1541 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1553 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <提交> <提交>..." -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <提交>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <提交>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <提交> <提交>" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<提交>]" -#: builtin/merge-base.c:217 +#: builtin/merge-base.c:218 msgid "output all common ancestors" msgstr "输出所有共同的祖先" -#: builtin/merge-base.c:219 +#: builtin/merge-base.c:220 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路合并的祖先提交" -#: builtin/merge-base.c:221 +#: builtin/merge-base.c:222 msgid "list revs not reachable from others" msgstr "显示不能被其他访问到的版本" -#: builtin/merge-base.c:223 +#: builtin/merge-base.c:224 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先提交么？" -#: builtin/merge-base.c:225 +#: builtin/merge-base.c:226 msgid "find where <commit> forked from reflog of <ref>" msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" -#: builtin/merge-file.c:8 +#: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" @@ -10009,155 +10355,159 @@ msgstr "合并 %s 和 %s\n" msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:152 +#: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "输入以 NUL 字符终止" -#: builtin/mktree.c:153 builtin/write-tree.c:24 +#: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "允许丢失的对象" -#: builtin/mktree.c:154 +#: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" -#: builtin/mv.c:16 +#: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<选项>] <源>... <目标>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引中并且不是子模组？" -#: builtin/mv.c:84 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" +msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引中" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "强制移动/重命令，即使目标存在" -#: builtin/mv.c:125 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "目标 '%s' 不是一个目录" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "坏的源" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "不能将目录移动到文件" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "源目录为空" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "目标已存在" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "不能覆盖" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "目标目录不存在" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 +#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <提交>..." -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:340 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "只打印名称（无 SHA-1）" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:400 +msgid "ignore refs matching <pattern>" +msgstr "忽略和 <模式> 相匹配的引用" + +#: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:403 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" -#: builtin/name-rev.c:324 +#: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -10165,11 +10515,11 @@ msgstr "" "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " "| (-c | -C) <对象>] [<对象>]" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -10177,243 +10527,244 @@ msgstr "" "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " "(-c | -C) <对象>] [<对象>]" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <注解引用>] show [<对象>]" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <注解引用>] prune [-n | -v]" -#: builtin/notes.c:36 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" -#: builtin/notes.c:41 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" msgstr "git notes [list [<对象>]]" -#: builtin/notes.c:46 +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<选项>] [<对象>]" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<选项>] <源对象> <目标对象>" -#: builtin/notes.c:52 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<源对象> <目标对象>]..." -#: builtin/notes.c:57 +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<选项>] [<对象>]" -#: builtin/notes.c:62 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" msgstr "git notes edit [<对象>]" -#: builtin/notes.c:67 +#: builtin/notes.c:68 msgid "git notes show [<object>]" msgstr "git notes show [<对象>]" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<选项>] <注解引用>" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<选项>]" -#: builtin/notes.c:74 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<选项>]" -#: builtin/notes.c:79 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" msgstr "git notes remove [<对象>]" -#: builtin/notes.c:84 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" msgstr "git notes prune [<选项>]" -#: builtin/notes.c:89 +#: builtin/notes.c:90 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:94 +#: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "为下面的对象写/编辑说明：" -#: builtin/notes.c:147 +#: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: builtin/notes.c:151 +#: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" -#: builtin/notes.c:159 +#: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:194 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:203 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "不能写注解对象" -#: builtin/notes.c:205 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s 中" -#: builtin/notes.c:233 builtin/tag.c:460 +#: builtin/notes.c:234 builtin/tag.c:517 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:235 builtin/tag.c:463 +#: builtin/notes.c:236 builtin/tag.c:520 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 -#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 +#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c:257 +#: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c:261 +#: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "不能从非数据对象 '%s' 中读取注解数据。" -#: builtin/notes.c:301 +#: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/notes.c:316 +#: builtin/notes.c:317 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#. TRANSLATORS: the first %s will be replaced by a -#. git notes command: 'add', 'merge', 'remove', etc. -#: builtin/notes.c:345 +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. +#: builtin/notes.c:348 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解" -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 -#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 +#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 +#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 +#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:378 builtin/notes.c:665 +#: builtin/notes.c:381 builtin/notes.c:667 #, c-format msgid "no note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents as a string" msgstr "注解内容作为一个字符串" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents in a file" msgstr "注解内容到一个文件中" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse specified note object" msgstr "重用指定的注解对象" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "allow storing empty note" msgstr "允许保存空白注释" -#: builtin/notes.c:412 builtin/notes.c:483 +#: builtin/notes.c:415 builtin/notes.c:486 msgid "replace existing notes" msgstr "替换已存在的注解" -#: builtin/notes.c:437 +#: builtin/notes.c:440 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:452 builtin/notes.c:531 +#: builtin/notes.c:455 builtin/notes.c:534 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 +#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c:484 +#: builtin/notes.c:487 msgid "read objects from stdin" msgstr "从标准输入读取对象" -#: builtin/notes.c:486 +#: builtin/notes.c:489 msgid "load rewriting config for <command> (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c:504 +#: builtin/notes.c:507 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:525 +#: builtin/notes.c:528 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:537 +#: builtin/notes.c:540 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:589 +#: builtin/notes.c:592 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10422,97 +10773,97 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:685 +#: builtin/notes.c:687 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "无法删除引用 NOTES_MERGE_PARTIAL" -#: builtin/notes.c:687 +#: builtin/notes.c:689 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "无法删除引用 NOTES_MERGE_REF" -#: builtin/notes.c:689 +#: builtin/notes.c:691 msgid "failed to remove 'git notes merge' worktree" msgstr "无法删除 'git notes merge' 工作区" -#: builtin/notes.c:709 +#: builtin/notes.c:711 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "无法读取引用 NOTES_MERGE_PARTIAL" -#: builtin/notes.c:711 +#: builtin/notes.c:713 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" -#: builtin/notes.c:713 +#: builtin/notes.c:715 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" -#: builtin/notes.c:726 +#: builtin/notes.c:728 msgid "failed to resolve NOTES_MERGE_REF" msgstr "无法解析 NOTES_MERGE_REF" -#: builtin/notes.c:729 +#: builtin/notes.c:731 msgid "failed to finalize notes merge" msgstr "无法完成注解合并" -#: builtin/notes.c:755 +#: builtin/notes.c:757 #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的注解合并策略 %s" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c:783 +#: builtin/notes.c:785 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c:794 +#: builtin/notes.c:796 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "不能混用 --commit、--abort 或 -s/--strategy" -#: builtin/notes.c:799 +#: builtin/notes.c:801 msgid "must specify a notes ref to merge" msgstr "必须指定一个注解引用来合并" -#: builtin/notes.c:823 +#: builtin/notes.c:825 #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" -#: builtin/notes.c:860 +#: builtin/notes.c:862 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "无法存储链接到当前的注解引用（%s）" -#: builtin/notes.c:865 +#: builtin/notes.c:867 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10522,218 +10873,218 @@ msgstr "" "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" -#: builtin/notes.c:887 +#: builtin/notes.c:889 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:899 +#: builtin/notes.c:901 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:902 +#: builtin/notes.c:904 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/notes.c:941 +#: builtin/notes.c:943 msgid "report pruned notes" msgstr "报告清除的注解" -#: builtin/notes.c:983 +#: builtin/notes.c:985 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:984 +#: builtin/notes.c:986 msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1019 +#: builtin/notes.c:1021 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:776 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:789 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1068 +#: builtin/pack-objects.c:1069 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:2344 +#: builtin/pack-objects.c:2434 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2747 +#: builtin/pack-objects.c:2843 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2847 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2877 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2879 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2785 +#: builtin/pack-objects.c:2881 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2788 +#: builtin/pack-objects.c:2884 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2789 +#: builtin/pack-objects.c:2885 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2790 +#: builtin/pack-objects.c:2886 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2889 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2891 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2893 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2799 +#: builtin/pack-objects.c:2895 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2897 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2803 +#: builtin/pack-objects.c:2899 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2901 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2903 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2905 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2907 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2909 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2911 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2913 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2820 +#: builtin/pack-objects.c:2916 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2919 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2826 +#: builtin/pack-objects.c:2922 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2925 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2831 +#: builtin/pack-objects.c:2927 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2929 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2931 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:2837 +#: builtin/pack-objects.c:2933 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2840 +#: builtin/pack-objects.c:2936 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2842 +#: builtin/pack-objects.c:2938 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:2844 +#: builtin/pack-objects.c:2940 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2942 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2848 +#: builtin/pack-objects.c:2944 msgid "do not hide commits by grafts" msgstr "显示被嫁接隐藏的提交" -#: builtin/pack-objects.c:2850 +#: builtin/pack-objects.c:2946 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2948 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3075 msgid "Counting objects" msgstr "对象计数中" @@ -10773,62 +11124,66 @@ msgstr "使早于给定时间的对象过期" msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品仓库中执行清理操作" -#: builtin/pull.c:51 builtin/pull.c:53 +#: builtin/pull.c:54 builtin/pull.c:56 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: builtin/pull.c:73 +#: builtin/pull.c:76 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/pull.c:121 +#: builtin/pull.c:124 +msgid "control for recursive fetching of submodules" +msgstr "控制子模组的递归获取" + +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "和合并相关的选项" -#: builtin/pull.c:124 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" msgstr "使用变基操作取代合并操作以合入修改" -#: builtin/pull.c:148 builtin/revert.c:101 +#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/pull.c:157 +#: builtin/pull.c:164 msgid "automatically stash/stash pop before and after rebase" -msgstr "自动在变基操作前后执行 stash/stash pop" +msgstr "变基操作前后执行自动贮藏和弹出贮藏" -#: builtin/pull.c:173 +#: builtin/pull.c:180 msgid "Options related to fetching" msgstr "和获取相关的参数" -#: builtin/pull.c:195 +#: builtin/pull.c:198 msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" -#: builtin/pull.c:284 +#: builtin/pull.c:287 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值无效：%s" -#: builtin/pull.c:397 +#: builtin/pull.c:399 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获取到的引用中没有变基操作的候选。" -#: builtin/pull.c:399 +#: builtin/pull.c:401 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获取到的引用中没有合并操作的候选。" -#: builtin/pull.c:400 +#: builtin/pull.c:402 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" -#: builtin/pull.c:403 +#: builtin/pull.c:405 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10838,42 +11193,42 @@ msgstr "" "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n" "分支默认的远程仓库，您必须在命令行中指定一个分支名。" -#: builtin/pull.c:408 git-parse-remote.sh:73 +#: builtin/pull.c:410 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当前不在一个分支上。" -#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您要变基到哪一个分支。" -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 +#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您要合并哪一个分支。" -#: builtin/pull.c:413 builtin/pull.c:428 +#: builtin/pull.c:415 builtin/pull.c:430 msgid "See git-pull(1) for details." msgstr "详见 git-pull(1)。" -#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 +#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:423 git-parse-remote.sh:75 +#: builtin/pull.c:425 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当前分支没有跟踪信息。" -#: builtin/pull.c:432 git-parse-remote.sh:95 +#: builtin/pull.c:434 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要为此分支创建跟踪信息，您可以执行：" -#: builtin/pull.c:437 +#: builtin/pull.c:439 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -10882,27 +11237,27 @@ msgstr "" "您的配置中指定要合并远程的引用 '%s'，\n" "但是没有获取到这个引用。" -#: builtin/pull.c:754 +#: builtin/pull.c:792 msgid "ignoring --verify-signatures for rebase" msgstr "为变基操作忽略 --verify-signatures" -#: builtin/pull.c:801 +#: builtin/pull.c:840 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" -#: builtin/pull.c:809 +#: builtin/pull.c:848 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:812 +#: builtin/pull.c:851 msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c:813 +#: builtin/pull.c:852 msgid "please commit or stash them." -msgstr "请提交或为它们保存进度。" +msgstr "请提交或贮藏它们。" -#: builtin/pull.c:838 +#: builtin/pull.c:877 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10912,7 +11267,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:843 +#: builtin/pull.c:882 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10929,27 +11284,31 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:858 +#: builtin/pull.c:897 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:862 +#: builtin/pull.c:901 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" -#: builtin/push.c:16 +#: builtin/pull.c:908 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "本地子模组中有修改，无法变基" + +#: builtin/push.c:17 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/push.c:89 +#: builtin/push.c:90 msgid "tag shorthand without <tag>" msgstr "标签后面未提供 <标签> 参数" -#: builtin/push.c:99 +#: builtin/push.c:100 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受简单的目标引用名" -#: builtin/push.c:143 +#: builtin/push.c:144 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -10957,7 +11316,7 @@ msgstr "" "\n" "为了永久地选择任一选项，参见 'git help config' 中的 push.default。" -#: builtin/push.c:146 +#: builtin/push.c:147 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -10981,7 +11340,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:161 +#: builtin/push.c:162 #, c-format msgid "" "You are not currently on a branch.\n" @@ -10995,7 +11354,7 @@ msgstr "" "\n" " git push %s HEAD:<远程分支名字>\n" -#: builtin/push.c:175 +#: builtin/push.c:176 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11008,12 +11367,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:183 +#: builtin/push.c:184 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:186 +#: builtin/push.c:187 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11023,12 +11382,12 @@ msgstr "" "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n" "而没有告诉我要推送什么、更新哪个远程分支。" -#: builtin/push.c:245 +#: builtin/push.c:246 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:252 +#: builtin/push.c:253 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11039,7 +11398,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:258 +#: builtin/push.c:259 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11050,7 +11409,7 @@ msgstr "" "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:264 +#: builtin/push.c:265 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11063,11 +11422,11 @@ msgstr "" "（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:271 +#: builtin/push.c:272 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒绝，因为该标签在远程已经存在。" -#: builtin/push.c:274 +#: builtin/push.c:275 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -11076,22 +11435,22 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:334 +#: builtin/push.c:335 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:338 +#: builtin/push.c:339 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:369 +#: builtin/push.c:370 #, c-format msgid "bad repository '%s'" msgstr "坏的仓库 '%s'" -#: builtin/push.c:370 +#: builtin/push.c:371 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11112,116 +11471,116 @@ msgstr "" "\n" " git push <名称>\n" -#: builtin/push.c:388 +#: builtin/push.c:389 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:389 +#: builtin/push.c:390 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规格同时使用" -#: builtin/push.c:394 +#: builtin/push.c:395 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:395 +#: builtin/push.c:396 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规格同时使用" -#: builtin/push.c:400 +#: builtin/push.c:401 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:518 +#: builtin/push.c:523 msgid "repository" msgstr "仓库" -#: builtin/push.c:519 builtin/send-pack.c:161 +#: builtin/push.c:524 builtin/send-pack.c:163 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:520 builtin/send-pack.c:163 +#: builtin/push.c:525 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:522 +#: builtin/push.c:527 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:523 +#: builtin/push.c:528 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送标签（不能使用 --all or --mirror）" -#: builtin/push.c:526 builtin/send-pack.c:164 +#: builtin/push.c:531 builtin/send-pack.c:166 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:528 builtin/send-pack.c:175 +#: builtin/push.c:533 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "引用名>:<期望值" -#: builtin/push.c:529 builtin/send-pack.c:176 +#: builtin/push.c:534 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:532 +#: builtin/push.c:537 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:534 builtin/send-pack.c:169 +#: builtin/push.c:539 builtin/send-pack.c:174 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 -#: builtin/send-pack.c:159 +#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:537 +#: builtin/push.c:542 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:540 +#: builtin/push.c:545 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:542 +#: builtin/push.c:547 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:543 +#: builtin/push.c:548 msgid "push missing but relevant tags" msgstr "推送缺失但有关的标签" -#: builtin/push.c:546 builtin/send-pack.c:166 +#: builtin/push.c:551 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "用 GPG 为推送签名" -#: builtin/push.c:548 builtin/send-pack.c:170 +#: builtin/push.c:553 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "需要远端支持原子事务" -#: builtin/push.c:549 +#: builtin/push.c:554 builtin/send-pack.c:171 msgid "server-specific" msgstr "server-specific" -#: builtin/push.c:549 +#: builtin/push.c:554 builtin/send-pack.c:172 msgid "option to transmit" msgstr "传输选项" -#: builtin/push.c:563 +#: builtin/push.c:568 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:565 +#: builtin/push.c:570 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/push.c:584 +#: builtin/push.c:589 msgid "push options must not have new line characters" msgstr "推送选项不能有换行符" -#: builtin/read-tree.c:37 +#: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -11231,75 +11590,87 @@ msgstr "" "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" -#: builtin/read-tree.c:110 +#: builtin/read-tree.c:121 msgid "write resulting index to <file>" msgstr "将索引结果写入 <文件>" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:124 msgid "only empty the index" msgstr "只是清空索引" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:126 msgid "Merging" msgstr "合并" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:128 msgid "perform a merge in addition to a read" msgstr "读取之余再执行一个合并" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:130 msgid "3-way merge if no file level merging required" msgstr "如果没有文件级合并需要，执行三方合并" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:132 msgid "3-way merge in presence of adds and removes" msgstr "存在添加和删除时，也执行三方合并" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:134 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m，但丢弃未合并的条目" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:135 msgid "<subdirectory>/" msgstr "<子目录>/" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c:136 msgid "read the tree into the index under <subdirectory>/" msgstr "读取树对象到索引的 <子目录>/ 下" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:139 msgid "update working tree with merge result" msgstr "用合并的结果更新工作区" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:141 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:142 msgid "allow explicitly ignored files to be overwritten" msgstr "允许忽略文件中设定的文件可以被覆盖" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:145 msgid "don't check the working tree after merging" msgstr "合并后不检查工作区" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:146 msgid "don't update the index or the work tree" msgstr "不更新索引区和工作区" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:148 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀疏检出过滤器" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:150 msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/receive-pack.c:26 +#: builtin/rebase--helper.c:8 +msgid "git rebase--helper [<options>]" +msgstr "git rebase--helper [<选项>]" + +#: builtin/rebase--helper.c:20 +msgid "continue rebase" +msgstr "继续变基" + +#: builtin/rebase--helper.c:22 +msgid "abort rebase" +msgstr "中止变基" + +#: builtin/receive-pack.c:28 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:793 +#: builtin/receive-pack.c:838 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -11325,7 +11696,7 @@ msgstr "" "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n" "配置变量为 'refuse'。" -#: builtin/receive-pack.c:813 +#: builtin/receive-pack.c:858 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -11344,29 +11715,29 @@ msgstr "" "\n" "若要屏蔽此信息，您可以设置它为 'refuse'。" -#: builtin/receive-pack.c:1883 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:1897 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "您必须指定一个目录。" -#: builtin/reflog.c:423 +#: builtin/reflog.c:424 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:541 builtin/reflog.c:546 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一个有效的时间戳" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11374,81 +11745,81 @@ msgstr "" "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <名称> <地址>" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:15 builtin/remote.c:35 msgid "git remote rename <old> <new>" msgstr "git remote rename <旧名称> <新名称>" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:16 builtin/remote.c:40 msgid "git remote remove <name>" msgstr "git remote remove <名称>" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:17 builtin/remote.c:45 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <名称>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <名称>" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <名称> <分支>..." -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:22 builtin/remote.c:71 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <名称>" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <名称> <新的地址>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <名称> <地址>" -#: builtin/remote.c:29 +#: builtin/remote.c:30 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <名称> <地址>" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <名称> <分支>..." -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <名称> <分支>..." -#: builtin/remote.c:55 +#: builtin/remote.c:56 msgid "git remote show [<options>] <name>" msgstr "git remote show [<选项>] <名称>" -#: builtin/remote.c:60 +#: builtin/remote.c:61 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<选项>] <名称>" -#: builtin/remote.c:65 +#: builtin/remote.c:66 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<选项>] [<组> | <远程>]..." -#: builtin/remote.c:94 +#: builtin/remote.c:95 #, c-format msgid "Updating %s" msgstr "更新 %s 中" -#: builtin/remote.c:126 +#: builtin/remote.c:127 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -11456,86 +11827,86 @@ msgstr "" "--mirror 选项危险且过时，请使用 --mirror=fetch\n" "\t 或 --mirror=push" -#: builtin/remote.c:143 +#: builtin/remote.c:144 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜像参数：%s" -#: builtin/remote.c:159 +#: builtin/remote.c:160 msgid "fetch the remote branches" msgstr "抓取远程的分支" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "import all tags and associated objects when fetching" msgstr "抓取时导入所有的标签和关联对象" -#: builtin/remote.c:164 +#: builtin/remote.c:165 msgid "or do not fetch any tag at all (--no-tags)" msgstr "或不抓取任何标签（--no-tags）" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "branch(es) to track" msgstr "跟踪的分支" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "master branch" msgstr "主线分支" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "set up remote as a mirror to push to or fetch from" msgstr "把远程设置为用以推送或抓取的镜像" -#: builtin/remote.c:181 +#: builtin/remote.c:182 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" -#: builtin/remote.c:190 builtin/remote.c:629 +#: builtin/remote.c:191 builtin/remote.c:630 #, c-format msgid "remote %s already exists." msgstr "远程 %s 已经存在。" -#: builtin/remote.c:194 builtin/remote.c:633 +#: builtin/remote.c:195 builtin/remote.c:634 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" -#: builtin/remote.c:234 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "无法设置 master '%s'" -#: builtin/remote.c:336 +#: builtin/remote.c:337 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "无法得到引用规格 %s 的获取列表" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:438 builtin/remote.c:446 msgid "(matching)" msgstr "（匹配）" -#: builtin/remote.c:449 +#: builtin/remote.c:450 msgid "(delete)" msgstr "（删除）" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 +#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 #, c-format msgid "No such remote: %s" msgstr "没有这样的远程：%s" -#: builtin/remote.c:639 +#: builtin/remote.c:640 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重命名配置小节 '%s' 到 '%s'" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11546,17 +11917,17 @@ msgstr "" "\t%s\n" "\t如果必要请手动更新配置。" -#: builtin/remote.c:695 +#: builtin/remote.c:696 #, c-format msgid "deleting '%s' failed" msgstr "删除 '%s' 失败" -#: builtin/remote.c:729 +#: builtin/remote.c:730 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" -#: builtin/remote.c:792 +#: builtin/remote.c:795 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11566,144 +11937,146 @@ msgid_plural "" msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" -#: builtin/remote.c:806 +#: builtin/remote.c:809 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除配置小节 '%s'" -#: builtin/remote.c:907 +#: builtin/remote.c:910 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次获取将存储于 remotes/%s）" -#: builtin/remote.c:910 +#: builtin/remote.c:913 msgid " tracked" msgstr " 已跟踪" -#: builtin/remote.c:912 +#: builtin/remote.c:915 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' 来移除）" -#: builtin/remote.c:914 +#: builtin/remote.c:917 msgid " ???" msgstr " ???" -#: builtin/remote.c:955 +#: builtin/remote.c:958 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" -#: builtin/remote.c:963 +#: builtin/remote.c:966 #, c-format msgid "rebases interactively onto remote %s" msgstr "交互式变基到远程 %s" -#: builtin/remote.c:964 +#: builtin/remote.c:967 #, c-format msgid "rebases onto remote %s" msgstr "变基到远程 %s" -#: builtin/remote.c:967 +#: builtin/remote.c:970 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s 合并" -#: builtin/remote.c:970 +#: builtin/remote.c:973 #, c-format msgid "merges with remote %s" msgstr "与远程 %s 合并" -#: builtin/remote.c:973 +#: builtin/remote.c:976 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以及和远程 %s\n" -#: builtin/remote.c:1016 +#: builtin/remote.c:1019 msgid "create" msgstr "创建" -#: builtin/remote.c:1019 +#: builtin/remote.c:1022 msgid "delete" msgstr "删除" -#: builtin/remote.c:1023 +#: builtin/remote.c:1026 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1026 +#: builtin/remote.c:1029 msgid "fast-forwardable" msgstr "可快进" -#: builtin/remote.c:1029 +#: builtin/remote.c:1032 msgid "local out of date" msgstr "本地已过时" -#: builtin/remote.c:1036 +#: builtin/remote.c:1039 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推送至 %-*s (%s)" -#: builtin/remote.c:1039 +#: builtin/remote.c:1042 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1046 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推送至 %s" -#: builtin/remote.c:1046 +#: builtin/remote.c:1049 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1114 +#: builtin/remote.c:1117 msgid "do not query remotes" msgstr "不查询远程" -#: builtin/remote.c:1141 +#: builtin/remote.c:1144 #, c-format msgid "* remote %s" msgstr "* 远程 %s" -#: builtin/remote.c:1142 +#: builtin/remote.c:1145 #, c-format msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 +#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 msgid "(no URL)" msgstr "(无 URL)" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1154 builtin/remote.c:1156 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " Push URL: %s" msgstr " 推送地址：%s" -#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1158 +#: builtin/remote.c:1164 msgid "(not queried)" msgstr "（未查询）" -#: builtin/remote.c:1160 +#: builtin/remote.c:1166 msgid "(unknown)" msgstr "（未知）" -#: builtin/remote.c:1164 +#: builtin/remote.c:1170 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" -#: builtin/remote.c:1176 +#: builtin/remote.c:1182 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -11711,164 +12084,164 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1179 builtin/remote.c:1205 +#: builtin/remote.c:1185 builtin/remote.c:1211 msgid " (status not queried)" msgstr "（状态未查询）" -#: builtin/remote.c:1188 +#: builtin/remote.c:1194 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 为 'git pull' 配置的本地分支：" msgstr[1] " 为 'git pull' 配置的本地分支：" -#: builtin/remote.c:1196 +#: builtin/remote.c:1202 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1202 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s：" msgstr[1] " 为 'git push' 配置的本地引用%s：" -#: builtin/remote.c:1223 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1225 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1240 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1242 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1252 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1260 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1280 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1281 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为摇摆状态！" -#: builtin/remote.c:1291 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1292 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1308 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1356 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1435 +#: builtin/remote.c:1441 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1442 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1459 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "查询推送 URL 地址，而非获取 URL 地址" -#: builtin/remote.c:1461 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "返回所有 URL 地址" -#: builtin/remote.c:1489 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "没有给远程仓库 '%s' 设定 URL" -#: builtin/remote.c:1515 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1517 +#: builtin/remote.c:1523 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1519 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1526 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1567 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧 URL 匹配模版：%s" -#: builtin/remote.c:1575 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送 URL 地址" -#: builtin/remote.c:1591 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" -#: builtin/remote.c:1622 +#: builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/repack.c:17 +#: builtin/repack.c:18 msgid "git repack [<options>]" msgstr "git repack [<选项>]" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -11876,328 +12249,332 @@ msgstr "" "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" "或禁用 pack.writebitmaps 配置。" -#: builtin/repack.c:166 +#: builtin/repack.c:168 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，并将不可达的对象设为松散对象" -#: builtin/repack.c:171 +#: builtin/repack.c:173 msgid "remove redundant packs, and run git-prune-packed" msgstr "删除多余的包，运行 git-prune-packed" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-object" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "do not run git-update-server-info" msgstr "不运行 git-update-server-info" -#: builtin/repack.c:180 +#: builtin/repack.c:182 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --local" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "write bitmap index" msgstr "写 bitmap 索引" -#: builtin/repack.c:183 +#: builtin/repack.c:185 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要将早于给定时间的对象过期" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新对不可达对象打包" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "size of the window used for delta compression" msgstr "用于增量压缩的窗口值" -#: builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:191 builtin/repack.c:197 msgid "bytes" msgstr "字节" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制内存大小而非条目数" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:194 +#: builtin/repack.c:196 +msgid "limits the maximum number of threads" +msgstr "限制最大线程数" + +#: builtin/repack.c:198 msgid "maximum size of each packfile" msgstr "每个包文件的最大尺寸" -#: builtin/repack.c:196 +#: builtin/repack.c:200 msgid "repack objects in packs marked with .keep" msgstr "对标记为 .keep 的包中的对象重新打包" -#: builtin/repack.c:206 +#: builtin/repack.c:210 msgid "cannot delete packs in a precious-objects repo" msgstr "不能删除珍品仓库中的打包文件" -#: builtin/repack.c:210 +#: builtin/repack.c:214 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不兼容" -#: builtin/repack.c:400 builtin/worktree.c:115 +#: builtin/repack.c:406 builtin/worktree.c:116 #, c-format msgid "failed to remove '%s'" msgstr "无法删除 '%s'" -#: builtin/replace.c:19 +#: builtin/replace.c:20 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <对象> <替换物>" -#: builtin/replace.c:20 +#: builtin/replace.c:21 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <对象>" -#: builtin/replace.c:21 +#: builtin/replace.c:22 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <提交> [<父提交>...]" -#: builtin/replace.c:22 +#: builtin/replace.c:23 msgid "git replace -d <object>..." msgstr "git replace -d <对象>..." -#: builtin/replace.c:23 +#: builtin/replace.c:24 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<格式>] [-l [<模式>]]" -#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 #, c-format msgid "Not a valid object name: '%s'" msgstr "不是一个有效的对象名：'%s'" -#: builtin/replace.c:355 +#: builtin/replace.c:361 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有损坏的合并标签" -#: builtin/replace.c:357 +#: builtin/replace.c:363 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有非法的合并标签" -#: builtin/replace.c:368 +#: builtin/replace.c:374 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:401 +#: builtin/replace.c:407 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "原始提交 '%s' 中包含一个 GPG 签名" -#: builtin/replace.c:402 +#: builtin/replace.c:408 msgid "the signature will be removed in the replacement commit!" msgstr "在替换的提交中签名将被移除！" -#: builtin/replace.c:408 +#: builtin/replace.c:414 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能为 '%s' 写替换提交" -#: builtin/replace.c:432 +#: builtin/replace.c:438 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:433 +#: builtin/replace.c:439 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:434 +#: builtin/replace.c:440 msgid "edit existing object" msgstr "编辑现存的对象" -#: builtin/replace.c:435 +#: builtin/replace.c:441 msgid "change a commit's parents" msgstr "修改一个提交的父提交" -#: builtin/replace.c:436 +#: builtin/replace.c:442 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" -#: builtin/replace.c:437 +#: builtin/replace.c:443 msgid "do not pretty-print contents for --edit" msgstr "不要为 --edit 操作美观显示内容" -#: builtin/replace.c:438 +#: builtin/replace.c:444 msgid "use this format" msgstr "使用此格式" -#: builtin/rerere.c:12 +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "在索引中注册干净的解决方案" -#: builtin/reset.c:26 +#: builtin/reset.c:29 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" -#: builtin/reset.c:27 +#: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<树或提交>] [--] <路径>..." -#: builtin/reset.c:28 +#: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "mixed" msgstr "混杂" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "soft" msgstr "软性" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "hard" msgstr "硬性" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "merge" msgstr "合并" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "keep" msgstr "保持" -#: builtin/reset.c:74 +#: builtin/reset.c:77 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:76 +#: builtin/reset.c:79 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:82 +#: builtin/reset.c:85 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:100 +#: builtin/reset.c:103 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:183 +#: builtin/reset.c:186 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:276 +#: builtin/reset.c:286 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:278 +#: builtin/reset.c:288 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:279 +#: builtin/reset.c:289 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:291 builtin/reset.c:293 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:285 +#: builtin/reset.c:295 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:288 +#: builtin/reset.c:301 msgid "record only the fact that removed paths will be added later" msgstr "将删除的路径标记为稍后添加" -#: builtin/reset.c:305 +#: builtin/reset.c:320 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:313 +#: builtin/reset.c:328 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:322 +#: builtin/reset.c:337 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:331 +#: builtin/reset.c:346 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:333 +#: builtin/reset.c:348 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:343 +#: builtin/reset.c:358 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对纯仓库进行%s重置" -#: builtin/reset.c:347 +#: builtin/reset.c:362 msgid "-N can only be used with --mixed" msgstr "-N 只能和 --mixed 同时使用" -#: builtin/reset.c:364 +#: builtin/reset.c:379 msgid "Unstaged changes after reset:" msgstr "重置后取消暂存的变更：" -#: builtin/reset.c:370 +#: builtin/reset.c:385 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:374 +#: builtin/reset.c:389 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:358 msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:394 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:399 msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作为一个参数传递" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:401 msgid "stop parsing after the first non-option argument" msgstr "遇到第一个非选项参数后停止解析" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:404 msgid "output in stuck long form" msgstr "以固定长格式输出" -#: builtin/rev-parse.c:532 +#: builtin/rev-parse.c:535 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12211,92 +12588,96 @@ msgstr "" "\n" "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" -#: builtin/revert.c:22 +#: builtin/revert.c:23 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<选项>] <提交号>..." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert <subcommand>" msgstr "git revert <子命令>" -#: builtin/revert.c:28 +#: builtin/revert.c:29 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<选项>] <提交号>..." -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <子命令>" -#: builtin/revert.c:71 +#: builtin/revert.c:90 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s：%s 不能和 %s 同时使用" -#: builtin/revert.c:80 +#: builtin/revert.c:99 msgid "end revert or cherry-pick sequence" msgstr "终止反转或拣选操作" -#: builtin/revert.c:81 +#: builtin/revert.c:100 msgid "resume revert or cherry-pick sequence" msgstr "继续反转或拣选操作" -#: builtin/revert.c:82 +#: builtin/revert.c:101 msgid "cancel revert or cherry-pick sequence" msgstr "取消反转或拣选操作" -#: builtin/revert.c:83 +#: builtin/revert.c:102 msgid "don't automatically commit" msgstr "不要自动提交" -#: builtin/revert.c:84 +#: builtin/revert.c:103 msgid "edit the commit message" msgstr "编辑提交说明" -#: builtin/revert.c:87 -msgid "parent number" +#: builtin/revert.c:106 +msgid "parent-number" msgstr "父编号" -#: builtin/revert.c:89 +#: builtin/revert.c:107 +msgid "select mainline parent" +msgstr "选择主干父提交编号" + +#: builtin/revert.c:109 msgid "merge strategy" msgstr "合并策略" -#: builtin/revert.c:90 +#: builtin/revert.c:110 msgid "option" msgstr "选项" -#: builtin/revert.c:91 +#: builtin/revert.c:111 msgid "option for merge strategy" msgstr "合并策略的选项" -#: builtin/revert.c:100 +#: builtin/revert.c:120 msgid "append commit name" msgstr "追加提交名称" -#: builtin/revert.c:102 +#: builtin/revert.c:122 msgid "preserve initially empty commits" msgstr "保留初始化的空提交" -#: builtin/revert.c:103 +#: builtin/revert.c:123 msgid "allow commits with empty messages" msgstr "允许提交说明为空" -#: builtin/revert.c:104 +#: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "保持多余的、空的提交" -#: builtin/revert.c:192 +#: builtin/revert.c:212 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:205 +#: builtin/revert.c:225 msgid "cherry-pick failed" msgstr "拣选失败" -#: builtin/rm.c:17 +#: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<选项>] [--] <文件>..." -#: builtin/rm.c:205 +#: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -12306,7 +12687,7 @@ msgid_plural "" msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" -#: builtin/rm.c:210 +#: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" @@ -12314,13 +12695,13 @@ msgstr "" "\n" "（使用 -f 强制删除）" -#: builtin/rm.c:214 +#: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "下列文件索引中有变更" msgstr[1] "下列文件索引中有变更" -#: builtin/rm.c:218 builtin/rm.c:227 +#: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -12328,29 +12709,29 @@ msgstr "" "\n" "（使用 --cached 保留本地文件，或用 -f 强制删除）" -#: builtin/rm.c:224 +#: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下文件有本地修改：" msgstr[1] "如下文件有本地修改：" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "不列出删除的文件" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "只从索引区删除" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "忽略文件更新状态检查" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "允许递归删除" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "即使没有匹配，也以零状态退出" @@ -12369,7 +12750,7 @@ msgstr "git rm：不能删除 %s" msgid "could not remove '%s'" msgstr "无法删除 '%s'" -#: builtin/send-pack.c:18 +#: builtin/send-pack.c:19 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -12380,23 +12761,23 @@ msgstr "" "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" " --all 和明确的 <引用> 互斥。" -#: builtin/send-pack.c:160 +#: builtin/send-pack.c:162 msgid "remote name" msgstr "远程名称" -#: builtin/send-pack.c:171 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "使用无状态的 RPC 协议" -#: builtin/send-pack.c:172 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "从标准输入读取引用" -#: builtin/send-pack.c:173 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "打印来自远程 helper 的状态" -#: builtin/shortlog.c:13 +#: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" @@ -12424,7 +12805,7 @@ msgstr "w[,i1[,i2]]" msgid "Linewrap output" msgstr "折行输出" -#: builtin/show-branch.c:10 +#: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -12436,124 +12817,124 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" -#: builtin/show-branch.c:375 +#: builtin/show-branch.c:376 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "忽略 %s，无法处理 %d 个以上的引用" msgstr[1] "忽略 %s，无法处理 %d 个以上的引用" -#: builtin/show-branch.c:541 +#: builtin/show-branch.c:530 #, c-format msgid "no matching refs with %s" msgstr "没有和 %s 匹配的引用" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:626 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:628 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:630 msgid "color '*!+-' corresponding to the branch" msgstr "着色 '*!+-' 到相应的分支" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:632 msgid "show <n> more commits after the common ancestor" msgstr "显示共同祖先后的 <n> 个提交" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:634 msgid "synonym to more=-1" msgstr "和 more=-1 同义" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:635 msgid "suppress naming strings" msgstr "不显示字符串命名" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:637 msgid "include the current branch" msgstr "包括当前分支" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:639 msgid "name commits with their object names" msgstr "以对象名字命名提交" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:641 msgid "show possible merge bases" msgstr "显示可能合并的基线" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:643 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:645 msgid "show commits in topological order" msgstr "以拓扑顺序显示提交" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:648 msgid "show only commits not on the first branch" msgstr "只显示不在第一个分支上的提交" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:650 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支可访问的合并提交" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:652 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方式排序，并尽可能地保持日期顺序" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:655 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" -#: builtin/show-branch.c:703 +#: builtin/show-branch.c:690 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" -#: builtin/show-branch.c:727 +#: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" msgstr "未提供分支，且 HEAD 无效" -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:717 msgid "--reflog option needs one branch name" msgstr "选项 --reflog 需要一个分支名" -#: builtin/show-branch.c:733 +#: builtin/show-branch.c:720 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "一次只能显示 %d 个条目。" msgstr[1] "一次只能显示 %d 个条目。" -#: builtin/show-branch.c:737 +#: builtin/show-branch.c:724 #, c-format msgid "no such ref %s" msgstr "无此引用 %s" -#: builtin/show-branch.c:829 +#: builtin/show-branch.c:808 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "不能处理 %d 个以上的版本。" msgstr[1] "不能处理 %d 个以上的版本。" -#: builtin/show-branch.c:833 +#: builtin/show-branch.c:812 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' 不是一个有效的引用。" -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:815 #, c-format msgid "cannot find commit %s (%s)" msgstr "不能找到提交 %s（%s）" @@ -12602,124 +12983,131 @@ msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" -#: builtin/stripspace.c:17 +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "跳过和移除所有的注释行" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "为每一行的行首添加注释符和空格" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 +#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "没有这样的引用：%s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 +#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用名称，却得到 %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:72 #, c-format msgid "cannot strip one component off url '%s'" msgstr "无法从 url '%s' 剥离一个组件" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记（anchor）" -#: builtin/submodule--helper.c:287 +#: builtin/submodule--helper.c:310 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:395 +#, c-format +msgid "" +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" + +#: builtin/submodule--helper.c:406 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "无法为子模组 '%s' 注册 url" -#: builtin/submodule--helper.c:377 +#: builtin/submodule--helper.c:410 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" # -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:420 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建议子模组 '%s' 使用命令更新模式\n" -#: builtin/submodule--helper.c:394 +#: builtin/submodule--helper.c:427 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "无法为子模组 '%s' 注册更新模式" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:443 msgid "Suppress output for initializing a submodule" msgstr "初始化子模组时抑制输出" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:448 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<路径>]" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:476 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路径>" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:482 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" -#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模组 '%s' 不能添加仓库备选：%s" -#: builtin/submodule--helper.c:564 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:571 +#: builtin/submodule--helper.c:611 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" -#: builtin/submodule--helper.c:595 +#: builtin/submodule--helper.c:633 msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" -#: builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:636 msgid "name of the new submodule" msgstr "新子模组的名称" -#: builtin/submodule--helper.c:601 +#: builtin/submodule--helper.c:639 msgid "url where to clone the submodule from" msgstr "克隆子模组的 url 地址" -#: builtin/submodule--helper.c:607 +#: builtin/submodule--helper.c:645 msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 +#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 msgid "force cloning progress" msgstr "强制显示克隆进度" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:653 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12727,187 +13115,170 @@ msgstr "" "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:684 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "无法克隆 '%s' 到子模组路径 '%s'" -#: builtin/submodule--helper.c:662 -#, c-format -msgid "cannot open file '%s'" -msgstr "无法打开文件 '%s'" - -#: builtin/submodule--helper.c:667 -#, c-format -msgid "could not close file %s" -msgstr "无法关闭文件 %s" - -#: builtin/submodule--helper.c:674 +#: builtin/submodule--helper.c:699 #, c-format msgid "could not get submodule directory for '%s'" msgstr "无法得到 '%s' 的子模组目录" -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:764 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模组 '%s' 尚未初始化" -#: builtin/submodule--helper.c:746 +#: builtin/submodule--helper.c:768 msgid "Maybe you want to use 'update --init'?" msgstr "也许您想要执行 'update --init'？" -#: builtin/submodule--helper.c:772 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略过未合并的子模组 %s" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:814 #, c-format msgid "Skipping submodule '%s'" msgstr "略过子模组 '%s'" -#: builtin/submodule--helper.c:929 +#: builtin/submodule--helper.c:942 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" -#: builtin/submodule--helper.c:940 +#: builtin/submodule--helper.c:953 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次尝试克隆 '%s' 失败，退出" -#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 +#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 msgid "path into the working tree" msgstr "到工作区的路径" -#: builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:977 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区中的路径，递归嵌套子模组" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:981 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:972 +#: builtin/submodule--helper.c:985 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" -#: builtin/submodule--helper.c:975 +#: builtin/submodule--helper.c:988 msgid "parallel jobs" msgstr "并发任务" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:990 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始克隆是否应该遵守推荐的浅克隆选项" -#: builtin/submodule--helper.c:978 +#: builtin/submodule--helper.c:991 msgid "don't print cloning progress" msgstr "不要输出克隆进度" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:998 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:995 +#: builtin/submodule--helper.c:1008 msgid "bad value for update parameter" msgstr "update 参数取值错误" -#: builtin/submodule--helper.c:1066 +#: builtin/submodule--helper.c:1079 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上" -#: builtin/submodule--helper.c:1106 +#: builtin/submodule--helper.c:1163 msgid "recurse into submodules" msgstr "在子模组中递归" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1169 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<路径>...]" -#: builtin/submodule--helper.c:1157 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "submodule-helper 子命令必须由另外的子命令调用" - -#: builtin/submodule--helper.c:1164 +#: builtin/submodule--helper.c:1232 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c:1170 +#: builtin/submodule--helper.c:1238 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <名称>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:41 msgid "suppress error message for non-symbolic (detached) refs" msgstr "不显示非符号（分离的）引用的错误信息" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:42 msgid "delete symbolic ref" msgstr "删除符号引用" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:43 msgid "shorten ref output" msgstr "简短的引用输出" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason" msgstr "原因" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason of the update" msgstr "更新的原因" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "" "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "git tag -d <tagname>..." msgstr "git tag -d <标签名>..." -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n" +"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" +"at <对象>]\n" "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<格式>] <标签名>..." -#: builtin/tag.c:82 -#, c-format -msgid "tag name too long: %.*s..." -msgstr "标签名称太长：%.*s..." - -#: builtin/tag.c:87 +#: builtin/tag.c:84 #, c-format msgid "tag '%s' not found." msgstr "未发现标签 '%s'。" -#: builtin/tag.c:102 +#: builtin/tag.c:100 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已删除标签 '%s'（曾为 %s）\n" -#: builtin/tag.c:131 +#: builtin/tag.c:129 #, c-format msgid "" "\n" @@ -12920,7 +13291,7 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:135 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -12934,325 +13305,343 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" -#: builtin/tag.c:213 +#: builtin/tag.c:211 msgid "unable to sign the tag" msgstr "无法签署标签" -#: builtin/tag.c:215 +#: builtin/tag.c:213 msgid "unable to write tag file" msgstr "无法写标签文件" -#: builtin/tag.c:240 +#: builtin/tag.c:237 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:253 -msgid "tag header too big." -msgstr "标签头信息太大。" - -#: builtin/tag.c:289 +#: builtin/tag.c:283 msgid "no tag message?" msgstr "无标签说明？" -#: builtin/tag.c:295 +#: builtin/tag.c:290 #, c-format msgid "The tag message has been left in %s\n" msgstr "标签说明被保留在 %s\n" -#: builtin/tag.c:354 +#: builtin/tag.c:398 msgid "list tag names" msgstr "列出标签名称" -#: builtin/tag.c:356 +#: builtin/tag.c:400 msgid "print <n> lines of each tag message" msgstr "每个标签信息打印 <n> 行" -#: builtin/tag.c:358 +#: builtin/tag.c:402 msgid "delete tags" msgstr "删除标签" -#: builtin/tag.c:359 +#: builtin/tag.c:403 msgid "verify tags" msgstr "验证标签" -#: builtin/tag.c:361 +#: builtin/tag.c:405 msgid "Tag creation options" msgstr "标签创建选项" -#: builtin/tag.c:363 +#: builtin/tag.c:407 msgid "annotated tag, needs a message" msgstr "附注标签，需要一个说明" -#: builtin/tag.c:365 +#: builtin/tag.c:409 msgid "tag message" msgstr "标签说明" -#: builtin/tag.c:367 +#: builtin/tag.c:411 msgid "annotated and GPG-signed tag" msgstr "附注并附加 GPG 签名的标签" -#: builtin/tag.c:371 +#: builtin/tag.c:415 msgid "use another key to sign the tag" msgstr "使用另外的私钥签名该标签" -#: builtin/tag.c:372 +#: builtin/tag.c:416 msgid "replace the tag if exists" msgstr "如果存在，替换现有的标签" -#: builtin/tag.c:373 builtin/update-ref.c:368 +#: builtin/tag.c:417 builtin/update-ref.c:369 msgid "create a reflog" msgstr "创建引用日志" -#: builtin/tag.c:375 +#: builtin/tag.c:419 msgid "Tag listing options" msgstr "标签列表选项" -#: builtin/tag.c:376 +#: builtin/tag.c:420 msgid "show tag list in columns" msgstr "以列的方式显示标签列表" -#: builtin/tag.c:377 builtin/tag.c:378 +#: builtin/tag.c:421 builtin/tag.c:423 msgid "print only tags that contain the commit" -msgstr "只打印包含提交的标签" +msgstr "只打印包含该提交的标签" + +#: builtin/tag.c:422 builtin/tag.c:424 +msgid "print only tags that don't contain the commit" +msgstr "只打印不包含该提交的标签" -#: builtin/tag.c:379 +#: builtin/tag.c:425 msgid "print only tags that are merged" msgstr "只打印已经合并的标签" -#: builtin/tag.c:380 +#: builtin/tag.c:426 msgid "print only tags that are not merged" msgstr "只打印尚未合并的标签" -#: builtin/tag.c:385 +#: builtin/tag.c:431 msgid "print only tags of the object" -msgstr "只打印对象的标签" +msgstr "只打印指向该对象的标签" -#: builtin/tag.c:415 +#: builtin/tag.c:470 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:437 -msgid "-n option is only allowed with -l." -msgstr "-n 选项只允许和 -l 同时使用。" +#: builtin/tag.c:492 +msgid "-n option is only allowed in list mode" +msgstr "-n 选项只允许用在列表显示模式" + +#: builtin/tag.c:494 +msgid "--contains option is only allowed in list mode" +msgstr "--contains 选项只允许用在列表显示模式" -#: builtin/tag.c:439 -msgid "--contains option is only allowed with -l." -msgstr "--contains 选项只允许和 -l 同时使用。" +#: builtin/tag.c:496 +msgid "--no-contains option is only allowed in list mode" +msgstr "--no-contains 选项只允许用在列表显示模式" -#: builtin/tag.c:441 -msgid "--points-at option is only allowed with -l." -msgstr "--points-at 选项只允许和 -l 同时使用。" +#: builtin/tag.c:498 +msgid "--points-at option is only allowed in list mode" +msgstr "--points-at 选项只允许用在列表显示模式" -#: builtin/tag.c:443 -msgid "--merged and --no-merged option are only allowed with -l" -msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" +#: builtin/tag.c:500 +msgid "--merged and --no-merged options are only allowed in list mode" +msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" -#: builtin/tag.c:454 +#: builtin/tag.c:511 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:473 +#: builtin/tag.c:530 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:479 +#: builtin/tag.c:536 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的标签名称。" -#: builtin/tag.c:484 +#: builtin/tag.c:541 #, c-format msgid "tag '%s' already exists" msgstr "标签 '%s' 已存在" -#: builtin/tag.c:512 +#: builtin/tag.c:571 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新标签 '%s'（曾为 %s）\n" -#: builtin/unpack-objects.c:493 +#: builtin/unpack-objects.c:494 msgid "Unpacking objects" msgstr "展开对象中" -#: builtin/update-index.c:79 +#: builtin/update-index.c:80 #, c-format msgid "failed to create directory %s" msgstr "无法创建目录 %s" -#: builtin/update-index.c:85 +#: builtin/update-index.c:86 #, c-format msgid "failed to stat %s" -msgstr "无法枚举 %s 状态" +msgstr "对 %s 调用 stat 失败" -#: builtin/update-index.c:95 +#: builtin/update-index.c:96 #, c-format msgid "failed to create file %s" msgstr "无法创建文件 %s" -#: builtin/update-index.c:103 +#: builtin/update-index.c:104 #, c-format msgid "failed to delete file %s" msgstr "无法删除文件 %s" -#: builtin/update-index.c:110 builtin/update-index.c:212 +#: builtin/update-index.c:111 builtin/update-index.c:217 #, c-format msgid "failed to delete directory %s" msgstr "无法删除目录 %s" -#: builtin/update-index.c:133 +#: builtin/update-index.c:136 #, c-format msgid "Testing mtime in '%s' " msgstr "在 '%s' 中测试 mtime " -#: builtin/update-index.c:145 +#: builtin/update-index.c:150 msgid "directory stat info does not change after adding a new file" msgstr "添加一个新文件后，目录的状态信息未改变" -#: builtin/update-index.c:158 +#: builtin/update-index.c:163 msgid "directory stat info does not change after adding a new directory" msgstr "添加一个新目录后，目录的状态信息未改变" -#: builtin/update-index.c:171 +#: builtin/update-index.c:176 msgid "directory stat info changes after updating a file" msgstr "更新一个文件后，目录的状态信息被修改" -#: builtin/update-index.c:182 +#: builtin/update-index.c:187 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "在子目录中添加文件后，目录的状态信息被修改" -#: builtin/update-index.c:193 +#: builtin/update-index.c:198 msgid "directory stat info does not change after deleting a file" msgstr "删除一个文件后，目录的状态信息未改变" -#: builtin/update-index.c:206 +#: builtin/update-index.c:211 msgid "directory stat info does not change after deleting a directory" msgstr "删除一个目录后，目录的状态信息未改变" -#: builtin/update-index.c:213 +#: builtin/update-index.c:218 msgid " OK" msgstr " OK" -#: builtin/update-index.c:564 +#: builtin/update-index.c:569 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<选项>] [--] [<文件>...]" -#: builtin/update-index.c:919 +#: builtin/update-index.c:924 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:922 +#: builtin/update-index.c:927 msgid "refresh: ignore submodules" msgstr "刷新：忽略子模组" -#: builtin/update-index.c:925 +#: builtin/update-index.c:930 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:927 +#: builtin/update-index.c:932 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:929 +#: builtin/update-index.c:934 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:931 +#: builtin/update-index.c:936 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:934 +#: builtin/update-index.c:939 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:938 +#: builtin/update-index.c:943 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:942 +#: builtin/update-index.c:947 msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<对象>,<路径>" -#: builtin/update-index.c:943 +#: builtin/update-index.c:948 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:952 +#: builtin/update-index.c:957 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:955 +#: builtin/update-index.c:960 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:958 +#: builtin/update-index.c:963 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:961 +#: builtin/update-index.c:966 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:964 +#: builtin/update-index.c:969 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:966 +#: builtin/update-index.c:971 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:968 +#: builtin/update-index.c:973 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:970 +#: builtin/update-index.c:975 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:974 +#: builtin/update-index.c:979 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:978 +#: builtin/update-index.c:983 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:982 +#: builtin/update-index.c:987 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:986 +#: builtin/update-index.c:991 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:989 +#: builtin/update-index.c:994 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:991 +#: builtin/update-index.c:996 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1000 msgid "write index in this format" msgstr "以这种格式写入索引区" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1002 msgid "enable or disable split index" msgstr "启用或禁用索引拆分" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1004 msgid "enable/disable untracked cache" msgstr "启用/禁用对未跟踪文件的缓存" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1006 msgid "test if the filesystem supports untracked cache" msgstr "测试文件系统是否支持未跟踪文件缓存" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1008 msgid "enable untracked cache without testing the filesystem" msgstr "无需检测文件系统，启用对未跟踪文件的缓存" -#: builtin/update-index.c:1120 +#: builtin/update-index.c:1108 +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" +"core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。" + +#: builtin/update-index.c:1117 +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" +"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。" + +#: builtin/update-index.c:1128 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13260,11 +13649,11 @@ msgstr "" "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修" "改它。" -#: builtin/update-index.c:1124 +#: builtin/update-index.c:1132 msgid "Untracked cache disabled" msgstr "缓存未跟踪文件被禁用" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1140 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13272,133 +13661,133 @@ msgstr "" "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或" "修改它。" -#: builtin/update-index.c:1136 +#: builtin/update-index.c:1144 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "缓存未跟踪文件在 '%s' 启用" -#: builtin/update-ref.c:9 +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<选项>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "删除引用" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "更新 <引用名> 本身而不是它指向的引用" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "标准输入有以 NUL 字符终止的参数" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "从标准输入读取更新" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "从头开始更新文件信息" -#: builtin/verify-commit.c:17 +#: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <提交>..." -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:73 msgid "print commit contents" msgstr "打印提交内容" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "打印原始 gpg 状态输出" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "冗长输出" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "只显示统计" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "打印标签内容" -#: builtin/worktree.c:15 +#: builtin/worktree.c:16 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<选项>] <路径> [<分支>]" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree list [<options>]" msgstr "git worktree list [<选项>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<选项>] <路径>" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<选项>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:42 +#: builtin/worktree.c:44 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "删除工作区/%s：不是一个有效的目录" -#: builtin/worktree.c:48 +#: builtin/worktree.c:50 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "删除 worktrees/%s：gitdir 文件不存在" -#: builtin/worktree.c:53 +#: builtin/worktree.c:55 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)" -#: builtin/worktree.c:64 +#: builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "删除 worktrees/%s：无效的 gitdir 文件" -#: builtin/worktree.c:80 +#: builtin/worktree.c:82 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "删除 worktrees/%s：gitdir 文件的指向不存在" -#: builtin/worktree.c:128 +#: builtin/worktree.c:129 msgid "report pruned working trees" msgstr "报告清除的工作区" -#: builtin/worktree.c:130 +#: builtin/worktree.c:131 msgid "expire working trees older than <time>" msgstr "将早于 <time> 的工作区过期" -#: builtin/worktree.c:204 +#: builtin/worktree.c:205 #, c-format msgid "'%s' already exists" msgstr "'%s' 已经存在" @@ -13408,96 +13797,100 @@ msgstr "'%s' 已经存在" msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:272 +#: builtin/worktree.c:275 #, c-format msgid "Preparing %s (identifier %s)" msgstr "准备 %s（标识符 %s）" -#: builtin/worktree.c:323 +#: builtin/worktree.c:327 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出分支 <branch> 即使已经被检出到其它工作区" -#: builtin/worktree.c:325 +#: builtin/worktree.c:329 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:327 +#: builtin/worktree.c:331 msgid "create or reset a branch" msgstr "创建或重置一个分支" -#: builtin/worktree.c:329 +#: builtin/worktree.c:333 msgid "populate the new working tree" msgstr "生成新的工作区" -#: builtin/worktree.c:337 +#: builtin/worktree.c:334 +msgid "keep the new working tree locked" +msgstr "锁定新工作区" + +#: builtin/worktree.c:342 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:472 +#: builtin/worktree.c:479 msgid "reason for locking" msgstr "锁定原因" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:491 builtin/worktree.c:524 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:486 builtin/worktree.c:519 +#: builtin/worktree.c:493 builtin/worktree.c:526 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:491 +#: builtin/worktree.c:498 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定，原因：%s" -#: builtin/worktree.c:493 +#: builtin/worktree.c:500 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:521 +#: builtin/worktree.c:528 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" -#: builtin/write-tree.c:13 +#: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "<前缀>/" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "将 <前缀> 子目录内容写到一个树对象" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "只对调试有用" -#: upload-pack.c:22 +#: upload-pack.c:23 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<选项>] <目录>" -#: upload-pack.c:1036 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "在一次单独的请求/响应（request/response）交换后退出" -#: upload-pack.c:1038 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "在初始的引用广告后立即退出" -#: upload-pack.c:1040 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" -#: upload-pack.c:1042 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "不活动 <n> 秒钟后终止传输" -#: credential-cache--daemon.c:223 +#: credential-cache--daemon.c:224 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13510,11 +13903,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "调试信息输出到标准错误" -#: git.c:14 +#: git.c:15 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -13524,15 +13917,20 @@ msgstr "" "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" "帮助。" -#: http.c:344 +#: http.c:337 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "http.postbuffer 为负值，默认为 %d" + +#: http.c:358 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "当 cURL < 7.22.0 时，不支持委托控制" -#: http.c:353 +#: http.c:367 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0" -#: http.c:1713 +#: http.c:1764 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13543,7 +13941,7 @@ msgstr "" " 请求：%s\n" " 重定向：%s" -#: remote-curl.c:319 +#: remote-curl.c:324 #, c-format msgid "redirecting to %s" msgstr "重定向到 %s" @@ -13911,7 +14309,7 @@ msgstr "尝试和 $pretty_name 的简单合并" msgid "Simple merge did not work, trying automatic merge." msgstr "简单合并未生效，尝试自动合并。" -#: git-rebase.sh:57 +#: git-rebase.sh:58 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -13922,37 +14320,41 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" -#: git-rebase.sh:157 git-rebase.sh:396 +#: git-rebase.sh:158 git-rebase.sh:397 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" -#: git-rebase.sh:171 +#: git-rebase.sh:169 +msgid "Applied autostash." +msgstr "成功应用 autostash。" + +#: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" msgstr "无法保存 $stash_sha1" -#: git-rebase.sh:211 +#: git-rebase.sh:212 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基操作。" -#: git-rebase.sh:216 +#: git-rebase.sh:217 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:357 +#: git-rebase.sh:358 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:368 +#: git-rebase.sh:369 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: git-rebase.sh:375 +#: git-rebase.sh:376 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:379 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -13960,7 +14362,7 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:418 +#: git-rebase.sh:419 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13979,101 +14381,101 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:469 +#: git-rebase.sh:470 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:493 +#: git-rebase.sh:494 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:496 git-rebase.sh:500 +#: git-rebase.sh:497 git-rebase.sh:501 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:505 +#: git-rebase.sh:506 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:528 +#: git-rebase.sh:529 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:561 +#: git-rebase.sh:562 msgid "Cannot autostash" msgstr "无法 autostash" -#: git-rebase.sh:566 +#: git-rebase.sh:567 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "创建了 autostash: $stash_abbrev" -#: git-rebase.sh:570 +#: git-rebase.sh:571 msgid "Please commit or stash them." -msgstr "请提交或为它们保存进度。" +msgstr "请提交或贮藏修改。" -#: git-rebase.sh:590 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:594 +#: git-rebase.sh:595 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:605 +#: git-rebase.sh:606 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" -#: git-rebase.sh:614 +#: git-rebase.sh:615 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先，回退分支以便在上面重放您的工作..." -#: git-rebase.sh:624 +#: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" -#: git-stash.sh:50 +#: git-stash.sh:54 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear 不支持参数" -#: git-stash.sh:73 +#: git-stash.sh:95 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: git-stash.sh:88 +#: git-stash.sh:110 msgid "Cannot save the current index state" msgstr "无法保存当前索引状态" -#: git-stash.sh:103 +#: git-stash.sh:125 msgid "Cannot save the untracked files" msgstr "无法保存未跟踪文件" -#: git-stash.sh:123 git-stash.sh:136 +#: git-stash.sh:145 git-stash.sh:158 msgid "Cannot save the current worktree state" msgstr "无法保存当前工作区状态" -#: git-stash.sh:140 +#: git-stash.sh:162 msgid "No changes selected" msgstr "没有选择变更" -#: git-stash.sh:143 +#: git-stash.sh:165 msgid "Cannot remove temporary index (can't happen)" msgstr "无法删除临时索引（不应发生）" -#: git-stash.sh:156 +#: git-stash.sh:178 msgid "Cannot record working tree state" msgstr "不能记录工作区状态" -#: git-stash.sh:188 +#: git-stash.sh:210 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "无法用 $w_commit 更新 $ref_stash" @@ -14088,7 +14490,7 @@ msgstr "无法用 $w_commit 更新 $ref_stash" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:266 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14097,107 +14499,107 @@ msgstr "" "错误：'stash save' 的未知选项：$option\n" " 要提供一个描述信息，使用 git stash save -- '$option'" -#: git-stash.sh:251 +#: git-stash.sh:281 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" -#: git-stash.sh:259 +#: git-stash.sh:289 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: git-stash.sh:263 +#: git-stash.sh:294 msgid "Cannot initialize stash" -msgstr "无法初始化 stash" +msgstr "无法初始化贮藏" -#: git-stash.sh:267 +#: git-stash.sh:298 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: git-stash.sh:268 +#: git-stash.sh:299 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "保存工作目录和索引状态 $stash_msg" -#: git-stash.sh:285 +#: git-stash.sh:326 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: git-stash.sh:403 +#: git-stash.sh:474 #, sh-format msgid "unknown option: $opt" msgstr "未知选项: $opt" -#: git-stash.sh:416 -msgid "No stash found." -msgstr "未发现 stash。" +#: git-stash.sh:487 +msgid "No stash entries found." +msgstr "未发现贮藏条目。" -#: git-stash.sh:423 +#: git-stash.sh:494 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-stash.sh:438 +#: git-stash.sh:509 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference 不是一个有效的引用" -#: git-stash.sh:466 +#: git-stash.sh:537 #, sh-format msgid "'$args' is not a stash-like commit" -msgstr "'$args' 不是 stash 样提交" +msgstr "'$args' 不是贮藏式提交" -#: git-stash.sh:477 +#: git-stash.sh:548 #, sh-format msgid "'$args' is not a stash reference" -msgstr "'$args' 不是一个 stash 引用" +msgstr "'$args' 不是一个贮藏引用" -#: git-stash.sh:485 +#: git-stash.sh:556 msgid "unable to refresh index" msgstr "无法刷新索引" -#: git-stash.sh:489 +#: git-stash.sh:560 msgid "Cannot apply a stash in the middle of a merge" -msgstr "无法在合并过程中恢复进度" +msgstr "无法在合并过程应用贮藏" -#: git-stash.sh:497 +#: git-stash.sh:568 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" -#: git-stash.sh:499 +#: git-stash.sh:570 msgid "Could not save index tree" msgstr "不能保存索引树" -#: git-stash.sh:508 -msgid "Could not restore untracked files from stash" -msgstr "无法从进度保存中恢复未跟踪文件" +#: git-stash.sh:579 +msgid "Could not restore untracked files from stash entry" +msgstr "无法从贮藏条目中恢复未跟踪文件" -#: git-stash.sh:533 +#: git-stash.sh:604 msgid "Cannot unstage modified files" msgstr "无法将修改的文件取消暂存" -#: git-stash.sh:548 +#: git-stash.sh:619 msgid "Index was not unstashed." -msgstr "索引的进度没有被恢复。" +msgstr "索引未从贮藏中恢复。" -#: git-stash.sh:562 -msgid "The stash is kept in case you need it again." -msgstr "暂存被保留以备您再次需要。" +#: git-stash.sh:633 +msgid "The stash entry is kept in case you need it again." +msgstr "贮藏条目被保留以备您再次需要。" -#: git-stash.sh:571 +#: git-stash.sh:642 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:572 +#: git-stash.sh:643 #, sh-format msgid "${REV}: Could not drop stash entry" -msgstr "${REV}：不能丢弃进度条目" +msgstr "${REV}：无法丢弃贮藏条目" -#: git-stash.sh:580 +#: git-stash.sh:651 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:652 +#: git-stash.sh:730 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" @@ -14220,7 +14622,7 @@ msgstr "'$sm_path' 已经存在于索引中" msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" -#: git-submodule.sh:218 +#: git-submodule.sh:219 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -14231,22 +14633,22 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:236 +#: git-submodule.sh:237 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存仓库到索引" -#: git-submodule.sh:238 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" -#: git-submodule.sh:246 +#: git-submodule.sh:247 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -14261,47 +14663,47 @@ msgstr "" "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" "或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。" -#: git-submodule.sh:254 +#: git-submodule.sh:255 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:266 +#: git-submodule.sh:267 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:271 +#: git-submodule.sh:272 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:280 +#: git-submodule.sh:281 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:327 +#: git-submodule.sh:342 #, sh-format msgid "Entering '$displaypath'" msgstr "正在进入 '$displaypath'" -#: git-submodule.sh:347 +#: git-submodule.sh:362 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "停止于 '$displaypath'；脚本返回非零值。" -#: git-submodule.sh:418 +#: git-submodule.sh:433 #, sh-format msgid "pathspec and --all are incompatible" msgstr "pathspec 和 --all 不兼容" -#: git-submodule.sh:423 +#: git-submodule.sh:438 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: git-submodule.sh:443 +#: git-submodule.sh:458 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14310,56 +14712,56 @@ msgstr "" "子模组工作区 '$displaypath' 包含一个 .git 目录\n" "（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）" -#: git-submodule.sh:451 +#: git-submodule.sh:466 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们" -#: git-submodule.sh:454 +#: git-submodule.sh:469 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "已清除目录 '$displaypath'" -#: git-submodule.sh:455 +#: git-submodule.sh:470 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "无法移除子模组工作区 '$displaypath'" -#: git-submodule.sh:458 +#: git-submodule.sh:473 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "不能创建空的子模组目录 '$displaypath'" -#: git-submodule.sh:467 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:623 +#: git-submodule.sh:638 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:633 +#: git-submodule.sh:648 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:638 +#: git-submodule.sh:653 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" -#: git-submodule.sh:656 +#: git-submodule.sh:671 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中获取" -#: git-submodule.sh:662 +#: git-submodule.sh:677 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14367,84 +14769,84 @@ msgid "" msgstr "" "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" -#: git-submodule.sh:669 +#: git-submodule.sh:684 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:670 +#: git-submodule.sh:685 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:674 +#: git-submodule.sh:689 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:675 +#: git-submodule.sh:690 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:680 +#: git-submodule.sh:695 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:681 +#: git-submodule.sh:696 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:686 +#: git-submodule.sh:701 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:687 +#: git-submodule.sh:702 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:718 +#: git-submodule.sh:733 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:826 +#: git-submodule.sh:841 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#: git-submodule.sh:878 +#: git-submodule.sh:893 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:898 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:901 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:904 +#: git-submodule.sh:919 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:1051 +#: git-submodule.sh:1065 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:1118 +#: git-submodule.sh:1137 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" @@ -14656,7 +15058,7 @@ msgid "" "\tgit rebase --continue" msgstr "" "执行成功：$rest\n" -"但是在索引和/或工作区中存在变更。提交或暂存修改，然后运行\n" +"但是在索引和/或工作区中存在变更。提交或贮藏修改，然后运行\n" "\n" "\tgit rebase --continue" @@ -14737,11 +15139,11 @@ msgstr "" msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。" -#: git-rebase--interactive.sh:1079 +#: git-rebase--interactive.sh:1083 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1084 +#: git-rebase--interactive.sh:1088 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14770,22 +15172,22 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1101 +#: git-rebase--interactive.sh:1105 msgid "Error trying to find the author identity to amend commit" msgstr "在修补提交中查找作者信息时遇到错误" -#: git-rebase--interactive.sh:1106 +#: git-rebase--interactive.sh:1110 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 +#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 msgid "Could not commit staged changes." msgstr "不能提交暂存的修改。" -#: git-rebase--interactive.sh:1139 +#: git-rebase--interactive.sh:1147 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14799,40 +15201,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 +#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 msgid "Could not execute editor" msgstr "无法运行编辑器" -#: git-rebase--interactive.sh:1160 +#: git-rebase--interactive.sh:1168 #, sh-format msgid "Could not checkout $switch_to" msgstr "不能检出 $switch_to" -#: git-rebase--interactive.sh:1165 +#: git-rebase--interactive.sh:1173 msgid "No HEAD?" msgstr "没有 HEAD？" -#: git-rebase--interactive.sh:1166 +#: git-rebase--interactive.sh:1174 #, sh-format msgid "Could not create temporary $state_dir" msgstr "不能创建临时 $state_dir" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:1176 msgid "Could not mark as interactive" msgstr "不能标记为交互式" -#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 +#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 msgid "Could not init rewritten commits" msgstr "不能对重写提交进行初始化" -#: git-rebase--interactive.sh:1283 +#: git-rebase--interactive.sh:1291 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" -#: git-rebase--interactive.sh:1288 +#: git-rebase--interactive.sh:1296 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -14842,7 +15244,7 @@ msgstr "" "然而，如果您删除全部内容，变基操作将会终止。\n" "\n" -#: git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1303 msgid "Note that empty commits are commented out" msgstr "注意空提交已被注释掉" @@ -14904,126 +15306,120 @@ msgid "Unable to determine absolute path of git directory" msgstr "不能确定 git 目录的绝对路径" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:238 +#: git-add--interactive.perl:196 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "staged" msgstr "缓存" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "unstaged" msgstr "未缓存" -#: git-add--interactive.perl:297 git-add--interactive.perl:322 +#: git-add--interactive.perl:246 git-add--interactive.perl:271 msgid "binary" msgstr "二进制" -#: git-add--interactive.perl:306 git-add--interactive.perl:360 +#: git-add--interactive.perl:255 git-add--interactive.perl:309 msgid "nothing" msgstr "无" -#: git-add--interactive.perl:342 git-add--interactive.perl:357 +#: git-add--interactive.perl:291 git-add--interactive.perl:306 msgid "unchanged" msgstr "没有修改" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:602 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 个路径\n" msgstr[1] "增加了 %d 个路径\n" -#: git-add--interactive.perl:656 +#: git-add--interactive.perl:605 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" -#: git-add--interactive.perl:659 +#: git-add--interactive.perl:608 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:611 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "触碰了 %d 个路径\n" msgstr[1] "触碰了 %d 个路径\n" -#: git-add--interactive.perl:671 +#: git-add--interactive.perl:620 msgid "Update" msgstr "更新" -#: git-add--interactive.perl:683 +#: git-add--interactive.perl:632 msgid "Revert" msgstr "还原" -#: git-add--interactive.perl:706 +#: git-add--interactive.perl:655 #, perl-format msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" -#: git-add--interactive.perl:717 +#: git-add--interactive.perl:666 msgid "Add untracked" msgstr "添加未跟踪的" -#: git-add--interactive.perl:723 +#: git-add--interactive.perl:672 msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:985 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。" -#: git-add--interactive.perl:1042 +#: git-add--interactive.perl:988 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." -msgstr "如果补丁能干净地应用，编辑块将立即标记为保存进度。" +msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。" -#: git-add--interactive.perl:1045 +#: git-add--interactive.perl:991 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。" -#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +#: git-add--interactive.perl:994 git-add--interactive.perl:1003 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。" -#: git-add--interactive.perl:1051 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding" -msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃" - -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:997 git-add--interactive.perl:1000 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。" -#: git-add--interactive.perl:1067 +#: git-add--interactive.perl:1013 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "无法写入块编辑文件：%s" -#: git-add--interactive.perl:1068 +#: git-add--interactive.perl:1014 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1020 #, perl-format msgid "" "---\n" @@ -15037,7 +15433,7 @@ msgstr "" "以 %s 开始的行将被删除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1028 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -15046,7 +15442,7 @@ msgstr "" "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" "此次编辑被终止，该块不会被修改。\n" -#: git-add--interactive.perl:1096 +#: git-add--interactive.perl:1042 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "无法读取块编辑文件：%s" @@ -15057,12 +15453,12 @@ msgstr "无法读取块编辑文件：%s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1134 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " -#: git-add--interactive.perl:1196 +#: git-add--interactive.perl:1143 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15076,7 +15472,7 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块" -#: git-add--interactive.perl:1202 +#: git-add--interactive.perl:1149 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15090,7 +15486,7 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块" -#: git-add--interactive.perl:1208 +#: git-add--interactive.perl:1155 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15104,7 +15500,7 @@ msgstr "" "a - 不暂存该块和本文件中后面的全部块\n" "d - 不要不暂存该块和本文件中后面的全部块" -#: git-add--interactive.perl:1214 +#: git-add--interactive.perl:1161 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15118,7 +15514,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1220 +#: git-add--interactive.perl:1167 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15132,7 +15528,7 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块" -#: git-add--interactive.perl:1226 +#: git-add--interactive.perl:1173 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15146,7 +15542,7 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15160,7 +15556,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1241 +#: git-add--interactive.perl:1188 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15182,201 +15578,201 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: git-add--interactive.perl:1272 +#: git-add--interactive.perl:1219 msgid "The selected hunks do not apply to the index!\n" msgstr "选中的块不能应用到索引！\n" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1234 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未合入的：%s\n" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1243 msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1245 msgid "No changes.\n" msgstr "没有修改。\n" -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1253 msgid "Patch update" msgstr "补丁更新" -#: git-add--interactive.perl:1358 +#: git-add--interactive.perl:1305 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1306 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1307 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "暂存该块 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1363 +#: git-add--interactive.perl:1310 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1311 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1312 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1368 +#: git-add--interactive.perl:1315 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1316 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1317 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1373 +#: git-add--interactive.perl:1320 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1321 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1322 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1378 +#: git-add--interactive.perl:1325 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1326 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1330 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1331 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1332 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1335 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1336 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1337 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1493 +#: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1442 msgid "go to which hunk? " msgstr "跳转到哪个块？" -#: git-add--interactive.perl:1504 +#: git-add--interactive.perl:1451 #, perl-format msgid "Invalid number: '%s'\n" msgstr "无效数字：'%s'\n" -#: git-add--interactive.perl:1509 +#: git-add--interactive.perl:1456 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "对不起，只有 %d 个可用块。\n" msgstr[1] "对不起，只有 %d 个可用块。\n" -#: git-add--interactive.perl:1535 +#: git-add--interactive.perl:1482 msgid "search for regex? " msgstr "使用正则表达式搜索？" -#: git-add--interactive.perl:1548 +#: git-add--interactive.perl:1495 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "错误的正则表达式 %s：%s\n" -#: git-add--interactive.perl:1558 +#: git-add--interactive.perl:1505 msgid "No hunk matches the given pattern\n" msgstr "没有和给定模式相匹配的快\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 msgid "No previous hunk\n" msgstr "没有前一个块\n" -#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 msgid "No next hunk\n" msgstr "没有下一个块\n" -#: git-add--interactive.perl:1606 +#: git-add--interactive.perl:1553 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "拆分为 %d 块。\n" msgstr[1] "拆分为 %d 块。\n" -#: git-add--interactive.perl:1658 +#: git-add--interactive.perl:1605 msgid "Review diff" msgstr "检视 diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1677 +#: git-add--interactive.perl:1624 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" "revert - revert staged set of changes back to the HEAD version\n" "patch - pick hunks and update selectively\n" -"diff\t - view diff between HEAD and index\n" +"diff - view diff between HEAD and index\n" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" @@ -15387,84 +15783,84 @@ msgstr "" "diff - 显示 HEAD 和索引间差异\n" "add untracked - 添加未跟踪文件的内容至暂存列表\n" -#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 -#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 -#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 +#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 +#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 msgid "missing --" msgstr "缺失 --" -#: git-add--interactive.perl:1715 +#: git-add--interactive.perl:1662 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模式：%s" -#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 #, perl-format msgid "invalid argument %s, expecting --" msgstr "无效的参数 %s，期望是 --" -#: git-send-email.perl:121 +#: git-send-email.perl:126 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本地时间和 GMT 有不到一分钟间隔\n" -#: git-send-email.perl:128 git-send-email.perl:134 +#: git-send-email.perl:133 git-send-email.perl:139 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本地时间偏移量大于等于 24 小时\n" -#: git-send-email.perl:202 git-send-email.perl:208 +#: git-send-email.perl:208 git-send-email.perl:214 msgid "the editor exited uncleanly, aborting everything" msgstr "编辑器非正常退出，终止所有操作" -#: git-send-email.perl:282 +#: git-send-email.perl:291 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" -#: git-send-email.perl:287 +#: git-send-email.perl:296 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含编辑的邮件。\n" -#: git-send-email.perl:305 +#: git-send-email.perl:314 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它选项不兼容\n" -#: git-send-email.perl:368 git-send-email.perl:623 +#: git-send-email.perl:379 git-send-email.perl:634 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在仓库之外运行 git format-patch\n" -#: git-send-email.perl:437 +#: git-send-email.perl:448 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 字段：'%s'\n" -#: git-send-email.perl:466 +#: git-send-email.perl:477 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 设置：'%s'\n" -#: git-send-email.perl:498 +#: git-send-email.perl:509 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支持带引号的 sendmail 别名：%s\n" -#: git-send-email.perl:500 +#: git-send-email.perl:511 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支持 `:include:`：%s\n" -#: git-send-email.perl:502 +#: git-send-email.perl:513 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:507 +#: git-send-email.perl:518 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能识别的 sendmail 行：%s\n" -#: git-send-email.perl:589 +#: git-send-email.perl:600 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15473,17 +15869,18 @@ msgid "" " * Saying \"./%s\" if you mean a file; or\n" " * Giving --format-patch option if you mean a range.\n" msgstr "" -"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除歧义：\n" +"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" +"歧义：\n" "\n" " * 如果含义为一个文件，使用 \"./%s\"，或者\n" " * 如果含义为一个范围，使用 --format-patch 选项。\n" -#: git-send-email.perl:610 +#: git-send-email.perl:621 #, perl-format msgid "Failed to opendir %s: %s" msgstr "无法打开目录 %s: %s" -#: git-send-email.perl:634 +#: git-send-email.perl:645 #, perl-format msgid "" "fatal: %s: %s\n" @@ -15492,24 +15889,27 @@ msgstr "" "严重：%s：%s\n" "警告：补丁未能发送\n" -#: git-send-email.perl:645 +#: git-send-email.perl:656 msgid "" "\n" "No patch files specified!\n" "\n" -msgstr "\n未指定补丁文件！\n\n" +msgstr "" +"\n" +"未指定补丁文件！\n" +"\n" -#: git-send-email.perl:658 +#: git-send-email.perl:669 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中没有标题行？" -#: git-send-email.perl:668 +#: git-send-email.perl:679 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "无法写入 %s: %s" -#: git-send-email.perl:678 +#: git-send-email.perl:689 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15522,41 +15922,41 @@ msgstr "" "\n" "如果您不想发送摘要，清除内容。\n" -#: git-send-email.perl:701 +#: git-send-email.perl:712 #, perl-format msgid "Failed to open %s.final: %s" msgstr "无法打开 %s.final: %s" -#: git-send-email.perl:704 +#: git-send-email.perl:715 #, perl-format msgid "Failed to open %s: %s" msgstr "无法打开 %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:750 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "To/Cc/Bcc 字段不解析，它们被忽略\n" -#: git-send-email.perl:748 +#: git-send-email.perl:759 msgid "Summary email is empty, skipping it\n" msgstr "摘要邮件为空，跳过\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:780 +#: git-send-email.perl:791 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您确认要使用 <%s> [y/N]？" -#: git-send-email.perl:809 +#: git-send-email.perl:820 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n" -#: git-send-email.perl:814 +#: git-send-email.perl:825 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？" -#: git-send-email.perl:822 +#: git-send-email.perl:833 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -15568,20 +15968,20 @@ msgstr "" "\t%s\n" "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n" -#: git-send-email.perl:841 +#: git-send-email.perl:852 msgid "To whom should the emails be sent (if anyone)?" msgstr "邮件将要发送给谁？" -#: git-send-email.perl:859 +#: git-send-email.perl:870 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "严重：别名 '%s' 扩展为它自己\n" -#: git-send-email.perl:871 +#: git-send-email.perl:882 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？" -#: git-send-email.perl:921 git-send-email.perl:929 +#: git-send-email.perl:932 git-send-email.perl:940 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" @@ -15589,16 +15989,16 @@ msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:933 +#: git-send-email.perl:944 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1234 +#: git-send-email.perl:1245 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路径 \"%s\" 不存在" -#: git-send-email.perl:1309 +#: git-send-email.perl:1320 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15623,182 +16023,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1324 +#: git-send-email.perl:1335 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "发送邮件？([y]es|[n]o|[q]uit|[a]ll)：" -#: git-send-email.perl:1327 +#: git-send-email.perl:1338 msgid "Send this email reply required" msgstr "发送要求的邮件回复" -#: git-send-email.perl:1353 +#: git-send-email.perl:1364 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 服务器未被正确定义。" -#: git-send-email.perl:1397 +#: git-send-email.perl:1411 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "服务器不支持 STARTTLS！%s" -#: git-send-email.perl:1403 +#: git-send-email.perl:1416 git-send-email.perl:1420 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "STARTTLS 失败！%s" + +#: git-send-email.perl:1430 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" -#: git-send-email.perl:1421 +#: git-send-email.perl:1448 #, perl-format msgid "Failed to send %s\n" msgstr "无法发送 %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Dry-Sent %s\n" msgstr "演习发送 %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Sent %s\n" msgstr "正发送 %s\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "Dry-OK. Log says:\n" msgstr "演习成功。日志说：\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "OK. Log says:\n" msgstr "OK。日志说：\n" -#: git-send-email.perl:1438 +#: git-send-email.perl:1465 msgid "Result: " msgstr "结果：" -#: git-send-email.perl:1441 +#: git-send-email.perl:1468 msgid "Result: OK\n" msgstr "结果：OK\n" -#: git-send-email.perl:1454 +#: git-send-email.perl:1481 #, perl-format msgid "can't open file %s" msgstr "无法打开文件 %s" -#: git-send-email.perl:1501 git-send-email.perl:1521 +#: git-send-email.perl:1528 git-send-email.perl:1548 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1507 +#: git-send-email.perl:1534 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 添加 to：%s 自行 '%s'\n" -#: git-send-email.perl:1555 +#: git-send-email.perl:1582 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1578 +#: git-send-email.perl:1605 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 添加 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1676 +#: git-send-email.perl:1711 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能执行 '%s'" -#: git-send-email.perl:1683 +#: git-send-email.perl:1718 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 添加 %s: %s 自：'%s'\n" -#: git-send-email.perl:1687 +#: git-send-email.perl:1722 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 无法关闭管道至 '%s'" -#: git-send-email.perl:1714 +#: git-send-email.perl:1749 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式发送信息" -#: git-send-email.perl:1722 +#: git-send-email.perl:1757 msgid "invalid transfer encoding" msgstr "无效的传送编码" -#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能打开 %s：%s\n" -#: git-send-email.perl:1744 +#: git-send-email.perl:1798 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s：补丁包含一个超过 998 字符的行" -#: git-send-email.perl:1760 +#: git-send-email.perl:1814 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略过 %s 含备份后缀 '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1764 +#: git-send-email.perl:1818 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要发送 %s？[y|N]：" - -#~ msgid "Use an experimental blank-line-based heuristic to improve diffs" -#~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示" - -#~ msgid "Clever... amending the last one with dirty index." -#~ msgstr "聪明... 用脏索引修补最后一个提交。" - -#~ msgid "" -#~ "the following submodule (or one of its nested submodules)\n" -#~ "uses a .git directory:" -#~ msgid_plural "" -#~ "the following submodules (or one of their nested submodules)\n" -#~ "use a .git directory:" -#~ msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" -#~ msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" - -#~ msgid "" -#~ "\n" -#~ "(use 'rm -rf' if you really want to remove it including all of its " -#~ "history)" -#~ msgstr "" -#~ "\n" -#~ "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" - -#~ msgid "Could not write to %s" -#~ msgstr "不能写入 %s" - -#~ msgid "Error wrapping up %s." -#~ msgstr "错误收尾 %s。" - -#~ msgid "Your local changes would be overwritten by cherry-pick." -#~ msgstr "您的本地修改将被拣选操作覆盖。" - -#~ msgid "Cannot revert during another revert." -#~ msgstr "不能在回退中执行另一回退。" - -#~ msgid "Cannot cherry-pick during another cherry-pick." -#~ msgstr "不能在拣选过程中执行另一拣选。" - -#~ msgid "Could not parse line %d." -#~ msgstr "不能解析第 %d 行。" - -#~ msgid "Could not open %s" -#~ msgstr "不能打开 %s" - -#~ msgid "Could not read %s." -#~ msgstr "不能读取 %s。" - -#~ msgid "Could not format %s." -#~ msgstr "不能格式化 %s。" - -#~ msgid "%s: %s" -#~ msgstr "%s：%s" - -#~ msgid "cannot open %s: %s" -#~ msgstr "不能打开 %s：%s" - -#~ msgid "You need to set your committer info first" -#~ msgstr "您需要先设置您的提交者信息" |