@matheusbsbs / matheus-bagliano / commits / 52f771b3d4

l10n: zh_CN: updated translation for 2.55

Reviewed-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: lilydjwg <lilydjwg@gmail.com>

lilydjwg committed Jun 21, 2026 at 16:16 UTC 52f771b3d413778ba82d1ccc4759f852a298ae54
1 file changed +767 -267
po/zh_CN.po
+767 -267
@@ -28,6 +28,7 @@
28 # amend | 修订
29 # ancestor | 祖先，祖先提交
30 # annotated tag | 附注标签
31 +# backfill | 回填
32 # bare repository | 纯仓库
33 # bisect | 二分查找
34 # bitmap | 位图
@@ -49,6 +50,7 @@
50 # commit object | 提交对象
51 # commit-graph | 提交图
52 # commit-ish (also committish) | 提交号
53 +# compact | 压实
54 # cone | 锥形模式（稀疏检出）；锥（稀疏检出）
55 # conflict | 冲突
56 # core Git | 核心 Git 工具
@@ -174,7 +176,7 @@ msgid ""
176 msgstr ""
177 "Project-Id-Version: Git\n"
178 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
177 -"POT-Creation-Date: 2026-04-10 10:05+0800\n"
179 +"POT-Creation-Date: 2026-06-19 14:43+0800\n"
180 "PO-Revision-Date: 2025-11-16 01:03+0800\n"
181 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
182 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
@@ -185,55 +187,6 @@ msgstr ""
187 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
188 "X-Generator: Gtranslator 42.0\n"
189
188 -#: builtin/fast-import.c
189 -msgid "aborting due to invalid signature"
190 -msgstr "由于签名无效而中止"
191 -
192 -#: builtin/fast-import.c
193 -msgid "failed to sign tag object"
194 -msgstr "无法为标签对象签名"
195 -
196 -#: builtin/history.c
197 -msgid "control which refs should be updated"
198 -msgstr "控制应更新哪些引用"
199 -
200 -#: builtin/history.c
201 -msgid "control ref update behavior"
202 -msgstr "控制引用更新行为"
203 -
204 -#: builtin/replay.c
205 -msgid ""
206 -"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
207 -"advance=<branch> | --revert=<branch>)\n"
208 -"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
209 -msgstr ""
210 -"（实验性！）git replay ([--contained] --onto=<新基线> | --advance=<分支> | --"
211 -"revert=<分支>)\n"
212 -"[--ref=<引用>] [--ref-action=<模式>] <版本范围>"
213 -
214 -#: builtin/replay.c
215 -msgid "reference to update with result"
216 -msgstr "要更新结果的引用"
217 -
218 -#: builtin/stash.c
219 -msgid ""
220 -"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
221 -"| --quiet]\n"
222 -" [-u | --include-untracked] [-a | --all] [(-m | --message) "
223 -"<message>]\n"
224 -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
225 -" [--] [<pathspec>...]"
226 -msgstr ""
227 -"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
228 -"| --quiet]\n"
229 -" [-u | --include-untracked] [-a | --all] [(-m | --message) <消息>]\n"
230 -" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
231 -" [--] [<路径规格>...]"
232 -
233 -#: replay.c
234 -msgid "'--ref' cannot be used with multiple revision ranges"
235 -msgstr "'--ref' 不能与多个版本范围一起使用"
236 -
190 #: add-interactive.c
191 #, c-format
192 msgid "Huh (%s)?"
@@ -815,7 +768,7 @@ msgid ""
768 "aborted and the hunk is left unchanged.\n"
769 msgstr ""
770 "如果无法干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
818 -"此次编辑被终止，该块不会被修改。\n"
771 +"此次编辑被中止，该块不会被修改。\n"
772
773 #: add-patch.c
774 msgid "could not parse hunk header"
@@ -1087,7 +1040,7 @@ msgstr ""
1040
1041 #: advice.c
1042 msgid "Not possible to fast-forward, aborting."
1090 -msgstr "无法快进，终止。"
1043 +msgstr "无法快进，中止。"
1044
1045 #: advice.c
1046 #, c-format
@@ -1176,9 +1129,9 @@ msgstr "命令行以 \\ 结尾"
1129 msgid "unclosed quote"
1130 msgstr "未关闭的引号"
1131
1179 -#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
1180 -#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c
1181 -#: t/helper/test-pkt-line.c
1132 +#: alias.c builtin/cat-file.c builtin/name-rev.c builtin/notes.c
1133 +#: builtin/prune-packed.c builtin/receive-pack.c builtin/refs.c builtin/repo.c
1134 +#: builtin/tag.c t/helper/test-pkt-line.c
1135 msgid "too many arguments"
1136 msgstr "太多参数"
1137
@@ -2190,32 +2143,32 @@ msgstr ""
2143 #: bisect.c
2144 #, c-format
2145 msgid ""
2193 -"The merge base %s is %s.\n"
2146 +"The merge base %s is '%s'.\n"
2147 "This means the first '%s' commit is between %s and [%s].\n"
2148 msgstr ""
2196 -"合并基线 %s 是 %s。\n"
2149 +"合并基线 %s 是 '%s'。\n"
2150 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
2151
2152 #: bisect.c
2153 #, c-format
2154 msgid ""
2202 -"Some %s revs are not ancestors of the %s rev.\n"
2155 +"Some '%s' revs are not ancestors of the '%s' rev.\n"
2156 "git bisect cannot work properly in this case.\n"
2204 -"Maybe you mistook %s and %s revs?\n"
2157 +"Maybe you mistook '%s' and '%s' revs?\n"
2158 msgstr ""
2206 -"一些 %s 版本不是 %s 版本的祖先。\n"
2207 -"这种情况下 git 二分查找无法正常工作。\n"
2208 -"您可能弄错了 %s 和 %s 版本？\n"
2159 +"一些 '%s' 版本不是 '%s' 版本的祖先。\n"
2160 +"这种情况下 git bisect 无法正常工作。\n"
2161 +"也许您弄错了 '%s' 和 '%s' 版本？\n"
2162
2163 #: bisect.c
2164 #, c-format
2165 msgid ""
2166 "the merge base between %s and [%s] must be skipped.\n"
2214 -"So we cannot be sure the first %s commit is between %s and %s.\n"
2167 +"So we cannot be sure the first '%s' commit is between %s and %s.\n"
2168 "We continue anyway."
2169 msgstr ""
2170 "介于 %s 和 [%s] 的合并基线必须被跳过。\n"
2218 -"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
2171 +"所以我们无法确认第一个 '%s' 提交是否介于 %s 和 %s 之间。\n"
2172 "我们仍然继续。"
2173
2174 #: bisect.c
@@ -2225,8 +2178,8 @@ msgstr "二分查找中：合并基线必须经过测试\n"
2178
2179 #: bisect.c
2180 #, c-format
2228 -msgid "a %s revision is needed"
2229 -msgstr "需要一个 %s 版本"
2181 +msgid "a '%s' revision is needed"
2182 +msgstr "需要一个 '%s' 版本"
2183
2184 #: bisect.c
2185 #, c-format
@@ -2249,8 +2202,8 @@ msgstr "读取二分查找引用失败"
2202
2203 #: bisect.c
2204 #, c-format
2252 -msgid "%s was both %s and %s\n"
2253 -msgstr "%s 同时为 %s 和 %s\n"
2205 +msgid "%s was both '%s' and '%s'\n"
2206 +msgstr "%s 同时为 '%s' 和 '%s'\n"
2207
2208 #: bisect.c
2209 #, c-format
@@ -3022,8 +2975,8 @@ msgstr "n"
2975
2976 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2977 #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
3025 -#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c
3026 -#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c
2978 +#: builtin/ls-files.c builtin/ls-tree.c builtin/name-rev.c builtin/refs.c
2979 +#: builtin/replace.c builtin/repo.c builtin/submodule--helper.c builtin/tag.c
2980 #: builtin/verify-tag.c
2981 msgid "format"
2982 msgstr "格式"
@@ -3050,11 +3003,11 @@ msgstr "跳过当前补丁"
3003
3004 #: builtin/am.c
3005 msgid "restore the original branch and abort the patching operation"
3053 -msgstr "恢复原始分支并终止打补丁操作"
3006 +msgstr "恢复原始分支并中止打补丁操作"
3007
3008 #: builtin/am.c
3009 msgid "abort the patching operation but keep HEAD where it is"
3057 -msgstr "终止补丁操作但保持 HEAD 不变"
3010 +msgstr "中止补丁操作但保持 HEAD 不变"
3011
3012 #: builtin/am.c
3013 msgid "show the patch being applied"
@@ -3153,8 +3106,25 @@ msgid "git archive: expected a flush"
3106 msgstr "git archive：应有一个 flush 包"
3107
3108 #: builtin/backfill.c
3156 -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]"
3157 -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]"
3109 +msgid ""
3110 +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] "
3111 +"[<revision-range>]"
3112 +msgstr ""
3113 +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] [<"
3114 +"版本范围>]"
3115 +
3116 +#: builtin/backfill.c
3117 +#, c-format
3118 +msgid "'%s' cannot be used with 'git backfill'"
3119 +msgstr "'%s' 不能和 'git backfill' 同时使用"
3120 +
3121 +#: builtin/backfill.c
3122 +msgid "cannot backfill with these filter options"
3123 +msgstr "无法使用这些过滤选项进行回填"
3124 +
3125 +#: builtin/backfill.c
3126 +msgid "cannot backfill with blob size limits"
3127 +msgstr "无法在有数据对象大小限制的情况下进行回填"
3128
3129 #: builtin/backfill.c
3130 msgid "problem loading sparse-checkout"
@@ -3168,6 +3138,10 @@ msgstr "单次请求的最少对象数量"
3138 msgid "Restrict the missing objects to the current sparse-checkout"
3139 msgstr "将缺少的对象限制在当前的稀疏检出中"
3140
3141 +#: builtin/backfill.c
3142 +msgid "Include blobs from boundary commits in the backfill"
3143 +msgstr "在回填中包含边界提交中的数据对象"
3144 +
3145 #: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c
3146 #: builtin/shortlog.c bundle.c
3147 #, c-format
@@ -3312,19 +3286,21 @@ msgid "Are you sure [Y/n]? "
3286 msgstr "您确认吗 [Y/n]？ "
3287
3288 #: builtin/bisect.c
3315 -msgid "status: waiting for both good and bad commits\n"
3316 -msgstr "状态：正在等待好的和坏的提交\n"
3289 +#, c-format
3290 +msgid "status: waiting for both '%s' and '%s' commits\n"
3291 +msgstr "状态：正在等待 '%s' 和 '%s' 提交\n"
3292
3293 #: builtin/bisect.c
3294 #, c-format
3320 -msgid "status: waiting for bad commit, %d good commit known\n"
3321 -msgid_plural "status: waiting for bad commit, %d good commits known\n"
3322 -msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
3323 -msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
3295 +msgid "status: waiting for '%s' commit, %d '%s' commit known\n"
3296 +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n"
3297 +msgstr[0] "状态：正在等待 '%s' 提交，已知 %d 个 '%s' 提交\n"
3298 +msgstr[1] "状态：正在等待 '%s' 提交，已知 %d 个 '%s' 提交\n"
3299
3300 #: builtin/bisect.c
3326 -msgid "status: waiting for good commit(s), bad commit known\n"
3327 -msgstr "状态：正在等待好的提交，已知坏的提交\n"
3301 +#, c-format
3302 +msgid "status: waiting for '%s' commit(s), '%s' commit known\n"
3303 +msgstr "状态：正在等待 '%s' 提交，已知 '%s' 提交\n"
3304
3305 #: builtin/bisect.c
3306 msgid "no terms defined"
@@ -3333,9 +3309,9 @@ msgstr "未定义术语"
3309 #: builtin/bisect.c
3310 #, c-format
3311 msgid ""
3336 -"Your current terms are %s for the old state\n"
3337 -"and %s for the new state.\n"
3338 -msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
3312 +"Your current terms are '%s' for the old state\n"
3313 +"and '%s' for the new state.\n"
3314 +msgstr "您当前的术语：旧状态为 '%s'，新状态为 '%s'。\n"
3315
3316 #: builtin/bisect.c
3317 #, c-format
@@ -3439,13 +3415,13 @@ msgstr "二分查找运行失败：没有提供命令。"
3415
3416 #: builtin/bisect.c
3417 #, c-format
3442 -msgid "unable to verify %s on good revision"
3443 -msgstr "无法在好版本中验证 %s"
3418 +msgid "unable to verify %s on '%s' revision"
3419 +msgstr "无法在 '%2$s' 版本上验证 %1$s"
3420
3421 #: builtin/bisect.c
3422 #, c-format
3447 -msgid "bogus exit code %d for good revision"
3448 -msgstr "好版本返回错误的退出码 %d"
3423 +msgid "bogus exit code %d for '%s' revision"
3424 +msgstr "'%2$s' 版本返回错误的退出码 %1$d"
3425
3426 #: builtin/bisect.c
3427 #, c-format
@@ -3466,8 +3442,9 @@ msgid "bisect run success"
3442 msgstr "二分查找运行成功"
3443
3444 #: builtin/bisect.c
3469 -msgid "bisect found first bad commit"
3470 -msgstr "二分查找找到了第一个坏的提交"
3445 +#, c-format
3446 +msgid "bisect found first '%s' commit\n"
3447 +msgstr "二分查找找到了第一个 '%s' 提交\n"
3448
3449 #: builtin/bisect.c
3450 #, c-format
@@ -4187,7 +4164,8 @@ msgstr ""
4164 "您可以删除任何您不想共享的内容。\n"
4165
4166 #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
4190 -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h
4167 +#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c
4168 +#: parse-options.h
4169 msgid "mode"
4170 msgstr "模式"
4171
@@ -4311,6 +4289,11 @@ msgstr "解包对象中"
4289 msgid "cannot read object %s '%s'"
4290 msgstr "无法读取对象 %s '%s'"
4291
4292 +#: builtin/cat-file.c
4293 +#, c-format
4294 +msgid "mailmap: invalid boolean '%s'"
4295 +msgstr "mailmap：无效的布尔值 '%s'"
4296 +
4297 #: builtin/cat-file.c
4298 msgid "flush is only for --buffer mode"
4299 msgstr "flush 只在 --buffer 模式中使用"
@@ -4757,15 +4740,6 @@ msgstr "无法读取树（%s）"
4740 msgid "you need to resolve your current index first"
4741 msgstr "您需要先解决当前索引的冲突"
4742
4760 -#: builtin/checkout.c
4761 -#, c-format
4762 -msgid ""
4763 -"cannot continue with staged changes in the following files:\n"
4764 -"%s"
4765 -msgstr ""
4766 -"无法继续，下列文件有暂存的修改：\n"
4767 -"%s"
4768 -
4743 #: builtin/checkout.c
4744 #, c-format
4745 msgid "Can not do reflog for '%s': %s\n"
@@ -4870,6 +4844,11 @@ msgstr "之前的 HEAD 位置是"
4844 msgid "You are on a branch yet to be born"
4845 msgstr "您位于一个尚未初始化的分支"
4846
4847 +#: builtin/checkout.c
4848 +#, c-format
4849 +msgid "The following paths have local changes:\n"
4850 +msgstr "以下路径有本地修改：\n"
4851 +
4852 #: builtin/checkout.c
4853 #, c-format
4854 msgid ""
@@ -6197,7 +6176,7 @@ msgid ""
6176 "with '%s' will be ignored, and an empty message aborts the commit.\n"
6177 msgstr ""
6178 "请为您的变更输入提交说明。以 '%s' 开始的行将被忽略，而一个空的提交\n"
6200 -"说明将会终止提交。\n"
6179 +"说明将会中止提交。\n"
6180
6181 #: builtin/commit.c
6182 #, c-format
@@ -6216,7 +6195,7 @@ msgid ""
6195 "An empty message aborts the commit.\n"
6196 msgstr ""
6197 "请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n"
6219 -"也可以删除它们。一个空的提交说明将会终止提交。\n"
6198 +"也可以删除它们。一个空的提交说明将会中止提交。\n"
6199
6200 #: builtin/commit.c
6201 msgid ""
@@ -6570,17 +6549,17 @@ msgstr "无法读取提交说明：%s"
6549 #: builtin/commit.c builtin/history.c
6550 #, c-format
6551 msgid "Aborting commit due to empty commit message.\n"
6573 -msgstr "由于提交说明为空，终止提交。\n"
6552 +msgstr "由于提交说明为空，中止提交。\n"
6553
6554 #: builtin/commit.c
6555 #, c-format
6556 msgid "Aborting commit; you did not edit the message.\n"
6578 -msgstr "终止提交；您未更改来自模板的提交说明。\n"
6557 +msgstr "中止提交；您未更改来自模板的提交说明。\n"
6558
6559 #: builtin/commit.c
6560 #, c-format
6561 msgid "Aborting commit due to empty commit message body.\n"
6583 -msgstr "因提交说明的正文为空而终止提交。\n"
6562 +msgstr "因提交说明的正文为空而中止提交。\n"
6563
6564 #: builtin/commit.c
6565 msgid ""
@@ -6763,6 +6742,21 @@ msgstr "错误的参数个数，应该为 %d 个"
6742 msgid "wrong number of arguments, should be from %d to %d"
6743 msgstr "错误的参数个数，应为 %d 到 %d 个"
6744
6745 +#: builtin/config.c
6746 +#, c-format
6747 +msgid "missing value to set to the variable '%s'"
6748 +msgstr "缺少要设置给变量 '%s' 的值"
6749 +
6750 +#: builtin/config.c
6751 +#, c-format
6752 +msgid "did you mean \"git config set %s %s\"?"
6753 +msgstr "您的意思是 \"git config set %s %s\" 吗？"
6754 +
6755 +#: builtin/config.c
6756 +#, c-format
6757 +msgid "missing value to set to a variable with an invalid name '%s'"
6758 +msgstr "变量名 '%s' 无效，且缺少要设置的值"
6759 +
6760 #: builtin/config.c
6761 #, c-format
6762 msgid "invalid key pattern: %s"
@@ -7860,7 +7854,7 @@ msgid "not updating %s (new tip %s does not contain %s)"
7854 msgstr "未更新 %s（新的分支顶端 %s 不包含 %s）"
7855
7856 #: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c
7863 -#: sequencer.c
7857 +#: repack-midx.c sequencer.c
7858 #, c-format
7859 msgid "unable to create leading directories of %s"
7860 msgstr "无法为 %s 创建上级目录"
@@ -8155,6 +8149,10 @@ msgstr ""
8149 "正在替换提交的无效签名\n"
8150 " 据称由 %s 签署"
8151
8152 +#: builtin/fast-import.c
8153 +msgid "aborting due to invalid signature"
8154 +msgstr "由于签名无效而中止"
8155 +
8156 #: builtin/fast-import.c
8157 msgid "signing commits in interoperability mode is unsupported"
8158 msgstr "互操作模式下不支持为提交签名"
@@ -8179,6 +8177,10 @@ msgstr "正在剥离提交签名"
8177 msgid "importing a commit signature verbatim"
8178 msgstr "逐字导入提交签名"
8179
8180 +#: builtin/fast-import.c
8181 +msgid "failed to sign tag object"
8182 +msgstr "无法为标签对象签名"
8183 +
8184 #: builtin/fast-import.c
8185 #, c-format
8186 msgid "importing a tag signature verbatim for tag '%s'"
@@ -8519,15 +8521,20 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
8521 msgid "option \"%s\" is ignored for %s"
8522 msgstr "选项 \"%s\" 对 %s 将被忽略"
8523
8522 -#: builtin/fetch.c odb.c
8524 +#: builtin/fetch.c fetch-pack.c
8525 #, c-format
8524 -msgid "%s is not a valid object"
8525 -msgstr "%s 不是一个有效的对象"
8526 +msgid "the object %s does not exist"
8527 +msgstr "对象 %s 不存在"
8528
8529 #: builtin/fetch.c
8530 #, c-format
8529 -msgid "the object %s does not exist"
8530 -msgstr "对象 '%s' 不存在"
8531 +msgid "ignoring %s=%s because it does not match any refs"
8532 +msgstr "因不匹配任何引用而忽略 %s=%s"
8533 +
8534 +#: builtin/fetch.c
8535 +#, c-format
8536 +msgid "ignoring %s because the protocol does not support it"
8537 +msgstr "因协议不支持而忽略 %s"
8538
8539 #: builtin/fetch.c
8540 #, c-format
@@ -8758,6 +8765,10 @@ msgstr "版本"
8765 msgid "report that we have only objects reachable from this object"
8766 msgstr "报告我们只拥有从该对象开始可达的对象"
8767
8768 +#: builtin/fetch.c builtin/pull.c
8769 +msgid "ensure this ref is always sent as a negotiation have"
8770 +msgstr "确保此引用始终作为协商的 have 发送"
8771 +
8772 #: builtin/fetch.c
8773 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
8774 msgstr "不获取包文件；而是打印协商的祖先提交"
@@ -8778,10 +8789,6 @@ msgstr "抓取后写提交图"
8789 msgid "accept refspecs from stdin"
8790 msgstr "从标准输入获取引用规格"
8791
8781 -#: builtin/fetch.c
8782 -msgid "--negotiate-only needs one or more --negotiation-tip=*"
8783 -msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*"
8784 -
8792 #: builtin/fetch.c
8793 msgid "negative depth in --deepen is not supported"
8794 msgstr "--deepen 不支持负数深度"
@@ -8803,7 +8810,7 @@ msgstr "fetch --all 不能带一个仓库参数"
8810 msgid "fetch --all does not make sense with refspecs"
8811 msgstr "fetch --all 带引用规格没有任何意义"
8812
8806 -#: builtin/fetch.c
8813 +#: builtin/fetch.c builtin/push.c
8814 #, c-format
8815 msgid "no such remote or remote group: %s"
8816 msgstr "没有这样的远程或远程组：%s"
@@ -8820,6 +8827,11 @@ msgstr "在使用 --negotiate-only 时必须提供远程仓库"
8827 msgid "protocol does not support --negotiate-only, exiting"
8828 msgstr "协议不支持 --negotiate-only，退出"
8829
8830 +#: builtin/fetch.c
8831 +#, c-format
8832 +msgid "%s needs one or more %s"
8833 +msgstr "%s 需要一个或多个 %s"
8834 +
8835 #: builtin/fetch.c
8836 msgid ""
8837 "--filter can only be used with the remote configured in "
@@ -9238,6 +9250,11 @@ msgstr "'%s' 的值超出范围：%d"
9250 msgid "value of '%s' not bool or int: %d"
9251 msgstr "'%s' 的值不是 bool 或 int：%d"
9252
9253 +#: builtin/fsmonitor--daemon.c
9254 +#, c-format
9255 +msgid "daemon did not stop within %d seconds"
9256 +msgstr "守护进程未在 %d 秒内停止"
9257 +
9258 #: builtin/fsmonitor--daemon.c
9259 #, c-format
9260 msgid "fsmonitor-daemon is watching '%s'\n"
@@ -9294,6 +9311,10 @@ msgstr "fsmonitor--daemon 已经在运行 '%s'"
9311 msgid "running fsmonitor-daemon in '%s'\n"
9312 msgstr "在 '%s' 中运行 fsmonitor-daemon\n"
9313
9314 +#: builtin/fsmonitor--daemon.c setup.c
9315 +msgid "setsid failed"
9316 +msgstr "setsid 失败"
9317 +
9318 #: builtin/fsmonitor--daemon.c
9319 #, c-format
9320 msgid "starting fsmonitor-daemon in '%s'\n"
@@ -10139,6 +10160,14 @@ msgstr "用法：%s%s"
10160 msgid "'git help config' for more information"
10161 msgstr "'git help config' 获取更多信息"
10162
10163 +#: builtin/history.c
10164 +msgid ""
10165 +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"
10166 +"reedit-message] [--empty=(drop|keep|abort)]"
10167 +msgstr ""
10168 +"git history fixup <提交> [--dry-run] [--update-refs=(branches|head)] [--"
10169 +"reedit-message] [--empty=(drop|keep|abort)]"
10170 +
10171 #: builtin/history.c
10172 msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]"
10173 msgstr "git history reword <提交> [--dry-run] [--update-refs=(branches|head)]"
@@ -10210,27 +10239,99 @@ msgstr "无法更新引用 '%s'：%s"
10239 msgid "failed to commit ref transaction: %s"
10240 msgstr "无法提交引用事务：%s"
10241
10242 +#: builtin/history.c
10243 +#, c-format
10244 +msgid "unable to parse parent of %s"
10245 +msgstr "无法解析 %s 的父提交"
10246 +
10247 +#: builtin/history.c
10248 +#, c-format
10249 +msgid ""
10250 +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", "
10251 +"and \"abort\"."
10252 +msgstr ""
10253 +"无法识别的 '--empty=' 动作 '%s'；有效值为 \"drop\"、\"keep\" 和 \"abort\"。"
10254 +
10255 +#: builtin/history.c
10256 +msgid "control which refs should be updated"
10257 +msgstr "控制应更新哪些引用"
10258 +
10259 #: builtin/history.c
10260 msgid "perform a dry-run without updating any refs"
10261 msgstr "试运行（不更新任何引用）"
10262
10263 +#: builtin/history.c
10264 +msgid "open an editor to modify the commit message"
10265 +msgstr "打开编辑器以修改提交说明"
10266 +
10267 +#: builtin/history.c builtin/rebase.c builtin/revert.c
10268 +msgid "how to handle commits that become empty"
10269 +msgstr "如何处理成为空提交的提交"
10270 +
10271 #: builtin/history.c
10272 msgid "command expects a single revision"
10273 msgstr "该命令需要一个版本"
10274
10275 +#: builtin/history.c
10276 +msgid "cannot run fixup in a bare repository"
10277 +msgstr "无法在纯仓库中运行 fixup"
10278 +
10279 #: builtin/history.c
10280 #, c-format
10281 msgid "commit cannot be found: %s"
10282 msgstr "找不到提交：%s"
10283
10284 #: builtin/history.c
10227 -msgid "failed writing reworded commit"
10228 -msgstr "写入重写后的提交失败"
10285 +msgid "cannot get tree for HEAD"
10286 +msgstr "无法获取 HEAD 的树对象"
10287 +
10288 +#: builtin/history.c builtin/show-index.c
10289 +msgid "unable to read index"
10290 +msgstr "无法读取索引"
10291 +
10292 +#: builtin/history.c
10293 +msgid "nothing to fixup: no staged changes"
10294 +msgstr "没有可修正的内容：没有暂存的变更"
10295 +
10296 +#: builtin/history.c
10297 +msgid "unable to write index as a tree"
10298 +msgstr "无法将索引写入为树"
10299 +
10300 +#: builtin/history.c
10301 +#, c-format
10302 +msgid "cannot get tree for commit %s"
10303 +msgstr "无法获取提交 %s 的树对象"
10304 +
10305 +#: builtin/history.c
10306 +msgid "merge failed while applying fixup"
10307 +msgstr "应用修正时合并失败"
10308 +
10309 +#: builtin/history.c
10310 +msgid "fixup would produce conflicts; aborting"
10311 +msgstr "修正会产生冲突；正在中止"
10312 +
10313 +#: builtin/history.c
10314 +#, c-format
10315 +msgid "cannot drop root commit %s: it has no parent to replay onto"
10316 +msgstr "无法丢弃根提交 %s：它没有可以重放到的父提交"
10317 +
10318 +#: builtin/history.c
10319 +#, c-format
10320 +msgid "fixup makes commit %s empty"
10321 +msgstr "修正使提交 %s 变为空"
10322 +
10323 +#: builtin/history.c
10324 +msgid "failed writing fixed-up commit"
10325 +msgstr "无法写入修正后的提交"
10326
10327 #: builtin/history.c
10328 msgid "failed replaying descendants"
10329 msgstr "重放后代提交失败"
10330
10331 +#: builtin/history.c
10332 +msgid "failed writing reworded commit"
10333 +msgstr "写入重写后的提交失败"
10334 +
10335 #: builtin/history.c
10336 msgid "unable to populate index with tree"
10337 msgstr "无法用树填充索引"
@@ -10263,6 +10364,10 @@ msgstr "写入第一个提交失败"
10364 msgid "failed writing second commit"
10365 msgstr "写入第二个提交失败"
10366
10367 +#: builtin/history.c
10368 +msgid "control ref update behavior"
10369 +msgstr "控制引用更新行为"
10370 +
10371 #: builtin/history.c
10372 msgid "command expects a committish"
10373 msgstr "该命令需要一个提交号"
@@ -10274,10 +10379,12 @@ msgstr "无法拆分合并提交"
10379 #: builtin/hook.c
10380 msgid ""
10381 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
10277 -"stdin=<path>] <hook-name> [-- <hook-args>]"
10382 +"stdin=<path>] [(-j|--jobs) <n>]\n"
10383 +"<hook-name> [-- <hook-args>]"
10384 msgstr ""
10385 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-stdin=<路径"
10280 -">] <钩子名称> [-- <钩子参数>]"
10386 +">] [(-j|--jobs) <n>]\n"
10387 +"<钩子名称> [-- <钩子参数>]"
10388
10389 #: builtin/hook.c
10390 msgid ""
@@ -10327,6 +10434,15 @@ msgstr "静默地忽略缺失的 <钩子名称>"
10434 msgid "file to read into hooks' stdin"
10435 msgstr "读取至钩子标准输入的文件"
10436
10437 +#: builtin/hook.c
10438 +msgid "run up to <n> hooks simultaneously (-1 for CPU count)"
10439 +msgstr "同时运行最多 <n> 个钩子（-1 表示 CPU 数）"
10440 +
10441 +#: builtin/hook.c
10442 +#, c-format
10443 +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)"
10444 +msgstr "-j 的值无效：%d（使用 -1 表示 CPU 数，或使用正整数）"
10445 +
10446 #: builtin/index-pack.c
10447 #, c-format
10448 msgid "object type mismatch at %s"
@@ -10389,6 +10505,10 @@ msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
10505 msgid "inflate returned %d"
10506 msgstr "解压缩返回 %d"
10507
10508 +#: builtin/index-pack.c builtin/unpack-objects.c
10509 +msgid "object size too large for this platform"
10510 +msgstr "对象大小对于此平台而言太大"
10511 +
10512 #: builtin/index-pack.c
10513 msgid "offset value overflow for delta base object"
10514 msgstr "delta 基准对象的偏移值溢出"
@@ -11926,14 +12046,14 @@ msgstr ""
12046
12047 #: builtin/merge.c
12048 msgid "An empty message aborts the commit.\n"
11929 -msgstr "空的提交说明会终止提交。\n"
12049 +msgstr "空的提交说明会中止提交。\n"
12050
12051 #: builtin/merge.c
12052 #, c-format
12053 msgid ""
12054 "Lines starting with '%s' will be ignored, and an empty message aborts\n"
12055 "the commit.\n"
11936 -msgstr "以 '%s' 开始的行将被忽略，而空的提交说明将终止提交。\n"
12056 +msgstr "以 '%s' 开始的行将被忽略，而空的提交说明将中止提交。\n"
12057
12058 #: builtin/merge.c
12059 msgid "Empty commit message."
@@ -11971,7 +12091,7 @@ msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
12091 msgid "Bad value '%s' in environment '%s'"
12092 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
12093
11974 -#: builtin/merge.c editor.c read-cache.c wrapper.c
12094 +#: builtin/merge.c editor.c read-cache.c t/helper/test-synthesize.c wrapper.c
12095 #, c-format
12096 msgid "could not close '%s'"
12097 msgstr "无法关闭 '%s'"
@@ -11987,7 +12107,7 @@ msgstr "--abort 不带参数"
12107
12108 #: builtin/merge.c
12109 msgid "There is no merge to abort (MERGE_HEAD missing)."
11990 -msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
12110 +msgstr "没有要中止的合并（MERGE_HEAD 丢失）。"
12111
12112 #: builtin/merge.c
12113 msgid "--quit expects no arguments"
@@ -12149,19 +12269,23 @@ msgstr "允许创建一个以上的树"
12269 msgid ""
12270 "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"
12271 " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"
12152 -" [--refs-snapshot=<path>]"
12272 +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n"
12273 +" [--base=<checksum>]"
12274 msgstr ""
12275 "git multi-pack-index [<选项>] write [--preferred-pack=<包>]\n"
12276 " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"
12156 -" [--refs-snapshot=<路径>]"
12277 +" [--refs-snapshot=<路径>] [--[no-]write-chain-file]\n"
12278 +" [--base=<校验和>]"
12279
12280 #: builtin/multi-pack-index.c
12281 msgid ""
12282 "git multi-pack-index [<options>] compact [--[no-]incremental]\n"
12161 -" [--[no-]bitmap] <from> <to>"
12283 +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n"
12284 +" <from> <to>"
12285 msgstr ""
12286 "git multi-pack-index [<选项>] compact [--[no-]incremental]\n"
12164 -" [--[no-]bitmap] <源> <目标>"
12287 +" [--[no-]bitmap] [--base=<校验和>] [--[no-]write-chain-file]\n"
12288 +" <起始> <截止>"
12289
12290 #: builtin/multi-pack-index.c
12291 msgid "git multi-pack-index [<options>] verify"
@@ -12195,10 +12319,22 @@ msgstr "在计算多包位图时打包以供重用"
12319 msgid "write multi-pack bitmap"
12320 msgstr "写入多包位图"
12321
12322 +#: builtin/multi-pack-index.c
12323 +msgid "checksum"
12324 +msgstr "校验和"
12325 +
12326 +#: builtin/multi-pack-index.c
12327 +msgid "base MIDX for incremental writes"
12328 +msgstr "增量写入的基线 MIDX"
12329 +
12330 #: builtin/multi-pack-index.c
12331 msgid "write a new incremental MIDX"
12332 msgstr "写入一个新的增量 MIDX"
12333
12334 +#: builtin/multi-pack-index.c
12335 +msgid "write the multi-pack-index chain file"
12336 +msgstr "写入多包索引链文件"
12337 +
12338 #: builtin/multi-pack-index.c
12339 msgid "write multi-pack index containing only given indexes"
12340 msgstr "写入只包括给定索引的多包索引"
@@ -12207,6 +12343,15 @@ msgstr "写入只包括给定索引的多包索引"
12343 msgid "refs snapshot for selecting bitmap commits"
12344 msgstr "用于选择位图提交的引用快照"
12345
12346 +#: builtin/multi-pack-index.c
12347 +#, c-format
12348 +msgid "cannot use %s without %s"
12349 +msgstr "使用 %s 时不能没有 %s"
12350 +
12351 +#: builtin/multi-pack-index.c
12352 +msgid "cannot use --base without --no-write-chain-file"
12353 +msgstr "使用 --base 时不能没有 --no-write-chain-file"
12354 +
12355 #: builtin/multi-pack-index.c
12356 #, c-format
12357 msgid "could not find MIDX: %s"
@@ -12384,6 +12529,60 @@ msgstr "允许打印 `undefined` 的名称（默认）"
12529 msgid "dereference tags in the input (internal use)"
12530 msgstr "反向解析输入中的标签（内部使用）"
12531
12532 +#: builtin/name-rev.c
12533 +#, c-format
12534 +msgid "'%s' needs to be either text, revs, or rev"
12535 +msgstr "'%s' 必须是 text、revs 或 rev"
12536 +
12537 +#: builtin/name-rev.c
12538 +msgid ""
12539 +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--"
12540 +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]"
12541 +msgstr ""
12542 +"（实验性！）git format-rev --stdin-mode=<模式> --format=<美化> [--"
12543 +"[no-]notes=<引用>] [-z] [--[no-]null-output] [--[no-]null-input]"
12544 +
12545 +#: builtin/name-rev.c
12546 +msgid "pretty format to use"
12547 +msgstr "要使用的美化格式"
12548 +
12549 +#: builtin/name-rev.c
12550 +msgid "stdin-mode"
12551 +msgstr "标准输入模式"
12552 +
12553 +#: builtin/name-rev.c
12554 +msgid "how revs are processed"
12555 +msgstr "如何处理版本"
12556 +
12557 +#: builtin/name-rev.c builtin/range-diff.c
12558 +msgid "notes"
12559 +msgstr "注解"
12560 +
12561 +#: builtin/name-rev.c
12562 +msgid "display notes for pretty format"
12563 +msgstr "为美化格式显示注解"
12564 +
12565 +#: builtin/name-rev.c
12566 +msgid "z"
12567 +msgstr "z"
12568 +
12569 +#: builtin/name-rev.c
12570 +msgid "Use NUL for input and output termination"
12571 +msgstr "使用 NUL 作为输入和输出的终止符"
12572 +
12573 +#: builtin/name-rev.c
12574 +msgid "Use NUL for input termination"
12575 +msgstr "使用 NUL 作为输入的终止符"
12576 +
12577 +#: builtin/name-rev.c
12578 +msgid "Use NUL for output termination"
12579 +msgstr "使用 NUL 作为输出的终止符"
12580 +
12581 +#: builtin/name-rev.c
12582 +#, c-format
12583 +msgid "'%s' is required"
12584 +msgstr "需要 '%s'"
12585 +
12586 #: builtin/notes.c
12587 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
12588 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
@@ -12737,7 +12936,7 @@ msgid ""
12936 "abort'.\n"
12937 msgstr ""
12938 "自动注解合并失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
12740 -"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
12939 +"交结果，或者使用命令 'git notes merge --abort' 中止合并。\n"
12940
12941 #: builtin/notes.c builtin/tag.c
12942 #, c-format
@@ -12809,6 +13008,11 @@ msgstr "无效的 --name-hash-version 选项：%d"
13008 msgid "currently, --write-bitmap-index requires --name-hash-version=1"
13009 msgstr "当前，--write-bitmap-index 要求 --name-hash-version=1"
13010
13011 +#: builtin/pack-objects.c
13012 +#, c-format
13013 +msgid "write_reuse_object: unable to parse object header of %s"
13014 +msgstr "write_reuse_object：无法解析 %s 的对象头"
13015 +
13016 #: builtin/pack-objects.c
13017 #, c-format
13018 msgid ""
@@ -13028,10 +13232,6 @@ msgstr "无法检查 %s 处的松散对象"
13232 msgid "unable to force loose object"
13233 msgstr "无法强制松散对象"
13234
13031 -#: builtin/pack-objects.c
13032 -msgid "failed to pack objects via path-walk"
13033 -msgstr "通过 path-walk 打包对象失败"
13034 -
13235 #: builtin/pack-objects.c
13236 #, c-format
13237 msgid "not a rev '%s'"
@@ -13042,6 +13242,10 @@ msgstr "不是一个版本 '%s'"
13242 msgid "bad revision '%s'"
13243 msgstr "错误的版本 '%s'"
13244
13245 +#: builtin/pack-objects.c
13246 +msgid "failed to pack objects via path-walk"
13247 +msgstr "通过 path-walk 打包对象失败"
13248 +
13249 #: builtin/pack-objects.c
13250 msgid "unable to add recent objects"
13251 msgstr "无法添加最近的对象"
@@ -13745,6 +13949,11 @@ msgstr ""
13949 msgid "invalid value for '%s'"
13950 msgstr "'%s' 的值无效"
13951
13952 +#: builtin/push.c
13953 +#, c-format
13954 +msgid "could not push to %s"
13955 +msgstr "无法推送到 %s"
13956 +
13957 #: builtin/push.c builtin/submodule--helper.c
13958 msgid "repository"
13959 msgstr "仓库"
@@ -13837,15 +14046,35 @@ msgid ""
14046 "and then push using the remote name\n"
14047 "\n"
14048 " git push <name>\n"
14049 +"\n"
14050 +"To push to multiple remotes at once, configure a remote group using\n"
14051 +"\n"
14052 +" git config remotes.<groupname> \"<remote1> <remote2>\"\n"
14053 +"\n"
14054 +"and then push using the group name\n"
14055 +"\n"
14056 +" git push <groupname>\n"
14057 msgstr ""
13841 -"没有配置推送目标。\n"
13842 -"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
14058 +"未配置推送目标。\n"
14059 +"请通过命令行指定 URL，或使用以下命令配置一个远程仓库\n"
14060 "\n"
14061 " git remote add <名称> <地址>\n"
14062 "\n"
14063 "然后使用该远程仓库名执行推送\n"
14064 "\n"
14065 " git push <名称>\n"
14066 +"\n"
14067 +"若要同时推送到多个远程仓库，请使用以下命令配置远程组\n"
14068 +"\n"
14069 +" git config remotes.<组名> \"<远程1> <远程2>\"\n"
14070 +"\n"
14071 +"然后使用组名进行推送\n"
14072 +"\n"
14073 +" git push <组名>\n"
14074 +
14075 +#: builtin/push.c
14076 +msgid "push options must not have new line characters"
14077 +msgstr "推送选项不能有换行符"
14078
14079 #: builtin/push.c
14080 msgid "--all can't be combined with refspecs"
@@ -13856,8 +14085,8 @@ msgid "--mirror can't be combined with refspecs"
14085 msgstr "--mirror 不能和引用规格同时使用"
14086
14087 #: builtin/push.c
13859 -msgid "push options must not have new line characters"
13860 -msgstr "推送选项不能有换行符"
14088 +msgid "--atomic can only be used when pushing to one remote"
14089 +msgstr "--atomic 只能在推送到一个远程仓库时使用"
14090
14091 #: builtin/range-diff.c
14092 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
@@ -13880,10 +14109,6 @@ msgstr "无效的 max-memory 值：%s"
14109 msgid "use simple diff colors"
14110 msgstr "使用简单差异颜色"
14111
13883 -#: builtin/range-diff.c
13884 -msgid "notes"
13885 -msgstr "注解"
13886 -
14112 #: builtin/range-diff.c
14113 msgid "passed to 'git log'"
14114 msgstr "传递给 'git log'"
@@ -14220,11 +14445,11 @@ msgstr "跳过当前补丁并继续"
14445
14446 #: builtin/rebase.c
14447 msgid "abort and check out the original branch"
14223 -msgstr "终止并检出原有分支"
14448 +msgstr "中止并检出原有分支"
14449
14450 #: builtin/rebase.c
14451 msgid "abort but keep HEAD where it is"
14227 -msgstr "终止但保持 HEAD 不变"
14452 +msgstr "中止但保持 HEAD 不变"
14453
14454 #: builtin/rebase.c
14455 msgid "edit the todo list during an interactive rebase"
@@ -14250,10 +14475,6 @@ msgstr "让用户编辑要变基的提交列表"
14475 msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
14476 msgstr "（已删除）曾是：尝试重建合并提交而非忽略它们"
14477
14253 -#: builtin/rebase.c builtin/revert.c
14254 -msgid "how to handle commits that become empty"
14255 -msgstr "如何处理成为空提交的提交"
14256 -
14478 #: builtin/rebase.c
14479 msgid "keep commits which start empty"
14480 msgstr "保留初始为空的提交"
@@ -15341,11 +15562,11 @@ msgstr "冗长输出；必须置于子命令之前"
15562 msgid ""
15563 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
15564 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
15344 -"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
15565 +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"
15566 msgstr ""
15567 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
15568 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<包名>]\n"
15348 -"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
15569 +"[--write-midx[=<模式>]] [--name-hash-version=<n>] [--path-walk]"
15570
15571 #: builtin/repack.c
15572 msgid ""
@@ -15356,7 +15577,12 @@ msgstr ""
15577 "或禁用 pack.writeBitmaps 配置。"
15578
15579 #: builtin/repack.c
15359 -msgid "pack everything in a single pack"
15580 +#, c-format
15581 +msgid "unknown value for %s: %s"
15582 +msgstr "%s 的值未识别：%s"
15583 +
15584 +#: builtin/repack.c
15585 +msgid "pack everything in a single pack"
15586 msgstr "所有内容打包到一个包文件中"
15587
15588 #: builtin/repack.c
@@ -15472,6 +15698,11 @@ msgstr "储存被过滤的对象的包的前缀"
15698 msgid "cannot delete packs in a precious-objects repo"
15699 msgstr "不能删除珍品仓库中的打包文件"
15700
15701 +#: builtin/repack.c
15702 +#, c-format
15703 +msgid "invalid value for %s: %d"
15704 +msgstr "%s 的值无效：%d"
15705 +
15706 #: builtin/repack.c
15707 #, c-format
15708 msgid "option '%s' can only be used along with '%s'"
@@ -15722,6 +15953,16 @@ msgstr "只能为 -l 提供一个模式"
15953 msgid "invalid %s value: '%s'"
15954 msgstr "无效的 %s 值：'%s'"
15955
15956 +#: builtin/replay.c
15957 +msgid ""
15958 +"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
15959 +"advance=<branch> | --revert=<branch>)\n"
15960 +"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
15961 +msgstr ""
15962 +"（实验性！）git replay ([--contained] --onto=<新基线> | --advance=<分支> | --"
15963 +"revert=<分支>)\n"
15964 +"[--ref=<引用>] [--ref-action=<模式>] <版本范围>"
15965 +
15966 #: builtin/replay.c
15967 msgid "update all branches that point at commits in <revision-range>"
15968 msgstr "更新指向 <版本范围> 中提交的所有分支"
@@ -15738,6 +15979,10 @@ msgstr "在给定分支上重放并演进该分支"
15979 msgid "revert commits onto given branch"
15980 msgstr "在给定分支上还原提交"
15981
15982 +#: builtin/replay.c
15983 +msgid "reference to update with result"
15984 +msgstr "要更新结果的引用"
15985 +
15986 #: builtin/replay.c
15987 msgid "control ref update behavior (update|print)"
15988 msgstr "控制引用更新行为（update|print）"
@@ -16587,10 +16832,6 @@ msgstr "无法读取头信息"
16832 msgid "unknown index version"
16833 msgstr "未知的索引版本"
16834
16590 -#: builtin/show-index.c
16591 -msgid "unable to read index"
16592 -msgstr "无法读取索引"
16593 -
16835 #: builtin/show-index.c
16836 msgid "corrupt index file"
16837 msgstr "索引文件损坏"
@@ -16906,8 +17147,12 @@ msgid "git stash pop [--index] [-q | --quiet] [<stash>]"
17147 msgstr "git stash pop [--index] [-q | --quiet] [<储藏>]"
17148
17149 #: builtin/stash.c
16909 -msgid "git stash apply [--index] [-q | --quiet] [<stash>]"
16910 -msgstr "git stash apply [--index] [-q | --quiet] [<储藏>]"
17150 +msgid ""
17151 +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-"
17152 +"theirs=<label>] [--label-base=<label>] [<stash>]"
17153 +msgstr ""
17154 +"git stash apply [--index] [-q | --quiet] [--label-ours=<标签>] [--label-"
17155 +"theirs=<标签>] [--label-base=<标签>] [<储藏>]"
17156
17157 #: builtin/stash.c
17158 msgid "git stash branch <branchname> [<stash>]"
@@ -16917,6 +17162,21 @@ msgstr "git stash branch <分支名> [<储藏>]"
17162 msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
17163 msgstr "git stash store [(-m | --message) <消息>] [-q | --quiet] <提交>"
17164
17165 +#: builtin/stash.c
17166 +msgid ""
17167 +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
17168 +"| --quiet]\n"
17169 +" [-u | --include-untracked] [-a | --all] [(-m | --message) "
17170 +"<message>]\n"
17171 +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
17172 +" [--] [<pathspec>...]"
17173 +msgstr ""
17174 +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
17175 +"| --quiet]\n"
17176 +" [-u | --include-untracked] [-a | --all] [(-m | --message) <消息>]\n"
17177 +" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
17178 +" [--] [<路径规格>...]"
17179 +
17180 #: builtin/stash.c
17181 msgid ""
17182 "git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
@@ -17007,6 +17267,22 @@ msgstr "无法从储藏条目中恢复未跟踪文件"
17267 msgid "attempt to recreate the index"
17268 msgstr "尝试重建索引"
17269
17270 +#: builtin/stash.c
17271 +msgid "label"
17272 +msgstr "标签"
17273 +
17274 +#: builtin/stash.c
17275 +msgid "label for the upstream side in conflict markers"
17276 +msgstr "冲突标记中上游侧的标签"
17277 +
17278 +#: builtin/stash.c
17279 +msgid "label for the stashed side in conflict markers"
17280 +msgstr "冲突标记中储藏侧的标签"
17281 +
17282 +#: builtin/stash.c
17283 +msgid "label for the base in diff3 conflict markers"
17284 +msgstr "diff3 冲突标记中基准侧的标签"
17285 +
17286 #: builtin/stash.c
17287 #, c-format
17288 msgid "Dropped %s (%s)"
@@ -18546,7 +18822,19 @@ msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/"
18822
18823 #: builtin/upload-pack.c
18824 msgid "interrupt transfer after <n> seconds of inactivity"
18549 -msgstr "不活动 <n> 秒钟后终止传输"
18825 +msgstr "不活动 <n> 秒钟后中止传输"
18826 +
18827 +#: builtin/url-parse.c
18828 +msgid "git url-parse [-c <component>] [--] <url>..."
18829 +msgstr "git url-parse [-c <组件>] [--] <url>..."
18830 +
18831 +#: builtin/url-parse.c
18832 +msgid "component"
18833 +msgstr "组件"
18834 +
18835 +#: builtin/url-parse.c
18836 +msgid "which URL component to extract"
18837 +msgstr "提取哪个 URL 组件"
18838
18839 #: builtin/verify-commit.c
18840 msgid "git verify-commit [-v | --verbose] [--raw] <commit>..."
@@ -19407,6 +19695,10 @@ msgstr "在一个仓库列表上运行 Git 命令"
19695 msgid "Prepare patches for e-mail submission"
19696 msgstr "准备电子邮件提交的补丁"
19697
19698 +#: command-list.h
19699 +msgid "EXPERIMENTAL: Pretty format revisions on demand"
19700 +msgstr "实验性：按需以美化的格式输出版本信息"
19701 +
19702 #: command-list.h
19703 msgid "Verifies the connectivity and validity of the objects in the database"
19704 msgstr "验证仓库中对象的连通性和有效性"
@@ -19440,8 +19732,8 @@ msgid "EXPERIMENTAL: Rewrite history"
19732 msgstr "实验性：重写历史"
19733
19734 #: command-list.h
19443 -msgid "Run git hooks"
19444 -msgstr "运行 git 钩子"
19735 +msgid "Run Git hooks"
19736 +msgstr "运行 Git 钩子"
19737
19738 #: command-list.h
19739 msgid "Server side implementation of Git over HTTP"
@@ -19697,8 +19989,8 @@ msgid "Restricted login shell for Git-only SSH access"
19989 msgstr "只允许 Git SSH 访问的受限登录 shell"
19990
19991 #: command-list.h
19700 -msgid "Summarize 'git log' output"
19701 -msgstr "汇总 'git log' 输出"
19992 +msgid "Summarize `git log` output"
19993 +msgstr "汇总 `git log` 的输出"
19994
19995 #: command-list.h
19996 msgid "Show various types of objects"
@@ -19785,6 +20077,10 @@ msgstr "将存档发送回 git-archive"
20077 msgid "Send objects packed back to git-fetch-pack"
20078 msgstr "将对象压缩包发送回 git-fetch-pack"
20079
20080 +#: command-list.h
20081 +msgid "Parse and extract git URL components"
20082 +msgstr "解析并提取 git URL 的组件"
20083 +
20084 #: command-list.h
20085 msgid "Show a Git logical variable"
20086 msgstr "显示一个 Git 逻辑变量"
@@ -20383,7 +20679,7 @@ msgstr "'has_worktree_moved' 中未处理的情况：%d"
20679 msgid "health thread wait failed [GLE %ld]"
20680 msgstr "健康监测线程等待失败 [GLE %ld]"
20681
20386 -#: compat/fsmonitor/fsm-ipc-darwin.c
20682 +#: compat/fsmonitor/fsm-ipc-unix.c
20683 #, c-format
20684 msgid "Invalid path: %s"
20685 msgstr "无效路径：%s"
@@ -20396,6 +20692,50 @@ msgstr "无法创建 FSEventStream。"
20692 msgid "Failed to start the FSEventStream"
20693 msgstr "无法启动 FSEventStream"
20694
20695 +#: compat/fsmonitor/fsm-listen-linux.c
20696 +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches"
20697 +msgstr "达到 inotify 监视限制；请增加 fs.inotify.max_user_watches"
20698 +
20699 +#: compat/fsmonitor/fsm-listen-linux.c
20700 +#, c-format
20701 +msgid "inotify_add_watch('%s') failed"
20702 +msgstr "inotify_add_watch('%s') 失败"
20703 +
20704 +#: compat/fsmonitor/fsm-listen-linux.c
20705 +msgid "inotify_rm_watch() failed"
20706 +msgstr "inotify_rm_watch() 失败"
20707 +
20708 +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c
20709 +#, c-format
20710 +msgid "opendir('%s') failed"
20711 +msgstr "opendir('%s') 失败"
20712 +
20713 +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c
20714 +#, c-format
20715 +msgid "lstat('%s') failed"
20716 +msgstr "lstat('%s') 失败"
20717 +
20718 +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c
20719 +#, c-format
20720 +msgid "closedir('%s') failed"
20721 +msgstr "closedir('%s') 失败"
20722 +
20723 +#: compat/fsmonitor/fsm-listen-linux.c
20724 +msgid "inotify_init1() failed"
20725 +msgstr "inotify_init1() 失败"
20726 +
20727 +#: compat/fsmonitor/fsm-listen-linux.c
20728 +msgid "closing inotify file descriptor failed"
20729 +msgstr "关闭 inotify 文件描述符失败"
20730 +
20731 +#: compat/fsmonitor/fsm-listen-linux.c
20732 +msgid "reading inotify message stream failed"
20733 +msgstr "读取 inotify 消息流失败"
20734 +
20735 +#: compat/fsmonitor/fsm-listen-linux.c
20736 +msgid "polling inotify message stream failed"
20737 +msgstr "轮询 inotify 消息流失败"
20738 +
20739 #: compat/fsmonitor/fsm-listen-win32.c
20740 #, c-format
20741 msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
@@ -20426,26 +20766,11 @@ msgstr "GetOverlappedResult 在 '%s' 上失败 [GLE %ld]"
20766 msgid "could not read directory changes [GLE %ld]"
20767 msgstr "无法获取目录变更 [GLE %ld]"
20768
20429 -#: compat/fsmonitor/fsm-path-utils-darwin.c
20430 -#, c-format
20431 -msgid "opendir('%s') failed"
20432 -msgstr "opendir('%s') 失败"
20433 -
20434 -#: compat/fsmonitor/fsm-path-utils-darwin.c
20435 -#, c-format
20436 -msgid "lstat('%s') failed"
20437 -msgstr "lstat('%s') 失败"
20438 -
20769 #: compat/fsmonitor/fsm-path-utils-darwin.c
20770 #, c-format
20771 msgid "strbuf_readlink('%s') failed"
20772 msgstr "strbuf_readlink('%s') 失败"
20773
20444 -#: compat/fsmonitor/fsm-path-utils-darwin.c
20445 -#, c-format
20446 -msgid "closedir('%s') failed"
20447 -msgstr "closedir('%s') 失败"
20448 -
20774 #: compat/fsmonitor/fsm-path-utils-win32.c
20775 #, c-format
20776 msgid "[GLE %ld] unable to open for read '%ls'"
@@ -21019,11 +21344,6 @@ msgstr "无效的 ls-refs 响应：%s"
21344 msgid "expected flush after ref listing"
21345 msgstr "在引用列表之后应该有一个 flush 包"
21346
21022 -#: connect.c
21023 -#, c-format
21024 -msgid "protocol '%s' is not supported"
21025 -msgstr "不支持 '%s' 协议"
21026 -
21347 #: connect.c
21348 msgid "unable to set SO_KEEPALIVE on socket"
21349 msgstr "无法为 socket 设置 SO_KEEPALIVE"
@@ -21087,6 +21407,11 @@ msgstr "已阻止奇怪的端口号 '%s'"
21407 msgid "cannot start proxy %s"
21408 msgstr "无法启动代理 %s"
21409
21410 +#: connect.c
21411 +#, c-format
21412 +msgid "protocol '%s' is not supported"
21413 +msgstr "不支持 '%s' 协议"
21414 +
21415 #: connect.c
21416 msgid "no path specified; see 'git help pull' for valid url syntax"
21417 msgstr "未指定路径，执行 'git help pull' 查看有效的 URL 语法"
@@ -21624,6 +21949,11 @@ msgstr "-S 需要一个非空参数"
21949 msgid "failed to parse --submodule option parameter: '%s'"
21950 msgstr "无法解析 --submodule 选项的参数：'%s'"
21951
21952 +#: diff.c
21953 +#, c-format
21954 +msgid "%s expects a non-negative integer"
21955 +msgstr "%s 预期一个非负整数"
21956 +
21957 #: diff.c
21958 #, c-format
21959 msgid "bad --word-diff argument: %s"
@@ -22979,6 +23309,56 @@ msgstr ""
23309 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
23310 "配置 `git config set advice.ignoredHook false` 来关闭这条警告。"
23311
23312 +#: hook.c
23313 +#, c-format
23314 +msgid "hook.jobs must be an integer, ignoring: '%s'"
23315 +msgstr "hook.jobs 必须是整数，已忽略：'%s'"
23316 +
23317 +#: hook.c
23318 +#, c-format
23319 +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'"
23320 +msgstr "hook.jobs 必须是正整数或 -1，已忽略：'%s'"
23321 +
23322 +#: hook.c
23323 +#, c-format
23324 +msgid ""
23325 +"hook friendly-name '%s' collides with a known event name; please choose a "
23326 +"different friendly-name"
23327 +msgstr "钩子的友好名称 '%s' 与已知事件名称冲突；请选择另外的友好名称"
23328 +
23329 +#: hook.c
23330 +#, c-format
23331 +msgid ""
23332 +"hook friendly-name '%s' is the same as its event; this may cause ambiguity "
23333 +"with hook.%s.enabled"
23334 +msgstr "钩子的友好名称 '%s' 与其事件相同；这可能会导致 hook.%s.enabled 有歧义"
23335 +
23336 +#: hook.c
23337 +#, c-format
23338 +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'"
23339 +msgstr "hook.%s.parallel 必须是布尔值，已忽略：'%s'"
23340 +
23341 +#: hook.c
23342 +#, c-format
23343 +msgid "hook.%s.jobs must be an integer, ignoring: '%s'"
23344 +msgstr "hook.%s.jobs 必须是整数，已忽略：'%s'"
23345 +
23346 +#: hook.c
23347 +#, c-format
23348 +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'"
23349 +msgstr "hook.%s.jobs 必须是正整数或 -1，已忽略：'%s'"
23350 +
23351 +#: hook.c
23352 +#, c-format
23353 +msgid ""
23354 +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event "
23355 +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), "
23356 +"so this setting will be ignored"
23357 +msgstr ""
23358 +"设置了 hook.%s.jobs，但 '%s' 看起来像是一个钩子的友好名称，而不是事件名称；"
23359 +"hook.<event>.jobs 使用事件名称（例如 hook.post-receive.jobs），因此此设置将被"
23360 +"忽略"
23361 +
23362 #: hook.c
23363 #, c-format
23364 msgid "disabled hook '%s' has no command configured"
@@ -22991,6 +23371,18 @@ msgid ""
23371 "aborting."
23372 msgstr "必须配置 'hook.%s.command'，或移除 'hook.%s.event'；正在中止。"
23373
23374 +#: hook.c
23375 +#, c-format
23376 +msgid ""
23377 +"hook '%s' is not marked as parallel=true, running in parallel anyway due to "
23378 +"-j%u"
23379 +msgstr "钩子 '%s' 未标记为 parallel=true，但由于 -j%u 仍并行运行"
23380 +
23381 +#: hook.c
23382 +#, c-format
23383 +msgid "%s must be a positive integer or -1, ignoring: %d"
23384 +msgstr "%s 必须为正整数或 -1，已忽略：%d"
23385 +
23386 #: http-fetch.c
23387 msgid "not a git repository"
23388 msgstr "不是 Git 仓库"
@@ -23221,7 +23613,7 @@ msgstr "参数"
23613 msgid "object filtering"
23614 msgstr "对象过滤"
23615
23224 -#: list-objects-filter.c
23616 +#: list-objects-filter.c path-walk.c
23617 #, c-format
23618 msgid "unable to access sparse blob in '%s'"
23619 msgstr "无法访问 '%s' 中的稀疏数据对象"
@@ -23668,6 +24060,11 @@ msgstr "无法在 v1 格式下执行 MIDX 压缩"
24060 msgid "ignoring existing multi-pack-index; checksum mismatch"
24061 msgstr "忽略已存在的多包索引，校验码不匹配"
24062
24063 +#: midx-write.c
24064 +#, c-format
24065 +msgid "could not find base MIDX '%s'"
24066 +msgstr "找不到基线 MIDX '%s'"
24067 +
24068 #: midx-write.c
24069 #, c-format
24070 msgid "could not load reverse index for MIDX %s"
@@ -23722,7 +24119,7 @@ msgstr "无法写入多包位图"
24119 msgid "too many multi-pack-indexes"
24120 msgstr "过多的多包索引"
24121
23725 -#: midx-write.c
24122 +#: midx-write.c repack-midx.c
24123 msgid "unable to open multi-pack-index chain file"
24124 msgstr "无法打开多包索引链文件"
24125
@@ -23828,12 +24225,12 @@ msgstr "多包索引链文件太小"
24225 #: midx.c
24226 #, c-format
24227 msgid "pack count in base MIDX too high: %<PRIuMAX>"
23831 -msgstr "基线的 MIDX 中包的数量过高：%<PRIuMAX>"
24228 +msgstr "基线 MIDX 中包的数量过高：%<PRIuMAX>"
24229
24230 #: midx.c
24231 #, c-format
24232 msgid "object count in base MIDX too high: %<PRIuMAX>"
23836 -msgstr "基线的 MIDX 中对象的数量过高：%<PRIuMAX>"
24233 +msgstr "基线 MIDX 中对象的数量过高：%<PRIuMAX>"
24234
24235 #: midx.c
24236 #, c-format
@@ -23870,6 +24267,11 @@ msgstr "多包索引存储一个 64 位偏移，但是 off_t 太小"
24267 msgid "multi-pack-index large offset out of bounds"
24268 msgstr "多包索引大偏移区越界"
24269
24270 +#: midx.c
24271 +#, c-format
24272 +msgid "failed to clear multi-pack-index chain at %s"
24273 +msgstr "无法清理位于 %s 的多包索引链"
24274 +
24275 #: midx.c
24276 msgid "multi-pack-index file exists, but failed to parse"
24277 msgstr "多包索引文件存在，但无法解析"
@@ -23942,7 +24344,7 @@ msgid ""
24344 msgstr ""
24345 "您的前一次注解合并尚未结束（存在 %s）。\n"
24346 "在开始一个新的注解合并之前，请使用 'git notes merge --commit' 或者 'git "
23945 -"notes merge --abort' 来提交/终止前一次合并。"
24347 +"notes merge --abort' 来提交/中止前一次合并。"
24348
24349 #: notes-merge.c
24350 #, c-format
@@ -23996,7 +24398,7 @@ msgstr "无法将 %s %s 映射到提交对象中"
24398 msgid "Failed to convert object from %s to %s"
24399 msgstr "无法将对象从 %s 转换为 %s"
24400
23999 -#: object-file.c
24401 +#: object-file.c odb/source-loose.c
24402 #, c-format
24403 msgid "object file %s is empty"
24404 msgstr "对象文件 %s 为空"
@@ -24011,35 +24413,6 @@ msgstr "损坏的松散对象 '%s'"
24413 msgid "garbage at end of loose object '%s'"
24414 msgstr "松散对象 '%s' 后面有垃圾数据"
24415
24014 -#: object-file.c
24015 -#, c-format
24016 -msgid "unable to open loose object %s"
24017 -msgstr "无法打开松散对象 %s"
24018 -
24019 -#: object-file.c
24020 -#, c-format
24021 -msgid "unable to parse %s header"
24022 -msgstr "无法解析 %s 头部"
24023 -
24024 -#: object-file.c
24025 -msgid "invalid object type"
24026 -msgstr "无效的对象类型"
24027 -
24028 -#: object-file.c
24029 -#, c-format
24030 -msgid "unable to unpack %s header"
24031 -msgstr "无法解开 %s 头部"
24032 -
24033 -#: object-file.c
24034 -#, c-format
24035 -msgid "header for %s too long, exceeds %d bytes"
24036 -msgstr "%s 的头部太长，超出了 %d 字节"
24037 -
24038 -#: object-file.c
24039 -#, c-format
24040 -msgid "loose object %s (stored in %s) is corrupt"
24041 -msgstr "松散对象 %s（保存在 %s）已损坏"
24042 -
24416 #: object-file.c
24417 #, c-format
24418 msgid "unable to open %s"
@@ -24098,8 +24471,8 @@ msgstr "由于 %s 的对象源数据不稳定而无法处理"
24471
24472 #: object-file.c
24473 #, c-format
24101 -msgid "write stream object %ld != %<PRIuMAX>"
24102 -msgstr "写入流对象 %ld != %<PRIuMAX>"
24474 +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>"
24475 +msgstr "写入流对象 %<PRIuMAX> != %<PRIuMAX>"
24476
24477 #: object-file.c
24478 #, c-format
@@ -24451,6 +24824,11 @@ msgstr "打包对象 %s（保存在 %s）已损坏"
24824 msgid "missing mapping of %s to %s"
24825 msgstr "缺少 %s 到 %s 的映射"
24826
24827 +#: odb.c
24828 +#, c-format
24829 +msgid "%s is not a valid object"
24830 +msgstr "%s 不是一个有效的对象"
24831 +
24832 #: odb.c
24833 #, c-format
24834 msgid "%s is not a valid '%s' object"
@@ -24468,6 +24846,35 @@ msgstr "无法读取 alternates 文件"
24846 msgid "unable to move new alternates file into place"
24847 msgstr "无法将新的 alternates 文件移动到位"
24848
24849 +#: odb/source-loose.c
24850 +#, c-format
24851 +msgid "unable to open loose object %s"
24852 +msgstr "无法打开松散对象 %s"
24853 +
24854 +#: odb/source-loose.c
24855 +#, c-format
24856 +msgid "unable to parse %s header"
24857 +msgstr "无法解析 %s 头部"
24858 +
24859 +#: odb/source-loose.c
24860 +msgid "invalid object type"
24861 +msgstr "无效的对象类型"
24862 +
24863 +#: odb/source-loose.c
24864 +#, c-format
24865 +msgid "unable to unpack %s header"
24866 +msgstr "无法解开 %s 头部"
24867 +
24868 +#: odb/source-loose.c
24869 +#, c-format
24870 +msgid "header for %s too long, exceeds %d bytes"
24871 +msgstr "%s 的头部太长，超出了 %d 字节"
24872 +
24873 +#: odb/source-loose.c
24874 +#, c-format
24875 +msgid "loose object %s (stored in %s) is corrupt"
24876 +msgstr "松散对象 %s（保存在 %s）已损坏"
24877 +
24878 #: pack-bitmap-write.c
24879 #, c-format
24880 msgid "duplicate entry when writing bitmap index: %s"
@@ -25021,6 +25428,29 @@ msgstr "无法找到对象 %s"
25428 msgid "failed to find tag %s"
25429 msgstr "无法找到标签 %s"
25430
25431 +#: path-walk.c
25432 +#, c-format
25433 +msgid "tree:%lu filter not supported by the path-walk API"
25434 +msgstr "path-walk API 不支持 tree:%lu 过滤器"
25435 +
25436 +#: path-walk.c
25437 +msgid "sparse filter cannot be combined with existing sparse patterns"
25438 +msgstr "稀疏过滤器不能与现有的稀疏模式同时使用"
25439 +
25440 +#: path-walk.c
25441 +#, c-format
25442 +msgid "unable to parse sparse filter data in '%s'"
25443 +msgstr "无法解析 '%s' 中的稀疏过滤器数据"
25444 +
25445 +#: path-walk.c
25446 +msgid "sparse filter is not cone-mode compatible"
25447 +msgstr "稀疏过滤器不兼容锥形模式"
25448 +
25449 +#: path-walk.c
25450 +#, c-format
25451 +msgid "object filter '%s' not supported by the path-walk API"
25452 +msgstr "path-walk API 不支持对象过滤器 '%s'"
25453 +
25454 #: path-walk.c
25455 msgid "failed to setup revision walk"
25456 msgstr "无法设置版本遍历"
@@ -25218,13 +25648,10 @@ msgstr "配置 '%2$s' 中存在不支持的字段 '%1$s'"
25648
25649 #: promisor-remote.c
25650 #, c-format
25221 -msgid "no or empty URL advertised for remote '%s'"
25222 -msgstr "远程 '%s' 的 URL 没有公布或为空"
25223 -
25224 -#: promisor-remote.c
25225 -#, c-format
25226 -msgid "known remote named '%s' but with URL '%s' instead of '%s'"
25227 -msgstr "已知远程名称为 '%s'，但 URL 是 '%s' 而非 '%s'"
25651 +msgid ""
25652 +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this "
25653 +"remote"
25654 +msgstr "已知远程名称为 '%s'，但 URL 是 '%s' 而非 '%s'，忽略此远程"
25655
25656 #: promisor-remote.c
25657 #, c-format
@@ -25233,8 +25660,10 @@ msgstr "远程信息中的无效元素 '%s'"
25660
25661 #: promisor-remote.c
25662 #, c-format
25236 -msgid "server advertised a promisor remote without a name or URL: %s"
25237 -msgstr "服务器通告了一个没有名称或 URL 的承诺者远程：%s"
25663 +msgid ""
25664 +"server advertised a promisor remote without a name or URL: '%s', ignoring "
25665 +"this remote"
25666 +msgstr "服务器通告了一个没有名称或 URL 的承诺者远程：'%s'，忽略此远程"
25667
25668 #: promisor-remote.c
25669 #, c-format
@@ -25290,8 +25719,8 @@ msgstr "%s 必须为非负值，使用默认值"
25719
25720 #: pseudo-merge.c
25721 #, c-format
25293 -msgid "%s must be between 0 and 1, using default"
25294 -msgstr "%s 必须介于 0 到 1 之间，使用默认值"
25722 +msgid "%s must be between 0 (exclusive) and 1, using default"
25723 +msgstr "%s 必须介于 0（不含）和 1 之间，使用默认值"
25724
25725 #: pseudo-merge.c
25726 #, c-format
@@ -25600,7 +26029,7 @@ msgid ""
26029 "Or you can abort the rebase with 'git rebase --abort'.\n"
26030 msgstr ""
26031 "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
25603 -"或者您可以用 'git rebase --abort' 终止变基。\n"
26032 +"或者您可以用 'git rebase --abort' 中止变基。\n"
26033
26034 #: rebase-interactive.c
26035 #, c-format
@@ -25704,7 +26133,7 @@ msgid ""
26133 "\n"
26134 msgstr ""
26135 "\n"
25707 -"然而，如果您删除全部内容，变基操作将会终止。\n"
26136 +"然而，如果您删除全部内容，变基操作将会中止。\n"
26137 "\n"
26138
26139 #: rebase-interactive.c
@@ -26136,6 +26565,16 @@ msgstr "拒绝更新有错误名称 '%s' 的引用"
26565 msgid "refusing to force and skip creation of reflog"
26566 msgstr "拒绝强制跳过创建引用日志"
26567
26568 +#: refs.c
26569 +#, c-format
26570 +msgid "trying to write ref '%s' with nonexistent object %s"
26571 +msgstr "试图用不存在的对象 %2$s 写入引用 '%1$s'"
26572 +
26573 +#: refs.c
26574 +#, c-format
26575 +msgid "trying to write non-commit object %s to branch '%s'"
26576 +msgstr "尝试将非提交对象 %s 写入分支 '%s'"
26577 +
26578 #: refs.c
26579 #, c-format
26580 msgid "update_ref failed for ref '%s': %s"
@@ -26237,16 +26676,6 @@ msgstr "无法打开 '%s'"
26676 msgid "refname is dangerous: %s"
26677 msgstr "危险的引用名称：%s"
26678
26240 -#: refs/reftable-backend.c
26241 -#, c-format
26242 -msgid "trying to write ref '%s' with nonexistent object %s"
26243 -msgstr "试图用不存在的对象 %2$s 写入引用 '%1$s'"
26244 -
26245 -#: refs/reftable-backend.c
26246 -#, c-format
26247 -msgid "trying to write non-commit object %s to branch '%s'"
26248 -msgstr "尝试将非提交对象 %s 写入分支 '%s'"
26249 -
26679 #: refs/reftable-backend.c
26680 #, c-format
26681 msgid ""
@@ -26831,6 +27260,43 @@ msgstr "无法关闭引用快照临时文件"
27260 msgid "could not remove stale bitmap: %s"
27261 msgstr "无法删除过期的位图：%s"
27262
27263 +#: repack-midx.c
27264 +msgid "no packs to write MIDX during compaction"
27265 +msgstr "压实时没有要写入 MIDX 的包"
27266 +
27267 +#: repack-midx.c
27268 +#, c-format
27269 +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>"
27270 +msgstr "写入 MIDX 时预期刚好一行，却得到：%<PRIuMAX>"
27271 +
27272 +#: repack-midx.c
27273 +#, c-format
27274 +msgid "unexpected MIDX output: '%s'"
27275 +msgstr "意外的 MIDX 输出：'%s'"
27276 +
27277 +#: repack-midx.c
27278 +#, c-format
27279 +msgid "could not load pack %<PRIu32> from MIDX"
27280 +msgstr "无法从 MIDX 加载包 %<PRIu32>"
27281 +
27282 +#: repack-midx.c
27283 +msgid "too many objects in MIDX compaction step"
27284 +msgstr "MIDX 压实步骤中对象过多"
27285 +
27286 +#: repack-midx.c
27287 +#, c-format
27288 +msgid "could not find preferred pack for MIDX %s"
27289 +msgstr "无法找到 MIDX %s 的首选包"
27290 +
27291 +#: repack-midx.c
27292 +msgid "unable to generate compaction plan"
27293 +msgstr "无法生成压实计划"
27294 +
27295 +#: repack-midx.c
27296 +#, c-format
27297 +msgid "unable to execute compaction step %<PRIuMAX>"
27298 +msgstr "无法执行压实步骤 %<PRIuMAX>"
27299 +
27300 #: repack-promisor.c
27301 msgid "could not start pack-objects to repack promisor objects"
27302 msgstr "无法开始 pack-objects 来重新打包承诺者对象"
@@ -26911,6 +27377,15 @@ msgstr "需要一些提交来重放"
27377 msgid "all positive revisions given must be references"
27378 msgstr "提供的所有正向版本必须为引用"
27379
27380 +#: replay.c
27381 +#, c-format
27382 +msgid "commit %s became empty after replay"
27383 +msgstr "提交 %s 在重放后变空"
27384 +
27385 +#: replay.c
27386 +msgid "'--ref' cannot be used with multiple revision ranges"
27387 +msgstr "'--ref' 不能与多个版本范围一起使用"
27388 +
27389 #: replay.c sequencer.c
27390 #, c-format
27391 msgid "'%s' is not a valid refname"
@@ -27065,8 +27540,8 @@ msgid "object filtering requires --objects"
27540 msgstr "对象过滤需要 --objects"
27541
27542 #: revision.c
27068 -msgid "-L does not yet support diff formats besides -p and -s"
27069 -msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
27543 +msgid "-L does not yet support the requested diff format"
27544 +msgstr "-L 尚不支持所请求的差异格式"
27545
27546 #: run-command.c
27547 #, c-format
@@ -27438,7 +27913,7 @@ msgid ""
27913 msgstr ""
27914 "手工解决所有冲突，执行 \"git add/rm <冲突的文件>\" 标记\n"
27915 "冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n"
27441 -"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
27916 +"\"git rebase --skip\" 命令跳过这个提交。如果想要中止执行并回到\n"
27917 "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
27918
27919 #: sequencer.c
@@ -27460,7 +27935,7 @@ msgid ""
27935 msgstr ""
27936 "解决所有冲突之后，用 \"git add/rm <路径规格>\" 标记它们，\n"
27937 "然后执行 \"git cherry-pick --continue\"。您也可以执行\n"
27463 -"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
27938 +"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要中止执行并回到\n"
27939 "执行 \"git cherry-pick\" 之前的状态，执行 \"git cherry-pick --abort\"。"
27940
27941 #: sequencer.c
@@ -27474,7 +27949,7 @@ msgid ""
27949 msgstr ""
27950 "解决所有冲突之后，用 \"git add/rm <路径规格>\" 标记它们，\n"
27951 "然后执行 \"git revert --continue\"。您也可以执行\n"
27477 -"\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
27952 +"\"git revert --skip\" 命令跳过这个提交。如果想要中止执行并回到\n"
27953 "执行 \"git revert\" 之前的状态，执行 \"git revert --abort\"。"
27954
27955 #: sequencer.c
@@ -27968,7 +28443,7 @@ msgstr "无法解析 HEAD"
28443
28444 #: sequencer.c
28445 msgid "cannot abort from a branch yet to be born"
27971 -msgstr "无法从尚未建立的分支终止"
28446 +msgstr "无法从尚未建立的分支中止"
28447
28448 #: sequencer.c
28449 #, c-format
@@ -28196,22 +28671,28 @@ msgstr "无法存储 %s"
28671 #: sequencer.c
28672 #, c-format
28673 msgid ""
28199 -"%s\n"
28674 +"Your local changes are stashed, however applying them\n"
28675 +"resulted in conflicts. You can either resolve the conflicts\n"
28676 +"and then discard the stash with \"git stash drop\", or, if you\n"
28677 +"do not want to resolve them now, run \"git reset --hard\" and\n"
28678 +"apply the local changes later by running \"git stash pop\".\n"
28679 +msgstr ""
28680 +"您的本地修改已储藏，但在应用时出现了冲突。您可以解决这些冲突，\n"
28681 +"然后通过 \"git stash drop\" 丢弃该储藏；或者，如果您现在不想解决它们，\n"
28682 +"运行 \"git reset --hard\"，以后再运行 \"git stash pop\" 来重新应用\n"
28683 +"这些本地修改。\n"
28684 +
28685 +#: sequencer.c
28686 +#, c-format
28687 +msgid ""
28688 +"Autostash exists; creating a new stash entry.\n"
28689 "Your changes are safe in the stash.\n"
28690 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
28691 msgstr ""
28203 -"%s\n"
28692 +"自动储藏已存在，创建一个新的储藏条目。\n"
28693 "您的修改在储藏区中很安全。\n"
28694 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
28695
28207 -#: sequencer.c
28208 -msgid "Applying autostash resulted in conflicts."
28209 -msgstr "应用自动储藏导致冲突。"
28210 -
28211 -#: sequencer.c
28212 -msgid "Autostash exists; creating a new stash entry."
28213 -msgstr "自动储藏已经存在；正在创建一个新的储藏条目。"
28214 -
28696 #: sequencer.c
28697 msgid "autostash reference is a symref"
28698 msgstr "自动储藏的引用是一个符号引用"
@@ -28562,10 +29043,6 @@ msgstr ""
29043 msgid "fork failed"
29044 msgstr "fork 失败"
29045
28565 -#: setup.c
28566 -msgid "setsid failed"
28567 -msgstr "setsid 失败"
28568 -
29046 #: setup.c
29047 #, c-format
29048 msgid "cannot stat template '%s'"
@@ -28660,6 +29137,11 @@ msgstr "在 %s%s 初始化空的共享 Git 仓库\n"
29137 msgid "Initialized empty Git repository in %s%s\n"
29138 msgstr "在 %s%s 初始化空的 Git 仓库\n"
29139
29140 +#: sideband.c
29141 +#, c-format
29142 +msgid "unrecognized value for '%s': '%s'"
29143 +msgstr "'%s' 的值无法识别：'%s'"
29144 +
29145 #: sparse-index.c
29146 #, c-format
29147 msgid "index entry is a directory, but not sparse (%08x)"
@@ -29059,6 +29541,10 @@ msgstr "切换激进边遍历模式"
29541 msgid "read a pattern list over stdin"
29542 msgstr "从标准输入读取模式列表"
29543
29544 +#: t/helper/test-path-walk.c
29545 +msgid "toggle pruning of trees by sparse patterns"
29546 +msgstr "切换按稀疏模式裁剪树"
29547 +
29548 #: t/helper/test-reach.c
29549 #, c-format
29550 msgid "commit %s is not marked reachable"
@@ -29153,6 +29639,15 @@ msgstr "令牌"
29639 msgid "command token to send to the server"
29640 msgstr "发送到服务器的命令令牌"
29641
29642 +#: t/helper/test-synthesize.c
29643 +msgid "write a pack with a single reachable large blob"
29644 +msgstr "写入一个包含单个可达的大数据对象的包"
29645 +
29646 +#: t/helper/test-synthesize.c
29647 +#, c-format
29648 +msgid "'%s' is not a valid blob size"
29649 +msgstr "'%s' 不是一个有效的数据对象大小"
29650 +
29651 #: t/unit-tests/unit-test.c
29652 msgid "unit-test [<options>]"
29653 msgstr "unit-test [<选项>]"
@@ -29289,6 +29784,11 @@ msgstr "无法连接到子服务 %s"
29784 msgid "--negotiate-only requires protocol v2"
29785 msgstr "--negotiate-only 需要协议 v2"
29786
29787 +#: transport-helper.c
29788 +#, c-format
29789 +msgid "ignoring %s because the protocol does not support it."
29790 +msgstr "因协议不支持而忽略 %s"
29791 +
29792 #: transport-helper.c
29793 msgid "'option' without a matching 'ok/error' directive"
29794 msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
@@ -29488,7 +29988,7 @@ msgstr ""
29988
29989 #: transport.c
29990 msgid "Aborting."
29491 -msgstr "正在终止。"
29991 +msgstr "正在中止。"
29992
29993 #: transport.c
29994 msgid "failed to push all needed submodules"
@@ -29750,7 +30250,7 @@ msgstr ""
30250 #: unpack-trees.c
30251 #, c-format
30252 msgid "Aborting\n"
29753 -msgstr "正在终止\n"
30253 +msgstr "正在中止\n"
30254
30255 #: unpack-trees.c
30256 #, c-format
@@ -30222,7 +30722,7 @@ msgstr " （解决冲突并运行 \"git commit\"）"
30722 # 译者：注意保持前导空格
30723 #: wt-status.c
30724 msgid " (use \"git merge --abort\" to abort the merge)"
30225 -msgstr " （使用 \"git merge --abort\" 终止合并）"
30725 +msgstr " （使用 \"git merge --abort\" 中止合并）"
30726
30727 #: wt-status.c
30728 msgid "All conflicts fixed but you are still merging."
@@ -30702,7 +31202,7 @@ msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d"
31202
31203 #: git-send-email.perl
31204 msgid "the editor exited uncleanly, aborting everything"
30705 -msgstr "编辑器非正常退出，终止所有操作"
31205 +msgstr "编辑器非正常退出，中止所有操作"
31206
31207 #: git-send-email.perl
31208 #, perl-format