From 473eb54151ef8756fd2cfa1ef37d8b941a081049 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Thu, 4 Mar 2021 22:44:43 +0800 Subject: l10n: zh_CN: for git v2.31.0 l10n round 1 and 2 Translate 161 new messages (5104t0f0u) for git 2.31.0. Signed-off-by: Jiang Xin --- po/zh_CN.po | 9094 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 4723 insertions(+), 4371 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index b30a1e5704..fdaaea8197 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -92,6 +92,7 @@ # plumbing | 管件（Git 底层核心命令的别称） # porcelain | 瓷件（Git 上层封装命令的别称） # precious-objects repo | 珍品仓库 +# promisor | 承诺者 # prune | 清除 # pull | 拉，拉取 # push | 推，推送 @@ -140,8 +141,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2020-12-21 07:10+0800\n" -"PO-Revision-Date: 2020-12-26 21:43+0800\n" +"POT-Creation-Date: 2021-03-04 22:41+0800\n" +"PO-Revision-Date: 2021-03-14 23:21+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -155,9 +156,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: 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 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 +#: builtin/rebase.c:1963 msgid "could not read index" msgstr "不能读取索引" @@ -185,7 +186,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 msgid "could not write index" msgstr "不能写入索引" @@ -343,7 +344,7 @@ msgstr "未缓存" #: 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/fetch.c:150 builtin/merge.c:285 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 @@ -904,7 +905,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:281 builtin/merge.c:1369 +#: advice.c:281 builtin/merge.c:1370 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" @@ -1194,7 +1195,8 @@ msgstr "打补丁失败：%s:%ld" msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" @@ -1353,7 +1355,7 @@ msgstr "不能为新建文件 %s 创建后端存储" msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4374 builtin/bisect--helper.c:524 +#: apply.c:4374 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" @@ -1389,7 +1391,7 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" @@ -1443,7 +1445,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后，应用了 %d 行。" msgstr[1] "修复空白错误后，应用了 %d 行。" -#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -1511,7 +1513,7 @@ msgstr "如果一个补丁不能应用则尝试三方合并" msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" @@ -1521,7 +1523,7 @@ msgstr "确保至少匹配 行上下文" #: 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:1346 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 msgid "action" msgstr "动作" @@ -1549,9 +1551,9 @@ msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" @@ -1638,14 +1640,14 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list" msgid "cannot read %s" msgstr "不能读取 %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1138 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1139 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" @@ -1687,7 +1689,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:556 builtin/log.c:1765 +#: archive.c:556 builtin/log.c:1764 msgid "prefix" msgstr "前缀" @@ -1695,11 +1697,11 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "文件" @@ -1864,12 +1866,12 @@ msgstr "二分查找中：合并基线必须是经过测试的\n" msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:987 builtin/merge.c:152 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" @@ -1887,7 +1889,7 @@ msgstr "%s 同时为 %s 和 %s\n" #, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" @@ -1921,11 +1923,11 @@ msgstr "不能将 --contents 和最终的提交对象名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:267 +#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -2097,7 +2099,7 @@ msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2141,295 +2143,308 @@ msgstr "不能生成 pack-objects 进程" msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:379 -msgid "rev-list died" -msgstr "rev-list 终止" - -#: bundle.c:428 +#: bundle.c:386 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:498 +#: bundle.c:490 #, c-format msgid "unsupported bundle version %d" msgstr "不支持的归档包版本 %d" -#: bundle.c:500 +#: bundle.c:492 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "不能写入，归档包版本 %d 不支持算法 %s" -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:530 +#: bundle.c:539 msgid "Refusing to create empty bundle." msgstr "不能创建空的归档包。" -#: bundle.c:540 +#: bundle.c:549 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:565 +#: bundle.c:574 msgid "index-pack died" msgstr "index-pack 终止" +#: chunk-format.c:113 +msgid "terminating chunk id appears earlier than expected" +msgstr "终止块 ID 比预期更早出现" + +#: chunk-format.c:122 +#, c-format +msgid "improper chunk offset(s) % and %" +msgstr "不正确的块偏移 % 和 %" + +#: chunk-format.c:129 +#, c-format +msgid "duplicate chunk ID % found" +msgstr "发现重复的块ID %" + +#: chunk-format.c:143 +#, c-format +msgid "final chunk has non-zero id %" +msgstr "最终块有非零 ID %" + #: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit-graph.c:188 midx.c:47 +#: commit-graph.c:197 midx.c:46 msgid "invalid hash version" msgstr "无效的哈希版本" -#: commit-graph.c:246 +#: commit-graph.c:255 msgid "commit-graph file is too small" msgstr "提交图形文件太小" -#: commit-graph.c:311 +#: commit-graph.c:348 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交图形签名 %X 和签名 %X 不匹配" -#: commit-graph.c:318 +#: commit-graph.c:355 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交图形版本 %X 和版本 %X 不匹配" -#: commit-graph.c:325 +#: commit-graph.c:362 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" -#: commit-graph.c:342 +#: commit-graph.c:379 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "提交图形文件太小，容不下 %u 个块" -#: commit-graph.c:361 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "提交图形不正确的块偏移 %08x%08x" - -#: commit-graph.c:433 -#, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "提交图形块 id %08x 出现了多次" - -#: commit-graph.c:499 +#: commit-graph.c:472 msgid "commit-graph has no base graphs chunk" msgstr "提交图形没有基础图形块" -#: commit-graph.c:509 +#: commit-graph.c:482 msgid "commit-graph chain does not match" msgstr "提交图形链不匹配" -#: commit-graph.c:557 +#: commit-graph.c:530 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" -#: commit-graph.c:581 +#: commit-graph.c:554 msgid "unable to find all commit-graph files" msgstr "无法找到所有提交图形文件" -#: commit-graph.c:721 commit-graph.c:785 +#: commit-graph.c:735 commit-graph.c:772 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "无效的提交位置。提交图形可能已损坏" -#: commit-graph.c:742 +#: commit-graph.c:756 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:1036 builtin/am.c:1292 +#: commit-graph.c:789 +msgid "commit-graph requires overflow generation data but has none" +msgstr "提交图需要溢出世代数据，但是没有" + +#: commit-graph.c:1065 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1252 builtin/pack-objects.c:2864 +#: commit-graph.c:1327 builtin/pack-objects.c:2872 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:1283 +#: commit-graph.c:1358 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" -#: commit-graph.c:1300 +#: commit-graph.c:1375 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:1320 +#: commit-graph.c:1395 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" -#: commit-graph.c:1339 +#: commit-graph.c:1414 +msgid "Computing commit graph topological levels" +msgstr "正在计算提交图拓扑级别" + +#: commit-graph.c:1467 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:1406 +#: commit-graph.c:1548 msgid "Computing commit changed paths Bloom filters" msgstr "计算提交变更路径的布隆过滤器" -#: commit-graph.c:1483 +#: commit-graph.c:1625 msgid "Collecting referenced commits" msgstr "正在收集引用的提交" -#: commit-graph.c:1508 +#: commit-graph.c:1650 #, 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:1521 +#: commit-graph.c:1663 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:1525 +#: commit-graph.c:1667 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:1562 +#: commit-graph.c:1704 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" -#: commit-graph.c:1580 +#: commit-graph.c:1722 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" -#: commit-graph.c:1628 +#: commit-graph.c:1771 msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1670 midx.c:819 +#: commit-graph.c:1802 midx.c:794 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1683 +#: commit-graph.c:1815 msgid "unable to create temporary graph layer" msgstr "无法创建临时图层" -#: commit-graph.c:1688 +#: commit-graph.c:1820 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "无法为 '%s' 调整共享权限" -#: commit-graph.c:1758 +#: commit-graph.c:1879 #, 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:1803 +#: commit-graph.c:1915 msgid "unable to open commit-graph chain file" msgstr "无法打开提交图形链文件" -#: commit-graph.c:1819 +#: commit-graph.c:1931 msgid "failed to rename base commit-graph file" msgstr "无法重命名基础提交图形文件" -#: commit-graph.c:1839 +#: commit-graph.c:1951 msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" -#: commit-graph.c:1965 +#: commit-graph.c:2084 msgid "Scanning merged commits" msgstr "正在扫描合并提交" -#: commit-graph.c:2009 +#: commit-graph.c:2128 msgid "Merging commit-graph" msgstr "正在合并提交图形" -#: commit-graph.c:2115 +#: commit-graph.c:2235 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用" -#: commit-graph.c:2214 +#: commit-graph.c:2342 msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:2307 +#: commit-graph.c:2440 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:2317 +#: commit-graph.c:2450 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" -#: commit-graph.c:2327 commit-graph.c:2342 +#: commit-graph.c:2460 commit-graph.c:2475 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2334 +#: commit-graph.c:2467 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" -#: commit-graph.c:2352 +#: commit-graph.c:2485 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2367 +#: commit-graph.c:2500 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2374 +#: commit-graph.c:2507 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2384 +#: commit-graph.c:2517 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2393 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2407 +#: commit-graph.c:2540 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2412 +#: commit-graph.c:2545 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" -#: commit-graph.c:2416 +#: commit-graph.c:2549 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" -#: commit-graph.c:2432 +#: commit-graph.c:2566 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" -msgstr "提交图形中的提交 %s 的世代号是 %u != %u" +msgid "commit-graph generation for commit %s is % < %" +msgstr "提交图形中的提交 %s 的世代号是 % < %" -#: commit-graph.c:2438 +#: commit-graph.c:2572 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "提交图形中提交 %s 的提交日期是 % != %" -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 #: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" @@ -2460,27 +2475,27 @@ msgstr "" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" -#: commit.c:1172 +#: commit.c:1223 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: commit.c:1176 +#: commit.c:1227 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: commit.c:1179 +#: commit.c:1230 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" -#: commit.c:1182 +#: commit.c:1233 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: commit.c:1436 +#: commit.c:1487 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" @@ -2494,7 +2509,7 @@ msgstr "" msgid "memory exhausted" msgstr "内存耗尽" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2509,289 +2524,333 @@ msgstr "" "\t%2$s\n" "这可能是因为循环包含。" -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "无法扩展包含路径 '%s'" -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "相对路径的配置文件引用必须来自于文件" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "相对路径的配置文件条件引用必须来自于文件" -#: config.c:378 +#: config.c:396 +#, c-format +msgid "invalid config format: %s" +msgstr "无效的配置格式：%s" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "配置 '%.*s' 缺少环境变量名称" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "缺少环境变量 '%s' 于配置 '%.*s' " + +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "键名没有包含一个小节名称：%s" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名：%s" -#: config.c:408 sequencer.c:2580 +#: config.c:472 sequencer.c:2588 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" -#: config.c:414 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "无效键名（有换行符）：%s" -#: config.c:450 config.c:462 +#: config.c:511 +msgid "empty config key" +msgstr "空的配置键名" + +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "伪配置参数：%s" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "%s 中格式错误" -#: config.c:836 +#: config.c:622 +#, c-format +msgid "bogus count in %s" +msgstr "%s 中错误计数" + +#: config.c:626 +#, c-format +msgid "too many entries in %s" +msgstr "%s 中太多的条目" + +#: config.c:636 +#, c-format +msgid "missing config key %s" +msgstr "缺失配置键名 %s" + +#: config.c:644 +#, c-format +msgid "missing config value %s" +msgstr "缺失配置取值 %s" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "超出范围" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "无效的单位" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" -#: config.c:1013 +#: config.c:1163 #, 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:1016 +#: config.c:1166 #, 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:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" -#: config.c:1022 +#: config.c:1172 #, 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:1025 +#: config.c:1175 #, 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:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:1123 +#: config.c:1194 +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "'%2$s' 的错误的布尔取值 '%1$s'" + +#: config.c:1289 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展用户目录：'%s'" -#: config.c:1132 +#: config.c:1298 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" -#: config.c:1223 +#: config.c:1391 #, c-format msgid "abbrev length out of range: %d" msgstr "缩写长度超出范围：%d" -#: config.c:1237 config.c:1248 +#: config.c:1405 config.c:1416 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:1340 +#: config.c:1508 msgid "core.commentChar should only be one character" msgstr "core.commentChar 应该是一个字符" -#: config.c:1373 +#: config.c:1541 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1445 +#: config.c:1613 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式错误" -#: config.c:1471 +#: config.c:1639 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式错误：%s" -#: config.c:1472 +#: config.c:1640 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1533 builtin/pack-objects.c:3649 +#: config.c:1701 builtin/pack-objects.c:3666 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1655 +#: config.c:1823 #, c-format msgid "unable to load config blob object '%s'" msgstr "无法从数据对象 '%s' 加载配置" -#: config.c:1658 +#: config.c:1826 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 没有指向一个数据对象" -#: config.c:1675 +#: config.c:1843 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" -#: config.c:1705 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" -#: config.c:1759 +#: config.c:1927 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2122 +#: config.c:2290 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2296 +#: config.c:2464 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2341 +#: config.c:2509 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2387 +#: config.c:2555 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2389 +#: config.c:2557 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2473 +#: config.c:2641 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2505 +#: config.c:2673 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2534 +#: config.c:2702 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2786 config.c:3112 +#: config.c:2954 config.c:3280 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2797 +#: config.c:2965 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:2834 builtin/config.c:361 +#: config.c:3002 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:2859 +#: config.c:3027 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:2872 config.c:3125 +#: config.c:3040 config.c:3293 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:2883 +#: config.c:3051 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2892 config.c:3130 +#: config.c:3060 config.c:3298 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:2977 config.c:3227 +#: config.c:3145 config.c:3395 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:3011 +#: config.c:3179 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3103 +#: config.c:3271 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3270 +#: config.c:3438 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -2852,45 +2911,45 @@ msgstr "无效数据包" msgid "protocol error: unexpected '%s'" msgstr "协议错误：意外的 '%s'" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "服务器给出未知的对象格式 '%s'" -#: connect.c:500 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "无效的 ls-refs 响应：%s" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "在引用列表之后应该有一个 flush 包" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "在引用列表之后应该有响应结束包" -#: connect.c:640 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "不支持 '%s' 协议" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "无法为 socket 设置 SO_KEEPALIVE" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "查找 %s ..." -#: connect.c:735 +#: connect.c:761 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "无法查找 %s（端口 %s）（%s）" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" @@ -2899,7 +2958,7 @@ msgstr "" "完成。\n" "连接到 %s（端口 %s）... " -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2909,61 +2968,65 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 msgid "done." msgstr "完成。" -#: connect.c:798 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "无法查找 %s（%s）" -#: connect.c:804 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "未知端口 %s" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "已阻止奇怪的主机名 '%s'" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "已阻止奇怪的端口号 '%s'" -#: connect.c:953 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "不能启动代理 %s" -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "在 git:// 主机和仓库路径中禁止使用换行符" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "ssh 变体 'simple' 不支持 -4" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "ssh 变体 'simple' 不支持 -6" -#: connect.c:1248 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh 变体 'simple' 不支持设置端口" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "已阻止奇怪的路径名 '%s'" -#: connect.c:1408 +#: connect.c:1436 msgid "unable to fork" msgstr "无法 fork" -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在检查连通性" @@ -3223,6 +3286,11 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" +#: diff-merges.c:70 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "未知的 --diff-merges 取值：%s" + #: diff-lib.c:534 msgid "--merge-base does not work with ranges" msgstr "--merge-base 不适用于范围" @@ -3307,30 +3375,30 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4625 +#: diff.c:4628 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4628 +#: diff.c:4631 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4707 +#: diff.c:4710 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4755 +#: diff.c:4758 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" -#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" -#: diff.c:4792 +#: diff.c:4795 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3339,200 +3407,200 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4877 +#: diff.c:4880 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" -#: diff.c:4901 +#: diff.c:4904 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" -#: diff.c:4915 +#: diff.c:4918 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4965 diff.c:4971 +#: diff.c:4968 diff.c:4974 #, c-format msgid "%s expects / form" msgstr "%s 期望 / 格式" -#: diff.c:4983 +#: diff.c:4986 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" -#: diff.c:5004 +#: diff.c:5007 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" -#: diff.c:5023 +#: diff.c:5026 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c:5063 +#: diff.c:5066 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5099 diff.c:5119 +#: diff.c:5102 diff.c:5122 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" -#: diff.c:5223 +#: diff.c:5226 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "选项 -I 的正则表达式无效：'%s'" -#: diff.c:5272 +#: diff.c:5275 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5328 +#: diff.c:5331 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" -#: diff.c:5351 +#: diff.c:5367 msgid "Diff output format options" msgstr "差异输出格式化选项" -#: diff.c:5353 diff.c:5359 +#: diff.c:5369 diff.c:5375 msgid "generate patch" msgstr "生成补丁" -#: diff.c:5356 builtin/log.c:178 +#: diff.c:5372 builtin/log.c:179 msgid "suppress diff output" msgstr "不显示差异输出" -#: diff.c:5361 diff.c:5475 diff.c:5482 +#: diff.c:5377 diff.c:5491 diff.c:5498 msgid "" msgstr "" -#: diff.c:5362 diff.c:5365 +#: diff.c:5378 diff.c:5381 msgid "generate diffs with lines context" msgstr "生成含 行上下文的差异" -#: diff.c:5367 +#: diff.c:5383 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" -#: diff.c:5370 +#: diff.c:5386 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" -#: diff.c:5374 +#: diff.c:5390 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" -#: diff.c:5378 +#: diff.c:5394 msgid "machine friendly --stat" msgstr "机器友好的 --stat" -#: diff.c:5381 +#: diff.c:5397 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" -#: diff.c:5383 diff.c:5391 +#: diff.c:5399 diff.c:5407 msgid "..." msgstr "<参数1,参数2>..." -#: diff.c:5384 +#: diff.c:5400 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" -#: diff.c:5388 +#: diff.c:5404 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" -#: diff.c:5392 +#: diff.c:5408 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" -#: diff.c:5396 +#: diff.c:5412 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" -#: diff.c:5399 +#: diff.c:5415 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" -#: diff.c:5402 +#: diff.c:5418 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" -#: diff.c:5405 +#: diff.c:5421 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" -#: diff.c:5407 +#: diff.c:5423 msgid "[,[,]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" -#: diff.c:5408 +#: diff.c:5424 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" -#: diff.c:5410 diff.c:5413 diff.c:5416 +#: diff.c:5426 diff.c:5429 diff.c:5432 msgid "" msgstr "<宽度>" -#: diff.c:5411 +#: diff.c:5427 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" -#: diff.c:5414 +#: diff.c:5430 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" -#: diff.c:5417 +#: diff.c:5433 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" -#: diff.c:5419 +#: diff.c:5435 msgid "" msgstr "<次数>" -#: diff.c:5420 +#: diff.c:5436 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" -#: diff.c:5423 +#: diff.c:5439 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" -#: diff.c:5426 +#: diff.c:5442 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" -#: diff.c:5429 +#: diff.c:5445 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" -#: diff.c:5431 +#: diff.c:5447 msgid "show colored diff" msgstr "显示带颜色的差异" -#: diff.c:5432 +#: diff.c:5448 msgid "" msgstr "<类型>" -#: diff.c:5433 +#: diff.c:5449 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" -#: diff.c:5436 +#: diff.c:5452 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3540,299 +3608,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" -#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 msgid "" msgstr "<前缀>" -#: diff.c:5440 +#: diff.c:5456 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" -#: diff.c:5443 +#: diff.c:5459 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" -#: diff.c:5446 +#: diff.c:5462 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" -#: diff.c:5449 +#: diff.c:5465 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" -#: diff.c:5452 +#: diff.c:5468 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" -#: diff.c:5456 diff.c:5461 diff.c:5466 +#: diff.c:5472 diff.c:5477 diff.c:5482 msgid "" msgstr "<字符>" -#: diff.c:5457 +#: diff.c:5473 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" -#: diff.c:5462 +#: diff.c:5478 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" -#: diff.c:5467 +#: diff.c:5483 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" -#: diff.c:5470 +#: diff.c:5486 msgid "Diff rename options" msgstr "差异重命名选项" -#: diff.c:5471 +#: diff.c:5487 msgid "[/]" msgstr "[/]" -#: diff.c:5472 +#: diff.c:5488 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" -#: diff.c:5476 +#: diff.c:5492 msgid "detect renames" msgstr "检测重命名" -#: diff.c:5480 +#: diff.c:5496 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" -#: diff.c:5483 +#: diff.c:5499 msgid "detect copies" msgstr "检测拷贝" -#: diff.c:5487 +#: diff.c:5503 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" -#: diff.c:5489 +#: diff.c:5505 msgid "disable rename detection" msgstr "禁用重命名探测" -#: diff.c:5492 +#: diff.c:5508 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" -#: diff.c:5494 +#: diff.c:5510 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" -#: diff.c:5497 +#: diff.c:5513 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" -#: diff.c:5499 +#: diff.c:5515 msgid "Diff algorithm options" msgstr "差异算法选项" -#: diff.c:5501 +#: diff.c:5517 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" -#: diff.c:5504 +#: diff.c:5520 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" -#: diff.c:5507 +#: diff.c:5523 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" -#: diff.c:5510 +#: diff.c:5526 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" -#: diff.c:5513 +#: diff.c:5529 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" -#: diff.c:5516 +#: diff.c:5532 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" -#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 msgid "" msgstr "<正则>" -#: diff.c:5519 +#: diff.c:5535 msgid "ignore changes whose all lines match " msgstr "忽略所有行都和正则表达式匹配的变更" -#: diff.c:5522 +#: diff.c:5538 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" -#: diff.c:5525 +#: diff.c:5541 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" -#: diff.c:5529 +#: diff.c:5545 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c:5531 +#: diff.c:5547 msgid "" msgstr "<算法>" -#: diff.c:5532 +#: diff.c:5548 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: diff.c:5534 +#: diff.c:5550 msgid "" msgstr "<文本>" -#: diff.c:5535 +#: diff.c:5551 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" -#: diff.c:5537 diff.c:5546 diff.c:5549 +#: diff.c:5553 diff.c:5562 diff.c:5565 msgid "" msgstr "<模式>" -#: diff.c:5538 +#: diff.c:5554 msgid "show word diff, using to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" -#: diff.c:5541 +#: diff.c:5557 msgid "use to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" -#: diff.c:5544 +#: diff.c:5560 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" -#: diff.c:5547 +#: diff.c:5563 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" -#: diff.c:5550 +#: diff.c:5566 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" -#: diff.c:5553 +#: diff.c:5569 msgid "Other diff options" msgstr "其它差异选项" -#: diff.c:5555 +#: diff.c:5571 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" -#: diff.c:5559 +#: diff.c:5575 msgid "treat all files as text" msgstr "把所有文件当做文本处理" -#: diff.c:5561 +#: diff.c:5577 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" -#: diff.c:5563 +#: diff.c:5579 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" -#: diff.c:5565 +#: diff.c:5581 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" -#: diff.c:5567 +#: diff.c:5583 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" -#: diff.c:5569 +#: diff.c:5585 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" -#: diff.c:5571 +#: diff.c:5587 msgid "" msgstr "<何时>" -#: diff.c:5572 +#: diff.c:5588 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" -#: diff.c:5575 +#: diff.c:5591 msgid "" msgstr "<格式>" -#: diff.c:5576 +#: diff.c:5592 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" -#: diff.c:5580 +#: diff.c:5596 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" -#: diff.c:5583 +#: diff.c:5599 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" -#: diff.c:5585 +#: diff.c:5601 msgid "" msgstr "<字符串>" -#: diff.c:5586 +#: diff.c:5602 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" -#: diff.c:5589 +#: diff.c:5605 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" -#: diff.c:5592 +#: diff.c:5608 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" -#: diff.c:5595 +#: diff.c:5611 msgid "treat in -S as extended POSIX regular expression" msgstr "将 -S 的 当做扩展的 POSIX 正则表达式" -#: diff.c:5598 +#: diff.c:5614 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" -#: diff.c:5599 +#: diff.c:5615 diff.c:5618 +msgid "" +msgstr "<路径>" + +#: diff.c:5616 +msgid "show the change in the specified path first" +msgstr "先显示指定路径的变更" + +#: diff.c:5619 +msgid "skip the output to the specified path" +msgstr "跳过指定路径的输出" + +#: diff.c:5621 msgid "" msgstr "<对象 ID>" -#: diff.c:5600 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" -#: diff.c:5602 +#: diff.c:5624 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5603 +#: diff.c:5625 msgid "select files by diff type" msgstr "通过差异类型选择文件" -#: diff.c:5605 +#: diff.c:5627 msgid "" msgstr "<文件>" -#: diff.c:5606 +#: diff.c:5628 msgid "Output to a specific file" msgstr "输出到一个指定的文件" -#: diff.c:6263 +#: diff.c:6285 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多，略过不严格的重命名检查。" -#: diff.c:6266 +#: diff.c:6288 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多，只在修改的路径中查找拷贝。" -#: diff.c:6269 +#: diff.c:6291 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3843,10 +3923,15 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令 msgid "failed to read orderfile '%s'" msgstr "读取排序文件 '%s' 失败" -#: diffcore-rename.c:592 +#: diffcore-rename.c:786 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" +#: diffcore-rotate.c:29 +#, c-format +msgid "No such path '%s' in the diff" +msgstr "在差异中无此路径 '%s'" + #: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" @@ -3889,17 +3974,17 @@ msgstr "无法获得内核名称和信息" msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3520 +#: dir.c:3534 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3565 dir.c:3570 +#: dir.c:3579 dir.c:3584 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3599 +#: dir.c:3613 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" @@ -3918,12 +4003,12 @@ msgstr "过滤内容" msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" -#: environment.c:337 +#: environment.c:335 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能设置 GIT_DIR 为 '%s'" @@ -3958,32 +4043,32 @@ msgstr "无法写到远程" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:378 fetch-pack.c:1406 +#: fetch-pack.c:378 fetch-pack.c:1457 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:384 fetch-pack.c:1412 +#: fetch-pack.c:384 fetch-pack.c:1463 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:386 fetch-pack.c:1414 +#: fetch-pack.c:386 fetch-pack.c:1465 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:389 fetch-pack.c:1417 +#: fetch-pack.c:389 fetch-pack.c:1468 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:391 fetch-pack.c:1419 +#: fetch-pack.c:391 fetch-pack.c:1470 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:394 fetch-pack.c:1423 +#: fetch-pack.c:394 fetch-pack.c:1474 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" @@ -4021,171 +4106,175 @@ msgstr "标记 %s 为完成" msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:827 +#: fetch-pack.c:844 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:835 +#: fetch-pack.c:852 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:919 +#: fetch-pack.c:946 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:937 +#: fetch-pack.c:952 +msgid "fetch-pack: invalid index-pack output" +msgstr "fetch-pack：无效的 index-pack 输出" + +#: fetch-pack.c:969 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:939 +#: fetch-pack.c:971 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:982 +#: fetch-pack.c:1031 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 +#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 +#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 +#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 +#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 #, c-format msgid "Server supports %s" msgstr "服务器支持 %s" -#: fetch-pack.c:992 +#: fetch-pack.c:1041 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" -#: fetch-pack.c:1052 +#: fetch-pack.c:1101 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:1057 +#: fetch-pack.c:1106 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:1061 +#: fetch-pack.c:1110 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:1063 +#: fetch-pack.c:1112 msgid "Server does not support this repository's object format" msgstr "服务器不支持这个仓库的对象格式" -#: fetch-pack.c:1076 +#: fetch-pack.c:1125 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:1088 fetch-pack.c:1628 +#: fetch-pack.c:1138 fetch-pack.c:1682 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1214 +#: fetch-pack.c:1265 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "不匹配的算法：客户端 %s，服务端 %s" -#: fetch-pack.c:1218 +#: fetch-pack.c:1269 #, c-format msgid "the server does not support algorithm '%s'" msgstr "服务器不支持算法 '%s'" -#: fetch-pack.c:1238 +#: fetch-pack.c:1289 msgid "Server does not support shallow requests" msgstr "服务器不支持 shalllow 请求" -#: fetch-pack.c:1245 +#: fetch-pack.c:1296 msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:1284 +#: fetch-pack.c:1335 msgid "unable to write request to remote" msgstr "无法将请求写到远程" -#: fetch-pack.c:1302 +#: fetch-pack.c:1353 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" -#: fetch-pack.c:1308 +#: fetch-pack.c:1359 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s'，得到 '%s'" -#: fetch-pack.c:1369 +#: fetch-pack.c:1420 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行：'%s'" -#: fetch-pack.c:1374 +#: fetch-pack.c:1425 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错：%d" -#: fetch-pack.c:1384 +#: fetch-pack.c:1435 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" -#: fetch-pack.c:1386 +#: fetch-pack.c:1437 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" -#: fetch-pack.c:1428 +#: fetch-pack.c:1479 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错：%d" -#: fetch-pack.c:1475 +#: fetch-pack.c:1526 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1480 +#: fetch-pack.c:1531 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1485 +#: fetch-pack.c:1536 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错：%d" -#: fetch-pack.c:1515 +#: fetch-pack.c:1566 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack：预期响应结束包" -#: fetch-pack.c:1897 +#: fetch-pack.c:1960 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1920 builtin/clone.c:693 +#: fetch-pack.c:1983 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:1947 +#: fetch-pack.c:2010 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:1950 +#: fetch-pack.c:2013 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" -#: gpg-interface.c:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "不能创建临时文件" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "gpg 数据签名失败" @@ -4194,7 +4283,7 @@ msgstr "gpg 数据签名失败" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" -#: grep.c:640 +#: grep.c:543 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" @@ -4202,18 +4291,18 @@ msgstr "" "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" "功能" -#: grep.c:2100 +#: grep.c:1906 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" -#: grep.c:2128 +#: grep.c:1934 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" @@ -4283,7 +4372,7 @@ msgstr "在 $PATH 路径中的其他地方可用的 git 命令" msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令：" -#: help.c:365 git.c:99 +#: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "不支持的命令列表类型 '%s'" @@ -4518,11 +4607,229 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "不能创建 '%s.lock'：%s" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "lsrefs.unborn 的取值 '%s' 无效" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "在 ls-refs 参数后应该有一个 flush 包" -#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#: merge-ort.c:888 merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "无法合并子模组 %s （没有检出）" + +#: merge-ort.c:897 merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "无法合并子模组 %s（提交不存在）" + +#: merge-ort.c:906 merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "无法合并子模组 %s （提交未跟随合并基线）" + +#: merge-ort.c:916 merge-ort.c:923 +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "注意：快进子模组 %s 到 %s" + +#: merge-ort.c:944 +#, c-format +msgid "Failed to merge submodule %s" +msgstr "无法合并子模组 %s" + +#: merge-ort.c:951 +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" +"无法合并子模组 %s，但是存在一个可能的合并方案：\n" +"%s\n" + +#: merge-ort.c:955 merge-recursive.c:1259 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"如果这个正确，将其添加到索引，例如使用命令：\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"以接受此建议。\n" + +#: merge-ort.c:968 +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" +"无法合并子模组 %s，但是存在多个可能的合并：\n" +"%s" + +#: merge-ort.c:1127 merge-recursive.c:1341 +msgid "Failed to execute internal merge" +msgstr "无法执行内部合并" + +#: merge-ort.c:1132 merge-recursive.c:1346 +#, c-format +msgid "Unable to add %s to database" +msgstr "不能添加 %s 至对象库" + +#: merge-ort.c:1139 merge-recursive.c:1378 +#, c-format +msgid "Auto-merging %s" +msgstr "自动合并 %s" + +#: merge-ort.c:1278 merge-recursive.c:2100 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" +"在：%s。" + +#: merge-ort.c:1288 merge-recursive.c:2110 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" +"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" +"径放置于此：%s" + +#: merge-ort.c:1471 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目录中，没有一个目标目录中包含多数文件。" + +#: merge-ort.c:1637 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-ort.c:1781 merge-recursive.c:3215 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" + +#: merge-ort.c:1788 merge-recursive.c:3222 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" +"动到 %5$s。" + +#: merge-ort.c:1801 merge-recursive.c:3218 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" +"到 %s。" + +#: merge-ort.c:1809 merge-recursive.c:3225 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" +"建议将其移动到 %5$s。" + +#: merge-ort.c:1952 +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。" + +#: merge-ort.c:2047 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这可能导致嵌套的冲突标签。" + +#: merge-ort.c:2066 merge-ort.c:2090 +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。" + +#: merge-ort.c:2735 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。" + +#: merge-ort.c:2808 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"of them so each can be recorded somewhere." +msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的%s以便每个被记录在不同位置。" + +#: merge-ort.c:2812 +msgid "both" +msgstr "双方" + +#: merge-ort.c:2812 +msgid "one" +msgstr "一个" + +#: merge-ort.c:2907 merge-recursive.c:3052 +msgid "content" +msgstr "内容" + +#: merge-ort.c:2909 merge-recursive.c:3056 +msgid "add/add" +msgstr "添加/添加" + +#: merge-ort.c:2911 merge-recursive.c:3101 +msgid "submodule" +msgstr "子模组" + +#: merge-ort.c:2913 merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "冲突（%s）：合并冲突于 %s" + +#: merge-ort.c:2938 +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本在树中被保留。" + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:3406 +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "无法收集树 %s、%s、%s 的合并信息" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3661 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4594,22 +4901,7 @@ msgstr "创建符号链接 '%s' 失败：%s" msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:1191 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "无法合并子模组 %s （没有检出）" - -#: merge-recursive.c:1198 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "无法合并子模组 %s（提交不存在）" - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "无法合并子模组 %s （提交未跟随合并基线）" - -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交：" @@ -4633,41 +4925,11 @@ msgstr "无法合并子模组 %s（非快进）" msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案：\n" -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"如果这个正确，将其添加到索引，例如使用命令：\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"以接受此建议。\n" - #: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "无法执行内部合并" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "不能添加 %s 至对象库" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "自动合并 %s" - #: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." @@ -4772,24 +5034,6 @@ msgstr "" "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" "其它目录，没有目录包含大部分文件。" -#: merge-recursive.c:2100 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" -"在：%s。" - -#: merge-recursive.c:2110 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" -"径放置于此：%s" - #: merge-recursive.c:2202 #, c-format msgid "" @@ -4799,13 +5043,6 @@ msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " "%4$s->%5$s" -#: 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:2973 #, c-format msgid "cannot read object %s" @@ -4824,68 +5061,16 @@ msgstr "修改" msgid "modified" msgstr "修改" -#: merge-recursive.c:3052 -msgid "content" -msgstr "内容" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "添加/添加" - #: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:3101 -msgid "submodule" -msgstr "子模组" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "冲突（%s）：合并冲突于 %s" - #: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:3215 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" - -#: merge-recursive.c:3218 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" -"到 %s。" - -#: merge-recursive.c:3222 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" -"动到 %5$s。" - -#: merge-recursive.c:3225 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" -"建议将其移动到 %5$s。" - #: merge-recursive.c:3339 #, c-format msgid "Removing %s" @@ -4919,27 +5104,28 @@ msgstr "冲突（add/add）：合并冲突于 %s" msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3550 +#: merge-recursive.c:3539 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:3563 +#: merge-recursive.c:3552 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:3613 +#: merge-recursive.c:3602 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3769 +#: merge-recursive.c:3758 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 +#: builtin/stash.c:471 msgid "Unable to write index." msgstr "不能写入索引。" @@ -4947,184 +5133,176 @@ msgstr "不能写入索引。" msgid "failed to read the cache" msgstr "读取缓存失败" -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: midx.c:80 +#: midx.c:62 +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "多包索引的对象ID扇出表大小错误" + +#: midx.c:93 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" -#: midx.c:96 +#: midx.c:109 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" -#: midx.c:101 +#: midx.c:114 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" -#: midx.c:106 +#: midx.c:119 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" -#: midx.c:123 -msgid "invalid chunk offset (too large)" -msgstr "无效的块偏移（太大）" - -#: midx.c:147 -msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "终止多包索引块 id 出现时间早于预期" - -#: midx.c:160 +#: midx.c:136 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" -#: midx.c:162 +#: midx.c:138 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的对象 ID 扇出块" -#: midx.c:164 +#: midx.c:140 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的对象 ID 查询块" -#: midx.c:166 +#: midx.c:142 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" -#: midx.c:180 +#: midx.c:158 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序：'%s' 在 '%s' 之前" -#: midx.c:223 +#: midx.c:202 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" -#: midx.c:273 +#: midx.c:252 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" -#: midx.c:480 +#: midx.c:467 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" -#: midx.c:486 +#: midx.c:473 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" -#: midx.c:546 +#: midx.c:533 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:846 +#: midx.c:821 msgid "Adding packfiles to multi-pack-index" msgstr "添加包文件到多包索引" -#: midx.c:879 +#: midx.c:855 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" -#: midx.c:931 +#: midx.c:904 msgid "no pack files to index." msgstr "没有要索引的包文件。" -#: midx.c:982 -msgid "Writing chunks to multi-pack-index" -msgstr "写入块到多包索引" - -#: midx.c:1060 +#: midx.c:965 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:1116 +#: midx.c:1021 msgid "multi-pack-index file exists, but failed to parse" msgstr "多包索引文件存在，但无法解析" -#: midx.c:1124 +#: midx.c:1029 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c:1139 +#: midx.c:1044 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = % > % = fanout[%d]" -#: midx.c:1144 +#: midx.c:1049 msgid "the midx contains no oid" msgstr "midx 不包含 oid" -#: midx.c:1153 +#: midx.c:1058 msgid "Verifying OID order in multi-pack-index" msgstr "校验多包索引中的 OID 顺序" -#: midx.c:1162 +#: midx.c:1067 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1182 +#: midx.c:1087 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" -#: midx.c:1189 +#: midx.c:1094 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1205 +#: midx.c:1110 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1211 +#: midx.c:1116 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1220 +#: midx.c:1125 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "oid[%d] = %s 错误的对象偏移：% != %" -#: midx.c:1245 +#: midx.c:1150 msgid "Counting referenced objects" msgstr "正在对引用对象计数" -#: midx.c:1255 +#: midx.c:1160 msgid "Finding and deleting unreferenced packfiles" msgstr "正在查找和删除未引用的包文件" -#: midx.c:1446 +#: midx.c:1351 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" -#: midx.c:1466 +#: midx.c:1371 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" -#: name-hash.c:537 +#: name-hash.c:538 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "不能创建 lazy_dir 线程：%s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "不能创建 lazy_name 线程：%s" -#: name-hash.c:565 +#: name-hash.c:566 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "不能加入 lasy_name 线程：%s" @@ -5168,2933 +5346,2996 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object.c:53 +#: object-file.c:480 #, c-format -msgid "invalid object type \"%s\"" -msgstr "无效的对象类型 \"%s\"" +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" -#: object.c:173 +#: object-file.c:531 #, c-format -msgid "object %s is a %s, not a %s" -msgstr "对象 %s 是一个 %s，不是一个 %s" +msgid "unable to normalize alternate object path: %s" +msgstr "无法规范化备用对象路径：%s" -#: object.c:233 +#: object-file.c:603 #, c-format -msgid "object %s has unknown type id %d" -msgstr "对象 %s 有未知的类型 id %d" +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s：忽略备用对象库，嵌套太深" -#: object.c:246 +#: object-file.c:610 #, c-format -msgid "unable to parse object: %s" -msgstr "不能解析对象：%s" +msgid "unable to normalize object directory: %s" +msgstr "无法规范化对象目录: %s" -#: object.c:266 object.c:278 -#, c-format -msgid "hash mismatch %s" -msgstr "哈希值与 %s 不匹配" +#: object-file.c:653 +msgid "unable to fdopen alternates lockfile" +msgstr "无法 fdopen 替换锁文件" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 -#, c-format -msgid "unable to get size of %s" -msgstr "无法得到 %s 的大小" +#: object-file.c:671 +msgid "unable to read alternates file" +msgstr "无法读取替代文件" -#: packfile.c:615 -msgid "offset before end of packfile (broken .idx?)" -msgstr "偏移量在包文件结束之前（损坏的 .idx？）" +#: object-file.c:678 +msgid "unable to move new alternates file into place" +msgstr "无法将新的替代文件移动到位" -#: packfile.c:1907 +#: object-file.c:713 #, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" +msgid "path '%s' does not exist" +msgstr "路径 '%s' 不存在" -#: packfile.c:1911 +#: object-file.c:734 #, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: parse-options-cb.c:20 parse-options-cb.c:24 +#: object-file.c:740 #, c-format -msgid "option `%s' expects a numerical value" -msgstr "选项 `%s' 期望一个数字值" +msgid "reference repository '%s' is not a local repository." +msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: parse-options-cb.c:41 +#: object-file.c:746 #, c-format -msgid "malformed expiration date '%s'" -msgstr "格式错误的到期时间：'%s'" +msgid "reference repository '%s' is shallow" +msgstr "参考仓库 '%s' 是一个浅克隆" -#: parse-options-cb.c:54 +#: object-file.c:754 #, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" +msgid "reference repository '%s' is grafted" +msgstr "参考仓库 '%s' 已被移植" -#: parse-options-cb.c:132 parse-options-cb.c:149 +#: object-file.c:814 #, c-format -msgid "malformed object name '%s'" -msgstr "格式错误的对象名 '%s'" +msgid "invalid line while parsing alternate refs: %s" +msgstr "解析备用引用时无效的行：%s" -#: parse-options.c:38 +#: object-file.c:964 #, c-format -msgid "%s requires a value" -msgstr "%s 需要一个值" +msgid "attempting to mmap % over limit %" +msgstr "尝试 mmap %，超过了最大值 %" -#: parse-options.c:73 -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s 与 %s 不兼容" +#: object-file.c:985 +msgid "mmap failed" +msgstr "mmap 失败" -#: parse-options.c:78 +#: object-file.c:1149 #, c-format -msgid "%s : incompatible with something else" -msgstr "%s：和其它的不兼容" +msgid "object file %s is empty" +msgstr "对象文件 %s 为空" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: object-file.c:1284 object-file.c:2477 #, c-format -msgid "%s takes no value" -msgstr "%s 不取值" +msgid "corrupt loose object '%s'" +msgstr "损坏的松散对象 '%s'" -#: parse-options.c:94 +#: object-file.c:1286 object-file.c:2481 #, c-format -msgid "%s isn't available" -msgstr "%s 不可用" +msgid "garbage at end of loose object '%s'" +msgstr "松散对象 '%s' 后面有垃圾数据" -#: parse-options.c:217 -#, c-format -msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" +#: object-file.c:1328 +msgid "invalid object type" +msgstr "无效的对象类型" -#: parse-options.c:386 +#: object-file.c:1412 #, c-format -msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" -#: parse-options.c:420 parse-options.c:428 +#: object-file.c:1415 #, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "你的意思是 `--%s`（有两个短线）？" +msgid "unable to unpack %s header" +msgstr "无法解开 %s 头部" -#: parse-options.c:666 parse-options.c:971 +#: object-file.c:1421 #, c-format -msgid "alias of --%s" -msgstr "--%s 的别名" +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" -#: parse-options.c:862 +#: object-file.c:1424 #, c-format -msgid "unknown option `%s'" -msgstr "未知选项 `%s'" +msgid "unable to parse %s header" +msgstr "无法解析 %s 头部" -#: parse-options.c:864 +#: object-file.c:1651 #, c-format -msgid "unknown switch `%c'" -msgstr "未知开关 `%c'" +msgid "failed to read object %s" +msgstr "读取对象 %s 失败" -#: parse-options.c:866 +#: object-file.c:1655 #, c-format -msgid "unknown non-ascii option in string: `%s'" -msgstr "字符串中未知的非 ascii 字符选项：`%s'" +msgid "replacement %s not found for %s" +msgstr "找不到 %2$s 的替代 %1$s" -#: parse-options.c:890 -msgid "..." -msgstr "..." +#: object-file.c:1659 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "松散对象 %s（保存在 %s）已损坏" -#: parse-options.c:909 +#: object-file.c:1663 #, c-format -msgid "usage: %s" -msgstr "用法：%s" +msgid "packed object %s (stored in %s) is corrupt" +msgstr "打包对象 %s（保存在 %s）已损坏" -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation. -#. -#: parse-options.c:915 +#: object-file.c:1768 #, c-format -msgid " or: %s" -msgstr " 或：%s" +msgid "unable to write file %s" +msgstr "无法写文件 %s" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:918 +#: object-file.c:1775 #, c-format -msgid " %s" -msgstr " %s" +msgid "unable to set permission to '%s'" +msgstr "无法为 '%s' 设置权限" -#: parse-options.c:957 -msgid "-NUM" -msgstr "-数字" +#: object-file.c:1782 +msgid "file write error" +msgstr "文件写错误" -#: path.c:915 +#: object-file.c:1802 +msgid "error when closing loose object file" +msgstr "关闭松散对象文件时出错" + +#: object-file.c:1867 #, c-format -msgid "Could not make %s writable by group" -msgstr "不能设置 %s 为组可写" +msgid "insufficient permission for adding an object to repository database %s" +msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: pathspec.c:130 -msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" +#: object-file.c:1869 +msgid "unable to create temporary file" +msgstr "无法创建临时文件" -#: pathspec.c:148 -msgid "Only one 'attr:' specification is allowed." -msgstr "只允许一个 'attr:' 规格。" +#: object-file.c:1893 +msgid "unable to write loose object file" +msgstr "不能写松散对象文件" -#: pathspec.c:151 -msgid "attr spec must not be empty" -msgstr "属性规格不能为空" +#: object-file.c:1899 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "不能压缩新对象 %s（%d）" -#: pathspec.c:194 +#: object-file.c:1903 #, c-format -msgid "invalid attribute name %s" -msgstr "无效的属性名 %s" +msgid "deflateEnd on object %s failed (%d)" +msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: pathspec.c:259 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" +#: object-file.c:1907 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: pathspec.c:266 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" -msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" +#: object-file.c:1917 builtin/pack-objects.c:1097 +#, c-format +msgid "failed utime() on %s" +msgstr "在 %s 上调用 utime() 失败" -#: pathspec.c:306 -msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "路径规格包含无效的神奇前缀" +#: object-file.c:1994 +#, c-format +msgid "cannot read object for %s" +msgstr "不能读取对象 %s" -#: pathspec.c:327 +#: object-file.c:2045 +msgid "corrupt commit" +msgstr "损坏的提交" + +#: object-file.c:2053 +msgid "corrupt tag" +msgstr "损坏的标签" + +#: object-file.c:2153 #, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" +msgid "read error while indexing %s" +msgstr "索引 %s 时读取错误" -#: pathspec.c:332 +#: object-file.c:2156 #, c-format -msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" +msgid "short read while indexing %s" +msgstr "索引 %s 时读入不完整" -#: pathspec.c:370 +#: object-file.c:2229 object-file.c:2239 #, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" +msgid "%s: failed to insert into database" +msgstr "%s：插入数据库失败" -#: pathspec.c:429 +#: object-file.c:2245 #, c-format -msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "%s：'literal' 和 'glob' 不兼容" +msgid "%s: unsupported file type" +msgstr "%s：不支持的文件类型" -#: pathspec.c:445 +#: object-file.c:2269 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s：'%s' 在位于 '%s' 的仓库之外" +msgid "%s is not a valid object" +msgstr "%s 不是一个有效的对象" -#: pathspec.c:521 +#: object-file.c:2271 #, c-format -msgid "'%s' (mnemonic: '%c')" -msgstr "'%s'（助记符：'%c'）" +msgid "%s is not a valid '%s' object" +msgstr "%s 不是一个有效的 '%s' 对象" -#: pathspec.c:531 +#: object-file.c:2298 builtin/index-pack.c:192 #, c-format -msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s：路径规格神奇前缀不被此命令支持：%s" +msgid "unable to open %s" +msgstr "不能打开 %s" -#: pathspec.c:598 +#: object-file.c:2488 object-file.c:2541 #, c-format -msgid "pathspec '%s' is beyond a symbolic link" -msgstr "路径规格 '%s' 位于符号链接中" +msgid "hash mismatch for %s (expected %s)" +msgstr "%s 的哈希值不匹配（预期 %s）" -#: pathspec.c:643 +#: object-file.c:2512 #, c-format -msgid "line is badly quoted: %s" -msgstr "行被错误地引用：%s" +msgid "unable to mmap %s" +msgstr "不能 mmap %s" -#: pkt-line.c:92 -msgid "unable to write flush packet" -msgstr "无法写 flush 包" +#: object-file.c:2517 +#, c-format +msgid "unable to unpack header of %s" +msgstr "无法解压缩 %s 的头部" -#: pkt-line.c:99 -msgid "unable to write delim packet" -msgstr "无法写 delim 包" +#: object-file.c:2523 +#, c-format +msgid "unable to parse header of %s" +msgstr "无法解析 %s 的头部" -#: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "无法写入无状态分隔符数据包" +#: object-file.c:2534 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "无法解压缩 %s 的内容" -#: pkt-line.c:113 -msgid "flush packet write failed" -msgstr "flush 包写错误" +#: object-name.c:486 +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "短对象ID %s 存在歧义" -#: pkt-line.c:153 pkt-line.c:239 -msgid "protocol error: impossibly long line" -msgstr "协议错误：不可能的长行" +#: object-name.c:497 +msgid "The candidates are:" +msgstr "候选者有：" -#: pkt-line.c:169 pkt-line.c:171 -msgid "packet write with format failed" -msgstr "格式化包写入错误" +#: object-name.c:796 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n" +"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n" +"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n" +"false\" 命令关闭本消息通知。" -#: pkt-line.c:203 -msgid "packet write failed - data exceeds max packet size" -msgstr "写数据包失败：数据超过了包的最大长度" +#: object-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "'%.*s' 的日志仅能回到 %s" -#: pkt-line.c:210 pkt-line.c:217 -msgid "packet write failed" -msgstr "数据包写入失败" +#: object-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "'%.*s' 的日志仅有 %d 个条目" -#: pkt-line.c:302 -msgid "read error" -msgstr "读取错误" +#: object-name.c:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中" -#: pkt-line.c:310 -msgid "the remote end hung up unexpectedly" -msgstr "远端意外挂断了" +#: object-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"路径 '%s' 存在，而 '%s' 不存在\n" +"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？" -#: pkt-line.c:338 +#: object-name.c:1717 #, c-format -msgid "protocol error: bad line length character: %.4s" -msgstr "协议错误：错误的行长度字符串：%.4s" +msgid "path '%s' does not exist in '%.*s'" +msgstr "路径 '%s' 不在 '%.*s' 中" -#: pkt-line.c:352 pkt-line.c:357 +#: object-name.c:1745 #, c-format -msgid "protocol error: bad line length %d" -msgstr "协议错误：错误的行长度 %d" +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"路径 '%s' 在索引中，但不在暂存区 %d 中\n" +"提示：您的意思是 ':%d:%s'？" -#: pkt-line.c:373 sideband.c:165 +#: object-name.c:1761 #, c-format -msgid "remote error: %s" -msgstr "远程错误：%s" +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"路径 '%s' 在索引中，但 '%s' 不在\n" +"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？" -#: preload-index.c:119 -msgid "Refreshing index" -msgstr "正在刷新索引" +#: object-name.c:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "路径 '%s' 在磁盘上，但不在索引里" -#: preload-index.c:138 +#: object-name.c:1771 #, c-format -msgid "unable to create threaded lstat: %s" -msgstr "无法创建线程 lstat：%s" +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）" -#: pretty.c:983 -msgid "unable to parse --pretty format" -msgstr "不能解析 --pretty 格式" +#: object-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "不能在工作区之外使用相对路径语法" -#: promisor-remote.c:30 -msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "promisor-remote：无法派生 fetch 子进程" +#: object-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "无效的对象名 '%.*s'。" -#: promisor-remote.c:35 promisor-remote.c:37 -msgid "promisor-remote: could not write to fetch subprocess" -msgstr "promisor-remote：无法向 fetch 子进程写入" +#: object.c:53 +#, c-format +msgid "invalid object type \"%s\"" +msgstr "无效的对象类型 \"%s\"" -#: promisor-remote.c:41 -msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" +#: object.c:173 +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "对象 %s 是一个 %s，不是一个 %s" -#: promisor-remote.c:53 +#: object.c:233 #, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "promisor 远程名称不能以 '/' 开始：%s" +msgid "object %s has unknown type id %d" +msgstr "对象 %s 有未知的类型 id %d" -#: prune-packed.c:35 -msgid "Removing duplicate objects" -msgstr "正在删除重复对象" +#: object.c:246 +#, c-format +msgid "unable to parse object: %s" +msgstr "不能解析对象：%s" -#: range-diff.c:77 -msgid "could not start `log`" -msgstr "不能启动 `log`" +#: object.c:266 object.c:278 +#, c-format +msgid "hash mismatch %s" +msgstr "哈希值与 %s 不匹配" -#: range-diff.c:79 -msgid "could not read `log` output" -msgstr "不能读取 `log` 的输出" +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#, c-format +msgid "unable to get size of %s" +msgstr "无法得到 %s 的大小" -#: range-diff.c:98 sequencer.c:5310 +#: pack-bitmap.c:1489 builtin/rev-list.c:92 #, c-format -msgid "could not parse commit '%s'" -msgstr "不能解析提交 '%s'" +msgid "unable to get disk usage of %s" +msgstr "无法得到 %s 的磁盘使用量" -#: range-diff.c:112 +#: pack-revindex.c:220 #, c-format -msgid "" -"could not parse first line of `log` output: did not start with 'commit ': " -"'%s'" -msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'" +msgid "reverse-index file %s is too small" +msgstr "反向索引文件 %s 太小" -#: range-diff.c:137 +#: pack-revindex.c:225 #, c-format -msgid "could not parse git header '%.*s'" -msgstr "无法解析 git 头 '%.*s'" +msgid "reverse-index file %s is corrupt" +msgstr "反向索引文件 %s 损坏" -#: range-diff.c:299 -msgid "failed to generate diff" -msgstr "生成 diff 失败" +#: pack-revindex.c:233 +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "反向索引文件 %s 有错误的签名" -#: range-diff.c:532 range-diff.c:534 +#: pack-revindex.c:237 #, c-format -msgid "could not parse log for '%s'" -msgstr "不能解析 '%s' 的日志" +msgid "reverse-index file %s has unsupported version %" +msgstr "反向索引文件 %s 不支持的版本 %" -#: read-cache.c:682 +#: pack-revindex.c:242 #, c-format -msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" +msgid "reverse-index file %s has unsupported hash id %" +msgstr "反向索引文件 %s 有不支持的哈希 ID %" -#: read-cache.c:698 -msgid "cannot create an empty blob in the object database" -msgstr "不能在对象数据库中创建空的数据对象" +#: pack-write.c:236 +msgid "cannot both write and verify reverse index" +msgstr "无法同时写入和校验反向索引" -#: read-cache.c:720 +#: pack-write.c:257 #, c-format -msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s：只能添加常规文件、符号链接或 git 目录" +msgid "could not stat: %s" +msgstr "不能调用 stat：%s" -#: read-cache.c:725 +#: pack-write.c:269 #, c-format -msgid "'%s' does not have a commit checked out" -msgstr "'%s' 没有检出一个提交" +msgid "failed to make %s readable" +msgstr "无法设置 %s 为可读" -#: read-cache.c:777 +#: pack-write.c:508 #, c-format -msgid "unable to index file '%s'" -msgstr "无法索引文件 '%s'" +msgid "could not write '%s' promisor file" +msgstr "无法写入 '%s' 承诺者文件" -#: read-cache.c:796 -#, c-format -msgid "unable to add '%s' to index" -msgstr "无法在索引中添加 '%s'" +#: packfile.c:625 +msgid "offset before end of packfile (broken .idx?)" +msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: read-cache.c:807 +#: packfile.c:1934 #, c-format -msgid "unable to stat '%s'" -msgstr "无法对 %s 执行 stat" +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: read-cache.c:1318 +#: packfile.c:1938 #, c-format -msgid "'%s' appears as both a file and as a directory" -msgstr "'%s' 看起来既是文件又是目录" +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" -#: read-cache.c:1524 -msgid "Refresh index" -msgstr "刷新索引" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "选项 `%s' 期望一个数字值" -#: read-cache.c:1639 +#: parse-options-cb.c:41 #, c-format -msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"设置了 index.version，但是取值无效。\n" -"使用版本 %i" +msgid "malformed expiration date '%s'" +msgstr "格式错误的到期时间：'%s'" -#: read-cache.c:1649 +#: parse-options-cb.c:54 #, c-format -msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"设置了 GIT_INDEX_VERSION，但是取值无效。\n" -"使用版本 %i" +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" -#: read-cache.c:1705 +#: parse-options-cb.c:132 parse-options-cb.c:149 #, c-format -msgid "bad signature 0x%08x" -msgstr "坏的签名 0x%08x" +msgid "malformed object name '%s'" +msgstr "格式错误的对象名 '%s'" -#: read-cache.c:1708 +#: parse-options.c:38 #, c-format -msgid "bad index version %d" -msgstr "坏的索引版本 %d" +msgid "%s requires a value" +msgstr "%s 需要一个值" -#: read-cache.c:1717 -msgid "bad index file sha1 signature" -msgstr "坏的索引文件 sha1 签名" +#: parse-options.c:73 +#, c-format +msgid "%s is incompatible with %s" +msgstr "%s 与 %s 不兼容" -#: read-cache.c:1747 +#: parse-options.c:78 #, c-format -msgid "index uses %.4s extension, which we do not understand" -msgstr "索引使用不被支持的 %.4s 扩展" +msgid "%s : incompatible with something else" +msgstr "%s：和其它的不兼容" -# -#: read-cache.c:1749 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format -msgid "ignoring %.4s extension" -msgstr "忽略 %.4s 扩展" +msgid "%s takes no value" +msgstr "%s 不取值" -#: read-cache.c:1786 +#: parse-options.c:94 #, c-format -msgid "unknown index entry format 0x%08x" -msgstr "未知的索引条目格式 0x%08x" +msgid "%s isn't available" +msgstr "%s 不可用" -#: read-cache.c:1802 +#: parse-options.c:217 #, c-format -msgid "malformed name field in the index, near path '%s'" -msgstr "索引中靠近路径 '%s' 有错误的名称字段" +msgid "%s expects a non-negative integer value with an optional k/m/g suffix" +msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" -#: read-cache.c:1859 -msgid "unordered stage entries in index" -msgstr "索引中有未排序的暂存条目" +#: parse-options.c:386 +#, c-format +msgid "ambiguous option: %s (could be --%s%s or --%s%s)" +msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" -#: read-cache.c:1862 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "multiple stage entries for merged file '%s'" -msgstr "合并文件 '%s' 有多个暂存条目" +msgid "did you mean `--%s` (with two dashes)?" +msgstr "你的意思是 `--%s`（有两个短线）？" -#: read-cache.c:1865 +#: parse-options.c:666 parse-options.c:971 #, c-format -msgid "unordered stage entries for '%s'" -msgstr "'%s' 的未排序暂存条目" +msgid "alias of --%s" +msgstr "--%s 的别名" -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 -msgid "index file corrupt" -msgstr "索引文件损坏" +#: parse-options.c:862 +#, c-format +msgid "unknown option `%s'" +msgstr "未知选项 `%s'" -#: read-cache.c:2115 +#: parse-options.c:864 #, c-format -msgid "unable to create load_cache_entries thread: %s" -msgstr "无法创建 load_cache_entries 线程：%s" +msgid "unknown switch `%c'" +msgstr "未知开关 `%c'" -#: read-cache.c:2128 +#: parse-options.c:866 #, c-format -msgid "unable to join load_cache_entries thread: %s" -msgstr "无法加入 load_cache_entries 线程：%s" +msgid "unknown non-ascii option in string: `%s'" +msgstr "字符串中未知的非 ascii 字符选项：`%s'" + +#: parse-options.c:890 +msgid "..." +msgstr "..." -#: read-cache.c:2161 +#: parse-options.c:909 #, c-format -msgid "%s: index file open failed" -msgstr "%s：打开索引文件失败" +msgid "usage: %s" +msgstr "用法：%s" -#: read-cache.c:2165 +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation. +#. +#: parse-options.c:915 #, c-format -msgid "%s: cannot stat the open index" -msgstr "%s：不能对打开的索引执行 stat 操作" +msgid " or: %s" +msgstr " 或：%s" -#: read-cache.c:2169 +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: parse-options.c:918 #, c-format -msgid "%s: index file smaller than expected" -msgstr "%s：索引文件比预期的小" +msgid " %s" +msgstr " %s" + +#: parse-options.c:957 +msgid "-NUM" +msgstr "-数字" -#: read-cache.c:2173 +#: path.c:915 #, c-format -msgid "%s: unable to map index file" -msgstr "%s：无法对索引文件执行 map 操作" +msgid "Could not make %s writable by group" +msgstr "不能设置 %s 为组可写" + +#: pathspec.c:130 +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" + +#: pathspec.c:148 +msgid "Only one 'attr:' specification is allowed." +msgstr "只允许一个 'attr:' 规格。" + +#: pathspec.c:151 +msgid "attr spec must not be empty" +msgstr "属性规格不能为空" -#: read-cache.c:2215 +#: pathspec.c:194 #, c-format -msgid "unable to create load_index_extensions thread: %s" -msgstr "无法创建 load_index_extensions 线程：%s" +msgid "invalid attribute name %s" +msgstr "无效的属性名 %s" + +#: pathspec.c:259 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" + +#: pathspec.c:266 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" + +#: pathspec.c:306 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "路径规格包含无效的神奇前缀" -#: read-cache.c:2242 +#: pathspec.c:327 #, c-format -msgid "unable to join load_index_extensions thread: %s" -msgstr "无法加入 load_index_extensions 线程：%s" +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" -#: read-cache.c:2274 +#: pathspec.c:332 #, c-format -msgid "could not freshen shared index '%s'" -msgstr "无法刷新共享索引 '%s'" +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" -#: read-cache.c:2321 +#: pathspec.c:370 #, c-format -msgid "broken index, expect %s in %s, got %s" -msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 +#: pathspec.c:429 #, c-format -msgid "could not close '%s'" -msgstr "不能关闭 '%s'" +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s：'literal' 和 'glob' 不兼容" -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 +#: pathspec.c:445 #, c-format -msgid "could not stat '%s'" -msgstr "不能对 '%s' 调用 stat" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s：'%s' 在位于 '%s' 的仓库之外" -#: read-cache.c:3133 +#: pathspec.c:521 #, c-format -msgid "unable to open git dir: %s" -msgstr "不能打开 git 目录：%s" +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s'（助记符：'%c'）" -#: read-cache.c:3145 +#: pathspec.c:531 #, c-format -msgid "unable to unlink: %s" -msgstr "无法删除：%s" +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "%s：路径规格神奇前缀不被此命令支持：%s" -#: read-cache.c:3170 +#: pathspec.c:598 #, c-format -msgid "cannot fix permission bits on '%s'" -msgstr "不能修复 '%s' 的权限位" +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "路径规格 '%s' 位于符号链接中" -#: read-cache.c:3319 +#: pathspec.c:643 #, c-format -msgid "%s: cannot drop to stage #0" -msgstr "%s：不能落到暂存区 #0" +msgid "line is badly quoted: %s" +msgstr "行被错误地引用：%s" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n" -"或者您可以用 'git rebase --abort' 终止变基。\n" +#: pkt-line.c:92 +msgid "unable to write flush packet" +msgstr "无法写 flush 包" -#: rebase-interactive.c:33 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" +#: pkt-line.c:99 +msgid "unable to write delim packet" +msgstr "无法写 delim 包" -#: rebase-interactive.c:42 -msgid "" -"\n" -"Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup = like \"squash\", but discard this commit's log message\n" -"x, exec = run command (the rest of the line) using shell\n" -"b, break = stop here (continue rebase later with 'git rebase --continue')\n" -"d, drop = remove commit\n" -"l, label