84bf71eae7 · matheusbsbs/matheus-bagliano

@@ -142,8 +142,8 @@ msgid ""

142 msgstr ""

143 "Project-Id-Version: Git\n"

144 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

145 -"POT-Creation-Date: 2021-10-30 09:36+0800\n"

146 -"PO-Revision-Date: 2021-11-02 18:03+0000\n"

145 +"POT-Creation-Date: 2021-11-04 08:34+0800\n"

146 +"PO-Revision-Date: 2021-11-04 11:01+0000\n"

147 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"

148 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"

149 "Language: zh_CN\n"

@@ -158,8 +158,8 @@ msgstr ""

158 msgid "Huh (%s)?"

159 msgstr "嗯（%s）？"

160

161 -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3510

162 -#: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233

161 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512

162 +#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233

163 #: builtin/rebase.c:1642

164 msgid "could not read index"

165 msgstr "不能读取索引"

@@ -188,7 +188,7 @@ msgstr "更新"

188 msgid "could not stage '%s'"

189 msgstr "不能暂存 '%s'"

190

191 -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3716

191 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718

192 msgid "could not write index"

193 msgstr "不能写入索引"

194

@@ -1383,8 +1383,8 @@ msgstr "不能为新建文件 %s 创建后端存储"

1383 msgid "unable to add cache entry for %s"

1384 msgstr "无法为 %s 添加缓存条目"

1385

1386 -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242

1387 -#: builtin/gc.c:2277

1386 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241

1387 +#: builtin/gc.c:2276

1388 #, c-format

1389 msgid "failed to write to '%s'"

1390 msgstr "写入 '%s' 失败"

@@ -1670,8 +1670,8 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list"

1670 msgid "cannot read %s"

1671 msgstr "不能读取 %s"

1672

1673 -#: archive.c:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112

1674 -#: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834

1673 +#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114

1674 +#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834

1675 #: builtin/merge.c:1145

1676 #, c-format

1677 msgid "could not read '%s'"

@@ -1954,7 +1954,7 @@ msgid "--reverse and --first-parent together require specified latest commit"

1954 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

1955

1956 #: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

1957 -#: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114

1957 +#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114

1958 #: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

1959 #: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

1960 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

@@ -2130,7 +2130,7 @@ msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"

2130 msgid "unrecognized header: %s%s (%d)"

2131 msgstr "未能识别的包头：%s%s (%d)"

2132

2133 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402

2133 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404

2134 #: builtin/commit.c:862

2135 #, c-format

2136 msgid "could not open '%s'"

@@ -2475,7 +2475,7 @@ msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"

2475 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2476 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

2477

2478 -#: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418

2478 +#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418

2479 #: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2480 #, c-format

2481 msgid "could not parse %s"

@@ -2593,7 +2593,7 @@ msgstr "键名没有包含一个小节名称：%s"

2593 msgid "key does not contain variable name: %s"

2594 msgstr "键名没有包含变量名：%s"

2595

2596 -#: config.c:470 sequencer.c:2802

2596 +#: config.c:470 sequencer.c:2804

2597 #, c-format

2598 msgid "invalid key: %s"

2599 msgstr "无效键名：%s"

@@ -4318,23 +4318,23 @@ msgstr "没有这样的远程引用 %s"

4318 msgid "Server does not allow request for unadvertised object %s"

4319 msgstr "服务器不允许请求未公开的对象 %s"

4320

4321 -#: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900

4322 -#: gpg-interface.c:916

4321 +#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902

4322 +#: gpg-interface.c:918

4323 msgid "could not create temporary file"

4324 msgstr "不能创建临时文件"

4325

4326 -#: gpg-interface.c:332 gpg-interface.c:452

4326 +#: gpg-interface.c:332 gpg-interface.c:454

4327 #, c-format

4328 msgid "failed writing detached signature to '%s'"

4329 msgstr "无法将分离式签名写入 '%s'"

4330

4331 -#: gpg-interface.c:443

4331 +#: gpg-interface.c:445

4332 msgid ""

4333 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4334 "signature verification"

4335 msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"

4336

4337 -#: gpg-interface.c:467

4337 +#: gpg-interface.c:469

4338 msgid ""

4339 "ssh-keygen -Y find-principals/verify is needed for ssh signature "

4340 "verification (available in openssh version 8.2p1+)"

@@ -4342,61 +4342,61 @@ msgstr ""

4342 "ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"

4343 "（openssh 8.2p1+ 版本可用）"

4344

4345 -#: gpg-interface.c:521

4345 +#: gpg-interface.c:523

4346 #, c-format

4347 msgid "ssh signing revocation file configured but not found: %s"

4348 msgstr "设置了 ssh 签名吊销文件但无法找到：%s"

4349

4350 -#: gpg-interface.c:574

4350 +#: gpg-interface.c:576

4351 #, c-format

4352 msgid "bad/incompatible signature '%s'"

4353 msgstr "坏的/不兼容的签名 '%s‘"

4354

4355 -#: gpg-interface.c:733 gpg-interface.c:738

4355 +#: gpg-interface.c:735 gpg-interface.c:740

4356 #, c-format

4357 msgid "failed to get the ssh fingerprint for key '%s'"

4358 msgstr "无法得到密钥 '%s' 的 ssh 指纹"

4359

4360 -#: gpg-interface.c:760

4360 +#: gpg-interface.c:762

4361 msgid ""

4362 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4363 msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"

4364

4365 -#: gpg-interface.c:778

4365 +#: gpg-interface.c:780

4366 #, c-format

4367 -msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"

4367 +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"

4368 msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"

4369

4370 -#: gpg-interface.c:784

4370 +#: gpg-interface.c:786

4371 #, c-format

4372 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4373 msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"

4374

4375 -#: gpg-interface.c:872

4375 +#: gpg-interface.c:874

4376 msgid "gpg failed to sign the data"

4377 msgstr "gpg 数据签名失败"

4378

4379 -#: gpg-interface.c:893

4379 +#: gpg-interface.c:895

4380 msgid "user.signingkey needs to be set for ssh signing"

4381 msgstr "ssh 签名需要设置 user.signingkey"

4382

4383 -#: gpg-interface.c:904

4383 +#: gpg-interface.c:906

4384 #, c-format

4385 msgid "failed writing ssh signing key to '%s'"

4386 msgstr "无法将 ssh 签名密钥写入 '%s'"

4387

4388 -#: gpg-interface.c:922

4388 +#: gpg-interface.c:924

4389 #, c-format

4390 msgid "failed writing ssh signing key buffer to '%s'"

