diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2020-12-07 08:10:10 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2020-12-27 19:23:27 +0800 |
commit | d13389bf27f1618525ab4c29c53aca1334fdfa74 (patch) | |
tree | 23dea20e2b8bc6820ab46511185d7c5e0932e4c7 /po/zh_CN.po | |
parent | Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-po (diff) | |
download | tgif-d13389bf27f1618525ab4c29c53aca1334fdfa74.tar.xz |
l10n: zh_CN: for git v2.30.0 l10n round 1 and 2
Translate 71 new messages (5037t0f0u) for git 2.30.0.
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r-- | po/zh_CN.po | 5063 |
1 files changed, 2588 insertions, 2475 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 068d71bf2e..b30a1e5704 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -124,7 +124,7 @@ # tagger | 打标签者 # topic branch | 主题分支 # track | 跟踪 -# trailer | 尾部署名 +# trailer | 尾注 # tree | 树(工作区或树对象) # tree object | 树对象 # tree-ish (also treeish) | 树对象(或可以解析为一树对象) @@ -140,8 +140,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-10-10 09:32+0800\n" -"PO-Revision-Date: 2020-10-10 09:43+0800\n" +"POT-Creation-Date: 2020-12-21 07:10+0800\n" +"PO-Revision-Date: 2020-12-26 21:43+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -150,200 +150,200 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "嗯(%s)?" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 -#: builtin/rebase.c:1944 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 msgid "could not read index" msgstr "不能读取索引" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "二进制" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "无" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "没有修改" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "更新" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 msgid "could not write index" msgstr "不能写入索引" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" -#: add-interactive.c:716 git-add--interactive.perl:678 +#: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "说明:%s 现已成为未跟踪的。\n" -#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "还原" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{tree}" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" -#: add-interactive.c:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "添加未跟踪的" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 个路径\n" msgstr[1] "增加了 %d 个路径\n" -#: add-interactive.c:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合入的:%s" -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" -#: add-interactive.c:935 git-add--interactive.perl:1381 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "补丁更新" -#: add-interactive.c:974 git-add--interactive.perl:1794 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "检视 diff" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "显示含变更的路径" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "将工作区状态添加到暂存区修改集中" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "将暂存的修改集恢复为 HEAD 版本" -#: add-interactive.c:1008 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "挑选数据块并有选择地更新" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "显示 HEAD 和索引的差异" -#: add-interactive.c:1012 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "将未跟踪文件的内容添加到暂存区修改集中" -#: add-interactive.c:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "帮助:" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "选择一个条目" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "选择一系列条目" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "选择多个范围" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "基于唯一前缀选择条目" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "反选指定的条目" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "选择所有条目" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "(空)结束选择" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "选择一个编号条目" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "(空)不选择任何内容" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "请选择" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "缓存" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "未缓存" -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -351,31 +351,31 @@ msgstr "未缓存" msgid "path" msgstr "路径" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c:34 git-add--interactive.perl:1431 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1434 +#: add-patch.c:35 git-add--interactive.perl:1432 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1435 +#: add-patch.c:36 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1436 +#: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " @@ -400,22 +400,22 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" -#: add-patch.c:56 git-add--interactive.perl:1439 +#: add-patch.c:56 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1440 +#: add-patch.c:57 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1441 +#: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1442 +#: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " @@ -440,22 +440,22 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" -#: add-patch.c:80 git-add--interactive.perl:1445 +#: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1446 +#: add-patch.c:81 git-add--interactive.perl:1444 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1447 +#: add-patch.c:82 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1448 +#: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " @@ -480,22 +480,22 @@ msgstr "" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" -#: add-patch.c:103 git-add--interactive.perl:1451 +#: add-patch.c:103 git-add--interactive.perl:1449 #, 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:104 git-add--interactive.perl:1452 +#: add-patch.c:104 git-add--interactive.perl:1450 #, 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:105 git-add--interactive.perl:1453 +#: add-patch.c:105 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1454 +#: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " @@ -520,26 +520,26 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:126 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, 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:127 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, 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:128 git-add--interactive.perl:1459 -#: git-add--interactive.perl:1477 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " @@ -564,22 +564,22 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, 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,?]? " @@ -598,22 +598,22 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, 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,?]? " @@ -679,7 +679,7 @@ msgid "" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" -#: add-patch.c:785 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" @@ -688,7 +688,7 @@ msgstr "" "预期上下文行 #%d 于\n" "%.*s" -#: add-patch.c:800 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -701,11 +701,11 @@ msgstr "" "\t不是结尾于:\n" "%.*s" -#: add-patch.c:1076 git-add--interactive.perl:1117 +#: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: add-patch.c:1080 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -719,7 +719,7 @@ msgstr "" "以 %c 开始的行将被删除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1094 git-add--interactive.perl:1131 +#: add-patch.c:1099 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -728,11 +728,11 @@ msgstr "" "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" "此次编辑被终止,该块不会被修改。\n" -#: add-patch.c:1127 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" -#: add-patch.c:1172 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" @@ -748,24 +748,24 @@ msgstr "'git apply --cached' 失败" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1241 git-add--interactive.perl:1244 +#: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " -#: add-patch.c:1284 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引!" -#: add-patch.c:1285 git-add--interactive.perl:1348 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么?" -#: add-patch.c:1292 git-add--interactive.perl:1351 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: add-patch.c:1349 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -787,73 +787,73 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: add-patch.c:1511 add-patch.c:1521 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "没有前一个块" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "没有下一个块" -#: add-patch.c:1532 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c:1543 git-add--interactive.perl:1608 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个块(<回车> 查看更多)? " -#: add-patch.c:1544 git-add--interactive.perl:1610 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "跳转到哪个块?" -#: add-patch.c:1555 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "无效数字:'%s'" -#: add-patch.c:1560 +#: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起,只有 %d 个可用块。" msgstr[1] "对不起,只有 %d 个可用块。" -#: add-patch.c:1569 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c:1575 git-add--interactive.perl:1663 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "使用正则表达式搜索?" -#: add-patch.c:1590 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s:%s" -#: add-patch.c:1607 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" -#: add-patch.c:1614 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "对不起,不能拆分这个块" -#: add-patch.c:1618 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" -#: add-patch.c:1622 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "对不起,不能编辑这个块" -#: add-patch.c:1674 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "'git apply' 失败" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" @@ -862,37 +862,37 @@ msgstr "" "\n" "使用 \"git config advice.%s false\" 来关闭此消息" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示:%.*s%s\n" -#: advice.c:247 +#: advice.c:250 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选,因为您有未合并的文件。" -#: advice.c:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交,因为您有未合并的文件。" -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并,因为您有未合并的文件。" -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取,因为您有未合并的文件。" -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退,因为您有未合并的文件。" -#: advice.c:257 +#: advice.c:260 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s,因为您有未合并的文件。" -#: advice.c:265 +#: advice.c:268 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." @@ -900,23 +900,23 @@ msgstr "" "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:278 builtin/merge.c:1349 +#: advice.c:281 builtin/merge.c:1369 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1194,7 +1194,7 @@ msgstr "打补丁失败:%s:%ld" msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" @@ -1214,7 +1214,7 @@ msgstr "路径 %s 已经被重命名/删除" msgid "%s: does not exist in index" msgstr "%s:不存在于索引中" -#: apply.c:3537 apply.c:3708 apply.c:3953 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "%s:和索引不匹配" @@ -1273,301 +1273,301 @@ msgstr "无效路径 '%s'" msgid "%s: already exists in index" msgstr "%s:已经存在于索引中" -#: apply.c:3956 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已经存在于工作区中" -#: apply.c:3976 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" -#: apply.c:3981 +#: apply.c:3979 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" -#: apply.c:4001 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:4005 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "%s:补丁未应用" -#: apply.c:4020 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." -#: apply.c:4112 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4119 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更,但它不在当前 HEAD 中" -#: apply.c:4122 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效(%s)。" -#: apply.c:4131 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4141 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4279 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4313 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4319 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4327 +#: apply.c:4325 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4333 apply.c:4478 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4376 builtin/bisect--helper.c:537 +#: apply.c:4374 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" -#: apply.c:4380 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4450 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4548 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4556 +#: apply.c:4554 msgid "internal error" msgstr "内部错误" -#: apply.c:4559 +#: apply.c:4557 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." -#: apply.c:4570 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4592 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4596 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4715 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4723 +#: apply.c:4726 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4743 +#: apply.c:4746 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4900 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s':%s" -#: apply.c:4927 +#: apply.c:4930 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4933 apply.c:4948 +#: apply.c:4936 apply.c:4951 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4941 +#: apply.c:4944 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后,应用了 %d 行。" msgstr[1] "修复空白错误后,应用了 %d 行。" -#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4985 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:4988 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4990 builtin/am.c:2279 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "数字" -#: apply.c:4991 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:4994 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:4996 +#: apply.c:4999 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" -#: apply.c:5000 +#: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:5002 +#: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁,而是显示输入的概要" -#: apply.c:5004 +#: apply.c:5007 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁,而是查看补丁是否可应用" -#: apply.c:5006 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:5008 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c:5010 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:5012 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:5015 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" -#: apply.c:5017 +#: apply.c:5020 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" -#: apply.c:5019 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:5024 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "动作" -#: apply.c:5026 +#: apply.c:5029 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:5029 apply.c:5032 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:5035 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "反向应用补丁" |