@matheusbsbs / matheus-bagliano / commits / bba9dd6a96

l10n: zh_CN: updated translation for 2.48

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

Teng Long committed Jan 4, 2025 at 00:30 UTC bba9dd6a96c464e2b32226be81cb1f30257c78c0
1 file changed +238 -63
po/zh_CN.po
+238 -63
@@ -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-10-05 03:31+0800\n"
158 -"PO-Revision-Date: 2024-10-05 03:32+0800\n"
157 +"POT-Creation-Date: 2025-01-02 20:43+0800\n"
158 +"PO-Revision-Date: 2025-01-05 19:01+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"
@@ -886,10 +886,10 @@ msgstr "只有二进制文件被修改。"
886 #, c-format
887 msgid ""
888 "\n"
889 -"Disable this message with \"git config advice.%s false\""
889 +"Disable this message with \"git config set advice.%s false\""
890 msgstr ""
891 "\n"
892 -"使用 \"git config advice.%s false\" 来关闭此消息"
892 +"使用 \"git config set advice.%s false\" 来关闭此消息"
893
894 #: advice.c
895 #, c-format
@@ -1778,9 +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 "不能检出工作区"
1781 +#: archive.c
1782 +#, c-format
1783 +msgid "failed to unpack tree object %s"
1784 +msgstr "无法解包树对象 %s"
1785
1786 #: archive.c
1787 #, c-format
@@ -1957,7 +1958,7 @@ msgstr "忽略过大的 gitattributes 数据对象 '%s'"
1958
1959 #: attr.c
1960 msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
1960 -msgstr "无法在没有存储库的情况下使用 --attr-source 或 GIT_ATTR_SOURCE"
1961 +msgstr "无法在没有仓库的情况下使用 --attr-source 或 GIT_ATTR_SOURCE"
1962
1963 #: attr.c
1964 msgid "bad --attr-source or GIT_ATTR_SOURCE"
@@ -4813,7 +4814,7 @@ msgstr "未知的冲突风格 '%s'"
4814 msgid "perform a 3-way merge with the new branch"
4815 msgstr "和新的分支执行三方合并"
4816
4816 -#: builtin/checkout.c builtin/log.c parse-options.h
4817 +#: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h
4818 msgid "style"
4819 msgstr "风格"
4820
@@ -4842,8 +4843,8 @@ msgid "update ignored files (default)"
4843 msgstr "更新忽略的文件（默认）"
4844
4845 #: builtin/checkout.c
4845 -msgid "do not check if another worktree is holding the given ref"
4846 -msgstr "不检查指定的引用是否被其他工作区所占用"
4846 +msgid "do not check if another worktree is using this branch"
4847 +msgstr "不检查其他工作区是否正在使用该分支"
4848
4849 #: builtin/checkout.c
4850 msgid "checkout our version for unmerged files"
@@ -5222,14 +5223,13 @@ msgstr "创建一个指定深度的浅克隆"
5223 msgid "create a shallow clone since a specific time"
5224 msgstr "从一个特定时间创建一个浅克隆"
5225
5225 -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
5226 -#: builtin/replay.c
5227 -msgid "revision"
5228 -msgstr "版本"
5226 +#: builtin/clone.c builtin/fetch.c builtin/pull.c
5227 +msgid "ref"
5228 +msgstr "引用"
5229
5230 #: builtin/clone.c builtin/fetch.c builtin/pull.c
5231 -msgid "deepen history of shallow clone, excluding rev"
5232 -msgstr "深化浅克隆的历史，除了特定版本"
5231 +msgid "deepen history of shallow clone, excluding ref"
5232 +msgstr "深化浅克隆的历史，除了给定的引用"
5233
5234 #: builtin/clone.c builtin/submodule--helper.c
5235 msgid "clone only one branch, HEAD or --branch"
@@ -5390,6 +5390,10 @@ msgstr "无法初始化稀疏检出"
5390 msgid "remote HEAD refers to nonexistent ref, unable to checkout"
5391 msgstr "远程 HEAD 指向一个不存在的引用，无法检出"
5392
5393 +#: builtin/clone.c
5394 +msgid "unable to checkout working tree"
5395 +msgstr "不能检出工作区"
5396 +
5397 #: builtin/clone.c
5398 msgid "unable to write parameters to config file"
5399 msgstr "无法将参数写入配置文件"
@@ -6368,10 +6372,9 @@ msgstr ""
6372 #: builtin/config.c
6373 msgid ""
6374 "git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
6371 -"<name> <value>"
6375 +"<name>"
6376 msgstr ""
6373 -"git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <名称> <"
6374 -"值>"
6377 +"git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <名称>"
6378
6379 #: builtin/config.c
6380 msgid "git config rename-section [<file-option>] <old-name> <new-name>"
@@ -6915,12 +6918,8 @@ msgstr "已遍历 %lu 个提交\n"
6918
6919 #: builtin/describe.c
6920 #, c-format
6918 -msgid ""
6919 -"more than %i tags found; listed %i most recent\n"
6920 -"gave up search at %s\n"
6921 -msgstr ""
6922 -"发现多于 %i 个标签，列出最近的 %i 个\n"
6923 -"在 %s 放弃搜索\n"
6921 +msgid "found %i tags; gave up search at %s\n"
6922 +msgstr "找到 %i 个标签；在 %s 处放弃搜索\n"
6923
6924 #: builtin/describe.c
6925 #, c-format
@@ -7468,6 +7467,21 @@ msgstr "%s 不是一个有效的对象"
7467 msgid "the object %s does not exist"
7468 msgstr "对象 '%s' 不存在"
7469
7470 +#: builtin/fetch.c
7471 +#, c-format
7472 +msgid ""
7473 +"Run 'git remote set-head %s %s' to follow the change, or set\n"
7474 +"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
7475 +"if you do not want to see this message. Specifically running\n"
7476 +"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n"
7477 +"until the remote changes HEAD to something else."
7478 +msgstr ""
7479 +"运行 'git remote set-head %s %s' 以跟随更改，或者\n"
7480 +"如果您不想看到此消息，则将'remote.%s.followRemoteHEAD' 配置选项设置为不同的"
7481 +"值。\n"
7482 +"特别地，运行 'git config set remote.%s.followRemoteHEAD %s' 将禁用警告，直到"
7483 +"远程将 HEAD 更改为其他内容。\""
7484 +
7485 #: builtin/fetch.c
7486 msgid "multiple branches detected, incompatible with --set-upstream"
7487 msgstr "检测到多分支，和 --set-upstream 不兼容"
@@ -7635,6 +7649,10 @@ msgstr "引用映射"
7649 msgid "specify fetch refmap"
7650 msgstr "指定获取操作的引用映射"
7651
7652 +#: builtin/fetch.c builtin/pull.c builtin/rebase.c builtin/replay.c
7653 +msgid "revision"
7654 +msgstr "版本"
7655 +
7656 #: builtin/fetch.c builtin/pull.c
7657 msgid "report that we have only objects reachable from this object"
7658 msgstr "报告我们只拥有从该对象开始可达的对象"
@@ -7830,7 +7848,7 @@ msgstr "存储着仓库路径列表的配置项键名"
7848
7849 #: builtin/for-each-repo.c
7850 msgid "keep going even if command fails in a repository"
7833 -msgstr "即使存储库中的命令失败，仍继续执行"
7851 +msgstr "即使仓库中的命令失败，仍继续执行"
7852
7853 #: builtin/for-each-repo.c
7854 msgid "missing --config=<config>"
@@ -8546,8 +8564,24 @@ msgid "%s scheduler is not available"
8564 msgstr "%s 调度器不可用"
8565
8566 #: builtin/gc.c
8549 -msgid "another process is scheduling background maintenance"
8550 -msgstr "另外一个进程正运行于后台维护"
8567 +#, c-format
8568 +msgid ""
8569 +"unable to create '%s.lock': %s.\n"
8570 +"\n"
8571 +"Another scheduled git-maintenance(1) process seems to be running in this\n"
8572 +"repository. Please make sure no other maintenance processes are running and\n"
8573 +"then try again. If it still fails, a git-maintenance(1) process may have\n"
8574 +"crashed in this repository earlier: remove the file manually to continue."
8575 +msgstr ""
8576 +"无法创建 '%s.lock'：%s。\n"
8577 +"\n"
8578 +"另一个已计划的 git-maintenance(1) 进程似乎正在该仓库中运行。\n"
8579 +"请确保没有其他维护进程正在运行，然后重试。如果仍然运行失败，则\n"
8580 +"git-maintenance(1) 进程可能之前已在此仓库中崩溃：请手动删除该文件以继续。"
8581 +
8582 +#: builtin/gc.c
8583 +msgid "cannot acquire lock for scheduled background maintenance"
8584 +msgstr "无法获取计划的后台维护锁"
8585
8586 #: builtin/gc.c
8587 msgid "git maintenance start [--scheduler=<scheduler>]"
@@ -9272,6 +9306,23 @@ msgid_plural "chain length = %d: %lu objects"
9306 msgstr[0] "链长 = %d: %lu 对象"
9307 msgstr[1] "链长 = %d: %lu 对象"
9308
9309 +#: builtin/index-pack.c
9310 +msgid "could not start pack-objects to repack local links"
9311 +msgstr "无法启动 pack-objects 来重新打包本地链接"
9312 +
9313 +#: builtin/index-pack.c
9314 +msgid "failed to feed local object to pack-objects"
9315 +msgstr "无法将本地对象提供给 pack-objects"
9316 +
9317 +#: builtin/index-pack.c
9318 +msgid "index-pack: Expecting full hex object ID lines only from pack-objects."
9319 +msgstr ""
9320 +"index-pack：期望仅从 pack-objects 的输出行中获得完整的十六进制对象 ID。"
9321 +
9322 +#: builtin/index-pack.c
9323 +msgid "could not finish pack-objects to repack local links"
9324 +msgstr "无法完成 pack-objects 来重新打包本地链接"
9325 +
9326 #: builtin/index-pack.c
9327 msgid "Cannot come back to cwd"
9328 msgstr "无法返回当前工作目录"
@@ -9286,6 +9337,10 @@ msgstr "错误选项 %s"
9337 msgid "unknown hash algorithm '%s'"
9338 msgstr "未知的哈希算法 '%s'"
9339
9340 +#: builtin/index-pack.c
9341 +msgid "--promisor cannot be used with a pack name"
9342 +msgstr "--promisor 无法与包名称一起使用"
9343 +
9344 #: builtin/index-pack.c
9345 msgid "--stdin requires a git repository"
9346 msgstr "--stdin 需要 git 仓库"
@@ -11002,11 +11057,11 @@ msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
11057 msgid ""
11058 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
11059 "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
11005 -"| -C) <object>] [<object>]"
11060 +"| -C) <object>] [<object>] [-e]"
11061 msgstr ""
11062 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [--[no-]separator|--"
11063 "separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <"
11009 -"对象>] [<对象>]"
11064 +"对象>] [<对象>] [-e]"
11065
11066 #: builtin/notes.c
11067 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
@@ -11016,11 +11071,11 @@ msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
11071 msgid ""
11072 "git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
11073 "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
11019 -"| -C) <object>] [<object>]"
11074 +"| -C) <object>] [<object>] [-e]"
11075 msgstr ""
11076 "git notes [--ref <注解引用>] append [--allow-empty] [--[no-]separator|--"
11077 "separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <"
11023 -"对象>] [<对象>]"
11078 +"对象>] [<对象>] [-e]"
11079
11080 #: builtin/notes.c
11081 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
@@ -11171,6 +11226,10 @@ msgstr "注解内容到一个文件中"
11226 msgid "reuse and edit specified note object"
11227 msgstr "重用和编辑指定的注解对象"
11228
11229 +#: builtin/notes.c
11230 +msgid "edit note message in editor"
11231 +msgstr "在编辑器中编辑注释说明"
11232 +
11233 #: builtin/notes.c
11234 msgid "reuse specified note object"
11235 msgstr "重用指定的注解对象"
@@ -11784,6 +11843,10 @@ msgstr "处理丢失的对象"
11843 msgid "do not pack objects in promisor packfiles"
11844 msgstr "不要打包 promisor 包文件中的对象"
11845
11846 +#: builtin/pack-objects.c
11847 +msgid "implies --missing=allow-any"
11848 +msgstr "暗含 --missing=allow-any"
11849 +
11850 #: builtin/pack-objects.c
11851 msgid "respect islands during delta compression"
11852 msgstr "在增量压缩时参考数据岛"
@@ -13668,6 +13731,33 @@ msgid_plural " Local refs configured for 'git push'%s:"
13731 msgstr[0] " 为 'git push' 配置的本地引用%s："
13732 msgstr[1] " 为 'git push' 配置的本地引用%s："
13733
13734 +#: builtin/remote.c
13735 +#, c-format
13736 +msgid "'%s/HEAD' is unchanged and points to '%s'\n"
13737 +msgstr "'%s/HEAD' 未改变并指向 '%s'\n"
13738 +
13739 +#: builtin/remote.c
13740 +#, c-format
13741 +msgid "'%s/HEAD' has changed from '%s' and now points to '%s'\n"
13742 +msgstr "'%s/HEAD' 已从 '%s' 更改，现在指向 '%s'\n"
13743 +
13744 +#: builtin/remote.c
13745 +#, c-format
13746 +msgid "'%s/HEAD' is now created and points to '%s'\n"
13747 +msgstr "'%s/HEAD' 现已创建并指向 '%s'\n"
13748 +
13749 +#: builtin/remote.c
13750 +#, c-format
13751 +msgid "'%s/HEAD' was detached at '%s' and now points to '%s'\n"
13752 +msgstr "'%s/HEAD' 在 '%s' 处分离并且现在指向 '%s'\n"
13753 +
13754 +#: builtin/remote.c
13755 +#, c-format
13756 +msgid ""
13757 +"'%s/HEAD' used to point to '%s' (which is not a remote branch), but now "
13758 +"points to '%s'\n"
13759 +msgstr "'%s/HEAD' 曾指向 '%s'（不是远程分支），但现在指向 '%s'\n"
13760 +
13761 #: builtin/remote.c
13762 msgid "set refs/remotes/<name>/HEAD according to remote"
13763 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
@@ -13696,7 +13786,7 @@ msgstr "不是一个有效引用：%s"
13786
13787 #: builtin/remote.c
13788 #, c-format
13699 -msgid "Could not setup %s"
13789 +msgid "Could not set up %s"
13790 msgstr "不能设置 %s"
13791
13792 # 译者：注意保持前导空格
@@ -17034,6 +17124,10 @@ msgstr "设置跟踪模式（参见 git-branch(1)）"
17124 msgid "try to match the new branch name with a remote-tracking branch"
17125 msgstr "尝试为新分支名匹配一个远程跟踪分支"
17126
17127 +#: builtin/worktree.c
17128 +msgid "use relative paths for worktrees"
17129 +msgstr "对工作区使用相对路径"
17130 +
17131 #: builtin/worktree.c diff.c parse-options.c
17132 #, c-format
17133 msgid "options '%s', '%s', and '%s' cannot be used together"
@@ -17370,6 +17464,30 @@ msgstr "不能创建 '%s'"
17464 msgid "index-pack died"
17465 msgstr "index-pack 终止"
17466
17467 +#: cache-tree.c
17468 +#, c-format
17469 +msgid "directory '%s' is present in index, but not sparse"
17470 +msgstr "目录 '%s' 存在于索引中，但不是稀疏的"
17471 +
17472 +#: cache-tree.c unpack-trees.c
17473 +msgid "corrupted cache-tree has entries not present in index"
17474 +msgstr "损坏的缓存树包含索引中不存在的条目"
17475 +
17476 +#: cache-tree.c
17477 +#, c-format
17478 +msgid "%s with flags 0x%x should not be in cache-tree"
17479 +msgstr "标志位为 0x%2$x 的 %1$s 不应位于缓存树中"
17480 +
17481 +#: cache-tree.c
17482 +#, c-format
17483 +msgid "bad subtree '%.*s'"
17484 +msgstr "损坏的子树 '%.*s'"
17485 +
17486 +#: cache-tree.c
17487 +#, c-format
17488 +msgid "cache-tree for path %.*s does not match. Expected %s got %s"
17489 +msgstr "路径 %.*s 的缓存树不匹配。预期为 %s，实际为 %s"
17490 +
17491 #: chunk-format.c
17492 msgid "terminating chunk id appears earlier than expected"
17493 msgstr "终止块 ID 比预期更早出现"
@@ -18477,15 +18595,15 @@ msgid ""
18595 "to convert the grafts into replace refs.\n"
18596 "\n"
18597 "Turn this message off by running\n"
18480 -"\"git config advice.graftFileDeprecated false\""
18598 +"\"git config set advice.graftFileDeprecated false\""
18599 msgstr ""
18600 "对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n"
18601 "未来的Git版本中被移除。\n"
18602 "\n"
18603 "请使用 \"git replace --convert-graft-file\" 将\n"
18486 -"grafts 转换为替换引用。\n"
18604 +"（提交）移植转换为替换引用。\n"
18605 "\n"
18488 -"设置 \"git config advice.graftFileDeprecated false\"\n"
18606 +"运行 \"git config set advice.graftFileDeprecated false\"\n"
18607 "可关闭本消息"
18608
18609 #: commit.c
@@ -19485,6 +19603,21 @@ msgstr "URL 没有 scheme：%s"
19603 msgid "credential url cannot be parsed: %s"
19604 msgstr "不能解析凭据 URL：%s"
19605
19606 +#: daemon.c
19607 +#, c-format
19608 +msgid "invalid timeout '%s', expecting a non-negative integer"
19609 +msgstr "无效的超时值 '%s'，应为非负整数"
19610 +
19611 +#: daemon.c
19612 +#, c-format
19613 +msgid "invalid init-timeout '%s', expecting a non-negative integer"
19614 +msgstr "无效的初始超时值 '%s'，应为非负整数"
19615 +
19616 +#: daemon.c
19617 +#, c-format
19618 +msgid "invalid max-connections '%s', expecting an integer"
19619 +msgstr "无效的最大连接数 '%s'，应为一个整数"
19620 +
19621 #: date.c
19622 msgid "in the future"
19623 msgstr "在将来"
@@ -20351,6 +20484,20 @@ msgstr "错误的 git 名字空间路径 \"%s\""
20484 msgid "too many args to run %s"
20485 msgstr "执行 %s 的参数太多"
20486
20487 +#: fetch-pack.c
20488 +#, c-format
20489 +msgid ""
20490 +"You are attempting to fetch %s, which is in the commit graph file but not in "
20491 +"the object database.\n"
20492 +"This is probably due to repo corruption.\n"
20493 +"If you are attempting to repair this repo corruption by refetching the "
20494 +"missing object, use 'git fetch --refetch' with the missing object."
20495 +msgstr ""
20496 +"您正在尝试获取 %s，它位于提交图文件中，但不在对象数据库中。\n"
20497 +"这可能是由于仓库损坏造成的。\n"
20498 +"如果您尝试通过重新获取丢失的对象来修复此仓库损坏，请对丢失的对象使用 'git "
20499 +"fetch --refetch'。"
20500 +
20501 #: fetch-pack.c
20502 msgid "git fetch-pack: expected shallow list"
20503 msgstr "git fetch-pack：应为 shallow 列表"
@@ -21062,10 +21209,10 @@ msgstr[1] ""
21209 #, c-format
21210 msgid ""
21211 "The '%s' hook was ignored because it's not set as executable.\n"
21065 -"You can disable this warning with `git config advice.ignoredHook false`."
21212 +"You can disable this warning with `git config set advice.ignoredHook false`."
21213 msgstr ""
21214 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
21068 -"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
21215 +"配置 `git config set advice.ignoredHook false` 来关闭这条警告。"
21216
21217 #: http-fetch.c
21218 msgid "not a git repository"
@@ -21085,18 +21232,10 @@ msgstr "http.postBuffer 为负值，默认为 %d"
21232 msgid "Delegation control is not supported with cURL < 7.22.0"
21233 msgstr "不支持委托控制，因为 cURL < 7.22.0"
21234
21088 -#: http.c
21089 -msgid "Public key pinning not supported with cURL < 7.39.0"
21090 -msgstr "不支持公钥文件锁定，因为 cURL < 7.39.0"
21091 -
21235 #: http.c
21236 msgid "Unknown value for http.proactiveauth"
21237 msgstr "http.proactiveauth 为未知取值"
21238
21096 -#: http.c
21097 -msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
21098 -msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
21099 -
21239 #: http.c
21240 #, c-format
21241 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
@@ -21316,6 +21455,11 @@ msgstr "检测到被引用的 CRLF"
21455 msgid "unable to format message: %s"
21456 msgstr "无法格式化消息：%s"
21457
21458 +#: merge-ll.c
21459 +#, c-format
21460 +msgid "invalid marker-size '%s', expecting an integer"
21461 +msgstr "无效的标记大小 '%s'，应为一个整数"
21462 +
21463 #: merge-ort.c merge-recursive.c
21464 #, c-format
21465 msgid "Failed to merge submodule %s (not checked out)"
@@ -22623,7 +22767,7 @@ msgid ""
22767 "\n"
22768 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
22769 "examine these refs and maybe delete them. Turn this message off by\n"
22626 -"running \"git config advice.objectNameWarning false\""
22770 +"running \"git config set advice.objectNameWarning false\""
22771 msgstr ""
22772 "Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n"
22773 "个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"
@@ -22631,7 +22775,7 @@ msgstr ""
22775 " git switch -c $br $(git rev-parse ...)\n"
22776 "\n"
22777 "当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"
22634 -"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
22778 +"引用，可能需要删除它们。运行 \"git config set advice.objectNameWarning\n"
22779 "false\" 命令关闭本消息通知。"
22780
22781 #: object-name.c
@@ -22826,15 +22970,6 @@ msgstr "多包位图缺少必需的反向索引"
22970 msgid "could not open pack %s"
22971 msgstr "不能打开包 %s"
22972
22829 -#: pack-bitmap.c t/helper/test-read-midx.c
22830 -msgid "could not determine MIDX preferred pack"
22831 -msgstr "不能确定多包索引的首选包"
22832 -
22833 -#: pack-bitmap.c
22834 -#, c-format
22835 -msgid "preferred pack (%s) is invalid"
22836 -msgstr "首选包 (%s) 无效"
22837 -
22973 #: pack-bitmap.c
22974 msgid "corrupt bitmap lookup table: triplet position out of index"
22975 msgstr "损坏的位图查询表：三元组位置超出索引"
@@ -24170,8 +24305,19 @@ msgid "log for %s is empty"
24305 msgstr "%s 的日志为空"
24306
24307 #: refs.c
24173 -msgid "refusing to force and skip creation of reflog"
24174 -msgstr "拒绝既强制又跳过创建引用日志"
24308 +#, c-format
24309 +msgid "refusing to update reflog for pseudoref '%s'"
24310 +msgstr "拒绝为伪引用 '%s' 更新引用日志"
24311 +
24312 +#: refs.c
24313 +#, c-format
24314 +msgid "refusing to update pseudoref '%s'"
24315 +msgstr "拒绝更新伪引用 '%s'"
24316 +
24317 +#: refs.c
24318 +#, c-format
24319 +msgid "refusing to update reflog with bad name '%s'"
24320 +msgstr "拒绝使用错误名称 '%s' 更新引用日志"
24321
24322 #: refs.c
24323 #, c-format
@@ -24179,9 +24325,8 @@ msgid "refusing to update ref with bad name '%s'"
24325 msgstr "拒绝更新有错误名称 '%s' 的引用"
24326
24327 #: refs.c
24182 -#, c-format
24183 -msgid "refusing to update pseudoref '%s'"
24184 -msgstr "拒绝更新伪引用 '%s'"
24328 +msgid "refusing to force and skip creation of reflog"
24329 +msgstr "拒绝强制跳过创建引用日志"
24330
24331 #: refs.c
24332 #, c-format
@@ -24242,6 +24387,11 @@ msgid ""
24387 "cannot lock ref '%s': expected symref with target '%s': but is a regular ref"
24388 msgstr "无法锁定引用 '%s'：预期目标为 '%s' 的符号引用：但是是普通引用"
24389
24390 +#: refs/files-backend.c
24391 +#, c-format
24392 +msgid "cannot read ref file '%s'"
24393 +msgstr "无法读取引用文件 '%s'"
24394 +
24395 #: refs/files-backend.c
24396 #, c-format
24397 msgid "cannot open directory %s"
@@ -24498,6 +24648,11 @@ msgstr "提供了一个以上的 receivepack，使用第一个"
24648 msgid "more than one uploadpack given, using the first"
24649 msgstr "提供了一个以上的 uploadpack，使用第一个"
24650
24651 +#: remote.c
24652 +#, c-format
24653 +msgid "unrecognized followRemoteHEAD value '%s' ignored"
24654 +msgstr "已忽略无法识别的 followRemoteHEAD 值 '%s'"
24655 +
24656 #: remote.c
24657 #, c-format
24658 msgid "unrecognized value transfer.credentialsInUrl: '%s'"
@@ -26810,6 +26965,10 @@ msgstr "提交 %s 没有标记为可达"
26965 msgid "too many commits marked reachable"
26966 msgstr "太多提交标记为可达"
26967
26968 +#: t/helper/test-read-midx.c
26969 +msgid "could not determine MIDX preferred pack"
26970 +msgstr "不能确定多包索引的首选包"
26971 +
26972 #: t/helper/test-serve-v2.c
26973 msgid "test-tool serve-v2 [<options>]"
26974 msgstr "test-tool serve-v2 [<选项>]"
@@ -27584,6 +27743,10 @@ msgstr ".git 文件损坏"
27743 msgid ".git file incorrect"
27744 msgstr ".git 文件不正确"
27745
27746 +#: worktree.c
27747 +msgid ".git file absolute/relative path mismatch"
27748 +msgstr ".git 文件绝对/相对路径不匹配"
27749 +
27750 #: worktree.c
27751 msgid "not a valid path"
27752 msgstr "不是一个有效的路径"
@@ -27604,6 +27767,10 @@ msgstr "无法定位仓库，.git 文件损坏"
27767 msgid "gitdir unreadable"
27768 msgstr "gitdir 不可读"
27769
27770 +#: worktree.c
27771 +msgid "gitdir absolute/relative path mismatch"
27772 +msgstr "gitdir 绝对/相对路径不匹配"
27773 +
27774 #: worktree.c
27775 msgid "gitdir incorrect"
27776 msgstr "gitdir 不正确"
@@ -27648,6 +27815,14 @@ msgstr "无法在 '%2$s' 中取消设置 %1$s"
27815 msgid "failed to set extensions.worktreeConfig setting"
27816 msgstr "无法设置 extensions.worktreeConfig"
27817
27818 +#: worktree.c
27819 +msgid "unable to upgrade repository format to support relative worktrees"
27820 +msgstr "无法升级仓库格式以支持相对工作区"
27821 +
27822 +#: worktree.c
27823 +msgid "unable to set extensions.relativeWorktrees setting"
27824 +msgstr "无法设定 extensions.relativeWorktrees 的设置"
27825 +
27826 #: wrapper.c
27827 #, c-format
27828 msgid "could not setenv '%s'"