diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 4587 |
1 files changed, 2365 insertions, 2222 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 7ede055381..abbf74cda7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -141,8 +141,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-06-05 22:10+0800\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 17:27+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -156,8 +156,8 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" msgstr "不能读取索引" @@ -186,7 +186,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "不能写入索引" @@ -244,12 +244,12 @@ msgstr[1] "增加了 %d 个路径\n" msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" @@ -326,11 +326,11 @@ msgstr "选择一个编号条目" msgid "(empty) select nothing" msgstr "（空）不选择任何内容" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "请选择" @@ -342,12 +342,13 @@ msgstr "缓存" msgid "unstaged" msgstr "未缓存" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "路径" @@ -356,7 +357,7 @@ msgstr "路径" msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "再见。\n" @@ -647,40 +648,40 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "无法解析彩色数据块头信息 '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "不能解析差异信息" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "运行 '%s' 失败" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -689,7 +690,7 @@ msgstr "" "预期上下文行 #%d 于\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -702,11 +703,11 @@ msgstr "" "\t不是结尾于：\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -720,7 +721,7 @@ msgstr "" "以 %c 开始的行将被删除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 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" @@ -729,11 +730,11 @@ msgstr "" "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" "此次编辑被终止，该块不会被修改。\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" @@ -749,24 +750,24 @@ msgstr "'git apply --cached' 失败" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -788,69 +789,69 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "没有前一个块" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "没有下一个块" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "跳转到哪个块？" -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "无效数字：'%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起，只有 %d 个可用块。" msgstr[1] "对不起，只有 %d 个可用块。" -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "使用正则表达式搜索？" -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s：%s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "对不起，不能拆分这个块" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "对不起，不能编辑这个块" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "'git apply' 失败" @@ -905,7 +906,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" @@ -923,7 +924,8 @@ msgid "" "The following pathspecs didn't match any eligible path, but they do match " "index\n" "entries outside the current sparse checkout:\n" -msgstr "以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n" +msgstr "" +"以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n" #: advice.c:303 msgid "" @@ -1278,8 +1280,8 @@ msgstr "%s：错误类型" msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" @@ -1369,7 +1371,7 @@ msgstr "不能为新建文件 %s 创建后端存储" msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" @@ -1459,7 +1461,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后，应用了 %d 行。" msgstr[1] "修复空白错误后，应用了 %d 行。" -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -1471,7 +1473,7 @@ msgstr "不要应用与给出路径向匹配的变更" msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "数字" @@ -1521,7 +1523,7 @@ msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" #: apply.c:5027 msgid "attempt three-way merge, fall back on normal patch if that fails" -msgstr "尝试三路合并，如果失败则尝试正常补丁模式" +msgstr "尝试三路合并，如果失败则回落至正常补丁模式" #: apply.c:5029 msgid "build a temporary index based on embedded index information" @@ -1535,9 +1537,9 @@ msgstr "路径以 NUL 字符分隔" msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "动作" @@ -1567,8 +1569,8 @@ msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" @@ -1580,7 +1582,7 @@ msgstr "允许不正确的文件末尾换行符" msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "根目录" @@ -1622,7 +1624,7 @@ msgstr "路径不是有效的 UTF-8：%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" @@ -1656,13 +1658,13 @@ msgid "cannot read %s" msgstr "不能读取 %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" @@ -1704,7 +1706,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "前缀" @@ -1715,7 +1717,7 @@ msgstr "为归档中每个路径名加上前缀" #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" @@ -1746,7 +1748,8 @@ msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "仓库" @@ -1754,7 +1757,7 @@ msgstr "仓库" msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "命令" @@ -1938,11 +1941,11 @@ msgstr "不能将 --contents 和最终的提交对象名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -2094,118 +2097,118 @@ msgstr "'%s' 已经检出到 '%s'" msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "未能识别的归档包哈希算法：%s" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "未知能力 '%s'" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 #: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "需要一个仓库来校验一个归档包" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个归档包中含有这个引用：" msgstr[1] "这个归档包中含有 %d 个引用：" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "这个归档包记录一个完整历史。" -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个归档包需要这个引用：" msgstr[1] "这个归档包需要 %d 个引用：" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "无法复制归档包描述符" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "不支持的归档包版本 %d" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "不能写入，归档包版本 %d 不支持算法 %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "不能创建空的归档包。" -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack 终止" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "终止块 ID 比预期更早出现" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "发现重复的块ID %<PRIx32>" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "最终块有非零 ID %<PRIx32>" @@ -2273,12 +2276,12 @@ msgstr "无法找到提交 %s" msgid "commit-graph requires overflow generation data but has none" msgstr "提交图需要溢出世代数据，但是没有" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" @@ -2340,7 +2343,7 @@ msgstr "正在查找提交图中额外的边" msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" @@ -2389,78 +2392,78 @@ msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用" msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2517 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2555 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2742,7 +2745,7 @@ msgstr "%s 的取值格式错误：%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" @@ -2762,110 +2765,110 @@ msgstr "引用 '%s' 没有指向一个数据对象" msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2560 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "不能 mmap '%s'" +msgid "unable to mmap '%s'%s" +msgstr "不能 mmap '%s'%s" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -3041,7 +3044,7 @@ msgstr "已阻止奇怪的路径名 '%s'" msgid "unable to fork" msgstr "无法 fork" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在检查连通性" @@ -3060,7 +3063,7 @@ msgstr "关闭 rev-list 的标准输入失败" #: convert.c:183 #, c-format msgid "illegal crlf_action %d" -msgstr "非法的 crlf 动作 %d" +msgstr "非法的 crlf_action %d" #: convert.c:196 #, c-format @@ -3160,23 +3163,23 @@ msgstr "意外的过滤类型" msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 过滤器 '%s' 失败" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 过滤器 %s 失败" @@ -3301,36 +3304,36 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "未知的 --diff-merges 取值：%s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "--merge-base 不适用于范围" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base 仅适用于提交" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "不能解析 HEAD" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "未找到合并基线" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "找到了多条合并基线" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<选项>] <路径> <路径>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3353,7 +3356,7 @@ msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " +"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 " "'plain'" #: diff.c:325 @@ -3385,35 +3388,46 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S" + +#: diff.c:4643 +msgid "" +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "---pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3422,200 +3436,200 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "选项 -I 的正则表达式无效：'%s'" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "差异输出格式化选项" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "生成补丁" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "不显示差异输出" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差异" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "机器友好的 --stat" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<参数1,参数2>..." -#: diff.c:5402 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<宽度>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<次数>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "显示带颜色的差异" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<类型>" -#: diff.c:5451 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" -#: diff.c:5454 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3623,311 +3637,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<前缀>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<字符>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "差异重命名选项" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "检测重命名" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "检测拷贝" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" msgstr "禁用重命名探测" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" -#: diff.c:5515 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "差异算法选项" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<正则>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "忽略所有行都和正则表达式匹配的变更" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<算法>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<文本>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<模式>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "其它差异选项" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "把所有文件当做文本处理" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<何时>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<格式>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<字符串>" -#: diff.c:5604 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" -#: diff.c:5607 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<路径>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "先显示指定路径的变更" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" msgstr "跳过指定路径的输出" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" msgstr "<对象 ID>" -#: diff.c:5624 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" -#: diff.c:5626 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "通过差异类型选择文件" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<文件>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "输出到一个指定的文件" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." -msgstr "因为文件太多，略过不严格的重命名检查。" +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "由于文件太多，跳过详尽的重命名检查。" -#: diff.c:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." -msgstr "因为文件太多，只在修改的路径中查找拷贝。" +msgstr "由于文件太多，只在修改的路径中找到了拷贝。" -#: diff.c:6293 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3938,7 +3952,7 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令 msgid "failed to read orderfile '%s'" msgstr "读取排序文件 '%s' 失败" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" @@ -3947,59 +3961,59 @@ msgstr "正在进行非精确的重命名探测" msgid "No such path '%s' in the diff" msgstr "在差异中无此路径 '%s'" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路径规格 '%s' 未匹配任何 git 已知文件" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "未识别的模式：'%s'" -#: dir.c:777 dir.c:791 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "未识别的反向模式：'%s'" -#: dir.c:809 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" -#: dir.c:819 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "禁止 cone 模式匹配" -#: dir.c:1206 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:2314 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2614 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2738 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3543 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3590 dir.c:3595 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3624 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" @@ -4009,11 +4023,11 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "过滤内容" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" @@ -4023,7 +4037,7 @@ msgstr "不能对文件 '%s' 调用 stat" msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能设置 GIT_DIR 为 '%s'" @@ -4162,7 +4176,7 @@ msgstr "服务器支持 %s" #: fetch-pack.c:1029 msgid "Server does not support shallow clients" -msgstr "服务器不支持 shalllow 客户端" +msgstr "服务器不支持浅客户端" #: fetch-pack.c:1089 msgid "Server does not support --shallow-since" @@ -4188,7 +4202,7 @@ msgstr "没有共同的提交" msgid "source repository is shallow, reject to clone." msgstr "源仓库是浅克隆，拒绝克隆。" -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" @@ -4204,13 +4218,13 @@ msgstr "服务器不支持算法 '%s'" #: fetch-pack.c:1279 msgid "Server does not support shallow requests" -msgstr "服务器不支持 shalllow 请求" +msgstr "服务器不支持浅克隆请求" #: fetch-pack.c:1286 msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "无法将请求写到远程" @@ -4266,24 +4280,24 @@ msgstr "处理要获取的引用出错：%d" msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack：预期响应结束包" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "来自远程的意外的 'ready'" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" @@ -4303,7 +4317,7 @@ msgstr "gpg 数据签名失败" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" +msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" #: grep.c:531 @@ -4314,18 +4328,18 @@ msgstr "" "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" "功能" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" -#: grep.c:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" @@ -4562,7 +4576,7 @@ msgstr "sparse:path 过滤器支持已被删除" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型" #: list-objects-filter-options.c:124 @@ -4607,7 +4621,7 @@ msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对 msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "无法为提交 %s 加载根树" @@ -4646,39 +4660,39 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包" #: mailinfo.c:1050 msgid "quoted CRLF detected" -msgstr "检测到引号中的换行符" +msgstr "检测到被引用的 CRLF" #: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s （没有检出）" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "无法合并子模组 %s（提交不存在）" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s （提交未跟随合并基线）" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "注意：快进子模组 %s 到 %s" -#: merge-ort.c:1172 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "无法合并子模组 %s" -#: merge-ort.c:1179 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4687,7 +4701,7 @@ msgstr "" "无法合并子模组 %s，但是存在一个可能的合并方案：\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4703,7 +4717,7 @@ msgstr "" "\n" "以接受此建议。\n" -#: merge-ort.c:1196 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4712,21 +4726,21 @@ msgstr "" "无法合并子模组 %s，但是存在多个可能的合并：\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4735,7 +4749,7 @@ msgstr "" "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" "在：%s。" -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4744,7 +4758,7 @@ msgstr "" "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" "径放置于此：%s" -#: merge-ort.c:1634 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4754,14 +4768,14 @@ msgstr "" "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目" "录中，没有一个目标目录中包含多数文件。" -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。" -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4769,7 +4783,7 @@ msgid "" msgstr "" "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4778,7 +4792,7 @@ msgstr "" "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" "动到 %5$s。" -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4787,7 +4801,7 @@ msgstr "" "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" "到 %s。" -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4796,13 +4810,13 @@ msgstr "" "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" "建议将其移动到 %5$s。" -#: merge-ort.c:2103 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。" -#: merge-ort.c:2198 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4812,60 +4826,64 @@ msgstr "" "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这" "可能导致嵌套的冲突标签。" -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2683 merge-ort.c:2707 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。" -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" -#: merge-ort.c:2981 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。" -#: merge-ort.c:3055 +#: merge-ort.c:3689 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." -msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，把它们都重命名以便每个能记录在不同位置。" +msgstr "" +"冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位" +"置。" -#: merge-ort.c:3062 +#: merge-ort.c:3696 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " "of them so each can be recorded somewhere." -msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的一个以便每个被记录在不同位置。" +msgstr "" +"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同" +"位置。" -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "内容" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "添加/添加" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "子模组" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-ort.c:3198 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4874,22 +4892,22 @@ msgstr "" "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本" "在树中被保留。" -#: merge-ort.c:3433 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " "copy renamed to %s" -msgstr "注意：%s 不是最新的，并且正在检出冲突的版本。旧副本重命名为 %s" +msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %s" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "无法收集树 %s、%s、%s 的合并信息" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4898,103 +4916,103 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "已经是最新的。" -#: merge-recursive.c:356 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "（坏提交）\n" -#: merge-recursive.c:379 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。" -#: merge-recursive.c:388 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" -#: merge-recursive.c:876 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "创建路径 '%s'%s 失败" -#: merge-recursive.c:887 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:910 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:956 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:981 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "打开 '%s' 失败：%s" -#: merge-recursive.c:992 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "创建符号链接 '%s' 失败：%s" -#: merge-recursive.c:997 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交：" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快进子模组 %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "无法合并子模组 %s （没发现合并跟随的提交）" -#: merge-recursive.c:1269 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "无法合并子模组 %s（非快进）" -#: merge-recursive.c:1270 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案：\n" -#: merge-recursive.c:1282 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" -#: merge-recursive.c:1424 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。" -#: merge-recursive.c:1496 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5003,7 +5021,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1501 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5012,7 +5030,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1508 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5021,7 +5039,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1513 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5030,40 +5048,40 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" -#: merge-recursive.c:1609 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" -#: merge-recursive.c:1667 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1698 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1703 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s" -#: merge-recursive.c:1730 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5072,18 +5090,18 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1827 +#: merge-recursive.c:1823 #, 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:2090 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5093,7 +5111,7 @@ msgstr "" "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" "其它目录，没有目录包含大部分文件。" -#: merge-recursive.c:2224 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5102,78 +5120,78 @@ msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " "%4$s->%5$s" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modify" msgstr "修改" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modified" msgstr "修改" -#: merge-recursive.c:3108 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:3161 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:3368 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:3391 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:3396 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:3403 +#: merge-recursive.c:3406 #, 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:3412 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:3421 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "冲突（add/add）：合并冲突于 %s" -#: merge-recursive.c:3474 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3568 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:3581 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:3631 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3796 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "不能写入索引。" @@ -5182,8 +5200,8 @@ msgstr "不能写入索引。" msgid "failed to read the cache" msgstr "读取缓存失败" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -5257,106 +5275,114 @@ msgstr "打开包索引 '%s' 失败" msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "无法存储反向索引文件" -#: midx.c:933 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略已存在的多包索引，校验码不匹配" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "添加包文件到多包索引" -#: midx.c:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "未知的首选包：'%s'" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "首选包 '%s' 已过期" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "没有要索引的包文件。" -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "删除 %s 失败" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "多包索引文件存在，但无法解析" -#: midx.c:1222 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "不正确的校验码" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c:1237 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "midx 不包含 oid" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "校验多包索引中的 OID 顺序" -#: midx.c:1260 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "正在对引用对象计数" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "正在查找和删除未引用的包文件" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" @@ -5373,7 +5399,7 @@ msgstr "不能创建 lazy_name 线程：%s" #: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" -msgstr "不能加入 lasy_name 线程：%s" +msgstr "不能加入 lazy_name 线程：%s" #: notes-merge.c:277 #, c-format @@ -5419,265 +5445,266 @@ msgstr "坏的 %s 值：'%s'" msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径：%s" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "无法读取替代文件" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: object-file.c:780 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: object-file.c:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析备用引用时无效的行：%s" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "mmap 失败" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "mmap 失败%s" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "无效的对象类型" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "文件写错误" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "不能写松散对象文件" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: object-file.c:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "损坏的提交" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "损坏的标签" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入数据库失败" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配（预期 %s）" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: object-file.c:2581 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "短对象ID %s 存在歧义" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "候选者有：" -#: object-name.c:796 +#: object-name.c:790 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" @@ -5698,22 +5725,22 @@ msgstr "" "引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n" "false\" 命令关闭本消息通知。" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "'%.*s' 的日志仅能回到 %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "'%.*s' 的日志仅有 %d 个条目" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5722,12 +5749,12 @@ msgstr "" "路径 '%s' 存在，而 '%s' 不存在\n" "提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "路径 '%s' 不在 '%.*s' 中" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5736,7 +5763,7 @@ msgstr "" "路径 '%s' 在索引中，但不在暂存区 %d 中\n" "提示：您的意思是 ':%d:%s'？" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5745,21 +5772,21 @@ msgstr "" "路径 '%s' 在索引中，但 '%s' 不在\n" "提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "路径 '%s' 在磁盘上，但不在索引里" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "不能在工作区之外使用相对路径语法" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "无效的对象名 '%.*s'。" @@ -5774,27 +5801,27 @@ msgstr "无效的对象类型 \"%s\"" msgid "object %s is a %s, not a %s" msgstr "对象 %s 是一个 %s，不是一个 %s" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "对象 %s 有未知的类型 id %d" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "无法得到 %s 的大小" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "无法得到 %s 的磁盘使用量" @@ -5847,12 +5874,17 @@ msgstr "无法写入 '%s' 承诺者文件" msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: packfile.c:1937 +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "包文件 %s 不能被映射%s" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" @@ -6054,8 +6086,8 @@ msgid "unable to write delim packet" msgstr "无法写 delim 包" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "无法写入无状态分隔符数据包" +msgid "unable to write response end packet" +msgstr "无法写入响应结束数据包" #: pkt-line.c:113 msgid "flush packet write failed" @@ -6114,19 +6146,19 @@ msgstr "无法创建线程 lstat：%s" msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote：无法派生 fetch 子进程" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote：无法向 fetch 子进程写入" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 远程名称不能以 '/' 开始：%s" @@ -6147,7 +6179,7 @@ msgstr "不能启动 `log`" msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6164,63 +6196,63 @@ msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'" msgid "could not parse git header '%.*s'" msgstr "无法解析 git 头 '%.*s'" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "生成 diff 失败" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "--left-only 和 --right-only 互斥" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" -#: read-cache.c:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "不能在对象数据库中创建空的数据对象" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能添加常规文件、符号链接或 git 目录" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 没有检出一个提交" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "无法索引文件 '%s'" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "刷新索引" -#: read-cache.c:1700 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6229,7 +6261,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6238,144 +6270,144 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "坏的索引文件 sha1 签名" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:332 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "索引文件损坏" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程：%s" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程：%s" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s：打开索引文件失败" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能对打开的索引执行 stat 操作" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引文件比预期的小" -#: read-cache.c:2238 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" -msgstr "%s：无法对索引文件执行 map 操作" +msgid "%s: unable to map index file%s" +msgstr "%s：无法映射索引文件%s" -#: read-cache.c:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程：%s" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程：%s" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" -#: read-cache.c:2392 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3138 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "无法转换为稀疏索引" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:3222 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" -#: read-cache.c:3234 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" -#: read-cache.c:3263 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" -#: read-cache.c:3412 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" @@ -6488,8 +6520,8 @@ msgstr "" "然而，如果您删除全部内容，变基操作将会终止。\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "不能写入 '%s'" @@ -6532,7 +6564,7 @@ msgstr "" msgid "could not read '%s'." msgstr "不能读取 '%s'。" -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "丢失" @@ -6551,247 +6583,247 @@ msgstr "落后 %d" msgid "ahead %d, behind %d" msgstr "领先 %d，落后 %d" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<颜色>)" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色：%%(color:%s)" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整数值 refname:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) 参数：%s" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不带参数" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "未能识别的 %%(objectsize) 参数：%s" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) 不带参数" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不带参数" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "未能识别的 %%(subject) 参数：%s" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "预期 %%(trailers:key=<值>)" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 参数：%s" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一个正数 contents:lines=%s" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) 参数：%s" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "未识别的邮件选项：%s" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<宽度>,<位置>)" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的位置：%s" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) 参数：%s" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) 参数：%s" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "格式错误的字段名：%.*s" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "未知的字段名：%.*s" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素" -#: ref-filter.c:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之后" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "错误的格式化字符串 %s" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "（非分支，正变基分离头指针 %s）" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "（头指针在 %s 分离）" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "（头指针自 %s 分离）" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "（非分支）" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1614 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" -#: ref-filter.c:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "格式错误的对象 '%s'" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" -#: ref-filter.c:2431 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2525 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "格式错误的对象名 %s" -#: ref-filter.c:2530 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "选项 `%s' 必须指向一个提交" @@ -7241,8 +7273,8 @@ msgstr "不能删除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "为 '%s' 记录 preimage" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" @@ -7280,38 +7312,38 @@ msgstr "不能打开 rr-cache 目录" msgid "could not determine HEAD revision" msgstr "不能确定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树。" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "不再支持 --unpacked=<packfile>" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2892 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "不能创建 async 线程：%s" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7344,27 +7376,27 @@ msgstr "send-pack：无法派生 fetch 子进程" #: send-pack.c:455 msgid "push negotiation failed; proceeding anyway with push" -msgstr "推送协商失败；无论如何继续推送" +msgstr "推送协商失败，但还是继续推送" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "接收端不支持这个仓库的哈希算法" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" -msgstr "接收端不支持签名推送" +msgstr "接收端不支持签名推送（--signed）" -#: send-pack.c:531 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" -msgstr "未发送推送证书，因为接收端不支持签名推送" +msgstr "未发送推送证书，因为接收端不支持签名推送（--signed）" -#: send-pack.c:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" -msgstr "接收端不支持原子推送" +msgstr "接收端不支持原子推送（--atomic）" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" @@ -7423,7 +7455,7 @@ msgid "could not lock '%s'" msgstr "不能锁定 '%s'" #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" @@ -7434,7 +7466,7 @@ msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" @@ -7484,8 +7516,8 @@ msgstr "在 '%.*s' 中没有 key" msgid "unable to dequote value of '%s'" msgstr "无法为 '%s' 的值去引号" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" @@ -7629,7 +7661,7 @@ msgstr "不能解析 HEAD" msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交！" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" @@ -7637,7 +7669,7 @@ msgstr "不能解析 HEAD 提交" msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" @@ -7655,12 +7687,13 @@ msgstr "无效的作者身份 '%s'" msgid "corrupt author: missing date information" msgstr "损坏的作者：缺失日期信息" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "写提交对象失败" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "不能更新 %s" @@ -7712,7 +7745,7 @@ msgstr "不能写 '%s'" msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "不能读取 HEAD" @@ -7853,7 +7886,7 @@ msgstr "不可用的 squash-onto" msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单：'%s'" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "提供了空的提交集" @@ -7884,7 +7917,7 @@ msgstr "不能创建序列目录 '%s'" msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" @@ -7896,7 +7929,7 @@ msgstr "不能解析 HEAD" msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" @@ -7944,7 +7977,7 @@ msgstr "" "您已经提交了么？\n" "试试 \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "不能读取 HEAD" @@ -8028,90 +8061,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并：'%.*s'" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" -msgstr "无法 autostash" +msgstr "无法自动贮藏" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" -msgstr "意外的 stash 响应：'%s'" +msgstr "意外的贮藏响应：'%s'" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "不能为 '%s' 创建目录" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" -msgstr "创建了 autostash：%s\n" +msgstr "创建了自动贮藏：%s\n" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" -msgstr "无法 reset --hard" +msgstr "无法硬性重置（reset --hard）" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" -msgstr "已应用 autostash。\n" +msgstr "已应用自动贮藏。\n" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -8122,29 +8155,29 @@ msgstr "" "您的修改在贮藏区中很安全。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "应用自动贮藏导致冲突。" -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。" -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -8164,58 +8197,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在变基（%d/%d）%s" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功变基并更新 %s。\n" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8224,50 +8257,50 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件：'%s'" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script：有未能处理的选项" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "make_script：准备版本时错误" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" @@ -8316,92 +8349,96 @@ msgstr "" msgid "unable to set up work tree using invalid config" msgstr "无法使用无效配置来创建工作区" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "发现未知的仓库扩展：" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "发现未知的仓库扩展：" +msgstr[1] "发现未知的仓库扩展：" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "仓库的版本是 0，但是发现仅用于 v1 的扩展：" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展：" +msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展：" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "打开 '%s' 出错" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大，无法作为 .git 文件：'%s'" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "读取 %s 出错" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式：%s" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径：%s" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "不是 git 仓库：%s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "不是 git 仓库：'%s'" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "获取 '%*s%s%s' 状态（stat）失败" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是 git 仓库（或者任何父目录）：%s" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8410,7 +8447,7 @@ msgstr "" "不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8419,27 +8456,27 @@ msgstr "" "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "不能打开或者复制 /dev/null" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "fork 失败" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid 失败" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "尝试在没有 cone 模式下使用稀疏索引" -#: sparse-index.c:156 +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" msgstr "不能更新缓存树，保持完整" -#: sparse-index.c:239 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "索引条目是一个目录，但不是稀疏的 (%08x)" @@ -8496,7 +8533,7 @@ msgid_plural "%u bytes/s" msgstr[0] "%u 字节/秒" msgstr[1] "%u 字节/秒" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" @@ -8564,55 +8601,55 @@ msgstr "路径规格 '%s' 在子模组 '%.*s' 中" msgid "bad --ignore-submodules argument: %s" msgstr "坏的 --ignore-submodules 参数：%s" -#: submodule.c:818 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。" -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交" -#: submodule.c:1006 +#: submodule.c:993 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'" -#: submodule.c:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "处理子模组 '%s' 失败" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: submodule.c:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "正在推送子模组 '%s'\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "无法推送子模组 '%s'\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "正在获取子模组 %s%s\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "无法访问子模组 '%s'\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8621,77 +8658,77 @@ msgstr "" "获取子模组时的错误：\n" "%s" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "无法将 '%s' 识别为 git 仓库" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中启动 'git status'" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中执行 'git status'" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "无法递归进子模组路径 '%s'" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "无法重置子模组索引" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模组 '%s' 中有脏索引" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模组 '%s' 无法被更新。" -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "禁止移动 '%s' 到现存 git 目录中" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8702,11 +8739,11 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" @@ -8743,7 +8780,7 @@ msgstr "尾注 '%.*s' 的键为空" msgid "could not read input file '%s'" msgstr "不能读取输入文件 '%s'" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "不能自标准输入读取" @@ -8831,7 +8868,7 @@ msgstr "协议不支持设置远程服务路径" msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "协议不支持该操作" @@ -8840,7 +8877,7 @@ msgstr "协议不支持该操作" msgid "can't connect to subservice %s" msgstr "不能连接到子服务 %s" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only 需要协议 v2" @@ -8973,53 +9010,53 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" msgid "could not read bundle '%s'" msgstr "无法读取归档包 '%s'" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "传输：无效的深度选项 '%s'" -#: transport.c:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "服务端选项需要版本 2 协议或更高" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "服务器不支持 wait-for-done" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 配置" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "协议 v2 的支持尚未实现" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "配置 '%s' 的取值未知：%s" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "传输 '%s' 不允许" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "不再支持 git-over-rsync" -#: transport.c:1181 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" -#: transport.c:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -9046,11 +9083,11 @@ msgstr "" "以推送至远程。\n" "\n" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "正在终止。" -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模组" @@ -9311,11 +9348,11 @@ msgstr "" "以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n" "并且碰撞组中只有一个文件存在工作区中：\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "正在更新索引标志" -#: unpack-trees.c:2608 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "工作树和未跟踪提交具有重复条目：%s" @@ -9357,99 +9394,99 @@ msgstr "无效的 '..' 路径片段" msgid "Fetching objects" msgstr "正在获取对象" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "读取 '%s' 失败" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件，错误码 %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "不是一个目录" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git 不是一个文件" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr ".git 文件损坏" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr ".git 文件不正确" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "不是一个有效的路径" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "无法定位仓库，.git 不是一个文件" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" msgstr "无法定位仓库，.git 文件没有指向一个仓库" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "无法定位仓库，.git 文件损坏" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "gitdir 不可读" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "gitdir 不正确" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "不是一个有效的目录" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "gitdir 文件不存在" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "无法读取 gitdir 文件（%s）" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "无效的 gitdir 文件" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "gitdir 文件指向一个不存在的位置" @@ -9502,11 +9539,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" @@ -9612,22 +9649,22 @@ msgstr "修改的内容, " msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:908 +#: wt-status.c:958 #, 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:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9635,7 +9672,7 @@ msgstr "" "不要改动或删除上面的一行。\n" "其下所有内容都将被忽略。" -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9646,77 +9683,77 @@ msgstr "" "花了 %.2f 秒才计算出分支的领先/落后范围。\n" "为避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1315 +#: wt-status.c:1365 #, 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:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1334 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -9724,202 +9761,206 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 -#: wt-status.c:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1376 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1387 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1399 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1409 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "拣选操作正在进行中。" -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （执行 \"git cherry-pick --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." msgstr "还原操作正在行中。" -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " （执行 \"git revert --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1486 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1497 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "您处于一个稀疏检出中。" + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." -msgstr "您处于稀疏签出状态，包含 %d%% 的跟踪文件" +msgstr "您处于稀疏检出状态，包含 %d%% 的跟踪文件" -#: wt-status.c:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "尚无提交" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9929,112 +9970,112 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1812 +#: wt-status.c:1870 #, 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:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1820 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" -#: wt-status.c:1828 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "尚无提交在 " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "不同" # 译者：注意保持句尾空格 -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "落后 " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "无法发送 IPC 命令" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "无法读取 IPC 响应" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:866 #, c-format msgid "could not start accept_thread '%s'" -msgstr "无法启动 accept_thread '%s'" +msgstr "无法启动 accept_thread '%s'" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "无法启动 '%s' 的 worker[0]" @@ -10071,7 +10112,7 @@ msgstr "删除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "不能读取索引" @@ -10106,8 +10147,8 @@ msgstr "不能应用 '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "演习" @@ -10116,7 +10157,7 @@ msgstr "演习" msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "交互式挑选数据块" @@ -10244,13 +10285,13 @@ msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file 与路径表达式参数不兼容" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul 需要 --pathspec-from-file" @@ -10269,105 +10310,105 @@ msgstr "" "运行下面的命令来关闭本消息\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "创建目录 '%s' 失败" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "拆分补丁失败。" -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1222 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" -#: builtin/am.c:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "补丁为空。" -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺失作者行" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识：%.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10375,24 +10416,24 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "提交内容为：" @@ -10400,39 +10441,39 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1823 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" -#: builtin/am.c:1867 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10442,7 +10483,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10453,106 +10494,106 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "清空索引失败" -#: builtin/am.c:2077 +#: builtin/am.c:2078 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:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "无效的 --show-current-patch 值：%s" -#: builtin/am.c:2230 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容" -#: builtin/am.c:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交说明中添加 Signed-off-by 尾注" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2289 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "传递给 git-mailinfo" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 #: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 @@ -10561,67 +10602,67 @@ msgstr "传递给 git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 #: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "恢复原始分支并终止打补丁操作" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" msgstr "终止补丁操作但保持 HEAD 不变" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "显示正在应用的补丁" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 #: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 #: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2376 +#: builtin/am.c:2377 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." @@ -10629,16 +10670,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "读取索引失败" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10647,11 +10688,11 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "交互式模式需要命令行上提供补丁" @@ -10744,62 +10785,62 @@ msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" msgid "could not write to file '%s'" msgstr "不能写入文件 '%s'" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一个有效的术语" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用内置命令 '%s' 作为术语" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改术语 '%s' 的含义" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "请使用两个不同的术语" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" msgstr "我们没有在二分查找。\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一个有效的提交" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" msgstr "坏的 bisect_write 参数：%s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "无法获取版本 '%s' 的对象 ID" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" msgstr "无法打开文件 '%s'" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10808,7 +10849,7 @@ msgstr "" "您需要给我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10819,7 +10860,7 @@ msgstr "" "然后需要提供我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一个 %s 提交的情况下二分查找" @@ -10828,22 +10869,22 @@ msgstr "在只有一个 %s 提交的情况下二分查找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "未定义术语" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10852,52 +10893,52 @@ msgstr "" "命令 'git bisect terms' 的参数 %s 无效。\n" "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" msgstr "版本遍历设置失败\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" msgstr "无法打开 '%s' 进行追加" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" msgstr "'' 不是一个有效的术语" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" msgstr "未识别的选项：'%s'" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起来不是一个有效的版本" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" msgstr "不会在做了 cg-seek 的树上做二分查找" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" msgstr "无效的引用：'%s'" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" msgstr "您需要执行 \"git bisect start\" 来开始\n" @@ -10905,104 +10946,104 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "您想让我为您这样做么[Y/n]？ " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" msgstr "请使用至少一个参数调用 `--bisect-state`" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' 只能带一个参数。" -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "坏的版本输入：%s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "坏的版本输入（不是提交）：%s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "我们没有在二分查找。" -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? 您在说什么?" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "不能读取文件 '%s' 来重放" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "清除二分查找状态" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "检查坏的或好的术语是否存在" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "打印二分查找术语" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "启动二分查找过程" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "查询下一个二分查找提交" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "标记引用的状态" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "列出到目前为止的二分查找步骤" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "从给定文件重放二分查找进程" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" msgstr "跳过要检出的一些提交" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 无日志" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 无需参数或者需要一个提交" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 个参数" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 个参数" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 需要 0 个参数" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 需要 0 个参数" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "未提供日志文件" @@ -11053,10 +11094,10 @@ msgstr "不把根提交作为边界（默认：关闭）" msgid "show work cost statistics" msgstr "显示工作消耗统计" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "强制显示进度报告" @@ -11104,7 +11145,7 @@ msgstr "显示作者的邮箱而不是名字（默认：关闭）" msgid "ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "版本" @@ -11158,7 +11199,7 @@ msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数 #: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" +msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -11688,19 +11729,19 @@ msgstr "git bundle list-heads <文件> [<引用名>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <文件> [<引用名>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "显示进度表" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" @@ -11712,29 +11753,29 @@ msgstr "指定归档包的格式版本" msgid "Need a repository to create a bundle." msgstr "需要一个仓库来创建归档包。" -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "不显示归档包的细节" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "需要一个仓库来解开归档包。" -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11742,7 +11783,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11750,71 +11791,71 @@ msgstr "" "git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] " "[--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "只能指定一个批处理选项" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "对于数据对象，对其内容做文本转换" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "对于数据对象，对其内容做过滤" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "数据对象" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 参数显示所有对象" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "不要对 --batch-all-objects 的输出排序" @@ -11842,8 +11883,8 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -11901,9 +11942,11 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<选项>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 +#: builtin/worktree.c:728 msgid "string" msgstr "字符串" @@ -11997,68 +12040,68 @@ msgstr "path '%s'：无法合并" msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "从 %2$s 更新了 %1$d 个路径" msgstr[1] "从 %2$s 更新了 %1$d 个路径" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "从索引区更新了 %d 个路径" msgstr[1] "从索引区更新了 %d 个路径" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都没有指定" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12067,51 +12110,51 @@ msgstr "" "不能继续，下列文件有暂存的修改：\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12132,7 +12175,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12159,19 +12202,19 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12180,7 +12223,7 @@ msgstr "" "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" "请使用 --（和可选的 --no-guess）来消除歧义" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12199,51 +12242,51 @@ msgstr "" "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" "名称，可以在配置中设置 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "只期望一个引用" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一个分支，得到标签 '%s'" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一个分支，得到远程分支 '%s'" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一个分支，得到 '%s'" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一个分支，得到提交 '%s'" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12251,7 +12294,7 @@ msgstr "" "不能在合并时切换分支\n" "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12259,7 +12302,7 @@ msgstr "" "不能在一个 am 会话期间切换分支\n" "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12267,7 +12310,7 @@ msgstr "" "不能在变基时切换分支\n" "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12275,7 +12318,7 @@ msgstr "" "不能在拣选时切换分支\n" "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12283,207 +12326,208 @@ msgstr "" "不能在还原时切换分支\n" "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "您在执行二分查找时切换分支" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不带 <起始点>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "风格" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c、-%c 和 --orphan 是互斥的" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名，尝试 -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "无法解析 %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 与 --detach 不兼容" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file 与 --patch 不兼容" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 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/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "您必须指定一个要恢复的路径" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜测 'git checkout <无此分支>'（默认）" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "使用叠加模式（默认）" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "创建并切换一个新分支" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "创建/重置并切换一个分支" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜测 'git switch <无此分支>'" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "丢弃本地修改" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "要检出哪一个树" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "恢复索引" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "恢复工作区（默认）" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "忽略未合并条目" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "使用叠加模式" @@ -12518,7 +12562,7 @@ msgstr "将忽略仓库 %s\n" msgid "could not lstat %s\n" msgstr "不能对 %s 调用 lstat\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12531,7 +12575,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12552,33 +12596,33 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12596,66 +12640,66 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "强制" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 #: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:929 +#: builtin/clean.c:925 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:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" @@ -12671,7 +12715,7 @@ msgstr "不克隆浅仓库" msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "创建一个纯仓库" @@ -12703,26 +12747,26 @@ msgstr "在克隆时初始化子模组" msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "名称" @@ -12739,7 +12783,7 @@ msgstr "检出 <分支> 而不是远程 HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "深度" @@ -12748,7 +12792,7 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "时间" @@ -12766,8 +12810,8 @@ msgstr "版本" msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" @@ -12779,11 +12823,11 @@ msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" @@ -12796,22 +12840,22 @@ msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "server-specific" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "传输选项" #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" @@ -12910,7 +12954,7 @@ msgstr "无法执行 repack 来清理" msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "太多参数。" @@ -12932,7 +12976,7 @@ msgstr "--bare 和 --separate-git-dir 选项不兼容。" msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" @@ -12953,7 +12997,7 @@ msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" @@ -13008,12 +13052,16 @@ msgstr "源仓库是浅克隆，忽略 --local" msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "远程传输报告错误" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -13072,7 +13120,7 @@ msgid "could not find object directory matching %s" msgstr "无法找到和 %s 匹配的对象目录" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "目录" @@ -13166,7 +13214,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重复的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "不是一个有效的对象名 %s" @@ -13194,13 +13242,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交对象 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 #: builtin/tag.c:456 msgid "message" msgstr "说明" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "提交说明" @@ -13208,7 +13256,7 @@ msgstr "提交说明" msgid "read commit log message from file" msgstr "从文件中读取提交说明" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交签名" @@ -13353,7 +13401,7 @@ msgid "" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" @@ -13389,7 +13437,42 @@ msgstr "不能读取 MERGE_MSG" msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:900 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n" + +#: builtin/commit.c:895 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" +"说明将会终止提交。\n" + +#: builtin/commit.c:899 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" +"也可以删除它们。\n" + +#: builtin/commit.c:903 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" +"也可以删除它们。一个空的提交说明将会终止提交。\n" + +#: builtin/commit.c:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13402,7 +13485,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "然后重试。\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13415,393 +13498,375 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "然后重试。\n" -#: builtin/commit.c:915 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" -"说明将会终止提交。\n" - -#: builtin/commit.c:923 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n" -"也可以删除它们。一个空的提交说明将会终止提交。\n" - # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "无法将尾注传递给 --trailers" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "您正处于一个合并过程中 -- 无法改写说明。" -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "您正处于一个拣选过程中 -- 无法改写说明。" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" -msgstr "不能将 --fixup 的 reword 选项和路径 '%s' 组合使用" +msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用" -#: builtin/commit.c:1226 +#: builtin/commit.c:1233 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" -msgstr "--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥" +msgstr "" +"--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥" -#: builtin/commit.c:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正处于一个变基过程中 -- 无法修补提交。" -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知选项：--fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "版本" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 #: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "模式" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1497 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "何时" -#: builtin/commit.c:1500 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "作者" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "日期" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 #: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "提交" -#: builtin/commit.c:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]提交" -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "尾注" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "添加自定义尾注" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "添加 Signed-off-by 尾注" -#: builtin/commit.c:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "强制编辑提交" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1737 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1744 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" -msgstr "终止提交因为提交说明的正文为空。\n" +msgstr "因提交说明的正文为空而终止提交。\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14429,65 +14494,65 @@ msgstr "临时文件存在于 '%s'。" msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "工具" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出" -#: builtin/difftool.c:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "传递给 `diff`" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作区或者 --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff 和 --no-index 不兼容" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui、--tool 和 --extcmd 互斥" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> 参数提供 <工具>" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" @@ -14510,14 +14575,14 @@ msgstr "安静模式，只使用 git_env_*() 的值作为退出码" #: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值，不是 `%s`" +msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值，不是 `%s`" #: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" "%s`" -msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型，不是 `%s`" +msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型，不是 `%s`" #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" @@ -14575,7 +14640,7 @@ msgstr "使用 done 功能来终止流" msgid "skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "引用规格" @@ -14888,8 +14953,8 @@ msgstr "%s 未发送所有必需的对象\n" #: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "拒绝 %s 因为浅克隆不允许被更新" +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "拒绝 %s 因为浅克隆的根不允许被更新" #: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format @@ -14989,58 +15054,62 @@ msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定， msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1995 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "在使用 --negotiate-only 时必须提供远程仓库" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "协议不支持 --negotiate-only，退出。" -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" -msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" +msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic 仅在从一个远程仓库获取的时候可用" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 仅在从一个远程仓库获取的时候可用" @@ -15133,19 +15202,19 @@ msgstr "只打印不包含该提交的引用" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<配置> <命令参数>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "配置" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "存储着仓库路径列表的配置项键名" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "缺少 --config=<配置>" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "未知" @@ -15161,16 +15230,16 @@ msgstr "%s %s 错误：%s" msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "来自 %7s %s 的损坏的链接" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "链接中错误的对象类型" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15179,211 +15248,211 @@ msgstr "" "损坏的链接来自于 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "缺失 %s %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "不可达 %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "悬空 %s %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "不能创建 lost-found" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "正在检查 %s" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在检查连通性（%d 个对象）" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "正在检查 %s %s" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "损坏的链接" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "标记 %s %s (%s) 于 %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：对象损坏或丢失" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：无效的引用日志条目 %s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "正在检查引用日志 %s->%s" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：无效的 sha1 指针 %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s：不是一个提交" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "注意：无默认引用" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：对象损坏或丢失：%s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析对象：%s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "坏的 sha1 文件：%s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "正在检查对象目录" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "正在检查对象目录" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "正在检查 %s 链接" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的东西（%s）" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分离头指针的指向不存在" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "正在检查缓存树" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中无效的 sha1 指针" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "显示悬空的对象" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s：对象缺失" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数：期望 sha1，得到 '%s'" @@ -15661,8 +15730,8 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" @@ -15677,242 +15746,242 @@ msgstr "无法读取树（%s）" msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" msgstr "显示第一个匹配的列号" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" msgstr "只显示行中的匹配的部分" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "分页" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" msgstr "未提供匹配模式" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支持和 --recurse-submodules 共用" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合，忽略 --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked 不能与 --cached 同时使用" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用于已跟踪内容" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" msgstr "同时给出了 --cached 和树对象" @@ -16035,30 +16104,30 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串：%s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" @@ -16096,7 +16165,7 @@ msgstr "输入上的读错误" msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" @@ -16123,238 +16192,238 @@ msgstr "包签名不匹配" msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:585 #, 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:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "应用 delta 失败" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1287 #, 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:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1303 #, 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:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "包文件名 '%s' 没有以 '.%s' 结尾" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1701 +#: builtin/index-pack.c:1699 #, 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:1708 +#: builtin/index-pack.c:1706 #, 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:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的哈希算法 '%s'" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin 需要 git 仓库" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" @@ -16398,56 +16467,56 @@ msgstr "没有在 %s 中找到模版" msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "无效的初始分支名：'%s'" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "尝试用不同的哈希算法重新初始化仓库" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init：已忽略 --initial-branch=%s" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" +msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16455,53 +16524,53 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "覆盖初始分支名称" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "指定要使用的哈希算法" -#: builtin/init-db.c:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir 和 --bare 是互斥的" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, 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:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 不能用于纯仓库" @@ -16608,85 +16677,85 @@ msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<范围>:<文件> 不能和路径表达式共用" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：从描述生成附函的模式无效" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "只需要一个范围" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "不是一个范围" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "无法创建附函文件" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "无法将 '%s' 解析为一个有效引用" -#: builtin/log.c:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "不能找到准确的合并基线" -#: builtin/log.c:1529 +#: builtin/log.c:1532 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" @@ -16696,288 +16765,288 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "无法推断当前系列的 range-diff 起始" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "使用 '%s' 作为当前系列的 range-diff 源" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "重制-计数" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "输出文件名的最大长度" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "从分支描述获取附函的模式" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "header" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "标识" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "边界" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "签名" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" -msgstr "在附函或单个补丁中显示和 <rev> 的差异" +msgstr "在附函或单个补丁中显示和 <版本> 的差异" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" -msgstr "在附函或单个补丁中显示和 <refspec> 的差异" +msgstr "在附函或单个补丁中显示和 <引用规格> 的差异" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout、--output 和 --output-directory 是互斥的" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "版本间差异：" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "范围差异：" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17184,7 +17253,7 @@ msgstr "保持主题" #: builtin/mailinfo.c:60 msgid "keep non patch brackets in subject" -msgstr "在标题保持无补丁括号标注" +msgstr "在主题中保持无补丁括号标注" #: builtin/mailinfo.c:62 msgid "copy Message-ID to the end of commit message" @@ -17216,11 +17285,11 @@ msgstr "<动作>" #: builtin/mailinfo.c:74 msgid "action when quoted CR is found" -msgstr "找到引用的 CR 时的操作" +msgstr "找到引号中的 CR 时的操作" #: builtin/mailinfo.c:77 msgid "use headers in message's body" -msgstr "在消息正文中使用标题" +msgstr "在消息正文中使用标头" #: builtin/mailsplit.c:241 #, c-format @@ -17342,14 +17411,6 @@ msgstr "合并 %s 和 %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" @@ -17492,36 +17553,36 @@ msgstr "无合并信息 -- 未更新 HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17531,83 +17592,83 @@ msgstr "" "合并到主题分支。\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "空的提交说明会终止提交。\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit 不带参数" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17615,7 +17676,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17623,88 +17684,88 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 和 --no-ff 组合使用。" -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "您不能将 --squash 和 --commit 组合使用。" -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "使用 %s 以准备手工解决。\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "使用 %s 策略以准备手工解决。\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -17726,7 +17787,7 @@ msgstr "错误：标签输入未通过 fsck：%s" #: builtin/mktag.c:41 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" -msgstr "%d（忽略 FSCK?）不应该触发这个调用" +msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调" #: builtin/mktag.c:56 #, c-format @@ -17800,7 +17861,7 @@ msgid "" "larger than this size" msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "未识别的子命令：%s" @@ -18329,7 +18390,7 @@ msgstr "尝试删除不存在的注解不是一个错误" msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "不删除，只显示" @@ -18345,22 +18406,22 @@ msgstr "注解引用" msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18368,106 +18429,106 @@ msgid "" msgstr "" "write_reuse_object：无法定位 %1$s，预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 个对象，预期 %<PRIu32> 个" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "对象计数中" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "次优（suboptimal）打包 - 内存不足" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "不一致的差异计数" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18476,23 +18537,23 @@ msgstr "" "uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格" "式（得到 '%s'）" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3199 #, c-format msgid "could not get type of object %s in pack %s" msgstr "无法获得包 %2$s 中对象 %1$s 的类型" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "不能找到包 '%s'" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18501,7 +18562,7 @@ msgstr "" "预期边界对象（edge object）ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18510,246 +18571,246 @@ msgstr "" "预期对象 ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "选项 --missing 的值无效" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "无法打开包文件索引" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "无法强制松散对象" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "无法添加最近的对象" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<版本>[,<偏移>]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "从标准输入读取包" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可达性算法" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "忽略该 pack" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "显示被移植隐藏的提交" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "如果可能，写 bitmap 索引" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "处理丢失的对象" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor 包文件中的对象" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "在增量压缩时参考数据岛" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "协议" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量链深度 %d 太深了，强制为 %d" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 来构建传输用的包文件" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包文件大小是 1 MiB" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "不能在没有 --stdout 的情况下使用 --filter" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" msgstr "不能同时使用 --filter 和 --stdin-packs" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "不能同时使用内部版本列表和 --stdin-packs" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "枚举对象中" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18959,19 +19020,19 @@ msgstr "" "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n" "或者 --ff-only 参数覆盖缺省设置。\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "请提交或贮藏它们。" -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18981,7 +19042,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18998,15 +19059,15 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本地子模组中有修改，无法变基" @@ -19068,7 +19129,7 @@ msgstr "" "\n" " git push %s HEAD:<远程分支名字>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -19081,12 +19142,17 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。" + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -19096,12 +19162,7 @@ msgstr "" "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n" "而没有告诉我要推送什么、更新哪个远程分支。" -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。" - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -19112,7 +19173,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:273 +#: builtin/push.c:264 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" @@ -19123,7 +19184,7 @@ msgstr "" "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:279 +#: builtin/push.c:270 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" @@ -19136,11 +19197,11 @@ msgstr "" "（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒绝，因为该标签在远程已经存在。" -#: builtin/push.c:289 +#: builtin/push.c:280 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" @@ -19149,7 +19210,7 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -19159,103 +19220,103 @@ msgstr "" "更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n" "在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失败" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "仓库" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送标签（不能使用 --all or --mirror）" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "要求远程更新在本地被整合" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "推送缺失但有关的标签" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "用 GPG 为推送签名" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "需要远端支持原子事务" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "坏的仓库 '%s'" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19276,27 +19337,27 @@ msgstr "" "\n" " git push <名称>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规格同时使用" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规格同时使用" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "推送选项不能有换行符" @@ -19841,7 +19902,7 @@ msgstr "应用所有更改，甚至那些已在上游存在的" #: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "看起来 'git-am' 正在执行中。无法变基。" +msgstr "看起来 'git am' 正在执行中。无法变基。" #: builtin/rebase.c:1483 msgid "" @@ -19868,7 +19929,7 @@ msgstr "没有正在进行的变基？" msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" @@ -19973,8 +20034,8 @@ msgstr "没有指向一个有效的提交 '%s'" msgid "fatal: no such branch/commit '%s'" msgstr "致命错误：无此分支/提交 '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "没有这样的引用：%s" @@ -20042,7 +20103,7 @@ msgstr "快进 %s 到 %s。\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <仓库目录>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 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" @@ -20068,7 +20129,7 @@ msgstr "" "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n" "配置变量为 'refuse'。" -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 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" @@ -20087,11 +20148,11 @@ msgstr "" "\n" "若要屏蔽此信息，您可以设置它为 'refuse'。" -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "您必须指定一个目录。" @@ -21060,15 +21121,15 @@ msgstr "只能为 -l 提供一个模式" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "在索引中注册干净的解决方案" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "没有路径的 'git rerere forget' 已经过时" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "无法为 '%s' 生成差异" @@ -21219,19 +21280,19 @@ msgstr "不能重置索引文件至版本 '%s'。" msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "对象过滤需要 --objects" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "标记计数和 --objects 不兼容" @@ -21251,6 +21312,18 @@ msgstr "遇到第一个非选项参数后停止解析" msgid "output in stuck long form" msgstr "以固定长格式输出" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "输入过早结束" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "在 `--' 分隔符之前没有给出使用方法字符串" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "需要一个单独的版本" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -21265,6 +21338,50 @@ msgstr "" "\n" "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir 需要一个参数" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "不是一个git目录 '%s'" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path 需要一个参数" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n 需要一个参数" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format 需要一个参数" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "未知的 --path-format 参数：%s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default 需要一个参数" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix 需要一个参数" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "未知的 --abbrev-ref 模式：%s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "未知的 --show-object-format 模式：%s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<选项>] <提交号>..." @@ -21746,37 +21863,37 @@ msgstr "无法修改 sparse-index 配置" msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "无法规范化路径 %s" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <模式>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "无法为 C 语言风格的字符串 '%s' 去引号" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "无法加载现存的稀疏检出模式" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "从标准输入读取模式" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" @@ -21800,10 +21917,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" @@ -21953,93 +22066,93 @@ msgstr "在贮藏中包含未跟踪文件" msgid "only show untracked files in the stash" msgstr "仅显示贮藏中的未跟踪文件" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "无法用 %2$s 更新 %1$s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "贮藏说明" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一个 <提交> 参数" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "没有选择变更" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "无法保存当前索引状态" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "无法保存未跟踪文件" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "无法保存当前工作区状态" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "不能记录工作区状态" -#: builtin/stash.c:1408 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "您是否忘了执行 'git add'？" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "无法初始化贮藏" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "保存工作目录和索引状态 %s" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "以补丁模式贮藏" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "静默模式" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "贮藏中包含未跟踪文件" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "包含忽略的文件" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22063,40 +22176,41 @@ msgstr "跳过和移除所有的注释行" msgid "prepend comment character and space to each line" msgstr "为每一行的行首添加注释符和空格" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用名称，却得到 %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote 不带参数" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "无法从 url '%s' 剥离一个组件" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记（anchor）" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "进入 '%s'\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22105,7 +22219,7 @@ msgstr "" "对 %s 执行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22115,169 +22229,169 @@ msgstr "" "在递归 %s 的子模组执行 run_command 时返回非零值。\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "抑制进入每一个子模组命令的输出" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "递归进入嵌套子模组中" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" -#: builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "无法为子模组 '%s' 注册 url" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建议子模组 '%s' 使用命令更新模式\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "无法为子模组 '%s' 注册更新模式" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "抑制子模组初始化的输出" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<选项>] [<路径>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "无法解析子模组 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "递归子模组 '%s' 失败" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "抑制子模组状态输出" -#: builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路径>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s（数据对象）->%s（子模组）" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s（子模组）->%s（数据对象）" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "不能从 '%s' 创建哈希对象" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "意外的模式 %o\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" +#: builtin/submodule--helper.c:1304 +msgid "compare the commit in the index with that in the submodule HEAD" msgstr "比较存储在索引和子模组 HEAD 中的提交" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "限制总结的大小" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "不能为 HEAD 获取一个版本" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached 和 --files 是互斥的" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "为 '%s' 同步子模组 url\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "无法为子模组路径 '%s' 注册 url" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "无法得到子模组 '%s' 的默认远程关联" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "无法为子模组 '%s' 更新远程关联" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "抑制子模组 URL 同步的输出" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22286,52 +22400,52 @@ msgstr "" "子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm " "-rf' 命令）" -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目录 '%s'\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "无法移除子模组工作区 '%s'\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能创建空的子模组目录 %s" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "删除子模组工作区，即使包含本地修改" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "将所有子模组取消注册" -#: builtin/submodule--helper.c:1631 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1690 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22343,46 +22457,67 @@ msgstr "" "Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n" "'--reference' 来克隆。" -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模组 '%s' 不能添加仓库备选：%s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" +msgstr "不能识别 submodule.alternateLocation 的取值 '%s'" + +#: builtin/submodule--helper.c:1800 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'" + +#: builtin/submodule--helper.c:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "无法克隆 '%s' 到子模组路径 '%s'" + +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "目录非空：'%s'" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "无法得到 '%s' 的子模组目录" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "新子模组的名称" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "克隆子模组的 url 地址" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "强制显示克隆进度" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "不允许克隆到一个非空目录" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22391,186 +22526,220 @@ msgstr "" "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " "[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>" -#: builtin/submodule--helper.c:1874 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'" - -#: builtin/submodule--helper.c:1885 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "无法克隆 '%s' 到子模组路径 '%s'" - -#: builtin/submodule--helper.c:1889 -#, c-format -msgid "directory not empty: '%s'" -msgstr "目录非空：'%s'" - -#: builtin/submodule--helper.c:1901 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "无法得到 '%s' 的子模组目录" - -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模组 '%s' 尚未初始化" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "也许您想要执行 'update --init'？" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略过未合并的子模组 %s" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "略过子模组 '%s'" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次尝试克隆 '%s' 失败，退出" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "到工作区的路径" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区中的路径，递归嵌套子模组" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" msgstr "并发任务" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始克隆是否应该遵守推荐的浅克隆选项" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "不要输出克隆进度" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "update 参数取值错误" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2435 #, 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:2542 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "无法获得子模组 '%s' 的仓库句柄" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "在子模组中递归" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr "检查写入 .gitmodules 文件是否安全" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 文件中的设置" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名称> [<值>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名称>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "请确认 .gitmodules 文件在工作区里" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "抑制设置子模组 URL 的输出" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "设置默认跟踪分支为 master" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "设置默认跟踪分支" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch 和 --default 是互斥的" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "向索引中添加位于 '%s' 的已存在的仓库\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "'%s' 已存在并且不是一个有效的 git 仓库" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "发现一个本地 git 目录 '%s' 及其远程仓库：" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"如果您想要重用这个本地 git 目录而非重新克隆自\n" +" %s\n" +"使用 '--force' 选项。如果本地 git 目录不是正确的仓库，或者如果您不确定这里\n" +"的含义，使用 '--name' 选项指定另外的名称。\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "为子模组 '%s' 重新激活本地 git 目录\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "无法检出子模组 '%s'" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "克隆仓库时要检出的分支" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "允许添加一个被忽略的子模组路径" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --name <名称>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" @@ -23185,7 +23354,7 @@ msgstr "git worktree remove [<选项>] <工作区>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "删除 '%s' 失败" @@ -23195,25 +23364,25 @@ msgstr "删除 '%s' 失败" msgid "Removing %s/%s: %s" msgstr "删除 %s/%s: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "报告清除的工作区" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "将早于 <时间> 的工作区过期" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "'%s' 已经存在" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "无法使用的工作区目标 '%s'" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23222,7 +23391,7 @@ msgstr "" "'%s' 是一个丢失但锁定的工作区，\n" "使用 '%s -f -f' 覆盖，或用 'unlock' 和 'prune' 或 'remove' 清除" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23231,27 +23400,31 @@ msgstr "" "'%s' 是一个丢失但已经注册的工作区，\n" "使用 '%s -f' 覆盖，或用 'prune' 或 'remove' 清除" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "初始化" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区（新分支 '%s'）" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "准备工作区（重置分支 '%s'，之前为 %s）" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "准备工作区（检出 '%s'）" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区（分离头指针 %s）" @@ -23276,82 +23449,90 @@ msgstr "生成新的工作区" msgid "keep the new working tree locked" msgstr "锁定新工作区" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "锁定原因" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "设置跟踪模式（参见 git-branch(1)）" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "尝试为新分支名匹配一个远程跟踪分支" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:565 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "--reason 需要 --lock" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "由 --lock 添加" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在创建新分支时使用选项 --[no-]track " -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "显示扩展的注释和原因（如果有）" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "向早于 <时间> 的工作区添添加“可修剪”注释" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose 和 --porcelain 互斥" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "锁定原因" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定，原因：%s" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移动或删除包含子模组的工作区" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "强制移动，即使工作区是脏的或已锁定" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一个主工作区" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "无法从 '%s' 算出目标名称" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23360,7 +23541,7 @@ msgstr "" "无法移动一个锁定的工作区，锁定原因：%s\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23368,36 +23549,36 @@ msgstr "" "无法移动一个锁定的工作区，\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "验证失败，无法移动工作区：%s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移动 '%s' 到 '%s' 失败" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中执行 'git status' 失败" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "强制删除，即使工作区是脏的或已锁定" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23406,7 +23587,7 @@ msgstr "" "无法删除一个锁定的工作区，锁定原因：%s\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23414,17 +23595,17 @@ msgstr "" "无法删除一个锁定的工作区，\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "验证失败，无法删除工作区：%s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "修理：%s：%s" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "错误：%s：%s" @@ -23620,7 +23801,7 @@ msgstr "test-tool serve-v2 [<选项>]" #: t/helper/test-serve-v2.c:19 msgid "exit immediately after advertising capabilities" -msgstr "对能力广告之后立即退出" +msgstr "通告能力之后立即退出" #: t/helper/test-simple-ipc.c:262 #, c-format @@ -23684,7 +23865,9 @@ msgstr "test-helper simple-ipc sendbytes [<名字>] [<字节数>] [<字节>]" msgid "" "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " "[<batchsize>]" -msgstr "test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大小>]" +msgstr "" +"test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大" +"小>]" #: t/helper/test-simple-ipc.c:696 msgid "name or pathname of unix domain socket" @@ -23762,7 +23945,7 @@ msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构 msgid "Could not set SSL backend to '%s': already set" msgstr "无法将 SSL 后端设置为 '%s'：已经设置" -#: http.c:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23812,95 +23995,95 @@ msgstr "无法访问 '%s'：%s" msgid "redirecting to %s" msgstr "重定向到 %s" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "远程服务器发送了无状态分隔符" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" +msgstr "远程服务器发送意外的响应结束数据包" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl：错误的行宽字符：%.4s" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl：意外响应结束包" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "RPC 失败。%s" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "不能处理这么大的推送" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "不能压缩请求，zlib 压缩错误 %d" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "不能压缩请求，zlib 结束错误 %d" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "收到了 %d 字节长度的头信息" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "预期仍然需要 %d 个字节的正文" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" -msgstr "哑 http 传输不支持 shalllow 能力" +msgstr "哑 http 传输不支持浅克隆能力" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "获取失败。" -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "无法通过智能 HTTP 获取 sha1" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "协议错误：期望 sha/ref，却得到 '%s'" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "http 传输协议不支持 %s" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "git-http-push 失败" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl：用法：git remote-curl <远程> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl：错误读取来自 git 的命令流" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl：尝试没有本地仓库下获取" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的来自 git 的命令 '%s'" @@ -24740,81 +24923,41 @@ msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' 没有检出的提交" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "添加位于 '$sm_path' 的现存仓库到索引" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" - -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"如果您想要重用这个本地 git 目录而非重新克隆自\n" -" $realrepo\n" -"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" -"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。" - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "激活本地 git 目录到子模组 '$sm_name'。" - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "不能检出子模组 '$sm_path'" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, 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:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1：" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24822,47 +24965,47 @@ msgid "" msgstr "" "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" @@ -25561,39 +25704,39 @@ msgstr "未知的 --patch 模式：%s" msgid "invalid argument %s, expecting --" msgstr "无效的参数 %s，期望是 --" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本地时间和 GMT 有不到一分钟间隔\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本地时间偏移量大于等于 24 小时\n" -#: git-send-email.perl:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "编辑器非正常退出，终止所有操作" -#: git-send-email.perl:321 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" -#: git-send-email.perl:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含编辑的邮件。\n" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它选项不兼容\n" -#: git-send-email.perl:493 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25603,47 +25746,47 @@ msgstr "" "git-send-email 通过 sendemail.* 选项进行设置，注意字母 'e'。\n" "设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在仓库之外运行 git format-patch\n" -#: git-send-email.perl:501 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n" -#: git-send-email.perl:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 字段：'%s'\n" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 设置：'%s'\n" -#: git-send-email.perl:573 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支持带引号的 sendmail 别名：%s\n" -#: git-send-email.perl:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支持 `:include:`：%s\n" -#: git-send-email.perl:577 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能识别的 sendmail 行：%s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25658,12 +25801,12 @@ msgstr "" " * 如果含义为一个文件，使用 \"./%s\"，或者\n" " * 如果含义为一个范围，使用 --format-patch 选项。\n" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "无法打开目录 %s: %s" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -25673,17 +25816,17 @@ msgstr "" "未指定补丁文件！\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中没有标题行？" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "为写入打开 %s 失败: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25696,37 +25839,37 @@ msgstr "" "\n" "如果您不想发送摘要，清除内容。\n" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "无法打开 %s: %s" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "无法打开 %s.final: %s" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "摘要邮件为空，跳过\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您确认要使用 <%s> [y/N]？" -#: git-send-email.perl:928 +#: git-send-email.perl:990 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:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？" -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25738,20 +25881,20 @@ msgstr "" "\t%s\n" "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "邮件将要发送给谁？" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命错误：别名 '%s' 扩展为它自己\n" -#: git-send-email.perl:990 +#: git-send-email.perl:1052 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:1048 git-send-email.perl:1056 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" @@ -25759,16 +25902,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:1060 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路径 \"%s\" 不存在" -#: git-send-email.perl:1460 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25793,112 +25936,112 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "发送要求的邮件回复" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 服务器未被正确定义。" -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "服务器不支持 STARTTLS！%s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失败！%s" -#: git-send-email.perl:1571 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" -#: git-send-email.perl:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "无法发送 %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "演习发送 %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "正发送 %s\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "演习成功。日志说：\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK。日志说：\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "结果：" -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "结果：OK\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "无法打开文件 %s" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1680 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 添加 to：%s 自行 '%s'\n" -#: git-send-email.perl:1737 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1772 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 添加 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能执行 '%s'" -#: git-send-email.perl:1890 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 添加 %s: %s 自：'%s'\n" -#: git-send-email.perl:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 无法关闭管道至 '%s'" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式发送信息" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "无效的传送编码" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -25909,27 +26052,27 @@ msgstr "" "%s\n" "警告：补丁未能发送\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能打开 %s：%s\n" -#: git-send-email.perl:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" "warning: no patches were sent\n" msgstr "" -"致命错误：%s:%d 超过 998 字节\n" +"致命错误：%s:%d 超过 998 字符\n" "警告：补丁未能发送\n" -#: git-send-email.perl:1997 +#: git-send-email.perl:2082 #, 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:2001 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要发送 %s？[y|N]：" |