4391 msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"

4392

4393 -#: gpg-interface.c:940

4393 +#: gpg-interface.c:942

4394 msgid ""

4395 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4396 "8.2p1+)"

4397 msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）"

4398

4399 -#: gpg-interface.c:952

4399 +#: gpg-interface.c:954

4400 #, c-format

4401 msgid "failed reading ssh signing data buffer from '%s'"

4402 msgstr "无法从 '%s' 读入 ssh 签名数据"

@@ -4406,7 +4406,7 @@ msgstr "无法从 '%s' 读入 ssh 签名数据"

4406 msgid "ignored invalid color '%.*s' in log.graphColors"

4407 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

4408

4409 -#: grep.c:531

4409 +#: grep.c:533

4410 msgid ""

4411 "given pattern contains NULL byte (via -f <file>). This is only supported "

4412 "with -P under PCRE v2"

@@ -4414,18 +4414,18 @@ msgstr ""

4414 "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"

4415 "功能"

4416

4417 -#: grep.c:1907

4417 +#: grep.c:1928

4418 #, c-format

4419 msgid "'%s': unable to read %s"

4420 msgstr "'%s'：无法读取 %s"

4421

4422 -#: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4422 +#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4423 #: builtin/rm.c:136

4424 #, c-format

4425 msgid "failed to stat '%s'"

4426 msgstr "对 '%s' 调用 stat 失败"

4427

4428 -#: grep.c:1935

4428 +#: grep.c:1956

4429 #, c-format

4430 msgid "'%s': short read"

4431 msgstr "'%s'：读取不完整"

@@ -6316,7 +6316,7 @@ msgstr "正在刷新索引"

6316 msgid "unable to create threaded lstat: %s"

6317 msgstr "无法创建线程 lstat：%s"

6318

6319 -#: pretty.c:988

6319 +#: pretty.c:1051

6320 msgid "unable to parse --pretty format"

6321 msgstr "不能解析 --pretty 格式"

6322

@@ -6353,7 +6353,7 @@ msgstr "不能启动 `log`"

6353 msgid "could not read `log` output"

6354 msgstr "不能读取 `log` 的输出"

6355

6356 -#: range-diff.c:97 sequencer.c:5603

6356 +#: range-diff.c:97 sequencer.c:5605

6357 #, c-format

6358 msgid "could not parse commit '%s'"

6359 msgstr "不能解析提交 '%s'"

@@ -6694,8 +6694,8 @@ msgstr ""

6694 "然而，如果您删除全部内容，变基操作将会终止。\n"

6695 "\n"

6696

6697 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3886

6698 -#: sequencer.c:3912 sequencer.c:5709 builtin/fsck.c:328 builtin/gc.c:1790

6697 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888

6698 +#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789

6699 #: builtin/rebase.c:190

6700 #, c-format

6701 msgid "could not write '%s'"

@@ -6948,7 +6948,7 @@ msgstr "这个命令拒绝元素 %%(%.*s)"

6948

6949 #: ref-filter.c:1040

6950 #, c-format

6951 -msgid "--format=%.*s cannot be used with--python, --shell, --tcl"

6951 +msgid "--format=%.*s cannot be used with --python, --shell, --tcl"

6952 msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"

6953

6954 #: ref-filter.c:1706

@@ -7420,7 +7420,7 @@ msgstr "无法写入 rerere 记录"

7420 msgid "there were errors while writing '%s' (%s)"

7421 msgstr "写入 '%s' (%s) 时出错"

7422

7423 -#: rerere.c:482 builtin/gc.c:2247 builtin/gc.c:2282

7423 +#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281

7424 #, c-format

7425 msgid "failed to flush '%s'"

7426 msgstr "刷新 '%s' 失败"

@@ -7504,7 +7504,7 @@ msgstr "不能打开 rr-cache 目录"

7504 msgid "could not determine HEAD revision"

7505 msgstr "不能确定 HEAD 版本"

7506

7507 -#: reset.c:70 reset.c:76 sequencer.c:3703

7507 +#: reset.c:70 reset.c:76 sequencer.c:3705

7508 #, c-format

7509 msgid "failed to find tree of %s"

7510 msgstr "无法找到 %s 指向的树"

@@ -7597,7 +7597,7 @@ msgstr "无效的提交信息清理模式 '%s'"

7597 msgid "could not delete '%s'"

7598 msgstr "无法删除 '%s'"

7599

7600 -#: sequencer.c:345 sequencer.c:4752 builtin/rebase.c:563 builtin/rebase.c:1297

7600 +#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297

7601 #: builtin/rm.c:408

7602 #, c-format

7603 msgid "could not remove '%s'"

@@ -7656,13 +7656,13 @@ msgstr ""

7656 "\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"

7657 "执行 \"git revert\" 之前的状态，执行 \"git revert --abort\"。"

7658

7659 -#: sequencer.c:448 sequencer.c:3288

7659 +#: sequencer.c:448 sequencer.c:3290

7660 #, c-format

7661 msgid "could not lock '%s'"

7662 msgstr "不能锁定 '%s'"

7663

7664 -#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306

7665 -#: sequencer.c:3564 sequencer.c:5619 strbuf.c:1176 wrapper.c:639

7664 +#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308

7665 +#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639

7666 #, c-format

7667 msgid "could not write to '%s'"

7668 msgstr "不能写入 '%s'"

@@ -7672,8 +7672,8 @@ msgstr "不能写入 '%s'"

7672 msgid "could not write eol to '%s'"

7673 msgstr "不能将换行符写入 '%s'"

7674

7675 -#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308

7676 -#: sequencer.c:3572

7675 +#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310

7676 +#: sequencer.c:3574

7677 #, c-format

7678 msgid "failed to finalize '%s'"

7679 msgstr "无法完成 '%s'"

@@ -7787,11 +7787,11 @@ msgstr ""

7787 "\n"

7788 " git rebase --continue\n"

7789

7790 -#: sequencer.c:1227

7790 +#: sequencer.c:1229

7791 msgid "'prepare-commit-msg' hook failed"

7792 msgstr "'prepare-commit-msg' 钩子失败"

7793

7794 -#: sequencer.c:1233

7794 +#: sequencer.c:1235

7795 msgid ""

7796 "Your name and email address were configured automatically based\n"

7797 "on your username and hostname. Please check that they are accurate.\n"

@@ -7815,7 +7815,7 @@ msgstr ""

7815 "\n"

7816 " git commit --amend --reset-author\n"

7817

7818 -#: sequencer.c:1246

7818 +#: sequencer.c:1248

7819 msgid ""

