@matheusbsbs / matheus-bagliano / commits / 5d5cd454e9

l10n: zh_CN: updated translation for 2.47

Signed-off-by: Teng Long <dyroneteng@gmail.com>

Teng Long committed Oct 5, 2024 at 02:56 UTC 5d5cd454e973b5acff1cb07b4ae98d3d19c629c0
1 file changed +240 -72
po/zh_CN.po
+240 -72
@@ -154,8 +154,8 @@ msgid ""
154 msgstr ""
155 "Project-Id-Version: Git\n"
156 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
157 -"POT-Creation-Date: 2024-07-27 22:28+0800\n"
158 -"PO-Revision-Date: 2024-07-28 19:52+0800\n"
157 +"POT-Creation-Date: 2024-10-05 03:31+0800\n"
158 +"PO-Revision-Date: 2024-10-05 03:32+0800\n"
159 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
160 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
161 "Language: zh_CN\n"
@@ -784,7 +784,7 @@ msgid ""
784 "/ - search for a hunk matching the given regex\n"
785 "s - split the current hunk into smaller hunks\n"
786 "e - manually edit the current hunk\n"
787 -"p - print the current hunk\n"
787 +"p - print the current hunk, 'P' to use the pager\n"
788 "? - print help\n"
789 msgstr ""
790 "j - 维持该块未决状态，查看下一个未决块\n"
@@ -795,7 +795,7 @@ msgstr ""
795 "/ - 查找和给定正则表达式匹配的块\n"
796 "s - 拆分当前块为更小的块\n"
797 "e - 手动编辑当前块\n"
798 -"p - 显示当前块\n"
798 +"p - 显示当前块, 'P' 使用分页器\n"
799 "? - 显示帮助\n"
800
801 #: add-patch.c
@@ -1613,6 +1613,18 @@ msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
1613 msgid "attempt three-way merge, fall back on normal patch if that fails"
1614 msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
1615
1616 +#: apply.c builtin/merge-file.c
1617 +msgid "for conflicts, use our version"
1618 +msgstr "如果冲突，使用我们的版本"
1619 +
1620 +#: apply.c builtin/merge-file.c
1621 +msgid "for conflicts, use their version"
1622 +msgstr "如果冲突，使用他们的版本"
1623 +
1624 +#: apply.c builtin/merge-file.c
1625 +msgid "for conflicts, use a union version"
1626 +msgstr "如果冲突，使用联合版本"
1627 +
1628 #: apply.c
1629 msgid "build a temporary index based on embedded index information"
1630 msgstr "创建一个临时索引基于嵌入的索引信息"
@@ -1674,6 +1686,10 @@ msgstr "为所有文件名前添加 <根目录>"
1686 msgid "don't return error for empty patches"
1687 msgstr "对空的补丁不返回错误"
1688
1689 +#: apply.c
1690 +msgid "--ours, --theirs, and --union require --3way"
1691 +msgstr "--ours、--theirs 和 --union 需要 --3way"
1692 +
1693 #: archive-tar.c archive-zip.c
1694 #, c-format
1695 msgid "cannot stream blob %s"
@@ -1762,6 +1778,10 @@ msgstr "不是一个有效的对象名：%s"
1778 msgid "not a tree object: %s"
1779 msgstr "不是一个树对象：%s"
1780
1781 +#: archive.c builtin/clone.c
1782 +msgid "unable to checkout working tree"
1783 +msgstr "不能检出工作区"
1784 +
1785 #: archive.c
1786 #, c-format
1787 msgid "File not found: %s"
@@ -1878,7 +1898,7 @@ msgstr "选项 '%s' 需要 '%s'"
1898 msgid "Unexpected option --output"
1899 msgstr "未知参数 --output"
1900
1881 -#: archive.c
1901 +#: archive.c t/unit-tests/unit-test.c
1902 #, c-format
1903 msgid "extra command line parameter '%s'"
1904 msgstr "额外的命令行参数：'%s'"
@@ -1949,7 +1969,7 @@ msgid "unable to stat '%s'"
1969 msgstr "无法对 %s 执行 stat"
1970
1971 #: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c
1952 -#: builtin/pack-objects.c combine-diff.c rerere.c
1972 +#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c
1973 #, c-format
1974 msgid "unable to read %s"
1975 msgstr "不能读 %s"
@@ -2086,7 +2106,7 @@ msgstr "--contents 和 --reverse 不能混用。"
2106 msgid "--reverse and --first-parent together require specified latest commit"
2107 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
2108
2089 -#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
2109 +#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c
2110 #: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c
2111 #: remote.c sequencer.c submodule.c
2112 msgid "revision walk setup failed"
@@ -2333,7 +2353,7 @@ msgstr "演习"
2353
2354 #: builtin/add.c builtin/check-ignore.c builtin/commit.c
2355 #: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c
2336 -#: builtin/read-tree.c
2356 +#: builtin/read-tree.c builtin/refs.c
2357 msgid "be verbose"
2358 msgstr "冗长输出"
2359
@@ -2813,7 +2833,7 @@ msgstr "n"
2833 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2834 #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
2835 #: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c
2816 -#: builtin/tag.c builtin/verify-tag.c
2836 +#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c
2837 msgid "format"
2838 msgstr "格式"
2839
@@ -3107,10 +3127,6 @@ msgstr ""
3127 "命令 'git bisect terms' 的参数 %s 无效。\n"
3128 "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
3129
3110 -#: builtin/bisect.c
3111 -msgid "revision walk setup failed\n"
3112 -msgstr "版本遍历设置失败\n"
3113 -
3130 #: builtin/bisect.c
3131 #, c-format
3132 msgid "could not open '%s' for appending"
@@ -4337,9 +4353,16 @@ msgid "also read contacts from stdin"
4353 msgstr "还从标准输入读取联系地址"
4354
4355 #: builtin/check-mailmap.c
4340 -#, c-format
4341 -msgid "unable to parse contact: %s"
4342 -msgstr "不能解析联系地址：%s"
4356 +msgid "read additional mailmap entries from file"
4357 +msgstr "从文件中读取附加邮件映射条目"
4358 +
4359 +#: builtin/check-mailmap.c
4360 +msgid "blob"
4361 +msgstr "数据对象"
4362 +
4363 +#: builtin/check-mailmap.c
4364 +msgid "read additional mailmap entries from blob"
4365 +msgstr "从数据对象中读取附加邮件映射条目"
4366
4367 #: builtin/check-mailmap.c
4368 msgid "no contacts specified"
@@ -4757,6 +4780,11 @@ msgstr "路径不能和切换分支同时使用"
4780 msgid "'%s' cannot be used with switching branches"
4781 msgstr "'%s' 不能和切换分支同时使用"
4782
4783 +#: builtin/checkout.c
4784 +#, c-format
4785 +msgid "'%s' needs the paths to check out"
4786 +msgstr "'%s' 需要路径进行检出"
4787 +
4788 #: builtin/checkout.c
4789 #, c-format
4790 msgid "'%s' cannot be used with '%s'"
@@ -5223,7 +5251,7 @@ msgstr "git目录"
5251 msgid "separate git dir from working tree"
5252 msgstr "git目录和工作区分离"
5253
5226 -#: builtin/clone.c builtin/init-db.c
5254 +#: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c
5255 msgid "specify the reference format to use"
5256 msgstr "指定要使用的引用格式"
5257
@@ -5320,7 +5348,7 @@ msgstr "无法创建链接 '%s'"
5348 msgid "failed to copy file to '%s'"
5349 msgstr "无法拷贝文件至 '%s'"
5350
5323 -#: builtin/clone.c
5351 +#: builtin/clone.c refs/files-backend.c
5352 #, c-format
5353 msgid "failed to iterate over '%s'"
5354 msgstr "无法在 '%s' 上迭代"
@@ -5362,10 +5390,6 @@ msgstr "无法初始化稀疏检出"
5390 msgid "remote HEAD refers to nonexistent ref, unable to checkout"
5391 msgstr "远程 HEAD 指向一个不存在的引用，无法检出"
5392
5365 -#: builtin/clone.c
5366 -msgid "unable to checkout working tree"
5367 -msgstr "不能检出工作区"
5368 -
5393 #: builtin/clone.c
5394 msgid "unable to write parameters to config file"
5395 msgstr "无法将参数写入配置文件"
@@ -5386,7 +5410,8 @@ msgstr "太多参数。"
5410 msgid "You must specify a repository to clone."
5411 msgstr "您必须指定一个仓库来克隆。"
5412
5389 -#: builtin/clone.c builtin/init-db.c builtin/refs.c setup.c
5413 +#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c
5414 +#: setup.c
5415 #, c-format
5416 msgid "unknown ref storage format '%s'"
5417 msgstr "未知的引用存储格式 '%s'"
@@ -5724,7 +5749,7 @@ msgstr "git commit-tree：无法读取"
5749 msgid ""
5750 "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
5751 " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"
5727 -"reword):]<commit>)]\n"
5752 +"reword):]<commit>]\n"
5753 " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
5754 " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
5755 " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
@@ -5734,7 +5759,7 @@ msgid ""
5759 msgstr ""
5760 "git commit [-a | --interactive | --patch] [-s] [-v] [-u<模式>] [--amend]\n"
5761 " [--dry-run] [(-c | -C | --squash) <提交> | --fixup [(amend|"
5737 -"reword):]<提交>)]\n"
5762 +"reword):]<提交>]\n"
5763 " [-F <文件> | -m <消息>] [--reset-author] [--allow-empty]\n"
5764 " [--allow-empty-message] [--no-verify] [-e] [--author=<作者>]\n"
5765 " [--date=<日期>] [--cleanup=<模式>] [--[no-]status]\n"
@@ -6327,11 +6352,10 @@ msgstr "git config list [<文件选项>] [<显示选项>] [--includes]"
6352 #: builtin/config.c
6353 msgid ""
6354 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6330 -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
6331 -"<name>"
6355 +"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
6356 msgstr ""
6333 -"git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则"
6334 -"表达式>] [--value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
6357 +"git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp] [--"
6358 +"value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
6359
6360 #: builtin/config.c
6361 msgid ""
@@ -6365,6 +6389,15 @@ msgstr "git config edit [<文件选项>]"
6389 msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
6390 msgstr "git config [<文件选项>] --get-colorbool <名称> [<标准输出为tty>]"
6391
6392 +#: builtin/config.c
6393 +msgid ""
6394 +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6395 +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
6396 +"<name>"
6397 +msgstr ""
6398 +"git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则"
6399 +"表达式>] [--value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
6400 +
6401 #: builtin/config.c
6402 msgid ""
6403 "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
@@ -7373,8 +7406,8 @@ msgstr ""
7406
7407 #: builtin/fetch.c
7408 #, c-format
7376 -msgid "%s did not send all necessary objects\n"
7377 -msgstr "%s 未发送所有必需的对象\n"
7409 +msgid "%s did not send all necessary objects"
7410 +msgstr "%s 未发送所有必需的对象"
7411
7412 #: builtin/fetch.c
7413 #, c-format
@@ -7422,8 +7455,8 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
7455
7456 #: builtin/fetch.c
7457 #, c-format
7425 -msgid "option \"%s\" is ignored for %s\n"
7426 -msgstr "选项 \"%s\" 为 %s 所忽略\n"
7458 +msgid "option \"%s\" is ignored for %s"
7459 +msgstr "选项 \"%s\" 为 %s 所忽略"
7460
7461 #: builtin/fetch.c object-file.c
7462 #, c-format
@@ -8265,6 +8298,10 @@ msgstr "更彻底（增加运行时间）"
8298 msgid "enable auto-gc mode"
8299 msgstr "启用自动垃圾回收模式"
8300
8301 +#: builtin/gc.c
8302 +msgid "perform garbage collection in the background"
8303 +msgstr "在后台进行垃圾回收"
8304 +
8305 #: builtin/gc.c
8306 msgid "force running gc even if there may be another gc running"
8307 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
@@ -8382,6 +8419,10 @@ msgstr "任务 '%s' 不能被多次选择"
8419 msgid "run tasks based on the state of the repository"
8420 msgstr "基于仓库状态来运行任务"
8421
8422 +#: builtin/gc.c
8423 +msgid "perform maintenance in the background"
8424 +msgstr "在后台执行运维"
8425 +
8426 #: builtin/gc.c
8427 msgid "frequency"
8428 msgstr "频率"
@@ -9473,10 +9514,6 @@ msgstr "-L<范围>:<文件> 不能和路径表达式共用"
9514 msgid "Final output: %d %s\n"
9515 msgstr "最终输出：%d %s\n"
9516
9476 -#: builtin/log.c
9477 -msgid "unable to create temporary object directory"
9478 -msgstr "无法创建临时对象目录"
9479 -
9517 #: builtin/log.c
9518 #, c-format
9519 msgid "git show %s: bad file"
@@ -10205,18 +10242,6 @@ msgstr "使用基于 diff3 的合并"
10242 msgid "use a zealous diff3 based merge"
10243 msgstr "使用基于狂热 diff3（zealous diff3）的合并"
10244
10208 -#: builtin/merge-file.c
10209 -msgid "for conflicts, use our version"
10210 -msgstr "如果冲突，使用我们的版本"
10211 -
10212 -#: builtin/merge-file.c
10213 -msgid "for conflicts, use their version"
10214 -msgstr "如果冲突，使用他们的版本"
10215 -
10216 -#: builtin/merge-file.c
10217 -msgid "for conflicts, use a union version"
10218 -msgstr "如果冲突，使用联合版本"
10219 -
10245 #: builtin/merge-file.c diff.c
10246 msgid "<algorithm>"
10247 msgstr "<算法>"
@@ -10512,7 +10537,7 @@ msgstr "不能写入索引。"
10537 msgid "Not handling anything other than two heads merge."
10538 msgstr "未处理两个头合并之外的任何操作。"
10539
10515 -#: builtin/merge.c
10540 +#: builtin/merge.c builtin/sparse-checkout.c
10541 #, c-format
10542 msgid "unable to write %s"
10543 msgstr "不能写 %s"
@@ -10803,6 +10828,10 @@ msgstr "在计算多包位图时打包以供重用"
10828 msgid "write multi-pack bitmap"
10829 msgstr "写入多包位图"
10830
10831 +#: builtin/multi-pack-index.c
10832 +msgid "write a new incremental MIDX"
10833 +msgstr "写入一个新的增量 MIDX"
10834 +
10835 #: builtin/multi-pack-index.c
10836 msgid "write multi-pack index containing only given indexes"
10837 msgstr "写入只包括给定索引的多包索引"
@@ -13205,6 +13234,10 @@ msgstr "无效的引用格式：%s"
13234 msgid "git refs migrate --ref-format=<format> [--dry-run]"
13235 msgstr "git refs migrate --ref-format=<格式> [--dry-run]"
13236
13237 +#: builtin/refs.c
13238 +msgid "git refs verify [--strict] [--verbose]"
13239 +msgstr "git refs verify [--strict] [--verbose]"
13240 +
13241 #: builtin/refs.c
13242 msgid "specify the reference format to convert to"
13243 msgstr "指定要转换的引用格式"
@@ -13222,6 +13255,14 @@ msgstr "缺少 --ref-format=<格式>"
13255 msgid "repository already uses '%s' format"
13256 msgstr "仓库已使用 '%s' 格式"
13257
13258 +#: builtin/refs.c
13259 +msgid "enable strict checking"
13260 +msgstr "启用严格的检查"
13261 +
13262 +#: builtin/refs.c
13263 +msgid "'git refs verify' takes no arguments"
13264 +msgstr "'git refs verify' 不接受任何参数"
13265 +
13266 #: builtin/remote.c
13267 msgid ""
13268 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
@@ -14996,12 +15037,12 @@ msgid "failed to look up reference"
15037 msgstr "无法找到引用"
15038
15039 #: builtin/show-ref.c
14999 -msgid "only show tags (can be combined with branches)"
15000 -msgstr "仅显示标签（可与分支组合使用）"
15040 +msgid "only show tags (can be combined with --branches)"
15041 +msgstr "仅显示标签（可与 --branches 组合使用）"
15042
15043 #: builtin/show-ref.c
15003 -msgid "only show branches (can be combined with tags)"
15004 -msgstr "仅显示分支（可以和标签组合使用）"
15044 +msgid "only show branches (can be combined with --tags)"
15045 +msgstr "仅显示分支（可与 --tags 组合使用）"
15046
15047 #: builtin/show-ref.c
15048 msgid "check for reference existence without resolving"
@@ -15063,6 +15104,11 @@ msgstr "无法删除目录 '%s'"
15104 msgid "failed to create directory for sparse-checkout file"
15105 msgstr "无法为稀疏检出文件创建目录"
15106
15107 +#: builtin/sparse-checkout.c
15108 +#, c-format
15109 +msgid "unable to fdopen %s"
15110 +msgstr "不能 fdopen %s"
15111 +
15112 #: builtin/sparse-checkout.c
15113 msgid "failed to initialize worktree config"
15114 msgstr "无法初始化工作树配置"
@@ -15612,8 +15658,8 @@ msgstr "不能从 '%s' 创建哈希对象"
15658
15659 #: builtin/submodule--helper.c
15660 #, c-format
15615 -msgid "unexpected mode %o\n"
15616 -msgstr "意外的模式 %o\n"
15661 +msgid "unexpected mode %o"
15662 +msgstr "意外的模式 %o"
15663
15664 #: builtin/submodule--helper.c
15665 msgid "use the commit stored in the index instead of the submodule HEAD"
@@ -18289,7 +18335,7 @@ msgstr "无法写入正确数量的基础图形 ID"
18335 msgid "unable to create temporary graph layer"
18336 msgstr "无法创建临时图层"
18337
18292 -#: commit-graph.c
18338 +#: commit-graph.c midx-write.c
18339 #, c-format
18340 msgid "unable to adjust shared permissions for '%s'"
18341 msgstr "无法为 '%s' 调整共享权限"
@@ -19638,7 +19684,7 @@ msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模
19684 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
19685 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
19686
19641 -#: diff.c transport.c
19687 +#: diff.c merge-recursive.c transport.c
19688 #, c-format
19689 msgid "unknown value for config '%s': %s"
19690 msgstr "配置 '%s' 未知的取值：%s"
@@ -21117,6 +21163,7 @@ msgstr ""
21163 "\n"
21164 "来设置您账号的缺省身份标识。\n"
21165 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
21166 +"\n"
21167
21168 #: ident.c
21169 msgid "no email was given and auto-detection is disabled"
@@ -21237,6 +21284,10 @@ msgstr ""
21284 msgid "Unable to create '%s.lock': %s"
21285 msgstr "不能创建 '%s.lock'：%s"
21286
21287 +#: log-tree.c
21288 +msgid "unable to create temporary object directory"
21289 +msgstr "无法创建临时对象目录"
21290 +
21291 #: loose.c
21292 #, c-format
21293 msgid "could not write loose object index %s"
@@ -21244,8 +21295,8 @@ msgstr "不能写入松散对象索引 %s"
21295
21296 #: loose.c
21297 #, c-format
21247 -msgid "failed to write loose object index %s\n"
21248 -msgstr "无法写入松散对象索引 %s\n"
21298 +msgid "failed to write loose object index %s"
21299 +msgstr "无法写入松散对象索引 %s"
21300
21301 #: ls-refs.c
21302 #, c-format
@@ -21878,6 +21929,20 @@ msgstr "不能载入包"
21929 msgid "could not open index for %s"
21930 msgstr "不能打开 %s 的索引"
21931
21932 +#: midx-write.c
21933 +#, c-format
21934 +msgid "unable to link '%s' to '%s'"
21935 +msgstr "无法将 '%s' 链接至 '%s'"
21936 +
21937 +#: midx-write.c midx.c
21938 +#, c-format
21939 +msgid "failed to clear multi-pack-index at %s"
21940 +msgstr "无法清理位于 %s 的多包索引"
21941 +
21942 +#: midx-write.c
21943 +msgid "cannot write incremental MIDX with bitmap"
21944 +msgstr "无法使用位图写入增量 MIDX"
21945 +
21946 #: midx-write.c
21947 msgid "ignoring existing multi-pack-index; checksum mismatch"
21948 msgstr "忽略已存在的多包索引，校验码不匹配"
@@ -21914,14 +21979,30 @@ msgstr "没有要索引的包文件。"
21979 msgid "refusing to write multi-pack .bitmap without any objects"
21980 msgstr "拒绝写入没有任何对象的多包位图"
21981
21982 +#: midx-write.c
21983 +msgid "unable to create temporary MIDX layer"
21984 +msgstr "无法创建临时 MIDX 层"
21985 +
21986 #: midx-write.c
21987 msgid "could not write multi-pack bitmap"
21988 msgstr "无法写入多包位图"
21989
21990 +#: midx-write.c
21991 +msgid "unable to open multi-pack-index chain file"
21992 +msgstr "无法打开多包索引链文件"
21993 +
21994 +#: midx-write.c
21995 +msgid "unable to rename new multi-pack-index layer"
21996 +msgstr "无法重命名新的多包索引层"
21997 +
21998 #: midx-write.c
21999 msgid "could not write multi-pack-index"
22000 msgstr "无法写入多包索引"
22001
22002 +#: midx-write.c
22003 +msgid "cannot expire packs from an incremental multi-pack-index"
22004 +msgstr "增量多包索引中的包不能过期"
22005 +
22006 #: midx-write.c
22007 msgid "Counting referenced objects"
22008 msgstr "正在对引用对象计数"
@@ -21930,6 +22011,10 @@ msgstr "正在对引用对象计数"
22011 msgid "Finding and deleting unreferenced packfiles"
22012 msgstr "正在查找和删除未引用的包文件"
22013
22014 +#: midx-write.c
22015 +msgid "cannot repack an incremental multi-pack-index"
22016 +msgstr "无法重新打包增量多包索引"
22017 +
22018 #: midx-write.c
22019 msgid "could not start pack-objects"
22020 msgstr "不能开始 pack-objects"
@@ -22001,6 +22086,33 @@ msgstr "多包索引包名块过短"
22086 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
22087 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
22088
22089 +#: midx.c
22090 +msgid "multi-pack-index chain file too small"
22091 +msgstr "多包索引链文件太小"
22092 +
22093 +#: midx.c
22094 +#, c-format
22095 +msgid "pack count in base MIDX too high: %<PRIuMAX>"
22096 +msgstr "基线的 MIDX 中包的数量过高：%<PRIuMAX>"
22097 +
22098 +#: midx.c
22099 +#, c-format
22100 +msgid "object count in base MIDX too high: %<PRIuMAX>"
22101 +msgstr "基线的 MIDX 中对象的数量过高：%<PRIuMAX>"
22102 +
22103 +#: midx.c
22104 +#, c-format
22105 +msgid "invalid multi-pack-index chain: line '%s' not a hash"
22106 +msgstr "无效的多包索引链：第 '%s' 行不是哈希值"
22107 +
22108 +#: midx.c
22109 +msgid "unable to find all multi-pack index files"
22110 +msgstr "无法找到所有的多包索引文件"
22111 +
22112 +#: midx.c
22113 +msgid "invalid MIDX object position, MIDX is likely corrupt"
22114 +msgstr "无效的 MIDX 对象位置，MIDX 可能已损坏"
22115 +
22116 #: midx.c
22117 #, c-format
22118 msgid "bad pack-int-id: %u (%u total packs)"
@@ -22023,11 +22135,6 @@ msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
22135 msgid "multi-pack-index large offset out of bounds"
22136 msgstr "多包索引大偏移区越界"
22137
22026 -#: midx.c
22027 -#, c-format
22028 -msgid "failed to clear multi-pack-index at %s"
22029 -msgstr "无法清理位于 %s 的多包索引"
22030 -
22138 #: midx.c
22139 msgid "multi-pack-index file exists, but failed to parse"
22140 msgstr "多包索引文件存在，但无法解析"
@@ -22285,6 +22392,16 @@ msgstr "打包对象 %s（保存在 %s）已损坏"
22392 msgid "missing mapping of %s to %s"
22393 msgstr "缺少 %s 到 %s 的映射"
22394
22395 +#: object-file.c
22396 +#, c-format
22397 +msgid "unable to open %s"
22398 +msgstr "不能打开 %s"
22399 +
22400 +#: object-file.c
22401 +#, c-format
22402 +msgid "files '%s' and '%s' differ in contents"
22403 +msgstr "文件 '%s' 和 '%s' 的内容不同"
22404 +
22405 #: object-file.c
22406 #, c-format
22407 msgid "unable to write file %s"
@@ -22391,11 +22508,6 @@ msgstr "%s：不支持的文件类型"
22508 msgid "%s is not a valid '%s' object"
22509 msgstr "%s 不是一个有效的 '%s' 对象"
22510
22394 -#: object-file.c
22395 -#, c-format
22396 -msgid "unable to open %s"
22397 -msgstr "不能打开 %s"
22398 -
22511 #: object-file.c
22512 #, c-format
22513 msgid "hash mismatch for %s (expected %s)"
@@ -23842,6 +23954,11 @@ msgstr "元素 %%(align) 需要一个正数的宽度"
23954 msgid "expected format: %%(ahead-behind:<committish>)"
23955 msgstr "期望的格式：%%(ahead-behind:<提交号>)"
23956
23957 +#: ref-filter.c
23958 +#, c-format
23959 +msgid "expected format: %%(is-base:<committish>)"
23960 +msgstr "期望的格式：%%(is-base:<提交号>)"
23961 +
23962 #: ref-filter.c
23963 #, c-format
23964 msgid "malformed field name: %.*s"
@@ -24125,6 +24242,15 @@ msgid ""
24242 "cannot lock ref '%s': expected symref with target '%s': but is a regular ref"
24243 msgstr "无法锁定引用 '%s'：预期目标为 '%s' 的符号引用：但是是普通引用"
24244
24245 +#: refs/files-backend.c
24246 +#, c-format
24247 +msgid "cannot open directory %s"
24248 +msgstr "无法打开目录 %s"
24249 +
24250 +#: refs/files-backend.c
24251 +msgid "Checking references consistency"
24252 +msgstr "正在检查引用一致性"
24253 +
24254 #: refs/reftable-backend.c
24255 #, c-format
24256 msgid "refname is dangerous: %s"
@@ -24894,13 +25020,17 @@ msgstr "只下载要检出的分支的元信息"
25020 msgid "create repository within 'src' directory"
25021 msgstr "在 'src' 目录中创建仓库"
25022
25023 +#: scalar.c
25024 +msgid "specify if tags should be fetched during clone"
25025 +msgstr "如若应在克隆期间获取标签则指定"
25026 +
25027 #: scalar.c
25028 msgid ""
25029 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
24900 -"\t[--[no-]src] <url> [<enlistment>]"
25030 +"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
25031 msgstr ""
25032 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
24903 -"\t[--[no-]src] <url> [<登记>]"
25033 +"\t[--[no-]src] [--[no-]tags] <url> [<登记>]"
25034
25035 #: scalar.c
25036 #, c-format
@@ -24922,6 +25052,11 @@ msgstr "无法获取 '%s' 的默认分支"
25052 msgid "could not configure remote in '%s'"
25053 msgstr "无法在 '%s' 中配置远程"
25054
25055 +#: scalar.c
25056 +#, c-format
25057 +msgid "could not disable tags in '%s'"
25058 +msgstr "无法禁用 '%s' 中的标签"
25059 +
25060 #: scalar.c
25061 #, c-format
25062 msgid "could not configure '%s'"
@@ -26190,6 +26325,11 @@ msgstr "无法返回当前工作目录"
26325 msgid "failed to stat '%*s%s%s'"
26326 msgstr "无法获取 '%*s%s%s' 状态（stat）"
26327
26328 +#: setup.c
26329 +#, c-format
26330 +msgid "safe.directory '%s' not absolute"
26331 +msgstr "safe.directory '%s' 不是绝对路径"
26332 +
26333 #: setup.c
26334 #, c-format
26335 msgid ""
@@ -26750,6 +26890,30 @@ msgstr "令牌"
26890 msgid "command token to send to the server"
26891 msgstr "发送到服务器的命令令牌"
26892
26893 +#: t/unit-tests/unit-test.c
26894 +msgid "unit-test [<options>]"
26895 +msgstr "unit-test [<选项>]"
26896 +
26897 +#: t/unit-tests/unit-test.c
26898 +msgid "immediately exit upon the first failed test"
26899 +msgstr "第一次测试失败后立即退出"
26900 +
26901 +#: t/unit-tests/unit-test.c
26902 +msgid "suite[::test]"
26903 +msgstr "suite[::测试用例]"
26904 +
26905 +#: t/unit-tests/unit-test.c
26906 +msgid "run only test suite or individual test <suite[::test]>"
26907 +msgstr "只运行测试套件或单独的测试 <测试套件[::测试用例]>"
26908 +
26909 +#: t/unit-tests/unit-test.c
26910 +msgid "suite"
26911 +msgstr "测试套件"
26912 +
26913 +#: t/unit-tests/unit-test.c
26914 +msgid "exclude test suite <suite>"
26915 +msgstr "排除测试套件 <测试套件>"
26916 +
26917 #: trailer.c
26918 #, c-format
26919 msgid "running trailer command '%s' failed"
@@ -28200,6 +28364,10 @@ msgstr "'%s.final' 包含编辑的邮件。\n"
28364 msgid "--dump-aliases incompatible with other options\n"
28365 msgstr "--dump-aliases 和其它选项不兼容\n"
28366
28367 +#: git-send-email.perl
28368 +msgid "--dump-aliases and --translate-aliases are mutually exclusive\n"
28369 +msgstr "--dump-aliases 和 --translate-aliases 是互斥的\n"
28370 +
28371 #: git-send-email.perl
28372 msgid ""
28373 "fatal: found configuration options for 'sendmail'\n"