@matheusbsbs / matheus-bagliano / commits / b705d3a745

l10n: zh_CN: for git 2.45 rounds

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

Teng Long committed Apr 24, 2024 at 21:43 UTC b705d3a745575676d3963d7a60acd19d27eb661c
1 file changed +504 -294
po/zh_CN.po
+504 -294
@@ -103,6 +103,7 @@
103 # preferred pack | 首选包（多包索引中引入的首选包概念）
104 # promisor | 承诺者
105 # prune | 清除
106 +# pseudorefs | 伪引用
107 # pull | 拉，拉取
108 # push | 推，推送
109 # reachable | 可达
@@ -153,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"
156 -"POT-Creation-Date: 2024-02-16 14:27+0800\n"
157 -"PO-Revision-Date: 2024-02-18 11:47+0800\n"
157 +"POT-Creation-Date: 2024-04-28 19:59+0800\n"
158 +"PO-Revision-Date: 2024-04-28 20:31+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"
@@ -726,12 +727,12 @@ msgid ""
727 "---\n"
728 "To remove '%c' lines, make them ' ' lines (context).\n"
729 "To remove '%c' lines, delete them.\n"
729 -"Lines starting with %c will be removed.\n"
730 +"Lines starting with %s will be removed.\n"
731 msgstr ""
732 "---\n"
733 "要删除 '%c' 开始的行，使其成为 ' ' 开始的行（上下文）。\n"
734 "要删除 '%c' 开始的行，删除它们。\n"
734 -"以 %c 开始的行将被删除。\n"
735 +"以 %s 开始的行将被删除。\n"
736
737 #: add-patch.c
738 msgid ""
@@ -783,6 +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"
788 "? - print help\n"
789 msgstr ""
790 "j - 维持该块未决状态，查看下一个未决块\n"
@@ -793,6 +795,7 @@ msgstr ""
795 "/ - 查找和给定正则表达式匹配的块\n"
796 "s - 拆分当前块为更小的块\n"
797 "e - 手动编辑当前块\n"
798 +"p - 显示当前块\n"
799 "? - 显示帮助\n"
800
801 #: add-patch.c
@@ -872,8 +875,8 @@ msgstr ""
875
876 #: advice.c
877 #, c-format
875 -msgid "%shint: %.*s%s\n"
876 -msgstr "%s提示：%.*s%s\n"
878 +msgid "%shint:%s%.*s%s\n"
879 +msgstr "%s提示：%s%.*s%s\n"
880
881 #: advice.c
882 msgid "Cherry-picking is not possible because you have unmerged files."
@@ -1469,11 +1472,6 @@ msgid_plural "Applying patch %%s with %d rejects..."
1472 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1473 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1474
1472 -#: apply.c
1473 -#, c-format
1474 -msgid "truncating .rej filename to %.*s.rej"
1475 -msgstr "截短 .rej 文件名为 %.*s.rej"
1476 -
1475 #: apply.c
1476 #, c-format
1477 msgid "cannot open %s"
@@ -2013,6 +2011,11 @@ msgstr "需要一个 %s 版本"
2011 msgid "could not create file '%s'"
2012 msgstr "不能创建文件 '%s'"
2013
2014 +#: bisect.c builtin/notes.c
2015 +#, c-format
2016 +msgid "unable to start 'show' for object '%s'"
2017 +msgstr "不能为对象 '%s' 开始 'show'"
2018 +
2019 #: bisect.c builtin/merge.c
2020 #, c-format
2021 msgid "could not read file '%s'"
@@ -2062,8 +2065,8 @@ msgid "--reverse and --first-parent together require specified latest commit"
2065 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
2066
2067 #: blame.c builtin/commit.c builtin/log.c builtin/merge.c
2065 -#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c
2066 -#: sequencer.c submodule.c
2068 +#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c
2069 +#: remote.c sequencer.c submodule.c
2070 msgid "revision walk setup failed"
2071 msgstr "版本遍历初始化失败"
2072
@@ -2180,6 +2183,10 @@ msgstr ""
2183 msgid "'%s' is not a valid branch name"
2184 msgstr "'%s' 不是一个有效的分支名称"
2185
2186 +#: branch.c builtin/branch.c
2187 +msgid "See `man git check-ref-format`"
2188 +msgstr "查阅 `man git check-ref-format`"
2189 +
2190 #: branch.c
2191 #, c-format
2192 msgid "a branch named '%s' already exists"
@@ -2410,14 +2417,8 @@ msgid "adding embedded git repository: %s"
2417 msgstr "正在添加嵌入式 git 仓库：%s"
2418
2419 #: builtin/add.c
2413 -msgid ""
2414 -"Use -f if you really want to add them.\n"
2415 -"Turn this message off by running\n"
2416 -"\"git config advice.addIgnoredFile false\""
2417 -msgstr ""
2418 -"如果您确实要添加它们，使用 -f 参数。\n"
2419 -"运行下面的命令来关闭本消息\n"
2420 -"\"git config advice.addIgnoredFile false\""
2420 +msgid "Use -f if you really want to add them."
2421 +msgstr "如果您确实想添加它们，请使用 -f 选项。"
2422
2423 #: builtin/add.c
2424 msgid "adding files failed"
@@ -2440,14 +2441,8 @@ msgid "Nothing specified, nothing added.\n"
2441 msgstr "没有指定文件，也没有文件被添加。\n"
2442
2443 #: builtin/add.c
2443 -msgid ""
2444 -"Maybe you wanted to say 'git add .'?\n"
2445 -"Turn this message off by running\n"
2446 -"\"git config advice.addEmptyPathspec false\""
2447 -msgstr ""
2448 -"也许您想要执行 'git add .'？\n"
2449 -"运行下面的命令来关闭本消息\n"
2450 -"\"git config advice.addEmptyPathspec false\""
2444 +msgid "Maybe you wanted to say 'git add .'?"
2445 +msgstr "也许您想要执行 'git add .'？"
2446
2447 #: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c
2448 #: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c
@@ -2467,8 +2462,8 @@ msgid "bad action '%s' for '%s'"
2462 msgstr "'%2$s' 的错误动作 '%1$s'"
2463
2464 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2470 -#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c
2471 -#: parallel-checkout.c sequencer.c setup.c
2465 +#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
2466 +#: ls-refs.c parallel-checkout.c sequencer.c setup.c
2467 #, c-format
2468 msgid "invalid value for '%s': '%s'"
2469 msgstr "'%s' 的值无效：'%s'"
@@ -2552,18 +2547,19 @@ msgstr "无法拆分补丁。"
2547
2548 #: builtin/am.c
2549 #, c-format
2555 -msgid "When you have resolved this problem, run \"%s --continue\"."
2556 -msgstr "当您解决这一问题，执行 \"%s --continue\"。"
2550 +msgid "When you have resolved this problem, run \"%s --continue\".\n"
2551 +msgstr "当您解决这一问题之后，执行 \"%s --continue\"。\n"
2552
2553 #: builtin/am.c
2554 #, c-format
2560 -msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2561 -msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
2555 +msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n"
2556 +msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。\n"
2557
2558 #: builtin/am.c
2559 #, c-format
2565 -msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
2566 -msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。"
2560 +msgid ""
2561 +"To record the empty patch as an empty commit, run \"%s --allow-empty\".\n"
2562 +msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。\n"
2563
2564 #: builtin/am.c
2565 #, c-format
@@ -3623,11 +3619,11 @@ msgstr "分支已拷贝，但更新配置文件失败"
3619 msgid ""
3620 "Please edit the description for the branch\n"
3621 " %s\n"
3626 -"Lines starting with '%c' will be stripped.\n"
3622 +"Lines starting with '%s' will be stripped.\n"
3623 msgstr ""
3624 "请编辑分支的描述\n"
3625 " %s\n"
3630 -"以 '%c' 开头的行将被过滤。\n"
3626 +"以 '%s' 开头的行将被过滤。\n"
3627
3628 #: builtin/branch.c
3629 msgid "Generic options"
@@ -3883,10 +3879,12 @@ msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
3879
3880 #: builtin/bugreport.c
3881 msgid ""
3886 -"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
3882 +"git bugreport [(-o | --output-directory) <path>]\n"
3883 +" [(-s | --suffix) <format> | --no-suffix]\n"
3884 " [--diagnose[=<mode>]]"
3885 msgstr ""
3889 -"git bugreport [-o|--output-directory <文件>] [(-s|--suffix) <格式>]\n"
3886 +"git bugreport [-o | --output-directory <文件>]\n"
3887 +" [(-s | --suffix) <格式> | --no-suffix]\n"
3888 " [--diagnose[=<模式>]"
3889
3890 #: builtin/bugreport.c
@@ -4488,6 +4486,12 @@ msgstr "'%s'、'%s' 或 '%s' 不能在检出一个树时使用"
4486 msgid "path '%s' is unmerged"
4487 msgstr "路径 '%s' 未合并"
4488
4489 +#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c
4490 +#: merge-ort.c reset.c sequencer.c tree-walk.c
4491 +#, c-format
4492 +msgid "unable to read tree (%s)"
4493 +msgstr "无法读取树（%s）"
4494 +
4495 #: builtin/checkout.c
4496 msgid "you need to resolve your current index first"
4497 msgstr "您需要先解决当前索引的冲突"
@@ -4754,6 +4758,11 @@ msgstr "不能切换分支到一个非提交 '%s'"
4758 msgid "missing branch or commit argument"
4759 msgstr "缺少分支或提交参数"
4760
4761 +#: builtin/checkout.c
4762 +#, c-format
4763 +msgid "unknown conflict style '%s'"
4764 +msgstr "未知的冲突风格 '%s'"
4765 +
4766 #: builtin/checkout.c
4767 msgid "perform a 3-way merge with the new branch"
4768 msgstr "和新的分支执行三方合并"
@@ -5074,18 +5083,8 @@ msgid "remove only ignored files"
5083 msgstr "只删除忽略的文件"
5084
5085 #: builtin/clean.c
5077 -msgid ""
5078 -"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
5079 -"clean"
5080 -msgstr ""
5081 -"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
5082 -
5083 -#: builtin/clean.c
5084 -msgid ""
5085 -"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
5086 -"refusing to clean"
5087 -msgstr ""
5088 -"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
5086 +msgid "clean.requireForce is true and -f not given: refusing to clean"
5087 +msgstr "clean.requireForce 设置为 true 且未提供 -f 选项：拒绝执行清理动作"
5088
5089 #: builtin/clone.c
5090 msgid "git clone [<options>] [--] <repo> [<dir>]"
@@ -5104,8 +5103,8 @@ msgid "create a bare repository"
5103 msgstr "创建一个纯仓库"
5104
5105 #: builtin/clone.c
5107 -msgid "create a mirror repository (implies bare)"
5108 -msgstr "创建一个镜像仓库（也是纯仓库）"
5106 +msgid "create a mirror repository (implies --bare)"
5107 +msgstr "创建一个镜像仓库（隐含 --bare）"
5108
5109 #: builtin/clone.c
5110 msgid "to clone from a local repository"
@@ -5506,6 +5505,11 @@ msgstr "右边框的填充空间"
5505 msgid "padding space between columns"
5506 msgstr "两列之间的填充空间"
5507
5508 +#: builtin/column.c
5509 +#, c-format
5510 +msgid "%s must be non-negative"
5511 +msgstr "%s 必须为非负整数"
5512 +
5513 #: builtin/column.c
5514 msgid "--command must be the first argument"
5515 msgstr "--command 必须是第一个参数"
@@ -5839,7 +5843,7 @@ msgid ""
5843 "in the current commit message"
5844 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5845
5842 -#: builtin/commit.c builtin/merge-tree.c
5846 +#: builtin/commit.c
5847 #, c-format
5848 msgid "could not lookup commit '%s'"
5849 msgstr "不能查询提交 '%s'"
@@ -5884,35 +5888,35 @@ msgstr "不能写提交模版"
5888 #, c-format
5889 msgid ""
5890 "Please enter the commit message for your changes. Lines starting\n"
5887 -"with '%c' will be ignored.\n"
5888 -msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n"
5891 +"with '%s' will be ignored.\n"
5892 +msgstr "请为您的变更输入提交说明。以 '%s' 开始的行将被忽略。\n"
5893
5894 #: builtin/commit.c
5895 #, c-format
5896 msgid ""
5897 "Please enter the commit message for your changes. Lines starting\n"
5894 -"with '%c' will be ignored, and an empty message aborts the commit.\n"
5898 +"with '%s' will be ignored, and an empty message aborts the commit.\n"
5899 msgstr ""
5896 -"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
5900 +"请为您的变更输入提交说明。以 '%s' 开始的行将被忽略，而一个空的提交\n"
5901 "说明将会终止提交。\n"
5902
5903 #: builtin/commit.c
5904 #, c-format
5905 msgid ""
5906 "Please enter the commit message for your changes. Lines starting\n"
5903 -"with '%c' will be kept; you may remove them yourself if you want to.\n"
5907 +"with '%s' will be kept; you may remove them yourself if you want to.\n"
5908 msgstr ""
5905 -"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n"
5909 +"请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n"
5910 "也可以删除它们。\n"
5911
5912 #: builtin/commit.c
5913 #, c-format
5914 msgid ""
5915 "Please enter the commit message for your changes. Lines starting\n"
5912 -"with '%c' will be kept; you may remove them yourself if you want to.\n"
5916 +"with '%s' will be kept; you may remove them yourself if you want to.\n"
5917 "An empty message aborts the commit.\n"
5918 msgstr ""
5915 -"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n"
5919 +"请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n"
5920 "也可以删除它们。一个空的提交说明将会终止提交。\n"
5921
5922 #: builtin/commit.c
@@ -6141,7 +6145,7 @@ msgstr "日期"
6145 msgid "override date for commit"
6146 msgstr "提交时覆盖日期"
6147
6144 -#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h
6148 +#: builtin/commit.c parse-options.h ref-filter.h
6149 msgid "commit"
6150 msgstr "提交"
6151
@@ -6465,6 +6469,10 @@ msgstr "取值"
6469 msgid "with --get, use default value when missing entry"
6470 msgstr "使用 --get 参数，当缺少设置时使用默认值"
6471
6472 +#: builtin/config.c
6473 +msgid "human-readable comment string (# will be prepended as needed)"
6474 +msgstr "人类可读的注释字符串（# 将根据需要添加到前面）"
6475 +
6476 #: builtin/config.c
6477 #, c-format
6478 msgid "wrong number of arguments, should be %d"
@@ -6577,6 +6585,10 @@ msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
6585 msgid "--default is only applicable to --get"
6586 msgstr "--default 仅适用于 --get"
6587
6588 +#: builtin/config.c
6589 +msgid "--comment is only applicable to add/set/replace operations"
6590 +msgstr "--comment 仅适用于 add/set/replace 操作"
6591 +
6592 #: builtin/config.c
6593 msgid "--fixed-value only applies with 'value-pattern'"
6594 msgstr "--fixed-value 仅适用于有 '值模式'"
@@ -6843,7 +6855,7 @@ msgstr "--merge-base 仅适用于两个提交"
6855 #: builtin/diff.c
6856 #, c-format
6857 msgid "'%s': not a regular file or symlink"
6846 -msgstr "'%s'：不是一个正规文件或符号链接"
6858 +msgstr "'%s'：不是一个普通文件或符号链接"
6859
6860 #: builtin/diff.c
6861 msgid "no merge given, only parents."
@@ -7622,6 +7634,10 @@ msgstr "只打印不包含该提交的引用"
7634 msgid "read reference patterns from stdin"
7635 msgstr "从标准输入读取引用的模式"
7636
7637 +#: builtin/for-each-ref.c
7638 +msgid "also include HEAD ref and pseudorefs"
7639 +msgstr "还包括 HEAD 引用和伪引用"
7640 +
7641 #: builtin/for-each-ref.c
7642 msgid "unknown arguments supplied with --stdin"
7643 msgstr "为 --stdin 提供了未知的命令参数"
@@ -8395,11 +8411,6 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
8411 msgid "no threads support, ignoring %s"
8412 msgstr "没有线程支持，忽略 %s"
8413
8398 -#: builtin/grep.c
8399 -#, c-format
8400 -msgid "unable to read tree (%s)"
8401 -msgstr "无法读取树（%s）"
8402 -
8414 #: builtin/grep.c
8415 #, c-format
8416 msgid "unable to read tree %s"
@@ -9164,13 +9175,46 @@ msgstr "--separate-git-dir 不能用于纯仓库"
9175 #: builtin/interpret-trailers.c
9176 msgid ""
9177 "git interpret-trailers [--in-place] [--trim-empty]\n"
9167 -" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n"
9178 +" [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"
9179 " [--parse] [<file>...]"
9180 msgstr ""
9181 "git interpret-trailers [--in-place] [--trim-empty]\n"
9182 " [(--trailer (<键|键别名>)[(=|:)<值>])...]\n"
9183 " [--parse] [<文件>...]"
9184
9185 +#: builtin/interpret-trailers.c wrapper.c
9186 +#, c-format
9187 +msgid "could not stat %s"
9188 +msgstr "不能对 %s 调用 stat"
9189 +
9190 +#: builtin/interpret-trailers.c
9191 +#, c-format
9192 +msgid "file %s is not a regular file"
9193 +msgstr "文件 %s 不是一个普通文件"
9194 +
9195 +#: builtin/interpret-trailers.c
9196 +#, c-format
9197 +msgid "file %s is not writable by user"
9198 +msgstr "文件 %s 用户不可写"
9199 +
9200 +#: builtin/interpret-trailers.c
9201 +msgid "could not open temporary file"
9202 +msgstr "不能打开临时文件"
9203 +
9204 +#: builtin/interpret-trailers.c
9205 +#, c-format
9206 +msgid "could not read input file '%s'"
9207 +msgstr "不能读取输入文件 '%s'"
9208 +
9209 +#: builtin/interpret-trailers.c builtin/mktag.c imap-send.c
9210 +msgid "could not read from stdin"
9211 +msgstr "不能自标准输入读取"
9212 +
9213 +#: builtin/interpret-trailers.c
9214 +#, c-format
9215 +msgid "could not rename temporary file to %s"
9216 +msgstr "不能重命名临时文件为 %s"
9217 +
9218 #: builtin/interpret-trailers.c
9219 msgid "edit files in place"
9220 msgstr "在原位编辑文件"
@@ -9668,21 +9712,6 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
9712 msgid "could not get object info about '%s'"
9713 msgstr "无法获得关于 '%s' 的对象信息"
9714
9671 -#: builtin/ls-files.c
9672 -#, c-format
9673 -msgid "bad ls-files format: element '%s' does not start with '('"
9674 -msgstr "坏的 ls-files 格式：元素 '%s' 没有以 '(' 开头"
9675 -
9676 -#: builtin/ls-files.c
9677 -#, c-format
9678 -msgid "bad ls-files format: element '%s' does not end in ')'"
9679 -msgstr "坏的 ls-files 格式：元素 '%s' 没有以 ')' 结尾"
9680 -
9681 -#: builtin/ls-files.c
9682 -#, c-format
9683 -msgid "bad ls-files format: %%%.*s"
9684 -msgstr "坏的 ls-files 格式: %%%.*s"
9685 -
9715 #: builtin/ls-files.c
9716 msgid "git ls-files [<options>] [<file>...]"
9717 msgstr "git ls-files [<选项>] [<文件>...]"
@@ -9775,7 +9804,7 @@ msgstr "显示相对于顶级目录的文件名"
9804 msgid "if any <file> is not in the index, treat this as an error"
9805 msgstr "如果任何 <文件> 都不在索引区，视为错误"
9806
9778 -#: builtin/ls-files.c
9807 +#: builtin/ls-files.c builtin/merge-tree.c
9808 msgid "tree-ish"
9809 msgstr "树对象"
9810
@@ -9853,21 +9882,6 @@ msgstr "除了显示指向的对象外，显示指向的引用名"
9882 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
9883 msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
9884
9856 -#: builtin/ls-tree.c
9857 -#, c-format
9858 -msgid "bad ls-tree format: element '%s' does not start with '('"
9859 -msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 '(' 开头"
9860 -
9861 -#: builtin/ls-tree.c
9862 -#, c-format
9863 -msgid "bad ls-tree format: element '%s' does not end in ')'"
9864 -msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 ')' 结尾"
9865 -
9866 -#: builtin/ls-tree.c
9867 -#, c-format
9868 -msgid "bad ls-tree format: %%%.*s"
9869 -msgstr "坏的 ls-tree 格式: %%%.*s"
9870 -
9885 #: builtin/ls-tree.c
9886 msgid "only show trees"
9887 msgstr "只显示树"
@@ -10018,7 +10032,9 @@ msgstr ""
10032 msgid ""
10033 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
10034 "\"histogram\""
10021 -msgstr "选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
10035 +msgstr ""
10036 +"选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 "
10037 +"\"histogram\""
10038
10039 #: builtin/merge-file.c
10040 msgid "send results to standard output"
@@ -10108,6 +10124,11 @@ msgstr "无法解析引用 '%s'"
10124 msgid "Merging %s with %s\n"
10125 msgstr "合并 %s 和 %s\n"
10126
10127 +#: builtin/merge-tree.c
10128 +#, c-format
10129 +msgid "could not parse as tree '%s'"
10130 +msgstr "无法解析为树对象 '%s'"
10131 +
10132 #: builtin/merge-tree.c builtin/merge.c
10133 msgid "not something we can merge"
10134 msgstr "不是可以合并的东西"
@@ -10370,9 +10391,9 @@ msgstr "空的提交说明会终止提交。\n"
10391 #: builtin/merge.c
10392 #, c-format
10393 msgid ""
10373 -"Lines starting with '%c' will be ignored, and an empty message aborts\n"
10394 +"Lines starting with '%s' will be ignored, and an empty message aborts\n"
10395 "the commit.\n"
10375 -msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
10396 +msgstr "以 '%s' 开始的行将被忽略，而空的提交说明将终止提交。\n"
10397
10398 #: builtin/merge.c
10399 msgid "Empty commit message."
@@ -10565,10 +10586,6 @@ msgstr "不能读取被标记的对象 '%s'"
10586 msgid "object '%s' tagged as '%s', but is a '%s' type"
10587 msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型"
10588
10568 -#: builtin/mktag.c imap-send.c trailer.c
10569 -msgid "could not read from stdin"
10570 -msgstr "不能自标准输入读取"
10571 -
10589 #: builtin/mktag.c
10590 msgid "tag on stdin did not pass our strict fsck check"
10591 msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
@@ -10900,11 +10917,6 @@ msgstr "git notes prune [<选项>]"
10917 msgid "Write/edit the notes for the following object:"
10918 msgstr "为下面的对象写/编辑说明："
10919
10903 -#: builtin/notes.c
10904 -#, c-format
10905 -msgid "unable to start 'show' for object '%s'"
10906 -msgstr "不能为对象 '%s' 开始 'show'"
10907 -
10920 #: builtin/notes.c
10921 msgid "could not read 'show' output"
10922 msgstr "不能读取 'show' 的输出"
@@ -11677,10 +11689,11 @@ msgstr "拒绝在未指定 --i-still-use-this 选项时运行"
11689
11690 #: builtin/pack-refs.c
11691 msgid ""
11680 -"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
11692 +"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
11693 "<pattern>]"
11694 msgstr ""
11683 -"git pack-refs [--all] [--no-prune] [--include <模式>] [--exclude <模式>]"
11695 +"git pack-refs [--all] [--no-prune] [--auto] [--include <模式>] [--exclude <模"
11696 +"式>]"
11697
11698 #: builtin/pack-refs.c
11699 msgid "pack everything"
@@ -11690,6 +11703,10 @@ msgstr "打包一切"
11703 msgid "prune loose refs (default)"
11704 msgstr "清除松散的引用（默认）"
11705
11706 +#: builtin/pack-refs.c
11707 +msgid "auto-pack refs as needed"
11708 +msgstr "按需对引用自动打包"
11709 +
11710 #: builtin/pack-refs.c
11711 msgid "references to include"
11712 msgstr "需包含的引用"
@@ -12450,19 +12467,6 @@ msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
12467 msgid "could not remove '%s'"
12468 msgstr "无法删除 '%s'"
12469
12453 -#: builtin/rebase.c
12454 -msgid ""
12455 -"Resolve all conflicts manually, mark them as resolved with\n"
12456 -"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
12457 -"You can instead skip this commit: run \"git rebase --skip\".\n"
12458 -"To abort and get back to the state before \"git rebase\", run \"git rebase --"
12459 -"abort\"."
12460 -msgstr ""
12461 -"手工解决所有冲突，执行 \"git add/rm <冲突的文件>\" 标记\n"
12462 -"冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n"
12463 -"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
12464 -"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
12465 -
12470 #: builtin/rebase.c
12471 #, c-format
12472 msgid ""
@@ -12495,12 +12499,16 @@ msgstr "无法切换到 %s"
12499 msgid "apply options and merge options cannot be used together"
12500 msgstr "应用选项和合并选项不能同时使用"
12501
12502 +#: builtin/rebase.c
12503 +msgid "--empty=ask is deprecated; use '--empty=stop' instead."
12504 +msgstr "--empty=ask 已弃用；请使用 '--empty=stop'。"
12505 +
12506 #: builtin/rebase.c
12507 #, c-format
12508 msgid ""
12509 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
12502 -"\"ask\"."
12503 -msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
12510 +"\"stop\"."
12511 +msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"stop\"。"
12512
12513 #: builtin/rebase.c
12514 msgid ""
@@ -12642,7 +12650,7 @@ msgstr "让用户编辑要变基的提交列表"
12650 msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
12651 msgstr "（已删除）曾是：尝试重建合并提交而非忽略它们"
12652
12645 -#: builtin/rebase.c
12653 +#: builtin/rebase.c builtin/revert.c
12654 msgid "how to handle commits that become empty"
12655 msgstr "如何处理成为空提交的提交"
12656
@@ -12723,8 +12731,8 @@ msgstr ""
12731 "取而代之请使用 'merges'"
12732
12733 #: builtin/rebase.c
12726 -msgid "No rebase in progress?"
12727 -msgstr "没有正在进行的变基？"
12734 +msgid "no rebase in progress"
12735 +msgstr "没有正在进行的变基"
12736
12737 #: builtin/rebase.c
12738 msgid "The --edit-todo action can only be used during interactive rebase."
@@ -12940,6 +12948,10 @@ msgstr "您必须指定一个目录"
12948 msgid "git reflog [show] [<log-options>] [<ref>]"
12949 msgstr "git reflog [show] [<log 选项>] [<引用>]"
12950
12951 +#: builtin/reflog.c
12952 +msgid "git reflog list"
12953 +msgstr "git reflog list"
12954 +
12955 #: builtin/reflog.c
12956 msgid ""
12957 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
@@ -12969,6 +12981,11 @@ msgstr "git reflog exists <引用>"
12981 msgid "invalid timestamp '%s' given to '--%s'"
12982 msgstr "给 '--%2$s' 的时间戳 '%1$s' 无效"
12983
12984 +#: builtin/reflog.c sequencer.c
12985 +#, c-format
12986 +msgid "%s does not accept arguments: '%s'"
12987 +msgstr "%s 不接受参数：'%s'"
12988 +
12989 #: builtin/reflog.c
12990 msgid "do not actually prune any entries"
12991 msgstr "不要实际清除任何条目"
@@ -13128,8 +13145,8 @@ msgstr ""
13145
13146 #: builtin/remote.c
13147 #, c-format
13131 -msgid "unknown mirror argument: %s"
13132 -msgstr "未知的镜像参数：%s"
13148 +msgid "unknown --mirror argument: %s"
13149 +msgstr "未知的 --mirror 参数：%s"
13150
13151 #: builtin/remote.c
13152 msgid "fetch the remote branches"
@@ -13579,6 +13596,10 @@ msgstr ""
13596 msgid "could not start pack-objects to repack promisor objects"
13597 msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
13598
13599 +#: builtin/repack.c
13600 +msgid "failed to feed promisor objects to pack-objects"
13601 +msgstr "无法将承诺者对象提供给 pack-objects"
13602 +
13603 #: builtin/repack.c
13604 msgid "repack: Expecting full hex object ID lines only from pack-objects."
13605 msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
@@ -14030,7 +14051,9 @@ msgstr "不能隐式地确定 --onto 正确的基线"
14051 msgid ""
14052 "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "
14053 "<branch>) <revision-range>..."
14033 -msgstr "（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版本范围>..."
14054 +msgstr ""
14055 +"（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版"
14056 +"本范围>..."
14057
14058 #: builtin/replay.c
14059 msgid "make replay advance given branch"
@@ -14053,7 +14076,8 @@ msgstr "选项 --onto 或 --advance 必须指定其一"
14076 msgid ""
14077 "some rev walking options will be overridden as '%s' bit in 'struct rev_info' "
14078 "will be forced"
14056 -msgstr "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定"
14079 +msgstr ""
14080 +"一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定"
14081
14082 #: builtin/replay.c
14083 msgid "error preparing revisions"
@@ -14321,6 +14345,15 @@ msgstr "--default 需要一个参数"
14345 msgid "--prefix requires an argument"
14346 msgstr "--prefix 需要一个参数"
14347
14348 +#: builtin/rev-parse.c
14349 +msgid "no object format specified"
14350 +msgstr "未指定对象格式"
14351 +
14352 +#: builtin/rev-parse.c
14353 +#, c-format
14354 +msgid "unsupported object format: %s"
14355 +msgstr "不支持的对象格式：'%s'"
14356 +
14357 #: builtin/rev-parse.c
14358 #, c-format
14359 msgid "unknown mode for --abbrev-ref: %s"
@@ -14425,8 +14458,8 @@ msgid "allow commits with empty messages"
14458 msgstr "允许提交说明为空"
14459
14460 #: builtin/revert.c
14428 -msgid "keep redundant, empty commits"
14429 -msgstr "保持多余的、空的提交"
14461 +msgid "deprecated: use --empty=keep instead"
14462 +msgstr "已弃用：取而代之使用 --empty=keep"
14463
14464 #: builtin/revert.c
14465 msgid "use the 'reference' format to refer to commits"
@@ -14877,7 +14910,7 @@ msgstr "初始化稀疏检出为锥形模式"
14910 msgid "toggle the use of a sparse index"
14911 msgstr "切换稀疏索引的使用"
14912
14880 -#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c
14913 +#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c
14914 #, c-format
14915 msgid "unable to create leading directories of %s"
14916 msgstr "不能为 %s 创建先导目录"
@@ -16041,12 +16074,12 @@ msgid ""
16074 "\n"
16075 "Write a message for tag:\n"
16076 " %s\n"
16044 -"Lines starting with '%c' will be ignored.\n"
16077 +"Lines starting with '%s' will be ignored.\n"
16078 msgstr ""
16079 "\n"
16080 "输入一个标签说明：\n"
16081 " %s\n"
16049 -"以 '%c' 开头的行将被忽略。\n"
16082 +"以 '%s' 开头的行将被忽略。\n"
16083
16084 #: builtin/tag.c
16085 #, c-format
@@ -16054,13 +16087,13 @@ msgid ""
16087 "\n"
16088 "Write a message for tag:\n"
16089 " %s\n"
16057 -"Lines starting with '%c' will be kept; you may remove them yourself if you "
16090 +"Lines starting with '%s' will be kept; you may remove them yourself if you "
16091 "want to.\n"
16092 msgstr ""
16093 "\n"
16094 "输入一个标签说明：\n"
16095 " %s\n"
16063 -"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
16096 +"以 '%s' 开头的行将被保留，如果您愿意也可以删除它们。\n"
16097
16098 #: builtin/tag.c
16099 msgid "unable to sign the tag"
@@ -16168,6 +16201,10 @@ msgstr "只打印尚未合并的标签"
16201 msgid "print only tags of the object"
16202 msgstr "只打印指向该对象的标签"
16203
16204 +#: builtin/tag.c
16205 +msgid "could not start 'git column'"
16206 +msgstr "无法启动 'git column'"
16207 +
16208 #: builtin/tag.c
16209 #, c-format
16210 msgid "the '%s' option is only allowed in list mode"
@@ -16473,12 +16510,12 @@ msgid "fsmonitor disabled"
16510 msgstr "fsmonitor 被禁用"
16511
16512 #: builtin/update-ref.c
16476 -msgid "git update-ref [<options>] -d <refname> [<old-val>]"
16477 -msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
16513 +msgid "git update-ref [<options>] -d <refname> [<old-oid>]"
16514 +msgstr "git update-ref [<选项>] -d <引用名> [<旧对象>]"
16515
16516 #: builtin/update-ref.c
16480 -msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
16481 -msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
16517 +msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
16518 +msgstr "git update-ref [<选项>] <引用名> <新对象> [<旧对象>]"
16519
16520 #: builtin/update-ref.c
16521 msgid "git update-ref [<options>] --stdin [-z]"
@@ -18101,7 +18138,8 @@ msgstr "无法重命名临时提交图文件"
18138 #: commit-graph.c
18139 #, c-format
18140 msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
18104 -msgstr "无法合并提交图，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>"
18141 +msgstr ""
18142 +"无法合并提交图，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>"
18143
18144 #: commit-graph.c
18145 #, c-format
@@ -18189,6 +18227,11 @@ msgstr "提交图具有零和非零的世代（例如：提交 '%s' 和 '%s'）"
18227 msgid "Verifying commits in commit graph"
18228 msgstr "正在校验提交图中的提交"
18229
18230 +#: commit-reach.c sequencer.c
18231 +#, c-format
18232 +msgid "could not parse commit %s"
18233 +msgstr "不能解析提交 %s"
18234 +
18235 #: commit.c
18236 #, c-format
18237 msgid "%s %s is not a commit!"
@@ -18716,8 +18759,14 @@ msgid "bad zlib compression level %d"
18759 msgstr "错误的 zlib 压缩级别 %d"
18760
18761 #: config.c
18719 -msgid "core.commentChar should only be one ASCII character"
18720 -msgstr "core.commentChar 应该是一个 ASCII 编码的字符"
18762 +#, c-format
18763 +msgid "%s cannot contain newline"
18764 +msgstr "%s 不能包含换行符"
18765 +
18766 +#: config.c
18767 +#, c-format
18768 +msgid "%s must have at least one character"
18769 +msgstr "%s 必须至少有一个字符"
18770
18771 #: config.c
18772 #, c-format
@@ -18805,6 +18854,11 @@ msgstr "%s 有多个取值"
18854 msgid "failed to write new configuration file %s"
18855 msgstr "无法写入新的配置文件 %s"
18856
18857 +#: config.c
18858 +#, c-format
18859 +msgid "no multi-line comment allowed: '%s'"
18860 +msgstr "不允许多行注释：'%s'"
18861 +
18862 #: config.c
18863 #, c-format
18864 msgid "could not lock config file %s"
@@ -20983,6 +21037,16 @@ msgstr ""
21037 msgid "Unable to create '%s.lock': %s"
21038 msgstr "不能创建 '%s.lock'：%s"
21039
21040 +#: loose.c
21041 +#, c-format
21042 +msgid "could not write loose object index %s"
21043 +msgstr "不能写入松散对象索引 %s"
21044 +
21045 +#: loose.c
21046 +#, c-format
21047 +msgid "failed to write loose object index %s\n"
21048 +msgstr "无法写入松散对象索引 %s\n"
21049 +
21050 #: ls-refs.c
21051 #, c-format
21052 msgid "unexpected line: '%s'"
@@ -20996,6 +21060,11 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包"
21060 msgid "quoted CRLF detected"
21061 msgstr "检测到被引用的 CRLF"
21062
21063 +#: mem-pool.c strbuf.c wrapper.c
21064 +#, c-format
21065 +msgid "unable to format message: %s"
21066 +msgstr "无法格式化消息：%s"
21067 +
21068 #: merge-ort.c merge-recursive.c
21069 #, c-format
21070 msgid "Failed to merge submodule %s (not checked out)"
@@ -21011,6 +21080,11 @@ msgstr "无法合并子模组 %s （没有合并基线）"
21080 msgid "Failed to merge submodule %s (commits not present)"
21081 msgstr "无法合并子模组 %s（提交不存在）"
21082
21083 +#: merge-ort.c merge-recursive.c
21084 +#, c-format
21085 +msgid "Failed to merge submodule %s (repository corrupt)"
21086 +msgstr "无法合并子模组 %s（仓库损坏）"
21087 +
21088 #: merge-ort.c merge-recursive.c
21089 #, c-format
21090 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
@@ -21541,6 +21615,104 @@ msgstr "不能解析对象 '%s'"
21615 msgid "failed to read the cache"
21616 msgstr "无法读取缓存"
21617
21618 +#: midx-write.c
21619 +#, c-format
21620 +msgid "failed to add packfile '%s'"
21621 +msgstr "无法添加包文件 '%s'"
21622 +
21623 +#: midx-write.c
21624 +#, c-format
21625 +msgid "failed to open pack-index '%s'"
21626 +msgstr "无法打开包索引 '%s'"
21627 +
21628 +#: midx-write.c
21629 +#, c-format
21630 +msgid "failed to locate object %d in packfile"
21631 +msgstr "无法在包文件中定位对象 %d"
21632 +
21633 +#: midx-write.c
21634 +msgid "cannot store reverse index file"
21635 +msgstr "无法存储反向索引文件"
21636 +
21637 +#: midx-write.c
21638 +#, c-format
21639 +msgid "could not parse line: %s"
21640 +msgstr "不能解析行：%s"
21641 +
21642 +#: midx-write.c
21643 +#, c-format
21644 +msgid "malformed line: %s"
21645 +msgstr "格式错误的行：%s"
21646 +
21647 +#: midx-write.c
21648 +msgid "ignoring existing multi-pack-index; checksum mismatch"
21649 +msgstr "忽略已存在的多包索引，校验码不匹配"
21650 +
21651 +#: midx-write.c
21652 +msgid "could not load pack"
21653 +msgstr "不能载入包"
21654 +
21655 +#: midx-write.c
21656 +#, c-format
21657 +msgid "could not open index for %s"
21658 +msgstr "不能打开 %s 的索引"
21659 +
21660 +#: midx-write.c
21661 +msgid "Adding packfiles to multi-pack-index"
21662 +msgstr "添加包文件到多包索引"
21663 +
21664 +#: midx-write.c
21665 +#, c-format
21666 +msgid "unknown preferred pack: '%s'"
21667 +msgstr "未知的首选包：'%s'"
21668 +
21669 +#: midx-write.c
21670 +#, c-format
21671 +msgid "cannot select preferred pack %s with no objects"
21672 +msgstr "不能选择没有对象的首选包 %s"
21673 +
21674 +#: midx-write.c
21675 +#, c-format
21676 +msgid "did not see pack-file %s to drop"
21677 +msgstr "没有看到要丢弃的包文件 %s"
21678 +
21679 +#: midx-write.c
21680 +#, c-format
21681 +msgid "preferred pack '%s' is expired"
21682 +msgstr "首选包 '%s' 已过期"
21683 +
21684 +#: midx-write.c
21685 +msgid "no pack files to index."
21686 +msgstr "没有要索引的包文件。"
21687 +
21688 +#: midx-write.c
21689 +msgid "refusing to write multi-pack .bitmap without any objects"
21690 +msgstr "拒绝写入没有任何对象的多包位图"
21691 +
21692 +#: midx-write.c
21693 +msgid "could not write multi-pack bitmap"
21694 +msgstr "无法写入多包位图"
21695 +
21696 +#: midx-write.c
21697 +msgid "could not write multi-pack-index"
21698 +msgstr "无法写入多包索引"
21699 +
21700 +#: midx-write.c
21701 +msgid "Counting referenced objects"
21702 +msgstr "正在对引用对象计数"
21703 +
21704 +#: midx-write.c
21705 +msgid "Finding and deleting unreferenced packfiles"
21706 +msgstr "正在查找和删除未引用的包文件"
21707 +
21708 +#: midx-write.c
21709 +msgid "could not start pack-objects"
21710 +msgstr "不能开始 pack-objects"
21711 +
21712 +#: midx-write.c
21713 +msgid "could not finish pack-objects"
21714 +msgstr "不能结束 pack-objects"
21715 +
21716 #: midx.c
21717 msgid "multi-pack-index OID fanout is of the wrong size"
21718 msgstr "多包索引的对象 ID 扇出表大小错误"
@@ -21626,88 +21798,6 @@ msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
21798 msgid "multi-pack-index large offset out of bounds"
21799 msgstr "多包索引大偏移区越界"
21800
21629 -#: midx.c
21630 -#, c-format
21631 -msgid "failed to add packfile '%s'"
21632 -msgstr "无法添加包文件 '%s'"
21633 -
21634 -#: midx.c
21635 -#, c-format
21636 -msgid "failed to open pack-index '%s'"
21637 -msgstr "无法打开包索引 '%s'"
21638 -
21639 -#: midx.c
21640 -#, c-format
21641 -msgid "failed to locate object %d in packfile"
21642 -msgstr "无法在包文件中定位对象 %d"
21643 -
21644 -#: midx.c
21645 -msgid "cannot store reverse index file"
21646 -msgstr "无法存储反向索引文件"
21647 -
21648 -#: midx.c
21649 -#, c-format
21650 -msgid "could not parse line: %s"
21651 -msgstr "不能解析行：%s"
21652 -
21653 -#: midx.c
21654 -#, c-format
21655 -msgid "malformed line: %s"
21656 -msgstr "格式错误的行：%s"
21657 -
21658 -#: midx.c
21659 -msgid "ignoring existing multi-pack-index; checksum mismatch"
21660 -msgstr "忽略已存在的多包索引，校验码不匹配"
21661 -
21662 -#: midx.c
21663 -msgid "could not load pack"
21664 -msgstr "不能载入包"
21665 -
21666 -#: midx.c
21667 -#, c-format
21668 -msgid "could not open index for %s"
21669 -msgstr "不能打开 %s 的索引"
21670 -
21671 -#: midx.c
21672 -msgid "Adding packfiles to multi-pack-index"
21673 -msgstr "添加包文件到多包索引"
21674 -
21675 -#: midx.c
21676 -#, c-format
21677 -msgid "unknown preferred pack: '%s'"
21678 -msgstr "未知的首选包：'%s'"
21679 -
21680 -#: midx.c
21681 -#, c-format
21682 -msgid "cannot select preferred pack %s with no objects"
21683 -msgstr "不能选择没有对象的首选包 %s"
21684 -
21685 -#: midx.c
21686 -#, c-format
21687 -msgid "did not see pack-file %s to drop"
21688 -msgstr "没有看到要丢弃的包文件 %s"
21689 -
21690 -#: midx.c
21691 -#, c-format
21692 -msgid "preferred pack '%s' is expired"
21693 -msgstr "首选包 '%s' 已过期"
21694 -
21695 -#: midx.c
21696 -msgid "no pack files to index."
21697 -msgstr "没有要索引的包文件。"
21698 -
21699 -#: midx.c
21700 -msgid "refusing to write multi-pack .bitmap without any objects"
21701 -msgstr "拒绝写入没有任何对象的多包位图 .bitmap"
21702 -
21703 -#: midx.c
21704 -msgid "could not write multi-pack bitmap"
21705 -msgstr "无法写入多包位图"
21706 -
21707 -#: midx.c
21708 -msgid "could not write multi-pack-index"
21709 -msgstr "无法写入多包索引"
21710 -
21801 #: midx.c
21802 #, c-format
21803 msgid "failed to clear multi-pack-index at %s"
@@ -21761,22 +21851,6 @@ msgstr "无法为包文件 %s 加载包索引"
21851 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
21852 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
21853
21764 -#: midx.c
21765 -msgid "Counting referenced objects"
21766 -msgstr "正在对引用对象计数"
21767 -
21768 -#: midx.c
21769 -msgid "Finding and deleting unreferenced packfiles"
21770 -msgstr "正在查找和删除未引用的包文件"
21771 -
21772 -#: midx.c
21773 -msgid "could not start pack-objects"
21774 -msgstr "不能开始 pack-objects"
21775 -
21776 -#: midx.c
21777 -msgid "could not finish pack-objects"
21778 -msgstr "不能结束 pack-objects"
21779 -
21854 #: name-hash.c
21855 #, c-format
21856 msgid "unable to create lazy_dir thread: %s"
@@ -21831,6 +21905,30 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
21905 msgid "Bad %s value: '%s'"
21906 msgstr "坏的 %s 值：'%s'"
21907
21908 +#: object-file-convert.c
21909 +msgid "failed to decode tree entry"
21910 +msgstr "无法解码树对象"
21911 +
21912 +#: object-file-convert.c
21913 +#, c-format
21914 +msgid "failed to map tree entry for %s"
21915 +msgstr "无法为 %s 映射树对象"
21916 +
21917 +#: object-file-convert.c
21918 +#, c-format
21919 +msgid "bad %s in commit"
21920 +msgstr "提交中有错误的 %s"
21921 +
21922 +#: object-file-convert.c
21923 +#, c-format
21924 +msgid "unable to map %s %s in commit object"
21925 +msgstr "无法将 %s %s 映射到提交对象中"
21926 +
21927 +#: object-file-convert.c
21928 +#, c-format
21929 +msgid "Failed to convert object from %s to %s"
21930 +msgstr "无法将对象从 %s 转换为 %s"
21931 +
21932 #: object-file.c
21933 #, c-format
21934 msgid "object directory %s does not exist; check .git/objects/info/alternates"
@@ -21957,6 +22055,11 @@ msgstr "找不到 %2$s 的替代 %1$s"
22055 msgid "packed object %s (stored in %s) is corrupt"
22056 msgstr "打包对象 %s（保存在 %s）已损坏"
22057
22058 +#: object-file.c
22059 +#, c-format
22060 +msgid "missing mapping of %s to %s"
22061 +msgstr "缺少 %s 到 %s 的映射"
22062 +
22063 #: object-file.c
22064 #, c-format
22065 msgid "unable to write file %s"
@@ -22024,6 +22127,11 @@ msgstr "无法创建目录 %s"
22127 msgid "cannot read object for %s"
22128 msgstr "不能读取对象 %s"
22129
22130 +#: object-file.c
22131 +#, c-format
22132 +msgid "cannot map object %s to %s"
22133 +msgstr "无法将对象 %s 映射到 %s"
22134 +
22135 #: object-file.c
22136 #, c-format
22137 msgid "object fails fsck: %s"
@@ -22386,6 +22494,10 @@ msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断"
22494 msgid "unable to load pack: '%s', disabling pack-reuse"
22495 msgstr "无法打开包：'%s'，禁用包重用"
22496
22497 +#: pack-bitmap.c
22498 +msgid "unable to compute preferred pack, disabling pack-reuse"
22499 +msgstr "无法计算首选包，禁用包重用"
22500 +
22501 #: pack-bitmap.c
22502 #, c-format
22503 msgid "object '%s' not found in type bitmaps"
@@ -23656,6 +23768,84 @@ msgstr "无法删除引用 %s：%s"
23768 msgid "could not delete references: %s"
23769 msgstr "无法删除引用：%s"
23770
23771 +#: refs/reftable-backend.c
23772 +#, c-format
23773 +msgid "refname is dangerous: %s"
23774 +msgstr "危险的引用名称：%s"
23775 +
23776 +#: refs/reftable-backend.c
23777 +#, c-format
23778 +msgid "trying to write ref '%s' with nonexistent object %s"
23779 +msgstr "试图用不存在的对象 %2$s 写入引用 '%1$s'"
23780 +
23781 +#: refs/reftable-backend.c
23782 +#, c-format
23783 +msgid "trying to write non-commit object %s to branch '%s'"
23784 +msgstr "尝试将非提交对象 %s 写入分支 '%s'"
23785 +
23786 +#: refs/reftable-backend.c
23787 +#, c-format
23788 +msgid ""
23789 +"multiple updates for 'HEAD' (including one via its referent '%s') are not "
23790 +"allowed"
23791 +msgstr "不允许对 'HEAD' 进行多次更新（包括通过其引用 '%s' 进行的更新）"
23792 +
23793 +#: refs/reftable-backend.c
23794 +#, c-format
23795 +msgid "cannot lock ref '%s': unable to resolve reference '%s'"
23796 +msgstr "无法锁定引用 '%s'：无法解析引用 '%s'"
23797 +
23798 +#: refs/reftable-backend.c
23799 +#, c-format
23800 +msgid "cannot lock ref '%s': error reading reference"
23801 +msgstr "无法锁定引用 '%s'：读取引用时出错"
23802 +
23803 +#: refs/reftable-backend.c
23804 +#, c-format
23805 +msgid ""
23806 +"multiple updates for '%s' (including one via symref '%s') are not allowed"
23807 +msgstr "不允许对 '%s' 进行多次更新（包括通过符号引用 '%s' 更新）"
23808 +
23809 +#: refs/reftable-backend.c
23810 +#, c-format
23811 +msgid "cannot lock ref '%s': reference already exists"
23812 +msgstr "无法锁定引用 '%s'：引用已存在"
23813 +
23814 +#: refs/reftable-backend.c
23815 +#, c-format
23816 +msgid "cannot lock ref '%s': reference is missing but expected %s"
23817 +msgstr "无法锁定 '%s' 引用：引用丢失，但预期为 %s"
23818 +
23819 +#: refs/reftable-backend.c
23820 +#, c-format
23821 +msgid "cannot lock ref '%s': is at %s but expected %s"
23822 +msgstr "无法锁定 '%s' 引用：位于 %s，但预期为 %s"
23823 +
23824 +#: refs/reftable-backend.c
23825 +#, c-format
23826 +msgid "reftable: transaction prepare: %s"
23827 +msgstr "reftable: 事务准备：%s"
23828 +
23829 +#: refs/reftable-backend.c
23830 +#, c-format
23831 +msgid "reftable: transaction failure: %s"
23832 +msgstr "reftable: 事务失败：%s"
23833 +
23834 +#: refs/reftable-backend.c
23835 +#, c-format
23836 +msgid "unable to compact stack: %s"
23837 +msgstr "无法压缩栈：%s"
23838 +
23839 +#: refs/reftable-backend.c
23840 +#, c-format
23841 +msgid "refname %s not found"
23842 +msgstr "引用名称 %s 未找到"
23843 +
23844 +#: refs/reftable-backend.c
23845 +#, c-format
23846 +msgid "refname %s is a symbolic ref, copying it is not supported"
23847 +msgstr "引用名 %s 是一个符号引用，不支持复制"
23848 +
23849 #: refspec.c
23850 #, c-format
23851 msgid "invalid refspec '%s'"
@@ -23666,6 +23856,11 @@ msgstr "无效的引用规格：'%s'"
23856 msgid "invalid quoting in push-option value: '%s'"
23857 msgstr "在 push-option 取值中无效的引号：'%s'"
23858
23859 +#: remote-curl.c
23860 +#, c-format
23861 +msgid "unknown value for object-format: %s"
23862 +msgstr "对象格式的未知取值：%s"
23863 +
23864 #: remote-curl.c
23865 #, c-format
23866 msgid "%sinfo/refs not valid: is this a git repository?"
@@ -24203,8 +24398,21 @@ msgstr "resolve-undo 记录 `%s`，现缺失"
24398
24399 #: revision.c
24400 #, c-format
24206 -msgid "could not get commit for ancestry-path argument %s"
24207 -msgstr "无法获得 ancestry-path 参数 %s 的提交"
24401 +msgid "%s exists but is a symbolic ref"
24402 +msgstr "%s 存在但是一个符号引用"
24403 +
24404 +#: revision.c
24405 +msgid ""
24406 +"--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, "
24407 +"REVERT_HEAD or REBASE_HEAD"
24408 +msgstr ""
24409 +"--merge 选项需要指定 MERGE_HEAD、CHERRY_PICK_HEAD、REVERT_HEAD 或 "
24410 +"REBASE_HEAD 中的一个伪引用"
24411 +
24412 +#: revision.c
24413 +#, c-format
24414 +msgid "could not get commit for --ancestry-path argument %s"
24415 +msgstr "无法获得 --ancestry-path 参数 %s 的提交"
24416
24417 #: revision.c
24418 msgid "--unpacked=<packfile> no longer supported"
@@ -24563,6 +24771,19 @@ msgstr "变基"
24771 msgid "unknown action: %d"
24772 msgstr "未知动作：%d"
24773
24774 +#: sequencer.c
24775 +msgid ""
24776 +"Resolve all conflicts manually, mark them as resolved with\n"
24777 +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
24778 +"You can instead skip this commit: run \"git rebase --skip\".\n"
24779 +"To abort and get back to the state before \"git rebase\", run \"git rebase --"
24780 +"abort\"."
24781 +msgstr ""
24782 +"手工解决所有冲突，执行 \"git add/rm <冲突的文件>\" 标记\n"
24783 +"冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n"
24784 +"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
24785 +"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
24786 +
24787 #: sequencer.c
24788 msgid ""
24789 "after resolving the conflicts, mark the corrected paths\n"
@@ -24811,11 +25032,6 @@ msgstr "损坏的作者：缺失日期信息"
25032 msgid "could not update %s"
25033 msgstr "不能更新 %s"
25034
24814 -#: sequencer.c
24815 -#, c-format
24816 -msgid "could not parse commit %s"
24817 -msgstr "不能解析提交 %s"
24818 -
25035 #: sequencer.c
25036 #, c-format
25037 msgid "could not parse parent commit %s"
@@ -24946,11 +25162,6 @@ msgstr "update-ref 需要一个完整的引用名，例如：refs/heads/%s"
25162 msgid "invalid command '%.*s'"
25163 msgstr "无效命令 '%.*s'"
25164
24949 -#: sequencer.c
24950 -#, c-format
24951 -msgid "%s does not accept arguments: '%s'"
24952 -msgstr "%s 不接受参数：'%s'"
24953 -
25165 #: sequencer.c
25166 #, c-format
25167 msgid "missing arguments for %s"
@@ -25500,6 +25711,11 @@ msgstr ""
25711 msgid "unable to set up work tree using invalid config"
25712 msgstr "无法使用无效配置来创建工作区"
25713
25714 +#: setup.c
25715 +#, c-format
25716 +msgid "'%s' already specified as '%s'"
25717 +msgstr "'%s' 已指定为 '%s'"
25718 +
25719 #: setup.c
25720 #, c-format
25721 msgid "Expected git repo version <= %d, found %d"
@@ -25732,6 +25948,24 @@ msgstr "索引条目是一个目录，但不是稀疏的 (%08x)"
25948 msgid "cannot use split index with a sparse index"
25949 msgstr "拆分索引无法与稀疏索引一起使用"
25950
25951 +#. TRANSLATORS: The first %s is a command like "ls-tree".
25952 +#: strbuf.c
25953 +#, c-format
25954 +msgid "bad %s format: element '%s' does not start with '('"
25955 +msgstr "坏的 %s 格式：元素 '%s' 没有以 '(' 开头"
25956 +
25957 +#. TRANSLATORS: The first %s is a command like "ls-tree".
25958 +#: strbuf.c
25959 +#, c-format
25960 +msgid "bad %s format: element '%s' does not end in ')'"
25961 +msgstr "坏的 %s 格式：元素 '%s' 没有以 ')' 结尾"
25962 +
25963 +#. TRANSLATORS: %s is a command like "ls-tree".
25964 +#: strbuf.c
25965 +#, c-format
25966 +msgid "bad %s format: %%%.*s"
25967 +msgstr "坏的 %s 格式: %%%.*s"
25968 +
25969 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
25970 #: strbuf.c
25971 #, c-format
@@ -26123,35 +26357,6 @@ msgstr "键 '%2$s' 的未知取值 '%1$s'"
26357 msgid "empty trailer token in trailer '%.*s'"
26358 msgstr "尾注 '%.*s' 的键为空"
26359
26126 -#: trailer.c
26127 -#, c-format
26128 -msgid "could not read input file '%s'"
26129 -msgstr "不能读取输入文件 '%s'"
26130 -
26131 -#: trailer.c wrapper.c
26132 -#, c-format
26133 -msgid "could not stat %s"
26134 -msgstr "不能对 %s 调用 stat"
26135 -
26136 -#: trailer.c
26137 -#, c-format
26138 -msgid "file %s is not a regular file"
26139 -msgstr "文件 %s 不是一个正规文件"
26140 -
26141 -#: trailer.c
26142 -#, c-format
26143 -msgid "file %s is not writable by user"
26144 -msgstr "文件 %s 用户不可写"
26145 -
26146 -#: trailer.c
26147 -msgid "could not open temporary file"
26148 -msgstr "不能打开临时文件"
26149 -
26150 -#: trailer.c
26151 -#, c-format
26152 -msgid "could not rename temporary file to %s"
26153 -msgstr "不能重命名临时文件为 %s"
26154 -
26360 #: transport-helper.c
26361 msgid "full write to remote helper failed"
26362 msgstr "完整写入远程助手失败"
@@ -26271,8 +26476,8 @@ msgstr "remote-heper 不支持推送，需要引用规格"
26476
26477 #: transport-helper.c
26478 #, c-format
26274 -msgid "helper %s does not support 'force'"
26275 -msgstr "助手 %s 不支持 'force'"
26479 +msgid "helper %s does not support '--force'"
26480 +msgstr "助手 %s 不支持 '--force'"
26481
26482 #: transport-helper.c
26483 msgid "couldn't run fast-export"
@@ -26746,6 +26951,11 @@ msgstr "无效的端口号"
26951 msgid "invalid '..' path segment"
26952 msgstr "无效的 '..' 路径片段"
26953
26954 +#: usage.c
26955 +#, c-format
26956 +msgid "error: unable to format message: %s\n"
26957 +msgstr "错误：无法格式化消息：%s\n"
26958 +
26959 #: usage.c
26960 msgid "usage: "
26961 msgstr "用法："