diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 7046 |
1 files changed, 3637 insertions, 3409 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 5be52589bb..ee0e6bee0d 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-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-11 15:38+0800\n" +"POT-Creation-Date: 2020-05-27 07:23+0800\n" +"PO-Revision-Date: 2020-05-27 07:39+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -154,9 +154,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 +#: builtin/rebase.c:1919 msgid "could not read index" msgstr "不能读取索引" @@ -184,8 +184,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 msgid "could not write index" msgstr "不能写入索引" @@ -201,8 +200,8 @@ msgstr[1] "更新了 %d 个路径\n" msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" @@ -325,11 +324,11 @@ msgstr "选择一个编号条目" msgid "(empty) select nothing" msgstr "（空）不选择任何内容" -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848 msgid "What now" msgstr "请选择" @@ -341,12 +340,13 @@ msgstr "缓存" msgid "unstaged" msgstr "未缓存" -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 +#: 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 git-add--interactive.perl:213 +#: builtin/submodule--helper.c:2148 bugreport.c:129 +#: git-add--interactive.perl:213 msgid "path" msgstr "路径" @@ -354,33 +354,33 @@ msgstr "路径" msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: add-patch.c:33 git-add--interactive.perl:1428 +#: add-patch.c:34 git-add--interactive.perl:1428 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:34 git-add--interactive.perl:1429 +#: add-patch.c:35 git-add--interactive.perl:1429 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1430 +#: add-patch.c:36 git-add--interactive.perl:1430 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:37 +#: add-patch.c:38 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。" -#: add-patch.c:40 +#: add-patch.c:41 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -394,28 +394,28 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" -#: add-patch.c:54 git-add--interactive.perl:1433 +#: add-patch.c:55 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:55 git-add--interactive.perl:1434 +#: add-patch.c:56 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:56 git-add--interactive.perl:1435 +#: add-patch.c:57 git-add--interactive.perl:1435 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:58 +#: add-patch.c:59 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。" -#: add-patch.c:61 +#: add-patch.c:62 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -429,28 +429,28 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" -#: add-patch.c:77 git-add--interactive.perl:1438 +#: add-patch.c:78 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:78 git-add--interactive.perl:1439 +#: add-patch.c:79 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:79 git-add--interactive.perl:1440 +#: add-patch.c:80 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:81 +#: add-patch.c:82 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。" -#: add-patch.c:84 +#: add-patch.c:85 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -464,28 +464,28 @@ msgstr "" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" -#: add-patch.c:99 git-add--interactive.perl:1443 +#: add-patch.c:100 git-add--interactive.perl:1443 #, 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:100 git-add--interactive.perl:1444 +#: add-patch.c:101 git-add--interactive.perl:1444 #, 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:101 git-add--interactive.perl:1445 +#: add-patch.c:102 git-add--interactive.perl:1445 #, 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:103 add-patch.c:168 add-patch.c:211 +#: add-patch.c:104 add-patch.c:169 add-patch.c:212 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。" -#: add-patch.c:106 +#: add-patch.c:107 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -499,31 +499,31 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:121 git-add--interactive.perl:1448 +#: add-patch.c:122 git-add--interactive.perl:1448 #: git-add--interactive.perl:1463 #, 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:122 git-add--interactive.perl:1449 +#: add-patch.c:123 git-add--interactive.perl:1449 #: git-add--interactive.perl:1464 #, 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:123 git-add--interactive.perl:1450 +#: add-patch.c:124 git-add--interactive.perl:1450 #: git-add--interactive.perl:1465 #, 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:125 add-patch.c:147 add-patch.c:190 +#: add-patch.c:126 add-patch.c:148 add-patch.c:191 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。" -#: add-patch.c:128 add-patch.c:193 +#: add-patch.c:129 add-patch.c:194 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -537,22 +537,22 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453 #, 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:144 add-patch.c:187 git-add--interactive.perl:1454 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454 #, c-format, perl-format msgid "Discard deletion 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:1455 +#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455 #, 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:150 +#: add-patch.c:151 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -566,22 +566,22 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458 #, 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:165 add-patch.c:208 git-add--interactive.perl:1459 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459 #, 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:166 add-patch.c:209 git-add--interactive.perl:1460 +#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460 #, 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:171 +#: add-patch.c:172 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -595,7 +595,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:214 +#: add-patch.c:215 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -609,40 +609,40 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:318 +#: add-patch.c:319 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" -#: add-patch.c:337 add-patch.c:341 +#: add-patch.c:338 add-patch.c:342 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "无法解析彩色数据块头信息 '%.*s'" -#: add-patch.c:395 +#: add-patch.c:396 msgid "could not parse diff" msgstr "不能解析差异信息" -#: add-patch.c:414 +#: add-patch.c:415 msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" -#: add-patch.c:428 +#: add-patch.c:429 #, c-format msgid "failed to run '%s'" msgstr "运行 '%s' 失败" -#: add-patch.c:587 +#: add-patch.c:588 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" -#: add-patch.c:588 +#: add-patch.c:589 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" -#: add-patch.c:761 +#: add-patch.c:762 #, c-format msgid "" "expected context line #%d in\n" @@ -651,7 +651,7 @@ msgstr "" "预期上下文行 #%d 于\n" "%.*s" -#: add-patch.c:776 +#: add-patch.c:777 #, c-format msgid "" "hunks do not overlap:\n" @@ -664,11 +664,11 @@ msgstr "" "\t不是结尾于：\n" "%.*s" -#: add-patch.c:1052 git-add--interactive.perl:1112 +#: add-patch.c:1053 git-add--interactive.perl:1112 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: add-patch.c:1056 +#: add-patch.c:1057 #, c-format msgid "" "---\n" @@ -682,7 +682,7 @@ msgstr "" "以 %c 开始的行将被删除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 +#: add-patch.c:1071 git-add--interactive.perl:1126 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 +691,11 @@ msgstr "" "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" "此次编辑被终止，该块不会被修改。\n" -#: add-patch.c:1103 +#: add-patch.c:1104 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" -#: add-patch.c:1148 +#: add-patch.c:1149 msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" @@ -816,37 +816,46 @@ msgstr "对不起，不能编辑这个块" msgid "'git apply' failed" msgstr "'git apply' 失败" -#: advice.c:115 +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"使用 \"git config advice.%s false\" 来关闭此消息" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:168 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" -#: advice.c:170 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" -#: advice.c:172 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" -#: advice.c:174 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" -#: advice.c:176 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" -#: advice.c:178 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" -#: advice.c:186 +#: advice.c:265 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -854,23 +863,23 @@ msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:194 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:278 builtin/merge.c:1353 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: advice.c:201 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c:202 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c:208 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1148,7 +1157,7 @@ msgstr "打补丁失败：%s:%ld" msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" @@ -1343,7 +1352,7 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" @@ -1409,7 +1418,7 @@ msgstr "不要应用与给出路径向匹配的变更" msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4973 builtin/am.c:2259 msgid "num" msgstr "数字" @@ -1465,7 +1474,7 @@ msgstr "如果一个补丁不能应用则尝试三方合并" msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" @@ -1473,9 +1482,9 @@ msgstr "路径以 NUL 字符分隔" msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: 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:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332 msgid "action" msgstr "动作" @@ -1504,8 +1513,8 @@ msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" @@ -1517,7 +1526,7 @@ msgstr "允许不正确的文件末尾换行符" msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5032 builtin/am.c:2247 msgid "root" msgstr "根目录" @@ -1525,6 +1534,55 @@ msgstr "根目录" msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" +#: archive-tar.c:125 archive-zip.c:351 +#, c-format +msgid "cannot stream blob %s" +msgstr "不能打开数据对象 %s" + +#: archive-tar.c:266 archive-zip.c:369 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "不支持的文件模式：0%o (SHA1: %s)" + +#: archive-tar.c:293 archive-zip.c:359 +#, c-format +msgid "cannot read %s" +msgstr "不能读取 %s" + +#: archive-tar.c:465 +#, c-format +msgid "unable to start '%s' filter" +msgstr "无法启动 '%s' 过滤器" + +#: archive-tar.c:468 +msgid "unable to redirect descriptor" +msgstr "无法重定向描述符" + +#: archive-tar.c:475 +#, c-format +msgid "'%s' filter reported error" +msgstr "'%s' 过滤器报告了错误" + +#: archive-zip.c:319 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "路径不是有效的 UTF-8：%s" + +#: archive-zip.c:323 +#, c-format +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 +#, c-format +msgid "deflate error (%d)" +msgstr "压缩错误 (%d)" + +#: archive-zip.c:615 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "对于本系统时间戳太大：%<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<选项>] <树对象> [<路径>...]" @@ -1543,172 +1601,123 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" -#: archive.c:396 +#: archive.c:401 #, c-format msgid "no such ref: %.*s" msgstr "无此引用：%.*s" -#: archive.c:401 +#: archive.c:407 #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" -#: archive.c:414 +#: archive.c:420 #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" -#: archive.c:426 +#: archive.c:432 msgid "current working directory is untracked" msgstr "当前工作目录未被跟踪" -#: archive.c:457 +#: archive.c:464 msgid "fmt" msgstr "格式" -#: archive.c:457 +#: archive.c:464 msgid "archive format" msgstr "归档格式" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:465 builtin/log.c:1674 msgid "prefix" msgstr "前缀" -#: archive.c:459 +#: archive.c:466 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: 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:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 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 msgid "file" msgstr "文件" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:468 builtin/archive.c:90 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:463 +#: archive.c:470 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:464 +#: archive.c:471 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:465 +#: archive.c:472 msgid "store only" msgstr "只存储" -#: archive.c:466 +#: archive.c:473 msgid "compress faster" msgstr "压缩速度更快" -#: archive.c:474 +#: archive.c:481 msgid "compress better" msgstr "压缩效果更好" -#: archive.c:477 +#: archive.c:484 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "仓库" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:487 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "命令" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:489 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: archive.c:489 +#: archive.c:496 msgid "Unexpected option --remote" msgstr "未知参数 --remote" -#: archive.c:491 +#: archive.c:498 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" -#: archive.c:493 +#: archive.c:500 msgid "Unexpected option --output" msgstr "未知参数 --output" -#: archive.c:515 +#: archive.c:522 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" -#: archive.c:522 +#: archive.c:529 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" -#: archive-tar.c:125 archive-zip.c:351 -#, c-format -msgid "cannot stream blob %s" -msgstr "不能打开数据对象 %s" - -#: archive-tar.c:266 archive-zip.c:369 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "不支持的文件模式：0%o (SHA1: %s)" - -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "不能读取 %s" - -#: archive-tar.c:465 -#, c-format -msgid "unable to start '%s' filter" -msgstr "无法启动 '%s' 过滤器" - -#: archive-tar.c:468 -msgid "unable to redirect descriptor" -msgstr "无法重定向描述符" - -#: archive-tar.c:475 -#, c-format -msgid "'%s' filter reported error" -msgstr "'%s' 过滤器报告了错误" - -#: archive-zip.c:319 -#, c-format -msgid "path is not valid UTF-8: %s" -msgstr "路径不是有效的 UTF-8：%s" - -#: archive-zip.c:323 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "路径太长（%d 字符，SHA1：%s）：%s" - -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 -#, c-format -msgid "deflate error (%d)" -msgstr "压缩错误 (%d)" - -#: archive-zip.c:615 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "对于本系统时间戳太大：%<PRIuMAX>" - #: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" @@ -1801,12 +1810,12 @@ msgstr "二分查找中：合并基线必须是经过测试的\n" msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:966 builtin/merge.c:151 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" @@ -1846,37 +1855,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" -#: blame.c:2700 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:2714 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" -#: blame.c:2735 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2821 bundle.c:167 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/shortlog.c:192 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: blame.c:2762 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" -#: blame.c:2773 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" -#: blame.c:2784 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" @@ -2004,12 +2013,12 @@ msgstr "歧义的对象名：'%s'。" msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" @@ -2024,8 +2033,8 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 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'" @@ -2077,7 +2086,7 @@ msgstr "rev-list 终止" msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -2100,323 +2109,339 @@ msgstr "index-pack 终止" msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 -#, c-format -msgid "could not parse %s" -msgstr "不能解析 %s" - -#: commit.c:53 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s 不是一个提交！" - -#: commit.c:193 -msgid "" -"Support for <GIT_DIR>/info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "" -"对 <GIT_DIR>/info/grafts 的支持已被弃用，并将在\n" -"未来的Git版本中被移除。\n" -"\n" -"请使用 \"git replace --convert-graft-file\" 将\n" -"grafts 转换为替换引用。\n" -"\n" -"设置 \"git config advice.graftFileDeprecated false\"\n" -"可关闭本消息" - -#: commit.c:1153 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" - -#: commit.c:1157 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" - -#: commit.c:1160 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "提交 %s 没有 GPG 签名。" - -#: commit.c:1163 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" - -#: commit.c:1417 -msgid "" -"Warning: commit message did not conform to UTF-8.\n" -"You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "" -"警告：提交说明不符合 UTF-8 字符编码。\n" -"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n" -"设置为您项目所用的字符编码。\n" - -#: commit-graph.c:122 +#: commit-graph.c:183 msgid "commit-graph file is too small" msgstr "提交图形文件太小" -#: commit-graph.c:189 +#: commit-graph.c:248 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交图形签名 %X 和签名 %X 不匹配" -#: commit-graph.c:196 +#: commit-graph.c:255 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交图形版本 %X 和版本 %X 不匹配" -#: commit-graph.c:203 +#: commit-graph.c:262 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" -#: commit-graph.c:226 +#: commit-graph.c:284 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "提交图形块查找表条目丢失，文件可能不完整" -#: commit-graph.c:237 +#: commit-graph.c:294 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "提交图形不正确的块偏移 %08x%08x" -#: commit-graph.c:280 +#: commit-graph.c:362 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "提交图形块 id %08x 出现了多次" -#: commit-graph.c:343 +#: commit-graph.c:436 msgid "commit-graph has no base graphs chunk" msgstr "提交图形没有基础图形块" -#: commit-graph.c:353 +#: commit-graph.c:446 msgid "commit-graph chain does not match" msgstr "提交图形链不匹配" -#: commit-graph.c:401 +#: commit-graph.c:494 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" -#: commit-graph.c:425 +#: commit-graph.c:518 msgid "unable to find all commit-graph files" msgstr "无法找到所有提交图形文件" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:651 commit-graph.c:711 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "无效的提交位置。提交图形可能已损坏" -#: commit-graph.c:579 +#: commit-graph.c:672 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:852 builtin/am.c:1292 +#: commit-graph.c:948 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1096 +msgid "Writing changed paths Bloom filters index" +msgstr "编写变更路径的 Bloom 过滤器索引" + +#: commit-graph.c:1121 +msgid "Writing changed paths Bloom filters data" +msgstr "编写变更路径的 Bloom 过滤器数据" + +#: commit-graph.c:1160 builtin/pack-objects.c:2783 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:1043 +#: commit-graph.c:1196 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" -#: commit-graph.c:1060 +#: commit-graph.c:1213 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:1079 +#: commit-graph.c:1233 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" -#: commit-graph.c:1098 +#: commit-graph.c:1252 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:1173 +#: commit-graph.c:1300 +msgid "Computing commit changed paths Bloom filters" +msgstr "计算提交变更路径的 Bloom 过滤器" + +#: commit-graph.c:1359 #, 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:1186 +#: commit-graph.c:1372 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:1190 +#: commit-graph.c:1376 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:1214 +#: 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:1234 +#: commit-graph.c:1426 #, c-format msgid "invalid commit object id: %s" msgstr "无效的提交对象 ID：%s" -#: commit-graph.c:1249 +#: commit-graph.c:1442 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" -#: commit-graph.c:1264 +#: commit-graph.c:1457 msgid "Counting distinct commits in commit graph" msgstr "正在计算提交图中不同的提交" -#: commit-graph.c:1294 +#: commit-graph.c:1489 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" -#: commit-graph.c:1340 +#: commit-graph.c:1538 msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1572 midx.c:812 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1585 +msgid "unable to create temporary graph layer" +msgstr "无法创建临时图层" + +#: commit-graph.c:1590 #, c-format -msgid "unable to create '%s'" -msgstr "不能创建 '%s'" +msgid "unable to adjust shared permissions for '%s'" +msgstr "无法为 '%s' 调整共享权限" -#: commit-graph.c:1445 +#: commit-graph.c:1667 #, 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:1486 +#: commit-graph.c:1712 msgid "unable to open commit-graph chain file" msgstr "无法打开提交图形链文件" -#: commit-graph.c:1498 +#: commit-graph.c:1728 msgid "failed to rename base commit-graph file" msgstr "无法重命名基础提交图形文件" -#: commit-graph.c:1518 +#: commit-graph.c:1748 msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" -#: commit-graph.c:1631 +#: commit-graph.c:1874 msgid "Scanning merged commits" msgstr "正在扫描合并提交" -#: commit-graph.c:1642 +#: commit-graph.c:1885 #, c-format msgid "unexpected duplicate commit id %s" msgstr "意外的重复提交 ID %s" -#: commit-graph.c:1665 +#: commit-graph.c:1908 msgid "Merging commit-graph" msgstr "正在合并提交图形" -#: commit-graph.c:1844 +#: commit-graph.c:2096 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "提交图格式不能写入 %d 个提交" -#: commit-graph.c:1855 +#: commit-graph.c:2107 msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:1944 +#: commit-graph.c:2200 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:1954 +#: commit-graph.c:2210 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:2220 commit-graph.c:2235 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:1971 +#: commit-graph.c:2227 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" -#: commit-graph.c:1989 +#: commit-graph.c:2245 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2003 +#: commit-graph.c:2259 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2010 +#: commit-graph.c:2266 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2020 +#: commit-graph.c:2276 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2029 +#: commit-graph.c:2285 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2298 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2047 +#: commit-graph.c:2303 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" -#: commit-graph.c:2051 +#: commit-graph.c:2307 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" -#: commit-graph.c:2066 +#: commit-graph.c:2322 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "提交图形中的提交 %s 的世代号是 %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2328 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "不能解析 %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s 不是一个提交！" + +#: commit.c:194 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" +"对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n" +"未来的Git版本中被移除。\n" +"\n" +"请使用 \"git replace --convert-graft-file\" 将\n" +"grafts 转换为替换引用。\n" +"\n" +"设置 \"git config advice.graftFileDeprecated false\"\n" +"可关闭本消息" + +#: commit.c:1168 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" + +#: commit.c:1172 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" + +#: commit.c:1175 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "提交 %s 没有 GPG 签名。" + +#: commit.c:1178 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" + +#: commit.c:1432 +msgid "" +"Warning: commit message did not conform to UTF-8.\n" +"You may want to amend it after fixing the message, or set the config\n" +"variable i18n.commitencoding to the encoding your project uses.\n" +msgstr "" +"警告：提交说明不符合 UTF-8 字符编码。\n" +"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n" +"设置为您项目所用的字符编码。\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "内存耗尽" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2431,289 +2456,289 @@ msgstr "" "\t%2$s\n" "这可能是因为循环包含。" -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "无法扩展包含路径 '%s'" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "相对路径的配置文件引用必须来自于文件" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "相对路径的配置文件条件引用必须来自于文件" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "键名没有包含一个小节名称：%s" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名：%s" -#: config.c:406 sequencer.c:2444 +#: config.c:408 sequencer.c:2456 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "无效键名（有换行符）：%s" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "伪配置参数：%s" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "%s 中格式错误" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "超出范围" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "无效的单位" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展用户目录：'%s'" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "缩写长度超出范围：%d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar 应该是一个字符" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式错误" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式错误：%s" -#: config.c:1457 +#: config.c:1472 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1533 builtin/pack-objects.c:3542 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "无法从数据对象 '%s' 加载配置" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 没有指向一个数据对象" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" -#: config.c:1743 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2097 +#: config.c:2113 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2267 +#: config.c:2283 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2312 +#: config.c:2328 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2358 +#: config.c:2374 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2360 +#: config.c:2376 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2441 +#: config.c:2457 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2473 +#: config.c:2489 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2502 +#: config.c:2518 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2754 config.c:3078 +#: config.c:2770 config.c:3094 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2765 +#: config.c:2781 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:2800 builtin/config.c:344 +#: config.c:2816 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:2825 +#: config.c:2841 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:2838 config.c:3091 +#: config.c:2854 config.c:3107 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:2849 +#: config.c:2865 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2858 config.c:3096 +#: config.c:2874 config.c:3112 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:2943 config.c:3193 +#: config.c:2959 config.c:3209 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:2977 +#: config.c:2993 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3069 +#: config.c:3085 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3236 +#: config.c:3252 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -2876,19 +2901,19 @@ msgstr "已阻止奇怪的路径名 '%s'" msgid "unable to fork" msgstr "无法 fork" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在检查连通性" -#: connected.c:110 +#: connected.c:119 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" -#: connected.c:130 +#: connected.c:139 msgid "failed write to rev-list" msgstr "写入 rev-list 失败" -#: connected.c:137 +#: connected.c:146 msgid "failed to close rev-list's stdin" msgstr "关闭 rev-list 的标准输入失败" @@ -2987,35 +3012,63 @@ msgstr "从外部过滤器 '%s' 读取失败" msgid "external filter '%s' failed" msgstr "外部过滤器 '%s' 失败" -#: convert.c:839 +#: convert.c:840 msgid "unexpected filter type" msgstr "意外的过滤类型" -#: convert.c:850 +#: convert.c:851 msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" -#: convert.c:924 +#: convert.c:943 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" -#: convert.c:1223 +#: convert.c:1243 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" -#: convert.c:1411 convert.c:1445 +#: convert.c:1431 convert.c:1465 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 过滤器 '%s' 失败" -#: convert.c:1489 +#: convert.c:1511 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 过滤器 %s 失败" +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "跳过凭据查询：credential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "拒绝使用缺少主机字段的凭据" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "拒绝使用缺少协议字段的凭据" + +#: credential.c:396 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "URL 的 %s 组件中包含换行符：%s" + +#: credential.c:440 +#, c-format +msgid "url has no scheme: %s" +msgstr "URL 没有 scheme：%s" + +#: credential.c:513 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "不能解析凭据 URL：%s" + #: date.c:138 msgid "in the future" msgstr "在将来" @@ -3108,15 +3161,6 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "读取排序文件 '%s' 失败" - -#: diffcore-rename.c:543 -msgid "Performing inexact rename detection" -msgstr "正在进行非精确的重命名探测" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<选项>] <路径> <路径>" @@ -3176,35 +3220,35 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:4202 +#: diff.c:4238 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4547 +#: diff.c:4583 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4550 +#: diff.c:4586 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4628 +#: diff.c:4664 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4676 +#: diff.c:4712 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 +#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245 #: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" -#: diff.c:4713 +#: diff.c:4749 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3213,195 +3257,195 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4798 +#: diff.c:4834 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" -#: diff.c:4822 +#: diff.c:4858 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" -#: diff.c:4836 +#: diff.c:4872 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4886 diff.c:4892 +#: diff.c:4922 diff.c:4928 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4904 +#: diff.c:4940 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" -#: diff.c:4925 +#: diff.c:4961 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" -#: diff.c:4944 +#: diff.c:4980 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c:4984 +#: diff.c:5020 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5056 diff.c:5076 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" -#: diff.c:5178 +#: diff.c:5214 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5234 +#: diff.c:5270 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" -#: diff.c:5257 +#: diff.c:5293 msgid "Diff output format options" msgstr "差异输出格式化选项" -#: diff.c:5259 diff.c:5265 +#: diff.c:5295 diff.c:5301 msgid "generate patch" msgstr "生成补丁" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5298 builtin/log.c:177 msgid "suppress diff output" msgstr "不显示差异输出" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5303 diff.c:5417 diff.c:5424 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5304 diff.c:5307 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差异" -#: diff.c:5273 +#: diff.c:5309 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" -#: diff.c:5276 +#: diff.c:5312 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" -#: diff.c:5280 +#: diff.c:5316 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" -#: diff.c:5284 +#: diff.c:5320 msgid "machine friendly --stat" msgstr "机器友好的 --stat" -#: diff.c:5287 +#: diff.c:5323 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" -#: diff.c:5289 diff.c:5297 +#: diff.c:5325 diff.c:5333 msgid "<param1,param2>..." msgstr "<参数1,参数2>..." -#: diff.c:5290 +#: diff.c:5326 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" -#: diff.c:5294 +#: diff.c:5330 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" -#: diff.c:5298 +#: diff.c:5334 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" -#: diff.c:5302 +#: diff.c:5338 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" -#: diff.c:5305 +#: diff.c:5341 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" -#: diff.c:5308 +#: diff.c:5344 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" -#: diff.c:5311 +#: diff.c:5347 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" -#: diff.c:5313 +#: diff.c:5349 msgid "<width>[,<name-width>[,<count>]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" -#: diff.c:5314 +#: diff.c:5350 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5352 diff.c:5355 diff.c:5358 msgid "<width>" msgstr "<宽度>" -#: diff.c:5317 +#: diff.c:5353 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" -#: diff.c:5320 +#: diff.c:5356 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" -#: diff.c:5323 +#: diff.c:5359 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" -#: diff.c:5325 +#: diff.c:5361 msgid "<count>" msgstr "<次数>" -#: diff.c:5326 +#: diff.c:5362 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" -#: diff.c:5329 +#: diff.c:5365 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" -#: diff.c:5332 +#: diff.c:5368 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" -#: diff.c:5335 +#: diff.c:5371 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" -#: diff.c:5337 +#: diff.c:5373 msgid "show colored diff" msgstr "显示带颜色的差异" -#: diff.c:5338 +#: diff.c:5374 msgid "<kind>" msgstr "<类型>" -#: diff.c:5339 +#: diff.c:5375 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" -#: diff.c:5342 +#: diff.c:5378 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3409,300 +3453,309 @@ msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493 msgid "<prefix>" msgstr "<前缀>" -#: diff.c:5346 +#: diff.c:5382 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" -#: diff.c:5349 +#: diff.c:5385 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" -#: diff.c:5352 +#: diff.c:5388 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" -#: diff.c:5355 +#: diff.c:5391 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" -#: diff.c:5358 +#: diff.c:5394 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5398 diff.c:5403 diff.c:5408 msgid "<char>" msgstr "<字符>" -#: diff.c:5363 +#: diff.c:5399 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" -#: diff.c:5368 +#: diff.c:5404 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" -#: diff.c:5373 +#: diff.c:5409 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" -#: diff.c:5376 +#: diff.c:5412 msgid "Diff rename options" msgstr "差异重命名选项" -#: diff.c:5377 +#: diff.c:5413 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5414 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" -#: diff.c:5382 +#: diff.c:5418 msgid "detect renames" msgstr "检测重命名" -#: diff.c:5386 +#: diff.c:5422 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" -#: diff.c:5389 +#: diff.c:5425 msgid "detect copies" msgstr "检测拷贝" -#: diff.c:5393 +#: diff.c:5429 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" -#: diff.c:5395 +#: diff.c:5431 msgid "disable rename detection" msgstr "禁用重命名探测" -#: diff.c:5398 +#: diff.c:5434 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" -#: diff.c:5400 +#: diff.c:5436 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" -#: diff.c:5403 +#: diff.c:5439 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" -#: diff.c:5405 +#: diff.c:5441 msgid "Diff algorithm options" msgstr "差异算法选项" -#: diff.c:5407 +#: diff.c:5443 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" -#: diff.c:5410 +#: diff.c:5446 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" -#: diff.c:5413 +#: diff.c:5449 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" -#: diff.c:5416 +#: diff.c:5452 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" -#: diff.c:5419 +#: diff.c:5455 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" -#: diff.c:5422 +#: diff.c:5458 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" -#: diff.c:5425 +#: diff.c:5461 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" -#: diff.c:5428 +#: diff.c:5464 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" -#: diff.c:5432 +#: diff.c:5468 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c:5434 +#: diff.c:5470 msgid "<algorithm>" msgstr "<算法>" -#: diff.c:5435 +#: diff.c:5471 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: diff.c:5437 +#: diff.c:5473 msgid "<text>" msgstr "<文本>" -#: diff.c:5438 +#: diff.c:5474 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5476 diff.c:5485 diff.c:5488 msgid "<mode>" msgstr "<模式>" -#: diff.c:5441 +#: diff.c:5477 msgid "show word diff, using <mode> to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5479 diff.c:5482 diff.c:5527 msgid "<regex>" msgstr "<正则>" -#: diff.c:5444 +#: diff.c:5480 msgid "use <regex> to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" -#: diff.c:5447 +#: diff.c:5483 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" -#: diff.c:5450 +#: diff.c:5486 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" -#: diff.c:5453 +#: diff.c:5489 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" -#: diff.c:5456 +#: diff.c:5492 msgid "Other diff options" msgstr "其它差异选项" -#: diff.c:5458 +#: diff.c:5494 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" -#: diff.c:5462 +#: diff.c:5498 msgid "treat all files as text" msgstr "把所有文件当做文本处理" -#: diff.c:5464 +#: diff.c:5500 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" -#: diff.c:5466 +#: diff.c:5502 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" -#: diff.c:5468 +#: diff.c:5504 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" -#: diff.c:5470 +#: diff.c:5506 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" -#: diff.c:5472 +#: diff.c:5508 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" -#: diff.c:5474 +#: diff.c:5510 msgid "<when>" msgstr "<何时>" -#: diff.c:5475 +#: diff.c:5511 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" -#: diff.c:5478 +#: diff.c:5514 msgid "<format>" msgstr "<格式>" -#: diff.c:5479 +#: diff.c:5515 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" -#: diff.c:5483 +#: diff.c:5519 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" -#: diff.c:5486 +#: diff.c:5522 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" -#: diff.c:5488 +#: diff.c:5524 msgid "<string>" msgstr "<字符串>" -#: diff.c:5489 +#: diff.c:5525 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" -#: diff.c:5492 +#: diff.c:5528 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" -#: diff.c:5495 +#: diff.c:5531 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" -#: diff.c:5498 +#: diff.c:5534 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" -#: diff.c:5501 +#: diff.c:5537 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" -#: diff.c:5502 +#: diff.c:5538 msgid "<object-id>" msgstr "<对象 ID>" -#: diff.c:5503 +#: diff.c:5539 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" -#: diff.c:5505 +#: diff.c:5541 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5542 msgid "select files by diff type" msgstr "通过差异类型选择文件" -#: diff.c:5508 +#: diff.c:5544 msgid "<file>" msgstr "<文件>" -#: diff.c:5509 +#: diff.c:5545 msgid "Output to a specific file" msgstr "输出到一个指定的文件" -#: diff.c:6164 +#: diff.c:6200 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多，略过不严格的重命名检查。" -#: diff.c:6167 +#: diff.c:6203 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多，只在修改的路径中查找拷贝。" -#: diff.c:6170 +#: diff.c:6206 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "读取排序文件 '%s' 失败" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "正在进行非精确的重命名探测" + #: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" @@ -3732,35 +3785,35 @@ msgstr "禁止 cone 模式匹配" msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:2144 +#: dir.c:2275 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2479 +#: dir.c:2575 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2603 +#: dir.c:2699 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3407 +#: dir.c:3481 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3452 dir.c:3457 +#: dir.c:3526 dir.c:3531 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3486 +#: dir.c:3560 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" @@ -3769,17 +3822,17 @@ msgstr "提示：等待您的编辑器关闭文件...%c" msgid "Filtering content" msgstr "过滤内容" -#: entry.c:476 +#: entry.c:479 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" -#: environment.c:331 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能设置 GIT_DIR 为 '%s'" @@ -3789,244 +3842,244 @@ msgstr "不能设置 GIT_DIR 为 '%s'" msgid "too many args to run %s" msgstr "执行 %s 的参数太多" -#: fetch-pack.c:150 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "无法写到远程" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:357 fetch-pack.c:1364 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:363 fetch-pack.c:1370 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:365 fetch-pack.c:1372 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:368 fetch-pack.c:1375 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:370 fetch-pack.c:1377 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:373 fetch-pack.c:1381 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" -#: fetch-pack.c:414 +#: fetch-pack.c:415 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:432 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:462 +#: fetch-pack.c:463 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:476 progress.c:336 msgid "done" msgstr "完成" -#: fetch-pack.c:487 +#: fetch-pack.c:488 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:534 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:754 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:818 +#: fetch-pack.c:819 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:826 +#: fetch-pack.c:827 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:900 +#: fetch-pack.c:901 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:916 +#: fetch-pack.c:917 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:918 +#: fetch-pack.c:919 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:965 +#: fetch-pack.c:966 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986 +#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002 +#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018 +#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040 #, c-format msgid "Server supports %s" msgstr "服务器支持 %s" -#: fetch-pack.c:972 +#: fetch-pack.c:973 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" -#: fetch-pack.c:1032 +#: fetch-pack.c:1033 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:1038 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:1042 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1059 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1071 fetch-pack.c:1563 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1209 +#: fetch-pack.c:1211 msgid "Server does not support shallow requests" msgstr "服务器不支持 shalllow 请求" -#: fetch-pack.c:1216 +#: fetch-pack.c:1218 msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:1239 +#: fetch-pack.c:1242 msgid "unable to write request to remote" msgstr "无法将请求写到远程" -#: fetch-pack.c:1257 +#: fetch-pack.c:1260 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" -#: fetch-pack.c:1263 +#: fetch-pack.c:1266 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s'，得到 '%s'" -#: fetch-pack.c:1303 +#: fetch-pack.c:1327 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行：'%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1332 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错：%d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1342 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" -#: fetch-pack.c:1320 +#: fetch-pack.c:1344 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" -#: fetch-pack.c:1362 +#: fetch-pack.c:1386 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错：%d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1433 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1414 +#: fetch-pack.c:1438 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1419 +#: fetch-pack.c:1443 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错：%d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1789 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1812 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:1812 +#: fetch-pack.c:1839 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1842 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" -#: gpg-interface.c:408 -msgid "gpg failed to sign the data" -msgstr "gpg 数据签名失败" - -#: gpg-interface.c:434 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "不能创建临时文件" -#: gpg-interface.c:437 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg 数据签名失败" + #: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" @@ -4045,7 +4098,7 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -4121,7 +4174,7 @@ msgstr "在 $PATH 路径中的其他地方可用的 git 命令" msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令：" -#: help.c:363 git.c:98 +#: help.c:363 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "不支持的命令列表类型 '%s'" @@ -4130,19 +4183,19 @@ msgstr "不支持的命令列表类型 '%s'" msgid "The common Git guides are:" msgstr "最常用的 Git 向导有：" -#: help.c:512 +#: help.c:427 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "执行 'git help <command>' 来查看特定子命令" -#: help.c:517 +#: help.c:432 msgid "External commands" msgstr "外部命令" -#: help.c:532 +#: help.c:447 msgid "Command aliases" msgstr "命令别名" -#: help.c:596 +#: help.c:511 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4151,31 +4204,31 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:655 +#: help.c:570 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:677 +#: help.c:592 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。" -#: help.c:682 +#: help.c:597 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "假定你想要的是 '%s' 并继续。" -#: help.c:687 +#: help.c:602 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。" -#: help.c:695 +#: help.c:610 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:699 +#: help.c:614 msgid "" "\n" "The most similar command is" @@ -4189,16 +4242,16 @@ msgstr[1] "" "\n" "最相似的命令是" -#: help.c:714 +#: help.c:653 msgid "git version [<options>]" msgstr "git version [<选项>]" -#: help.c:783 +#: help.c:708 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" -#: help.c:787 +#: help.c:712 msgid "" "\n" "Did you mean this?" @@ -4265,36 +4318,11 @@ msgstr "不允许空的姓名（对于 <%s>）" msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符：%s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: list-objects.c:127 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象" - -#: list-objects.c:140 -#, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象" - -#: list-objects.c:375 -#, c-format -msgid "unable to load root tree for commit %s" -msgstr "无法为提交 %s 加载根树" - -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "不能访问 '%s' 中的稀疏数据对象" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "无法解析 %s 中的稀疏过滤器数据" - #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "期望 'tree:<深度>'" @@ -4321,7 +4349,32 @@ msgstr "期望在组合后有一些东西：" msgid "multiple filter-specs cannot be combined" msgstr "不能混用多种过滤规格" -#: lockfile.c:151 +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "不能访问 '%s' 中的稀疏数据对象" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "无法解析 %s 中的稀疏过滤器数据" + +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象" + +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象" + +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "无法为提交 %s 加载根树" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -4339,20 +4392,14 @@ msgstr "" "可能之前有一个 git 进程在这个仓库中异常退出：\n" "手动删除这个文件再继续。" -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "不能创建 '%s.lock'：%s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "读取缓存失败" - -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 -msgid "unable to write new index file" -msgstr "无法写新的索引文件" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "在 ls-refs 参数后应该有一个 flush 包" #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4535,7 +4582,7 @@ msgstr "重命名" msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" @@ -4573,14 +4620,14 @@ msgstr "" msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1793 +#: merge-recursive.c:1805 #, 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:2056 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4590,7 +4637,7 @@ msgstr "" "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" "其它目录，没有目录包含大部分文件。" -#: merge-recursive.c:2088 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4599,7 +4646,7 @@ msgstr "" "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" "在：%s。" -#: merge-recursive.c:2098 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4608,7 +4655,7 @@ msgstr "" "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" "径放置于此：%s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4617,59 +4664,59 @@ msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " "%4$s->%5$s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。" -#: merge-recursive.c:2961 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modify" msgstr "修改" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modified" msgstr "修改" -#: merge-recursive.c:3040 +#: merge-recursive.c:3052 msgid "content" msgstr "内容" -#: merge-recursive.c:3044 +#: merge-recursive.c:3056 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:3067 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3101 git-submodule.sh:985 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:3090 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:3203 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4677,7 +4724,7 @@ msgid "" msgstr "" "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" -#: merge-recursive.c:3206 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4686,7 +4733,7 @@ msgstr "" "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" "到 %s。" -#: merge-recursive.c:3210 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4695,7 +4742,7 @@ msgstr "" "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" "动到 %5$s。" -#: merge-recursive.c:3213 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4704,59 +4751,59 @@ msgstr "" "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" "建议将其移动到 %5$s。" -#: merge-recursive.c:3327 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:3355 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:3362 +#: merge-recursive.c:3374 #, 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:3371 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "冲突（add/add）：合并冲突于 %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "已经是最新的！" -#: merge-recursive.c:3433 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3537 +#: merge-recursive.c:3549 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:3550 +#: merge-recursive.c:3562 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:3600 +#: merge-recursive.c:3612 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3659 +#: merge-recursive.c:3671 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4765,15 +4812,25 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" -#: merge-recursive.c:3756 +#: merge-recursive.c:3768 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 msgid "Unable to write index." msgstr "不能写入索引。" +#: merge.c:41 +msgid "failed to read the cache" +msgstr "读取缓存失败" + +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "无法写新的索引文件" + #: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" @@ -4823,107 +4880,115 @@ msgstr "多包索引缺少必需的对象偏移块" msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序：'%s' 在 '%s' 之前" -#: midx.c:210 +#: midx.c:208 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" -#: midx.c:260 +#: midx.c:258 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" -#: midx.c:288 +#: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "从多包索引准备 packfile 出错" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:842 +#: midx.c:840 msgid "Adding packfiles to multi-pack-index" msgstr "添加包文件到多包索引" -#: midx.c:875 +#: midx.c:873 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" -#: midx.c:973 +#: midx.c:925 +msgid "no pack files to index." +msgstr "没有要索引的包文件。" + +#: midx.c:977 msgid "Writing chunks to multi-pack-index" msgstr "写入块到多包索引" -#: midx.c:1052 +#: midx.c:1056 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:1108 +#: midx.c:1112 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c:1123 +#: midx.c:1127 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1128 +#: midx.c:1132 +msgid "the midx contains no oid" +msgstr "midx 不包含 oid" + +#: midx.c:1141 msgid "Verifying OID order in multi-pack-index" msgstr "校验多包索引中的 OID 顺序" -#: midx.c:1137 +#: midx.c:1150 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1170 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" -#: midx.c:1164 +#: midx.c:1177 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1180 +#: midx.c:1193 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1186 +#: midx.c:1199 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1195 +#: midx.c:1208 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>" -#: midx.c:1220 +#: midx.c:1233 msgid "Counting referenced objects" msgstr "正在对引用对象计数" -#: midx.c:1230 +#: midx.c:1243 msgid "Finding and deleting unreferenced packfiles" msgstr "正在查找和删除未引用的包文件" -#: midx.c:1388 +#: midx.c:1433 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" -#: midx.c:1407 +#: midx.c:1452 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" @@ -5006,6 +5071,11 @@ msgstr "不能解析对象：%s" msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135 +#, c-format +msgid "unable to get size of %s" +msgstr "无法得到 %s 的大小" + #: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" @@ -5020,10 +5090,25 @@ msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format -msgid "unable to get size of %s" -msgstr "无法得到 %s 的大小" +msgid "option `%s' expects a numerical value" +msgstr "选项 `%s' 期望一个数字值" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "格式错误的到期时间：'%s'" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" + +#: parse-options-cb.c:130 parse-options-cb.c:147 +#, c-format +msgid "malformed object name '%s'" +msgstr "格式错误的对象名 '%s'" #: parse-options.c:38 #, c-format @@ -5065,26 +5150,31 @@ msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" msgid "did you mean `--%s` (with two dashes)?" msgstr "你的意思是 `--%s`（有两个短线）？" -#: parse-options.c:857 +#: parse-options.c:663 parse-options.c:963 +#, c-format +msgid "alias of --%s" +msgstr "--%s 的别名" + +#: parse-options.c:854 #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" -#: parse-options.c:859 +#: parse-options.c:856 #, c-format msgid "unknown switch `%c'" msgstr "未知开关 `%c'" -#: parse-options.c:861 +#: parse-options.c:858 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字符串中未知的非 ascii 字符选项：`%s'" -#: parse-options.c:885 +#: parse-options.c:882 msgid "..." msgstr "..." -#: parse-options.c:904 +#: parse-options.c:901 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -5092,46 +5182,21 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:907 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:913 +#: parse-options.c:910 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:949 msgid "-NUM" msgstr "-数字" -#: parse-options.c:966 -#, c-format -msgid "alias of --%s" -msgstr "--%s 的别名" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "选项 `%s' 期望一个数字值" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "格式错误的到期时间：'%s'" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "格式错误的对象名 '%s'" - #: path.c:915 #, c-format msgid "Could not make %s writable by group" @@ -5188,27 +5253,27 @@ msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不兼容" -#: pathspec.c:442 +#: pathspec.c:445 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s：'%s' 在位于 '%s' 的仓库之外" -#: pathspec.c:517 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助记符：'%c'）" -#: pathspec.c:527 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规格神奇前缀不被此命令支持：%s" -#: pathspec.c:594 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" -#: pathspec.c:639 +#: pathspec.c:643 #, c-format msgid "line is badly quoted: %s" msgstr "行被错误地引用：%s" @@ -5273,7 +5338,7 @@ msgstr "正在刷新索引" msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat：%s" -#: pretty.c:981 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" @@ -5286,29 +5351,40 @@ msgstr "远程未设置 URL" msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 远程名称不能以 '/' 开始：%s" -#: range-diff.c:75 +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "正在删除重复对象" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "不能启动 `log`" -#: range-diff.c:77 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:98 sequencer.c:5143 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" -#: range-diff.c:122 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "无法解析 git 头 '%.*s'" -#: range-diff.c:285 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "生成 diff 失败" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" @@ -5425,9 +5501,9 @@ msgstr "'%s' 的未排序暂存条目" #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "索引文件损坏" @@ -5482,12 +5558,12 @@ msgstr "无法刷新共享索引 '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" @@ -5614,14 +5690,14 @@ msgstr "" "然而，如果您删除全部内容，变基操作将会终止。\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 #, c-format msgid "could not write '%s'" msgstr "不能写入 '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 +#: builtin/rebase.c:240 #, c-format msgid "could not write '%s'." msgstr "不能写入 '%s'。" @@ -5651,132 +5727,14 @@ msgstr "" "可选值有：ignore、warn、error。\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 +#: builtin/rebase.c:252 #, c-format msgid "could not read '%s'." msgstr "不能读取 '%s'。" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "%s 没有指向一个有效的对象！" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "忽略悬空符号引用 %s" - -#: refs.c:669 ref-filter.c:2098 -#, c-format -msgid "ignoring broken ref %s" -msgstr "忽略损坏的引用 %s" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "无法为写入打开 '%s'：%s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "无法读取引用 '%s'" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "引用 '%s' 已经存在" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "写入 '%s' 时意外的对象 ID" - -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 -#, c-format -msgid "could not write to '%s'" -msgstr "不能写入 '%s'" - -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 -#, c-format -msgid "could not open '%s' for writing" -msgstr "无法打开 '%s' 进行写入" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "删除 '%s' 时意外的对象 ID" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "引用 %s 的日志在 %s 之后有缺口" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "引用 %s 的日志意外终止于 %s " - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "%s 的日志为空" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "拒绝更新有错误名称 '%s' 的引用" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "对引用 '%s' 执行 update_ref 失败：%s" - -#: refs.c:2023 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "不允许对引用 '%s' 多次更新" - -#: refs.c:2055 -msgid "ref updates forbidden inside quarantine environment" -msgstr "在隔离环境中禁止更新引用" - -#: refs.c:2151 refs.c:2181 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' 已存在，无法创建 '%s'" - -#: refs.c:2157 refs.c:2192 -#, c-format -msgid "cannot process '%s' and '%s' at the same time" -msgstr "无法同时处理 '%s' 和 '%s'" - -#: refs/files-backend.c:1233 -#, c-format -msgid "could not remove reference %s" -msgstr "无法删除引用 %s" - -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 -#, c-format -msgid "could not delete reference %s: %s" -msgstr "无法删除引用 %s：%s" - -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 -#, c-format -msgid "could not delete references: %s" -msgstr "无法删除引用：%s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "无效的引用表达式：'%s'" - -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1936 msgid "gone" msgstr "丢失" @@ -5961,114 +5919,232 @@ msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" msgid "malformed format string %s" msgstr "错误的格式化字符串 %s" -#: ref-filter.c:1488 +#: ref-filter.c:1486 #, c-format msgid "no branch, rebasing %s" msgstr "非分支，正变基 %s" -#: ref-filter.c:1491 +#: ref-filter.c:1489 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "非分支，正变基分离头指针 %s" -#: ref-filter.c:1494 +#: ref-filter.c:1492 #, c-format msgid "no branch, bisect started on %s" msgstr "非分支，二分查找开始于 %s" -#: ref-filter.c:1504 +#: ref-filter.c:1502 msgid "no branch" msgstr "非分支" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1538 ref-filter.c:1747 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1550 +#: ref-filter.c:1548 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" -#: ref-filter.c:2004 +#: ref-filter.c:2001 #, c-format msgid "malformed object at '%s'" msgstr "格式错误的对象 '%s'" -#: ref-filter.c:2093 +#: ref-filter.c:2090 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:2389 +#: ref-filter.c:2095 refs.c:625 +#, c-format +msgid "ignoring broken ref %s" +msgstr "忽略损坏的引用 %s" + +#: ref-filter.c:2395 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2489 +#: ref-filter.c:2495 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "选项 `%s' 和 --merged 不兼容" -#: ref-filter.c:2492 +#: ref-filter.c:2498 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "选项 `%s' 和 --no-merged 不兼容" -#: ref-filter.c:2502 +#: ref-filter.c:2508 #, c-format msgid "malformed object name %s" msgstr "格式错误的对象名 %s" -#: ref-filter.c:2507 +#: ref-filter.c:2513 #, c-format msgid "option `%s' must point to a commit" msgstr "选项 `%s' 必须指向一个提交" -#: remote.c:366 +#: refs.c:262 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s 没有指向一个有效的对象！" + +#: refs.c:623 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "忽略悬空符号引用 %s" + +#: refs.c:760 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "无法为写入打开 '%s'：%s" + +#: refs.c:770 refs.c:821 +#, c-format +msgid "could not read ref '%s'" +msgstr "无法读取引用 '%s'" + +#: refs.c:776 +#, c-format +msgid "ref '%s' already exists" +msgstr "引用 '%s' 已经存在" + +#: refs.c:781 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "写入 '%s' 时意外的对象 ID" + +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173 +#: wrapper.c:620 +#, c-format +msgid "could not write to '%s'" +msgstr "不能写入 '%s'" + +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:852 +#, c-format +msgid "could not open '%s' for writing" +msgstr "无法打开 '%s' 进行写入" + +#: refs.c:823 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "删除 '%s' 时意外的对象 ID" + +#: refs.c:954 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "引用 %s 的日志在 %s 之后有缺口" + +#: refs.c:960 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "引用 %s 的日志意外终止于 %s " + +#: refs.c:1019 +#, c-format +msgid "log for %s is empty" +msgstr "%s 的日志为空" + +#: refs.c:1111 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "拒绝更新有错误名称 '%s' 的引用" + +#: refs.c:1187 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "对引用 '%s' 执行 update_ref 失败：%s" + +#: refs.c:1979 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "不允许对引用 '%s' 多次更新" + +#: refs.c:2011 +msgid "ref updates forbidden inside quarantine environment" +msgstr "在隔离环境中禁止更新引用" + +#: refs.c:2107 refs.c:2137 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' 已存在，无法创建 '%s'" + +#: refs.c:2113 refs.c:2148 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "无法同时处理 '%s' 和 '%s'" + +#: refs/files-backend.c:1233 +#, c-format +msgid "could not remove reference %s" +msgstr "无法删除引用 %s" + +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "无法删除引用 %s：%s" + +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#, c-format +msgid "could not delete references: %s" +msgstr "无法删除引用：%s" + +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "无效的引用表达式：'%s'" + +#: remote.c:355 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "配置的远程短名称不能以 '/' 开始：%s" -#: remote.c:414 +#: remote.c:403 msgid "more than one receivepack given, using the first" msgstr "提供了一个以上的 receivepack，使用第一个" -#: remote.c:422 +#: remote.c:411 msgid "more than one uploadpack given, using the first" msgstr "提供了一个以上的 uploadpack，使用第一个" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:620 +#: remote.c:602 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:688 +#: remote.c:670 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "模式的键 '%s' 没有 '*'" -#: remote.c:698 +#: remote.c:680 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "模式的值 '%s' 没有 '*'" -#: remote.c:1004 +#: remote.c:986 #, c-format msgid "src refspec %s does not match any" msgstr "源引用表达式 %s 没有匹配" -#: remote.c:1009 +#: remote.c:991 #, c-format msgid "src refspec %s matches more than one" msgstr "源引用表达式 %s 匹配超过一个" @@ -6077,7 +6153,7 @@ msgstr "源引用表达式 %s 匹配超过一个" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1006 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6099,7 +6175,7 @@ msgstr "" "\n" "都不行，所以我们已放弃。您必须给出完整的引用。" -#: remote.c:1044 +#: remote.c:1026 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6109,7 +6185,7 @@ msgstr "" "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n" "'%s:refs/heads/%s' 推送么？" -#: remote.c:1049 +#: remote.c:1031 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6119,7 +6195,7 @@ msgstr "" "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1054 +#: remote.c:1036 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6129,7 +6205,7 @@ msgstr "" "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1059 +#: remote.c:1041 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6139,114 +6215,114 @@ msgstr "" "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1095 +#: remote.c:1077 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s 无法被解析为分支" -#: remote.c:1106 +#: remote.c:1088 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "无法删除 '%s'：远程引用不存在" -#: remote.c:1118 +#: remote.c:1100 #, c-format msgid "dst refspec %s matches more than one" msgstr "目标引用表达式 %s 匹配超过一个" -#: remote.c:1125 +#: remote.c:1107 #, c-format msgid "dst ref %s receives from more than one src" msgstr "目标引用 %s 接收超过一个源" -#: remote.c:1628 remote.c:1729 +#: remote.c:1610 remote.c:1711 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: remote.c:1637 +#: remote.c:1619 #, c-format msgid "no such branch: '%s'" msgstr "没有此分支：'%s'" -#: remote.c:1640 +#: remote.c:1622 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: remote.c:1646 +#: remote.c:1628 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: remote.c:1661 +#: remote.c:1643 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" -#: remote.c:1673 +#: remote.c:1655 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置要推送的远程服务器" -#: remote.c:1683 +#: remote.c:1665 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用规格未包含 '%s'" -#: remote.c:1696 +#: remote.c:1678 msgid "push has no destination (push.default is 'nothing')" msgstr "推送无目标（push.default 是 'nothing'）" -#: remote.c:1718 +#: remote.c:1700 msgid "cannot resolve 'simple' push to a single destination" msgstr "无法解析 'simple' 推送至一个单独的目标" -#: remote.c:1844 +#: remote.c:1826 #, c-format msgid "couldn't find remote ref %s" msgstr "无法找到远程引用 %s" -#: remote.c:1857 +#: remote.c:1839 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* 在本地忽略可笑的引用 '%s'" -#: remote.c:2020 +#: remote.c:2002 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:2024 +#: remote.c:2006 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:2027 +#: remote.c:2009 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:2031 +#: remote.c:2013 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:2034 +#: remote.c:2016 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 查看详情）\n" -#: remote.c:2038 +#: remote.c:2020 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:2044 +#: remote.c:2026 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:2047 +#: remote.c:2029 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6255,11 +6331,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:2055 +#: remote.c:2037 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:2058 +#: remote.c:2040 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6275,11 +6351,11 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:2068 +#: remote.c:2050 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: remote.c:2251 +#: remote.c:2233 #, c-format msgid "cannot parse expected object name '%s'" msgstr "无法解析期望的对象名 '%s'" @@ -6299,6 +6375,11 @@ msgstr "重复的替换引用：%s" msgid "replace depth too high for object %s" msgstr "对象 %s 的替换层级太深" +#: repository.c:94 builtin/init-db.c:188 +#, c-format +msgid "The hash algorithm %s is not supported in this build." +msgstr "这个版本不支持 %s 哈希算法。" + #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" msgstr "损坏的 MERGE_RR" @@ -6357,7 +6438,7 @@ msgstr "不能删除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "为 '%s' 记录 preimage" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" @@ -6392,20 +6473,29 @@ msgstr "忘记 '%s' 的解决方案\n" msgid "unable to open rr-cache directory" msgstr "不能打开 rr-cache 目录" -#: revision.c:2497 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "不能确定 HEAD 版本" + +#: reset.c:70 reset.c:76 sequencer.c:3318 +#, c-format +msgid "failed to find tree of %s" +msgstr "无法找到 %s 指向的树。" + +#: revision.c:2655 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2500 +#: revision.c:2658 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2708 +#: revision.c:2866 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" -#: revision.c:2712 +#: revision.c:2870 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" @@ -6427,75 +6517,75 @@ msgstr "" "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n" "配置 `git config advice.ignoredHook false` 来关闭这条警告。" -#: send-pack.c:144 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "读取远程解包状态时收到意外的 flush 包" -#: send-pack.c:146 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "不能解析远程解包状态：%s" -#: send-pack.c:148 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "远程解包失败：%s" -#: send-pack.c:309 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "为推送证书签名失败" -#: send-pack.c:423 +#: send-pack.c:399 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" -#: send-pack.c:425 +#: send-pack.c:401 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未发送推送证书，因为接收端不支持签名推送" -#: send-pack.c:437 +#: send-pack.c:413 msgid "the receiving end does not support --atomic push" msgstr "接收端不支持原子推送" -#: send-pack.c:442 +#: send-pack.c:418 msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" -#: sequencer.c:191 +#: sequencer.c:192 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "无效的提交信息清理模式 '%s'" -#: sequencer.c:296 +#: sequencer.c:297 #, c-format msgid "could not delete '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:325 +#: sequencer.c:326 msgid "revert" msgstr "还原" -#: sequencer.c:327 +#: sequencer.c:328 msgid "cherry-pick" msgstr "拣选" -#: sequencer.c:329 +#: sequencer.c:330 msgid "rebase" msgstr "变基" -#: sequencer.c:331 +#: sequencer.c:332 #, c-format msgid "unknown action: %d" msgstr "未知动作：%d" -#: sequencer.c:389 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6503,7 +6593,7 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" -#: sequencer.c:392 +#: sequencer.c:393 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6512,44 +6602,43 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:406 sequencer.c:2921 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:412 +#: sequencer.c:413 #, c-format msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 +#: sequencer.c:3203 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: sequencer.c:466 +#: sequencer.c:457 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" -#: sequencer.c:470 +#: sequencer.c:461 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或贮藏后再继续。" -#: sequencer.c:502 +#: sequencer.c:493 #, c-format msgid "%s: fast-forward" msgstr "%s：快进" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:532 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" @@ -6557,65 +6646,65 @@ msgstr "无效的清理模式 %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:635 +#: sequencer.c:626 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:652 +#: sequencer.c:643 msgid "unable to update cache tree" msgstr "不能更新缓存树" -#: sequencer.c:666 +#: sequencer.c:657 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:746 +#: sequencer.c:737 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中没有 key" -#: sequencer.c:757 +#: sequencer.c:748 #, c-format msgid "unable to dequote value of '%s'" msgstr "无法为 '%s' 的值去引号" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: sequencer.c:804 +#: sequencer.c:795 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已经给出 'GIT_AUTHOR_NAME'" -#: sequencer.c:809 +#: sequencer.c:800 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已经给出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:814 +#: sequencer.c:805 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已经给出 'GIT_AUTHOR_DATE'" -#: sequencer.c:818 +#: sequencer.c:809 #, c-format msgid "unknown variable '%s'" msgstr "未知变量 '%s'" -#: sequencer.c:823 +#: sequencer.c:814 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:825 +#: sequencer.c:816 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:827 +#: sequencer.c:818 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:876 +#: sequencer.c:867 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6644,11 +6733,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:1141 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 钩子失败" -#: sequencer.c:1154 +#: sequencer.c:1147 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6672,7 +6761,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1160 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6695,325 +6784,330 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1202 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: sequencer.c:1211 +#: sequencer.c:1204 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: sequencer.c:1257 +#: sequencer.c:1250 msgid "unable to resolve HEAD after creating commit" msgstr "创建提交后，不能解析 HEAD" -#: sequencer.c:1259 +#: sequencer.c:1252 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: sequencer.c:1263 +#: sequencer.c:1256 msgid " (root-commit)" msgstr "（根提交）" -#: sequencer.c:1284 +#: sequencer.c:1277 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1286 +#: sequencer.c:1279 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交！" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1335 sequencer.c:1980 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1379 sequencer.c:1450 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能从 '%s' 读取提交说明" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 +#: builtin/merge.c:919 msgid "failed to write commit object" msgstr "写提交对象失败" -#: sequencer.c:1474 +#: sequencer.c:1433 sequencer.c:4118 +#, c-format +msgid "could not update %s" +msgstr "不能更新 %s" + +#: sequencer.c:1481 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1479 +#: sequencer.c:1486 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1569 sequencer.c:1680 #, c-format msgid "unknown command: %d" msgstr "未知命令：%d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1627 sequencer.c:1652 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" -#: sequencer.c:1630 +#: sequencer.c:1637 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1639 sequencer.c:3230 msgid "could not read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1634 +#: sequencer.c:1641 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" -#: sequencer.c:1640 +#: sequencer.c:1647 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明：" -#: sequencer.c:1655 +#: sequencer.c:1662 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" -#: sequencer.c:1662 +#: sequencer.c:1669 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d：" -#: sequencer.c:1668 +#: sequencer.c:1675 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过：" -#: sequencer.c:1756 +#: sequencer.c:1763 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:1763 +#: sequencer.c:1770 msgid "cannot fixup root commit" msgstr "不能修复根提交" -#: sequencer.c:1782 +#: sequencer.c:1789 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1797 sequencer.c:1805 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:1804 +#: sequencer.c:1811 #, c-format msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1830 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1888 +#: sequencer.c:1895 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" -#: sequencer.c:1943 +#: sequencer.c:1952 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:1944 +#: sequencer.c:1953 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:1961 +#: sequencer.c:1972 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "丢弃 %s %s -- 补丁内容已在上游\n" -#: sequencer.c:2018 +#: sequencer.c:2030 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:2025 +#: sequencer.c:2037 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:2102 +#: sequencer.c:2114 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数：'%s'" -#: sequencer.c:2111 +#: sequencer.c:2123 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" -#: sequencer.c:2142 +#: sequencer.c:2154 #, c-format msgid "could not parse '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:2203 +#: sequencer.c:2215 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d：%.*s" -#: sequencer.c:2214 +#: sequencer.c:2226 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:2298 +#: sequencer.c:2310 msgid "cancelling a cherry picking in progress" msgstr "正在取消一个进行中的拣选" -#: sequencer.c:2305 +#: sequencer.c:2317 msgid "cancelling a revert in progress" msgstr "正在取消一个进行中的还原" -#: sequencer.c:2349 +#: sequencer.c:2361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:2351 +#: sequencer.c:2363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单：'%s'" -#: sequencer.c:2356 +#: sequencer.c:2368 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:2367 +#: sequencer.c:2379 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:2369 +#: sequencer.c:2381 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:2447 +#: sequencer.c:2459 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:2540 +#: sequencer.c:2556 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2556 +#: sequencer.c:2576 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单：'%s'" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2664 sequencer.c:4469 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2660 +#: sequencer.c:2680 msgid "revert is already in progress" msgstr "一个还原操作已在进行" -#: sequencer.c:2662 +#: sequencer.c:2682 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2665 +#: sequencer.c:2685 msgid "cherry-pick is already in progress" msgstr "拣选操作已在进行" -#: sequencer.c:2667 +#: sequencer.c:2687 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2681 +#: sequencer.c:2701 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:2696 +#: sequencer.c:2716 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2776 sequencer.c:4206 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2778 sequencer.c:2789 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2780 sequencer.c:2824 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2810 builtin/grep.c:744 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:2792 +#: sequencer.c:2812 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s'：%s" -#: sequencer.c:2793 +#: sequencer.c:2813 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:2799 +#: sequencer.c:2819 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:2810 +#: sequencer.c:2830 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！" -#: sequencer.c:2851 +#: sequencer.c:2871 msgid "no revert in progress" msgstr "没有正在进行的还原" -#: sequencer.c:2859 +#: sequencer.c:2879 msgid "no cherry-pick in progress" msgstr "没有正在进行的拣选" -#: sequencer.c:2869 +#: sequencer.c:2889 msgid "failed to skip the commit" msgstr "无法跳过这个提交" -#: sequencer.c:2876 +#: sequencer.c:2896 msgid "there is nothing to skip" msgstr "没有要跳过的" -#: sequencer.c:2879 +#: sequencer.c:2899 #, c-format msgid "" "have you committed already?\n" @@ -7022,21 +7116,16 @@ msgstr "" "您已经提交了么？\n" "试试 \"git %s --continue\"" -#: sequencer.c:3003 sequencer.c:4011 -#, c-format -msgid "could not update %s" -msgstr "不能更新 %s" - -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3060 sequencer.c:4098 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:3059 +#: sequencer.c:3077 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "无法拷贝 '%s' 至 '%s'" -#: sequencer.c:3067 +#: sequencer.c:3085 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7055,23 +7144,28 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3095 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能应用 %s... %.*s" -#: sequencer.c:3084 +#: sequencer.c:3102 #, c-format msgid "Could not merge %.*s" msgstr "不能合并 %.*s" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" +#: sequencer.c:3132 +#, c-format +msgid "Executing: %s\n" +msgstr "正在执行：%s\n" + # 译者：注意保持前导空格 -#: sequencer.c:3129 +#: sequencer.c:3147 #, c-format msgid "" "execution failed: %s\n" @@ -7086,11 +7180,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3153 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:3141 +#: sequencer.c:3159 #, c-format msgid "" "execution succeeded: %s\n" @@ -7107,102 +7201,128 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3220 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" -#: sequencer.c:3256 +#: sequencer.c:3274 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:3261 +#: sequencer.c:3279 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 -#, c-format -msgid "failed to find tree of %s" -msgstr "无法找到 %s 指向的树。" - -#: sequencer.c:3344 +#: sequencer.c:3363 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3375 +#: sequencer.c:3394 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3397 +#: sequencer.c:3416 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3406 +#: sequencer.c:3425 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并：'%.*s'" -#: sequencer.c:3418 +#: sequencer.c:3437 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3434 +#: sequencer.c:3453 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:3594 +#: sequencer.c:3613 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:3610 +#: sequencer.c:3629 msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3703 +msgid "Cannot autostash" +msgstr "无法 autostash" + +#: sequencer.c:3706 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "意外的 stash 响应：'%s'" + +#: sequencer.c:3712 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "不能为 '%s' 创建目录" + +#: sequencer.c:3715 +#, c-format +msgid "Created autostash: %s\n" +msgstr "创建了 autostash：%s\n" + +#: sequencer.c:3719 +msgid "could not reset --hard" +msgstr "无法 reset --hard" + +#: sequencer.c:3744 #, c-format msgid "Applied autostash.\n" msgstr "已应用 autostash。\n" -#: sequencer.c:3691 +#: sequencer.c:3756 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3759 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"应用 autostash 导致冲突。\n" -"您的修改安全地保存在贮藏区中。\n" +"%s\n" +"您的修改在贮藏区中很安全。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3755 +#: sequencer.c:3764 +msgid "Applying autostash resulted in conflicts." +msgstr "应用自动贮藏导致冲突。" + +#: sequencer.c:3765 +msgid "Autostash exists; creating a new stash entry." +msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。" + +#: sequencer.c:3857 #, c-format msgid "%s: not a valid OID" msgstr "%s：不是一个有效的对象 ID" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:3775 +#: sequencer.c:3877 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3879 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:3785 +#: sequencer.c:3887 #, c-format msgid "" "Could not execute the todo command\n" @@ -7222,48 +7342,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3931 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "正在变基（%d/%d）%s" + +#: sequencer.c:3976 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:4047 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:3999 +#: sequencer.c:4106 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:4004 +#: sequencer.c:4111 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:4018 +#: sequencer.c:4125 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:4111 +#: sequencer.c:4185 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "成功变基并更新 %s。\n" + +#: sequencer.c:4218 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:4120 +#: sequencer.c:4227 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:4122 +#: sequencer.c:4229 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:4124 +#: sequencer.c:4231 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:4127 +#: sequencer.c:4234 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7272,59 +7402,59 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4270 sequencer.c:4309 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件：'%s'" -#: sequencer.c:4217 +#: sequencer.c:4324 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:4224 +#: sequencer.c:4331 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:4338 +#: sequencer.c:4446 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:4342 +#: sequencer.c:4450 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:4377 +#: sequencer.c:4485 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:4846 +#: sequencer.c:4962 msgid "make_script: unhandled options" msgstr "make_script：有未能处理的选项" -#: sequencer.c:4849 +#: sequencer.c:4965 msgid "make_script: error preparing revisions" msgstr "make_script：准备版本时错误" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5206 sequencer.c:5223 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:5119 +#: sequencer.c:5242 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:5213 +#: sequencer.c:5336 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" -#: setup.c:124 +#: setup.c:133 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s' 在位于 '%s' 的仓库之外" -#: setup.c:175 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7333,7 +7463,7 @@ msgstr "" "%s：工作区中无此路径。\n" "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" -#: setup.c:188 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7344,12 +7474,12 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:254 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "选项 '%s' 必须在其他非选项参数之前" -#: setup.c:273 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7360,92 +7490,92 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:409 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "无法使用无效配置来创建工作区" -#: setup.c:413 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" -#: setup.c:559 +#: setup.c:569 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" -#: setup.c:567 +#: setup.c:577 msgid "unknown repository extensions found:" msgstr "发现未知的仓库扩展：" -#: setup.c:586 +#: setup.c:596 #, c-format msgid "error opening '%s'" msgstr "打开 '%s' 出错" -#: setup.c:588 +#: setup.c:598 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大，无法作为 .git 文件：'%s'" -#: setup.c:590 +#: setup.c:600 #, c-format msgid "error reading %s" msgstr "读取 %s 出错" -#: setup.c:592 +#: setup.c:602 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式：%s" -#: setup.c:594 +#: setup.c:604 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径：%s" -#: setup.c:596 +#: setup.c:606 #, c-format msgid "not a git repository: %s" msgstr "不是一个 git 仓库：%s" -#: setup.c:695 +#: setup.c:708 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:709 +#: setup.c:722 #, c-format msgid "not a git repository: '%s'" msgstr "不是一个 git 仓库：'%s'" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:751 setup.c:753 setup.c:784 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:870 +#: setup.c:883 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "获取 '%*s%s%s' 状态（stat）失败" -#: setup.c:1108 +#: setup.c:1121 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:1117 setup.c:1123 +#: setup.c:1130 setup.c:1136 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" -#: setup.c:1128 +#: setup.c:1141 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一个 git 仓库（或者任何父目录）：%s" -#: setup.c:1134 +#: setup.c:1147 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7454,7 +7584,7 @@ msgstr "" "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1245 +#: setup.c:1258 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7463,268 +7593,268 @@ msgstr "" "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: setup.c:1289 +#: setup.c:1304 msgid "open /dev/null or dup failed" msgstr "不能打开或者复制 /dev/null" -#: setup.c:1304 +#: setup.c:1319 msgid "fork failed" msgstr "fork 失败" -#: setup.c:1309 +#: setup.c:1324 msgid "setsid failed" msgstr "setsid 失败" -#: sha1-file.c:452 +#: sha1-file.c:470 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径：%s" -#: sha1-file.c:575 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" -#: sha1-file.c:582 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" -#: sha1-file.c:625 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" -#: sha1-file.c:643 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "无法读取替代文件" -#: sha1-file.c:650 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" -#: sha1-file.c:685 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: sha1-file.c:711 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: sha1-file.c:717 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: sha1-file.c:723 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: sha1-file.c:731 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" -#: sha1-file.c:791 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析备用引用时无效的行：%s" -#: sha1-file.c:943 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:975 msgid "mmap failed" msgstr "mmap 失败" -#: sha1-file.c:1128 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1274 sha1-file.c:2454 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1276 sha1-file.c:2458 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" -#: sha1-file.c:1307 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "无效的对象类型" -#: sha1-file.c:1391 +#: sha1-file.c:1402 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" -#: sha1-file.c:1394 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" -#: sha1-file.c:1400 +#: sha1-file.c:1411 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" -#: sha1-file.c:1403 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: sha1-file.c:1629 +#: sha1-file.c:1640 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" -#: sha1-file.c:1633 +#: sha1-file.c:1644 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: sha1-file.c:1637 +#: sha1-file.c:1648 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" -#: sha1-file.c:1641 +#: sha1-file.c:1652 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" -#: sha1-file.c:1746 +#: sha1-file.c:1757 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" -#: sha1-file.c:1753 +#: sha1-file.c:1764 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: sha1-file.c:1760 +#: sha1-file.c:1771 msgid "file write error" msgstr "文件写错误" -#: sha1-file.c:1780 +#: sha1-file.c:1791 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" -#: sha1-file.c:1845 +#: sha1-file.c:1856 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: sha1-file.c:1847 +#: sha1-file.c:1858 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: sha1-file.c:1871 +#: sha1-file.c:1882 msgid "unable to write loose object file" msgstr "不能写松散对象文件" -#: sha1-file.c:1877 +#: sha1-file.c:1888 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" -#: sha1-file.c:1881 +#: sha1-file.c:1892 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: sha1-file.c:1885 +#: sha1-file.c:1896 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1906 builtin/pack-objects.c:1055 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: sha1-file.c:1972 +#: sha1-file.c:1983 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" -#: sha1-file.c:2011 +#: sha1-file.c:2022 msgid "corrupt commit" msgstr "损坏的提交" -#: sha1-file.c:2019 +#: sha1-file.c:2030 msgid "corrupt tag" msgstr "损坏的标签" -#: sha1-file.c:2119 +#: sha1-file.c:2130 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: sha1-file.c:2122 +#: sha1-file.c:2133 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2206 sha1-file.c:2216 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入数据库失败" -#: sha1-file.c:2211 +#: sha1-file.c:2222 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" -#: sha1-file.c:2235 +#: sha1-file.c:2246 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: sha1-file.c:2237 +#: sha1-file.c:2248 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2275 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2465 sha1-file.c:2518 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配（预期 %s）" -#: sha1-file.c:2478 +#: sha1-file.c:2489 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: sha1-file.c:2483 +#: sha1-file.c:2494 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: sha1-file.c:2489 +#: sha1-file.c:2500 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: sha1-file.c:2500 +#: sha1-file.c:2511 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" @@ -7826,43 +7956,43 @@ msgid "invalid object name '%.*s'." msgstr "无效的对象名 '%.*s'。" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:853 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:855 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:863 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:865 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:872 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:874 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:880 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7870,18 +8000,42 @@ msgstr[0] "%u 字节" msgstr[1] "%u 字节" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:882 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u 字节/秒" msgstr[1] "%u 字节/秒" -#: strbuf.c:1164 +#: strbuf.c:1180 #, c-format msgid "could not edit '%s'" msgstr "不能编辑 '%s'" +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "忽略可疑的子模组名称：%s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "submodule.fetchjobs 不允许为负值" + +#: submodule-config.c:402 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "忽略可能被解析为命令行选项的 '%s'：%s" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "%s 的值无效" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "不能更新 .gitmodules 条目 %s" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" @@ -7939,7 +8093,7 @@ msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes - msgid "process for submodule '%s' failed" msgstr "处理子模组 '%s' 失败" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" @@ -8053,39 +8207,15 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:2209 +#: submodule.c:2210 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" -#: submodule.c:2248 +#: submodule.c:2250 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" -#: submodule-config.c:236 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "忽略可疑的子模组名称：%s" - -#: submodule-config.c:303 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "submodule.fetchjobs 不允许为负值" - -#: submodule-config.c:401 -#, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "忽略可能被解析为命令行选项的 '%s'：%s" - -#: submodule-config.c:498 -#, c-format -msgid "invalid value for %s" -msgstr "%s 的值无效" - -#: submodule-config.c:765 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "不能更新 .gitmodules 条目 %s" - #: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" @@ -8140,97 +8270,6 @@ msgstr "不能打开临时文件" msgid "could not rename temporary file to %s" msgstr "不能重命名临时文件为 %s" -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" - -#: transport.c:145 -#, c-format -msgid "could not read bundle '%s'" -msgstr "无法读取 bundle '%s'" - -#: transport.c:214 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "传输：无效的深度选项 '%s'" - -#: transport.c:266 -msgid "see protocol.version in 'git help config' for more details" -msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" - -#: transport.c:267 -msgid "server options require protocol version 2 or later" -msgstr "服务端选项需要版本 2 协议或更高" - -#: transport.c:632 -msgid "could not parse transport.color.* config" -msgstr "不能解析 transport.color.* 配置" - -#: transport.c:705 -msgid "support for protocol v2 not implemented yet" -msgstr "协议 v2 的支持尚未实现" - -#: transport.c:831 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "配置 '%s' 的取值未知：%s" - -#: transport.c:897 -#, c-format -msgid "transport '%s' not allowed" -msgstr "传输 '%s' 不允许" - -#: transport.c:949 -msgid "git-over-rsync is no longer supported" -msgstr "不再支持 git-over-rsync" - -#: transport.c:1044 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" - -#: transport.c:1048 -#, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" -msgstr "" -"\n" -"请尝试\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"或者进入到子目录执行\n" -"\n" -"\tgit push\n" -"\n" -"以推送至远程。\n" -"\n" - -#: transport.c:1056 -msgid "Aborting." -msgstr "正在终止。" - -#: transport.c:1201 -msgid "failed to push all needed submodules" -msgstr "不能推送全部需要的子模组" - -#: transport.c:1345 transport-helper.c:657 -msgid "operation not supported by protocol" -msgstr "协议不支持该操作" - #: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "完整写入远程助手失败" @@ -8273,7 +8312,7 @@ msgstr "不能执行 fast-import" msgid "error while running fast-import" msgstr "执行 fast-import 出错" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:545 transport-helper.c:1135 #, c-format msgid "could not read ref %s" msgstr "无法读取引用 %s" @@ -8291,6 +8330,10 @@ msgstr "协议不支持设置远程服务路径" msgid "invalid remote service path" msgstr "无效的远程服务路径" +#: transport-helper.c:657 transport.c:1339 +msgid "operation not supported by protocol" +msgstr "协议不支持该操作" + #: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" @@ -8331,24 +8374,24 @@ msgstr "助手 %s 不支持 --atomic" msgid "helper %s does not support 'push-option'" msgstr "助手 %s 不支持 'push-option'" -#: transport-helper.c:965 +#: transport-helper.c:966 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支持 push，需要引用表达式" -#: transport-helper.c:970 +#: transport-helper.c:971 #, c-format msgid "helper %s does not support 'force'" msgstr "助手 %s 不支持 'force'" -#: transport-helper.c:1017 +#: transport-helper.c:1018 msgid "couldn't run fast-export" msgstr "无法执行 fast-export" -#: transport-helper.c:1022 +#: transport-helper.c:1023 msgid "error while running fast-export" msgstr "执行 fast-export 时出错" -#: transport-helper.c:1047 +#: transport-helper.c:1048 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8357,50 +8400,137 @@ msgstr "" "没有共同的引用并且也没有指定，什么也不会做。\n" "可能您应该指定一个分支如 'master'。\n" -#: transport-helper.c:1120 +#: transport-helper.c:1121 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式错误的响应：%s" -#: transport-helper.c:1272 +#: transport-helper.c:1273 #, c-format msgid "read(%s) failed" msgstr "读取（%s）失败" -#: transport-helper.c:1299 +#: transport-helper.c:1300 #, c-format msgid "write(%s) failed" msgstr "写（%s）失败" -#: transport-helper.c:1348 +#: transport-helper.c:1349 #, c-format msgid "%s thread failed" msgstr "%s 线程失败" -#: transport-helper.c:1352 +#: transport-helper.c:1353 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 线程等待失败：%s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1372 transport-helper.c:1376 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能启动线程来拷贝数据：%s" -#: transport-helper.c:1412 +#: transport-helper.c:1413 #, c-format msgid "%s process failed to wait" msgstr "%s 进程等待失败" -#: transport-helper.c:1416 +#: transport-helper.c:1417 #, c-format msgid "%s process failed" msgstr "%s 进程失败" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1435 transport-helper.c:1444 msgid "can't start thread for copying data" msgstr "不能启动线程来拷贝数据" +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" + +#: transport.c:145 +#, c-format +msgid "could not read bundle '%s'" +msgstr "无法读取 bundle '%s'" + +#: transport.c:214 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "传输：无效的深度选项 '%s'" + +#: transport.c:266 +msgid "see protocol.version in 'git help config' for more details" +msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" + +#: transport.c:267 +msgid "server options require protocol version 2 or later" +msgstr "服务端选项需要版本 2 协议或更高" + +#: transport.c:632 +msgid "could not parse transport.color.* config" +msgstr "不能解析 transport.color.* 配置" + +#: transport.c:705 +msgid "support for protocol v2 not implemented yet" +msgstr "协议 v2 的支持尚未实现" + +#: transport.c:839 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "配置 '%s' 的取值未知：%s" + +#: transport.c:905 +#, c-format +msgid "transport '%s' not allowed" +msgstr "传输 '%s' 不允许" + +#: transport.c:957 +msgid "git-over-rsync is no longer supported" +msgstr "不再支持 git-over-rsync" + +#: transport.c:1052 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" + +#: transport.c:1056 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" +"\n" +"请尝试\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"或者进入到子目录执行\n" +"\n" +"\tgit push\n" +"\n" +"以推送至远程。\n" +"\n" + +#: transport.c:1064 +msgid "Aborting." +msgstr "正在终止。" + +#: transport.c:1209 +msgid "failed to push all needed submodules" +msgstr "不能推送全部需要的子模组" + #: tree-walk.c:32 msgid "too-short tree object" msgstr "太短的树对象" @@ -8417,7 +8547,7 @@ msgstr "树对象条目中空的文件名" msgid "too-short tree file" msgstr "太短的树文件" -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8426,7 +8556,7 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s请在切换分支前提交或贮藏您的修改。" -#: unpack-trees.c:112 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8435,7 +8565,7 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8444,7 +8574,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s请在合并前提交或贮藏您的修改。" -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8453,7 +8583,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8462,7 +8592,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s请在 %s 之前提交或贮藏您的修改。" -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8471,7 +8601,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8480,7 +8610,7 @@ msgstr "" "更新如下目录将会丢失其中未跟踪的文件：\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8489,7 +8619,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s请在切换分支之前移动或删除。" -#: unpack-trees.c:133 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8498,7 +8628,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8507,7 +8637,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:138 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8516,7 +8646,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8525,7 +8655,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:143 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8534,7 +8664,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8544,7 +8674,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s请在切换分支前移动或删除。" -#: unpack-trees.c:151 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8554,7 +8684,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8563,7 +8693,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:156 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8572,7 +8702,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8581,7 +8711,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:161 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8590,59 +8720,66 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" -#: unpack-trees.c:172 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"无法更新稀疏检出：如下条目不是最新：\n" +"无法更新子模组：\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"工作区中下列文件将被稀疏检出更新所覆盖：\n" +"尽管存在稀疏检出模板，以下路径不是最新，因而保留：\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"工作区中下列文件将被稀疏检出更新所删除：\n" +"尽管存在稀疏检出模板，以下路径处于未合并状态，因而保留：\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"无法更新子模组：\n" +"尽管存在稀疏检出模板，以下路径已经存在，因而未更新：\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "正在终止\n" -#: unpack-trees.c:317 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "在修复上述路径之后，你可能要执行 `git sparse-checkout reapply`。\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "正在更新文件" -#: unpack-trees.c:349 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8651,10 +8788,14 @@ msgstr "" "以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n" "并且碰撞组中只有一个文件存在工作区中：\n" -#: unpack-trees.c:1445 +#: unpack-trees.c:1498 msgid "Updating index flags" msgstr "正在更新索引标志" +#: upload-pack.c:1337 +msgid "expected flush after fetch arguments" +msgstr "在 fetch 参数之后应该有一个 flush 包" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "无效的 URL 方案名称或丢失 '://' 后缀" @@ -8688,32 +8829,32 @@ msgstr "无效的 '..' 路径片段" msgid "Fetching objects" msgstr "正在获取对象" -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:262 builtin/am.c:2098 #, c-format msgid "failed to read '%s'" msgstr "读取 '%s' 失败" -#: worktree.c:305 +#: worktree.c:309 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" -#: worktree.c:316 +#: worktree.c:320 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" -#: worktree.c:328 +#: worktree.c:332 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:334 +#: worktree.c:338 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件，错误码 %d" -#: worktree.c:342 +#: worktree.c:347 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" @@ -8767,11 +8908,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" @@ -8877,22 +9018,22 @@ msgstr "修改的内容, " msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:906 +#: wt-status.c:904 #, 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:938 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:940 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:1022 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8900,7 +9041,7 @@ msgstr "" "不要改动或删除上面的一行。\n" "其下所有内容都将被忽略。" -#: wt-status.c:1114 +#: wt-status.c:1112 #, c-format msgid "" "\n" @@ -8911,77 +9052,77 @@ msgstr "" "花了 %.2f 秒才计算出分支的领先/落后范围。\n" "为避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1144 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 -#: wt-status.c:1149 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" -#: wt-status.c:1153 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:1156 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:1165 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:1168 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1176 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1311 +#: wt-status.c:1309 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1314 +#: wt-status.c:1312 #, 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:1325 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" -#: wt-status.c:1330 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1333 +#: wt-status.c:1331 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -8989,189 +9130,189 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 -#: wt-status.c:1341 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" -#: wt-status.c:1353 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1358 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1375 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1382 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1386 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1391 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1394 +#: wt-status.c:1392 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1398 +#: wt-status.c:1396 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1403 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1406 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1408 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1419 +#: wt-status.c:1417 msgid "Cherry-pick currently in progress." msgstr "拣选操作正在进行中。" -#: wt-status.c:1422 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1429 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1432 +#: wt-status.c:1430 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （执行 \"git cherry-pick --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1437 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1439 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "还原操作正在行中。" -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " （执行 \"git revert --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1466 +#: wt-status.c:1464 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1468 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1478 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1482 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1485 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1694 +#: wt-status.c:1692 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1701 +#: wt-status.c:1699 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1703 +#: wt-status.c:1701 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1713 +#: wt-status.c:1711 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1730 +#: wt-status.c:1728 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1731 +#: wt-status.c:1729 msgid "No commits yet" msgstr "尚无提交" -#: wt-status.c:1745 +#: wt-status.c:1743 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1747 +#: wt-status.c:1745 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1751 +#: wt-status.c:1749 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9181,102 +9322,102 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1757 +#: wt-status.c:1755 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1759 +#: wt-status.c:1757 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1765 +#: wt-status.c:1763 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1770 +#: wt-status.c:1768 #, 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:1773 +#: wt-status.c:1771 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1776 +#: wt-status.c:1774 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1779 +#: wt-status.c:1777 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1782 +#: wt-status.c:1780 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1783 wt-status.c:1788 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1788 +#: wt-status.c:1786 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1792 +#: wt-status.c:1790 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1905 +#: wt-status.c:1903 msgid "No commits yet on " msgstr "尚无提交在 " -#: wt-status.c:1909 +#: wt-status.c:1907 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1940 +#: wt-status.c:1938 msgid "different" msgstr "不同" # 译者：注意保持句尾空格 -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1940 wt-status.c:1948 msgid "behind " msgstr "落后 " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1943 wt-status.c:1946 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2468 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" -#: wt-status.c:2476 +#: wt-status.c:2474 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" -#: wt-status.c:2478 +#: wt-status.c:2476 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: compat/precompose_utf8.c:58 builtin/clone.c:455 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 #, c-format msgid "failed to unlink '%s'" msgstr "删除 '%s' 失败" @@ -9290,7 +9431,7 @@ msgstr "git add [<选项>] [--] <路径规格>..." msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "更新文件失败" @@ -9303,7 +9444,7 @@ msgstr "删除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:266 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "不能读取索引" @@ -9338,8 +9479,8 @@ msgstr "不能应用 '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 #: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "演习" @@ -9348,7 +9489,7 @@ msgstr "演习" msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308 msgid "select hunks interactively" msgstr "交互式挑选数据块" @@ -9451,7 +9592,7 @@ msgstr "" msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:447 builtin/commit.c:348 +#: builtin/add.c:447 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容" @@ -9472,13 +9613,13 @@ msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 +#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file 与路径表达式参数不兼容" -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 +#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul 需要 --pathspec-from-file" @@ -9634,34 +9775,34 @@ msgstr "提交内容为：" msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c:1700 builtin/commit.c:398 +#: builtin/am.c:1699 builtin/commit.c:395 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1704 +#: builtin/am.c:1703 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1743 builtin/am.c:1811 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1760 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1767 +#: builtin/am.c:1766 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1771 +#: builtin/am.c:1770 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" -#: builtin/am.c:1815 +#: builtin/am.c:1814 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9671,7 +9812,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1822 +#: builtin/am.c:1821 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9682,169 +9823,171 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:1981 +#: builtin/am.c:1980 msgid "failed to clean index" msgstr "清空索引失败" -#: builtin/am.c:2025 +#: builtin/am.c:2024 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:2132 +#: builtin/am.c:2131 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2172 +#: builtin/am.c:2171 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "无效的 --show-current-patch 值：%s" -#: builtin/am.c:2176 +#: builtin/am.c:2175 #, 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:2207 +#: builtin/am.c:2206 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2208 +#: builtin/am.c:2207 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2216 +#: builtin/am.c:2215 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2218 +#: builtin/am.c:2217 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16 +#: builtin/repack.c:306 builtin/stash.c:816 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2221 +#: builtin/am.c:2220 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2226 +#: builtin/am.c:2225 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2228 +#: builtin/am.c:2227 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2235 +#: builtin/am.c:2234 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 +#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/am.c:2266 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 +#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 +#: bugreport.c:131 msgid "format" msgstr "格式" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2272 +#: builtin/am.c:2271 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2275 +#: builtin/am.c:2274 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "abort the patching operation but keep HEAD where it is." msgstr "终止补丁操作但保持 HEAD 不变。" -#: builtin/am.c:2288 +#: builtin/am.c:2287 msgid "show the patch being applied" msgstr "显示正在应用的补丁" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2295 +#: builtin/am.c:2294 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 +#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 +#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2319 +#: builtin/am.c:2318 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." @@ -9852,16 +9995,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2326 +#: builtin/am.c:2325 msgid "failed to read the index" msgstr "读取索引失败" -#: builtin/am.c:2341 +#: builtin/am.c:2340 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2365 +#: builtin/am.c:2364 #, c-format msgid "" "Stray %s directory found.\n" @@ -9870,11 +10013,11 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2371 +#: builtin/am.c:2370 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: builtin/am.c:2381 +#: builtin/am.c:2380 msgid "interactive mode requires patches on the command line" msgstr "交互式模式需要命令行上提供补丁" @@ -10279,7 +10422,7 @@ msgstr "显示作者的邮箱而不是名字（默认：关闭）" msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:860 builtin/log.c:1721 msgid "rev" msgstr "版本" @@ -10347,14 +10490,14 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "追踪代码行" @@ -10565,7 +10708,7 @@ msgstr "设置跟踪模式（参见 git-pull(1)）" msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:520 msgid "upstream" msgstr "上游" @@ -10657,97 +10800,97 @@ msgstr "只打印尚未合并的分支" msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:433 +#: builtin/tag.c:434 msgid "object" msgstr "对象" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "只打印指向该对象的分支" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "排序和过滤属于大小写不敏感" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "输出格式" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "为拷贝操作提供了太多的分支名" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "为重命名操作提供了太多的参数" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "为设置新上游提供了太多的参数" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:841 +#: builtin/branch.c:839 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -10755,7 +10898,7 @@ msgstr "" "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" "您是否想要使用：-a|-r --list <模式>？" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -10778,19 +10921,19 @@ msgstr "git bundle list-heads <文件> [<引用名>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <文件> [<引用名>...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 +#: builtin/bundle.c:66 builtin/pack-objects.c:3376 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 +#: builtin/bundle.c:68 builtin/pack-objects.c:3378 msgid "show progress meter" msgstr "显示进度表" -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 +#: builtin/bundle.c:70 builtin/pack-objects.c:3380 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 +#: builtin/bundle.c:73 builtin/pack-objects.c:3383 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" @@ -10820,7 +10963,7 @@ msgstr "冗长输出；必须置于子命令之前" msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10828,7 +10971,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:599 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10836,71 +10979,71 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "只能指定一个批处理选项" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "对于数据对象，对其内容做文本转换" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "对于数据对象，对其内容做过滤" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:648 git-submodule.sh:984 msgid "blob" msgstr "数据对象" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 参数显示所有对象" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "不要对 --batch-all-objects 的输出排序" @@ -10928,8 +11071,8 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537 +#: builtin/worktree.c:502 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -11021,7 +11164,7 @@ msgstr "将内容写入临时文件" #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/worktree.c:675 msgid "string" msgstr "字符串" @@ -11049,98 +11192,98 @@ msgstr "git switch [<选项>] [<分支>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<选项>] [--source=<分支>] <文件>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:193 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必需的版本" -#: builtin/checkout.c:243 +#: builtin/checkout.c:256 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必需的版本" -#: builtin/checkout.c:261 +#: builtin/checkout.c:274 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:277 +#: builtin/checkout.c:290 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:377 +#: builtin/checkout.c:395 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" -#: builtin/checkout.c:382 +#: builtin/checkout.c:400 #, 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:389 +#: builtin/checkout.c:407 #, 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:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 +#: builtin/checkout.c:440 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:443 builtin/checkout.c:446 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:432 +#: builtin/checkout.c:450 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:436 +#: builtin/checkout.c:454 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都没有指定" -#: builtin/checkout.c:440 +#: builtin/checkout.c:458 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:463 builtin/checkout.c:468 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:527 builtin/checkout.c:534 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:704 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:734 +#: builtin/checkout.c:758 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11149,51 +11292,51 @@ msgstr "" "不能继续，下列文件有暂存的修改：\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:861 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:903 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:907 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:887 +#: builtin/checkout.c:911 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:914 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:918 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:920 builtin/checkout.c:1344 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:922 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:949 +#: builtin/checkout.c:973 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:979 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11214,7 +11357,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:998 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11241,19 +11384,19 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1033 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1037 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1077 builtin/checkout.c:1339 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1152 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11262,7 +11405,7 @@ msgstr "" "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" "请使用 --（和可选的 --no-guess）来消除歧义" -#: builtin/checkout.c:1135 +#: builtin/checkout.c:1159 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" @@ -11281,51 +11424,51 @@ msgstr "" "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" "名称，可以在配置中设置 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1169 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1235 msgid "only one reference expected" msgstr "只期望一个引用" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1252 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1311 builtin/checkout.c:1677 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一个分支，得到标签 '%s'" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1360 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一个分支，得到远程分支 '%s'" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1361 builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一个分支，得到 '%s'" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1364 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一个分支，得到提交 '%s'" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1380 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11333,7 +11476,7 @@ msgstr "" "不能在合并时切换分支\n" "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1384 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11341,7 +11484,7 @@ msgstr "" "不能在一个 am 会话期间切换分支\n" "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1388 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11349,7 +11492,7 @@ msgstr "" "不能在变基时切换分支\n" "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11357,7 +11500,7 @@ msgstr "" "不能在拣选时切换分支\n" "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11365,251 +11508,253 @@ msgstr "" "不能在还原时切换分支\n" "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1400 msgid "you are switching branch while bisecting" msgstr "您在执行二分查找时切换分支" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1407 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428 +#: builtin/checkout.c:1433 builtin/checkout.c:1438 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1435 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不带 <起始点>" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1443 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1450 msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80 +#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1493 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322 msgid "style" msgstr "风格" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1495 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1507 builtin/worktree.c:499 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1508 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1510 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1512 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1512 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1514 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1517 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1530 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1533 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1537 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1565 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b、-B 和 --orphan 是互斥的" +#: builtin/checkout.c:1592 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%c、-%c 和 --orphan 是互斥的" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1596 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1633 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1610 -msgid "missing branch name; try -b" -msgstr "缺少分支名，尝试 -b" +#: builtin/checkout.c:1638 +#, c-format +msgid "missing branch name; try -%c" +msgstr "缺少分支名，尝试 -%c" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1670 #, c-format msgid "could not resolve %s" msgstr "无法解析 %s" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1686 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1693 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1697 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1678 +#: builtin/checkout.c:1706 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 与 --detach 不兼容" -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 +#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file 与 --patch 不兼容" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1720 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:1697 +#: builtin/checkout.c:1725 msgid "you must specify path(s) to restore" msgstr "您必须指定一个要恢复的路径" -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802 +#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1752 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1754 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1755 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1757 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜测 'git checkout <无此分支>'（默认）" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1758 msgid "use overlay mode (default)" msgstr "使用叠加模式（默认）" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1803 msgid "create and switch to a new branch" msgstr "创建并切换一个新分支" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1805 msgid "create/reset and switch to a branch" msgstr "创建/重置并切换一个分支" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1807 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜测 'git switch <无此分支>'" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1809 msgid "throw away local modifications" msgstr "丢弃本地修改" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1843 msgid "which tree-ish to checkout from" msgstr "要检出哪一个树" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1845 msgid "restore the index" msgstr "恢复索引" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1847 msgid "restore the working tree (default)" msgstr "恢复工作区（默认）" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1849 msgid "ignore unmerged entries" msgstr "忽略未合并条目" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1850 msgid "use overlay mode" msgstr "使用叠加模式" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "删除 %s 失败" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "不能对 %s 调用 lstat\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -11622,7 +11767,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -11649,27 +11794,27 @@ msgstr "" msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:663 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:700 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:721 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c:795 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11687,63 +11832,63 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:831 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:847 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:909 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:911 +#: builtin/clean.c:905 msgid "force" msgstr "强制" -#: builtin/clean.c:912 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:914 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:916 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c:917 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:919 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:937 +#: builtin/clean.c:931 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:941 +#: builtin/clean.c:935 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:944 +#: builtin/clean.c:938 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11758,7 +11903,7 @@ msgstr "git clone [<选项>] [--] <仓库> [<路径>]" msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536 msgid "create a bare repository" msgstr "创建一个纯仓库" @@ -11778,11 +11923,11 @@ msgstr "不使用本地硬链接，始终复制" msgid "setup as shared repository" msgstr "设置为共享仓库" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "路径规格" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" @@ -11790,11 +11935,11 @@ msgstr "在克隆时初始化子模组" msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:533 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:534 msgid "directory from which templates will be used" msgstr "模板目录将被使用" @@ -11809,7 +11954,7 @@ msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3442 builtin/repack.c:329 msgid "name" msgstr "名称" @@ -11825,8 +11970,8 @@ msgstr "检出 <分支> 而不是远程 HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/pull.c:208 msgid "depth" msgstr "深度" @@ -11834,7 +11979,8 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431 +#: builtin/pull.c:211 msgid "time" msgstr "时间" @@ -11842,12 +11988,12 @@ msgstr "时间" msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 msgid "revision" msgstr "版本" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" @@ -11864,11 +12010,11 @@ msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:542 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:543 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" @@ -11880,23 +12026,23 @@ msgstr "key=value" msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 msgid "option to transmit" msgstr "传输选项" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 +#: builtin/push.c:571 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 +#: builtin/push.c:573 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" @@ -11926,32 +12072,32 @@ msgstr "info: 不能为 '%s' 添加一个备用：%s\n" msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:430 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "无法在 '%s' 上启动迭代器" -#: builtin/clone.c:460 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "创建链接 '%s' 失败" -#: builtin/clone.c:464 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "拷贝文件至 '%s' 失败" -#: builtin/clone.c:469 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "无法在 '%s' 上迭代" -#: builtin/clone.c:494 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:508 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11961,134 +12107,134 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git restore --source=HEAD :/' 重试\n" -#: builtin/clone.c:585 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:705 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:753 +#: builtin/clone.c:756 msgid "failed to initialize sparse-checkout" msgstr "无法初始化稀疏检出" -#: builtin/clone.c:776 +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:807 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:862 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" -#: builtin/clone.c:925 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c:927 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:971 builtin/receive-pack.c:1972 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:969 +#: builtin/clone.c:975 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:982 +#: builtin/clone.c:988 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:985 +#: builtin/clone.c:991 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:998 +#: builtin/clone.c:1004 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:1010 builtin/fetch.c:1789 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:1014 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:1024 +#: builtin/clone.c:1030 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271 +#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:1044 +#: builtin/clone.c:1050 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:1064 +#: builtin/clone.c:1070 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1072 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1096 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" -#: builtin/clone.c:1154 +#: builtin/clone.c:1160 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1156 +#: builtin/clone.c:1162 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1158 +#: builtin/clone.c:1164 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1160 +#: builtin/clone.c:1166 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1163 +#: builtin/clone.c:1169 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" -#: builtin/clone.c:1168 +#: builtin/clone.c:1174 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1249 builtin/clone.c:1257 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1254 +#: builtin/clone.c:1260 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -12124,6 +12270,97 @@ msgstr "两列之间的填充空间" msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" +#: builtin/commit-graph.c:11 builtin/commit-graph.c:19 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" +"[no-]progress]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略" +">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" +"[no-]progress] <切分选项>" + +#: builtin/commit-graph.c:60 +#, c-format +msgid "could not find object directory matching %s" +msgstr "无法找到和 %s 匹配的对象目录" + +#: builtin/commit-graph.c:76 builtin/commit-graph.c:152 +#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678 +msgid "dir" +msgstr "目录" + +#: builtin/commit-graph.c:77 builtin/commit-graph.c:153 +#: builtin/commit-graph.c:258 +msgid "The object directory to store the graph" +msgstr "保存图形的对象目录" + +#: builtin/commit-graph.c:79 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "如果提交图形被拆分，只验证头一个文件" + +#: builtin/commit-graph.c:102 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "无法打开提交图形 '%s'" + +#: builtin/commit-graph.c:136 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "未能识别的 --split 参数，%s" + +#: builtin/commit-graph.c:155 +msgid "start walk at all refs" +msgstr "开始遍历所有引用" + +#: builtin/commit-graph.c:157 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "从标准输入中的包索引文件列表中扫描提交" + +#: builtin/commit-graph.c:159 +msgid "start walk at commits listed by stdin" +msgstr "从标准输入中的提交开始扫描" + +#: builtin/commit-graph.c:161 +msgid "include all commits already in the commit-graph file" +msgstr "包含 commit-graph 文件中已有所有提交" + +#: builtin/commit-graph.c:163 +msgid "enable computation for changed paths" +msgstr "启用变更路径的计算" + +#: builtin/commit-graph.c:166 +msgid "allow writing an incremental commit-graph file" +msgstr "允许写一个增量提交图形文件" + +#: builtin/commit-graph.c:170 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "在非基本拆分提交图形中的最大提交数" + +#: builtin/commit-graph.c:172 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "一个拆分提交图形的两个级别之间的最大比率" + +#: builtin/commit-graph.c:174 +msgid "only expire files older than a given date-time" +msgstr "只让早于给定时间的文件过期" + +#: builtin/commit-graph.c:190 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" + +#: builtin/commit-graph.c:229 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "意外的非十六进制对象 ID：%s" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -12137,7 +12374,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重复的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 #, c-format msgid "not a valid object name %s" msgstr "不是一个有效的对象名 %s" @@ -12165,13 +12402,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交对象 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/tag.c:413 msgid "message" msgstr "说明" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1506 msgid "commit message" msgstr "提交说明" @@ -12179,8 +12416,8 @@ msgstr "提交说明" msgid "read commit log message from file" msgstr "从文件中读取提交说明" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交签名" @@ -12224,10 +12461,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "否则，请使用 'git rebase --skip'\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "否则，请使用 'git cherry-pick --skip'\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -12248,106 +12489,110 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 树对象失败" -#: builtin/commit.c:351 +#: builtin/commit.c:348 msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file 和 -a 在一起没有意义" -#: builtin/commit.c:364 +#: builtin/commit.c:361 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:376 +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:385 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:400 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "无法更新临时索引" -#: builtin/commit.c:402 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:479 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:481 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:489 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "在变基过程中不能做部分提交。" + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:508 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:606 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" -#: builtin/commit.c:608 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式错误的作者信息" -#: builtin/commit.c:627 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "格式错误的 --author 参数" -#: builtin/commit.c:680 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:732 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:736 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:834 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:853 +#: builtin/commit.c:852 #, c-format msgid "" "\n" @@ -12361,7 +12606,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:858 +#: builtin/commit.c:857 #, c-format msgid "" "\n" @@ -12375,7 +12620,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:871 +#: builtin/commit.c:870 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12384,7 +12629,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:879 +#: builtin/commit.c:878 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12395,320 +12640,324 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:896 +#: builtin/commit.c:895 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:904 +#: builtin/commit.c:903 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:911 +#: builtin/commit.c:910 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:928 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:997 +#: builtin/commit.c:999 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:1013 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1057 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1069 +#: builtin/commit.c:1071 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1089 builtin/commit.c:1333 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1129 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1171 +#: builtin/commit.c:1173 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1180 +#: builtin/commit.c:1182 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1183 +#: builtin/commit.c:1185 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1185 +#: builtin/commit.c:1187 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1188 +#: builtin/commit.c:1189 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "您正处于一个变基过程中 -- 无法修补提交。" + +#: builtin/commit.c:1192 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1198 +#: builtin/commit.c:1202 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1200 +#: builtin/commit.c:1204 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" -#: builtin/commit.c:1208 +#: builtin/commit.c:1213 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1225 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1231 +#: builtin/commit.c:1237 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1370 builtin/commit.c:1531 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1366 +#: builtin/commit.c:1372 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c:1370 +#: builtin/commit.c:1376 msgid "version" msgstr "版本" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 +#: builtin/worktree.c:646 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1379 builtin/commit.c:1537 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1382 builtin/commit.c:1540 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 +#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336 msgid "mode" msgstr "模式" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1385 builtin/commit.c:1543 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1383 +#: builtin/commit.c:1389 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1391 parse-options.h:192 msgid "when" msgstr "何时" -#: builtin/commit.c:1386 +#: builtin/commit.c:1392 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1388 +#: builtin/commit.c:1394 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1389 +#: builtin/commit.c:1395 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c:1391 +#: builtin/commit.c:1397 msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" -#: builtin/commit.c:1411 +#: builtin/commit.c:1417 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "author" msgstr "作者" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1505 builtin/gc.c:538 msgid "date" msgstr "日期" -#: builtin/commit.c:1500 +#: builtin/commit.c:1505 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 +#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "提交" -#: builtin/commit.c:1502 +#: builtin/commit.c:1507 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1503 +#: builtin/commit.c:1508 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1504 +#: builtin/commit.c:1509 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1505 +#: builtin/commit.c:1510 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1506 +#: builtin/commit.c:1511 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1508 +#: builtin/commit.c:1513 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1509 +#: builtin/commit.c:1514 msgid "force edit of commit" msgstr "强制编辑提交" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1517 +#: builtin/commit.c:1522 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1519 +#: builtin/commit.c:1524 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1520 +#: builtin/commit.c:1525 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1521 +#: builtin/commit.c:1526 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1522 +#: builtin/commit.c:1527 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1523 +#: builtin/commit.c:1528 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1536 +#: builtin/commit.c:1541 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1537 +#: builtin/commit.c:1542 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1544 +#: builtin/commit.c:1549 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1546 +#: builtin/commit.c:1551 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1619 +#: builtin/commit.c:1624 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1626 +#: builtin/commit.c:1631 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1645 +#: builtin/commit.c:1652 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1659 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1664 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1698 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12717,77 +12966,6 @@ msgstr "" "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n" "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" -"[no-]progress]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 -msgid "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "无法找到和 %s 匹配的对象目录" - -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 -msgid "dir" -msgstr "目录" - -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 -msgid "The object directory to store the graph" -msgstr "保存图形的对象目录" - -#: builtin/commit-graph.c:71 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "如果提交图形被拆分，只验证头一个文件" - -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 -#, c-format -msgid "Could not open commit-graph '%s'" -msgstr "无法打开提交图形 '%s'" - -#: builtin/commit-graph.c:128 -msgid "start walk at all refs" -msgstr "开始遍历所有引用" - -#: builtin/commit-graph.c:130 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "从标准输入中的包索引文件列表中扫描提交" - -#: builtin/commit-graph.c:132 -msgid "start walk at commits listed by stdin" -msgstr "从标准输入中的提交开始扫描" - -#: builtin/commit-graph.c:134 -msgid "include all commits already in the commit-graph file" -msgstr "包含 commit-graph 文件中已有所有提交" - -#: builtin/commit-graph.c:137 -msgid "allow writing an incremental commit-graph file" -msgstr "允许写一个增量提交图形文件" - -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 -msgid "maximum number of commits in a non-base split commit-graph" -msgstr "在非基本拆分提交图形中的最大提交数" - -#: builtin/commit-graph.c:141 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "一个拆分提交图形的两个级别之间的最大比率" - -#: builtin/commit-graph.c:159 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<选项>]" @@ -13108,49 +13286,44 @@ msgstr "git describe [<选项>] [<提交号>...]" msgid "git describe [<options>] --dirty" msgstr "git describe [<选项>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "头" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "轻量级的" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "附注的" -#: builtin/describe.c:275 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "附注标签 %s 无效" -#: builtin/describe.c:279 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "附注标签 %s 没有嵌入名称" - #: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" -msgstr "标签 '%s' 的确是在 '%s'" +msgid "tag '%s' is externally known as '%s'" +msgstr "标签 '%s' 在外部被认为是 '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有标签准确匹配 '%s'" -#: builtin/describe.c:327 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n" -#: builtin/describe.c:394 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13159,7 +13332,7 @@ msgstr "" "没有附注标签能描述 '%s'。\n" "然而，存在未附注标签：尝试 --tags。" -#: builtin/describe.c:425 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13168,12 +13341,12 @@ msgstr "" "没有标签能描述 '%s'。\n" "尝试 --always，或者创建一些标签。" -#: builtin/describe.c:455 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:458 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13182,90 +13355,90 @@ msgstr "" "发现多于 %i 个标签，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:526 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "描述 %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:537 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是数据对象" -#: builtin/describe.c:551 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "寻找该提交之后的标签" -#: builtin/describe.c:552 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c:553 +#: builtin/describe.c:556 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:554 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "使用任意标签，即使未附带注释" -#: builtin/describe.c:555 +#: builtin/describe.c:558 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c:556 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "只跟随第一个父提交" -#: builtin/describe.c:559 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c:561 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> 个标签（默认：10）" -#: builtin/describe.c:563 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的标签" -#: builtin/describe.c:565 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "不考虑匹配 <模式> 的标签" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "标记" -#: builtin/describe.c:569 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c:572 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）" -#: builtin/describe.c:590 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:619 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:670 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 与提交号不兼容" -#: builtin/describe.c:672 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken 与提交号不兼容" @@ -13490,7 +13663,7 @@ msgstr "使用 done 功能来终止流" msgid "Skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1177 builtin/log.c:1724 msgid "refspec" msgstr "引用规格" @@ -13518,197 +13691,198 @@ msgstr "对带有标记 ID 的标签做标记" msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists" -#: builtin/fetch.c:34 +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:116 +#: builtin/fetch.c:117 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能为负数" -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:140 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:141 builtin/pull.c:228 +#: builtin/fetch.c:142 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "为 git pull/fetch 设置上游" -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:144 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:146 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:146 +#: builtin/fetch.c:147 msgid "force overwrite of local reference" msgstr "强制覆盖本地引用" -#: builtin/fetch.c:148 +#: builtin/fetch.c:149 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:151 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:155 msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:157 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" -#: builtin/fetch.c:158 +#: builtin/fetch.c:159 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签，并且替换变更标签" # 译者：可选值，不能翻译 -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:160 +#: builtin/fetch.c:161 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:165 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:166 +#: builtin/fetch.c:167 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:171 +#: builtin/fetch.c:172 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:178 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:180 +#: builtin/fetch.c:181 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:183 +#: builtin/fetch.c:184 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获取子模组的缺省值（比配置文件优先级低）" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:188 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:189 builtin/pull.c:226 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:190 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:196 +#: builtin/fetch.c:197 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" -#: builtin/fetch.c:199 +#: builtin/fetch.c:200 msgid "run 'gc --auto' after fetching" msgstr "获取后执行 'gc --auto'" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:202 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上检查强制更新" -#: builtin/fetch.c:203 +#: builtin/fetch.c:204 msgid "write the commit-graph after fetching" msgstr "抓取后写提交图" -#: builtin/fetch.c:513 +#: builtin/fetch.c:514 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:653 +#: builtin/fetch.c:654 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "配置变量 fetch.output 包含无效值 %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:752 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:755 +#: builtin/fetch.c:756 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 msgid "can't fetch in current branch" msgstr "当前分支下不能执行获取操作" -#: builtin/fetch.c:779 +#: builtin/fetch.c:780 msgid "[tag update]" msgstr "[标签更新]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 +#: builtin/fetch.c:852 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:784 +#: builtin/fetch.c:785 msgid "would clobber existing tag" msgstr "会破坏现有的标签" -#: builtin/fetch.c:806 +#: builtin/fetch.c:807 msgid "[new tag]" msgstr "[新标签]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:810 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:813 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:852 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:856 +#: builtin/fetch.c:857 msgid "non-fast-forward" msgstr "非快进" -#: builtin/fetch.c:877 +#: builtin/fetch.c:878 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13718,7 +13892,7 @@ msgstr "" "要重新启用，请使用 '--show-forced-updates' 选项或运行\n" "'git config fetch.showForcedUpdates true'。" -#: builtin/fetch.c:881 +#: builtin/fetch.c:882 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13729,22 +13903,22 @@ msgstr "" "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:914 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必需的对象\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:935 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1020 builtin/fetch.c:1158 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13754,57 +13928,57 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1128 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1129 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为悬空状态）" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1161 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1162 builtin/remote.c:1112 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1185 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯仓库的当前分支 %s" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1207 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:1421 +#: builtin/fetch.c:1415 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "检测到多分支，和 --set-upstream 不兼容" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1430 msgid "not setting upstream for a remote remote-tracking branch" msgstr "没有为一个远程跟踪分支设置上游" -#: builtin/fetch.c:1438 +#: builtin/fetch.c:1432 msgid "not setting upstream for a remote tag" msgstr "没有为一个远程标签设置上游" -#: builtin/fetch.c:1440 +#: builtin/fetch.c:1434 msgid "unknown branch type" msgstr "未知的分支类型" -#: builtin/fetch.c:1442 +#: builtin/fetch.c:1436 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -13812,92 +13986,92 @@ msgstr "" "未发现源分支。\n" "您需要使用 --set-upstream 选项指定一个分支。" -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1562 builtin/fetch.c:1625 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1590 +#: builtin/fetch.c:1584 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "无法获取 '%s'（退出码：%d）\n" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1687 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1724 msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1773 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1775 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1780 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1782 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1798 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1800 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1809 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1816 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1834 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "从文件中读取" @@ -13937,7 +14111,7 @@ msgstr "引用占位符适用于 Tcl" msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "遵照格式中的颜色输出" @@ -13961,32 +14135,32 @@ msgstr "只打印包含该提交的引用" msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "未知" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, c-format msgid "error in %s %s: %s" msgstr "%s %s 错误：%s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "来自 %7s %s 的损坏的链接" -#: builtin/fsck.c:155 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "链接中错误的对象类型" -#: builtin/fsck.c:171 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -13995,211 +14169,211 @@ msgstr "" "损坏的链接来自于 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "缺失 %s %s" -#: builtin/fsck.c:309 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "不可达 %s %s" -#: builtin/fsck.c:329 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "悬空 %s %s" -#: builtin/fsck.c:339 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "不能创建 lost-found" -#: builtin/fsck.c:350 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:367 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "正在检查 %s" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在检查连通性（%d 个对象）" -#: builtin/fsck.c:424 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "正在检查 %s %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:430 msgid "broken links" msgstr "损坏的链接" -#: builtin/fsck.c:438 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "标记 %s %s (%s) 于 %s" -#: builtin/fsck.c:475 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：对象损坏或丢失" -#: builtin/fsck.c:500 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：无效的引用日志条目 %s" -#: builtin/fsck.c:514 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "正在检查引用日志 %s->%s" -#: builtin/fsck.c:548 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：无效的 sha1 指针 %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s：不是一个提交" -#: builtin/fsck.c:609 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "注意：无默认引用" -#: builtin/fsck.c:624 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：对象损坏或丢失：%s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析对象：%s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "坏的 sha1 文件：%s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "正在检查对象目录" -#: builtin/fsck.c:675 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "正在检查对象目录" -#: builtin/fsck.c:690 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "正在检查 %s 链接" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:696 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/fsck.c:702 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的东西（%s）" -#: builtin/fsck.c:708 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分离头指针的指向不存在" -#: builtin/fsck.c:712 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" -#: builtin/fsck.c:724 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "正在检查缓存树" -#: builtin/fsck.c:729 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中无效的 sha1 指针" -#: builtin/fsck.c:738 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" -#: builtin/fsck.c:769 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:776 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "显示悬空的对象" -#: builtin/fsck.c:777 +#: builtin/fsck.c:778 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c:778 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:779 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:780 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:781 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:782 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c:783 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:785 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:787 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:225 msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c:874 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "%s：对象缺失" -#: builtin/fsck.c:885 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数：期望 sha1，得到 '%s'" @@ -14218,12 +14392,12 @@ msgstr "对 %s 调用 fstat 失败：%s" msgid "failed to parse '%s' value '%s'" msgstr "无法解析 '%s' 值 '%s'" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" @@ -14317,259 +14491,259 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730 +#: builtin/pack-objects.c:2855 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:633 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:704 +#: builtin/grep.c:724 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:803 +#: builtin/grep.c:823 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:805 +#: builtin/grep.c:825 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:807 +#: builtin/grep.c:827 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:809 +#: builtin/grep.c:829 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:811 +#: builtin/grep.c:831 msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" -#: builtin/grep.c:814 +#: builtin/grep.c:834 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:816 +#: builtin/grep.c:836 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:818 +#: builtin/grep.c:838 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:820 +#: builtin/grep.c:840 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:822 +#: builtin/grep.c:842 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:825 +#: builtin/grep.c:845 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:827 +#: builtin/grep.c:847 msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" -#: builtin/grep.c:829 +#: builtin/grep.c:849 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:833 +#: builtin/grep.c:853 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:836 +#: builtin/grep.c:856 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:839 +#: builtin/grep.c:859 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:842 +#: builtin/grep.c:862 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:845 +#: builtin/grep.c:865 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:846 +#: builtin/grep.c:866 msgid "show column number of first match" msgstr "显示第一个匹配的列号" -#: builtin/grep.c:847 +#: builtin/grep.c:867 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:848 +#: builtin/grep.c:868 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:850 +#: builtin/grep.c:870 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:852 +#: builtin/grep.c:872 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:854 +#: builtin/grep.c:874 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:857 +#: builtin/grep.c:877 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:859 +#: builtin/grep.c:879 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:862 +#: builtin/grep.c:882 msgid "show only matching parts of a line" msgstr "只显示行中的匹配的部分" -#: builtin/grep.c:864 +#: builtin/grep.c:884 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:865 +#: builtin/grep.c:885 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:867 +#: builtin/grep.c:887 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:869 +#: builtin/grep.c:889 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:872 +#: builtin/grep.c:892 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:875 +#: builtin/grep.c:895 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:877 +#: builtin/grep.c:897 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:879 +#: builtin/grep.c:899 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:880 +#: builtin/grep.c:900 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:883 +#: builtin/grep.c:903 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:885 +#: builtin/grep.c:905 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:888 +#: builtin/grep.c:908 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:890 +#: builtin/grep.c:910 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:892 +#: builtin/grep.c:912 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:904 +#: builtin/grep.c:924 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:906 +#: builtin/grep.c:926 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:908 +#: builtin/grep.c:928 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:912 +#: builtin/grep.c:932 msgid "pager" msgstr "分页" -#: builtin/grep.c:912 +#: builtin/grep.c:932 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:916 +#: builtin/grep.c:936 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:983 +#: builtin/grep.c:1003 msgid "no pattern given" msgstr "未提供匹配模式" -#: builtin/grep.c:1019 +#: builtin/grep.c:1039 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" -#: builtin/grep.c:1027 +#: builtin/grep.c:1047 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1057 +#: builtin/grep.c:1077 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支持和 --recurse-submodules 共用" -#: builtin/grep.c:1061 +#: builtin/grep.c:1081 msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合，忽略 --threads" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1084 builtin/pack-objects.c:3548 msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:1101 +#: builtin/grep.c:1121 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:1127 +#: builtin/grep.c:1147 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" -#: builtin/grep.c:1133 +#: builtin/grep.c:1153 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用于已跟踪内容" -#: builtin/grep.c:1141 +#: builtin/grep.c:1161 msgid "both --cached and trees are given" msgstr "同时给出了 --cached 和树对象" @@ -14610,66 +14784,66 @@ msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "打印所有可用的命令" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "排除向导" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "显示有用的指南列表" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "打印所有配置变量名称" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "显示 man 手册" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "在 web 浏览器中显示手册" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "显示 info 手册" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "打印命令描述" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "执行 '%s' 失败" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -14678,7 +14852,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -14687,35 +14861,35 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:367 #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串：%s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" @@ -14753,7 +14927,7 @@ msgstr "输入上的读错误" msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:607 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" @@ -14761,6 +14935,11 @@ msgstr "包太大超过了当前 off_t 的定义" msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许值" +#: builtin/index-pack.c:306 builtin/repack.c:250 +#, c-format +msgid "unable to create '%s'" +msgstr "不能创建 '%s'" + #: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" @@ -14819,8 +14998,8 @@ msgstr "解压缩严重的不一致" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:159 +#: builtin/pack-objects.c:219 builtin/pack-objects.c:314 #, c-format msgid "unable to read %s" msgstr "不能读 %s" @@ -14881,7 +15060,7 @@ msgstr "parse_pack_objects() 中遇到不可理喻的问题" msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" @@ -14914,169 +15093,178 @@ msgstr[1] "包有 %d 个未解决的 delta" msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1391 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1405 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1430 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1438 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1462 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1476 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1484 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1596 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1598 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1646 #, 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:1654 +#: builtin/index-pack.c:1653 #, 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:1693 +#: builtin/index-pack.c:1692 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1741 builtin/index-pack.c:1744 +#: builtin/index-pack.c:1760 builtin/index-pack.c:1764 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1780 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1782 msgid "--stdin requires a git repository" msgstr "--stdin 需要一个 git 仓库" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1788 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" -#: builtin/init-db.c:61 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "不能对模版 '%s' 调用 stat" -#: builtin/init-db.c:66 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "不能打开目录 '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "不能读取链接 '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 创建符号链接" -#: builtin/init-db.c:86 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: builtin/init-db.c:90 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" -#: builtin/init-db.c:121 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "没有在 %s 中找到模版" -#: builtin/init-db.c:136 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:356 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:337 +#: builtin/init-db.c:359 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:374 +msgid "attempt to reinitialize repository with different hash" +msgstr "尝试用不同的哈希算法重新初始化仓库" + +#: builtin/init-db.c:380 builtin/init-db.c:601 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "未知的哈希算法 '%s'" + +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:413 +#: builtin/init-db.c:458 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:459 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:463 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:464 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:513 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15084,32 +15272,40 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:538 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:492 +#: builtin/init-db.c:539 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:544 +msgid "hash" +msgstr "hash" + +#: builtin/init-db.c:545 +msgid "specify the hash algorithm to use" +msgstr "指定要使用的哈希算法" + +#: builtin/init-db.c:578 builtin/init-db.c:583 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:587 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:614 #, 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:587 +#: builtin/init-db.c:642 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -15178,126 +15374,126 @@ msgstr "--trailer 和 --only-input 同时使用没有意义" msgid "no input file given for in-place editing" msgstr "没有给出要原位编辑的文件" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" -#: builtin/log.c:57 +#: builtin/log.c:58 msgid "git show [<options>] <object>..." msgstr "git show [<选项>] <对象>..." -#: builtin/log.c:110 +#: builtin/log.c:111 #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "show source" msgstr "显示源" -#: builtin/log.c:175 +#: builtin/log.c:179 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:177 +#: builtin/log.c:182 msgid "only decorate refs that match <pattern>" msgstr "只修饰与 <模式> 匹配的引用" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "do not decorate refs that match <pattern>" msgstr "不修饰和 <模式> 匹配的引用" -#: builtin/log.c:180 +#: builtin/log.c:185 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:183 +#: builtin/log.c:188 msgid "Process line range n,m in file, counting from 1" msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" -#: builtin/log.c:281 +#: builtin/log.c:298 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:556 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:571 builtin/log.c:666 #, c-format msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:670 +#: builtin/log.c:691 #, c-format msgid "unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:814 +#: builtin/log.c:835 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：从描述生成附函的模式无效" -#: builtin/log.c:821 +#: builtin/log.c:842 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:936 +#: builtin/log.c:957 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:952 +#: builtin/log.c:973 #, c-format msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:969 +#: builtin/log.c:990 msgid "need exactly one range" msgstr "只需要一个范围" -#: builtin/log.c:979 +#: builtin/log.c:1000 msgid "not a range" msgstr "不是一个范围" -#: builtin/log.c:1143 +#: builtin/log.c:1164 msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" -#: builtin/log.c:1149 +#: builtin/log.c:1170 msgid "failed to create cover-letter file" msgstr "无法创建附函文件" -#: builtin/log.c:1228 +#: builtin/log.c:1249 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1255 +#: builtin/log.c:1276 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1313 +#: builtin/log.c:1334 msgid "two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1455 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:1439 +#: builtin/log.c:1460 msgid "could not find exact merge base" msgstr "不能找到准确的合并基线" -#: builtin/log.c:1443 +#: builtin/log.c:1464 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" @@ -15307,381 +15503,381 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c:1463 +#: builtin/log.c:1484 msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1474 +#: builtin/log.c:1495 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1478 +#: builtin/log.c:1499 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1531 +#: builtin/log.c:1552 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1583 +#: builtin/log.c:1604 msgid "failed to infer range-diff ranges" msgstr "无法推断 range-diff 范围" -#: builtin/log.c:1629 +#: builtin/log.c:1650 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1632 +#: builtin/log.c:1653 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1636 +#: builtin/log.c:1657 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1638 +#: builtin/log.c:1659 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1640 +#: builtin/log.c:1661 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1641 +#: builtin/log.c:1662 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1642 +#: builtin/log.c:1663 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1644 +#: builtin/log.c:1665 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1646 +#: builtin/log.c:1667 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1648 +#: builtin/log.c:1669 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1651 +#: builtin/log.c:1672 msgid "cover-from-description-mode" msgstr "从分支描述获取附函的模式" -#: builtin/log.c:1652 +#: builtin/log.c:1673 msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" -#: builtin/log.c:1654 +#: builtin/log.c:1675 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1657 +#: builtin/log.c:1678 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1660 +#: builtin/log.c:1681 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1663 +#: builtin/log.c:1684 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1665 +#: builtin/log.c:1686 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1667 +#: builtin/log.c:1688 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1669 +#: builtin/log.c:1690 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1671 +#: builtin/log.c:1692 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1672 +#: builtin/log.c:1693 msgid "header" msgstr "header" -#: builtin/log.c:1673 +#: builtin/log.c:1694 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1695 builtin/log.c:1696 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1674 +#: builtin/log.c:1695 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1676 +#: builtin/log.c:1696 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1678 +#: builtin/log.c:1697 msgid "ident" msgstr "标识" -#: builtin/log.c:1679 +#: builtin/log.c:1698 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1681 +#: builtin/log.c:1700 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1682 +#: builtin/log.c:1701 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1702 builtin/log.c:1705 msgid "boundary" msgstr "边界" -#: builtin/log.c:1684 +#: builtin/log.c:1703 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1687 +#: builtin/log.c:1706 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1691 +#: builtin/log.c:1710 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1693 +#: builtin/log.c:1712 msgid "signature" msgstr "签名" -#: builtin/log.c:1694 +#: builtin/log.c:1713 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1695 +#: builtin/log.c:1714 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1696 +#: builtin/log.c:1715 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1698 +#: builtin/log.c:1717 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1699 +#: builtin/log.c:1718 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1701 +#: builtin/log.c:1720 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c:1703 +#: builtin/log.c:1722 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <rev> 的差异" -#: builtin/log.c:1706 +#: builtin/log.c:1725 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <refspec> 的差异" -#: builtin/log.c:1708 +#: builtin/log.c:1727 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c:1792 +#: builtin/log.c:1812 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c:1807 +#: builtin/log.c:1827 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1809 +#: builtin/log.c:1829 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1817 +#: builtin/log.c:1837 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1819 +#: builtin/log.c:1839 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1821 +#: builtin/log.c:1841 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1854 +#: builtin/log.c:1874 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1958 +#: builtin/log.c:1978 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1962 +#: builtin/log.c:1982 msgid "Interdiff:" msgstr "版本间差异：" -#: builtin/log.c:1963 +#: builtin/log.c:1983 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" -#: builtin/log.c:1969 +#: builtin/log.c:1989 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1993 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1981 +#: builtin/log.c:2001 msgid "Range-diff:" msgstr "范围差异：" -#: builtin/log.c:1982 +#: builtin/log.c:2002 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" -#: builtin/log.c:1993 +#: builtin/log.c:2013 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:2029 +#: builtin/log.c:2049 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c:2073 +#: builtin/log.c:2093 msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:2132 +#: builtin/log.c:2152 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2206 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小写字母表示 'fsmonitor clean' 文件" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "显示文件换行符格式" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "在子模组中递归" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "树对象" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树对象> 之后删除的路径仍然存在" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "显示调试数据" @@ -15699,7 +15895,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不打印远程 URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 msgid "exec" msgstr "exec" @@ -15772,191 +15968,302 @@ msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" msgid "empty mbox: '%s'" msgstr "空的 mbox：'%s'" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <提交> <提交>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <提交>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <提交>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <提交> <提交>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <引用> [<提交>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "输出所有共同的祖先" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "查找一个多路合并的祖先提交" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "显示不能被其他访问到的版本" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "第一个是其他的祖先提交么？" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初" +"始文件> <文件2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "将结果发送到标准输出" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "使用基于 diff3 的合并" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "如果冲突，使用我们的版本" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "如果冲突，使用他们的版本" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "如果冲突，使用联合版本" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "如果冲突，使用指定长度的标记" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "不要警告冲突" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "为 文件1/初始文件/文件2 设置标签" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "未知选项 %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "不能解析对象 '%s'" + +#: builtin/merge-recursive.c:57 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" +msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" + +#: builtin/merge-recursive.c:65 +msgid "not handling anything other than two heads merge." +msgstr "不能处理两个头合并之外的任何操作。" + +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "无法解析引用 '%s'" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "合并 %s 和 %s\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:121 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:142 +#: builtin/merge.c:144 #, c-format msgid "option `%s' requires a value" msgstr "选项 `%s' 需要一个值" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:189 +#: builtin/merge.c:191 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:194 +#: builtin/merge.c:196 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:247 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:250 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:251 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:253 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:256 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:258 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:260 builtin/pull.c:154 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:260 +#: builtin/merge.c:262 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:264 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:268 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:270 builtin/pull.c:169 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:271 builtin/pull.c:172 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:272 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:272 +#: builtin/merge.c:274 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:279 +#: builtin/merge.c:281 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" # -#: builtin/merge.c:281 +#: builtin/merge.c:283 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作区" -#: builtin/merge.c:283 +#: builtin/merge.c:285 msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:287 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" -#: builtin/merge.c:291 +#: builtin/merge.c:294 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" -#: builtin/merge.c:308 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "不能运行贮藏。" -#: builtin/merge.c:313 +#: builtin/merge.c:316 msgid "stash failed" msgstr "贮藏失败" -#: builtin/merge.c:318 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:387 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:398 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:499 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:586 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:708 +#: builtin/merge.c:716 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c:722 +#: builtin/merge.c:730 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:745 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:789 +#: builtin/merge.c:797 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:798 +#: builtin/merge.c:806 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:804 +#: builtin/merge.c:812 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" @@ -15966,83 +16273,83 @@ msgstr "" "合并到主题分支。\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:817 msgid "An empty message aborts the commit.\n" msgstr "空的提交说明会终止提交。\n" -#: builtin/merge.c:812 +#: builtin/merge.c:820 #, 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:865 +#: builtin/merge.c:873 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:880 +#: builtin/merge.c:888 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:941 +#: builtin/merge.c:949 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:980 +#: builtin/merge.c:988 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:982 +#: builtin/merge.c:990 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:984 +#: builtin/merge.c:992 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:989 +#: builtin/merge.c:997 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1046 +#: builtin/merge.c:1054 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1149 +#: builtin/merge.c:1157 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1191 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1286 +#: builtin/merge.c:1295 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1290 +#: builtin/merge.c:1299 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1299 +#: builtin/merge.c:1317 msgid "--quit expects no arguments" msgstr "--quit 不带参数" -#: builtin/merge.c:1312 +#: builtin/merge.c:1330 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1316 +#: builtin/merge.c:1334 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1332 +#: builtin/merge.c:1350 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16050,7 +16357,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1339 +#: builtin/merge.c:1357 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16058,211 +16365,100 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1342 +#: builtin/merge.c:1360 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1356 +#: builtin/merge.c:1374 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 和 --no-ff 组合使用。" -#: builtin/merge.c:1358 +#: builtin/merge.c:1376 msgid "You cannot combine --squash with --commit." msgstr "您不能将 --squash 和 --commit 组合使用。" -#: builtin/merge.c:1374 +#: builtin/merge.c:1392 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1391 +#: builtin/merge.c:1409 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1393 +#: builtin/merge.c:1411 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1398 +#: builtin/merge.c:1416 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1400 +#: builtin/merge.c:1418 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1481 +#: builtin/merge.c:1499 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1490 +#: builtin/merge.c:1508 msgid "Already up to date." msgstr "已经是最新的。" -#: builtin/merge.c:1500 +#: builtin/merge.c:1518 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1564 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1571 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1596 msgid "Already up to date. Yeeah!" msgstr "已经是最新的。耶！" -#: builtin/merge.c:1580 +#: builtin/merge.c:1602 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1630 builtin/merge.c:1695 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1634 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1686 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1688 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1697 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1711 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <提交> <提交>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <提交>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <提交>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <提交> <提交>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <引用> [<提交>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "输出所有共同的祖先" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "查找一个多路合并的祖先提交" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "显示不能被其他访问到的版本" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "第一个是其他的祖先提交么？" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" -"件> <文件2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "将结果发送到标准输出" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "使用基于 diff3 的合并" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "如果冲突，使用我们的版本" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "如果冲突，使用他们的版本" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "如果冲突，使用联合版本" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "如果冲突，使用指定长度的标记" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "不要警告冲突" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "为 文件1/初始文件/文件2 设置标签" - -#: builtin/merge-recursive.c:47 -#, c-format -msgid "unknown option %s" -msgstr "未知选项 %s" - -#: builtin/merge-recursive.c:53 -#, c-format -msgid "could not parse object '%s'" -msgstr "不能解析对象 '%s'" - -#: builtin/merge-recursive.c:57 -#, c-format -msgid "cannot handle more than %d base. Ignoring %s." -msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" -msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" - -#: builtin/merge-recursive.c:65 -msgid "not handling anything other than two heads merge." -msgstr "不能处理两个头合并之外的任何操作。" - -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "无法解析引用 '%s'" - -#: builtin/merge-recursive.c:82 -#, c-format -msgid "Merging %s with %s\n" -msgstr "合并 %s 和 %s\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -16297,7 +16493,7 @@ msgid "" "larger than this size" msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "太多参数" @@ -16397,7 +16593,7 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -16586,7 +16782,7 @@ msgstr "不能写注解对象" msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s 中" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" @@ -16811,7 +17007,7 @@ msgstr "" "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" @@ -16829,7 +17025,7 @@ msgstr "尝试删除不存在的注解不是一个错误" msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "不删除，只显示" @@ -16845,116 +17041,116 @@ msgstr "注解引用" msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1608 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:431 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:442 #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:573 #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:784 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 个对象，预期 %<PRIu32> 个" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:973 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:986 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:1047 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:1100 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1298 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1725 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1734 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:2005 msgid "Counting objects" msgstr "对象计数中" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2150 #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236 +#: builtin/pack-objects.c:2246 #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2260 msgid "suboptimal pack - out of memory" msgstr "次优（suboptimal）打包 - 内存不足" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2575 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2714 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2802 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2808 msgid "inconsistency with delta count" msgstr "不一致的差异计数" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2889 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16963,7 +17159,7 @@ msgstr "" "预期边界对象（edge object）ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2895 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16972,226 +17168,226 @@ msgstr "" "预期对象 ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2993 msgid "invalid value for --missing" msgstr "选项 --missing 的值无效" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160 msgid "cannot open pack index" msgstr "无法打开包文件索引" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:3083 #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3168 msgid "unable to force loose object" msgstr "无法强制松散对象" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3261 #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3264 #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3289 msgid "unable to add recent objects" msgstr "无法添加最近的对象" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3342 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3346 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3384 msgid "<version>[,<offset>]" msgstr "<版本>[,<偏移>]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3385 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3388 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3390 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3392 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3394 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3396 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3398 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3400 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3402 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3404 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3406 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3408 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3410 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3412 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3415 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3418 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3421 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3424 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3426 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3428 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3430 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3432 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3435 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可达性算法" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3437 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3439 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3441 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3443 msgid "ignore this pack" msgstr "忽略该 pack" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3445 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3447 msgid "do not hide commits by grafts" msgstr "显示被移植隐藏的提交" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3449 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3451 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3455 msgid "write a bitmap index if possible" msgstr "如果可能，写 bitmap 索引" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3459 msgid "handling for missing objects" msgstr "处理丢失的对象" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3462 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor 包文件中的对象" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3464 msgid "respect islands during delta compression" msgstr "在增量压缩时参考数据岛" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3493 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量链深度 %d 太深了，强制为 %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3498 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3552 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 来构建传输用的包文件" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3554 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包文件大小是 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3559 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3562 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3568 msgid "cannot use --filter without --stdout" msgstr "不能在没有 --stdout 的情况下使用 --filter" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3628 msgid "Enumerating objects" msgstr "枚举对象" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3658 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -17212,31 +17408,27 @@ msgstr "打包一切" msgid "prune loose refs (default)" msgstr "清除松散的引用（默认）" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:42 -msgid "Removing duplicate objects" -msgstr "正在删除重复对象" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "限制遍历 promisor 包以外的对象" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品仓库中执行清理操作" @@ -17249,61 +17441,88 @@ msgstr "%s 的值无效：%s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/pull.c:122 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "控制子模组的递归获取" -#: builtin/pull.c:126 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "和合并相关的选项" -#: builtin/pull.c:129 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "使用变基操作取代合并操作以合入修改" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/pull.c:166 -msgid "automatically stash/stash pop before and after rebase" -msgstr "变基操作前后执行自动贮藏和弹出贮藏" +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "在操作前后执行自动贮藏和弹出贮藏" -#: builtin/pull.c:182 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "和获取相关的参数" -#: builtin/pull.c:192 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/pull.c:200 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" -#: builtin/pull.c:300 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值无效：%s" -#: builtin/pull.c:426 +#: builtin/pull.c:349 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次\n" +"pull 操作之前执行下面一条命令来抑制本消息：\n" +"\n" +" git config pull.rebase false # 合并（缺省策略）\n" +" git config pull.rebase true # 变基\n" +" git config pull.ff only # 仅快进\n" +"\n" +"您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n" +"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n" +"或者 --ff-only 参数覆盖缺省设置。\n" + +#: builtin/pull.c:459 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获取到的引用中没有变基操作的候选。" -#: builtin/pull.c:428 +#: builtin/pull.c:461 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获取到的引用中没有合并操作的候选。" -#: builtin/pull.c:429 +#: builtin/pull.c:462 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" -#: builtin/pull.c:432 +#: builtin/pull.c:465 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17313,42 +17532,42 @@ msgstr "" "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n" "分支默认的远程仓库，您必须在命令行中指定一个分支名。" -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当前不在一个分支上。" -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您要变基到哪一个分支。" -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您要合并哪一个分支。" -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:475 builtin/pull.c:490 msgid "See git-pull(1) for details." msgstr "详见 git-pull(1)。" -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 +#: builtin/rebase.c:1240 git-parse-remote.sh:64 msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当前分支没有跟踪信息。" -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:494 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要为此分支创建跟踪信息，您可以执行：" -#: builtin/pull.c:466 +#: builtin/pull.c:499 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17357,32 +17576,28 @@ msgstr "" "您的配置中指定要合并远程的引用 '%s'，\n" "但是没有获取到这个引用。" -#: builtin/pull.c:576 +#: builtin/pull.c:610 #, c-format msgid "unable to access commit %s" msgstr "无法访问提交 %s" -#: builtin/pull.c:857 +#: builtin/pull.c:895 msgid "ignoring --verify-signatures for rebase" msgstr "为变基操作忽略 --verify-signatures" -#: builtin/pull.c:912 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" - -#: builtin/pull.c:920 +#: builtin/pull.c:955 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:924 +#: builtin/pull.c:959 msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c:925 +#: builtin/pull.c:960 msgid "please commit or stash them." msgstr "请提交或贮藏它们。" -#: builtin/pull.c:950 +#: builtin/pull.c:985 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17392,7 +17607,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:956 +#: builtin/pull.c:991 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17409,15 +17624,15 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:971 +#: builtin/pull.c:1006 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:975 +#: builtin/pull.c:1010 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" -#: builtin/pull.c:982 +#: builtin/pull.c:1018 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本地子模组中有修改，无法变基" @@ -17560,12 +17775,12 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:360 +#: builtin/push.c:361 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:367 +#: builtin/push.c:368 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失败" @@ -17594,65 +17809,65 @@ msgstr "推送标签（不能使用 --all or --mirror）" msgid "force updates" msgstr "强制更新" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:179 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:180 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:556 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:556 builtin/send-pack.c:174 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:561 +#: builtin/push.c:559 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:564 +#: builtin/push.c:562 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:566 +#: builtin/push.c:564 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:567 +#: builtin/push.c:565 msgid "push missing but relevant tags" msgstr "推送缺失但有关的标签" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:567 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "用 GPG 为推送签名" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:569 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "需要远端支持原子事务" -#: builtin/push.c:590 +#: builtin/push.c:587 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:592 +#: builtin/push.c:589 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/push.c:612 +#: builtin/push.c:609 #, c-format msgid "bad repository '%s'" msgstr "坏的仓库 '%s'" -#: builtin/push.c:613 +#: builtin/push.c:610 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -17673,27 +17888,27 @@ msgstr "" "\n" " git push <名称>\n" -#: builtin/push.c:628 +#: builtin/push.c:625 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:630 +#: builtin/push.c:627 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规格同时使用" -#: builtin/push.c:634 +#: builtin/push.c:631 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:636 +#: builtin/push.c:633 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规格同时使用" -#: builtin/push.c:639 +#: builtin/push.c:636 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:643 +#: builtin/push.c:640 msgid "push options must not have new line characters" msgstr "推送选项不能有换行符" @@ -17820,7 +18035,7 @@ msgstr "抑制反馈信息" msgid "You need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/rebase.c:32 +#: builtin/rebase.c:35 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " "[<upstream> [<branch>]]" @@ -17828,217 +18043,203 @@ msgstr "" "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<" "上游> [<分支>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 #, c-format msgid "unusable todo list: '%s'" msgstr "不可用的待办列表：'%s'" -#: builtin/rebase.c:292 +#: builtin/rebase.c:298 #, c-format msgid "could not create temporary %s" msgstr "无法创建临时的 %s" -#: builtin/rebase.c:298 +#: builtin/rebase.c:304 msgid "could not mark as interactive" msgstr "无法标记为交互式" -#: builtin/rebase.c:352 +#: builtin/rebase.c:358 msgid "could not generate todo list" msgstr "无法生成待办列表" -#: builtin/rebase.c:391 +#: builtin/rebase.c:399 msgid "a base commit must be provided with --upstream or --onto" msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" -#: builtin/rebase.c:461 +#: builtin/rebase.c:468 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<选项>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "（已弃用）保留空提交" +#: builtin/rebase.c:481 builtin/rebase.c:1374 +msgid "keep commits which start empty" +msgstr "保留初始为空的提交" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:485 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "允许提交说明为空" -#: builtin/rebase.c:480 +#: builtin/rebase.c:487 msgid "rebase merge commits" msgstr "对合并提交变基" -#: builtin/rebase.c:482 +#: builtin/rebase.c:489 msgid "keep original branch points of cousins" msgstr "保持兄弟提交的原始分支点" -#: builtin/rebase.c:484 +#: builtin/rebase.c:491 msgid "move commits that begin with squash!/fixup!" msgstr "移动以 squash!/fixup! 开头的提交" -#: builtin/rebase.c:485 +#: builtin/rebase.c:492 msgid "sign commits" msgstr "签名提交" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:494 builtin/rebase.c:1314 msgid "display a diffstat of what changed upstream" msgstr "显示上游变化的差异统计" -#: builtin/rebase.c:489 +#: builtin/rebase.c:496 msgid "continue rebase" msgstr "继续变基" -#: builtin/rebase.c:491 +#: builtin/rebase.c:498 msgid "skip commit" msgstr "跳过提交" -#: builtin/rebase.c:492 +#: builtin/rebase.c:499 msgid "edit the todo list" msgstr "变基待办列表" -#: builtin/rebase.c:494 +#: builtin/rebase.c:501 msgid "show the current patch" msgstr "显示当前补丁" -#: builtin/rebase.c:497 +#: builtin/rebase.c:504 msgid "shorten commit ids in the todo list" msgstr "缩短待办列表中的提交号" -#: builtin/rebase.c:499 +#: builtin/rebase.c:506 msgid "expand commit ids in the todo list" msgstr "扩展待办列表中的提交号" -#: builtin/rebase.c:501 +#: builtin/rebase.c:508 msgid "check the todo list" msgstr "检查待办列表" -#: builtin/rebase.c:503 +#: builtin/rebase.c:510 msgid "rearrange fixup/squash lines" msgstr "重新排列 fixup/squash 行" -#: builtin/rebase.c:505 +#: builtin/rebase.c:512 msgid "insert exec commands in todo list" msgstr "在待办列表中插入 exec 执行命令" -#: builtin/rebase.c:506 +#: builtin/rebase.c:513 msgid "onto" msgstr "onto" -#: builtin/rebase.c:509 +#: builtin/rebase.c:516 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:509 +#: builtin/rebase.c:516 msgid "restrict revision" msgstr "限制版本" -#: builtin/rebase.c:511 +#: builtin/rebase.c:518 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:512 +#: builtin/rebase.c:519 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:514 +#: builtin/rebase.c:521 msgid "the upstream commit" msgstr "上游提交" -#: builtin/rebase.c:516 +#: builtin/rebase.c:523 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:516 +#: builtin/rebase.c:523 msgid "head name" msgstr "head 名称" -#: builtin/rebase.c:521 +#: builtin/rebase.c:528 msgid "rebase strategy" msgstr "变基策略" -#: builtin/rebase.c:522 +#: builtin/rebase.c:529 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:523 +#: builtin/rebase.c:530 msgid "strategy options" msgstr "策略选项" -#: builtin/rebase.c:524 +#: builtin/rebase.c:531 msgid "switch-to" msgstr "切换到" -#: builtin/rebase.c:525 +#: builtin/rebase.c:532 msgid "the branch or commit to checkout" msgstr "要检出的分支或提交" -#: builtin/rebase.c:526 +#: builtin/rebase.c:533 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:526 +#: builtin/rebase.c:533 msgid "onto name" msgstr "onto name" -#: builtin/rebase.c:527 +#: builtin/rebase.c:534 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:527 +#: builtin/rebase.c:534 msgid "the command to run" msgstr "要执行的命令" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:537 builtin/rebase.c:1407 msgid "automatically re-schedule any `exec` that fails" msgstr "自动重新安排任何失败的 `exec`" -#: builtin/rebase.c:546 +#: builtin/rebase.c:553 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果" -#: builtin/rebase.c:562 +#: builtin/rebase.c:569 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s 需要交互式变基" +msgid "%s requires the merge backend" +msgstr "%s 需要合并后端" #: builtin/rebase.c:612 #, c-format msgid "could not get 'onto': '%s'" msgstr "无法获取 'onto'：'%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:629 #, c-format msgid "invalid orig-head: '%s'" msgstr "无效的原始 head：'%s'" -#: builtin/rebase.c:652 +#: builtin/rebase.c:654 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略无效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c:728 -#, c-format -msgid "Could not read '%s'" -msgstr "不能读取 '%s'" - -#: builtin/rebase.c:746 -#, c-format -msgid "Cannot store %s" -msgstr "不能存储 %s" - -#: builtin/rebase.c:853 -msgid "could not determine HEAD revision" -msgstr "不能确定 HEAD 版本" - -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18051,7 +18252,7 @@ msgstr "" "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。" -#: builtin/rebase.c:1058 +#: builtin/rebase.c:882 #, c-format msgid "" "\n" @@ -18069,14 +18270,14 @@ msgstr "" "\n" "因此 git 无法对其变基。" -#: builtin/rebase.c:1383 +#: builtin/rebase.c:1208 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1226 #, c-format msgid "" "%s\n" @@ -18093,7 +18294,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1242 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18106,136 +18307,136 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1272 msgid "exec commands cannot contain newlines" msgstr "exec 命令不能包含换行符" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1276 msgid "empty exec command" msgstr "空的 exec 命令" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1305 msgid "rebase onto given branch instead of upstream" msgstr "变基到给定的分支而非上游" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1307 msgid "use the merge-base of upstream and branch as the current base" msgstr "使用上游和分支的合并基线做为当前基线" -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1309 msgid "allow pre-rebase hook to run" msgstr "允许执行 pre-rebase 钩子" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1311 msgid "be quiet. implies --no-stat" msgstr "安静。暗示 --no-stat" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1317 msgid "do not show diffstat of what changed upstream" msgstr "不显示上游变化的差异统计" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1320 msgid "add a Signed-off-by: line to each commit" msgstr "为每一个提交添加一个 Signed-off-by: 签名" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 msgid "passed to 'git am'" msgstr "传递给 'git am" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1330 builtin/rebase.c:1332 msgid "passed to 'git apply'" msgstr "传递给 'git apply'" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1334 builtin/rebase.c:1337 msgid "cherry-pick all commits, even if unchanged" msgstr "拣选所有提交，即使未修改" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1339 msgid "continue" msgstr "继续" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1342 msgid "skip current patch and continue" msgstr "跳过当前补丁并继续" # 译者：注意保持前导空格 -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1344 msgid "abort and check out the original branch" msgstr "终止并检出原有分支" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1347 msgid "abort but keep HEAD where it is" msgstr "终止但保持 HEAD 不变" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1348 msgid "edit the todo list during an interactive rebase" msgstr "在交互式变基中编辑待办列表" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1351 msgid "show the patch file being applied or merged" msgstr "显示正在应用或合并的补丁文件" -#: builtin/rebase.c:1530 +#: builtin/rebase.c:1354 msgid "use apply strategies to rebase" msgstr "使用应用策略进行变基" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1358 msgid "use merging strategies to rebase" msgstr "使用合并策略进行变基" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1362 msgid "let the user edit the list of commits to rebase" msgstr "让用户编辑要变基的提交列表" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1366 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "（已弃用）尝试重建合并提交而非忽略它们" -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1371 msgid "how to handle commits that become empty" msgstr "如何处理成为空提交的提交" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1378 msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交" -#: builtin/rebase.c:1560 -msgid "automatically stash/stash pop before and after" -msgstr "在操作前后执行自动贮藏和弹出贮藏" - -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1385 msgid "add exec lines after each commit of the editable list" msgstr "可编辑列表的每一个提交下面增加一行 exec" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1389 msgid "allow rebasing commits with empty messages" msgstr "允许针对空提交说明的提交变基" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1393 msgid "try to rebase merges instead of skipping them" msgstr "尝试对合并提交变基而不是忽略它们" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1396 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 来优化上游" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1398 msgid "use the given merge strategy" msgstr "使用给定的合并策略" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1400 builtin/revert.c:115 msgid "option" msgstr "选项" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1401 msgid "pass the argument through to the merge strategy" msgstr "将参数传递给合并策略" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1404 msgid "rebase all reachable commits up to the root(s)" msgstr "将所有可达的提交变基到根提交" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1409 +msgid "apply all changes, even those already present upstream" +msgstr "应用所有更改，甚至那些已在上游存在的" + +#: builtin/rebase.c:1426 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18243,36 +18444,40 @@ msgstr "" "对 rebase.useBuiltin 的支持已被删除！\n" "详见 'git help config' 中的条目。" -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1432 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "看起来 'git-am' 正在执行中。无法变基。" -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1473 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。" -#: builtin/rebase.c:1650 +#: builtin/rebase.c:1478 msgid "cannot combine '--keep-base' with '--onto'" msgstr "不能将 '--keep-base' 和 '--onto' 组合使用" -#: builtin/rebase.c:1652 +#: builtin/rebase.c:1480 msgid "cannot combine '--keep-base' with '--root'" msgstr "不能将 '--keep-base' 和 '--root' 组合使用" -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1484 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "不能将 '--root' 和 '--fork-point' 组合使用" + +#: builtin/rebase.c:1487 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1491 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1514 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1526 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18280,16 +18485,16 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1545 msgid "could not discard worktree changes" msgstr "无法丢弃工作区变更" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1564 #, c-format msgid "could not move back to %s" msgstr "无法移回 %s" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1610 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18308,164 +18513,141 @@ msgstr "" "\t%s\n" "然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1638 msgid "switch `C' expects a numerical value" msgstr "开关 `C' 期望一个数字值" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1680 #, c-format msgid "Unknown mode: %s" msgstr "未知模式：%s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1702 msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1899 +#: builtin/rebase.c:1732 msgid "cannot combine apply options with merge options" msgstr "不能组合使用应用选项和合并选项" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1745 #, c-format msgid "Unknown rebase backend: %s" msgstr "未知的变基后端：%s" -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1770 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1790 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1794 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1818 #, c-format msgid "invalid upstream '%s'" msgstr "无效的上游 '%s'" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1824 msgid "Could not create new root commit" msgstr "不能创建新的根提交" -#: builtin/rebase.c:2017 +#: builtin/rebase.c:1850 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s'：只需要与分支的一个合并基线" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1853 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'：只需要一个合并基线" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1861 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "没有指向一个有效的提交 '%s'" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1887 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "致命错误：无此分支/提交 '%s'" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "没有这样的引用：%s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1906 msgid "Could not resolve HEAD to a revision" msgstr "无法将 HEAD 解析为一个版本" -#: builtin/rebase.c:2111 -msgid "Cannot autostash" -msgstr "无法 autostash" - -#: builtin/rebase.c:2114 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "意外的 stash 响应：'%s'" - -#: builtin/rebase.c:2120 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "不能为 '%s' 创建目录" - -#: builtin/rebase.c:2123 -#, c-format -msgid "Created autostash: %s\n" -msgstr "创建了 autostash：%s\n" - -#: builtin/rebase.c:2126 -msgid "could not reset --hard" -msgstr "无法 reset --hard" - -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1927 msgid "Please commit or stash them." msgstr "请提交或贮藏修改。" -#: builtin/rebase.c:2169 +#: builtin/rebase.c:1963 #, c-format msgid "could not switch to %s" msgstr "无法切换到 %s" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:1974 msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:2182 +#: builtin/rebase.c:1976 #, c-format msgid "Current branch %s is up to date.\n" msgstr "当前分支 %s 是最新的。\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:1984 msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的，强制变基。" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:1986 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "当前分支 %s 是最新的，强制变基。\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:1994 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 钩子拒绝了变基操作。" -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2001 #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的变更：\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2004 #, c-format msgid "Changes from %s to %s:\n" msgstr "从 %s 到 %s 的变更：\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2029 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先，回退头指针以便在其上重放您的工作...\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2038 msgid "Could not detach HEAD" msgstr "无法分离头指针" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2047 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快进 %s 到 %s。\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <仓库目录>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:843 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" @@ -18491,7 +18673,7 @@ msgstr "" "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n" "配置变量为 'refuse'。" -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:863 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" @@ -18510,11 +18692,11 @@ msgstr "" "\n" "若要屏蔽此信息，您可以设置它为 'refuse'。" -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1960 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1974 msgid "You must specify a directory." msgstr "您必须指定一个目录。" @@ -19090,11 +19272,11 @@ msgstr "未找到此 URL：%s" msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送 URL 地址" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<选项>]" -#: builtin/repack.c:28 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19102,111 +19284,111 @@ msgstr "" "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" "或禁用 pack.writebitmaps 配置。" -#: builtin/repack.c:191 +#: builtin/repack.c:193 msgid "could not start pack-objects to repack promisor objects" msgstr "无法开始 pack-objects 来重新打包 promisor 对象" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:232 builtin/repack.c:418 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。" -#: builtin/repack.c:254 +#: builtin/repack.c:256 msgid "could not finish pack-objects to repack promisor objects" msgstr "无法完成 pack-objects 来重新打包 promisor 对象" -#: builtin/repack.c:292 +#: builtin/repack.c:294 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" -#: builtin/repack.c:294 +#: builtin/repack.c:296 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，并将不可达的对象设为松散对象" -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "remove redundant packs, and run git-prune-packed" msgstr "删除多余的包，运行 git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:301 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" -#: builtin/repack.c:301 +#: builtin/repack.c:303 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-object" -#: builtin/repack.c:303 +#: builtin/repack.c:305 msgid "do not run git-update-server-info" msgstr "不运行 git-update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:308 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --local" -#: builtin/repack.c:308 +#: builtin/repack.c:310 msgid "write bitmap index" msgstr "写 bitmap 索引" -#: builtin/repack.c:310 +#: builtin/repack.c:312 msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --delta-islands" -#: builtin/repack.c:311 +#: builtin/repack.c:313 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:312 +#: builtin/repack.c:314 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要将早于给定时间的对象过期" -#: builtin/repack.c:314 +#: builtin/repack.c:316 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新对不可达对象打包" -#: builtin/repack.c:316 +#: builtin/repack.c:318 msgid "size of the window used for delta compression" msgstr "用于增量压缩的窗口值" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:319 builtin/repack.c:325 msgid "bytes" msgstr "字节" -#: builtin/repack.c:318 +#: builtin/repack.c:320 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制内存大小而非条目数" -#: builtin/repack.c:320 +#: builtin/repack.c:322 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:322 +#: builtin/repack.c:324 msgid "limits the maximum number of threads" msgstr "限制最大线程数" -#: builtin/repack.c:324 +#: builtin/repack.c:326 msgid "maximum size of each packfile" msgstr "每个包文件的最大尺寸" -#: builtin/repack.c:326 +#: builtin/repack.c:328 msgid "repack objects in packs marked with .keep" msgstr "对标记为 .keep 的包中的对象重新打包" -#: builtin/repack.c:328 +#: builtin/repack.c:330 msgid "do not repack this pack" msgstr "不要对该包文件重新打包" -#: builtin/repack.c:338 +#: builtin/repack.c:340 msgid "cannot delete packs in a precious-objects repo" msgstr "不能删除珍品仓库中的打包文件" -#: builtin/repack.c:342 +#: builtin/repack.c:344 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不兼容" -#: builtin/repack.c:425 +#: builtin/repack.c:427 msgid "Nothing new to pack." msgstr "没有新的要打包。" -#: builtin/repack.c:486 +#: builtin/repack.c:488 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19222,7 +19404,7 @@ msgstr "" "警告：并且尝试重命名改回原有文件名的操作也失败。\n" "警告：请手动将 %s 下的这些文件重命名：\n" -#: builtin/repack.c:534 +#: builtin/repack.c:536 #, c-format msgid "failed to remove '%s'" msgstr "删除 '%s' 失败" @@ -19528,94 +19710,94 @@ msgstr "合并" msgid "keep" msgstr "保持" -#: builtin/reset.c:82 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:84 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:90 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:115 +#: builtin/reset.c:116 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:194 +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 #: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:297 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:303 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:309 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "将删除的路径标记为稍后添加" -#: builtin/reset.c:343 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:351 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:360 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:370 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:372 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:387 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对纯仓库进行%s重置" -#: builtin/reset.c:391 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N 只能和 --mixed 同时使用" -#: builtin/reset.c:412 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "重置后取消暂存的变更：" -#: builtin/reset.c:415 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -19627,12 +19809,12 @@ msgstr "" "重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" -#: builtin/reset.c:425 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:429 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" @@ -19652,23 +19834,23 @@ msgstr "rev-list 不支持显示注解" msgid "marked counting is incompatible with --objects" msgstr "标记计数和 --objects 不兼容" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作为一个参数传递" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "遇到第一个非选项参数后停止解析" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "以固定长格式输出" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -19863,15 +20045,15 @@ msgstr "" msgid "remote name" msgstr "远程名称" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "使用无状态的 RPC 协议" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "从标准输入读取引用" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "打印来自远程 helper 的状态" @@ -20090,69 +20272,57 @@ msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" #: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <选项>" +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>" #: builtin/sparse-checkout.c:64 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）" -#: builtin/sparse-checkout.c:225 +#: builtin/sparse-checkout.c:212 msgid "failed to create directory for sparse-checkout file" msgstr "无法为稀疏检出文件创建目录" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:253 msgid "failed to set extensions.worktreeConfig setting" msgstr "无法设置 extensions.worktreeConfig" -#: builtin/sparse-checkout.c:283 +#: builtin/sparse-checkout.c:270 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:289 msgid "initialize the sparse-checkout in cone mode" msgstr "初始化稀疏检出为 cone 模式" -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "初始化稀疏检出" - -#: builtin/sparse-checkout.c:341 +#: builtin/sparse-checkout.c:326 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: builtin/sparse-checkout.c:398 +#: builtin/sparse-checkout.c:383 #, c-format msgid "could not normalize path %s" msgstr "无法规范化路径 %s" -#: builtin/sparse-checkout.c:410 +#: builtin/sparse-checkout.c:395 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <模式>)" -#: builtin/sparse-checkout.c:435 +#: builtin/sparse-checkout.c:420 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "无法为 C 语言风格的字符串 '%s' 去引号" -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +#: builtin/sparse-checkout.c:474 builtin/sparse-checkout.c:498 msgid "unable to load existing sparse-checkout patterns" msgstr "无法加载现存的稀疏检出模式" -#: builtin/sparse-checkout.c:558 +#: builtin/sparse-checkout.c:543 msgid "read patterns from standard in" msgstr "从标准输入读取模式" -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "设置稀疏检出模式" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "禁用稀疏检出" - -#: builtin/sparse-checkout.c:593 +#: builtin/sparse-checkout.c:580 msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" @@ -20232,7 +20402,7 @@ msgstr "'%s' 不像是一个贮藏提交" msgid "Too many revisions specified:%s" msgstr "指定了太多的版本：%s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "未发现贮藏条目。" @@ -20241,13 +20411,13 @@ msgstr "未发现贮藏条目。" msgid "%s is not a valid reference" msgstr "%s 不是一个有效的引用名" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear 不支持参数" #: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" -msgstr "无法在合并过程应用贮藏" +msgstr "无法在合并过程中应用贮藏" #: builtin/stash.c:415 #, c-format @@ -20271,7 +20441,7 @@ msgstr "无法从贮藏条目中恢复未跟踪文件" msgid "Merging %s with %s" msgstr "正在合并 %s 和 %s" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "索引未从贮藏中恢复。" @@ -20294,105 +20464,107 @@ msgstr "%s：无法丢弃贮藏条目" msgid "'%s' is not a stash reference" msgstr "'%s' 不是一个贮藏引用" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:633 msgid "The stash entry is kept in case you need it again." msgstr "贮藏条目被保留以备您再次需要。" -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "无法用 %2$s 更新 %1$s" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540 msgid "stash message" msgstr "贮藏说明" -#: builtin/stash.c:824 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一个 <提交> 参数" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1046 msgid "No changes selected" msgstr "没有选择变更" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1146 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1173 msgid "Cannot save the current index state" msgstr "无法保存当前索引状态" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1182 msgid "Cannot save the untracked files" msgstr "无法保存未跟踪文件" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1193 builtin/stash.c:1202 msgid "Cannot save the current worktree state" msgstr "无法保存当前工作区状态" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1230 msgid "Cannot record working tree state" msgstr "不能记录工作区状态" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1279 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1298 +#: builtin/stash.c:1295 msgid "Did you forget to 'git add'?" msgstr "您是否忘了执行 'git add'？" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1310 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1317 msgid "Cannot initialize stash" msgstr "无法初始化贮藏" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1332 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: builtin/stash.c:1340 +#: builtin/stash.c:1337 #, c-format msgid "Saved working directory and index state %s" msgstr "保存工作目录和索引状态 %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1427 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "stash in patch mode" msgstr "以补丁模式贮藏" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "quiet mode" msgstr "静默模式" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "include untracked files in stash" msgstr "贮藏中包含未跟踪文件" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1473 builtin/stash.c:1538 msgid "include ignore files" msgstr "包含忽略的文件" -#: builtin/stash.c:1600 -#, c-format -msgid "could not exec %s" -msgstr "不能执行 %s" +#: builtin/stash.c:1573 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"对 stash.useBuiltin 的支持已被删除！\n" +"详见 'git help config' 中的条目。" #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -20823,17 +20995,25 @@ msgstr "git submodule--helper config --unset <名称>" msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2241 git-submodule.sh:176 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "请确认 .gitmodules 文件在工作区里" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2257 +msgid "Suppress output for setting url of a submodule" +msgstr "阻止设置子模组 URL 的输出" + +#: builtin/submodule--helper.c:2261 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>" + +#: builtin/submodule--helper.c:2323 git.c:436 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2329 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" @@ -20858,11 +21038,11 @@ msgstr "删除符号引用" msgid "shorten ref output" msgstr "缩短引用输出" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "原因" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "更新的原因" @@ -20954,134 +21134,134 @@ msgstr "" msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "无标签说明？" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "标签说明被保留在 %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "列出标签名称" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "每个标签信息打印 <n> 行" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "删除标签" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "验证标签" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "标签创建选项" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "附注标签，需要一个说明" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "标签说明" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "强制编辑标签说明" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "附注并附加 GPG 签名的标签" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "使用另外的私钥签名该标签" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "如果存在，替换现有的标签" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "创建引用日志" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "标签列表选项" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "以列的方式显示标签列表" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "只打印包含该提交的标签" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "只打印不包含该提交的标签" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "只打印已经合并的标签" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "只打印尚未合并的标签" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "只打印指向该对象的标签" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "-n 选项只允许用在列表显示模式" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "--contains 选项只允许用在列表显示模式" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains 选项只允许用在列表显示模式" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "--points-at 选项只允许用在列表显示模式" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的标签名称。" -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "标签 '%s' 已存在" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新标签 '%s'（曾为 %s）\n" @@ -21351,19 +21531,19 @@ msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<选项>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "删除引用" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "更新 <引用名> 本身而不是它指向的引用" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "标准输入有以 NUL 字符终止的参数" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "从标准输入读取更新" @@ -21455,7 +21635,7 @@ msgstr "git worktree remove [<选项>] <工作区>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:60 builtin/worktree.c:894 #, c-format msgid "failed to delete '%s'" msgstr "删除 '%s' 失败" @@ -21533,115 +21713,115 @@ msgstr "" msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:435 builtin/worktree.c:441 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区（新分支 '%s'）" -#: builtin/worktree.c:434 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "准备工作区（重置分支 '%s'，之前为 %s）" -#: builtin/worktree.c:443 +#: builtin/worktree.c:446 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "准备工作区（检出 '%s'）" -#: builtin/worktree.c:449 +#: builtin/worktree.c:452 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区（分离头指针 %s）" -#: builtin/worktree.c:490 +#: builtin/worktree.c:493 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出 <分支>，即使已经被检出到其它工作区" -#: builtin/worktree.c:493 +#: builtin/worktree.c:496 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:495 +#: builtin/worktree.c:498 msgid "create or reset a branch" msgstr "创建或重置一个分支" -#: builtin/worktree.c:497 +#: builtin/worktree.c:500 msgid "populate the new working tree" msgstr "生成新的工作区" -#: builtin/worktree.c:498 +#: builtin/worktree.c:501 msgid "keep the new working tree locked" msgstr "锁定新工作区" -#: builtin/worktree.c:501 +#: builtin/worktree.c:504 msgid "set up tracking mode (see git-branch(1))" msgstr "设置跟踪模式（参见 git-branch(1)）" -#: builtin/worktree.c:504 +#: builtin/worktree.c:507 msgid "try to match the new branch name with a remote-tracking branch" msgstr "尝试为新分支名匹配一个远程跟踪分支" -#: builtin/worktree.c:512 +#: builtin/worktree.c:515 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:573 +#: builtin/worktree.c:576 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在创建新分支时使用选项 --[no-]track " -#: builtin/worktree.c:673 +#: builtin/worktree.c:676 msgid "reason for locking" msgstr "锁定原因" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795 +#: builtin/worktree.c:922 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:690 builtin/worktree.c:723 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:692 +#: builtin/worktree.c:695 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定，原因：%s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:697 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:722 +#: builtin/worktree.c:725 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" -#: builtin/worktree.c:763 +#: builtin/worktree.c:766 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移动或删除包含子模组的工作区" -#: builtin/worktree.c:771 +#: builtin/worktree.c:774 msgid "force move even if worktree is dirty or locked" msgstr "强制移动，即使工作区是脏的或已锁定" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:797 builtin/worktree.c:924 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一个主工作区" -#: builtin/worktree.c:799 +#: builtin/worktree.c:802 #, c-format msgid "could not figure out destination name from '%s'" msgstr "无法从 '%s' 算出目标名称" -#: builtin/worktree.c:805 +#: builtin/worktree.c:808 #, c-format msgid "target '%s' already exists" msgstr "目标 '%s' 已存在" -#: builtin/worktree.c:813 +#: builtin/worktree.c:816 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21650,7 +21830,7 @@ msgstr "" "无法移动一个锁定的工作区，锁定原因：%s\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:815 +#: builtin/worktree.c:818 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21658,36 +21838,36 @@ msgstr "" "无法移动一个锁定的工作区，\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:818 +#: builtin/worktree.c:821 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "验证失败，无法移动工作区：%s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:826 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移动 '%s' 到 '%s' 失败" -#: builtin/worktree.c:871 +#: builtin/worktree.c:874 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中执行 'git status' 失败" -#: builtin/worktree.c:875 +#: builtin/worktree.c:878 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除" -#: builtin/worktree.c:880 +#: builtin/worktree.c:883 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:906 msgid "force removal even if worktree is dirty or locked" msgstr "强制删除，即使工作区是脏的或已锁定" -#: builtin/worktree.c:926 +#: builtin/worktree.c:929 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21696,7 +21876,7 @@ msgstr "" "无法删除一个锁定的工作区，锁定原因：%s\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:928 +#: builtin/worktree.c:931 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21704,7 +21884,7 @@ msgstr "" "无法删除一个锁定的工作区，\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:931 +#: builtin/worktree.c:934 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "验证失败，无法删除工作区：%s" @@ -21725,17 +21905,121 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" -#: fast-import.c:3125 +#: bugreport.c:14 +msgid "git version:\n" +msgstr "git 版本：\n" + +#: bugreport.c:20 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() 失败，错误为 '%s'（%d）\n" + +#: bugreport.c:30 +msgid "compiler info: " +msgstr "编译器信息：" + +#: bugreport.c:32 +msgid "libc info: " +msgstr "libc 信息：" + +#: bugreport.c:74 +msgid "not run from a git repository - no hooks to show\n" +msgstr "不是在 git 仓库中执行 - 没有要显示的钩子\n" + +#: bugreport.c:84 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]" + +#: bugreport.c:91 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"感谢您填写 Git 错误报告！\n" +"请填写以下问卷，以帮助我们了解您的问题。\n" +"\n" +"在错误发生之前，您做了什么？（重现问题的步骤）\n" +"\n" +"您期望发生什么？（预期行为）\n" +"\n" +"实际发生了什么？（实际行为）\n" +"\n" +"您所期望的与实际发生的有什么不同？\n" +"\n" +"您想要补充的其它内容：\n" +"\n" +"请检查错误报告下面的内容。\n" +"您可以删除任何您不想共享的内容。\n" + +#: bugreport.c:130 +msgid "specify a destination for the bugreport file" +msgstr "指定错误报告文件的目标位置" + +#: bugreport.c:132 +msgid "specify a strftime format suffix for the filename" +msgstr "指定文件的 strftime 格式后缀" + +#: bugreport.c:156 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "不能为 '%s' 创建先导目录" + +#: bugreport.c:163 +msgid "System Info" +msgstr "系统信息" + +#: bugreport.c:166 +msgid "Enabled Hooks" +msgstr "启用的钩子" + +#: bugreport.c:174 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "不能创建新文件 '%s'" + +#: bugreport.c:186 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "在 '%s' 创建了新报告。\n" + +#: fast-import.c:3085 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "子模组 '%s' 缺少 from 标记" + +#: fast-import.c:3087 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "子模组 '%s' 缺少 to 标记" + +#: fast-import.c:3222 #, c-format msgid "Expected 'mark' command, got %s" msgstr "预期 'mark' 命令，得到 %s" -#: fast-import.c:3130 +#: fast-import.c:3227 #, c-format msgid "Expected 'to' command, got %s" msgstr "预期 'to' 命令，得到 %s" -#: fast-import.c:3254 +#: fast-import.c:3317 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "子模组重写选项的预期格式为 name:filename" + +#: fast-import.c:3371 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" @@ -21774,7 +22058,7 @@ msgstr "test-tool serve-v2 [<选项>]" msgid "exit immediately after advertising capabilities" msgstr "对能力广告之后立即退出" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -21790,7 +22074,7 @@ msgstr "" " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" " <命令> [<参数>]" -#: git.c:34 +#: git.c:35 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -21802,47 +22086,47 @@ msgstr "" "帮助。\n" "有关系统的概述，查看 'git help git'。" -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "没有为 --git-dir 提供目录\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "没有为 --namespace 提供命名空间\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "没有为 --work-tree 提供目录\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "没有为 --super-prefix 提供前缀\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "应为 -c 提供一个配置字符串\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "没有为 -C 提供目录\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "未知选项：%s\n" -#: git.c:360 +#: git.c:362 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "在扩展别名 '%s' 时：'%s'" -#: git.c:369 +#: git.c:371 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -21851,39 +22135,39 @@ msgstr "" "别名 '%s' 修改环境变量。您可以使用在别名中\n" "使用 '!git'" -#: git.c:376 +#: git.c:378 #, c-format msgid "empty alias for %s" msgstr "%s 的空别名" -#: git.c:379 +#: git.c:381 #, c-format msgid "recursive alias: %s" msgstr "递归的别名：%s" -#: git.c:459 +#: git.c:463 msgid "write failure on standard output" msgstr "在标准输出写入失败" -#: git.c:461 +#: git.c:465 msgid "unknown write failure on standard output" msgstr "到标准输出的未知写入错误" -#: git.c:463 +#: git.c:467 msgid "close failed on standard output" msgstr "标准输出关闭失败" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "检测到别名循环：'%s'的扩展未终止：%s" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "不能作为内置命令处理 %s" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" @@ -21892,53 +22176,53 @@ msgstr "" "用法：%s\n" "\n" -#: git.c:876 +#: git.c:875 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n" -#: git.c:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "运行命令 '%s' 失败：%s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer 为负值，默认为 %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "不支持委托控制，因为 cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0" -#: http.c:876 +#: http.c:914 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0" -#: http.c:949 +#: http.c:993 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "不支持协议限制，因为 cURL < 7.19.4" -#: http.c:1086 +#: http.c:1139 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端：" -#: http.c:1093 +#: http.c:1146 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建" -#: http.c:1097 +#: http.c:1150 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "无法将 SSL 后端设置为 '%s'：已经设置" -#: http.c:1966 +#: http.c:2032 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22058,6 +22342,14 @@ msgstr "remote-curl：尝试没有本地仓库下获取" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的来自 git 的命令 '%s'" +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "编译器信息不可用\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "libc 信息不可用\n" + #: list-objects-filter-options.h:85 msgid "args" msgstr "参数" @@ -22111,11 +22403,11 @@ msgstr "排序的字段名" msgid "update the index with reused conflict resolution if possible" msgstr "如果可能，重用冲突解决更新索引" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "头指针分离自 " @@ -22156,619 +22448,627 @@ msgid "List, create, or delete branches" msgstr "列出、创建或删除分支" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "收集信息以供用户提交错误报告" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "通过归档移动对象和引用" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "提供仓库对象的内容、类型或大小" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "显示 gitattributes 信息" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "调试 gitignore / exclude 文件" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "显示联系人的规范名称和电子邮件" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "切换分支或恢复工作区文件" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "从索引拷贝文件到工作区" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "确保引用名称格式正确" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "查找尚未应用到上游的提交" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "应用一些现存提交引入的修改" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "git-commit 的图形替代界面" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "从工作区中删除未跟踪文件" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "克隆仓库到一个新目录" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "以列的方式显示数据" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "记录变更到仓库" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "写入和校验 Git 提交图文件" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "创建一个新的提交对象" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "获取和设置仓库或者全局选项" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "计算未打包对象的数量和磁盘空间占用" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "检索和存储用户密码" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "在内存中临时存储密码的助手" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "在磁盘存储密码的助手" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "将一个提交导出到 CVS 检出中" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Git 的一个 CVS 服务模拟器" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "一个非常简单的 Git 仓库服务器" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "基于一个现存的引用为一个对象起一个可读的名称" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "显示提交之间、提交和工作区之间等的差异" -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "比较工作区和索引区中的文件" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "将一个树和工作区或索引做比较" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "比较两个树对象的文件内容和模式" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "使用常见的差异工具显示更改" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Git 数据导出器" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Git 快速数据导入器后端" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "从另外一个仓库下载对象和引用" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "从另一个仓库获取缺失的对象" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "重写分支" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "生成一个合并提交信息" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "对每一个引用输出信息 " -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "准备电子邮件提交的补丁" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "验证仓库中对象的连通性和有效性" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "清除不必要的文件和优化本地仓库" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "从 git-archive 创建的归档文件中提取提交 ID" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "输出和模式匹配的行" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "一个便携的 Git 图形客户端" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "显示 Git 的帮助信息" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "Git HTTP 协议的服务端实现" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "通过 HTTP 从远程 Git 仓库下载" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "通过 HTTP/DAV 推送对象另一个仓库" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "从标准输入将一组补丁发送到IMAP文件夹" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "从一个现存的包存档文件创建包索引" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "在 gitweb 中即时浏览您的工作仓库" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "添加或解析提交说明中的结构化信息" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "Git 仓库浏览器" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "显示提交日志" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "显示索引和工作区中文件的信息" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "显示一个远程仓库的引用" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "显示一个树对象的内容" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "从单个电子邮件中提取补丁和作者身份" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "简单的 UNIX mbox 邮箱切分程序" -#: command-list.h:121 +#: command-list.h:122 msgid "Join two or more development histories together" msgstr "合并两个或更多开发历史" -#: command-list.h:122 +#: command-list.h:123 msgid "Find as good common ancestors as possible for a merge" msgstr "为了合并查找尽可能好的公共祖先提交" -#: command-list.h:123 +#: command-list.h:124 msgid "Run a three-way file merge" msgstr "运行一个三路文件合并" -#: command-list.h:124 +#: command-list.h:125 msgid "Run a merge for files needing merging" msgstr "对于需要合并的文件执行合并" -#: command-list.h:125 +#: command-list.h:126 msgid "The standard helper program to use with git-merge-index" msgstr "与 git-merge-index 一起使用的标准向导程序" -#: command-list.h:126 +#: command-list.h:127 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "运行合并冲突解决工具以解决合并冲突" -#: command-list.h:127 +#: command-list.h:128 msgid "Show three-way merge without touching index" msgstr "显示三路合并而不动索引" -#: command-list.h:128 +#: command-list.h:129 msgid "Write and verify multi-pack-indexes" msgstr "写入和校验多包索引" -#: command-list.h:129 +#: command-list.h:130 msgid "Creates a tag object" msgstr "创建一个标签对象" -#: command-list.h:130 +#: command-list.h:131 msgid "Build a tree-object from ls-tree formatted text" msgstr "基于 ls-tree 的格式化文本创建一个树对象" -#: command-list.h:131 +#: command-list.h:132 msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或重命名一个文件、目录或符号链接" # 查找给定版本的符号名称 -#: command-list.h:132 +#: command-list.h:133 msgid "Find symbolic names for given revs" msgstr "查找给定版本的符号名称" -#: command-list.h:133 +#: command-list.h:134 msgid "Add or inspect object notes" msgstr "添加或检查对象注释" -#: command-list.h:134 +#: command-list.h:135 msgid "Import from and submit to Perforce repositories" msgstr "导入和提交到 Perforce 仓库中" -#: command-list.h:135 +#: command-list.h:136 msgid "Create a packed archive of objects" msgstr "创建对象的存档包" -#: command-list.h:136 +#: command-list.h:137 msgid "Find redundant pack files" msgstr "查找冗余的包文件" -#: command-list.h:137 +#: command-list.h:138 msgid "Pack heads and tags for efficient repository access" msgstr "打包头和标签以实现高效的仓库访问" -#: command-list.h:138 +#: command-list.h:139 msgid "Routines to help parsing remote repository access parameters" msgstr "帮助解析远程仓库访问参数的例程" -#: command-list.h:139 +#: command-list.h:140 msgid "Compute unique ID for a patch" msgstr "计算一个补丁的唯一 ID" -#: command-list.h:140 +#: command-list.h:141 msgid "Prune all unreachable objects from the object database" msgstr "删除对象库中所有不可达对象" -#: command-list.h:141 +#: command-list.h:142 msgid "Remove extra objects that are already in pack files" msgstr "删除已经在包文件中的多余对象" -#: command-list.h:142 +#: command-list.h:143 msgid "Fetch from and integrate with another repository or a local branch" msgstr "获取并整合另外的仓库或一个本地分支" -#: command-list.h:143 +#: command-list.h:144 msgid "Update remote refs along with associated objects" msgstr "更新远程引用和相关的对象" -#: command-list.h:144 +#: command-list.h:145 msgid "Applies a quilt patchset onto the current branch" msgstr "将一个 quilt 补丁集应用到当前分支。" -#: command-list.h:145 +#: command-list.h:146 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "比较两个提交范围（如一个分支的两个版本）" -#: command-list.h:146 +#: command-list.h:147 msgid "Reads tree information into the index" msgstr "将树信息读取到索引" -#: command-list.h:147 +#: command-list.h:148 msgid "Reapply commits on top of another base tip" msgstr "在另一个分支上重新应用提交" -#: command-list.h:148 +#: command-list.h:149 msgid "Receive what is pushed into the repository" msgstr "接收推送到仓库中的对象" -#: command-list.h:149 +#: command-list.h:150 msgid "Manage reflog information" msgstr "管理 reflog 信息" -#: command-list.h:150 +#: command-list.h:151 msgid "Manage set of tracked repositories" msgstr "管理已跟踪仓库" -#: command-list.h:151 +#: command-list.h:152 msgid "Pack unpacked objects in a repository" msgstr "打包仓库中未打包对象" -#: command-list.h:152 +#: command-list.h:153 msgid "Create, list, delete refs to replace objects" msgstr "创建、列出、删除对象替换引用" -#: command-list.h:153 +#: command-list.h:154 msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" -#: command-list.h:154 +#: command-list.h:155 msgid "Reuse recorded resolution of conflicted merges" msgstr "重用冲突合并的解决方案记录" -#: command-list.h:155 +#: command-list.h:156 msgid "Reset current HEAD to the specified state" msgstr "重置当前 HEAD 到指定状态" -#: command-list.h:156 +#: command-list.h:157 msgid "Restore working tree files" msgstr "恢复工作区文件" -#: command-list.h:157 +#: command-list.h:158 msgid "Revert some existing commits" msgstr "回退一些现存提交" -#: command-list.h:158 +#: command-list.h:159 msgid "Lists commit objects in reverse chronological order" msgstr "按时间顺序列出提交对象" -#: command-list.h:159 +#: command-list.h:160 msgid "Pick out and massage parameters" msgstr "选出并处理参数" -#: command-list.h:160 +#: command-list.h:161 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引中删除文件" -#: command-list.h:161 +#: command-list.h:162 msgid "Send a collection of patches as emails" msgstr "通过电子邮件发送一组补丁" -#: command-list.h:162 +#: command-list.h:163 msgid "Push objects over Git protocol to another repository" msgstr "使用 Git 协议推送对象到另一个仓库" -#: command-list.h:163 +#: command-list.h:164 msgid "Restricted login shell for Git-only SSH access" msgstr "只允许 Git SSH 访问的受限登录shell" -#: command-list.h:164 +#: command-list.h:165 msgid "Summarize 'git log' output" msgstr "'git log' 输出摘要" -#: command-list.h:165 +#: command-list.h:166 msgid "Show various types of objects" msgstr "显示各种类型的对象" -#: command-list.h:166 +#: command-list.h:167 msgid "Show branches and their commits" msgstr "显示分支和提交" -#: command-list.h:167 +#: command-list.h:168 msgid "Show packed archive index" msgstr "显示打包归档索引" -#: command-list.h:168 +#: command-list.h:169 msgid "List references in a local repository" msgstr "显示本地仓库中的引用" -#: command-list.h:169 +#: command-list.h:170 msgid "Git's i18n setup code for shell scripts" msgstr "为 shell 脚本准备的 Git 国际化设置代码" -#: command-list.h:170 +#: command-list.h:171 msgid "Common Git shell script setup code" msgstr "常用的 Git shell 脚本设置代码" -#: command-list.h:171 +#: command-list.h:172 msgid "Initialize and modify the sparse-checkout" msgstr "初始化及修改稀疏检出" -#: command-list.h:172 +#: command-list.h:173 msgid "Stash the changes in a dirty working directory away" msgstr "贮藏脏工作区中的修改" -#: command-list.h:173 +#: command-list.h:174 msgid "Add file contents to the staging area" msgstr "将文件内容添加到索引" -#: command-list.h:174 +#: command-list.h:175 msgid "Show the working tree status" msgstr "显示工作区状态" -#: command-list.h:175 +#: command-list.h:176 msgid "Remove unnecessary whitespace" msgstr "删除不必要的空白字符" -#: command-list.h:176 +#: command-list.h:177 msgid "Initialize, update or inspect submodules" msgstr "初始化、更新或检查子模组" -#: command-list.h:177 +#: command-list.h:178 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subersion 仓库和 Git 之间的双向操作" -#: command-list.h:178 +#: command-list.h:179 msgid "Switch branches" msgstr "切换分支" -#: command-list.h:179 +#: command-list.h:180 msgid "Read, modify and delete symbolic refs" msgstr "读取、修改和删除符号引用" -#: command-list.h:180 +#: command-list.h:181 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" -#: command-list.h:181 +#: command-list.h:182 msgid "Creates a temporary file with a blob's contents" msgstr "用 blob 数据对象的内容创建一个临时文件" -#: command-list.h:182 +#: command-list.h:183 msgid "Unpack objects from a packed archive" msgstr "从打包文件中解压缩对象" -#: command-list.h:183 +#: command-list.h:184 msgid "Register file contents in the working tree to the index" msgstr "将工作区的文件内容注册到索引" -#: command-list.h:184 +#: command-list.h:185 msgid "Update the object name stored in a ref safely" msgstr "安全地更新存储于引用中的对象名称" -#: command-list.h:185 +#: command-list.h:186 msgid "Update auxiliary info file to help dumb servers" msgstr "更新辅助信息文件以帮助哑协议服务" -#: command-list.h:186 +#: command-list.h:187 msgid "Send archive back to git-archive" msgstr "将存档发送回 git-archive" -#: command-list.h:187 +#: command-list.h:188 msgid "Send objects packed back to git-fetch-pack" msgstr "将对象压缩包发送回 git-fetch-pack" -#: command-list.h:188 +#: command-list.h:189 msgid "Show a Git logical variable" msgstr "显示一个Git逻辑变量" -#: command-list.h:189 +#: command-list.h:190 msgid "Check the GPG signature of commits" msgstr "检查 GPG 提交签名" -#: command-list.h:190 +#: command-list.h:191 msgid "Validate packed Git archive files" msgstr "校验打包的Git存仓文件" -#: command-list.h:191 +#: command-list.h:192 msgid "Check the GPG signature of tags" msgstr "检查标签的 GPG 签名" -#: command-list.h:192 +#: command-list.h:193 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git web 界面（Git 仓库的 web 前端）" -#: command-list.h:193 +#: command-list.h:194 msgid "Show logs with difference each commit introduces" msgstr "显示每一个提交引入的差异日志" -#: command-list.h:194 +#: command-list.h:195 msgid "Manage multiple working trees" msgstr "管理多个工作区" -#: command-list.h:195 +#: command-list.h:196 msgid "Create a tree object from the current index" msgstr "从当前索引创建一个树对象" -#: command-list.h:196 +#: command-list.h:197 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: command-list.h:197 +#: command-list.h:198 msgid "Git command-line interface and conventions" msgstr "Git 命令行界面和约定" -#: command-list.h:198 +#: command-list.h:199 msgid "A Git core tutorial for developers" msgstr "面向开发人员的 Git 核心教程" -#: command-list.h:199 +#: command-list.h:200 msgid "Git for CVS users" msgstr "适合 CVS 用户的 Git 帮助" -#: command-list.h:200 +#: command-list.h:201 msgid "Tweaking diff output" msgstr "调整差异输出" -#: command-list.h:201 +#: command-list.h:202 msgid "A useful minimum set of commands for Everyday Git" msgstr "每一天 Git 的一组有用的最小命令集合" -#: command-list.h:202 +#: command-list.h:203 +msgid "Frequently asked questions about using Git" +msgstr "关于使用 Git 的常见问题" + +#: command-list.h:204 msgid "A Git Glossary" msgstr "Git 词汇表" -#: command-list.h:203 +#: command-list.h:205 msgid "Hooks used by Git" msgstr "Git 使用的钩子" -#: command-list.h:204 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: command-list.h:205 +#: command-list.h:207 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: command-list.h:206 +#: command-list.h:208 msgid "Git namespaces" msgstr "Git 名字空间" -#: command-list.h:207 +#: command-list.h:209 msgid "Git Repository Layout" msgstr "Git 仓库布局" -#: command-list.h:208 +#: command-list.h:210 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: command-list.h:209 +#: command-list.h:211 msgid "Mounting one repository inside another" msgstr "将一个仓库安装到另外一个仓库中" -#: command-list.h:210 +#: command-list.h:212 msgid "A tutorial introduction to Git: part two" msgstr "一个 Git 教程：第二部分" -#: command-list.h:211 +#: command-list.h:213 msgid "A tutorial introduction to Git" msgstr "一个 Git 教程" -#: command-list.h:212 +#: command-list.h:214 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" @@ -22813,20 +23113,20 @@ msgstr "未提供日志文件" msgid "cannot read $file for replaying" msgstr "不能读取 $file 来重放" -#: git-bisect.sh:232 +#: git-bisect.sh:233 msgid "?? what are you talking about?" msgstr "?? 您在说什么?" -#: git-bisect.sh:241 +#: git-bisect.sh:243 msgid "bisect run failed: no command provided." msgstr "二分查找运行失败：没有提供命令。" -#: git-bisect.sh:246 +#: git-bisect.sh:248 #, sh-format msgid "running $command" msgstr "运行 $command" -#: git-bisect.sh:253 +#: git-bisect.sh:255 #, sh-format msgid "" "bisect run failed:\n" @@ -22835,11 +23135,11 @@ msgstr "" "二分查找运行失败：\n" "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" -#: git-bisect.sh:279 +#: git-bisect.sh:281 msgid "bisect run cannot continue any more" msgstr "二分查找不能继续运行" -#: git-bisect.sh:285 +#: git-bisect.sh:287 #, sh-format msgid "" "bisect run failed:\n" @@ -22848,11 +23148,11 @@ msgstr "" "二分查找运行失败：\n" "'bisect_state $state' 退出码为 $res" -#: git-bisect.sh:292 +#: git-bisect.sh:294 msgid "bisect run success" msgstr "二分查找运行成功" -#: git-bisect.sh:300 +#: git-bisect.sh:302 msgid "We are not bisecting." msgstr "我们没有在二分查找。" @@ -22894,128 +23194,46 @@ msgstr "尝试和 $pretty_name 的简单合并" msgid "Simple merge did not work, trying automatic merge." msgstr "简单合并未生效，尝试自动合并。" -#: git-legacy-stash.sh:221 -msgid "Cannot remove temporary index (can't happen)" -msgstr "无法删除临时索引（不应发生）" - -#: git-legacy-stash.sh:272 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "无法用 $w_commit 更新 $ref_stash" - -#: git-legacy-stash.sh:324 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "错误：'stash push' 的未知选项：$option" - -#: git-legacy-stash.sh:356 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "保存工作目录和索引状态 $stash_msg" - -#: git-legacy-stash.sh:536 -#, sh-format -msgid "unknown option: $opt" -msgstr "未知选项: $opt" - -#: git-legacy-stash.sh:556 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "指定了太多的版本：$REV" - -#: git-legacy-stash.sh:571 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference 不是一个有效的引用" - -#: git-legacy-stash.sh:599 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' 不是贮藏式提交" - -#: git-legacy-stash.sh:610 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "'$args' 不是一个贮藏引用" - -#: git-legacy-stash.sh:618 -msgid "unable to refresh index" -msgstr "无法刷新索引" - -#: git-legacy-stash.sh:622 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "无法在合并过程应用贮藏" - -#: git-legacy-stash.sh:630 -msgid "Conflicts in index. Try without --index." -msgstr "索引中有冲突。尝试不使用 --index。" - -#: git-legacy-stash.sh:632 -msgid "Could not save index tree" -msgstr "不能保存索引树" - -#: git-legacy-stash.sh:641 -msgid "Could not restore untracked files from stash entry" -msgstr "无法从贮藏条目中恢复未跟踪文件" - -#: git-legacy-stash.sh:666 -msgid "Cannot unstage modified files" -msgstr "无法将修改的文件取消暂存" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "丢弃了 ${REV} ($s)" - -#: git-legacy-stash.sh:705 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "${REV}：无法丢弃贮藏条目" - -#: git-legacy-stash.sh:792 -msgid "(To restore them type \"git stash apply\")" -msgstr "（为恢复数据输入 \"git stash apply\"）" - -#: git-submodule.sh:203 +#: git-submodule.sh:205 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: git-submodule.sh:213 +#: git-submodule.sh:215 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:232 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:235 +#: git-submodule.sh:237 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" -#: git-submodule.sh:242 +#: git-submodule.sh:244 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' 没有检出的提交" -#: git-submodule.sh:273 +#: git-submodule.sh:275 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存仓库到索引" -#: git-submodule.sh:275 +#: git-submodule.sh:277 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" -#: git-submodule.sh:283 +#: git-submodule.sh:285 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" -#: git-submodule.sh:285 +#: git-submodule.sh:287 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23030,51 +23248,51 @@ msgstr "" "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" "或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。" -#: git-submodule.sh:291 +#: git-submodule.sh:293 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:303 +#: git-submodule.sh:305 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:308 +#: git-submodule.sh:310 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:317 +#: git-submodule.sh:319 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:590 +#: git-submodule.sh:592 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:600 +#: git-submodule.sh:602 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:605 +#: git-submodule.sh:607 #, 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:623 +#: git-submodule.sh:625 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1：" -#: git-submodule.sh:629 +#: git-submodule.sh:631 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23082,74 +23300,74 @@ msgid "" msgstr "" "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" -#: git-submodule.sh:636 +#: git-submodule.sh:638 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:637 +#: git-submodule.sh:639 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:641 +#: git-submodule.sh:643 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:642 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:649 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:648 +#: git-submodule.sh:650 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:653 +#: git-submodule.sh:655 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:654 +#: git-submodule.sh:656 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:685 +#: git-submodule.sh:687 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:896 +#: git-submodule.sh:878 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#: git-submodule.sh:948 +#: git-submodule.sh:930 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:968 +#: git-submodule.sh:950 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:971 +#: git-submodule.sh:953 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:974 +#: git-submodule.sh:956 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" @@ -23168,6 +23386,16 @@ msgstr "已应用 autostash。" msgid "Cannot store $stash_sha1" msgstr "不能存储 $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"应用 autostash 导致了冲突。\n" +"您的修改安全地保存在贮藏区中。\n" +"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" |