7820 "Your name and email address were configured automatically based\n"

7821 "on your username and hostname. Please check that they are accurate.\n"

@@ -7838,349 +7838,349 @@ msgstr ""

7838 "\n"

7839 " git commit --amend --reset-author\n"

7840

7841 -#: sequencer.c:1288

7841 +#: sequencer.c:1290

7842 msgid "couldn't look up newly created commit"

7843 msgstr "无法找到新创建的提交"

7844

7845 -#: sequencer.c:1290

7845 +#: sequencer.c:1292

7846 msgid "could not parse newly created commit"

7847 msgstr "不能解析新创建的提交"

7848

7849 -#: sequencer.c:1336

7849 +#: sequencer.c:1338

7850 msgid "unable to resolve HEAD after creating commit"

7851 msgstr "创建提交后，不能解析 HEAD"

7852

7853 -#: sequencer.c:1338

7853 +#: sequencer.c:1340

7854 msgid "detached HEAD"

7855 msgstr "分离头指针"

7856

7857 # 译者：中文字符串拼接，可删除前导空格

7858 -#: sequencer.c:1342

7858 +#: sequencer.c:1344

7859 msgid " (root-commit)"

7860 msgstr "（根提交）"

7861

7862 -#: sequencer.c:1363

7862 +#: sequencer.c:1365

7863 msgid "could not parse HEAD"

7864 msgstr "不能解析 HEAD"

7865

7866 -#: sequencer.c:1365

7866 +#: sequencer.c:1367

7867 #, c-format

7868 msgid "HEAD %s is not a commit!"

7869 msgstr "HEAD %s 不是一个提交！"

7870

7871 -#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707

7871 +#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707

7872 msgid "could not parse HEAD commit"

7873 msgstr "不能解析 HEAD 提交"

7874

7875 -#: sequencer.c:1425 sequencer.c:2310

7875 +#: sequencer.c:1427 sequencer.c:2312

7876 msgid "unable to parse commit author"

7877 msgstr "不能解析提交作者"

7878

7879 -#: sequencer.c:1436 builtin/am.c:1616 builtin/merge.c:708

7879 +#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708

7880 msgid "git write-tree failed to write a tree"

7881 msgstr "git write-tree 无法写入树对象"

7882

7883 -#: sequencer.c:1469 sequencer.c:1589

7883 +#: sequencer.c:1471 sequencer.c:1591

7884 #, c-format

7885 msgid "unable to read commit message from '%s'"

7886 msgstr "不能从 '%s' 读取提交说明"

7887

7888 -#: sequencer.c:1500 sequencer.c:1532

7888 +#: sequencer.c:1502 sequencer.c:1534

7889 #, c-format

7890 msgid "invalid author identity '%s'"

7891 msgstr "无效的作者身份 '%s'"

7892

7893 -#: sequencer.c:1506

7893 +#: sequencer.c:1508

7894 msgid "corrupt author: missing date information"

7895 msgstr "损坏的作者：缺失日期信息"

7896

7897 -#: sequencer.c:1545 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913

7897 +#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913

7898 #: builtin/merge.c:938 t/helper/test-fast-rebase.c:78

7899 msgid "failed to write commit object"

7900 msgstr "写提交对象失败"

7901

7902 -#: sequencer.c:1572 sequencer.c:4524 t/helper/test-fast-rebase.c:199

7902 +#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199

7903 #: t/helper/test-fast-rebase.c:217

7904 #, c-format

7905 msgid "could not update %s"

7906 msgstr "不能更新 %s"

7907

7908 -#: sequencer.c:1621

7908 +#: sequencer.c:1623

7909 #, c-format

7910 msgid "could not parse commit %s"

7911 msgstr "不能解析提交 %s"

7912

7913 -#: sequencer.c:1626

7913 +#: sequencer.c:1628

7914 #, c-format

7915 msgid "could not parse parent commit %s"

7916 msgstr "不能解析父提交 %s"

7917

7918 -#: sequencer.c:1709 sequencer.c:1990

7918 +#: sequencer.c:1711 sequencer.c:1992

7919 #, c-format

7920 msgid "unknown command: %d"

7921 msgstr "未知命令：%d"

7922

7923 -#: sequencer.c:1751

7923 +#: sequencer.c:1753

7924 msgid "This is the 1st commit message:"

7925 msgstr "这是第一个提交说明："

7926

7927 -#: sequencer.c:1752

7927 +#: sequencer.c:1754

7928 #, c-format

7929 msgid "This is the commit message #%d:"

7930 msgstr "这是提交说明 #%d："

7931

7932 -#: sequencer.c:1753

7932 +#: sequencer.c:1755

7933 msgid "The 1st commit message will be skipped:"

7934 msgstr "第一个提交说明将被跳过："

7935

7936 -#: sequencer.c:1754

7936 +#: sequencer.c:1756

7937 #, c-format

7938 msgid "The commit message #%d will be skipped:"

7939 msgstr "提交说明 #%d 将被跳过："

7940

7941 -#: sequencer.c:1755

7941 +#: sequencer.c:1757

7942 #, c-format

7943 msgid "This is a combination of %d commits."

7944 msgstr "这是一个 %d 个提交的组合。"

7945

7946 -#: sequencer.c:1902 sequencer.c:1959

7946 +#: sequencer.c:1904 sequencer.c:1961

7947 #, c-format

7948 msgid "cannot write '%s'"

7949 msgstr "不能写 '%s'"

7950

7951 -#: sequencer.c:1949

7951 +#: sequencer.c:1951

7952 msgid "need a HEAD to fixup"

7953 msgstr "需要一个 HEAD 来修复"

7954

7955 -#: sequencer.c:1951 sequencer.c:3599

7955 +#: sequencer.c:1953 sequencer.c:3601

7956 msgid "could not read HEAD"

7957 msgstr "不能读取 HEAD"

7958

7959 -#: sequencer.c:1953

7959 +#: sequencer.c:1955

7960 msgid "could not read HEAD's commit message"

7961 msgstr "不能读取 HEAD 的提交说明"

7962

7963 -#: sequencer.c:1977

7963 +#: sequencer.c:1979

7964 #, c-format

7965 msgid "could not read commit message of %s"

7966 msgstr "不能读取 %s 的提交说明"

7967

7968 -#: sequencer.c:2087

7968 +#: sequencer.c:2089

7969 msgid "your index file is unmerged."

7970 msgstr "您的索引文件未完成合并。"

7971

7972 -#: sequencer.c:2094

7972 +#: sequencer.c:2096

7973 msgid "cannot fixup root commit"

