65387fd5eb · matheusbsbs/matheus-bagliano

@@ -44,6 +44,7 @@

44 # commit message | 提交说明

45 # commit object | 提交对象

46 # commit-ish (also committish) | 提交号

47 +# cone | 锥形（稀疏检出模型）；锥（稀疏检出）

48 # conflict | 冲突

49 # core Git | 核心 Git 工具

50 # cover letter | 附函

@@ -53,6 +54,7 @@

54 # directory | 目录

55 # dirty | 脏（的工作区）

56 # dumb HTTP protocol | 哑 HTTP 协议

57 +# enlistment | 登记（在 scalar 中使用）

58 # evil merge | 坏合并（合并引入了父提交没有的修改）

59 # fast-forward | 快进

60 # fetch | 获取

@@ -136,14 +138,14 @@

138 # upstream | 上游

139 # upstream branch | 上游分支

140 # working tree | 工作区

139 -# Fangyi Zhou <me@fangyi.io>, 2021.

141 +# Fangyi Zhou <me@fangyi.io>, 2021-2022.

142 #

143 msgid ""

144 msgstr ""

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

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

145 -"POT-Creation-Date: 2021-11-10 08:55+0800\n"

146 -"PO-Revision-Date: 2021-11-10 12:16+0000\n"

147 +"POT-Creation-Date: 2022-01-11 09:38+0800\n"

148 +"PO-Revision-Date: 2022-01-11 18:18+0000\n"

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

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

151 "Language: zh_CN\n"

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

160 msgid "Huh (%s)?"

161 msgstr "嗯（%s）？"

162

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 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509

164 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233

165 #: builtin/rebase.c:1642

166 msgid "could not read index"

167 msgstr "不能读取索引"

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

190 msgid "could not stage '%s'"

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

192

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

193 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713

194 msgid "could not write index"

195 msgstr "不能写入索引"

196

@@ -204,8 +206,8 @@ msgstr[1] "更新了 %d 个路径\n"

206 msgid "note: %s is untracked now.\n"

207 msgstr "说明：%s 现已成为未跟踪的。\n"

208

207 -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

208 -#: builtin/reset.c:151

209 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306

210 +#: builtin/reset.c:167

211 #, c-format

212 msgid "make_cache_entry failed for path '%s'"

213 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

@@ -246,21 +248,21 @@ msgstr[1] "增加了 %d 个路径\n"

248 msgid "ignoring unmerged: %s"

249 msgstr "忽略未合入的：%s"

250

249 -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369

251 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371

252 #, c-format

253 msgid "Only binary files changed.\n"

254 msgstr "只有二进制文件被修改。\n"

255

254 -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371

256 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373

257 #, c-format

258 msgid "No changes.\n"

259 msgstr "没有修改。\n"

260

259 -#: add-interactive.c:947 git-add--interactive.perl:1379

261 +#: add-interactive.c:947 git-add--interactive.perl:1381

262 msgid "Patch update"

263 msgstr "补丁更新"

264

263 -#: add-interactive.c:986 git-add--interactive.perl:1792

265 +#: add-interactive.c:986 git-add--interactive.perl:1794

266 msgid "Review diff"

267 msgstr "检视 diff"

268

@@ -328,11 +330,11 @@ msgstr "选择一个编号条目"

330 msgid "(empty) select nothing"

331 msgstr "（空）不选择任何内容"

332

331 -#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896

333 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898

334 msgid "*** Commands ***"

335 msgstr "*** 命令 ***"

336

335 -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

337 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895

338 msgid "What now"

339 msgstr "请选择"

340

@@ -344,13 +346,13 @@ msgstr "缓存"

346 msgid "unstaged"

347 msgstr "未缓存"

348

347 -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

348 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

349 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194

350 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

351 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

352 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

353 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

349 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367

350 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128

351 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194

352 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858

353 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504

354 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574

355 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812

356 #: git-add--interactive.perl:213

357 msgid "path"

358 msgstr "路径"

@@ -359,27 +361,27 @@ msgstr "路径"

361 msgid "could not refresh index"

362 msgstr "不能刷新索引"

363

362 -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

364 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805

365 #, c-format

366 msgid "Bye.\n"

367 msgstr "再见。\n"

368

367 -#: add-patch.c:34 git-add--interactive.perl:1431

369 +#: add-patch.c:34 git-add--interactive.perl:1433

370 #, c-format, perl-format

371 msgid "Stage mode change [y,n,q,a,d%s,?]? "

372 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "

373

372 -#: add-patch.c:35 git-add--interactive.perl:1432

374 +#: add-patch.c:35 git-add--interactive.perl:1434

375 #, c-format, perl-format

376 msgid "Stage deletion [y,n,q,a,d%s,?]? "

377 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "

378

377 -#: add-patch.c:36 git-add--interactive.perl:1433

379 +#: add-patch.c:36 git-add--interactive.perl:1435

380 #, c-format, perl-format

381 msgid "Stage addition [y,n,q,a,d%s,?]? "

382 msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "

383

382 -#: add-patch.c:37 git-add--interactive.perl:1434

384 +#: add-patch.c:37 git-add--interactive.perl:1436

385 #, c-format, perl-format

386 msgid "Stage this hunk [y,n,q,a,d%s,?]? "

387 msgstr "暂存该块 [y,n,q,a,d%s,?]? "

@@ -404,22 +406,22 @@ msgstr ""

406 "a - 暂存该块和本文件中后面的全部块\n"

407 "d - 不暂存该块和本文件中后面的全部块\n"

408

407 -#: add-patch.c:56 git-add--interactive.perl:1437

409 +#: add-patch.c:56 git-add--interactive.perl:1439

410 #, c-format, perl-format

411 msgid "Stash mode change [y,n,q,a,d%s,?]? "

412 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "

413

412 -#: add-patch.c:57 git-add--interactive.perl:1438

414 +#: add-patch.c:57 git-add--interactive.perl:1440

415 #, c-format, perl-format

416 msgid "Stash deletion [y,n,q,a,d%s,?]? "

417 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "

418

417 -#: add-patch.c:58 git-add--interactive.perl:1439

419 +#: add-patch.c:58 git-add--interactive.perl:1441

420 #, c-format, perl-format

421 msgid "Stash addition [y,n,q,a,d%s,?]? "

422 msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "

423

422 -#: add-patch.c:59 git-add--interactive.perl:1440

424 +#: add-patch.c:59 git-add--interactive.perl:1442

425 #, c-format, perl-format

426 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

427 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "

@@ -444,22 +446,22 @@ msgstr ""

446 "a - 贮藏该块和本文件中后面的全部块\n"

447 "d - 不贮藏该块和本文件中后面的全部块\n"

448

447 -#: add-patch.c:80 git-add--interactive.perl:1443

449 +#: add-patch.c:80 git-add--interactive.perl:1445

450 #, c-format, perl-format

451 msgid "Unstage mode change [y,n,q,a,d%s,?]? "

452 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "

453

452 -#: add-patch.c:81 git-add--interactive.perl:1444

454 +#: add-patch.c:81 git-add--interactive.perl:1446

455 #, c-format, perl-format

456 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

457 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "

458

457 -#: add-patch.c:82 git-add--interactive.perl:1445

459 +#: add-patch.c:82 git-add--interactive.perl:1447

460 #, c-format, perl-format

461 msgid "Unstage addition [y,n,q,a,d%s,?]? "

462 msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "

463

462 -#: add-patch.c:83 git-add--interactive.perl:1446

464 +#: add-patch.c:83 git-add--interactive.perl:1448

465 #, c-format, perl-format

466 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

467 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "

@@ -484,22 +486,22 @@ msgstr ""

486 "a - 取消暂存该块和本文件中后面的全部块\n"

487 "d - 不要取消暂存该块和本文件中后面的全部块\n"

488

487 -#: add-patch.c:103 git-add--interactive.perl:1449

489 +#: add-patch.c:103 git-add--interactive.perl:1451

490 #, c-format, perl-format

491 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

492 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "

493

492 -#: add-patch.c:104 git-add--interactive.perl:1450

494 +#: add-patch.c:104 git-add--interactive.perl:1452

495 #, c-format, perl-format

496 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

497 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "

498

497 -#: add-patch.c:105 git-add--interactive.perl:1451

499 +#: add-patch.c:105 git-add--interactive.perl:1453

500 #, c-format, perl-format

501 msgid "Apply addition to index [y,n,q,a,d%s,?]? "

502 msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "

503

502 -#: add-patch.c:106 git-add--interactive.perl:1452

504 +#: add-patch.c:106 git-add--interactive.perl:1454

505 #, c-format, perl-format

506 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

507 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "

@@ -524,26 +526,26 @@ msgstr ""

526 "a - 应用该块和本文件中后面的全部块\n"

527 "d - 不要应用该块和本文件中后面的全部块\n"

528

527 -#: add-patch.c:126 git-add--interactive.perl:1455

528 -#: git-add--interactive.perl:1473

529 +#: add-patch.c:126 git-add--interactive.perl:1457

530 +#: git-add--interactive.perl:1475

531 #, c-format, perl-format

532 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

533 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "

534

533 -#: add-patch.c:127 git-add--interactive.perl:1456

534 -#: git-add--interactive.perl:1474

535 +#: add-patch.c:127 git-add--interactive.perl:1458

536 +#: git-add--interactive.perl:1476

537 #, c-format, perl-format

538 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

539 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "

540

539 -#: add-patch.c:128 git-add--interactive.perl:1457

540 -#: git-add--interactive.perl:1475

541 +#: add-patch.c:128 git-add--interactive.perl:1459

542 +#: git-add--interactive.perl:1477

543 #, c-format, perl-format

544 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

545 msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "

546

545 -#: add-patch.c:129 git-add--interactive.perl:1458

546 -#: git-add--interactive.perl:1476

547 +#: add-patch.c:129 git-add--interactive.perl:1460

548 +#: git-add--interactive.perl:1478

549 #, c-format, perl-format

550 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

551 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "

@@ -568,22 +570,22 @@ msgstr ""

570 "a - 丢弃该块和本文件中后面的全部块\n"

571 "d - 不要丢弃该块和本文件中后面的全部块\n"

572

571 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461

573 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463

574 #, c-format, perl-format

575 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

576 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "

577

576 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462

578 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464

579 #, c-format, perl-format

580 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

581 msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "

582

581 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463

583 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465

584 #, c-format, perl-format

585 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

586 msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "

587

586 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464

588 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466

589 #, c-format, perl-format

590 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

591 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "

@@ -602,22 +604,22 @@ msgstr ""

604 "a - 丢弃该块和本文件中后面的全部块\n"

605 "d - 不要丢弃该块和本文件中后面的全部块\n"

606

605 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467

607 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469

608 #, c-format, perl-format

609 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

610 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "

611

610 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468

612 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470

613 #, c-format, perl-format

614 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

615 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "

616

615 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469

617 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471

618 #, c-format, perl-format

619 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "

620 msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "

621

620 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470

622 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472

623 #, c-format, perl-format

624 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

625 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "

@@ -671,7 +673,7 @@ msgstr "不能解析彩色差异信息"

673 #: add-patch.c:453

674 #, c-format

675 msgid "failed to run '%s'"

674 -msgstr "运行 '%s' 失败"

676 +msgstr "无法运行 '%s'"

677

678 #: add-patch.c:612

679 msgid "mismatched output from interactive.diffFilter"

@@ -752,7 +754,7 @@ msgstr "'git apply --cached' 失败"

754 #. Consider translating (saying "no" discards!) as

755 #. (saying "n" for "no" discards!) if the translation

756 #. of the word "no" does not start with n.

755 -#: add-patch.c:1247 git-add--interactive.perl:1242

757 +#: add-patch.c:1247 git-add--interactive.perl:1244

758 msgid ""

759 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

760 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "

@@ -761,11 +763,11 @@ msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！

763 msgid "The selected hunks do not apply to the index!"

764 msgstr "选中的块不能应用到索引！"

765

764 -#: add-patch.c:1291 git-add--interactive.perl:1346

766 +#: add-patch.c:1291 git-add--interactive.perl:1348

767 msgid "Apply them to the worktree anyway? "

768 msgstr "无论如何都要应用到工作区么？"

769

768 -#: add-patch.c:1298 git-add--interactive.perl:1349

770 +#: add-patch.c:1298 git-add--interactive.perl:1351

771 msgid "Nothing was applied.\n"

772 msgstr "未应用。\n"

773

@@ -803,11 +805,11 @@ msgstr "没有下一个块"

805 msgid "No other hunks to goto"

806 msgstr "没有其它可供跳转的块"

807

806 -#: add-patch.c:1549 git-add--interactive.perl:1606

808 +#: add-patch.c:1549 git-add--interactive.perl:1608

809 msgid "go to which hunk (<ret> to see more)? "

810 msgstr "跳转到哪个块（<回车> 查看更多）？ "

811

810 -#: add-patch.c:1550 git-add--interactive.perl:1608

812 +#: add-patch.c:1550 git-add--interactive.perl:1610

813 msgid "go to which hunk? "

814 msgstr "跳转到哪个块？"

815

@@ -827,7 +829,7 @@ msgstr[1] "对不起，只有 %d 个可用块。"

829 msgid "No other hunks to search"

830 msgstr "没有其它可供查找的块"

831

830 -#: add-patch.c:1581 git-add--interactive.perl:1661

832 +#: add-patch.c:1581 git-add--interactive.perl:1663

833 msgid "search for regex? "

834 msgstr "使用正则表达式搜索？"

835

@@ -908,7 +910,7 @@ msgstr ""

910 msgid "Exiting because of an unresolved conflict."

911 msgstr "因为存在未解决的冲突而退出。"

912

911 -#: advice.c:209 builtin/merge.c:1379

913 +#: advice.c:209 builtin/merge.c:1382

914 msgid "You have not concluded your merge (MERGE_HEAD exists)."

915 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

916

@@ -1001,21 +1003,33 @@ msgstr "未能识别的空白字符选项 '%s'"

1003 msgid "unrecognized whitespace ignore option '%s'"

1004 msgstr "未能识别的空白字符忽略选项 '%s'"

1005

1004 -#: apply.c:136

1005 -msgid "--reject and --3way cannot be used together."

1006 -msgstr "--reject 和 --3way 不能同时使用。"

1007 -

1008 -#: apply.c:139

1009 -msgid "--3way outside a repository"

1010 -msgstr "--3way 在一个仓库之外"

1011 -

1012 -#: apply.c:150

1013 -msgid "--index outside a repository"

1014 -msgstr "--index 在一个仓库之外"

1015 -

1016 -#: apply.c:153

1017 -msgid "--cached outside a repository"

1018 -msgstr "--cached 在一个仓库之外"

1006 +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307

1007 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870

1008 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885

1009 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541

1010 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470

1011 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757

1012 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361

1013 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155

1014 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033

1015 +#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560

1016 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778

1017 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073

1018 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641

1019 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199

1020 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426

1021 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710

1022 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316

1023 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572

1024 +#: builtin/worktree.c:702

1025 +#, c-format

1026 +msgid "options '%s' and '%s' cannot be used together"

1027 +msgstr "选项 '%s' 和 '%s' 不能同时使用"

1028 +

1029 +#: apply.c:139 apply.c:150 apply.c:153

1030 +#, c-format

1031 +msgid "'%s' outside a repository"

1032 +msgstr "'%s' 在仓库之外"

1033

1034 #: apply.c:800

1035 #, c-format

@@ -1218,8 +1232,8 @@ msgstr "打补丁失败：%s:%ld"

1232 msgid "cannot checkout %s"

1233 msgstr "不能检出 %s"

1234

1221 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

1222 -#: setup.c:308

1235 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214

1236 +#: setup.c:309

1237 #, c-format

1238 msgid "failed to read %s"

1239 msgstr "无法读取 %s"

@@ -1229,380 +1243,378 @@ msgstr "无法读取 %s"

1243 msgid "reading from '%s' beyond a symbolic link"

1244 msgstr "读取位于符号链接中的 '%s'"

1245

1232 -#: apply.c:3442 apply.c:3709

1246 +#: apply.c:3442 apply.c:3711

1247 #, c-format

1248 msgid "path %s has been renamed/deleted"

1249 msgstr "路径 %s 已经被重命名/删除"

1250

1237 -#: apply.c:3549 apply.c:3724

1251 +#: apply.c:3549 apply.c:3726

1252 #, c-format

1253 msgid "%s: does not exist in index"

1254 msgstr "%s：不存在于索引中"

1255

1242 -#: apply.c:3558 apply.c:3732 apply.c:3976

1256 +#: apply.c:3558 apply.c:3734 apply.c:3978

1257 #, c-format

1258 msgid "%s: does not match index"

1259 msgstr "%s：和索引不匹配"

1260

1247 -#: apply.c:3593

1261 +#: apply.c:3595

1262 msgid "repository lacks the necessary blob to perform 3-way merge."

1263 msgstr "仓库缺乏执行三方合并所必需的数据对象。"

1264

1251 -#: apply.c:3596

1265 +#: apply.c:3598

1266 #, c-format

1267 msgid "Performing three-way merge...\n"

1268 msgstr "执行三方合并...\n"

1269

1256 -#: apply.c:3612 apply.c:3616

1270 +#: apply.c:3614 apply.c:3618

1271 #, c-format

1272 msgid "cannot read the current contents of '%s'"

1273 msgstr "无法读取 '%s' 的当前内容"

1274

1261 -#: apply.c:3628

1275 +#: apply.c:3630

1276 #, c-format

1277 msgid "Failed to perform three-way merge...\n"

1278 msgstr "无法执行三方合并...\n"

1279

1266 -#: apply.c:3642

1280 +#: apply.c:3644

1281 #, c-format

1282 msgid "Applied patch to '%s' with conflicts.\n"

1283 msgstr "应用补丁到 '%s' 存在冲突。\n"

1284

1271 -#: apply.c:3647

1285 +#: apply.c:3649

1286 #, c-format

1287 msgid "Applied patch to '%s' cleanly.\n"

1288 msgstr "成功应用补丁到 '%s'。\n"

1289

1276 -#: apply.c:3664

1290 +#: apply.c:3666

1291 #, c-format

1292 msgid "Falling back to direct application...\n"

1293 msgstr "回落到直接应用...\n"

1294

1281 -#: apply.c:3676

1295 +#: apply.c:3678

1296 msgid "removal patch leaves file contents"

1297 msgstr "移除补丁仍留下了文件内容"

1298

1285 -#: apply.c:3749

1299 +#: apply.c:3751

1300 #, c-format

1301 msgid "%s: wrong type"

1302 msgstr "%s：错误类型"

1303

1290 -#: apply.c:3751

1304 +#: apply.c:3753

1305 #, c-format

1306 msgid "%s has type %o, expected %o"

1307 msgstr "%s 的类型是 %o，应为 %o"

1308

1295 -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1296 -#: read-cache.c:1368

1309 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918

1310 +#: read-cache.c:1381

1311 #, c-format

1312 msgid "invalid path '%s'"

1313 msgstr "无效路径 '%s'"

1314

1301 -#: apply.c:3974

1315 +#: apply.c:3976

1316 #, c-format

1317 msgid "%s: already exists in index"

1318 msgstr "%s：已经存在于索引中"

1319

1306 -#: apply.c:3978

1320 +#: apply.c:3980

1321 #, c-format

1322 msgid "%s: already exists in working directory"

1323 msgstr "%s：已经存在于工作区中"

1324

1311 -#: apply.c:3998

1325 +#: apply.c:4000

1326 #, c-format

1327 msgid "new mode (%o) of %s does not match old mode (%o)"

1328 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

1329

1316 -#: apply.c:4003

1330 +#: apply.c:4005

1331 #, c-format

1332 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1333 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

1334

1321 -#: apply.c:4023

1335 +#: apply.c:4025

1336 #, c-format

1337 msgid "affected file '%s' is beyond a symbolic link"

1338 msgstr "受影响的文件 '%s' 位于符号链接中"

1339

1326 -#: apply.c:4027

1340 +#: apply.c:4029

1341 #, c-format

1342 msgid "%s: patch does not apply"

1343 msgstr "%s：补丁未应用"

1344

1331 -#: apply.c:4042

1345 +#: apply.c:4044

1346 #, c-format

1347 msgid "Checking patch %s..."

1348 msgstr "正在检查补丁 %s..."

1349

1336 -#: apply.c:4134

1350 +#: apply.c:4136

1351 #, c-format

1352 msgid "sha1 information is lacking or useless for submodule %s"

1353 msgstr "子模组 %s 的 sha1 信息缺失或无效"

1354

1341 -#: apply.c:4141

1355 +#: apply.c:4143

1356 #, c-format

1357 msgid "mode change for %s, which is not in current HEAD"

1358 msgstr "%s 的模式变更，但它不在当前 HEAD 中"

1359

1346 -#: apply.c:4144

1360 +#: apply.c:4146

1361 #, c-format

1362 msgid "sha1 information is lacking or useless (%s)."

1363 msgstr "sha1 信息缺失或无效（%s）。"

1364

1351 -#: apply.c:4153

1365 +#: apply.c:4155

1366 #, c-format

1367 msgid "could not add %s to temporary index"

1368 msgstr "不能在临时索引中添加 %s"

1369

1356 -#: apply.c:4163

1370 +#: apply.c:4165

1371 #, c-format

1372 msgid "could not write temporary index to %s"

1373 msgstr "不能把临时索引写入到 %s"

1374

1361 -#: apply.c:4301

1375 +#: apply.c:4303

1376 #, c-format

1377 msgid "unable to remove %s from index"

1378 msgstr "不能从索引中移除 %s"

1379

