diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2020-07-10 10:32:01 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2020-07-21 16:31:13 +0800 |
commit | 7157c2b5c9b5f488eb5ce6ece3150935813a264c (patch) | |
tree | 2c0333a60d54f4f602abf33f2da51ff6966eb208 /po/zh_CN.po | |
parent | Merge branch 'l10n/zh_TW/200716' of github.com:l10n-tw/git-po (diff) | |
download | tgif-7157c2b5c9b5f488eb5ce6ece3150935813a264c.tar.xz |
l10n: zh_CN: for git v2.28.0 l10n round 1
Translate 70 new messages (4931t0f0u) for git 2.28.0.
Reviewed-by: Fangyi Zhou <me@fangyi.io>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r-- | po/zh_CN.po | 2490 |
1 files changed, 1368 insertions, 1122 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index ee0e6bee0d..a531819623 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -139,8 +139,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-05-27 07:23+0800\n" -"PO-Revision-Date: 2020-05-27 07:39+0800\n" +"POT-Creation-Date: 2020-07-10 09:53+0800\n" +"PO-Revision-Date: 2020-07-17 10: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" @@ -242,21 +242,21 @@ msgstr[1] "增加了 %d 个路径\n" msgid "ignoring unmerged: %s" msgstr "忽略未合入的:%s" -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 +#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 +#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" -#: add-interactive.c:935 git-add--interactive.perl:1376 +#: add-interactive.c:935 git-add--interactive.perl:1378 msgid "Patch update" msgstr "补丁更新" -#: add-interactive.c:974 git-add--interactive.perl:1754 +#: add-interactive.c:974 git-add--interactive.perl:1771 msgid "Review diff" msgstr "检视 diff" @@ -324,11 +324,11 @@ msgstr "选择一个编号条目" msgid "(empty) select nothing" msgstr "(空)不选择任何内容" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 msgid "What now" msgstr "请选择" @@ -345,7 +345,7 @@ msgstr "未缓存" #: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 bugreport.c:129 +#: builtin/submodule--helper.c:2148 bugreport.c:135 #: git-add--interactive.perl:213 msgid "path" msgstr "路径" @@ -354,33 +354,38 @@ msgstr "路径" msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782 #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: add-patch.c:34 git-add--interactive.perl:1428 +#: add-patch.c:34 git-add--interactive.perl:1430 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1429 +#: add-patch.c:35 git-add--interactive.perl:1431 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1430 +#: add-patch.c:36 git-add--interactive.perl:1432 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:38 +#: add-patch.c:39 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。" -#: add-patch.c:41 +#: add-patch.c:42 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -394,28 +399,33 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" -#: add-patch.c:55 git-add--interactive.perl:1433 +#: add-patch.c:56 git-add--interactive.perl:1436 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:56 git-add--interactive.perl:1434 +#: add-patch.c:57 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1435 +#: add-patch.c:58 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:59 +#: add-patch.c:61 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。" -#: add-patch.c:62 +#: add-patch.c:64 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -429,28 +439,33 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" -#: add-patch.c:78 git-add--interactive.perl:1438 +#: add-patch.c:80 git-add--interactive.perl:1442 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:79 git-add--interactive.perl:1439 +#: add-patch.c:81 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:80 git-add--interactive.perl:1440 +#: add-patch.c:82 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:82 +#: add-patch.c:85 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。" -#: add-patch.c:85 +#: add-patch.c:88 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -464,28 +479,33 @@ msgstr "" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" -#: add-patch.c:100 git-add--interactive.perl:1443 +#: add-patch.c:103 git-add--interactive.perl:1448 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:101 git-add--interactive.perl:1444 +#: add-patch.c:104 git-add--interactive.perl:1449 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:102 git-add--interactive.perl:1445 +#: add-patch.c:105 git-add--interactive.perl:1450 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:104 add-patch.c:169 add-patch.c:212 +#: add-patch.c:108 add-patch.c:176 add-patch.c:221 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。" -#: add-patch.c:107 +#: add-patch.c:111 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -499,31 +519,37 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:122 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 +#: add-patch.c:126 git-add--interactive.perl:1454 +#: git-add--interactive.perl:1472 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:123 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 +#: add-patch.c:127 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:124 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 +#: add-patch.c:128 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:126 add-patch.c:148 add-patch.c:191 +#: add-patch.c:131 add-patch.c:154 add-patch.c:199 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。" -#: add-patch.c:129 add-patch.c:194 +#: add-patch.c:134 add-patch.c:202 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -537,22 +563,27 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " +msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:151 +#: add-patch.c:157 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -566,22 +597,27 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:172 +#: add-patch.c:179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -595,7 +631,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:215 +#: add-patch.c:224 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -609,40 +645,40 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:319 +#: add-patch.c:328 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" -#: add-patch.c:338 add-patch.c:342 +#: add-patch.c:347 add-patch.c:351 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "无法解析彩色数据块头信息 '%.*s'" -#: add-patch.c:396 +#: add-patch.c:405 msgid "could not parse diff" msgstr "不能解析差异信息" -#: add-patch.c:415 +#: add-patch.c:424 msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" -#: add-patch.c:429 +#: add-patch.c:438 #, c-format msgid "failed to run '%s'" msgstr "运行 '%s' 失败" -#: add-patch.c:588 +#: add-patch.c:602 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" -#: add-patch.c:589 +#: add-patch.c:603 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" -#: add-patch.c:762 +#: add-patch.c:776 #, c-format msgid "" "expected context line #%d in\n" @@ -651,7 +687,7 @@ msgstr "" "预期上下文行 #%d 于\n" "%.*s" -#: add-patch.c:777 +#: add-patch.c:791 #, c-format msgid "" "hunks do not overlap:\n" @@ -664,11 +700,11 @@ msgstr "" "\t不是结尾于:\n" "%.*s" -#: add-patch.c:1053 git-add--interactive.perl:1112 +#: add-patch.c:1067 git-add--interactive.perl:1114 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: add-patch.c:1057 +#: add-patch.c:1071 #, c-format msgid "" "---\n" @@ -682,7 +718,7 @@ msgstr "" "以 %c 开始的行将被删除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1071 git-add--interactive.perl:1126 +#: add-patch.c:1085 git-add--interactive.perl:1128 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" @@ -691,11 +727,11 @@ msgstr "" "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" "此次编辑被终止,该块不会被修改。\n" -#: add-patch.c:1104 +#: add-patch.c:1118 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" -#: add-patch.c:1149 +#: add-patch.c:1163 msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" @@ -711,24 +747,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:1218 git-add--interactive.perl:1239 +#: add-patch.c:1232 git-add--interactive.perl:1241 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " -#: add-patch.c:1261 +#: add-patch.c:1275 msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引!" -#: add-patch.c:1262 git-add--interactive.perl:1343 +#: add-patch.c:1276 git-add--interactive.perl:1345 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么?" -#: add-patch.c:1269 git-add--interactive.perl:1346 +#: add-patch.c:1283 git-add--interactive.perl:1348 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: add-patch.c:1326 +#: add-patch.c:1340 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -750,69 +786,69 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: add-patch.c:1447 add-patch.c:1457 +#: add-patch.c:1463 add-patch.c:1473 msgid "No previous hunk" msgstr "没有前一个块" -#: add-patch.c:1452 add-patch.c:1462 +#: add-patch.c:1468 add-patch.c:1478 msgid "No next hunk" msgstr "没有下一个块" -#: add-patch.c:1468 +#: add-patch.c:1484 msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c:1479 git-add--interactive.perl:1577 +#: add-patch.c:1495 git-add--interactive.perl:1594 msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个块(<回车> 查看更多)? " -#: add-patch.c:1480 git-add--interactive.perl:1579 +#: add-patch.c:1496 git-add--interactive.perl:1596 msgid "go to which hunk? " msgstr "跳转到哪个块?" -#: add-patch.c:1491 +#: add-patch.c:1507 #, c-format msgid "Invalid number: '%s'" msgstr "无效数字:'%s'" -#: add-patch.c:1496 +#: add-patch.c:1512 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起,只有 %d 个可用块。" msgstr[1] "对不起,只有 %d 个可用块。" -#: add-patch.c:1505 +#: add-patch.c:1521 msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c:1511 git-add--interactive.perl:1623 +#: add-patch.c:1527 git-add--interactive.perl:1640 msgid "search for regex? " msgstr "使用正则表达式搜索?" -#: add-patch.c:1526 +#: add-patch.c:1542 #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s:%s" -#: add-patch.c:1543 +#: add-patch.c:1559 msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" -#: add-patch.c:1550 +#: add-patch.c:1566 msgid "Sorry, cannot split this hunk" msgstr "对不起,不能拆分这个块" -#: add-patch.c:1554 +#: add-patch.c:1570 #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" -#: add-patch.c:1558 +#: add-patch.c:1574 msgid "Sorry, cannot edit this hunk" msgstr "对不起,不能编辑这个块" -#: add-patch.c:1609 +#: add-patch.c:1625 msgid "'git apply' failed" msgstr "'git apply' 失败" @@ -1484,7 +1520,7 @@ msgstr "确保至少匹配 <n> 行上下文" #: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3458 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 msgid "action" msgstr "动作" @@ -1573,7 +1609,7 @@ msgstr "路径不是有效的 UTF-8:%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长(%d 字符,SHA1:%s):%s" -#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235 +#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" @@ -1642,8 +1678,8 @@ msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" #: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208 +#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 #: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 #: parse-options.h:190 @@ -1867,10 +1903,10 @@ msgstr "不能将 --contents 和最终的提交对象名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" -#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 +#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 #: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 #: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 -#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291 +#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -2023,84 +2059,88 @@ msgstr "'%s' 已经检出到 '%s'" msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" -#: bundle.c:36 +#: bundle.c:47 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" -#: bundle.c:64 +#: bundle.c:69 +msgid "unknown hash algorithm length" +msgstr "未知的哈希算法长度" + +#: bundle.c:84 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:143 +#: bundle.c:163 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交:" -#: bundle.c:146 +#: bundle.c:166 msgid "need a repository to verify a bundle" msgstr "需要一个仓库来校验一个包" -#: bundle.c:197 +#: bundle.c:217 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用:" msgstr[1] "这个包中含有 %d 个引用:" -#: bundle.c:204 +#: bundle.c:224 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" -#: bundle.c:206 +#: bundle.c:226 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用:" msgstr[1] "这个包需要 %d 个引用:" -#: bundle.c:273 +#: bundle.c:293 msgid "unable to dup bundle descriptor" msgstr "无法复制 bundle 描述符" -#: bundle.c:280 +#: bundle.c:300 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:291 +#: bundle.c:311 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:333 +#: bundle.c:353 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:382 +#: bundle.c:402 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 +#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数:%s" -#: bundle.c:469 +#: bundle.c:489 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:479 +#: bundle.c:499 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:504 +#: bundle.c:524 msgid "index-pack died" msgstr "index-pack 终止" @@ -2109,269 +2149,261 @@ msgstr "index-pack 终止" msgid "invalid color value: %.*s" msgstr "无效的颜色值:%.*s" -#: commit-graph.c:183 +#: commit-graph.c:238 msgid "commit-graph file is too small" msgstr "提交图形文件太小" -#: commit-graph.c:248 +#: commit-graph.c:303 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交图形签名 %X 和签名 %X 不匹配" -#: commit-graph.c:255 +#: commit-graph.c:310 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交图形版本 %X 和版本 %X 不匹配" -#: commit-graph.c:262 +#: commit-graph.c:317 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" -#: commit-graph.c:284 +#: commit-graph.c:339 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "提交图形块查找表条目丢失,文件可能不完整" -#: commit-graph.c:294 +#: commit-graph.c:349 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "提交图形不正确的块偏移 %08x%08x" -#: commit-graph.c:362 +#: commit-graph.c:417 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "提交图形块 id %08x 出现了多次" -#: commit-graph.c:436 +#: commit-graph.c:491 msgid "commit-graph has no base graphs chunk" msgstr "提交图形没有基础图形块" -#: commit-graph.c:446 +#: commit-graph.c:501 msgid "commit-graph chain does not match" msgstr "提交图形链不匹配" -#: commit-graph.c:494 +#: commit-graph.c:549 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "无效的提交图形链:行 '%s' 不是一个哈希值" -#: commit-graph.c:518 +#: commit-graph.c:573 msgid "unable to find all commit-graph files" msgstr "无法找到所有提交图形文件" -#: commit-graph.c:651 commit-graph.c:711 +#: commit-graph.c:706 commit-graph.c:770 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "无效的提交位置。提交图形可能已损坏" -#: commit-graph.c:672 +#: commit-graph.c:727 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:948 builtin/am.c:1292 +#: commit-graph.c:1009 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1096 +#: commit-graph.c:1157 msgid "Writing changed paths Bloom filters index" msgstr "编写变更路径的 Bloom 过滤器索引" -#: commit-graph.c:1121 +#: commit-graph.c:1182 msgid "Writing changed paths Bloom filters data" msgstr "编写变更路径的 Bloom 过滤器数据" -#: commit-graph.c:1160 builtin/pack-objects.c:2783 +#: commit-graph.c:1221 builtin/pack-objects.c:2832 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:1196 +#: commit-graph.c:1257 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" -#: commit-graph.c:1213 +#: commit-graph.c:1274 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:1233 +#: commit-graph.c:1294 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" -#: commit-graph.c:1252 +#: commit-graph.c:1313 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:1300 +#: commit-graph.c:1367 msgid "Computing commit changed paths Bloom filters" msgstr "计算提交变更路径的 Bloom 过滤器" -#: commit-graph.c:1359 +#: commit-graph.c:1423 +msgid "Collecting referenced commits" +msgstr "正在收集引用的提交" + +#: commit-graph.c:1447 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 个包中查找提交图的提交" msgstr[1] "正在 %d 个包中查找提交图的提交" -#: commit-graph.c:1372 +#: commit-graph.c:1460 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:1376 +#: commit-graph.c:1464 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:1405 -#, c-format -msgid "Finding commits for commit graph from %d ref" -msgid_plural "Finding commits for commit graph from %d refs" -msgstr[0] "正在从 %d 个引用中查找提交图的提交" -msgstr[1] "正在从 %d 个引用中查找提交图的提交" - -#: commit-graph.c:1426 -#, c-format -msgid "invalid commit object id: %s" -msgstr "无效的提交对象 ID:%s" - -#: commit-graph.c:1442 +#: commit-graph.c:1503 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" -#: commit-graph.c:1457 +#: commit-graph.c:1518 msgid "Counting distinct commits in commit graph" msgstr "正在计算提交图中不同的提交" -#: commit-graph.c:1489 +#: commit-graph.c:1550 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" -#: commit-graph.c:1538 +#: commit-graph.c:1599 msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1572 midx.c:812 +#: commit-graph.c:1633 midx.c:812 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1585 +#: commit-graph.c:1646 msgid "unable to create temporary graph layer" msgstr "无法创建临时图层" -#: commit-graph.c:1590 +#: commit-graph.c:1651 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "无法为 '%s' 调整共享权限" -#: commit-graph.c:1667 +#: commit-graph.c:1728 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步写出提交图" msgstr[1] "正在用 %d 步写出提交图" -#: commit-graph.c:1712 +#: commit-graph.c:1773 msgid "unable to open commit-graph chain file" msgstr "无法打开提交图形链文件" -#: commit-graph.c:1728 +#: commit-graph.c:1789 msgid "failed to rename base commit-graph file" msgstr "无法重命名基础提交图形文件" -#: commit-graph.c:1748 +#: commit-graph.c:1809 msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" -#: commit-graph.c:1874 +#: commit-graph.c:1935 msgid "Scanning merged commits" msgstr "正在扫描合并提交" -#: commit-graph.c:1885 +#: commit-graph.c:1946 #, c-format msgid "unexpected duplicate commit id %s" msgstr "意外的重复提交 ID %s" -#: commit-graph.c:1908 +#: commit-graph.c:1969 msgid "Merging commit-graph" msgstr "正在合并提交图形" -#: commit-graph.c:2096 +#: commit-graph.c:2156 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "提交图格式不能写入 %d 个提交" -#: commit-graph.c:2107 +#: commit-graph.c:2167 msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:2200 +#: commit-graph.c:2260 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误,可能已经损坏" -#: commit-graph.c:2210 +#: commit-graph.c:2270 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s" -#: commit-graph.c:2220 commit-graph.c:2235 +#: commit-graph.c:2280 commit-graph.c:2295 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u" -#: commit-graph.c:2227 +#: commit-graph.c:2287 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" -#: commit-graph.c:2245 +#: commit-graph.c:2305 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2259 +#: commit-graph.c:2320 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2266 +#: commit-graph.c:2327 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2276 +#: commit-graph.c:2337 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2285 +#: commit-graph.c:2346 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2298 +#: commit-graph.c:2360 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2303 +#: commit-graph.c:2365 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零" -#: commit-graph.c:2307 +#: commit-graph.c:2369 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零" -#: commit-graph.c:2322 +#: commit-graph.c:2385 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "提交图形中的提交 %s 的世代号是 %u != %u" -#: commit-graph.c:2328 +#: commit-graph.c:2391 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" @@ -2407,27 +2439,27 @@ msgstr "" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" -#: commit.c:1168 +#: commit.c:1172 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: commit.c:1172 +#: commit.c:1176 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: commit.c:1175 +#: commit.c:1179 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" -#: commit.c:1178 +#: commit.c:1182 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: commit.c:1432 +#: commit.c:1436 |