7974 msgstr "不能修复根提交"

7975

7976 -#: sequencer.c:2113

7976 +#: sequencer.c:2115

7977 #, c-format

7978 msgid "commit %s is a merge but no -m option was given."

7979 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

7980

7981 -#: sequencer.c:2121 sequencer.c:2129

7981 +#: sequencer.c:2123 sequencer.c:2131

7982 #, c-format

7983 msgid "commit %s does not have parent %d"

7984 msgstr "提交 %s 没有第 %d 个父提交"

7985

7986 -#: sequencer.c:2135

7986 +#: sequencer.c:2137

7987 #, c-format

7988 msgid "cannot get commit message for %s"

7989 msgstr "不能得到 %s 的提交说明"

7990

7991 #. TRANSLATORS: The first %s will be a "todo" command like

7992 #. "revert" or "pick", the second %s a SHA1.

7993 -#: sequencer.c:2154

7993 +#: sequencer.c:2156

7994 #, c-format

7995 msgid "%s: cannot parse parent commit %s"

7996 msgstr "%s：不能解析父提交 %s"

7997

7998 -#: sequencer.c:2220

7998 +#: sequencer.c:2222

7999 #, c-format

8000 msgid "could not rename '%s' to '%s'"

8001 msgstr "不能将 '%s' 重命名为 '%s'"

8002

8003 -#: sequencer.c:2280

8003 +#: sequencer.c:2282

8004 #, c-format

8005 msgid "could not revert %s... %s"

8006 msgstr "不能还原 %s... %s"

8007

8008 -#: sequencer.c:2281

8008 +#: sequencer.c:2283

8009 #, c-format

8010 msgid "could not apply %s... %s"

8011 msgstr "不能应用 %s... %s"

8012

8013 -#: sequencer.c:2302

8013 +#: sequencer.c:2304

8014 #, c-format

8015 msgid "dropping %s %s -- patch contents already upstream\n"

8016 msgstr "丢弃 %s %s -- 补丁内容已在上游\n"

8017

8018 -#: sequencer.c:2360

8018 +#: sequencer.c:2362

8019 #, c-format

8020 msgid "git %s: failed to read the index"

8021 msgstr "git %s：无法读取索引"

8022

8023 -#: sequencer.c:2368

8023 +#: sequencer.c:2370

8024 #, c-format

8025 msgid "git %s: failed to refresh the index"

8026 msgstr "git %s：无法刷新索引"

8027

8028 -#: sequencer.c:2448

8028 +#: sequencer.c:2450

8029 #, c-format

8030 msgid "%s does not accept arguments: '%s'"

8031 msgstr "%s 不接受参数：'%s'"

8032

8033 -#: sequencer.c:2457

8033 +#: sequencer.c:2459

8034 #, c-format

8035 msgid "missing arguments for %s"

8036 msgstr "缺少 %s 的参数"

8037

8038 -#: sequencer.c:2500

8038 +#: sequencer.c:2502

8039 #, c-format

8040 msgid "could not parse '%s'"

8041 msgstr "无法解析 '%s'"

8042

8043 -#: sequencer.c:2561

8043 +#: sequencer.c:2563

8044 #, c-format

8045 msgid "invalid line %d: %.*s"

8046 msgstr "无效行 %d：%.*s"

8047

8048 -#: sequencer.c:2572

8048 +#: sequencer.c:2574

8049 #, c-format

8050 msgid "cannot '%s' without a previous commit"

8051 msgstr "没有父提交的情况下不能 '%s'"

8052

8053 -#: sequencer.c:2620 builtin/rebase.c:184

8053 +#: sequencer.c:2622 builtin/rebase.c:184

8054 #, c-format

8055 msgid "could not read '%s'."

8056 msgstr "不能读取 '%s'。"

8057

8058 -#: sequencer.c:2658

8058 +#: sequencer.c:2660

8059 msgid "cancelling a cherry picking in progress"

8060 msgstr "正在取消一个进行中的拣选"

8061

8062 -#: sequencer.c:2667

8062 +#: sequencer.c:2669

8063 msgid "cancelling a revert in progress"

8064 msgstr "正在取消一个进行中的还原"

8065

8066 -#: sequencer.c:2707

8066 +#: sequencer.c:2709

8067 msgid "please fix this using 'git rebase --edit-todo'."

8068 msgstr "请用 'git rebase --edit-todo' 来修改。"

8069

8070 -#: sequencer.c:2709

8070 +#: sequencer.c:2711

8071 #, c-format

8072 msgid "unusable instruction sheet: '%s'"

8073 msgstr "不可用的指令清单：'%s'"

8074

8075 -#: sequencer.c:2714

8075 +#: sequencer.c:2716

8076 msgid "no commits parsed."

8077 msgstr "没有解析提交。"

8078

8079 -#: sequencer.c:2725

8079 +#: sequencer.c:2727

8080 msgid "cannot cherry-pick during a revert."

8081 msgstr "不能在回退中执行拣选。"

8082

8083 -#: sequencer.c:2727

8083 +#: sequencer.c:2729

8084 msgid "cannot revert during a cherry-pick."

8085 msgstr "不能在拣选中执行回退。"

8086

8087 -#: sequencer.c:2805

8087 +#: sequencer.c:2807

8088 #, c-format

8089 msgid "invalid value for %s: %s"

8090 msgstr "%s 的值无效：%s"

8091

8092 -#: sequencer.c:2914

8092 +#: sequencer.c:2916

8093 msgid "unusable squash-onto"

8094 msgstr "不可用的 squash-onto"

8095

8096 -#: sequencer.c:2934

8096 +#: sequencer.c:2936

8097 #, c-format

8098 msgid "malformed options sheet: '%s'"

8099 msgstr "格式错误的选项清单：'%s'"

8100

8101 -#: sequencer.c:3029 sequencer.c:4903

8101 +#: sequencer.c:3031 sequencer.c:4905

8102 msgid "empty commit set passed"

8103 msgstr "提供了空的提交集"

8104

8105 -#: sequencer.c:3046

8105 +#: sequencer.c:3048

8106 msgid "revert is already in progress"

8107 msgstr "一个还原操作已在进行"

8108

8109 -#: sequencer.c:3048

8109 +#: sequencer.c:3050

8110 #, c-format

8111 msgid "try \"git revert (--continue | %s--abort | --quit)\""

8112 msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""

8113

8114 -#: sequencer.c:3051

8114 +#: sequencer.c:3053

8115 msgid "cherry-pick is already in progress"

8116 msgstr "拣选操作已在进行"

8117

8118 -#: sequencer.c:3053