1366 -#: apply.c:4335

1380 +#: apply.c:4337

1381 #, c-format

1382 msgid "corrupt patch for submodule %s"

1383 msgstr "子模组 %s 损坏的补丁"

1384

1371 -#: apply.c:4341

1385 +#: apply.c:4343

1386 #, c-format

1387 msgid "unable to stat newly created file '%s'"

1388 msgstr "不能对新建文件 '%s' 调用 stat"

1389

1376 -#: apply.c:4349

1390 +#: apply.c:4351

1391 #, c-format

1392 msgid "unable to create backing store for newly created file %s"

1393 msgstr "不能为新建文件 %s 创建后端存储"

1394

1381 -#: apply.c:4355 apply.c:4500

1395 +#: apply.c:4357 apply.c:4502

1396 #, c-format

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

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

1399

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

1387 -#: builtin/gc.c:2276

1400 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258

1401 +#: builtin/gc.c:2293

1402 #, c-format

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

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

1404 +msgstr "无法写入 '%s'"

1405

1392 -#: apply.c:4402

1406 +#: apply.c:4404

1407 #, c-format

1408 msgid "closing file '%s'"

1409 msgstr "关闭文件 '%s'"

1410

1397 -#: apply.c:4472

1411 +#: apply.c:4474

1412 #, c-format

1413 msgid "unable to write file '%s' mode %o"

1414 msgstr "不能写文件 '%s' 权限 %o"

1415

1402 -#: apply.c:4570

1416 +#: apply.c:4572

1417 #, c-format

1418 msgid "Applied patch %s cleanly."

1419 msgstr "成功应用补丁 %s。"

1420

1407 -#: apply.c:4578

1421 +#: apply.c:4580

1422 msgid "internal error"

1423 msgstr "内部错误"

1424

1411 -#: apply.c:4581

1425 +#: apply.c:4583

1426 #, c-format

1427 msgid "Applying patch %%s with %d reject..."

1428 msgid_plural "Applying patch %%s with %d rejects..."

1429 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1430 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1431

1418 -#: apply.c:4592

1432 +#: apply.c:4594

1433 #, c-format

1434 msgid "truncating .rej filename to %.*s.rej"

1435 msgstr "截短 .rej 文件名为 %.*s.rej"

1436

1423 -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1437 +#: apply.c:4602

1438 #, c-format

1439 msgid "cannot open %s"

1440 msgstr "不能打开 %s"

1441

1428 -#: apply.c:4614

1442 +#: apply.c:4616

1443 #, c-format

1444 msgid "Hunk #%d applied cleanly."

1445 msgstr "第 #%d 个片段成功应用。"

1446

1433 -#: apply.c:4618

1447 +#: apply.c:4620

1448 #, c-format

1449 msgid "Rejected hunk #%d."

1450 msgstr "拒绝第 #%d 个片段。"

1451

1438 -#: apply.c:4747

1452 +#: apply.c:4749

1453 #, c-format

1454 msgid "Skipped patch '%s'."

1455 msgstr "略过补丁 '%s'。"

1456

1443 -#: apply.c:4755

1444 -msgid "unrecognized input"

1445 -msgstr "未能识别的输入"

1457 +#: apply.c:4758

1458 +msgid "No valid patches in input (allow with \"--allow-empty\")"

1459 +msgstr "输入中没有合法的补丁（使用 \"--allow-empty\" 来允许）"

1460

1447 -#: apply.c:4775

1461 +#: apply.c:4779

1462 msgid "unable to read index file"

1463 msgstr "无法读取索引文件"

1464

1451 -#: apply.c:4932

1465 +#: apply.c:4936

1466 #, c-format

1467 msgid "can't open patch '%s': %s"

1468 msgstr "不能打开补丁 '%s'：%s"

1469

1456 -#: apply.c:4959

1470 +#: apply.c:4963

1471 #, c-format

1472 msgid "squelched %d whitespace error"

1473 msgid_plural "squelched %d whitespace errors"

1474 msgstr[0] "抑制下仍有 %d 个空白字符误用"

1475 msgstr[1] "抑制下仍有 %d 个空白字符误用"

1476

1463 -#: apply.c:4965 apply.c:4980

1477 +#: apply.c:4969 apply.c:4984

1478 #, c-format

1479 msgid "%d line adds whitespace errors."

1480 msgid_plural "%d lines add whitespace errors."

1481 msgstr[0] "%d 行新增了空白字符误用。"

1482 msgstr[1] "%d 行新增了空白字符误用。"

1483

1470 -#: apply.c:4973

1484 +#: apply.c:4977

1485 #, c-format

1486 msgid "%d line applied after fixing whitespace errors."

1487 msgid_plural "%d lines applied after fixing whitespace errors."

1488 msgstr[0] "修复空白错误后，应用了 %d 行。"

1489 msgstr[1] "修复空白错误后，应用了 %d 行。"

1490

1477 -#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1491 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430

1492 msgid "Unable to write new index file"

1493 msgstr "无法写入新索引文件"

1494

1481 -#: apply.c:5017

1495 +#: apply.c:5021

1496 msgid "don't apply changes matching the given path"

1497 msgstr "不要应用与给出路径向匹配的变更"

1498

1485 -#: apply.c:5020

1499 +#: apply.c:5024

1500 msgid "apply changes matching the given path"

1501 msgstr "应用与给出路径向匹配的变更"

1502

1489 -#: apply.c:5022 builtin/am.c:2320

1503 +#: apply.c:5026 builtin/am.c:2376

1504 msgid "num"

1505 msgstr "数字"

1506

1493 -#: apply.c:5023

1507 +#: apply.c:5027

1508 msgid "remove <num> leading slashes from traditional diff paths"

1509 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

1510

1497 -#: apply.c:5026

1511 +#: apply.c:5030

1512 msgid "ignore additions made by the patch"

1513 msgstr "忽略补丁中的添加的文件"

1514

1501 -#: apply.c:5028

1515 +#: apply.c:5032

1516 msgid "instead of applying the patch, output diffstat for the input"

1517 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

1518

1505 -#: apply.c:5032

1519 +#: apply.c:5036

1520 msgid "show number of added and deleted lines in decimal notation"

1521 msgstr "以十进制数显示添加和删除的行数"

1522

1509 -#: apply.c:5034

1523 +#: apply.c:5038

1524 msgid "instead of applying the patch, output a summary for the input"

1525 msgstr "不应用补丁，而是显示输入的概要"

1526

1513 -#: apply.c:5036

1527 +#: apply.c:5040

1528 msgid "instead of applying the patch, see if the patch is applicable"

1529 msgstr "不应用补丁，而是查看补丁是否可应用"

1530

1517 -#: apply.c:5038

1531 +#: apply.c:5042

1532 msgid "make sure the patch is applicable to the current index"

1533 msgstr "确认补丁可以应用到当前索引"

1534

1521 -#: apply.c:5040

1535 +#: apply.c:5044

1536 msgid "mark new files with `git add --intent-to-add`"

1537 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"

1538

1525 -#: apply.c:5042

1539 +#: apply.c:5046

1540 msgid "apply a patch without touching the working tree"

1541 msgstr "应用补丁而不修改工作区"

1542

1529 -#: apply.c:5044

1543 +#: apply.c:5048

1544 msgid "accept a patch that touches outside the working area"

1545 msgstr "接受修改工作区之外文件的补丁"

1546

1533 -#: apply.c:5047

1547 +#: apply.c:5051

1548 msgid "also apply the patch (use with --stat/--summary/--check)"

1549 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

1550

1537 -#: apply.c:5049

1551 +#: apply.c:5053

1552 msgid "attempt three-way merge, fall back on normal patch if that fails"

1553 msgstr "尝试三路合并，如果失败则回落至正常补丁模式"

1554

1541 -#: apply.c:5051

1555 +#: apply.c:5055

1556 msgid "build a temporary index based on embedded index information"

1557 msgstr "创建一个临时索引基于嵌入的索引信息"

1558

1545 -#: apply.c:5054 builtin/checkout-index.c:196

1559 +#: apply.c:5058 builtin/checkout-index.c:196

1560 msgid "paths are separated with NUL character"

1561 msgstr "路径以 NUL 字符分隔"

1562

1549 -#: apply.c:5056

1563 +#: apply.c:5060

1564 msgid "ensure at least <n> lines of context match"

1565 msgstr "确保至少匹配 <n> 行上下文"

1566

1553 -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

1567 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355

1568 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1569 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1570 #: builtin/rebase.c:1051

1571 msgid "action"

1572 msgstr "动作"

1573

1560 -#: apply.c:5058

1574 +#: apply.c:5062

1575 msgid "detect new or modified lines that have whitespace errors"

1576 msgstr "检查新增和修改的行中间的空白字符滥用"

1577

1564 -#: apply.c:5061 apply.c:5064

1578 +#: apply.c:5065 apply.c:5068

1579 msgid "ignore changes in whitespace when finding context"

1580 msgstr "查找上下文时忽略空白字符的变更"

1581

1568 -#: apply.c:5067

1582 +#: apply.c:5071

1583 msgid "apply the patch in reverse"

1584 msgstr "反向应用补丁"

1585

1572 -#: apply.c:5069

1586 +#: apply.c:5073

1587 msgid "don't expect at least one line of context"

1588 msgstr "无需至少一行上下文"

1589

1576 -#: apply.c:5071

1590 +#: apply.c:5075

1591 msgid "leave the rejected hunks in corresponding *.rej files"

1592 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

1593

1580 -#: apply.c:5073

1594 +#: apply.c:5077

1595 msgid "allow overlapping hunks"

1596 msgstr "允许重叠的补丁片段"

1597

1584 -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1585 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1586 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1587 -msgid "be verbose"

1588 -msgstr "冗长输出"

1589 -

1590 -#: apply.c:5076

1598 +#: apply.c:5080

1599 msgid "tolerate incorrectly detected missing new-line at the end of file"

1600 msgstr "允许不正确的文件末尾换行符"

1601

1594 -#: apply.c:5079

1602 +#: apply.c:5083

1603 msgid "do not trust the line counts in the hunk headers"

1604 msgstr "不信任补丁片段的头信息中的行号"

1605

1598 -#: apply.c:5081 builtin/am.c:2308

1606 +#: apply.c:5085 builtin/am.c:2364

1607 msgid "root"

1608 msgstr "根目录"

1609

1602 -#: apply.c:5082

1610 +#: apply.c:5086

1611 msgid "prepend <root> to all filenames"

1612 msgstr "为所有文件名前添加 <根目录>"

1613

1614 +#: apply.c:5089

1615 +msgid "don't return error for empty patches"

1616 +msgstr "对空的补丁不返回错误"

1617 +

1618 #: archive-tar.c:125 archive-zip.c:345

1619 #, c-format

1620 msgid "cannot stream blob %s"

@@ -1613,16 +1625,16 @@ msgstr "不能打开数据对象 %s"

1625 msgid "unsupported file mode: 0%o (SHA1: %s)"

1626 msgstr "不支持的文件模式：0%o (SHA1: %s)"

1627

1616 -#: archive-tar.c:450

1628 +#: archive-tar.c:447

1629 #, c-format

1630 msgid "unable to start '%s' filter"

1631 msgstr "无法启动 '%s' 过滤器"

1632

1621 -#: archive-tar.c:453

1633 +#: archive-tar.c:450

1634 msgid "unable to redirect descriptor"

1635 msgstr "无法重定向描述符"

1636

1625 -#: archive-tar.c:460

1637 +#: archive-tar.c:457

1638 #, c-format

1639 msgid "'%s' filter reported error"

1640 msgstr "'%s' 过滤器报告了错误"

@@ -1665,19 +1677,13 @@ msgstr ""

1677 msgid "git archive --remote <repo> [--exec <cmd>] --list"

1678 msgstr "git archive --remote <仓库> [--exec <命令>] --list"

1679

1668 -#: archive.c:188

1669 -#, c-format

1670 -msgid "cannot read %s"

1671 -msgstr "不能读取 %s"

1672 -

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

1680 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238

1681 +#: builtin/tag.c:578

1682 #, c-format

1677 -msgid "could not read '%s'"

1683 +msgid "cannot read '%s'"

1684 msgstr "不能读取 '%s'"

1685

1680 -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1686 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334

1687 #, c-format

1688 msgid "pathspec '%s' did not match any files"

1689 msgstr "路径规格 '%s' 未匹配任何文件"

@@ -1719,7 +1725,7 @@ msgstr "格式"

1725 msgid "archive format"

1726 msgstr "归档格式"

1727

1722 -#: archive.c:552 builtin/log.c:1775

1728 +#: archive.c:552 builtin/log.c:1790

1729 msgid "prefix"

1730 msgstr "前缀"

1731

@@ -1729,9 +1735,9 @@ msgstr "为归档中每个路径名加上前缀"

1735

1736 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1737 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1732 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1733 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1734 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

1738 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183

1739 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103

1740 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410

1741 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1742 msgid "file"

1743 msgstr "文件"

@@ -1761,7 +1767,7 @@ msgid "list supported archive formats"

1767 msgstr "列出支持的归档格式"

1768

1769 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1764 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1770 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513

1771 msgid "repo"

1772 msgstr "仓库"

1773

@@ -1769,7 +1775,7 @@ msgstr "仓库"

1775 msgid "retrieve the archive from remote repository <repo>"

1776 msgstr "从远程仓库（<仓库>）提取归档文件"

1777

1772 -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1778 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708

1779 #: builtin/notes.c:496

1780 msgid "command"

1781 msgstr "命令"

@@ -1782,18 +1788,20 @@ msgstr "远程 git-upload-archive 命令的路径"

1788 msgid "Unexpected option --remote"

1789 msgstr "未知参数 --remote"

1790

1785 -#: archive.c:580

1786 -msgid "Option --exec can only be used together with --remote"

1787 -msgstr "选项 --exec 只能和 --remote 同时使用"

1791 +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544

1792 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370

1793 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115

1794 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281

1795 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144

1796 +#: http-fetch.c:153

1797 +#, c-format

1798 +msgid "the option '%s' requires '%s'"

1799 +msgstr "选项 '%s' 需要 '%s'"

1800

1801 #: archive.c:582

1802 msgid "Unexpected option --output"

1803 msgstr "未知参数 --output"

1804

1793 -#: archive.c:584

1794 -msgid "Options --add-file and --remote cannot be used together"

1795 -msgstr "选项 --add-file 和 --remote 不能同时使用"

1796 -

1805 #: archive.c:606

1806 #, c-format

1807 msgid "Unknown archive format '%s'"

@@ -1901,7 +1909,7 @@ msgstr "需要一个 %s 版本"

1909 msgid "could not create file '%s'"

1910 msgstr "不能创建文件 '%s'"

1911

1904 -#: bisect.c:985 builtin/merge.c:154

1912 +#: bisect.c:985 builtin/merge.c:155

1913 #, c-format

1914 msgid "could not read file '%s'"

1915 msgstr "不能读取文件 '%s'"

@@ -1953,10 +1961,10 @@ msgstr "不能将 --contents 和最终的提交对象名共用"

1961 msgid "--reverse and --first-parent together require specified latest commit"

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

1963

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

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

1964 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158

1965 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114

1966 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071

1967 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373

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

1969 #: builtin/shortlog.c:255

1970 msgid "revision walk setup failed"

@@ -1977,97 +1985,86 @@ msgstr "在 %2$s 中无此路径 %1$s"

1985 msgid "cannot read blob %s for path %s"

1986 msgstr "不能为路径 %2$s 读取数据对象 %1$s"

1987

1980 -#: branch.c:53

1981 -#, c-format

1988 +#: branch.c:77

1989 msgid ""

1983 -"\n"

1984 -"After fixing the error cause you may try to fix up\n"

1985 -"the remote tracking information by invoking\n"

1986 -"\"git branch --set-upstream-to=%s%s%s\"."

1987 -msgstr ""

1988 -"\n"

1989 -"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"

1990 -"\"git branch --set-upstream-to=%s%s%s\" 。"

1991 -

1992 -#: branch.c:67

1993 -#, c-format

1994 -msgid "Not setting branch %s as its own upstream."

1995 -msgstr "未设置分支 %s 作为它自己的上游。"

1990 +"cannot inherit upstream tracking configuration of multiple refs when "

1991 +"rebasing is requested"

1992 +msgstr "在请求变基时无法继承上游多个引用的跟踪设置"

1993

1997 -#: branch.c:93

1994 +#: branch.c:88

1995 #, c-format

1999 -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

2000 -msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"

1996 +msgid "not setting branch '%s' as its own upstream"

1997 +msgstr "没有将分支 '%s' 设置为它自己的上游"

1998

2002 -#: branch.c:94

1999 +#: branch.c:144

2000 #, c-format

2004 -msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

2005 -msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"

2001 +msgid "branch '%s' set up to track '%s' by rebasing."

2002 +msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。"

2003

2007 -#: branch.c:98

2004 +#: branch.c:145

2005 #, c-format

2009 -msgid "Branch '%s' set up to track local branch '%s' by rebasing."

2010 -msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"

2006 +msgid "branch '%s' set up to track '%s'."

2007 +msgstr "分支 '%s' 设置为跟踪 '%s'。"

2008

2012 -#: branch.c:99

2009 +#: branch.c:148

2010 #, c-format

2014 -msgid "Branch '%s' set up to track local branch '%s'."

2015 -msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"

2011 +msgid "branch '%s' set up to track:"

2012 +msgstr "分支 '%s' 设置为跟踪："

2013

2017 -#: branch.c:104

2018 -#, c-format

2019 -msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

2020 -msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"

2014 +#: branch.c:160

2015 +msgid "unable to write upstream branch configuration"

2016 +msgstr "无法写入上游分支配置"

2017

2022 -#: branch.c:105

2023 -#, c-format

2024 -msgid "Branch '%s' set up to track remote ref '%s'."

2025 -msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"

2018 +#: branch.c:162

2019 +msgid ""

2020 +"\n"

2021 +"After fixing the error cause you may try to fix up\n"

2022 +"the remote tracking information by invoking:"

2023 +msgstr ""

2024 +"\n"

2025 +"在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支："

2026

2027 -#: branch.c:109

2027 +#: branch.c:203

2028 #, c-format

2029 -msgid "Branch '%s' set up to track local ref '%s' by rebasing."

2030 -msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"

2029 +msgid "asked to inherit tracking from '%s', but no remote is set"

2030 +msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程"

2031

2032 -#: branch.c:110

2032 +#: branch.c:209

2033 #, c-format

2034 -msgid "Branch '%s' set up to track local ref '%s'."

2035 -msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"

2036 -

2037 -#: branch.c:119

2038 -msgid "Unable to write upstream branch configuration"

2039 -msgstr "无法写入上游分支配置"

2034 +msgid "asked to inherit tracking from '%s', but no merge configuration is set"

2035 +msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置"

2036

2041 -#: branch.c:156

2037 +#: branch.c:252

2038 #, c-format

2043 -msgid "Not tracking: ambiguous information for ref %s"

2039 +msgid "not tracking: ambiguous information for ref %s"

2040 msgstr "未跟踪：引用 %s 有歧义"

2041

2046 -#: branch.c:189

2042 +#: branch.c:287

2043 #, c-format

2048 -msgid "'%s' is not a valid branch name."

2049 -msgstr "'%s' 不是一个有效的分支名称。"

2044 +msgid "'%s' is not a valid branch name"

2045 +msgstr "'%s' 不是一个有效的分支名称"

2046

2051 -#: branch.c:208

2047 +#: branch.c:307

2048 #, c-format

2053 -msgid "A branch named '%s' already exists."

2054 -msgstr "一个分支名 '%s' 已经存在。"

2049 +msgid "a branch named '%s' already exists"

2050 +msgstr "一个名为 '%s' 的分支已经存在"

2051

2056 -#: branch.c:213

2057 -msgid "Cannot force update the current branch."

2058 -msgstr "无法强制更新当前分支。"

2052 +#: branch.c:313

2053 +#, c-format

2054 +msgid "cannot force update the branch '%s'checked out at '%s'"

2055 +msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"

2056

2060 -#: branch.c:233

2057 +#: branch.c:336

2058 #, c-format

2062 -msgid "Cannot setup tracking information; starting point '%s' is not a branch."

2063 -msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

2059 +msgid "cannot set up tracking information; starting point '%s' is not a branch"

2060 +msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支"

2061

2065 -#: branch.c:235

2062 +#: branch.c:338

2063 #, c-format

2064 msgid "the requested upstream branch '%s' does not exist"

2065 msgstr "请求的上游分支 '%s' 不存在"

2066

2070 -#: branch.c:237

2067 +#: branch.c:340

2068 msgid ""

2069 "\n"

2070 "If you are planning on basing your work on an upstream\n"

@@ -2085,27 +2082,28 @@ msgstr ""

2082 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"

2083 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

2084

2088 -#: branch.c:281

2085 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377

2086 +#: builtin/replace.c:423 builtin/replace.c:453

2087 #, c-format

2090 -msgid "Not a valid object name: '%s'."

2091 -msgstr "不是一个有效的对象名：'%s'。"

2088 +msgid "not a valid object name: '%s'"

2089 +msgstr "不是一个有效的对象名：'%s'"

2090

2093 -#: branch.c:301

2091 +#: branch.c:404

2092 #, c-format

2095 -msgid "Ambiguous object name: '%s'."

2096 -msgstr "歧义的对象名：'%s'。"

2093 +msgid "ambiguous object name: '%s'"

2094 +msgstr "歧义的对象名：'%s'"

2095

2098 -#: branch.c:306

2096 +#: branch.c:409

2097 #, c-format

2100 -msgid "Not a valid branch point: '%s'."