8118 +#: sequencer.c:3055

8119 #, c-format

8120 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

8121 msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""

8122

8123 -#: sequencer.c:3067

8123 +#: sequencer.c:3069

8124 #, c-format

8125 msgid "could not create sequencer directory '%s'"

8126 msgstr "不能创建序列目录 '%s'"

8127

8128 -#: sequencer.c:3082

8128 +#: sequencer.c:3084

8129 msgid "could not lock HEAD"

8130 msgstr "不能锁定 HEAD"

8131

8132 -#: sequencer.c:3142 sequencer.c:4613

8132 +#: sequencer.c:3144 sequencer.c:4615

8133 msgid "no cherry-pick or revert in progress"

8134 msgstr "拣选或还原操作并未进行"

8135

8136 -#: sequencer.c:3144 sequencer.c:3155

8136 +#: sequencer.c:3146 sequencer.c:3157

8137 msgid "cannot resolve HEAD"

8138 msgstr "不能解析 HEAD"

8139

8140 -#: sequencer.c:3146 sequencer.c:3190

8140 +#: sequencer.c:3148 sequencer.c:3192

8141 msgid "cannot abort from a branch yet to be born"

8142 msgstr "不能从尚未建立的分支终止"

8143

8144 -#: sequencer.c:3176 builtin/grep.c:772

8144 +#: sequencer.c:3178 builtin/grep.c:772

8145 #, c-format

8146 msgid "cannot open '%s'"

8147 msgstr "不能打开 '%s'"

8148

8149 -#: sequencer.c:3178

8149 +#: sequencer.c:3180

8150 #, c-format

8151 msgid "cannot read '%s': %s"

8152 msgstr "不能读取 '%s'：%s"

8153

8154 -#: sequencer.c:3179

8154 +#: sequencer.c:3181

8155 msgid "unexpected end of file"

8156 msgstr "意外的文件结束"

8157

8158 -#: sequencer.c:3185

8158 +#: sequencer.c:3187

8159 #, c-format

8160 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

8161 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

8162

8163 -#: sequencer.c:3196

8163 +#: sequencer.c:3198

8164 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

8165 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

8166

8167 -#: sequencer.c:3237

8167 +#: sequencer.c:3239

8168 msgid "no revert in progress"

8169 msgstr "没有正在进行的还原"

8170

8171 -#: sequencer.c:3246

8171 +#: sequencer.c:3248

8172 msgid "no cherry-pick in progress"

8173 msgstr "没有正在进行的拣选"

8174

8175 -#: sequencer.c:3256

8175 +#: sequencer.c:3258

8176 msgid "failed to skip the commit"

8177 msgstr "无法跳过这个提交"

8178

8179 -#: sequencer.c:3263

8179 +#: sequencer.c:3265

8180 msgid "there is nothing to skip"

8181 msgstr "没有要跳过的"

8182

8183 -#: sequencer.c:3266

8183 +#: sequencer.c:3268

8184 #, c-format

8185 msgid ""

8186 "have you committed already?\n"

@@ -8189,16 +8189,16 @@ msgstr ""

8189 "您已经提交了么？\n"

8190 "试试 \"git %s --continue\""

8191

8192 -#: sequencer.c:3428 sequencer.c:4504

8192 +#: sequencer.c:3430 sequencer.c:4506

8193 msgid "cannot read HEAD"

8194 msgstr "不能读取 HEAD"

8195

8196 -#: sequencer.c:3445

8196 +#: sequencer.c:3447

8197 #, c-format

8198 msgid "unable to copy '%s' to '%s'"

8199 msgstr "无法拷贝 '%s' 至 '%s'"

8200

8201 -#: sequencer.c:3453

8201 +#: sequencer.c:3455

8202 #, c-format

8203 msgid ""

8204 "You can amend the commit now, with\n"

@@ -8217,27 +8217,27 @@ msgstr ""

8217 "\n"

8218 " git rebase --continue\n"

8219

8220 -#: sequencer.c:3463

8220 +#: sequencer.c:3465

8221 #, c-format

8222 msgid "Could not apply %s... %.*s"

8223 msgstr "不能应用 %s... %.*s"

8224

8225 -#: sequencer.c:3470

8225 +#: sequencer.c:3472

8226 #, c-format

8227 msgid "Could not merge %.*s"

8228 msgstr "不能合并 %.*s"

8229

8230 -#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:639

8230 +#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639

8231 #, c-format

8232 msgid "could not copy '%s' to '%s'"

8233 msgstr "不能拷贝 '%s' 至 '%s'"

8234

8235 -#: sequencer.c:3500

8235 +#: sequencer.c:3502

8236 #, c-format

8237 msgid "Executing: %s\n"

8238 msgstr "正在执行：%s\n"

8239

8240 -#: sequencer.c:3515

8240 +#: sequencer.c:3517

8241 #, c-format

8242 msgid ""

8243 "execution failed: %s\n"

@@ -8252,11 +8252,11 @@ msgstr ""

8252 " git rebase --continue\n"

8253 "\n"

8254

8255 -#: sequencer.c:3521

8255 +#: sequencer.c:3523

8256 msgid "and made changes to the index and/or the working tree\n"

8257 msgstr "并且修改索引和/或工作区\n"

8258

8259 -#: sequencer.c:3527

8259 +#: sequencer.c:3529

8260 #, c-format

8261 msgid ""

8262 "execution succeeded: %s\n"

@@ -8273,90 +8273,90 @@ msgstr ""

8273 " git rebase --continue\n"

8274 "\n"

8275

8276 -#: sequencer.c:3589

8276 +#: sequencer.c:3591

8277 #, c-format

8278 msgid "illegal label name: '%.*s'"

8279 msgstr "非法的标签名称：'%.*s'"

8280

8281 -#: sequencer.c:3662

8281 +#: sequencer.c:3664

8282 msgid "writing fake root commit"

8283 msgstr "写伪根提交"

8284

8285 -#: sequencer.c:3667

8285 +#: sequencer.c:3669

8286 msgid "writing squash-onto"

8287 msgstr "写入 squash-onto"

8288

8289 -#: sequencer.c:3746

8289 +#: sequencer.c:3748

8290 #, c-format

8291 msgid "could not resolve '%s'"

8292 msgstr "无法解析 '%s'"

8293

8294 -#: sequencer.c:3778

8294 +#: sequencer.c:3780

8295 msgid "cannot merge without a current revision"

8296 msgstr "没有当前版本不能合并"

8297

8298 -#: sequencer.c:3800

8298 +#: sequencer.c:3802

8299 #, c-format

8300 msgid "unable to parse '%.*s'"

8301 msgstr "无法解析 '%.*s'"

8302

8303 -#: sequencer.c:3809

8303 +#: sequencer.c:3811

8304 #, c-format

8305 msgid "nothing to merge: '%.*s'"

8306 msgstr "无可用合并：'%.*s'"

8307

8308 -#: sequencer.c:3821

8308 +#: sequencer.c:3823

8309 msgid "octopus merge cannot be executed on top of a [new root]"

8310 msgstr "章鱼合并不能在一个新的根提交上执行"

8311

8312 -#: sequencer.c:3876

8312 +#: sequencer.c:3878

8313 #, c-format

8314 msgid "could not get commit message of '%s'"

8315 msgstr "不能获取 '%s' 的提交说明"

8316

8317 -#: sequencer.c:4022

8317 +#: sequencer.c:4024

8318 #, c-format

8319 msgid "could not even attempt to merge '%.*s'"

8320 msgstr "甚至不能尝试合并 '%.*s'"

8321

8322 -#: sequencer.c:4038

8322 +#: sequencer.c:4040

8323 msgid "merge: Unable to write new index file"

8324 msgstr "合并：无法写入新索引文件"

8325

8326 -#: sequencer.c:4119

8326 +#: sequencer.c:4121

8327 msgid "Cannot autostash"

8328 msgstr "无法自动贮藏"

8329

8330 -#: sequencer.c:4122

8330 +#: sequencer.c:4124

8331 #, c-format

8332 msgid "Unexpected stash response: '%s'"

8333 msgstr "意外的贮藏响应：'%s'"

8334

8335 -#: sequencer.c:4128

8335 +#: sequencer.c:4130

8336 #, c-format

8337 msgid "Could not create directory for '%s'"

8338 msgstr "不能为 '%s' 创建目录"

8339

8340 -#: sequencer.c:4131

8340 +#: sequencer.c:4133

8341 #, c-format

8342 msgid "Created autostash: %s\n"

8343 msgstr "创建了自动贮藏：%s\n"

8344

8345 -#: sequencer.c:4135

8345 +#: sequencer.c:4137

8346 msgid "could not reset --hard"

8347 msgstr "无法硬性重置（reset --hard）"

8348

8349 -#: sequencer.c:4160

8349 +#: sequencer.c:4162

8350 #, c-format

8351 msgid "Applied autostash.\n"

8352 msgstr "已应用自动贮藏。\n"

8353

8354 -#: sequencer.c:4172

8354 +#: sequencer.c:4174

8355 #, c-format

8356 msgid "cannot store %s"

8357 msgstr "不能存储 %s"

8358

8359 -#: sequencer.c:4175

8359 +#: sequencer.c:4177

8360 #, c-format

8361 msgid ""

8362 "%s\n"

@@ -8367,29 +8367,29 @@ msgstr ""

8367 "您的修改在贮藏区中很安全。\n"

8368 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

8369

8370 -#: sequencer.c:4180

8370 +#: sequencer.c:4182

8371 msgid "Applying autostash resulted in conflicts."

8372 msgstr "应用自动贮藏导致冲突。"

8373

8374 -#: sequencer.c:4181

8374 +#: sequencer.c:4183

8375 msgid "Autostash exists; creating a new stash entry."

8376 msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"

8377

8378 -#: sequencer.c:4253

8378 +#: sequencer.c:4255

8379 msgid "could not detach HEAD"

8380 msgstr "不能分离头指针"

8381

8382 -#: sequencer.c:4268

8382 +#: sequencer.c:4270

8383 #, c-format

8384 msgid "Stopped at HEAD\n"

8385 msgstr "停止在 HEAD\n"

8386

8387 -#: sequencer.c:4270

8387 +#: sequencer.c:4272

8388 #, c-format

8389 msgid "Stopped at %s\n"

8390 msgstr "停止在 %s\n"

8391

8392 -#: sequencer.c:4302

8392 +#: sequencer.c:4304

8393 #, c-format

8394 msgid ""

8395 "Could not execute the todo command\n"

@@ -8409,58 +8409,58 @@ msgstr ""

8409 " git rebase --edit-todo\n"

8410 " git rebase --continue\n"

8411

8412 -#: sequencer.c:4348

8412 +#: sequencer.c:4350

8413 #, c-format

8414 msgid "Rebasing (%d/%d)%s"

8415 msgstr "正在变基（%d/%d）%s"

8416

8417 -#: sequencer.c:4394

8417 +#: sequencer.c:4396

8418 #, c-format

8419 msgid "Stopped at %s... %.*s\n"

8420 msgstr "停止在 %s... %.*s\n"

8421

8422 -#: sequencer.c:4464

8422 +#: sequencer.c:4466

8423 #, c-format

8424 msgid "unknown command %d"

8425 msgstr "未知命令 %d"

8426

8427 -#: sequencer.c:4512

8427 +#: sequencer.c:4514

8428 msgid "could not read orig-head"

8429 msgstr "不能读取 orig-head"

8430

8431 -#: sequencer.c:4517

8431 +#: sequencer.c:4519

8432 msgid "could not read 'onto'"

8433 msgstr "不能读取 'onto'"

8434

8435 -#: sequencer.c:4531

8435 +#: sequencer.c:4533

8436 #, c-format

8437 msgid "could not update HEAD to %s"

8438 msgstr "不能更新 HEAD 为 %s"

8439

8440 -#: sequencer.c:4591

8440 +#: sequencer.c:4593

8441 #, c-format

8442 msgid "Successfully rebased and updated %s.\n"

8443 msgstr "成功变基并更新 %s。\n"

8444

8445 -#: sequencer.c:4643

8445 +#: sequencer.c:4645

8446 msgid "cannot rebase: You have unstaged changes."

8447 msgstr "不能变基：您有未暂存的变更。"

8448

8449 -#: sequencer.c:4652

8449 +#: sequencer.c:4654

8450 msgid "cannot amend non-existing commit"

8451 msgstr "不能修补不存在的提交"

8452

8453 -#: sequencer.c:4654

8453 +#: sequencer.c:4656

8454 #, c-format

8455 msgid "invalid file: '%s'"

8456 msgstr "无效文件：'%s'"

8457

8458 -#: sequencer.c:4656

8458 +#: sequencer.c:4658

8459 #, c-format

8460 msgid "invalid contents: '%s'"

8461 msgstr "无效内容：'%s'"

8462

8463 -#: sequencer.c:4659

8463 +#: sequencer.c:4661

8464 msgid ""

8465 "\n"