2101 -msgstr "无效的分支点：'%s'。"

2098 +msgid "not a valid branch point: '%s'"

2099 +msgstr "无效的分支点：'%s'"

2100

2103 -#: branch.c:366

2101 +#: branch.c:469

2102 #, c-format

2103 msgid "'%s' is already checked out at '%s'"

2104 msgstr "'%s' 已经检出到 '%s'"

2105

2108 -#: branch.c:389

2106 +#: branch.c:494

2107 #, c-format

2108 msgid "HEAD of working tree %s is not updated"

2109 msgstr "工作区 %s 的 HEAD 指向没有被更新"

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

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

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

2130

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

2131 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406

2132 #: builtin/commit.c:862

2133 #, c-format

2134 msgid "could not open '%s'"

@@ -2189,7 +2187,7 @@ msgstr "不支持的归档包版本 %d"

2187 msgid "cannot write bundle version %d with algorithm %s"

2188 msgstr "不能写入，归档包版本 %d 不支持算法 %s"

2189

2192 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

2190 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399

2191 #, c-format

2192 msgid "unrecognized argument: %s"

2193 msgstr "未能识别的参数：%s"

@@ -2226,7 +2224,7 @@ msgstr "发现重复的块ID %<PRIx32>"

2224 msgid "final chunk has non-zero id %<PRIx32>"

2225 msgstr "最终块有非零 ID %<PRIx32>"

2226

2229 -#: color.c:329

2227 +#: color.c:354

2228 #, c-format

2229 msgid "invalid color value: %.*s"

2230 msgstr "无效的颜色值：%.*s"

@@ -2276,207 +2274,207 @@ msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"

2274 msgid "unable to find all commit-graph files"

2275 msgstr "无法找到所有提交图形文件"

2276

2279 -#: commit-graph.c:746 commit-graph.c:783

2277 +#: commit-graph.c:749 commit-graph.c:786

2278 msgid "invalid commit position. commit-graph is likely corrupt"

2279 msgstr "无效的提交位置。提交图形可能已损坏"

2280

2283 -#: commit-graph.c:767

2281 +#: commit-graph.c:770

2282 #, c-format

2283 msgid "could not find commit %s"

2284 msgstr "无法找到提交 %s"

2285

2288 -#: commit-graph.c:800

2286 +#: commit-graph.c:803

2287 msgid "commit-graph requires overflow generation data but has none"

2288 msgstr "提交图需要溢出世代数据，但是没有"

2289

2292 -#: commit-graph.c:1105 builtin/am.c:1342

2290 +#: commit-graph.c:1108 builtin/am.c:1369

2291 #, c-format

2292 msgid "unable to parse commit %s"

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

2294

2297 -#: commit-graph.c:1367 builtin/pack-objects.c:3070

2295 +#: commit-graph.c:1370 builtin/pack-objects.c:3070

2296 #, c-format

2297 msgid "unable to get type of object %s"

2298 msgstr "无法获得对象 %s 类型"

2299

2302 -#: commit-graph.c:1398

2300 +#: commit-graph.c:1401

2301 msgid "Loading known commits in commit graph"

2302 msgstr "正在加载提交图中的已知提交"

2303

2306 -#: commit-graph.c:1415

2304 +#: commit-graph.c:1418

2305 msgid "Expanding reachable commits in commit graph"

2306 msgstr "正在扩展提交图中的可达提交"

2307

2310 -#: commit-graph.c:1435

2308 +#: commit-graph.c:1438

2309 msgid "Clearing commit marks in commit graph"

2310 msgstr "正在清除提交图中的提交标记"

2311

2314 -#: commit-graph.c:1454

2312 +#: commit-graph.c:1457

2313 msgid "Computing commit graph topological levels"

2314 msgstr "正在计算提交图拓扑级别"

2315

2318 -#: commit-graph.c:1507

2316 +#: commit-graph.c:1510

2317 msgid "Computing commit graph generation numbers"

2318 msgstr "正在计算提交图世代数字"

2319

2322 -#: commit-graph.c:1588

2320 +#: commit-graph.c:1591

2321 msgid "Computing commit changed paths Bloom filters"

2322 msgstr "计算提交变更路径的布隆过滤器"

2323

2326 -#: commit-graph.c:1665

2324 +#: commit-graph.c:1668

2325 msgid "Collecting referenced commits"

2326 msgstr "正在收集引用的提交"

2327

2330 -#: commit-graph.c:1690

2328 +#: commit-graph.c:1693

2329 #, c-format

2330 msgid "Finding commits for commit graph in %d pack"

2331 msgid_plural "Finding commits for commit graph in %d packs"

2332 msgstr[0] "正在 %d 个包中查找提交图的提交"

2333 msgstr[1] "正在 %d 个包中查找提交图的提交"

2334

2337 -#: commit-graph.c:1703

2335 +#: commit-graph.c:1706

2336 #, c-format

2337 msgid "error adding pack %s"

2338 msgstr "添加包 %s 出错"

2339

2342 -#: commit-graph.c:1707

2340 +#: commit-graph.c:1710

2341 #, c-format

2342 msgid "error opening index for %s"

2343 msgstr "为 %s 打开索引出错"

2344

2347 -#: commit-graph.c:1744

2345 +#: commit-graph.c:1747

2346 msgid "Finding commits for commit graph among packed objects"

2347 msgstr "正在打包对象中查找提交图的提交"

2348

2351 -#: commit-graph.c:1762

2349 +#: commit-graph.c:1765

2350 msgid "Finding extra edges in commit graph"

2351 msgstr "正在查找提交图中额外的边"

2352

2355 -#: commit-graph.c:1811

2353 +#: commit-graph.c:1814

2354 msgid "failed to write correct number of base graph ids"

2355 msgstr "无法写入正确数量的基础图形 ID"

2356

2359 -#: commit-graph.c:1842 midx.c:1146

2357 +#: commit-graph.c:1845 midx.c:1149

2358 #, c-format

2359 msgid "unable to create leading directories of %s"

2360 msgstr "不能为 %s 创建先导目录"

2361

2364 -#: commit-graph.c:1855

2362 +#: commit-graph.c:1858

2363 msgid "unable to create temporary graph layer"

2364 msgstr "无法创建临时图层"

2365

2368 -#: commit-graph.c:1860

2366 +#: commit-graph.c:1863

2367 #, c-format

2368 msgid "unable to adjust shared permissions for '%s'"

2369 msgstr "无法为 '%s' 调整共享权限"

2370

2373 -#: commit-graph.c:1917

2371 +#: commit-graph.c:1920

2372 #, c-format

2373 msgid "Writing out commit graph in %d pass"

2374 msgid_plural "Writing out commit graph in %d passes"

2375 msgstr[0] "正在用 %d 步写出提交图"

2376 msgstr[1] "正在用 %d 步写出提交图"

2377

2380 -#: commit-graph.c:1953

2378 +#: commit-graph.c:1956

2379 msgid "unable to open commit-graph chain file"

2380 msgstr "无法打开提交图形链文件"

2381

2384 -#: commit-graph.c:1969

2382 +#: commit-graph.c:1972

2383 msgid "failed to rename base commit-graph file"

2384 msgstr "无法重命名基础提交图形文件"

2385

2388 -#: commit-graph.c:1989

2386 +#: commit-graph.c:1992

2387 msgid "failed to rename temporary commit-graph file"

2388 msgstr "无法重命名临时提交图形文件"

2389

2392 -#: commit-graph.c:2122

2390 +#: commit-graph.c:2125

2391 msgid "Scanning merged commits"

2392 msgstr "正在扫描合并提交"

2393

2396 -#: commit-graph.c:2166

2394 +#: commit-graph.c:2169

2395 msgid "Merging commit-graph"

2396 msgstr "正在合并提交图形"

2397

2400 -#: commit-graph.c:2274

2398 +#: commit-graph.c:2277

2399 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2400 msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"

2401

2404 -#: commit-graph.c:2381

2402 +#: commit-graph.c:2384

2403 msgid "too many commits to write graph"

2404 msgstr "提交太多不能画图"

2405

2408 -#: commit-graph.c:2479

2406 +#: commit-graph.c:2482

2407 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2408 msgstr "提交图文件的校验码错误，可能已经损坏"

2409

2412 -#: commit-graph.c:2489

2410 +#: commit-graph.c:2492

2411 #, c-format

2412 msgid "commit-graph has incorrect OID order: %s then %s"

2413 msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"

2414

2417 -#: commit-graph.c:2499 commit-graph.c:2514

2415 +#: commit-graph.c:2502 commit-graph.c:2517

2416 #, c-format

2417 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2418 msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"

2419

2422 -#: commit-graph.c:2506

2420 +#: commit-graph.c:2509

2421 #, c-format

2422 msgid "failed to parse commit %s from commit-graph"

2423 msgstr "无法从提交图形中解析提交 %s"

2424

2427 -#: commit-graph.c:2524

2425 +#: commit-graph.c:2527

2426 msgid "Verifying commits in commit graph"

2427 msgstr "正在校验提交图中的提交"

2428

2431 -#: commit-graph.c:2539

2429 +#: commit-graph.c:2542

2430 #, c-format

2431 msgid "failed to parse commit %s from object database for commit-graph"

2432 msgstr "无法从提交图形的对象库中解析提交 %s"

2433

2436 -#: commit-graph.c:2546

2434 +#: commit-graph.c:2549

2435 #, c-format

2436 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2437 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"

2438

2441 -#: commit-graph.c:2556

2439 +#: commit-graph.c:2559

2440 #, c-format

2441 msgid "commit-graph parent list for commit %s is too long"

2442 msgstr "提交 %s 的提交图形父提交列表太长了"

2443

2446 -#: commit-graph.c:2565

2444 +#: commit-graph.c:2568

2445 #, c-format

2446 msgid "commit-graph parent for %s is %s != %s"

2447 msgstr "%s 的提交图形父提交是 %s != %s"

2448

2451 -#: commit-graph.c:2579

2449 +#: commit-graph.c:2582

2450 #, c-format

2451 msgid "commit-graph parent list for commit %s terminates early"

2452 msgstr "提交 %s 的提交图形父提交列表过早终止"

2453

2456 -#: commit-graph.c:2584

2454 +#: commit-graph.c:2587

2455 #, c-format

2456 msgid ""

2457 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2458 msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"

2459

2462 -#: commit-graph.c:2588

2460 +#: commit-graph.c:2591

2461 #, c-format

2462 msgid ""

2463 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2464 msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"

2465

2468 -#: commit-graph.c:2605

2466 +#: commit-graph.c:2608

2467 #, c-format

2468 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2469 msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"

2470

2473 -#: commit-graph.c:2611

2471 +#: commit-graph.c:2614

2472 #, c-format

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

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

2475

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

2476 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444

2477 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456

2478 #, c-format

2479 msgid "could not parse %s"

2480 msgstr "不能解析 %s"

@@ -2506,27 +2504,27 @@ msgstr ""

2504 "设置 \"git config advice.graftFileDeprecated false\"\n"

2505 "可关闭本消息"

2506

2509 -#: commit.c:1239

2507 +#: commit.c:1241

2508 #, c-format

2509 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2510 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

2511

2514 -#: commit.c:1243

2512 +#: commit.c:1245

2513 #, c-format

2514 msgid "Commit %s has a bad GPG signature allegedly by %s."

2515 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

2516

2519 -#: commit.c:1246

2517 +#: commit.c:1248

2518 #, c-format

2519 msgid "Commit %s does not have a GPG signature."

2520 msgstr "提交 %s 没有 GPG 签名。"

2521

2524 -#: commit.c:1249

2522 +#: commit.c:1251

2523 #, c-format

2524 msgid "Commit %s has a good GPG signature by %s\n"

2525 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

2526

2529 -#: commit.c:1503

2527 +#: commit.c:1505

2528 msgid ""

2529 "Warning: commit message did not conform to UTF-8.\n"

2530 "You may want to amend it after fixing the message, or set the config\n"

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

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

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

2593

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

2594 +#: config.c:470 sequencer.c:2806

2595 #, c-format

2596 msgid "invalid key: %s"

2597 msgstr "无效键名：%s"

@@ -2744,144 +2742,144 @@ msgstr "core.commentChar 应该是一个字符"

2742 msgid "invalid mode for object creation: %s"

2743 msgstr "无效的对象创建模式：%s"

2744

2747 -#: config.c:1581

2745 +#: config.c:1584

2746 #, c-format

2747 msgid "malformed value for %s"

2748 msgstr "%s 的取值格式错误"

2749

2752 -#: config.c:1607

2750 +#: config.c:1610

2751 #, c-format

2752 msgid "malformed value for %s: %s"

2753 msgstr "%s 的取值格式错误：%s"

2754

2757 -#: config.c:1608

2755 +#: config.c:1611

2756 msgid "must be one of nothing, matching, simple, upstream or current"

2757 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"

2758

2761 -#: config.c:1669 builtin/pack-objects.c:4053

2759 +#: config.c:1672 builtin/pack-objects.c:4053

2760 #, c-format

2761 msgid "bad pack compression level %d"

2762 msgstr "错误的打包压缩级别 %d"

2763

2766 -#: config.c:1792

2764 +#: config.c:1795

2765 #, c-format

2766 msgid "unable to load config blob object '%s'"

2767 msgstr "无法从数据对象 '%s' 加载配置"

2768

2771 -#: config.c:1795

2769 +#: config.c:1798

2770 #, c-format

2771 msgid "reference '%s' does not point to a blob"

2772 msgstr "引用 '%s' 没有指向一个数据对象"

2773

2776 -#: config.c:1813

2774 +#: config.c:1816

2775 #, c-format

2776 msgid "unable to resolve config blob '%s'"

2777 msgstr "不能解析配置对象 '%s'"

2778

2781 -#: config.c:1858

2779 +#: config.c:1861

2780 #, c-format

2781 msgid "failed to parse %s"

2784 -msgstr "解析 %s 失败"

2782 +msgstr "无法解析 %s"

2783

2786 -#: config.c:1914

2784 +#: config.c:1917

2785 msgid "unable to parse command-line config"

2786 msgstr "无法解析命令行中的配置"

2787

2790 -#: config.c:2282

2788 +#: config.c:2285

2789 msgid "unknown error occurred while reading the configuration files"

2790 msgstr "在读取配置文件时遇到未知错误"

2791

2794 -#: config.c:2456

2792 +#: config.c:2459

2793 #, c-format

2794 msgid "Invalid %s: '%s'"

2795 msgstr "无效 %s：'%s'"

2796

2799 -#: config.c:2501

2797 +#: config.c:2504

2798 #, c-format

2799 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2800 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

2801

2804 -#: config.c:2547

2802 +#: config.c:2550

2803 #, c-format

2804 msgid "unable to parse '%s' from command-line config"

2805 msgstr "无法解析命令行配置中的 '%s'"

2806

2809 -#: config.c:2549

2807 +#: config.c:2552

2808 #, c-format

2809 msgid "bad config variable '%s' in file '%s' at line %d"

2810 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

2811

2814 -#: config.c:2633

2812 +#: config.c:2637

2813 #, c-format

2814 msgid "invalid section name '%s'"

2815 msgstr "无效的小节名称 '%s'"

2816

2819 -#: config.c:2665

2817 +#: config.c:2669

2818 #, c-format

2819 msgid "%s has multiple values"

2820 msgstr "%s 有多个取值"

2821

2824 -#: config.c:2694

2822 +#: config.c:2698

2823 #, c-format

2824 msgid "failed to write new configuration file %s"

2827 -msgstr "写入新的配置文件 %s 失败"

2825 +msgstr "无法写入新的配置文件 %s"

2826

2829 -#: config.c:2946 config.c:3273

2827 +#: config.c:2950 config.c:3277

2828 #, c-format

2829 msgid "could not lock config file %s"

2830 msgstr "不能锁定配置文件 %s"

2831

2834 -#: config.c:2957

2832 +#: config.c:2961

2833 #, c-format

2834 msgid "opening %s"

2835 msgstr "打开 %s"

2836

2839 -#: config.c:2994 builtin/config.c:361

2837 +#: config.c:2998 builtin/config.c:361

2838 #, c-format

2839 msgid "invalid pattern: %s"

2840 msgstr "无效模式：%s"

2841

2844 -#: config.c:3019

2842 +#: config.c:3023

2843 #, c-format

2844 msgid "invalid config file %s"

2845 msgstr "无效的配置文件 %s"

2846

2849 -#: config.c:3032 config.c:3286

2847 +#: config.c:3036 config.c:3290

2848 #, c-format

2849 msgid "fstat on %s failed"

2850 msgstr "对 %s 调用 fstat 失败"

2851

2854 -#: config.c:3043

2852 +#: config.c:3047

2853 #, c-format

2854 msgid "unable to mmap '%s'%s"

2855 msgstr "不能 mmap '%s'%s"

2856

2859 -#: config.c:3053 config.c:3291

2857 +#: config.c:3057 config.c:3295

2858 #, c-format

2859 msgid "chmod on %s failed"

2860 msgstr "对 %s 调用 chmod 失败"

2861

2864 -#: config.c:3138 config.c:3388

2862 +#: config.c:3142 config.c:3392

2863 #, c-format

2864 msgid "could not write config file %s"

2865 msgstr "不能写入配置文件 %s"

2866

2869 -#: config.c:3172

2867 +#: config.c:3176

2868 #, c-format

2869 msgid "could not set '%s' to '%s'"

2870 msgstr "不能设置 '%s' 为 '%s'"

2871

2874 -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2872 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2873 #, c-format

2874 msgid "could not unset '%s'"

2875 msgstr "不能取消设置 '%s'"

2876

2879 -#: config.c:3264

2877 +#: config.c:3268

2878 #, c-format

2879 msgid "invalid section name: %s"

2880 msgstr "无效的小节名称：%s"

2881

2884 -#: config.c:3431

2882 +#: config.c:3435

2883 #, c-format

2884 msgid "missing value for '%s'"

2885 msgstr "%s 的取值缺失"

@@ -3057,7 +3055,7 @@ msgstr "已阻止奇怪的路径名 '%s'"

3055 msgid "unable to fork"

3056 msgstr "无法 fork"

3057

3060 -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

3058 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57

3059 msgid "Checking connectivity"

3060 msgstr "正在检查连通性"

3061

@@ -3071,7 +3069,7 @@ msgstr "写入 rev-list 失败"

3069

3070 #: connected.c:151

3071 msgid "failed to close rev-list's stdin"

3074 -msgstr "关闭 rev-list 的标准输入失败"

3072 +msgstr "无法关闭 rev-list 的标准输入"

3073

3074 #: convert.c:183

3075 #, c-format

@@ -3353,18 +3351,18 @@ msgid ""

3351 msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"

3352

3353 # 译者：注意保持前导空格

3356 -#: diff.c:157

3354 +#: diff.c:158

3355 #, c-format

3356 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

3357 msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"

3358

3359 # 译者：注意保持前导空格

3362 -#: diff.c:162

3360 +#: diff.c:163

3361 #, c-format

3362 msgid " Unknown dirstat parameter '%s'\n"

3363 msgstr " 未知的 dirstat 参数 '%s'\n"

3364

3367 -#: diff.c:298

3365 +#: diff.c:299

3366 msgid ""

3367 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3368 "'dimmed-zebra', 'plain'"

@@ -3372,7 +3370,7 @@ msgstr ""

3370 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "

3371 "'plain'"

3372

3375 -#: diff.c:326

3373 +#: diff.c:327

3374 #, c-format

3375 msgid ""

3376 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

@@ -3381,18 +3379,18 @@ msgstr ""

3379 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"

3380 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"

3381

3384 -#: diff.c:334

3382 +#: diff.c:335

3383 msgid ""

3384 "color-moved-ws: allow-indentation-change cannot be combined with other "

3385 "whitespace modes"

3386 msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"

3387

3390 -#: diff.c:411

3388 +#: diff.c:412

3389 #, c-format

3390 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

3391 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

3392

3395 -#: diff.c:471

3393 +#: diff.c:472

3394 #, c-format

3395 msgid ""

3396 "Found errors in 'diff.dirstat' config variable:\n"

@@ -3401,46 +3399,48 @@ msgstr ""

3399 "发现配置变量 'diff.dirstat' 中的错误：\n"

3400 "%s"

3401

3404 -#: diff.c:4290

3402 +#: diff.c:4237

3403 #, c-format

3404 msgid "external diff died, stopping at %s"

3405 msgstr "外部 diff 退出，停止在 %s"

3406

3409 -#: diff.c:4642

3410 -msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3411 -msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

3407 +#: diff.c:4589

3408 +#, c-format

3409 +msgid "options '%s', '%s', '%s', and '%s' cannot be used together"

3410 +msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"

3411

3413 -#: diff.c:4645

3414 -msgid "-G, -S and --find-object are mutually exclusive"

3415 -msgstr "-G、-S 和 --find-object 是互斥的"

3412 +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506

3413 +#, c-format

3414 +msgid "options '%s', '%s', and '%s' cannot be used together"

3415 +msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"

3416

3417 -#: diff.c:4648

3418 -msgid ""

3419 -"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3420 -msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"

3417 +#: diff.c:4597

3418 +#, c-format

3419 +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"

3420 +msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'"

3421

3422 -#: diff.c:4651

3422 +#: diff.c:4601

3423 +#, c-format

3424 msgid ""

3424 -"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3425 -"with -G and -S"

3426 -msgstr "--pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"

3425 +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"

3426 +msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"

3427

3428 -#: diff.c:4730

3428 +#: diff.c:4681

3429 msgid "--follow requires exactly one pathspec"

3430 msgstr "--follow 明确要求只跟一个路径规格"

3431

3432 -#: diff.c:4778

3432 +#: diff.c:4729

3433 #, c-format

3434 msgid "invalid --stat value: %s"

3435 msgstr "无效的 --stat 值：%s"

3436

3437 -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3437 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277

3438 #: parse-options.c:217 parse-options.c:221

3439 #, c-format

3440 msgid "%s expects a numerical value"

3441 msgstr "%s 期望一个数字值"

3442

3443 -#: diff.c:4815

3443 +#: diff.c:4766

3444 #, c-format

3445 msgid ""

3446 "Failed to parse --dirstat/-X option parameter:\n"

@@ -3449,200 +3449,200 @@ msgstr ""

3449 "无法解析 --dirstat/-X 选项的参数：\n"

3450 "%s"

3451

3452 -#: diff.c:4900

3452 +#: diff.c:4851

3453 #, c-format

3454 msgid "unknown change class '%c' in --diff-filter=%s"

3455 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"

3456

3457 -#: diff.c:4924

3457 +#: diff.c:4875

3458 #, c-format

3459 msgid "unknown value after ws-error-highlight=%.*s"

3460 msgstr "ws-error-highlight=%.*s 之后未知的值"

3461

3462 -#: diff.c:4938

3462 +#: diff.c:4889

3463 #, c-format

3464 msgid "unable to resolve '%s'"

3465 msgstr "不能解析 '%s'"

3466

3467 -#: diff.c:4988 diff.c:4994

3467 +#: diff.c:4939 diff.c:4945

3468 #, c-format

3469 msgid "%s expects <n>/<m> form"

3470 msgstr "%s 期望 <n>/<m> 格式"

3471

3472 -#: diff.c:5006

3472 +#: diff.c:4957

3473 #, c-format

3474 msgid "%s expects a character, got '%s'"

3475 msgstr "%s 期望一个字符，得到 '%s'"

3476

3477 -#: diff.c:5027

3477 +#: diff.c:4978

3478 #, c-format

3479 msgid "bad --color-moved argument: %s"

3480 msgstr "坏的 --color-moved 参数：%s"

3481

3482 -#: diff.c:5046

3482 +#: diff.c:4997

3483 #, c-format

3484 msgid "invalid mode '%s' in --color-moved-ws"

3485 msgstr "--color-moved-ws 中的无效模式 '%s' "

3486

3487 -#: diff.c:5086

3487 +#: diff.c:5037

3488 msgid ""

3489 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3490 "\"histogram\""

3491 msgstr ""

3492 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3493

3494 -#: diff.c:5122 diff.c:5142

3494 +#: diff.c:5073 diff.c:5093

3495 #, c-format

3496 msgid "invalid argument to %s"

3497 msgstr "%s 的参数无效"

3498

3499 -#: diff.c:5246

3499 +#: diff.c:5197

3500 #, c-format

3501 msgid "invalid regex given to -I: '%s'"

3502 msgstr "选项 -I 的正则表达式无效：'%s'"

3503

3504 -#: diff.c:5295

3504 +#: diff.c:5246

3505 #, c-format

3506 msgid "failed to parse --submodule option parameter: '%s'"

3507 msgstr "无法解析 --submodule 选项的参数：'%s'"

3508

3509 -#: diff.c:5351

3509 +#: diff.c:5302

3510 #, c-format

3511 msgid "bad --word-diff argument: %s"

3512 msgstr "坏的 --word-diff 参数：%s"

3513

3514 -#: diff.c:5387

3514 +#: diff.c:5338

3515 msgid "Diff output format options"

3516 msgstr "差异输出格式化选项"

3517

3518 -#: diff.c:5389 diff.c:5395

3518 +#: diff.c:5340 diff.c:5346

3519 msgid "generate patch"

3520 msgstr "生成补丁"

3521

3522 -#: diff.c:5392 builtin/log.c:179

3522 +#: diff.c:5343 builtin/log.c:179

3523 msgid "suppress diff output"

3524 msgstr "不显示差异输出"

3525

3526 -#: diff.c:5397 diff.c:5511 diff.c:5518

3526 +#: diff.c:5348 diff.c:5462 diff.c:5469

3527 msgid "<n>"

3528 msgstr "<n>"

3529

3530 -#: diff.c:5398 diff.c:5401

3530 +#: diff.c:5349 diff.c:5352

3531 msgid "generate diffs with <n> lines context"

3532 msgstr "生成含 <n> 行上下文的差异"

3533

3534 -#: diff.c:5403

3534 +#: diff.c:5354

3535 msgid "generate the diff in raw format"

3536 msgstr "生成原始格式的差异"

3537

3538 -#: diff.c:5406

3538 +#: diff.c:5357

3539 msgid "synonym for '-p --raw'"

3540 msgstr "和 '-p --raw' 同义"

3541

3542 -#: diff.c:5410

3542 +#: diff.c:5361

3543 msgid "synonym for '-p --stat'"

3544 msgstr "和 '-p --stat' 同义"

3545

3546 -#: diff.c:5414

3546 +#: diff.c:5365

3547 msgid "machine friendly --stat"

3548 msgstr "机器友好的 --stat"

3549

3550 -#: diff.c:5417

3550 +#: diff.c:5368

3551 msgid "output only the last line of --stat"

3552 msgstr "只输出 --stat 的最后一行"

3553

3554 -#: diff.c:5419 diff.c:5427

3554 +#: diff.c:5370 diff.c:5378

3555 msgid "<param1,param2>..."

3556 msgstr "<参数1,参数2>..."

3557

3558 -#: diff.c:5420

3558 +#: diff.c:5371

3559 msgid ""

3560 "output the distribution of relative amount of changes for each sub-directory"

3561 msgstr "输出每个子目录相对变更的分布"

3562

3563 -#: diff.c:5424

3563 +#: diff.c:5375

3564 msgid "synonym for --dirstat=cumulative"

3565 msgstr "和 --dirstat=cumulative 同义"

3566

3567 -#: diff.c:5428

3567 +#: diff.c:5379

3568 msgid "synonym for --dirstat=files,param1,param2..."

3569 msgstr "是 --dirstat=files,param1,param2... 的同义词"

3570

3571 -#: diff.c:5432

3571 +#: diff.c:5383

3572 msgid "warn if changes introduce conflict markers or whitespace errors"

3573 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"

3574

3575 -#: diff.c:5435

3575 +#: diff.c:5386

3576 msgid "condensed summary such as creations, renames and mode changes"

3577 msgstr "精简摘要，例如创建、重命名和模式变更"

3578

3579 -#: diff.c:5438

3579 +#: diff.c:5389

3580 msgid "show only names of changed files"

3581 msgstr "只显示变更文件的文件名"

3582

3583 -#: diff.c:5441

3583 +#: diff.c:5392

3584 msgid "show only names and status of changed files"

3585 msgstr "只显示变更文件的文件名和状态"

3586

3587 -#: diff.c:5443

3587 +#: diff.c:5394

3588 msgid "<width>[,<name-width>[,<count>]]"

3589 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"

3590

3591 -#: diff.c:5444

3591 +#: diff.c:5395

3592 msgid "generate diffstat"

3593 msgstr "生成差异统计（diffstat）"

3594

3595 -#: diff.c:5446 diff.c:5449 diff.c:5452

3595 +#: diff.c:5397 diff.c:5400 diff.c:5403

3596 msgid "<width>"

3597 msgstr "<宽度>"

3598

3599 -#: diff.c:5447

3599 +#: diff.c:5398

3600 msgid "generate diffstat with a given width"

3601 msgstr "使用给定的长度生成差异统计"

3602

3603 -#: diff.c:5450

3603 +#: diff.c:5401

3604 msgid "generate diffstat with a given name width"

3605 msgstr "使用给定的文件名长度生成差异统计"

3606

3607 -#: diff.c:5453

3607 +#: diff.c:5404

3608 msgid "generate diffstat with a given graph width"

3609 msgstr "使用给定的图形长度生成差异统计"

3610

3611 -#: diff.c:5455

3611 +#: diff.c:5406

3612 msgid "<count>"

3613 msgstr "<次数>"

3614

3615 -#: diff.c:5456

3615 +#: diff.c:5407

3616 msgid "generate diffstat with limited lines"

3617 msgstr "生成有限行数的差异统计"

3618

3619 -#: diff.c:5459

3619 +#: diff.c:5410

3620 msgid "generate compact summary in diffstat"

3621 msgstr "生成差异统计的简洁摘要"

3622

3623 -#: diff.c:5462

3623 +#: diff.c:5413

3624 msgid "output a binary diff that can be applied"

3625 msgstr "输出一个可以应用的二进制差异"

3626

3627 -#: diff.c:5465

3627 +#: diff.c:5416

3628 msgid "show full pre- and post-image object names on the \"index\" lines"

3629 msgstr "在 \"index\" 行显示完整的前后对象名称"

3630

3631 -#: diff.c:5467

3631 +#: diff.c:5418

3632 msgid "show colored diff"

3633 msgstr "显示带颜色的差异"

3634

3635 -#: diff.c:5468

3635 +#: diff.c:5419

3636 msgid "<kind>"

3637 msgstr "<类型>"

3638

3639 -#: diff.c:5469

3639 +#: diff.c:5420

3640 msgid ""

3641 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3642 "diff"

3643 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"

3644

3645 -#: diff.c:5472

3645 +#: diff.c:5423

3646 msgid ""

3647 "do not munge pathnames and use NULs as output field terminators in --raw or "

3648 "--numstat"

@@ -3650,311 +3650,311 @@ msgstr ""

3650 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"

3651 "符"

3652

3653 -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3653 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541

3654 msgid "<prefix>"

3655 msgstr "<前缀>"

3656

3657 -#: diff.c:5476

3657 +#: diff.c:5427

3658 msgid "show the given source prefix instead of \"a/\""

3659 msgstr "显示给定的源前缀取代 \"a/\""

3660

3661 -#: diff.c:5479

3661 +#: diff.c:5430

3662 msgid "show the given destination prefix instead of \"b/\""

3663 msgstr "显示给定的目标前缀取代 \"b/\""

3664

3665 -#: diff.c:5482

3665 +#: diff.c:5433

3666 msgid "prepend an additional prefix to every line of output"

3667 msgstr "输出的每一行附加前缀"

3668

3669 -#: diff.c:5485

3669 +#: diff.c:5436

3670 msgid "do not show any source or destination prefix"

3671 msgstr "不显示任何源和目标前缀"

3672

3673 -#: diff.c:5488

3673 +#: diff.c:5439

3674 msgid "show context between diff hunks up to the specified number of lines"

3675 msgstr "显示指定行数的差异块间的上下文"

3676

3677 -#: diff.c:5492 diff.c:5497 diff.c:5502

3677 +#: diff.c:5443 diff.c:5448 diff.c:5453

3678 msgid "<char>"

3679 msgstr "<字符>"

3680

3681 -#: diff.c:5493

3681 +#: diff.c:5444

3682 msgid "specify the character to indicate a new line instead of '+'"

3683 msgstr "指定一个字符取代 '+' 来表示新的一行"

3684

3685 -#: diff.c:5498

3685 +#: diff.c:5449

3686 msgid "specify the character to indicate an old line instead of '-'"

3687 msgstr "指定一个字符取代 '-' 来表示旧的一行"

3688

3689 -#: diff.c:5503

3689 +#: diff.c:5454

3690 msgid "specify the character to indicate a context instead of ' '"

3691 msgstr "指定一个字符取代 ' ' 来表示一行上下文"

3692

3693 -#: diff.c:5506

3693 +#: diff.c:5457

3694 msgid "Diff rename options"

3695 msgstr "差异重命名选项"

3696

3697 -#: diff.c:5507

3697 +#: diff.c:5458

3698 msgid "<n>[/<m>]"

3699 msgstr "<n>[/<m>]"

3700

3701 -#: diff.c:5508

3701 +#: diff.c:5459

3702 msgid "break complete rewrite changes into pairs of delete and create"

3703 msgstr "将完全重写的变更打破为成对的删除和创建"

3704

3705 -#: diff.c:5512

3705 +#: diff.c:5463

3706 msgid "detect renames"

3707 msgstr "检测重命名"

3708

3709 -#: diff.c:5516

3709 +#: diff.c:5467

3710 msgid "omit the preimage for deletes"

3711 msgstr "省略删除操作的差异输出"

3712

3713 -#: diff.c:5519

3713 +#: diff.c:5470

3714 msgid "detect copies"

3715 msgstr "检测拷贝"

3716

3717 -#: diff.c:5523

3717 +#: diff.c:5474

3718 msgid "use unmodified files as source to find copies"

3719 msgstr "使用未修改的文件做为发现拷贝的源"

3720

3721 -#: diff.c:5525

3721 +#: diff.c:5476

3722 msgid "disable rename detection"

3723 msgstr "禁用重命名探测"

3724

3725 -#: diff.c:5528

3725 +#: diff.c:5479

3726 msgid "use empty blobs as rename source"

3727 msgstr "使用空的数据对象做为重命名的源"

3728

3729 -#: diff.c:5530

3729 +#: diff.c:5481

3730 msgid "continue listing the history of a file beyond renames"

3731 msgstr "继续列出文件重命名以外的历史记录"

3732

3733 -#: diff.c:5533

3733 +#: diff.c:5484

3734 msgid ""

3735 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3736 "given limit"

3737 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"

3738

3739 -#: diff.c:5535

3739 +#: diff.c:5486

3740 msgid "Diff algorithm options"

3741 msgstr "差异算法选项"

3742

3743 -#: diff.c:5537

3743 +#: diff.c:5488

3744 msgid "produce the smallest possible diff"

3745 msgstr "生成尽可能小的差异"

3746

3747 -#: diff.c:5540

3747 +#: diff.c:5491

3748 msgid "ignore whitespace when comparing lines"

3749 msgstr "行比较时忽略空白字符"

3750

3751 -#: diff.c:5543

3751 +#: diff.c:5494

3752 msgid "ignore changes in amount of whitespace"

3753 msgstr "忽略空白字符的变更"

3754

3755 -#: diff.c:5546

3755 +#: diff.c:5497

3756 msgid "ignore changes in whitespace at EOL"

3757 msgstr "忽略行尾的空白字符变更"

3758

3759 -#: diff.c:5549

3759 +#: diff.c:5500

3760 msgid "ignore carrier-return at the end of line"

3761 msgstr "忽略行尾的回车符（CR）"

3762

3763 -#: diff.c:5552

3763 +#: diff.c:5503

3764 msgid "ignore changes whose lines are all blank"

3765 msgstr "忽略整行都是空白的变更"

3766

3767 -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3767 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575

3768 msgid "<regex>"

3769 msgstr "<正则>"

3770

3771 -#: diff.c:5555

3771 +#: diff.c:5506

3772 msgid "ignore changes whose all lines match <regex>"

3773 msgstr "忽略所有行都和正则表达式匹配的变更"

3774

3775 -#: diff.c:5558

3775 +#: diff.c:5509

3776 msgid "heuristic to shift diff hunk boundaries for easy reading"

3777 msgstr "启发式转换差异边界以便阅读"

3778

3779 -#: diff.c:5561

3779 +#: diff.c:5512

3780 msgid "generate diff using the \"patience diff\" algorithm"

3781 msgstr "使用 \"patience diff\" 算法生成差异"

3782

3783 -#: diff.c:5565

3783 +#: diff.c:5516

3784 msgid "generate diff using the \"histogram diff\" algorithm"

3785 msgstr "使用 \"histogram diff\" 算法生成差异"

3786

3787 -#: diff.c:5567

3787 +#: diff.c:5518

3788 msgid "<algorithm>"

3789 msgstr "<算法>"

3790

3791 -#: diff.c:5568

3791 +#: diff.c:5519

3792 msgid "choose a diff algorithm"

3793 msgstr "选择一个差异算法"

3794

3795 -#: diff.c:5570

3795 +#: diff.c:5521

3796 msgid "<text>"

3797 msgstr "<文本>"

3798

3799 -#: diff.c:5571

3799 +#: diff.c:5522

3800 msgid "generate diff using the \"anchored diff\" algorithm"

3801 msgstr "使用 \"anchored diff\" 算法生成差异"

3802

3803 -#: diff.c:5573 diff.c:5582 diff.c:5585

3803 +#: diff.c:5524 diff.c:5533 diff.c:5536

3804 msgid "<mode>"

3805 msgstr "<模式>"

3806

3807 -#: diff.c:5574

3807 +#: diff.c:5525

3808 msgid "show word diff, using <mode> to delimit changed words"

3809 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"

3810

3811 -#: diff.c:5577

3811 +#: diff.c:5528

3812 msgid "use <regex> to decide what a word is"

3813 msgstr "使用 <正则表达式> 确定何为一个词"

3814

3815 -#: diff.c:5580

3815 +#: diff.c:5531

3816 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3817 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"

3818

3819 -#: diff.c:5583

3819 +#: diff.c:5534

3820 msgid "moved lines of code are colored differently"

3821 msgstr "移动的代码行用不同方式着色"

3822

3823 -#: diff.c:5586

3823 +#: diff.c:5537

3824 msgid "how white spaces are ignored in --color-moved"

3825 msgstr "在 --color-moved 下如何忽略空白字符"

3826

3827 -#: diff.c:5589

3827 +#: diff.c:5540

3828 msgid "Other diff options"

3829 msgstr "其它差异选项"

3830

3831 -#: diff.c:5591

3831 +#: diff.c:5542

3832 msgid "when run from subdir, exclude changes outside and show relative paths"

3833 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"

3834

3835 -#: diff.c:5595

3835 +#: diff.c:5546

3836 msgid "treat all files as text"

3837 msgstr "把所有文件当做文本处理"

3838

3839 -#: diff.c:5597

3839 +#: diff.c:5548

3840 msgid "swap two inputs, reverse the diff"

3841 msgstr "交换两个输入，反转差异"

3842

3843 -#: diff.c:5599

3843 +#: diff.c:5550

3844 msgid "exit with 1 if there were differences, 0 otherwise"

3845 msgstr "有差异时退出码为 1，否则为 0"

3846

3847 -#: diff.c:5601

3847 +#: diff.c:5552

3848 msgid "disable all output of the program"

3849 msgstr "禁用本程序的所有输出"

3850

3851 -#: diff.c:5603

3851 +#: diff.c:5554

3852 msgid "allow an external diff helper to be executed"

3853 msgstr "允许执行一个外置的差异助手"

3854

3855 -#: diff.c:5605

3855 +#: diff.c:5556

3856 msgid "run external text conversion filters when comparing binary files"

3857 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"

3858

3859 -#: diff.c:5607

3859 +#: diff.c:5558

3860 msgid "<when>"

3861 msgstr "<何时>"

3862

3863 -#: diff.c:5608

3863 +#: diff.c:5559

3864 msgid "ignore changes to submodules in the diff generation"

3865 msgstr "在生成差异时，忽略子模组的更改"

3866

3867 -#: diff.c:5611

3867 +#: diff.c:5562

3868 msgid "<format>"

3869 msgstr "<格式>"

3870

3871 -#: diff.c:5612

3871 +#: diff.c:5563

3872 msgid "specify how differences in submodules are shown"

3873 msgstr "指定子模组的差异如何显示"

3874

3875 -#: diff.c:5616

3875 +#: diff.c:5567

3876 msgid "hide 'git add -N' entries from the index"

3877 msgstr "隐藏索引中 'git add -N' 条目"

3878

3879 -#: diff.c:5619

3879 +#: diff.c:5570

3880 msgid "treat 'git add -N' entries as real in the index"

3881 msgstr "将索引中 'git add -N' 条目当做真实的"

3882

3883 -#: diff.c:5621

3883 +#: diff.c:5572

3884 msgid "<string>"

3885 msgstr "<字符串>"

3886

3887 -#: diff.c:5622

3887 +#: diff.c:5573

3888 msgid ""

3889 "look for differences that change the number of occurrences of the specified "

3890 "string"

3891 msgstr "查找改变了指定字符串出现次数的差异"

3892

3893 -#: diff.c:5625

3893 +#: diff.c:5576

3894 msgid ""

3895 "look for differences that change the number of occurrences of the specified "

3896 "regex"

3897 msgstr "查找改变指定正则匹配出现次数的差异"

3898

3899 -#: diff.c:5628

3899 +#: diff.c:5579

3900 msgid "show all changes in the changeset with -S or -G"

3901 msgstr "显示使用 -S 或 -G 的变更集的所有变更"

3902

3903 -#: diff.c:5631

3903 +#: diff.c:5582

3904 msgid "treat <string> in -S as extended POSIX regular expression"

3905 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"

3906

3907 -#: diff.c:5634

3907 +#: diff.c:5585

3908 msgid "control the order in which files appear in the output"

3909 msgstr "控制输出中的文件显示顺序"

3910

3911 -#: diff.c:5635 diff.c:5638

3911 +#: diff.c:5586 diff.c:5589

3912 msgid "<path>"

3913 msgstr "<路径>"

3914

3915 -#: diff.c:5636

3915 +#: diff.c:5587

3916 msgid "show the change in the specified path first"

3917 msgstr "先显示指定路径的变更"

3918

3919 -#: diff.c:5639

3919 +#: diff.c:5590

3920 msgid "skip the output to the specified path"

3921 msgstr "跳过指定路径的输出"

3922

3923 -#: diff.c:5641

3923 +#: diff.c:5592

3924 msgid "<object-id>"

3925 msgstr "<对象 ID>"

3926

3927 -#: diff.c:5642

3927 +#: diff.c:5593

3928 msgid ""

3929 "look for differences that change the number of occurrences of the specified "