8466 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -8469,59 +8469,59 @@ msgstr ""

8469 "\n"

8470 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

8471

8472 -#: sequencer.c:4695 sequencer.c:4734

8472 +#: sequencer.c:4697 sequencer.c:4736

8473 #, c-format

8474 msgid "could not write file: '%s'"

8475 msgstr "不能写入文件：'%s'"

8476

8477 -#: sequencer.c:4750

8477 +#: sequencer.c:4752

8478 msgid "could not remove CHERRY_PICK_HEAD"

8479 msgstr "不能删除 CHERRY_PICK_HEAD"

8480

8481 -#: sequencer.c:4760

8481 +#: sequencer.c:4762

8482 msgid "could not commit staged changes."

8483 msgstr "不能提交暂存的修改。"

8484

8485 -#: sequencer.c:4880

8485 +#: sequencer.c:4882

8486 #, c-format

8487 msgid "%s: can't cherry-pick a %s"

8488 msgstr "%s：不能拣选一个%s"

8489

8490 -#: sequencer.c:4884

8490 +#: sequencer.c:4886

8491 #, c-format

8492 msgid "%s: bad revision"

8493 msgstr "%s：错误的版本"

8494

8495 -#: sequencer.c:4919

8495 +#: sequencer.c:4921

8496 msgid "can't revert as initial commit"

8497 msgstr "不能作为初始提交回退"

8498

8499 -#: sequencer.c:5190 sequencer.c:5419

8499 +#: sequencer.c:5192 sequencer.c:5421

8500 #, c-format

8501 msgid "skipped previously applied commit %s"

8502 msgstr "跳过了先前已应用的提交 %s"

8503

8504 -#: sequencer.c:5260 sequencer.c:5435

8504 +#: sequencer.c:5262 sequencer.c:5437

8505 msgid "use --reapply-cherry-picks to include skipped commits"

8506 msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"

8507

8508 -#: sequencer.c:5406

8508 +#: sequencer.c:5408

8509 msgid "make_script: unhandled options"

8510 msgstr "make_script：有未能处理的选项"

8511

8512 -#: sequencer.c:5409

8512 +#: sequencer.c:5411

8513 msgid "make_script: error preparing revisions"

8514 msgstr "make_script：准备版本时错误"

8515

8516 -#: sequencer.c:5667 sequencer.c:5684

8516 +#: sequencer.c:5669 sequencer.c:5686

8517 msgid "nothing to do"

8518 msgstr "无事可做"

8519

8520 -#: sequencer.c:5703

8520 +#: sequencer.c:5705

8521 msgid "could not skip unnecessary pick commands"

8522 msgstr "无法跳过不必要的拣选"

8523

8524 -#: sequencer.c:5803

8524 +#: sequencer.c:5805

8525 msgid "the script was already rearranged."

8526 msgstr "脚本已经重新编排。"

8527

@@ -13445,7 +13445,7 @@ msgstr "要计算的变更路径布隆过滤器的最大数"

13445 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"

13446 msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"

13447

13448 -#: builtin/commit-graph.c:283

13448 +#: builtin/commit-graph.c:282

13449 msgid "Collecting commits from input"

13450 msgstr "正从标准输入收集提交"

13451

@@ -15706,16 +15706,16 @@ msgstr "显示进度"

15706 msgid "show verbose names for reachable objects"

15707 msgstr "显示可达对象的详细名称"

15708

15709 -#: builtin/fsck.c:860 builtin/index-pack.c:261

15709 +#: builtin/fsck.c:861 builtin/index-pack.c:261

15710 msgid "Checking objects"

15711 msgstr "正在检查对象"

15712

15713 -#: builtin/fsck.c:888

15713 +#: builtin/fsck.c:889

15714 #, c-format

15715 msgid "%s: object missing"

15716 msgstr "%s：对象缺失"

15717

15718 -#: builtin/fsck.c:899

15718 +#: builtin/fsck.c:900

15719 #, c-format

15720 msgid "invalid parameter: expected sha1, got '%s'"

15721 msgstr "无效的参数：期望 sha1，得到 '%s'"

@@ -15846,171 +15846,171 @@ msgstr "无法启动 'git pack-objects' 进程"

15846 msgid "failed to finish 'git pack-objects' process"

15847 msgstr "无法完成 'git pack-objects' 进程"

15848

15849 -#: builtin/gc.c:1089

15849 +#: builtin/gc.c:1088

15850 msgid "failed to write multi-pack-index"

15851 msgstr "无法写入多包索引"

15852

15853 -#: builtin/gc.c:1105

15853 +#: builtin/gc.c:1104

15854 msgid "'git multi-pack-index expire' failed"

15855 msgstr "'git multi-pack-index expire' 失败"

15856

15857 -#: builtin/gc.c:1164

15857 +#: builtin/gc.c:1163

15858 msgid "'git multi-pack-index repack' failed"

15859 msgstr "'git multi-pack-index repack' 失败"

15860

15861 -#: builtin/gc.c:1173

15861 +#: builtin/gc.c:1172

15862 msgid ""

15863 "skipping incremental-repack task because core.multiPackIndex is disabled"

15864 msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"

15865

15866 -#: builtin/gc.c:1277

15866 +#: builtin/gc.c:1276

15867 #, c-format

15868 msgid "lock file '%s' exists, skipping maintenance"

15869 msgstr "锁文件 '%s' 已存在，跳过维护"

15870

15871 -#: builtin/gc.c:1307

15871 +#: builtin/gc.c:1306

15872 #, c-format

15873 msgid "task '%s' failed"

15874 msgstr "任务 '%s' 失败"

15875

15876 -#: builtin/gc.c:1389

15876 +#: builtin/gc.c:1388

15877 #, c-format

15878 msgid "'%s' is not a valid task"

15879 msgstr "'%s' 不是一个有效的任务"

15880

15881 -#: builtin/gc.c:1394

15881 +#: builtin/gc.c:1393

15882 #, c-format

15883 msgid "task '%s' cannot be selected multiple times"

15884 msgstr "任务 '%s' 不能被多次选择"

15885

15886 -#: builtin/gc.c:1409

15886 +#: builtin/gc.c:1408

15887 msgid "run tasks based on the state of the repository"

15888 msgstr "基于仓库状态来运行任务"

15889

15890 -#: builtin/gc.c:1410

15890 +#: builtin/gc.c:1409

15891 msgid "frequency"

15892 msgstr "频率"

15893

15894 -#: builtin/gc.c:1411

15894 +#: builtin/gc.c:1410

15895 msgid "run tasks based on frequency"