3930 "object"

3931 msgstr "查找改变指定对象出现次数的差异"

3932

3933 -#: diff.c:5644

3933 +#: diff.c:5595

3934 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3935 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3936

3937 -#: diff.c:5645

3937 +#: diff.c:5596

3938 msgid "select files by diff type"

3939 msgstr "通过差异类型选择文件"

3940

3941 -#: diff.c:5647

3941 +#: diff.c:5598

3942 msgid "<file>"

3943 msgstr "<文件>"

3944

3945 -#: diff.c:5648

3945 +#: diff.c:5599

3946 msgid "Output to a specific file"

3947 msgstr "输出到一个指定的文件"

3948

3949 -#: diff.c:6306

3949 +#: diff.c:6257

3950 msgid "exhaustive rename detection was skipped due to too many files."

3951 msgstr "由于文件太多，跳过详尽的重命名检查。"

3952

3953 -#: diff.c:6309

3953 +#: diff.c:6260

3954 msgid "only found copies from modified paths due to too many files."

3955 msgstr "由于文件太多，只在修改的路径中找到了拷贝。"

3956

3957 -#: diff.c:6312

3957 +#: diff.c:6263

3958 #, c-format

3959 msgid ""

3960 "you may want to set your %s variable to at least %d and retry the command."

@@ -3963,7 +3963,7 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令

3963 #: diffcore-order.c:24

3964 #, c-format

3965 msgid "failed to read orderfile '%s'"

3966 -msgstr "读取排序文件 '%s' 失败"

3966 +msgstr "无法读取排序文件 '%s'"

3967

3968 #: diffcore-rename.c:1564

3969 msgid "Performing inexact rename detection"

@@ -3994,29 +3994,29 @@ msgstr "未识别的反向模式：'%s'"

3994 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3995 msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"

3996

3997 -#: dir.c:830

3997 +#: dir.c:828

3998 msgid "disabling cone pattern matching"

3999 -msgstr "禁止 cone 模式匹配"

3999 +msgstr "停用锥形模式匹配"

4000

4001 -#: dir.c:1214

4001 +#: dir.c:1212

4002 #, c-format

4003 msgid "cannot use %s as an exclude file"

4004 msgstr "不能将 %s 用作排除文件"

4005

4006 -#: dir.c:2464

4006 +#: dir.c:2418

4007 #, c-format

4008 msgid "could not open directory '%s'"

4009 msgstr "不能打开目录 '%s'"

4010

4011 -#: dir.c:2766

4011 +#: dir.c:2720

4012 msgid "failed to get kernel name and information"

4013 msgstr "无法获得内核名称和信息"

4014

4015 -#: dir.c:2890

4015 +#: dir.c:2844

4016 msgid "untracked cache is disabled on this system or location"

4017 msgstr "缓存未跟踪文件在本系统或位置中被禁用"

4018

4019 -#: dir.c:3158

4019 +#: dir.c:3112

4020 msgid ""

4021 "No directory name could be guessed.\n"

4022 "Please specify a directory on the command line"

@@ -4024,36 +4024,36 @@ msgstr ""

4024 "无法猜到目录名。\n"

4025 "请在命令行指定一个目录"

4026

4027 -#: dir.c:3837

4027 +#: dir.c:3800

4028 #, c-format

4029 msgid "index file corrupt in repo %s"

4030 msgstr "仓库 %s 中的索引文件损坏"

4031

4032 -#: dir.c:3884 dir.c:3889

4032 +#: dir.c:3847 dir.c:3852

4033 #, c-format

4034 msgid "could not create directories for %s"

4035 msgstr "不能为 %s 创建目录"

4036

4037 -#: dir.c:3918

4037 +#: dir.c:3881

4038 #, c-format

4039 msgid "could not migrate git directory from '%s' to '%s'"

4040 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

4041

4042 -#: editor.c:77

4042 +#: editor.c:74

4043 #, c-format

4044 msgid "hint: Waiting for your editor to close the file...%c"

4045 msgstr "提示：等待您的编辑器关闭文件...%c"

4046

4047 -#: entry.c:177

4047 +#: entry.c:179

4048 msgid "Filtering content"

4049 msgstr "过滤内容"

4050

4051 -#: entry.c:498

4051 +#: entry.c:500

4052 #, c-format

4053 msgid "could not stat file '%s'"

4054 msgstr "不能对文件 '%s' 调用 stat"

4055

4056 -#: environment.c:143

4056 +#: environment.c:145

4057 #, c-format

4058 msgid "bad git namespace path \"%s\""

4059 msgstr "错误的 git 名字空间路径 \"%s\""

@@ -4063,278 +4063,274 @@ msgstr "错误的 git 名字空间路径 \"%s\""

4063 msgid "too many args to run %s"

4064 msgstr "执行 %s 的参数太多"

4065

4066 -#: fetch-pack.c:193

4066 +#: fetch-pack.c:194

4067 msgid "git fetch-pack: expected shallow list"

4068 msgstr "git fetch-pack：应为 shallow 列表"

4069

4070 -#: fetch-pack.c:196

4070 +#: fetch-pack.c:197

4071 msgid "git fetch-pack: expected a flush packet after shallow list"

4072 msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"

4073

4074 -#: fetch-pack.c:207

4074 +#: fetch-pack.c:208

4075 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

4076 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

4077

4078 -#: fetch-pack.c:227

4078 +#: fetch-pack.c:228

4079 #, c-format

4080 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

4081 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

4082

4083 -#: fetch-pack.c:238

4083 +#: fetch-pack.c:239

4084 msgid "unable to write to remote"

4085 msgstr "无法写到远程"

4086

4087 -#: fetch-pack.c:299

4088 -msgid "--stateless-rpc requires multi_ack_detailed"

4089 -msgstr "--stateless-rpc 需要 multi_ack_detailed"

4090 -

4091 -#: fetch-pack.c:394 fetch-pack.c:1434

4087 +#: fetch-pack.c:395 fetch-pack.c:1439

4088 #, c-format

4089 msgid "invalid shallow line: %s"

4090 msgstr "无效的 shallow 信息：%s"

4091

4096 -#: fetch-pack.c:400 fetch-pack.c:1440

4092 +#: fetch-pack.c:401 fetch-pack.c:1445

4093 #, c-format

4094 msgid "invalid unshallow line: %s"

4095 msgstr "无效的 unshallow 信息：%s"

4096

4101 -#: fetch-pack.c:402 fetch-pack.c:1442

4097 +#: fetch-pack.c:403 fetch-pack.c:1447

4098 #, c-format

4099 msgid "object not found: %s"

4100 msgstr "对象未找到：%s"

4101

4106 -#: fetch-pack.c:405 fetch-pack.c:1445

4102 +#: fetch-pack.c:406 fetch-pack.c:1450

4103 #, c-format

4104 msgid "error in object: %s"

4105 msgstr "对象中出错：%s"

4106

4111 -#: fetch-pack.c:407 fetch-pack.c:1447

4107 +#: fetch-pack.c:408 fetch-pack.c:1452

4108 #, c-format

4109 msgid "no shallow found: %s"

4110 msgstr "未发现 shallow：%s"

4111

4116 -#: fetch-pack.c:410 fetch-pack.c:1451

4112 +#: fetch-pack.c:411 fetch-pack.c:1456

4113 #, c-format

4114 msgid "expected shallow/unshallow, got %s"

4115 msgstr "应为 shallow/unshallow，却得到 %s"

4116

4121 -#: fetch-pack.c:450

4117 +#: fetch-pack.c:451

4118 #, c-format

4119 msgid "got %s %d %s"

4120 msgstr "得到 %s %d %s"

4121

4126 -#: fetch-pack.c:467

4122 +#: fetch-pack.c:468

4123 #, c-format

4124 msgid "invalid commit %s"

4125 msgstr "无效提交 %s"

4126

4131 -#: fetch-pack.c:498

4127 +#: fetch-pack.c:499

4128 msgid "giving up"

4129 msgstr "放弃"

4130

4135 -#: fetch-pack.c:511 progress.c:339

4131 +#: fetch-pack.c:512 progress.c:339

4132 msgid "done"

4133 msgstr "完成"

4134

4139 -#: fetch-pack.c:523

4135 +#: fetch-pack.c:524

4136 #, c-format

4137 msgid "got %s (%d) %s"

4138 msgstr "得到 %s (%d) %s"

4139

4144 -#: fetch-pack.c:559

4140 +#: fetch-pack.c:560

4141 #, c-format

4142 msgid "Marking %s as complete"

4143 msgstr "标记 %s 为完成"

4144

4149 -#: fetch-pack.c:774

4145 +#: fetch-pack.c:775

4146 #, c-format

4147 msgid "already have %s (%s)"

4148 msgstr "已经有 %s（%s）"

4149

4154 -#: fetch-pack.c:860

4150 +#: fetch-pack.c:861

4151 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4152 msgstr "fetch-pack：无法派生 sideband 多路输出"

4153

4158 -#: fetch-pack.c:868

4154 +#: fetch-pack.c:869

4155 msgid "protocol error: bad pack header"

4156 msgstr "协议错误：坏的包头"

4157

4162 -#: fetch-pack.c:962

4158 +#: fetch-pack.c:965

4159 #, c-format

4160 msgid "fetch-pack: unable to fork off %s"

4161 msgstr "fetch-pack：无法派生进程 %s"

4162

4167 -#: fetch-pack.c:968

4163 +#: fetch-pack.c:971

4164 msgid "fetch-pack: invalid index-pack output"

4165 msgstr "fetch-pack：无效的 index-pack 输出"

4166

4171 -#: fetch-pack.c:985

4167 +#: fetch-pack.c:988

4168 #, c-format

4169 msgid "%s failed"

4170 msgstr "%s 失败"

4171

4176 -#: fetch-pack.c:987

4172 +#: fetch-pack.c:990

4173 msgid "error in sideband demultiplexer"

4174 msgstr "sideband 多路输出出错"

4175

4180 -#: fetch-pack.c:1030

4176 +#: fetch-pack.c:1035

4177 #, c-format

4178 msgid "Server version is %.*s"

4179 msgstr "服务器版本 %.*s"

4180

4185 -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

4186 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

4187 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

4188 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

4181 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058

4182 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4183 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090

4184 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112

4185 #, c-format

4186 msgid "Server supports %s"

4187 msgstr "服务器支持 %s"

4188

4193 -#: fetch-pack.c:1040

4189 +#: fetch-pack.c:1045

4190 msgid "Server does not support shallow clients"

4191 msgstr "服务器不支持浅客户端"

4192

4197 -#: fetch-pack.c:1100

4193 +#: fetch-pack.c:1105

4194 msgid "Server does not support --shallow-since"

4195 msgstr "服务器不支持 --shallow-since"

4196

4201 -#: fetch-pack.c:1105

4197 +#: fetch-pack.c:1110

4198 msgid "Server does not support --shallow-exclude"

4199 msgstr "服务器不支持 --shallow-exclude"

4200

4205 -#: fetch-pack.c:1109

4201 +#: fetch-pack.c:1114

4202 msgid "Server does not support --deepen"

4203 msgstr "服务器不支持 --deepen"

4204

4209 -#: fetch-pack.c:1111

4205 +#: fetch-pack.c:1116

4206 msgid "Server does not support this repository's object format"

4207 msgstr "服务器不支持这个仓库的对象格式"

4208

4213 -#: fetch-pack.c:1124

4209 +#: fetch-pack.c:1129

4210 msgid "no common commits"

4211 msgstr "没有共同的提交"

4212

4217 -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

4213 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130

4214 msgid "source repository is shallow, reject to clone."

4215 msgstr "源仓库是浅克隆，拒绝克隆。"

4216

4221 -#: fetch-pack.c:1139 fetch-pack.c:1671

4217 +#: fetch-pack.c:1144 fetch-pack.c:1681

4218 msgid "git fetch-pack: fetch failed."

4219 msgstr "git fetch-pack：获取失败。"

4220

4225 -#: fetch-pack.c:1253

4221 +#: fetch-pack.c:1258

4222 #, c-format

4223 msgid "mismatched algorithms: client %s; server %s"

4224 msgstr "不匹配的算法：客户端 %s，服务端 %s"

4225

4230 -#: fetch-pack.c:1257

4226 +#: fetch-pack.c:1262

4227 #, c-format

4228 msgid "the server does not support algorithm '%s'"

4229 msgstr "服务器不支持算法 '%s'"

4230

4235 -#: fetch-pack.c:1290

4231 +#: fetch-pack.c:1295

4232 msgid "Server does not support shallow requests"

4233 msgstr "服务器不支持浅克隆请求"

4234

4239 -#: fetch-pack.c:1297

4235 +#: fetch-pack.c:1302

4236 msgid "Server supports filter"

4237 msgstr "服务器支持 filter"

4238

4243 -#: fetch-pack.c:1340 fetch-pack.c:2053

4239 +#: fetch-pack.c:1345 fetch-pack.c:2063

4240 msgid "unable to write request to remote"

4241 msgstr "无法将请求写到远程"

4242

4247 -#: fetch-pack.c:1358

4243 +#: fetch-pack.c:1363

4244 #, c-format

4245 msgid "error reading section header '%s'"

4246 msgstr "读取节标题 '%s' 出错"

4247

4252 -#: fetch-pack.c:1364

4248 +#: fetch-pack.c:1369

4249 #, c-format

4250 msgid "expected '%s', received '%s'"

4251 msgstr "预期 '%s'，得到 '%s'"

4252

4257 -#: fetch-pack.c:1398

4253 +#: fetch-pack.c:1403

4254 #, c-format

4255 msgid "unexpected acknowledgment line: '%s'"

4256 msgstr "意外的确认行：'%s'"

4257

4262 -#: fetch-pack.c:1403

4258 +#: fetch-pack.c:1408

4259 #, c-format

4260 msgid "error processing acks: %d"

4261 msgstr "处理 ack 出错：%d"

4262

4267 -#: fetch-pack.c:1413

4263 +#: fetch-pack.c:1418

4264 msgid "expected packfile to be sent after 'ready'"

4265 msgstr "预期在 'ready' 之后发送 packfile"

4266

4271 -#: fetch-pack.c:1415

4267 +#: fetch-pack.c:1420

4268 msgid "expected no other sections to be sent after no 'ready'"

4269 msgstr "在没有 'ready' 不应该发送其它小节"

4270

4275 -#: fetch-pack.c:1456

4271 +#: fetch-pack.c:1461

4272 #, c-format

4273 msgid "error processing shallow info: %d"

4274 msgstr "处理浅克隆信息出错：%d"

4275

4280 -#: fetch-pack.c:1505

4276 +#: fetch-pack.c:1510

4277 #, c-format

4278 msgid "expected wanted-ref, got '%s'"

4279 msgstr "预期 wanted-ref，得到 '%s'"

4280

4285 -#: fetch-pack.c:1510

4281 +#: fetch-pack.c:1515

4282 #, c-format

4283 msgid "unexpected wanted-ref: '%s'"

4284 msgstr "意外的 wanted-ref：'%s'"

4285

4290 -#: fetch-pack.c:1515

4286 +#: fetch-pack.c:1520

4287 #, c-format

4288 msgid "error processing wanted refs: %d"

4289 msgstr "处理要获取的引用出错：%d"

4290

4295 -#: fetch-pack.c:1545

4291 +#: fetch-pack.c:1550

4292 msgid "git fetch-pack: expected response end packet"

4293 msgstr "git fetch-pack：预期响应结束包"

4294

4299 -#: fetch-pack.c:1949

4295 +#: fetch-pack.c:1959

4296 msgid "no matching remote head"

4297 msgstr "没有匹配的远程分支"

4298

4303 -#: fetch-pack.c:1972 builtin/clone.c:581

4299 +#: fetch-pack.c:1982 builtin/clone.c:581

4300 msgid "remote did not send all necessary objects"

4301 msgstr "远程没有发送所有必需的对象"

4302

4307 -#: fetch-pack.c:2075

4303 +#: fetch-pack.c:2085

4304 msgid "unexpected 'ready' from remote"

4305 msgstr "来自远程的意外的 'ready'"

4306

4311 -#: fetch-pack.c:2098

4307 +#: fetch-pack.c:2108

4308 #, c-format

4309 msgid "no such remote ref %s"

4310 msgstr "没有这样的远程引用 %s"

4311

4316 -#: fetch-pack.c:2101

4312 +#: fetch-pack.c:2111

4313 #, c-format

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

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

4316

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

4322 -#: gpg-interface.c:918

4317 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974

4318 +#: gpg-interface.c:990

4319 msgid "could not create temporary file"

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

4321

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

4322 +#: gpg-interface.c:332 gpg-interface.c:460

4323 #, c-format

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

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

4326

4331 -#: gpg-interface.c:445

4327 +#: gpg-interface.c:451

4328 msgid ""

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

4330 "signature verification"

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

4332

4337 -#: gpg-interface.c:469

4333 +#: gpg-interface.c:480

4334 msgid ""

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

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

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

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

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

4340

4345 -#: gpg-interface.c:523

4341 +#: gpg-interface.c:536

4342 #, c-format

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

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

4345

4350 -#: gpg-interface.c:576

4346 +#: gpg-interface.c:624

4347 #, c-format

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

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

4350

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

4351 +#: gpg-interface.c:801 gpg-interface.c:806

4352 #, c-format

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

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

4355

4360 -#: gpg-interface.c:762

4356 +#: gpg-interface.c:829

4357 msgid ""

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

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

4360

4365 -#: gpg-interface.c:780

4361 +#: gpg-interface.c:851

4362 #, c-format

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

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

4365

4370 -#: gpg-interface.c:786

4366 +#: gpg-interface.c:857

4367 #, c-format

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

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

4370

4375 -#: gpg-interface.c:874

4371 +#: gpg-interface.c:945

4372 msgid "gpg failed to sign the data"

4377 -msgstr "gpg 数据签名失败"

4373 +msgstr "gpg 无法为数据签名"

4374

4379 -#: gpg-interface.c:895

4375 +#: gpg-interface.c:967

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

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

4378

4383 -#: gpg-interface.c:906

4379 +#: gpg-interface.c:978

4380 #, c-format

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

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

4383

4388 -#: gpg-interface.c:924

4384 +#: gpg-interface.c:996

4385 #, c-format

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

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

4388

4393 -#: gpg-interface.c:942

4389 +#: gpg-interface.c:1014

4390 msgid ""

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

4392 "8.2p1+)"

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

4394

4399 -#: gpg-interface.c:954

4395 +#: gpg-interface.c:1026

4396 #, c-format

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

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

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

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

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

4404

4409 -#: grep.c:533

4405 +#: grep.c:531

4406 msgid ""

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

4408 "with -P under PCRE v2"

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

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

4411 "功能"

4412

4417 -#: grep.c:1928

4413 +#: grep.c:1942

4414 #, c-format

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

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

4417

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

4418 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90

4419 #: builtin/rm.c:136

4420 #, c-format

4421 msgid "failed to stat '%s'"

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

4422 +msgstr "无法对 '%s' 调用 stat"

4423

4428 -#: grep.c:1956

4424 +#: grep.c:1970

4425 #, c-format

4426 msgid "'%s': short read"

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

@@ -4546,8 +4542,8 @@ msgstr "假定您想要的是 '%s' 并继续。"

4542

4543 #: help.c:646

4544 #, c-format

4549 -msgid "Run '%s' instead? (y/N)"

4550 -msgstr "取而代之运行 '%s' ？ (y/N)"

4545 +msgid "Run '%s' instead [y/N]? "

4546 +msgstr "取而代之运行 '%s' [y/N]？"

4547

4548 #: help.c:654

4549 #, c-format

@@ -4767,7 +4763,7 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包"

4763 msgid "quoted CRLF detected"

4764 msgstr "检测到被引用的 CRLF"

4765

4770 -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4766 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46

4767 #, c-format

4768 msgid "bad action '%s' for '%s'"

4769 msgstr "'%2$s' 的错误动作 '%1$s'"

@@ -4988,7 +4984,7 @@ msgstr "子模组"

4984 msgid "CONFLICT (%s): Merge conflict in %s"

4985 msgstr "冲突（%s）：合并冲突于 %s"

4986

4991 -#: merge-ort.c:3856

4987 +#: merge-ort.c:3869

4988 #, c-format

4989 msgid ""

4990 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -4997,7 +4993,7 @@ msgstr ""

4993 "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"

4994 "在树中被保留。"

4995

5000 -#: merge-ort.c:4152

4996 +#: merge-ort.c:4165

4997 #, c-format

4998 msgid ""

4999 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -5007,7 +5003,7 @@ msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副

5003 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5004 #. base, and 2-3) the trees for the two trees we're merging.

5005 #.

5010 -#: merge-ort.c:4521

5006 +#: merge-ort.c:4534

5007 #, c-format

5008 msgid "collecting merge info failed for trees %s, %s, %s"

5009 msgstr "无法收集树 %s、%s、%s 的合并信息"

@@ -5021,7 +5017,7 @@ msgstr ""

5017 "您对下列文件的本地修改将被合并操作覆盖：\n"

5018 " %s"

5019

5024 -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

5020 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405

5021 msgid "Already up to date."

5022 msgstr "已经是最新的。"

5023

@@ -5042,7 +5038,7 @@ msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

5038 #: merge-recursive.c:881

5039 #, c-format

5040 msgid "failed to create path '%s'%s"

5045 -msgstr "创建路径 '%s'%s 失败"

5041 +msgstr "无法创建路径 '%s'%s"

5042

5043 #: merge-recursive.c:892

5044 #, c-format

@@ -5071,12 +5067,12 @@ msgstr "%s '%s' 应为数据对象"

5067 #: merge-recursive.c:986

5068 #, c-format

5069 msgid "failed to open '%s': %s"

5074 -msgstr "打开 '%s' 失败：%s"

5070 +msgstr "无法打开 '%s'：%s"

5071

5072 #: merge-recursive.c:997

5073 #, c-format

5074 msgid "failed to symlink '%s': %s"

5079 -msgstr "创建符号链接 '%s' 失败：%s"

5075 +msgstr "无法创建符号链接 '%s'：%s"

5076

5077 #: merge-recursive.c:1002

5078 #, c-format

@@ -5296,17 +5292,17 @@ msgstr "合并未返回提交"

5292 msgid "Could not parse object '%s'"

5293 msgstr "不能解析对象 '%s'"

5294

5299 -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904

5295 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906

5296 #: builtin/stash.c:489

5297 msgid "Unable to write index."

5298 msgstr "不能写入索引。"

5299

5300 #: merge.c:41

5301 msgid "failed to read the cache"

5306 -msgstr "读取缓存失败"

5302 +msgstr "无法读取缓存"

5303

5308 -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967

5309 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706

5304 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022

5305 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706

5306 #: builtin/stash.c:269

5307 msgid "unable to write new index file"

5308 msgstr "无法写新的索引文件"

@@ -5315,211 +5311,211 @@ msgstr "无法写新的索引文件"

5311 msgid "multi-pack-index OID fanout is of the wrong size"

5312 msgstr "多包索引的对象ID扇出表大小错误"

5313

5318 -#: midx.c:109

5314 +#: midx.c:111

5315 #, c-format

5316 msgid "multi-pack-index file %s is too small"

5317 msgstr "多包索引文件 %s 太小"

5318

5323 -#: midx.c:125

5319 +#: midx.c:127

5320 #, c-format

5321 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5322 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"

5323

5328 -#: midx.c:130

5324 +#: midx.c:132

5325 #, c-format

5326 msgid "multi-pack-index version %d not recognized"

5327 msgstr "multi-pack-index 版本 %d 不能被识别"

5328

5333 -#: midx.c:135

5329 +#: midx.c:137

5330 #, c-format

5331 msgid "multi-pack-index hash version %u does not match version %u"

5332 msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"

5333

5338 -#: midx.c:152

5334 +#: midx.c:154

5335 msgid "multi-pack-index missing required pack-name chunk"

5336 msgstr "多包索引缺少必需的包名块"

5337

5342 -#: midx.c:154

5338 +#: midx.c:156

5339 msgid "multi-pack-index missing required OID fanout chunk"

5340 msgstr "多包索引缺少必需的对象 ID 扇出块"

5341

5346 -#: midx.c:156

5342 +#: midx.c:158

5343 msgid "multi-pack-index missing required OID lookup chunk"

5344 msgstr "多包索引缺少必需的对象 ID 查询块"

5345

5350 -#: midx.c:158

5346 +#: midx.c:160

5347 msgid "multi-pack-index missing required object offsets chunk"

5348 msgstr "多包索引缺少必需的对象偏移块"

5349

5354 -#: midx.c:174

5350 +#: midx.c:176

5351 #, c-format

5352 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5353 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

5354

5359 -#: midx.c:221

5355 +#: midx.c:224

5356 #, c-format

5357 msgid "bad pack-int-id: %u (%u total packs)"

5358 msgstr "错的 pack-int-id：%u（共有 %u 个包）"

5359

5364 -#: midx.c:271

5360 +#: midx.c:274

5361 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5362 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

5363

5368 -#: midx.c:502

5364 +#: midx.c:505

5365 #, c-format

5366 msgid "failed to add packfile '%s'"

5371 -msgstr "添加包文件 '%s' 失败"

5367 +msgstr "无法添加包文件 '%s'"

5368

5373 -#: midx.c:508

5369 +#: midx.c:511

5370 #, c-format

5371 msgid "failed to open pack-index '%s'"

5376 -msgstr "打开包索引 '%s' 失败"

5372 +msgstr "无法打开包索引 '%s'"

5373

5378 -#: midx.c:576

5374 +#: midx.c:579

5375 #, c-format

5376 msgid "failed to locate object %d in packfile"

5381 -msgstr "在包文件中定位对象 %d 失败"

5377 +msgstr "无法在包文件中定位对象 %d"

5378

5383 -#: midx.c:892

5379 +#: midx.c:895

5380 msgid "cannot store reverse index file"

5381 msgstr "无法存储反向索引文件"

5382

5387 -#: midx.c:990

5383 +#: midx.c:993

5384 #, c-format

5385 msgid "could not parse line: %s"

5390 -msgstr "不能解析行： %s"

5386 +msgstr "不能解析行：%s"

5387

5392 -#: midx.c:992

5388 +#: midx.c:995

5389 #, c-format

5390 msgid "malformed line: %s"

5391 msgstr "格式错误的行：%s"

5392

5397 -#: midx.c:1159

5393 +#: midx.c:1162

5394 msgid "ignoring existing multi-pack-index; checksum mismatch"

5395 msgstr "忽略已存在的多包索引，校验码不匹配"

5396

5401 -#: midx.c:1184

5397 +#: midx.c:1187

5398 msgid "could not load pack"

5399 msgstr "不能载入包"

5400

5405 -#: midx.c:1190

5401 +#: midx.c:1193

5402 #, c-format

5403 msgid "could not open index for %s"

5404 msgstr "不能打开 %s 的索引"

5405

5410 -#: midx.c:1201

5406 +#: midx.c:1204

5407 msgid "Adding packfiles to multi-pack-index"

5408 msgstr "添加包文件到多包索引"

5409

5414 -#: midx.c:1244

5410 +#: midx.c:1247

5411 #, c-format

5412 msgid "unknown preferred pack: '%s'"

5413 msgstr "未知的首选包：'%s'"

5414

5419 -#: midx.c:1289

5415 +#: midx.c:1292

5416 #, c-format

5417 msgid "cannot select preferred pack %s with no objects"

5418 msgstr "不能选择没有对象的首选包 %s"

5419

5424 -#: midx.c:1321

5420 +#: midx.c:1324

5421 #, c-format

5422 msgid "did not see pack-file %s to drop"

5423 msgstr "没有看到要丢弃的包文件 %s"

5424

5429 -#: midx.c:1367

5425 +#: midx.c:1370

5426 #, c-format

5427 msgid "preferred pack '%s' is expired"

5428 msgstr "首选包 '%s' 已过期"

5429

5434 -#: midx.c:1380

5430 +#: midx.c:1383

5431 msgid "no pack files to index."

5432 msgstr "没有要索引的包文件。"

5433

5438 -#: midx.c:1417

5434 +#: midx.c:1420

5435 msgid "could not write multi-pack bitmap"

5436 msgstr "无法写入多包位图"

5437

5442 -#: midx.c:1427

5438 +#: midx.c:1430

5439 msgid "could not write multi-pack-index"

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

5441

5446 -#: midx.c:1486 builtin/clean.c:37

5442 +#: midx.c:1489 builtin/clean.c:37

5443 #, c-format

5444 msgid "failed to remove %s"

5449 -msgstr "删除 %s 失败"

5445 +msgstr "无法删除 %s"

5446

5451 -#: midx.c:1517

5447 +#: midx.c:1522

5448 #, c-format

5449 msgid "failed to clear multi-pack-index at %s"

5454 -msgstr "清理位于 %s 的多包索引失败"

5450 +msgstr "无法清理位于 %s 的多包索引"

5451

5456 -#: midx.c:1577

5452 +#: midx.c:1585

5453 msgid "multi-pack-index file exists, but failed to parse"

5454 msgstr "多包索引文件存在，但无法解析"

5455

5460 -#: midx.c:1585

5456 +#: midx.c:1593

5457 msgid "incorrect checksum"

5458 msgstr "不正确的校验码"

5459

5464 -#: midx.c:1588

5460 +#: midx.c:1596

5461 msgid "Looking for referenced packfiles"

5462 msgstr "正在查找引用的包文件"

5463

5468 -#: midx.c:1603

5464 +#: midx.c:1611

5465 #, c-format

5466 msgid ""

5467 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5468 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5469

5474 -#: midx.c:1608

5470 +#: midx.c:1616

5471 msgid "the midx contains no oid"

5472 msgstr "midx 不包含 oid"

5473

5478 -#: midx.c:1617

5474 +#: midx.c:1625

5475 msgid "Verifying OID order in multi-pack-index"

5476 msgstr "校验多包索引中的 OID 顺序"

5477

5482 -#: midx.c:1626

5478 +#: midx.c:1634

5479 #, c-format

5480 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5481 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"

5482

5487 -#: midx.c:1646

5483 +#: midx.c:1654

5484 msgid "Sorting objects by packfile"

5485 msgstr "通过包文件为对象排序"

5486

5491 -#: midx.c:1653

5487 +#: midx.c:1661

5488 msgid "Verifying object offsets"

5489 msgstr "校验对象偏移"

5490

5495 -#: midx.c:1669

5491 +#: midx.c:1677

5492 #, c-format

5493 msgid "failed to load pack entry for oid[%d] = %s"

5498 -msgstr "为 oid[%d] = %s 加载包条目失败"

5494 +msgstr "无法为 oid[%d] = %s 加载包条目"

5495

5500 -#: midx.c:1675

5496 +#: midx.c:1683

5497 #, c-format

5498 msgid "failed to load pack-index for packfile %s"

5503 -msgstr "为包文件 %s 加载包索引失败"

5499 +msgstr "无法为包文件 %s 加载包索引"

5500

5505 -#: midx.c:1684

5501 +#: midx.c:1692

5502 #, c-format

5503 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5504 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

5505

5510 -#: midx.c:1709

5506 +#: midx.c:1719

5507 msgid "Counting referenced objects"

5508 msgstr "正在对引用对象计数"

5509

5514 -#: midx.c:1719

5510 +#: midx.c:1729

5511 msgid "Finding and deleting unreferenced packfiles"

5512 msgstr "正在查找和删除未引用的包文件"

5513

5518 -#: midx.c:1911

5514 +#: midx.c:1921

5515 msgid "could not start pack-objects"

5516 msgstr "不能开始 pack-objects"

5517

5522 -#: midx.c:1931

5518 +#: midx.c:1941

5519 msgid "could not finish pack-objects"

5520 msgstr "不能结束 pack-objects"

5521

@@ -5577,257 +5573,257 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

5573 msgid "Bad %s value: '%s'"

5574 msgstr "坏的 %s 值：'%s'"

5575

5580 -#: object-file.c:459

5576 +#: object-file.c:456

5577 #, c-format

5578 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5579 msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"

5580

5585 -#: object-file.c:517

5581 +#: object-file.c:514

5582 #, c-format

5583 msgid "unable to normalize alternate object path: %s"

5584 msgstr "无法规范化备用对象路径：%s"

5585

5590 -#: object-file.c:591

5586 +#: object-file.c:588

5587 #, c-format

5588 msgid "%s: ignoring alternate object stores, nesting too deep"

5589 msgstr "%s：忽略备用对象库，嵌套太深"

5590

5595 -#: object-file.c:598

5591 +#: object-file.c:595

5592 #, c-format

5593 msgid "unable to normalize object directory: %s"

5594 msgstr "无法规范化对象目录: %s"

5595

5600 -#: object-file.c:641

5596 +#: object-file.c:638

5597 msgid "unable to fdopen alternates lockfile"

5598 msgstr "无法 fdopen 替换锁文件"

5599

5604 -#: object-file.c:659

5600 +#: object-file.c:656

5601 msgid "unable to read alternates file"

5602 msgstr "无法读取替代文件"

5603

5608 -#: object-file.c:666

5604 +#: object-file.c:663

5605 msgid "unable to move new alternates file into place"

5606 msgstr "无法将新的替代文件移动到位"

5607

5612 -#: object-file.c:701

5608 +#: object-file.c:741

5609 #, c-format

5610 msgid "path '%s' does not exist"

5611 msgstr "路径 '%s' 不存在"

5612

5617 -#: object-file.c:722

5613 +#: object-file.c:762

5614 #, c-format

5615 msgid "reference repository '%s' as a linked checkout is not supported yet."

5616 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

5617

5622 -#: object-file.c:728

5618 +#: object-file.c:768

5619 #, c-format

5620 msgid "reference repository '%s' is not a local repository."

5621 msgstr "参考仓库 '%s' 不是一个本地仓库。"

5622

5627 -#: object-file.c:734

5623 +#: object-file.c:774

5624 #, c-format

5625 msgid "reference repository '%s' is shallow"

5626 msgstr "参考仓库 '%s' 是一个浅克隆"

5627

5632 -#: object-file.c:742

5628 +#: object-file.c:782

5629 #, c-format

5630 msgid "reference repository '%s' is grafted"

5631 msgstr "参考仓库 '%s' 已被移植"

5632

5637 -#: object-file.c:773

5633 +#: object-file.c:813

5634 #, c-format

5635 msgid "could not find object directory matching %s"

5636 msgstr "无法找到和 %s 匹配的对象目录"

5637

5642 -#: object-file.c:823

5638 +#: object-file.c:863

5639 #, c-format

5640 msgid "invalid line while parsing alternate refs: %s"

5641 msgstr "解析备用引用时无效的行：%s"

5642

5647 -#: object-file.c:973

5643 +#: object-file.c:1013

5644 #, c-format

5645 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5646 msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"

5647

5652 -#: object-file.c:1008

5648 +#: object-file.c:1048

5649 #, c-format

5650 msgid "mmap failed%s"

5651 msgstr "mmap 失败%s"

5652

5657 -#: object-file.c:1174

5653 +#: object-file.c:1214

5654 #, c-format

5655 msgid "object file %s is empty"

5656 msgstr "对象文件 %s 为空"

5657

5662 -#: object-file.c:1293 object-file.c:2499

5658 +#: object-file.c:1333 object-file.c:2542

5659 #, c-format

5660 msgid "corrupt loose object '%s'"

5661 msgstr "损坏的松散对象 '%s'"

5662

5667 -#: object-file.c:1295 object-file.c:2503

5663 +#: object-file.c:1335 object-file.c:2546

5664 #, c-format

5665 msgid "garbage at end of loose object '%s'"

5666 msgstr "松散对象 '%s' 后面有垃圾数据"

5667

5672 -#: object-file.c:1417

5668 +#: object-file.c:1457

5669 #, c-format

5670 msgid "unable to parse %s header"

5671 msgstr "无法解析 %s 头部"

5672

5677 -#: object-file.c:1419

5673 +#: object-file.c:1459

5674 msgid "invalid object type"

5675 msgstr "无效的对象类型"

5676

5681 -#: object-file.c:1430

5677 +#: object-file.c:1470

5678 #, c-format

5679 msgid "unable to unpack %s header"

5680 msgstr "无法解开 %s 头部"

5681

5686 -#: object-file.c:1434

5682 +#: object-file.c:1474

5683 #, c-format

5684 msgid "header for %s too long, exceeds %d bytes"

5685 msgstr "%s 的头部太长，超出了 %d 字节"

5686

5691 -#: object-file.c:1664

5687 +#: object-file.c:1704

5688 #, c-format

5689 msgid "failed to read object %s"

5694 -msgstr "读取对象 %s 失败"

5690 +msgstr "无法读取对象 %s"

5691

5696 -#: object-file.c:1668

5692 +#: object-file.c:1708

5693 #, c-format

5694 msgid "replacement %s not found for %s"

5695 msgstr "找不到 %2$s 的替代 %1$s"

5696

5701 -#: object-file.c:1672

5697 +#: object-file.c:1712

5698 #, c-format

5699 msgid "loose object %s (stored in %s) is corrupt"

5700 msgstr "松散对象 %s（保存在 %s）已损坏"

5701

5706 -#: object-file.c:1676

5702 +#: object-file.c:1716

5703 #, c-format

5704 msgid "packed object %s (stored in %s) is corrupt"

5705 msgstr "打包对象 %s（保存在 %s）已损坏"

5706

5711 -#: object-file.c:1781

5707 +#: object-file.c:1821

5708 #, c-format

5709 msgid "unable to write file %s"

5710 msgstr "无法写文件 %s"

5711

5716 -#: object-file.c:1788

5712 +#: object-file.c:1828

5713 #, c-format

5714 msgid "unable to set permission to '%s'"

5715 msgstr "无法为 '%s' 设置权限"

5716

5721 -#: object-file.c:1795

5717 +#: object-file.c:1835

5718 msgid "file write error"

5719 msgstr "文件写错误"

5720

5725 -#: object-file.c:1815

5721 +#: object-file.c:1858

5722 msgid "error when closing loose object file"

5723 msgstr "关闭松散对象文件时出错"

5724

5729 -#: object-file.c:1882

5725 +#: object-file.c:1925

5726 #, c-format

5727 msgid "insufficient permission for adding an object to repository database %s"

5728 msgstr "权限不足，无法在仓库对象库 %s 中添加对象"

5729

5734 -#: object-file.c:1884

5730 +#: object-file.c:1927

5731 msgid "unable to create temporary file"

5732 msgstr "无法创建临时文件"

5733

5738 -#: object-file.c:1908

5734 +#: object-file.c:1951

5735 msgid "unable to write loose object file"

5736 msgstr "不能写松散对象文件"

5737

5742 -#: object-file.c:1914

5738 +#: object-file.c:1957

5739 #, c-format

5740 msgid "unable to deflate new object %s (%d)"

5741 msgstr "不能压缩新对象 %s（%d）"

5742

5747 -#: object-file.c:1918

5743 +#: object-file.c:1961

5744 #, c-format

5745 msgid "deflateEnd on object %s failed (%d)"

5746 msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"

5747

5752 -#: object-file.c:1922

5748 +#: object-file.c:1965

5749 #, c-format

5750 msgid "confused by unstable object source data for %s"

5751 msgstr "被 %s 的不稳定对象源数据搞糊涂了"

5752

5757 -#: object-file.c:1933 builtin/pack-objects.c:1243

5753 +#: object-file.c:1976 builtin/pack-objects.c:1243

5754 #, c-format

5755 msgid "failed utime() on %s"

5756 msgstr "在 %s 上调用 utime() 失败"

5757

5762 -#: object-file.c:2011

5758 +#: object-file.c:2054

5759 #, c-format

5760 msgid "cannot read object for %s"

5761 msgstr "不能读取对象 %s"

5762

5767 -#: object-file.c:2062

5763 +#: object-file.c:2105

5764 msgid "corrupt commit"

5765 msgstr "损坏的提交"

5766

5771 -#: object-file.c:2070

5767 +#: object-file.c:2113

5768 msgid "corrupt tag"

5769 msgstr "损坏的标签"

5770

5775 -#: object-file.c:2170

5771 +#: object-file.c:2213

5772 #, c-format

5773 msgid "read error while indexing %s"

5774 msgstr "索引 %s 时读取错误"

5775

5780 -#: object-file.c:2173

5776 +#: object-file.c:2216

5777 #, c-format

5778 msgid "short read while indexing %s"

5779 msgstr "索引 %s 时读入不完整"

5780

5785 -#: object-file.c:2246 object-file.c:2256

5781 +#: object-file.c:2289 object-file.c:2299

5782 #, c-format

5783 msgid "%s: failed to insert into database"

5788 -msgstr "%s：插入数据库失败"

5784 +msgstr "%s：无法插入数据库"

5785

5790 -#: object-file.c:2262

5786 +#: object-file.c:2305

5787 #, c-format

5788 msgid "%s: unsupported file type"

5789 msgstr "%s：不支持的文件类型"

5790

5795 -#: object-file.c:2286 builtin/fetch.c:1445

5791 +#: object-file.c:2329 builtin/fetch.c:1448

5792 #, c-format

5793 msgid "%s is not a valid object"

5794 msgstr "%s 不是一个有效的对象"

5795

5800 -#: object-file.c:2288

5796 +#: object-file.c:2331

5797 #, c-format

5798 msgid "%s is not a valid '%s' object"

5799 msgstr "%s 不是一个有效的 '%s' 对象"

5800

5805 -#: object-file.c:2315

5801 +#: object-file.c:2358

5802 #, c-format

5803 msgid "unable to open %s"

5804 msgstr "不能打开 %s"

5805

5810 -#: object-file.c:2510

5806 +#: object-file.c:2553

5807 #, c-format

5808 msgid "hash mismatch for %s (expected %s)"

5809 msgstr "%s 的哈希值不匹配（预期 %s）"

5810

5815 -#: object-file.c:2533

5811 +#: object-file.c:2576

5812 #, c-format

5813 msgid "unable to mmap %s"

5814 msgstr "不能 mmap %s"

5815

5820 -#: object-file.c:2539

5816 +#: object-file.c:2582

5817 #, c-format

5818 msgid "unable to unpack header of %s"

5819 msgstr "无法解压缩 %s 的头部"

5820

5825 -#: object-file.c:2544

5821 +#: object-file.c:2587

5822 #, c-format

5823 msgid "unable to parse header of %s"

5824 msgstr "无法解析 %s 的头部"

5825

5830 -#: object-file.c:2555

5826 +#: object-file.c:2598

5827 #, c-format

5828 msgid "unable to unpack contents of %s"

5829 msgstr "无法解压缩 %s 的内容"

@@ -5953,25 +5949,25 @@ msgstr "不能解析对象：%s"

5949 msgid "hash mismatch %s"

5950 msgstr "哈希值与 %s 不匹配"

5951

5956 -#: pack-bitmap.c:348

5952 +#: pack-bitmap.c:353

5953 msgid "multi-pack bitmap is missing required reverse index"

5954 msgstr "多包位图缺少必需的反向索引"

5955