15896 msgstr "基于频率运行任务"

15897

15898 -#: builtin/gc.c:1414

15898 +#: builtin/gc.c:1413

15899 msgid "do not report progress or other information over stderr"

15900 msgstr "不通过标准错误报告进度或其它信息"

15901

15902 -#: builtin/gc.c:1415

15902 +#: builtin/gc.c:1414

15903 msgid "task"

15904 msgstr "任务"

15905

15906 -#: builtin/gc.c:1416

15906 +#: builtin/gc.c:1415

15907 msgid "run a specific task"

15908 msgstr "运行一个特定的任务"

15909

15910 -#: builtin/gc.c:1433

15910 +#: builtin/gc.c:1432

15911 msgid "use at most one of --auto and --schedule=<frequency>"

15912 msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"

15913

15914 -#: builtin/gc.c:1476

15914 +#: builtin/gc.c:1475

15915 msgid "failed to run 'git config'"

15916 msgstr "无法运行 'git config'"

15917

15918 -#: builtin/gc.c:1628

15918 +#: builtin/gc.c:1627

15919 #, c-format

15920 msgid "failed to expand path '%s'"

15921 msgstr "无法扩展路径 '%s'"

15922

15923 -#: builtin/gc.c:1655 builtin/gc.c:1693

15923 +#: builtin/gc.c:1654 builtin/gc.c:1692

15924 msgid "failed to start launchctl"

15925 msgstr "无法启动 launchctl"

15926

15927 -#: builtin/gc.c:1768 builtin/gc.c:2221

15927 +#: builtin/gc.c:1767 builtin/gc.c:2220

15928 #, c-format

15929 msgid "failed to create directories for '%s'"

15930 msgstr "无法为 '%s' 创建目录"

15931

15932 -#: builtin/gc.c:1795

15932 +#: builtin/gc.c:1794

15933 #, c-format

15934 msgid "failed to bootstrap service %s"

15935 msgstr "无法引导服务 %s"

15936

15937 -#: builtin/gc.c:1888

15937 +#: builtin/gc.c:1887

15938 msgid "failed to create temp xml file"

15939 msgstr "无法创建临时 XML 文件"

15940

15941 -#: builtin/gc.c:1978

15941 +#: builtin/gc.c:1977

15942 msgid "failed to start schtasks"

15943 msgstr "无法启动计划任务"

15944

15945 -#: builtin/gc.c:2047

15945 +#: builtin/gc.c:2046

15946 msgid "failed to run 'crontab -l'; your system might not support 'cron'"

15947 msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"

15948

15949 -#: builtin/gc.c:2064

15949 +#: builtin/gc.c:2063

15950 msgid "failed to run 'crontab'; your system might not support 'cron'"

15951 msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"

15952

15953 -#: builtin/gc.c:2068

15953 +#: builtin/gc.c:2067

15954 msgid "failed to open stdin of 'crontab'"

15955 msgstr "无法打开 'crontab' 的标准输入"

15956

15957 -#: builtin/gc.c:2110

15957 +#: builtin/gc.c:2109

15958 msgid "'crontab' died"

15959 msgstr "'crontab' 终止"

15960

15961 -#: builtin/gc.c:2175

15961 +#: builtin/gc.c:2174

15962 msgid "failed to start systemctl"

15963 msgstr "无法启动 systemctl"

15964

15965 -#: builtin/gc.c:2185

15965 +#: builtin/gc.c:2184

15966 msgid "failed to run systemctl"

15967 msgstr "无法运行 systemctl"

15968

15969 -#: builtin/gc.c:2194 builtin/gc.c:2199 builtin/worktree.c:62

15969 +#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62

15970 #: builtin/worktree.c:945

15971 #, c-format

15972 msgid "failed to delete '%s'"

15973 msgstr "删除 '%s' 失败"

15974

15975 -#: builtin/gc.c:2379

15975 +#: builtin/gc.c:2378

15976 #, c-format

15977 msgid "unrecognized --scheduler argument '%s'"

15978 msgstr "无法识别的 --scheduler 参数 '%s'"

15979

15980 -#: builtin/gc.c:2404

15980 +#: builtin/gc.c:2403

15981 msgid "neither systemd timers nor crontab are available"

15982 msgstr "systemd 和 crontab 的定时器都不可用"

15983

15984 -#: builtin/gc.c:2419

15984 +#: builtin/gc.c:2418

15985 #, c-format

15986 msgid "%s scheduler is not available"

15987 msgstr "%s 调度器不可用"

15988

15989 -#: builtin/gc.c:2433

15989 +#: builtin/gc.c:2432

15990 msgid "another process is scheduling background maintenance"

15991 msgstr "另外一个进程正运行于后台维护"

15992

15993 -#: builtin/gc.c:2455

15993 +#: builtin/gc.c:2454

15994 msgid "git maintenance start [--scheduler=<scheduler>]"

15995 msgstr "git maintenance start [--scheduler=<调度器>]"

15996

15997 -#: builtin/gc.c:2464

15997 +#: builtin/gc.c:2463

15998 msgid "scheduler"

15999 msgstr "调度器"

16000

16001 -#: builtin/gc.c:2465

16001 +#: builtin/gc.c:2464

16002 msgid "scheduler to trigger git maintenance run"

16003 msgstr "触发 git maintenance 执行的调度器"

16004

16005 -#: builtin/gc.c:2479

16005 +#: builtin/gc.c:2478

16006 msgid "failed to add repo to global config"

16007 msgstr "无法将仓库添加到全局配置"

16008

16009 -#: builtin/gc.c:2488

16009 +#: builtin/gc.c:2487

16010 msgid "git maintenance <subcommand> [<options>]"

16011 msgstr "git maintenance <子命令> [<选项>]"

16012

16013 -#: builtin/gc.c:2507

16013 +#: builtin/gc.c:2506

16014 #, c-format

16015 msgid "invalid subcommand: %s"

16016 msgstr "无效子命令：%s"

@@ -16662,8 +16662,8 @@ msgstr "无法关闭已写入的 %s 文件 '%s'"

16662

16663 #: builtin/index-pack.c:1489

16664 #, c-format

16665 -msgid "unable to rename temporary '*.%s' file to '%s"

16666 -msgstr "不能重命名临时文件 '*.%s' 为 %s"

16665 +msgid "unable to rename temporary '*.%s' file to '%s'"

16666 +msgstr "不能重命名临时文件 '*.%s' 为 '%s'"

16667

16668 #: builtin/index-pack.c:1514

16669 msgid "error while closing pack file"

l10n: zh_CN: 2.34.0 Round 2