5960 -#: pack-bitmap.c:424

5956 +#: pack-bitmap.c:429

5957 msgid "load_reverse_index: could not open pack"

5958 msgstr "load_reverse_index：无法打开包"

5959

5964 -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424

5960 +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424

5961 #, c-format

5962 msgid "unable to get size of %s"

5963 msgstr "无法得到 %s 的大小"

5964

5969 -#: pack-bitmap.c:1916

5965 +#: pack-bitmap.c:1935

5966 #, c-format

5967 msgid "could not find %s in pack %s at offset %<PRIuMAX>"

5968 msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"

5969

5974 -#: pack-bitmap.c:1952 builtin/rev-list.c:92

5970 +#: pack-bitmap.c:1971 builtin/rev-list.c:92

5971 #, c-format

5972 msgid "unable to get disk usage of %s"

5973 msgstr "无法得到 %s 的磁盘使用量"

@@ -6020,45 +6016,50 @@ msgstr "无法设置 %s 为可读"

6016 msgid "could not write '%s' promisor file"

6017 msgstr "无法写入 '%s' 承诺者文件"

6018

6023 -#: packfile.c:626

6019 +#: packfile.c:627

6020 msgid "offset before end of packfile (broken .idx?)"

6021 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

6022

6027 -#: packfile.c:656

6023 +#: packfile.c:657

6024 #, c-format

6025 msgid "packfile %s cannot be mapped%s"

6026 msgstr "包文件 %s 不能被映射%s"

6027

6032 -#: packfile.c:1923

6028 +#: packfile.c:1924

6029 #, c-format

6030 msgid "offset before start of pack index for %s (corrupt index?)"

6031 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

6032

6037 -#: packfile.c:1927

6033 +#: packfile.c:1928

6034 #, c-format

6035 msgid "offset beyond end of pack index for %s (truncated index?)"

6036 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

6037

6042 -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175

6038 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175

6039 #, c-format

6040 msgid "option `%s' expects a numerical value"

6041 msgstr "选项 `%s' 期望一个数字值"

6042

6047 -#: parse-options-cb.c:41

6043 +#: parse-options-cb.c:42

6044 #, c-format

6045 msgid "malformed expiration date '%s'"

6046 msgstr "格式错误的到期时间：'%s'"

6047

6052 -#: parse-options-cb.c:54

6048 +#: parse-options-cb.c:55

6049 #, c-format

6050 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

6051 msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

6052

6057 -#: parse-options-cb.c:132 parse-options-cb.c:149

6053 +#: parse-options-cb.c:133 parse-options-cb.c:150

6054 #, c-format

6055 msgid "malformed object name '%s'"

6056 msgstr "格式错误的对象名 '%s'"

6057

6058 +#: parse-options-cb.c:307

6059 +#, c-format

6060 +msgid "option `%s' expects \"%s\" or \"%s\""

6061 +msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""

6062 +

6063 #: parse-options.c:58

6064 #, c-format

6065 msgid "%s requires a value"

@@ -6094,36 +6095,36 @@ msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"

6095 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

6096 msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

6097

6097 -#: parse-options.c:427 parse-options.c:435

6098 +#: parse-options.c:428 parse-options.c:436

6099 #, c-format

6100 msgid "did you mean `--%s` (with two dashes)?"

6101 msgstr "您的意思是 `--%s`（有两个短线）？"

6102

6102 -#: parse-options.c:677 parse-options.c:1053

6103 +#: parse-options.c:678 parse-options.c:1054

6104 #, c-format

6105 msgid "alias of --%s"

6106 msgstr "--%s 的别名"

6107

6107 -#: parse-options.c:891

6108 +#: parse-options.c:892

6109 #, c-format

6110 msgid "unknown option `%s'"

6111 msgstr "未知选项 `%s'"

6112

6112 -#: parse-options.c:893

6113 +#: parse-options.c:894

6114 #, c-format

6115 msgid "unknown switch `%c'"

6116 msgstr "未知开关 `%c'"

6117

6117 -#: parse-options.c:895

6118 +#: parse-options.c:896

6119 #, c-format

6120 msgid "unknown non-ascii option in string: `%s'"

6121 msgstr "字符串中未知的非 ascii 字符选项：`%s'"

6122

6122 -#: parse-options.c:919

6123 +#: parse-options.c:920

6124 msgid "..."

6125 msgstr "..."

6126

6126 -#: parse-options.c:933

6127 +#: parse-options.c:934

6128 #, c-format

6129 msgid "usage: %s"

6130 msgstr "用法：%s"

@@ -6131,7 +6132,7 @@ msgstr "用法：%s"

6132 #. TRANSLATORS: the colon here should align with the

6133 #. one in "usage: %s" translation.

6134 #.

6134 -#: parse-options.c:948

6135 +#: parse-options.c:949

6136 #, c-format

6137 msgid " or: %s"

6138 msgstr " 或：%s"

@@ -6155,18 +6156,18 @@ msgstr " 或：%s"

6156 #. translated) N_() usage string, which contained embedded

6157 #. newlines before we split it up.

6158 #.

6158 -#: parse-options.c:969

6159 +#: parse-options.c:970

6160 #, c-format

6161 msgid "%*s%s"

6162 msgstr "%*s%s"

6163

6164 # 译者：为保证在输出中对齐，注意调整句中空格！

6164 -#: parse-options.c:992

6165 +#: parse-options.c:993

6166 #, c-format

6167 msgid " %s"

6168 msgstr " %s"

6169

6169 -#: parse-options.c:1039

6170 +#: parse-options.c:1040

6171 msgid "-NUM"

6172 msgstr "-数字"

6173

@@ -6292,17 +6293,17 @@ msgstr "读取错误"

6293 msgid "the remote end hung up unexpectedly"

6294 msgstr "远端意外挂断了"

6295

6295 -#: pkt-line.c:390 pkt-line.c:392

6296 +#: pkt-line.c:417 pkt-line.c:419

6297 #, c-format

6298 msgid "protocol error: bad line length character: %.4s"

6299 msgstr "协议错误：错误的行长度字符串：%.4s"

6300

6300 -#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417

6301 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444

6302 #, c-format

6303 msgid "protocol error: bad line length %d"

6304 msgstr "协议错误：错误的行长度 %d"

6305

6305 -#: pkt-line.c:434 sideband.c:165

6306 +#: pkt-line.c:472 sideband.c:165

6307 #, c-format

6308 msgid "remote error: %s"

6309 msgstr "远程错误：%s"

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

6354 msgid "could not read `log` output"

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

6356

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

6357 +#: range-diff.c:97 sequencer.c:5602

6358 #, c-format

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

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

@@ -6372,61 +6373,57 @@ msgstr "无法解析 git 头 '%.*s'"

6373

6374 #: range-diff.c:304

6375 msgid "failed to generate diff"

6375 -msgstr "生成 diff 失败"

6376 -

6377 -#: range-diff.c:559

6378 -msgid "--left-only and --right-only are mutually exclusive"

6379 -msgstr "--left-only 和 --right-only 互斥"

6376 +msgstr "无法生成 diff"

6377

6378 #: range-diff.c:562 range-diff.c:564

6379 #, c-format

6380 msgid "could not parse log for '%s'"

6381 msgstr "不能解析 '%s' 的日志"

6382

6386 -#: read-cache.c:710

6383 +#: read-cache.c:723

6384 #, c-format

6385 msgid "will not add file alias '%s' ('%s' already exists in index)"

6386 msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"

6387

6391 -#: read-cache.c:726

6388 +#: read-cache.c:739

6389 msgid "cannot create an empty blob in the object database"

6390 msgstr "不能在对象数据库中创建空的数据对象"

6391

6395 -#: read-cache.c:748

6392 +#: read-cache.c:761

6393 #, c-format

6394 msgid "%s: can only add regular files, symbolic links or git-directories"

6395 msgstr "%s：只能添加常规文件、符号链接或 git 目录"

6396

6400 -#: read-cache.c:753 builtin/submodule--helper.c:3241

6397 +#: read-cache.c:766 builtin/submodule--helper.c:3242

6398 #, c-format

6399 msgid "'%s' does not have a commit checked out"

6400 msgstr "'%s' 没有检出一个提交"

6401

6405 -#: read-cache.c:805

6402 +#: read-cache.c:818

6403 #, c-format

6404 msgid "unable to index file '%s'"

6405 msgstr "无法索引文件 '%s'"

6406

6410 -#: read-cache.c:824

6407 +#: read-cache.c:837

6408 #, c-format

6409 msgid "unable to add '%s' to index"

6410 msgstr "无法在索引中添加 '%s'"

6411

6415 -#: read-cache.c:835

6412 +#: read-cache.c:848

6413 #, c-format

6414 msgid "unable to stat '%s'"

6415 msgstr "无法对 %s 执行 stat"

6416

6420 -#: read-cache.c:1373

6417 +#: read-cache.c:1386

6418 #, c-format

6419 msgid "'%s' appears as both a file and as a directory"

6420 msgstr "'%s' 看起来既是文件又是目录"

6421

6425 -#: read-cache.c:1588

6422 +#: read-cache.c:1601

6423 msgid "Refresh index"

6424 msgstr "刷新索引"

6425

6429 -#: read-cache.c:1720

6426 +#: read-cache.c:1733

6427 #, c-format

6428 msgid ""

6429 "index.version set, but the value is invalid.\n"

@@ -6435,7 +6432,7 @@ msgstr ""

6432 "设置了 index.version，但是取值无效。\n"

6433 "使用版本 %i"

6434

6438 -#: read-cache.c:1730

6435 +#: read-cache.c:1743

6436 #, c-format

6437 msgid ""

6438 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -6444,144 +6441,144 @@ msgstr ""

6441 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

6442 "使用版本 %i"

6443

6447 -#: read-cache.c:1786

6444 +#: read-cache.c:1799

6445 #, c-format

6446 msgid "bad signature 0x%08x"

6447 msgstr "坏的签名 0x%08x"

6448

6452 -#: read-cache.c:1789

6449 +#: read-cache.c:1802

6450 #, c-format

6451 msgid "bad index version %d"

6452 msgstr "坏的索引版本 %d"

6453

6457 -#: read-cache.c:1798

6454 +#: read-cache.c:1811

6455 msgid "bad index file sha1 signature"

6456 msgstr "坏的索引文件 sha1 签名"

6457

6461 -#: read-cache.c:1832

6458 +#: read-cache.c:1845

6459 #, c-format

6460 msgid "index uses %.4s extension, which we do not understand"

6461 msgstr "索引使用不被支持的 %.4s 扩展"

6462

6463 #

6467 -#: read-cache.c:1834

6464 +#: read-cache.c:1847

6465 #, c-format

6466 msgid "ignoring %.4s extension"

6467 msgstr "忽略 %.4s 扩展"

6468

6472 -#: read-cache.c:1871

6469 +#: read-cache.c:1884

6470 #, c-format

6471 msgid "unknown index entry format 0x%08x"

6472 msgstr "未知的索引条目格式 0x%08x"

6473

6477 -#: read-cache.c:1887

6474 +#: read-cache.c:1900

6475 #, c-format

6476 msgid "malformed name field in the index, near path '%s'"

6477 msgstr "索引中靠近路径 '%s' 有错误的名称字段"

6478

6482 -#: read-cache.c:1944

6479 +#: read-cache.c:1957

6480 msgid "unordered stage entries in index"

6481 msgstr "索引中有未排序的暂存条目"

6482

6486 -#: read-cache.c:1947

6483 +#: read-cache.c:1960

6484 #, c-format

6485 msgid "multiple stage entries for merged file '%s'"

6486 msgstr "合并文件 '%s' 有多个暂存条目"

6487

6491 -#: read-cache.c:1950

6488 +#: read-cache.c:1963

6489 #, c-format

6490 msgid "unordered stage entries for '%s'"

6491 msgstr "'%s' 的未排序暂存条目"

6492

6496 -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095

6497 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183

6498 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987

6493 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095

6494 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183

6495 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013

6496 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519

6500 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293

6501 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201

6497 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293

6498 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202

6499 msgid "index file corrupt"

6500 msgstr "索引文件损坏"

6501

6505 -#: read-cache.c:2209

6502 +#: read-cache.c:2222

6503 #, c-format

6504 msgid "unable to create load_cache_entries thread: %s"

6505 msgstr "无法创建 load_cache_entries 线程：%s"

6506

6510 -#: read-cache.c:2222

6507 +#: read-cache.c:2235

6508 #, c-format

6509 msgid "unable to join load_cache_entries thread: %s"

6510 msgstr "无法加入 load_cache_entries 线程：%s"

6511

6515 -#: read-cache.c:2255

6512 +#: read-cache.c:2268

6513 #, c-format

6514 msgid "%s: index file open failed"

6515 msgstr "%s：打开索引文件失败"

6516

6520 -#: read-cache.c:2259

6517 +#: read-cache.c:2272

6518 #, c-format

6519 msgid "%s: cannot stat the open index"

6520 msgstr "%s：不能对打开的索引执行 stat 操作"

6521

6525 -#: read-cache.c:2263

6522 +#: read-cache.c:2276

6523 #, c-format

6524 msgid "%s: index file smaller than expected"

6525 msgstr "%s：索引文件比预期的小"

6526

6530 -#: read-cache.c:2267

6527 +#: read-cache.c:2280

6528 #, c-format

6529 msgid "%s: unable to map index file%s"

6530 msgstr "%s：无法映射索引文件%s"

6531

6535 -#: read-cache.c:2310

6532 +#: read-cache.c:2323

6533 #, c-format

6534 msgid "unable to create load_index_extensions thread: %s"

6535 msgstr "无法创建 load_index_extensions 线程：%s"

6536

6540 -#: read-cache.c:2337

6537 +#: read-cache.c:2350

6538 #, c-format

6539 msgid "unable to join load_index_extensions thread: %s"

6540 msgstr "无法加入 load_index_extensions 线程：%s"

6541

6545 -#: read-cache.c:2375

6542 +#: read-cache.c:2396

6543 #, c-format

6544 msgid "could not freshen shared index '%s'"

6545 msgstr "无法刷新共享索引 '%s'"

6546

6550 -#: read-cache.c:2434

6547 +#: read-cache.c:2455

6548 #, c-format

6549 msgid "broken index, expect %s in %s, got %s"

6550 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

6551

6555 -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147

6552 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150

6553 #, c-format

6554 msgid "could not close '%s'"

6555 msgstr "不能关闭 '%s'"

6556

6560 -#: read-cache.c:3108

6557 +#: read-cache.c:3129

6558 msgid "failed to convert to a sparse-index"

6559 msgstr "无法转换为稀疏索引"

6560

6564 -#: read-cache.c:3179

6561 +#: read-cache.c:3200

6562 #, c-format

6563 msgid "could not stat '%s'"

6564 msgstr "不能对 '%s' 调用 stat"

6565

6569 -#: read-cache.c:3192

6566 +#: read-cache.c:3213

6567 #, c-format

6568 msgid "unable to open git dir: %s"

6569 msgstr "不能打开 git 目录：%s"

6570

6574 -#: read-cache.c:3204

6571 +#: read-cache.c:3225

6572 #, c-format

6573 msgid "unable to unlink: %s"

6574 msgstr "无法删除：%s"

6575

6579 -#: read-cache.c:3233

6576 +#: read-cache.c:3254

6577 #, c-format

6578 msgid "cannot fix permission bits on '%s'"

6579 msgstr "不能修复 '%s' 的权限位"

6580

6584 -#: read-cache.c:3390

6581 +#: read-cache.c:3411

6582 #, c-format

6583 msgid "%s: cannot drop to stage #0"

6584 msgstr "%s：不能落到暂存区 #0"

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

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

6692 "\n"

6693

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

6694 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883

6695 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791

6696 #: builtin/rebase.c:190

6697 #, c-format

6698 msgid "could not write '%s'"

@@ -6734,9 +6731,9 @@ msgstr ""

6731 #: rebase.c:29

6732 #, c-format

6733 msgid "%s: 'preserve' superseded by 'merges'"

6737 -msgstr "%s： 'preserve' 被 'merges' 取代"

6734 +msgstr "%s：'preserve' 被 'merges' 取代"

6735

6739 -#: ref-filter.c:42 wt-status.c:2036

6736 +#: ref-filter.c:42 wt-status.c:2048

6737 msgid "gone"

6738 msgstr "丢失"

6739

@@ -6775,7 +6772,8 @@ msgstr "期望整数值 refname:lstrip=%s"

6772 msgid "Integer value expected refname:rstrip=%s"

6773 msgstr "期望整数值 refname:rstrip=%s"

6774

6778 -#: ref-filter.c:265

6775 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431

6776 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560

6777 #, c-format

6778 msgid "unrecognized %%(%s) argument: %s"

6779 msgstr "未能识别的 %%(%s) 参数：%s"

@@ -6785,11 +6783,6 @@ msgstr "未能识别的 %%(%s) 参数：%s"

6783 msgid "%%(objecttype) does not take arguments"

6784 msgstr "%%(objecttype) 不带参数"

6785

6788 -#: ref-filter.c:344

6789 -#, c-format

6790 -msgid "unrecognized %%(objectsize) argument: %s"

6791 -msgstr "未能识别的 %%(objectsize) 参数：%s"

6792 -

6786 #: ref-filter.c:352

6787 #, c-format

6788 msgid "%%(deltabase) does not take arguments"

@@ -6800,11 +6793,6 @@ msgstr "%%(deltabase) 不带参数"

6793 msgid "%%(body) does not take arguments"

6794 msgstr "%%(body) 不带参数"

6795

6803 -#: ref-filter.c:377

6804 -#, c-format

6805 -msgid "unrecognized %%(subject) argument: %s"

6806 -msgstr "未能识别的 %%(subject) 参数：%s"

6807 -

6796 #: ref-filter.c:396

6797 #, c-format

6798 msgid "expected %%(trailers:key=<value>)"

@@ -6820,26 +6808,11 @@ msgstr "未知的 %%(trailers) 参数：%s"

6808 msgid "positive value expected contents:lines=%s"

6809 msgstr "期望一个正数 contents:lines=%s"

6810

6823 -#: ref-filter.c:431

6824 -#, c-format

6825 -msgid "unrecognized %%(contents) argument: %s"

6826 -msgstr "未能识别的 %%(contents) 参数：%s"

6827 -

6828 -#: ref-filter.c:443

6829 -#, c-format

6830 -msgid "unrecognized %%(raw) argument: %s"

6831 -msgstr "未能识别的 %%(raw) 参数：%s"

6832 -

6811 #: ref-filter.c:458

6812 #, c-format

6813 msgid "positive value expected '%s' in %%(%s)"

6814 msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"

6815

6838 -#: ref-filter.c:462

6839 -#, c-format

6840 -msgid "unrecognized argument '%s' in %%(%s)"

6841 -msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"

6842 -

6816 #: ref-filter.c:476

6817 #, c-format

6818 msgid "unrecognized email option: %s"

@@ -6860,21 +6833,11 @@ msgstr "未能识别的位置：%s"

6833 msgid "unrecognized width:%s"

6834 msgstr "未能识别的宽度：%s"

6835

6863 -#: ref-filter.c:534

6864 -#, c-format

6865 -msgid "unrecognized %%(align) argument: %s"

6866 -msgstr "未能识别的 %%(align) 参数：%s"

6867 -

6836 #: ref-filter.c:542

6837 #, c-format

6838 msgid "positive width expected with the %%(align) atom"

6839 msgstr "元素 %%(align) 需要一个正数的宽度"

6840

6873 -#: ref-filter.c:560

6874 -#, c-format

6875 -msgid "unrecognized %%(if) argument: %s"

6876 -msgstr "未能识别的 %%(if) 参数：%s"

6877 -

6841 #: ref-filter.c:568

6842 #, c-format

6843 msgid "%%(rest) does not take arguments"

@@ -6896,15 +6859,10 @@ msgid ""

6859 "not a git repository, but the field '%.*s' requires access to object data"

6860 msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"

6861

6899 -#: ref-filter.c:844

6900 -#, c-format

6901 -msgid "format: %%(if) atom used without a %%(then) atom"

6902 -msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

6903 -

6904 -#: ref-filter.c:910

6862 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948

6863 #, c-format

6906 -msgid "format: %%(then) atom used without an %%(if) atom"

6907 -msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

6864 +msgid "format: %%(%s) atom used without a %%(%s) atom"

6865 +msgstr "格式：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"

6866

6867 #: ref-filter.c:912

6868 #, c-format

@@ -6916,16 +6874,6 @@ msgstr "格式：%%(then) 元素用了多次"

6874 msgid "format: %%(then) atom used after %%(else)"

6875 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

6876

6919 -#: ref-filter.c:946

6920 -#, c-format

6921 -msgid "format: %%(else) atom used without an %%(if) atom"

6922 -msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

6923 -

6924 -#: ref-filter.c:948

6925 -#, c-format

6926 -msgid "format: %%(else) atom used without a %%(then) atom"

6927 -msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

6928 -

6877 #: ref-filter.c:950

6878 #, c-format

6879 msgid "format: %%(else) atom used more than once"

@@ -7000,22 +6948,22 @@ msgstr "格式错误的对象 '%s'"

6948 msgid "ignoring ref with broken name %s"

6949 msgstr "忽略带有错误名称 %s 的引用"

6950

7003 -#: ref-filter.c:2250 refs.c:673

6951 +#: ref-filter.c:2250 refs.c:676

6952 #, c-format

6953 msgid "ignoring broken ref %s"

6954 msgstr "忽略损坏的引用 %s"

6955

7008 -#: ref-filter.c:2623

6956 +#: ref-filter.c:2629

6957 #, c-format

6958 msgid "format: %%(end) atom missing"

6959 msgstr "格式：缺少 %%(end) 元素"

6960

7013 -#: ref-filter.c:2726

6961 +#: ref-filter.c:2740

6962 #, c-format

6963 msgid "malformed object name %s"

6964 msgstr "格式错误的对象名 %s"

6965

7018 -#: ref-filter.c:2731

6966 +#: ref-filter.c:2745

6967 #, c-format

6968 msgid "option `%s' must point to a commit"

6969 msgstr "选项 `%s' 必须指向一个提交"

@@ -7059,71 +7007,71 @@ msgstr "无法获取 `%s`"

7007 msgid "invalid branch name: %s = %s"

7008 msgstr "无效的分支名：%s = %s"

7009

7062 -#: refs.c:671

7010 +#: refs.c:674

7011 #, c-format

7012 msgid "ignoring dangling symref %s"

7013 msgstr "忽略悬空符号引用 %s"

7014

7067 -#: refs.c:920

7015 +#: refs.c:925

7016 #, c-format

7017 msgid "log for ref %s has gap after %s"

7018 msgstr "引用 %s 的日志在 %s 之后有缺口"

7019

7072 -#: refs.c:927

7020 +#: refs.c:932

7021 #, c-format

7022 msgid "log for ref %s unexpectedly ended on %s"

7023 msgstr "引用 %s 的日志意外终止于 %s "

7024

7077 -#: refs.c:992

7025 +#: refs.c:997

7026 #, c-format

7027 msgid "log for %s is empty"

7028 msgstr "%s 的日志为空"

7029

7082 -#: refs.c:1084

7030 +#: refs.c:1090

7031 #, c-format

7032 msgid "refusing to update ref with bad name '%s'"

7033 msgstr "拒绝更新有错误名称 '%s' 的引用"

7034

7087 -#: refs.c:1155

7035 +#: refs.c:1168

7036 #, c-format

7037 msgid "update_ref failed for ref '%s': %s"

7038 msgstr "对引用 '%s' 执行 update_ref 失败：%s"

7039

7092 -#: refs.c:2062

7040 +#: refs.c:2069

7041 #, c-format

7042 msgid "multiple updates for ref '%s' not allowed"

7043 msgstr "不允许对引用 '%s' 多次更新"

7044

7097 -#: refs.c:2142

7045 +#: refs.c:2152

7046 msgid "ref updates forbidden inside quarantine environment"

7047 msgstr "在隔离环境中禁止更新引用"

7048

7101 -#: refs.c:2153

7049 +#: refs.c:2163

7050 msgid "ref updates aborted by hook"

7051 msgstr "引用更新被钩子中止"

7052

7105 -#: refs.c:2253 refs.c:2283

7053 +#: refs.c:2271 refs.c:2301

7054 #, c-format

7055 msgid "'%s' exists; cannot create '%s'"

7056 msgstr "'%s' 已存在，无法创建 '%s'"

7057

7110 -#: refs.c:2259 refs.c:2294

7058 +#: refs.c:2277 refs.c:2312

7059 #, c-format

7060 msgid "cannot process '%s' and '%s' at the same time"

7061 msgstr "无法同时处理 '%s' 和 '%s'"

7062

7115 -#: refs/files-backend.c:1271

7063 +#: refs/files-backend.c:1268

7064 #, c-format

7065 msgid "could not remove reference %s"

7066 msgstr "无法删除引用 %s"

7067

7120 -#: refs/files-backend.c:1285 refs/packed-backend.c:1549

7068 +#: refs/files-backend.c:1282 refs/packed-backend.c:1549

7069 #: refs/packed-backend.c:1559

7070 #, c-format

7071 msgid "could not delete reference %s: %s"

7072 msgstr "无法删除引用 %s：%s"

7073

7126 -#: refs/files-backend.c:1288 refs/packed-backend.c:1562

7074 +#: refs/files-backend.c:1285 refs/packed-backend.c:1562

7075 #, c-format

7076 msgid "could not delete references: %s"

7077 msgstr "无法删除引用：%s"

@@ -7133,50 +7081,50 @@ msgstr "无法删除引用：%s"

7081 msgid "invalid refspec '%s'"

7082 msgstr "无效的引用规格：'%s'"

7083

7136 -#: remote.c:351

7084 +#: remote.c:402

7085 #, c-format

7086 msgid "config remote shorthand cannot begin with '/': %s"

7087 msgstr "配置的远程短名称不能以 '/' 开始：%s"

7088

7141 -#: remote.c:399

7089 +#: remote.c:450

7090 msgid "more than one receivepack given, using the first"

7091 msgstr "提供了一个以上的 receivepack，使用第一个"

7092

7145 -#: remote.c:407

7093 +#: remote.c:458

7094 msgid "more than one uploadpack given, using the first"

7095 msgstr "提供了一个以上的 uploadpack，使用第一个"

7096

7149 -#: remote.c:590

7097 +#: remote.c:699

7098 #, c-format

7099 msgid "Cannot fetch both %s and %s to %s"

7100 msgstr "不能同时获取 %s 和 %s 至 %s"

7101

7154 -#: remote.c:594

7102 +#: remote.c:703

7103 #, c-format

7104 msgid "%s usually tracks %s, not %s"

7105 msgstr "%s 通常跟踪 %s，而非 %s"

7106

7159 -#: remote.c:598

7107 +#: remote.c:707

7108 #, c-format

7109 msgid "%s tracks both %s and %s"

7110 msgstr "%s 同时跟踪 %s 和 %s"

7111

7164 -#: remote.c:666

7112 +#: remote.c:775

7113 #, c-format

7114 msgid "key '%s' of pattern had no '*'"

7115 msgstr "模式的键 '%s' 没有 '*'"

7116

7169 -#: remote.c:676

7117 +#: remote.c:785

7118 #, c-format

7119 msgid "value '%s' of pattern has no '*'"

7120 msgstr "模式的值 '%s' 没有 '*'"

7121

7174 -#: remote.c:1083

7122 +#: remote.c:1192

7123 #, c-format

7124 msgid "src refspec %s does not match any"

7125 msgstr "源引用规格 %s 没有匹配"

7126

7179 -#: remote.c:1088

7127 +#: remote.c:1197

7128 #, c-format

7129 msgid "src refspec %s matches more than one"

7130 msgstr "源引用规格 %s 匹配超过一个"

@@ -7185,7 +7133,7 @@ msgstr "源引用规格 %s 匹配超过一个"

7133 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

7134 #. the <src>.

7135 #.

7188 -#: remote.c:1103

7136 +#: remote.c:1212

7137 #, c-format

7138 msgid ""

7139 "The destination you provided is not a full refname (i.e.,\n"

@@ -7207,7 +7155,7 @@ msgstr ""

7155 "\n"

7156 "都不行，所以我们已放弃。您必须给出完整的引用。"

7157

7210 -#: remote.c:1123

7158 +#: remote.c:1232

7159 #, c-format

7160 msgid ""

7161 "The <src> part of the refspec is a commit object.\n"

@@ -7217,7 +7165,7 @@ msgstr ""

7165 "引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"

7166 "'%s:refs/heads/%s' 推送么？"

7167

7220 -#: remote.c:1128

7168 +#: remote.c:1237

7169 #, c-format

7170 msgid ""

7171 "The <src> part of the refspec is a tag object.\n"

@@ -7227,7 +7175,7 @@ msgstr ""

7175 "引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"

7176 "'%s:refs/tags/%s' 推送么？"

7177

7230 -#: remote.c:1133

7178 +#: remote.c:1242

7179 #, c-format

7180 msgid ""

7181 "The <src> part of the refspec is a tree object.\n"

@@ -7237,7 +7185,7 @@ msgstr ""

7185 "引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"

7186 "'%s:refs/tags/%s' 推送么？"

7187

7240 -#: remote.c:1138

7188 +#: remote.c:1247

7189 #, c-format

7190 msgid ""

7191 "The <src> part of the refspec is a blob object.\n"

@@ -7247,114 +7195,114 @@ msgstr ""

7195 "引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"

7196 "'%s:refs/tags/%s' 推送么？"

7197

7250 -#: remote.c:1174

7198 +#: remote.c:1283

7199 #, c-format

7200 msgid "%s cannot be resolved to branch"

7201 msgstr "%s 无法被解析为分支"

7202

7255 -#: remote.c:1185

7203 +#: remote.c:1294

7204 #, c-format

7205 msgid "unable to delete '%s': remote ref does not exist"

7206 msgstr "无法删除 '%s'：远程引用不存在"

7207

7260 -#: remote.c:1197

7208 +#: remote.c:1306

7209 #, c-format

7210 msgid "dst refspec %s matches more than one"

7211 msgstr "目标引用规格 %s 匹配超过一个"

7212

7265 -#: remote.c:1204

7213 +#: remote.c:1313

7214 #, c-format

7215 msgid "dst ref %s receives from more than one src"

7216 msgstr "目标引用 %s 接收超过一个源"

7217

7270 -#: remote.c:1724 remote.c:1825

7218 +#: remote.c:1834 remote.c:1941

7219 msgid "HEAD does not point to a branch"

7220 msgstr "HEAD 没有指向一个分支"

7221

7274 -#: remote.c:1733

7222 +#: remote.c:1843

7223 #, c-format

7224 msgid "no such branch: '%s'"

7225 msgstr "没有此分支：'%s'"

7226

7279 -#: remote.c:1736

7227 +#: remote.c:1846

7228 #, c-format

7229 msgid "no upstream configured for branch '%s'"

7230 msgstr "尚未给分支 '%s' 设置上游"

7231

7284 -#: remote.c:1742

7232 +#: remote.c:1852

7233 #, c-format

7234 msgid "upstream branch '%s' not stored as a remote-tracking branch"

7235 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

7236

7289 -#: remote.c:1757

7237 +#: remote.c:1867

7238 #, c-format

7239 msgid "push destination '%s' on remote '%s' has no local tracking branch"

7240 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

7241

7294 -#: remote.c:1769

7242 +#: remote.c:1882

7243 #, c-format

7244 msgid "branch '%s' has no remote for pushing"

7245 msgstr "分支 '%s' 没有设置要推送的远程服务器"

7246

7299 -#: remote.c:1779

7247 +#: remote.c:1892

7248 #, c-format

7249 msgid "push refspecs for '%s' do not include '%s'"

7250 msgstr "向 '%s' 推送引用规格未包含 '%s'"

7251

7304 -#: remote.c:1792

7252 +#: remote.c:1905

7253 msgid "push has no destination (push.default is 'nothing')"

7254 msgstr "推送无目标（push.default 是 'nothing'）"

7255

7308 -#: remote.c:1814

7256 +#: remote.c:1927

7257 msgid "cannot resolve 'simple' push to a single destination"

7258 msgstr "无法解析 'simple' 推送至一个单独的目标"

7259

7312 -#: remote.c:1943

7260 +#: remote.c:2060

7261 #, c-format

7262 msgid "couldn't find remote ref %s"

7263 msgstr "无法找到远程引用 %s"

7264

7317 -#: remote.c:1956

7265 +#: remote.c:2073

7266 #, c-format

7267 msgid "* Ignoring funny ref '%s' locally"

7268 msgstr "* 在本地忽略可笑的引用 '%s'"

7269

7322 -#: remote.c:2119

7270 +#: remote.c:2236

7271 #, c-format

7272 msgid "Your branch is based on '%s', but the upstream is gone.\n"

7273 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

7274

7327 -#: remote.c:2123

7275 +#: remote.c:2240

7276 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

7277 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

7278

7331 -#: remote.c:2126

7279 +#: remote.c:2243

7280 #, c-format

7281 msgid "Your branch is up to date with '%s'.\n"

7282 msgstr "您的分支与上游分支 '%s' 一致。\n"

7283

7336 -#: remote.c:2130

7284 +#: remote.c:2247

7285 #, c-format

7286 msgid "Your branch and '%s' refer to different commits.\n"

7287 msgstr "您的分支和 '%s' 指向不同的提交。\n"

7288

7341 -#: remote.c:2133

7289 +#: remote.c:2250

7290 #, c-format

7291 msgid " (use \"%s\" for details)\n"

7292 msgstr " （使用 \"%s\" 查看详情）\n"

7293

7346 -#: remote.c:2137

7294 +#: remote.c:2254

7295 #, c-format

7296 msgid "Your branch is ahead of '%s' by %d commit.\n"

7297 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

7298 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

7299 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

7300

7353 -#: remote.c:2143

7301 +#: remote.c:2260

7302 msgid " (use \"git push\" to publish your local commits)\n"

7303 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

7304

7357 -#: remote.c:2146

7305 +#: remote.c:2263

7306 #, c-format

7307 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

7308 msgid_plural ""

@@ -7363,11 +7311,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

7311 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

7312

7313 # 译者：注意保持前导空格

7366 -#: remote.c:2154

7314 +#: remote.c:2271

7315 msgid " (use \"git pull\" to update your local branch)\n"

7316 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

7317

7370 -#: remote.c:2157

7318 +#: remote.c:2274

7319 #, c-format

7320 msgid ""

7321 "Your branch and '%s' have diverged,\n"

@@ -7383,11 +7331,11 @@ msgstr[1] ""

7331 "并且分别有 %d 和 %d 处不同的提交。\n"

7332

7333 # 译者：注意保持前导空格

7386 -#: remote.c:2167

7334 +#: remote.c:2284

7335 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

7336 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

7337

7390 -#: remote.c:2359

7338 +#: remote.c:2476

7339 #, c-format

7340 msgid "cannot parse expected object name '%s'"

7341 msgstr "无法解析期望的对象名 '%s'"

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

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

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

7370

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

7371 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298

7372 #, c-format

7373 msgid "failed to flush '%s'"

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

7374 +msgstr "无法刷新 '%s'"

7375

7376 #: rerere.c:487 rerere.c:1023

7377 #, c-format

@@ -7465,8 +7413,8 @@ msgstr "不能删除 stray '%s'"

7413 msgid "Recorded preimage for '%s'"

7414 msgstr "为 '%s' 记录 preimage"

7415

7468 -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002

7469 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819

7416 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017

7417 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820

7418 #, c-format

7419 msgid "could not create directory '%s'"

7420 msgstr "不能创建目录 '%s'"

@@ -7474,7 +7422,7 @@ msgstr "不能创建目录 '%s'"

7422 #: rerere.c:1041

7423 #, c-format

7424 msgid "failed to update conflicted state in '%s'"

7477 -msgstr "更新 '%s' 中的冲突状态失败"

7425 +msgstr "无法更新 '%s' 中的冲突状态"

7426

7427 #: rerere.c:1052 rerere.c:1059

7428 #, c-format

@@ -7504,37 +7452,29 @@ msgstr "不能打开 rr-cache 目录"

7452 msgid "could not determine HEAD revision"

7453 msgstr "不能确定 HEAD 版本"

7454

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

7455 +#: reset.c:70 reset.c:76 sequencer.c:3700

7456 #, c-format

7457 msgid "failed to find tree of %s"

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

7459

7512 -#: revision.c:2259

7513 -msgid "--unsorted-input is incompatible with --no-walk"

7514 -msgstr "--unsorted-input 和 --no-walk 不兼容"

7515 -

7516 -#: revision.c:2346

7460 +#: revision.c:2347

7461 msgid "--unpacked=<packfile> no longer supported"

7462 msgstr "不再支持 --unpacked=<packfile>"

7463

7520 -#: revision.c:2655 revision.c:2659

7521 -msgid "--no-walk is incompatible with --unsorted-input"

7522 -msgstr "--no-walk 和 --unsorted-input 不兼容"

7523 -

7524 -#: revision.c:2690

7464 +#: revision.c:2686

7465 msgid "your current branch appears to be broken"

7466 msgstr "您的当前分支好像被损坏"

7467

7528 -#: revision.c:2693

7468 +#: revision.c:2689

7469 #, c-format

7470 msgid "your current branch '%s' does not have any commits yet"

7471 msgstr "您的当前分支 '%s' 尚无任何提交"

7472

7533 -#: revision.c:2895

7473 +#: revision.c:2891

7474 msgid "-L does not yet support diff formats besides -p and -s"

7475 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

7476

7537 -#: run-command.c:1278

7477 +#: run-command.c:1262

7478 #, c-format

7479 msgid "cannot create async thread: %s"

7480 msgstr "不能创建 async 线程：%s"

@@ -7555,7 +7495,7 @@ msgstr "远程解包失败：%s"

7495

7496 #: send-pack.c:378

7497 msgid "failed to sign the push certificate"

7558 -msgstr "为推送证书签名失败"

7498 +msgstr "无法为推送证书签名"

7499

7500 #: send-pack.c:435

7501 msgid "send-pack: unable to fork off fetch subprocess"

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

7537 msgid "could not delete '%s'"

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

7539

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

7601 -#: builtin/rm.c:408

7540 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297

7541 +#: builtin/rm.c:409

7542 #, c-format

7543 msgid "could not remove '%s'"

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

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

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

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

7598

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

7599 +#: sequencer.c:448 sequencer.c:3292

7600 #, c-format

7601 msgid "could not lock '%s'"

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

7603

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

7604 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310

7605 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639

7606 #, c-format

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

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

@@ -7672,12 +7612,18 @@ msgstr "不能写入 '%s'"

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

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

7614

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

7676 -#: sequencer.c:3574

7615 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312

7616 +#: sequencer.c:3569

7617 #, c-format

7618 msgid "failed to finalize '%s'"

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

7620

7621 +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551

7622 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148

7623 +#, c-format

7624 +msgid "could not read '%s'"

7625 +msgstr "不能读取 '%s'"

7626 +

7627 #: sequencer.c:499

7628 #, c-format

7629 msgid "your local changes would be overwritten by %s."

@@ -7692,7 +7638,7 @@ msgstr "提交您的修改或贮藏后再继续。"

7638 msgid "%s: fast-forward"

7639 msgstr "%s：快进"

7640

7695 -#: sequencer.c:574 builtin/tag.c:610

7641 +#: sequencer.c:574 builtin/tag.c:614

7642 #, c-format

7643 msgid "Invalid cleanup mode %s"

7644 msgstr "无效的清理模式 %s"

@@ -7723,8 +7669,8 @@ msgstr "在 '%.*s' 中没有 key"

7669 msgid "unable to dequote value of '%s'"

7670 msgstr "无法为 '%s' 的值去引号"

7671

7726 -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730

7727 -#: builtin/am.c:822 builtin/rebase.c:694

7672 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756

7673 +#: builtin/am.c:848 builtin/rebase.c:694

7674 #, c-format

7675 msgid "could not open '%s' for reading"

7676 msgstr "无法打开 '%s' 进行读取"

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

7733 "\n"

7734 " git rebase --continue\n"

7735

7790 -#: sequencer.c:1229

7736 +#: sequencer.c:1225

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

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

7739

7794 -#: sequencer.c:1235

7740 +#: sequencer.c:1231

7741 msgid ""

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

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

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

7761 "\n"

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

7763

7818 -#: sequencer.c:1248

7764 +#: sequencer.c:1244

7765 msgid ""

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

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

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

7784 "\n"

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

7786

7841 -#: sequencer.c:1290

7787 +#: sequencer.c:1288

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

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

7790

7845 -#: sequencer.c:1292

7791 +#: sequencer.c:1290

7792 msgid "could not parse newly created commit"

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

7794

7849 -#: sequencer.c:1338

7795 +#: sequencer.c:1339

7796 msgid "unable to resolve HEAD after creating commit"

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

7798

7853 -#: sequencer.c:1340

7799 +#: sequencer.c:1342

7800 msgid "detached HEAD"

7801 msgstr "分离头指针"

7802

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

7858 -#: sequencer.c:1344

7804 +#: sequencer.c:1346

7805 msgid " (root-commit)"

7806 msgstr "（根提交）"

7807

7862 -#: sequencer.c:1365

7808 +#: sequencer.c:1367

7809 msgid "could not parse HEAD"

7810 msgstr "不能解析 HEAD"

7811

7866 -#: sequencer.c:1367

7812 +#: sequencer.c:1369

7813 #, c-format

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

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

7816

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

7817 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708

7818 msgid "could not parse HEAD commit"

7819 msgstr "不能解析 HEAD 提交"

7820

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

7821 +#: sequencer.c:1429 sequencer.c:2314

7822 msgid "unable to parse commit author"

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

7824

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

7825 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710

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

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

7828

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

7829 +#: sequencer.c:1473 sequencer.c:1593

7830 #, c-format

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

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

7833

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

7834 +#: sequencer.c:1504 sequencer.c:1536

7835 #, c-format

7836 msgid "invalid author identity '%s'"

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

7838

7893 -#: sequencer.c:1508

7839 +#: sequencer.c:1510

7840 msgid "corrupt author: missing date information"

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

7842

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

7843 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915

7844 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78

7845 msgid "failed to write commit object"

7900 -msgstr "写提交对象失败"

7846 +msgstr "无法写提交对象"

7847

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

7848 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199

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

7850 #, c-format

7851 msgid "could not update %s"

7852 msgstr "不能更新 %s"

7853

7908 -#: sequencer.c:1623

7854 +#: sequencer.c:1625

7855 #, c-format

7856 msgid "could not parse commit %s"

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

7858

7913 -#: sequencer.c:1628

7859 +#: sequencer.c:1630

7860 #, c-format

7861 msgid "could not parse parent commit %s"

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

7863

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

7864 +#: sequencer.c:1713 sequencer.c:1994

7865 #, c-format

7866 msgid "unknown command: %d"

7867 msgstr "未知命令：%d"

7868

l10n: zh_CN: v2.35.0 round 1