349ede6ae7 · matheusbsbs/matheus-bagliano

@@ -139,8 +139,8 @@ msgid ""

139 msgstr ""

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

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

142 -"POT-Creation-Date: 2020-03-11 15:26+0800\n"

143 -"PO-Revision-Date: 2020-03-11 15:38+0800\n"

142 +"POT-Creation-Date: 2020-05-27 07:23+0800\n"

143 +"PO-Revision-Date: 2020-05-27 07:39+0800\n"

144 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

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

146 "Language: zh_CN\n"

@@ -154,9 +154,9 @@ msgstr ""

154 msgid "Huh (%s)?"

155 msgstr "嗯（%s）？"

156

157 -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124

158 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687

159 -#: builtin/rebase.c:2086 builtin/rebase.c:2130

157 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142

158 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518

159 +#: builtin/rebase.c:1919

160 msgid "could not read index"

161 msgstr "不能读取索引"

162

@@ -184,8 +184,7 @@ msgstr "更新"

184 msgid "could not stage '%s'"

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

186

187 -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317

188 -#: builtin/rebase.c:899

187 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336

188 msgid "could not write index"

189 msgstr "不能写入索引"

190

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

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

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

202

204 -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281

205 -#: builtin/reset.c:144

203 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294

204 +#: builtin/reset.c:145

205 #, c-format

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

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

@@ -325,11 +324,11 @@ msgstr "选择一个编号条目"

324 msgid "(empty) select nothing"

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

326

328 -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851

327 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851

328 msgid "*** Commands ***"

329 msgstr "*** 命令 ***"

330

332 -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848

331 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848

332 msgid "What now"

333 msgstr "请选择"

334

@@ -341,12 +340,13 @@ msgstr "缓存"

340 msgid "unstaged"

341 msgstr "未缓存"

342

344 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251

345 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144

346 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

343 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250

344 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145

345 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409

346 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

347 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

349 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213

348 +#: builtin/submodule--helper.c:2148 bugreport.c:129

349 +#: git-add--interactive.perl:213

350 msgid "path"

351 msgstr "路径"

352

@@ -354,33 +354,33 @@ msgstr "路径"

354 msgid "could not refresh index"

355 msgstr "不能刷新索引"

356

357 -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765

357 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765

358 #, c-format

359 msgid "Bye.\n"

360 msgstr "再见。\n"

361

362 -#: add-patch.c:33 git-add--interactive.perl:1428

362 +#: add-patch.c:34 git-add--interactive.perl:1428

363 #, c-format, perl-format

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

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

366

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

367 +#: add-patch.c:35 git-add--interactive.perl:1429

368 #, c-format, perl-format

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

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

371

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

372 +#: add-patch.c:36 git-add--interactive.perl:1430

373 #, c-format, perl-format

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

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

376

377 -#: add-patch.c:37

377 +#: add-patch.c:38

378 msgid ""

379 "If the patch applies cleanly, the edited hunk will immediately be marked for "

380 "staging."

381 msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。"

382

383 -#: add-patch.c:40

383 +#: add-patch.c:41

384 msgid ""

385 "y - stage this hunk\n"

386 "n - do not stage this hunk\n"

@@ -394,28 +394,28 @@ msgstr ""

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

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

396

397 -#: add-patch.c:54 git-add--interactive.perl:1433

397 +#: add-patch.c:55 git-add--interactive.perl:1433

398 #, c-format, perl-format

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

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

401

402 -#: add-patch.c:55 git-add--interactive.perl:1434

402 +#: add-patch.c:56 git-add--interactive.perl:1434

403 #, c-format, perl-format

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

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

406

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

407 +#: add-patch.c:57 git-add--interactive.perl:1435

408 #, c-format, perl-format

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

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

411

412 -#: add-patch.c:58

412 +#: add-patch.c:59

413 msgid ""

414 "If the patch applies cleanly, the edited hunk will immediately be marked for "

415 "stashing."

416 msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。"

417

418 -#: add-patch.c:61

418 +#: add-patch.c:62

419 msgid ""

420 "y - stash this hunk\n"

421 "n - do not stash this hunk\n"

@@ -429,28 +429,28 @@ msgstr ""

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

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

431

432 -#: add-patch.c:77 git-add--interactive.perl:1438

432 +#: add-patch.c:78 git-add--interactive.perl:1438

433 #, c-format, perl-format

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

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

436

437 -#: add-patch.c:78 git-add--interactive.perl:1439

437 +#: add-patch.c:79 git-add--interactive.perl:1439

438 #, c-format, perl-format

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

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

441

442 -#: add-patch.c:79 git-add--interactive.perl:1440

442 +#: add-patch.c:80 git-add--interactive.perl:1440

443 #, c-format, perl-format

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

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

446

447 -#: add-patch.c:81

447 +#: add-patch.c:82

448 msgid ""

449 "If the patch applies cleanly, the edited hunk will immediately be marked for "

450 "unstaging."

451 msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。"

452

453 -#: add-patch.c:84

453 +#: add-patch.c:85

454 msgid ""

455 "y - unstage this hunk\n"

456 "n - do not unstage this hunk\n"

@@ -464,28 +464,28 @@ msgstr ""

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

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

466

467 -#: add-patch.c:99 git-add--interactive.perl:1443

467 +#: add-patch.c:100 git-add--interactive.perl:1443

468 #, c-format, perl-format

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

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

471

472 -#: add-patch.c:100 git-add--interactive.perl:1444

472 +#: add-patch.c:101 git-add--interactive.perl:1444

473 #, c-format, perl-format

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

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

476

477 -#: add-patch.c:101 git-add--interactive.perl:1445

477 +#: add-patch.c:102 git-add--interactive.perl:1445

478 #, c-format, perl-format

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

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

481

482 -#: add-patch.c:103 add-patch.c:168 add-patch.c:211

482 +#: add-patch.c:104 add-patch.c:169 add-patch.c:212

483 msgid ""

484 "If the patch applies cleanly, the edited hunk will immediately be marked for "

485 "applying."

486 msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。"

487

488 -#: add-patch.c:106

488 +#: add-patch.c:107

489 msgid ""

490 "y - apply this hunk to index\n"

491 "n - do not apply this hunk to index\n"

@@ -499,31 +499,31 @@ msgstr ""

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

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

501

502 -#: add-patch.c:121 git-add--interactive.perl:1448

502 +#: add-patch.c:122 git-add--interactive.perl:1448

503 #: git-add--interactive.perl:1463

504 #, c-format, perl-format

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

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

507

508 -#: add-patch.c:122 git-add--interactive.perl:1449

508 +#: add-patch.c:123 git-add--interactive.perl:1449

509 #: git-add--interactive.perl:1464

510 #, c-format, perl-format

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

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

513

514 -#: add-patch.c:123 git-add--interactive.perl:1450

514 +#: add-patch.c:124 git-add--interactive.perl:1450

515 #: git-add--interactive.perl:1465

516 #, c-format, perl-format

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

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

519

520 -#: add-patch.c:125 add-patch.c:147 add-patch.c:190

520 +#: add-patch.c:126 add-patch.c:148 add-patch.c:191

521 msgid ""

522 "If the patch applies cleanly, the edited hunk will immediately be marked for "

523 "discarding."

524 msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。"

525

526 -#: add-patch.c:128 add-patch.c:193

526 +#: add-patch.c:129 add-patch.c:194

527 msgid ""

528 "y - discard this hunk from worktree\n"

529 "n - do not discard this hunk from worktree\n"

@@ -537,22 +537,22 @@ msgstr ""

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

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

539

540 -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453

540 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453

541 #, c-format, perl-format

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

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

544

545 -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454

545 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454

546 #, c-format, perl-format

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

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

549

550 -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455

550 +#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455

551 #, c-format, perl-format

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

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

554

555 -#: add-patch.c:150

555 +#: add-patch.c:151

556 msgid ""

557 "y - discard this hunk from index and worktree\n"

558 "n - do not discard this hunk from index and worktree\n"

@@ -566,22 +566,22 @@ msgstr ""

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

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

568

569 -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458

569 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458

570 #, c-format, perl-format

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

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

573

574 -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459

574 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459

575 #, c-format, perl-format

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

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

578

579 -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460

579 +#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460

580 #, c-format, perl-format

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

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

583

584 -#: add-patch.c:171

584 +#: add-patch.c:172

585 msgid ""

586 "y - apply this hunk to index and worktree\n"

587 "n - do not apply this hunk to index and worktree\n"

@@ -595,7 +595,7 @@ msgstr ""

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

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

597

598 -#: add-patch.c:214

598 +#: add-patch.c:215

599 msgid ""

600 "y - apply this hunk to worktree\n"

601 "n - do not apply this hunk to worktree\n"

@@ -609,40 +609,40 @@ msgstr ""

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

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

611

612 -#: add-patch.c:318

612 +#: add-patch.c:319

613 #, c-format

614 msgid "could not parse hunk header '%.*s'"

615 msgstr "无法解析数据块头信息 '%.*s'"

616

617 -#: add-patch.c:337 add-patch.c:341

617 +#: add-patch.c:338 add-patch.c:342

618 #, c-format

619 msgid "could not parse colored hunk header '%.*s'"

620 msgstr "无法解析彩色数据块头信息 '%.*s'"

621

622 -#: add-patch.c:395

622 +#: add-patch.c:396

623 msgid "could not parse diff"

624 msgstr "不能解析差异信息"

625

626 -#: add-patch.c:414

626 +#: add-patch.c:415

627 msgid "could not parse colored diff"

628 msgstr "不能解析彩色差异信息"

629

630 -#: add-patch.c:428

630 +#: add-patch.c:429

631 #, c-format

632 msgid "failed to run '%s'"

633 msgstr "运行 '%s' 失败"

634

635 -#: add-patch.c:587

635 +#: add-patch.c:588

636 msgid "mismatched output from interactive.diffFilter"

637 msgstr "interactive.diffFilter 的输出不匹配"

638

639 -#: add-patch.c:588

639 +#: add-patch.c:589

640 msgid ""

641 "Your filter must maintain a one-to-one correspondence\n"

642 "between its input and output lines."

643 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"

644

645 -#: add-patch.c:761

645 +#: add-patch.c:762

646 #, c-format

647 msgid ""

648 "expected context line #%d in\n"

@@ -651,7 +651,7 @@ msgstr ""

651 "预期上下文行 #%d 于\n"

652 "%.*s"

653

654 -#: add-patch.c:776

654 +#: add-patch.c:777

655 #, c-format

656 msgid ""

657 "hunks do not overlap:\n"

@@ -664,11 +664,11 @@ msgstr ""

664 "\t不是结尾于：\n"

665 "%.*s"

666

667 -#: add-patch.c:1052 git-add--interactive.perl:1112

667 +#: add-patch.c:1053 git-add--interactive.perl:1112

668 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

669 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"

670

671 -#: add-patch.c:1056

671 +#: add-patch.c:1057

672 #, c-format

673 msgid ""

674 "---\n"

@@ -682,7 +682,7 @@ msgstr ""

682 "以 %c 开始的行将被删除。\n"

683

684 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

685 -#: add-patch.c:1070 git-add--interactive.perl:1126

685 +#: add-patch.c:1071 git-add--interactive.perl:1126

686 msgid ""

687 "If it does not apply cleanly, you will be given an opportunity to\n"

688 "edit again. If all lines of the hunk are removed, then the edit is\n"

@@ -691,11 +691,11 @@ msgstr ""

691 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"

692 "此次编辑被终止，该块不会被修改。\n"

693

694 -#: add-patch.c:1103

694 +#: add-patch.c:1104

695 msgid "could not parse hunk header"

696 msgstr "无法解析数据块头信息"

697

698 -#: add-patch.c:1148

698 +#: add-patch.c:1149

699 msgid "'git apply --cached' failed"

700 msgstr "'git apply --cached' 失败"

701

@@ -816,37 +816,46 @@ msgstr "对不起，不能编辑这个块"

816 msgid "'git apply' failed"

817 msgstr "'git apply' 失败"

818

819 -#: advice.c:115

819 +#: advice.c:140

820 +#, c-format

821 +msgid ""

822 +"\n"

823 +"Disable this message with \"git config advice.%s false\""

824 +msgstr ""

825 +"\n"

826 +"使用 \"git config advice.%s false\" 来关闭此消息"

827 +

828 +#: advice.c:156

829 #, c-format

830 msgid "%shint: %.*s%s\n"

831 msgstr "%s提示：%.*s%s\n"

832

824 -#: advice.c:168

833 +#: advice.c:247

834 msgid "Cherry-picking is not possible because you have unmerged files."

835 msgstr "无法拣选，因为您有未合并的文件。"

836

828 -#: advice.c:170

837 +#: advice.c:249

838 msgid "Committing is not possible because you have unmerged files."

839 msgstr "无法提交，因为您有未合并的文件。"

840

832 -#: advice.c:172

841 +#: advice.c:251

842 msgid "Merging is not possible because you have unmerged files."

843 msgstr "无法合并，因为您有未合并的文件。"

844

836 -#: advice.c:174

845 +#: advice.c:253

846 msgid "Pulling is not possible because you have unmerged files."

847 msgstr "无法拉取，因为您有未合并的文件。"

848

840 -#: advice.c:176

849 +#: advice.c:255

850 msgid "Reverting is not possible because you have unmerged files."

851 msgstr "无法回退，因为您有未合并的文件。"

852

844 -#: advice.c:178

853 +#: advice.c:257

854 #, c-format

855 msgid "It is not possible to %s because you have unmerged files."

856 msgstr "无法 %s，因为您有未合并的文件。"

857

849 -#: advice.c:186

858 +#: advice.c:265

859 msgid ""

860 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

861 "as appropriate to mark resolution and make a commit."

@@ -854,23 +863,23 @@ msgstr ""

863 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"

864 "解决方案并提交。"

865

857 -#: advice.c:194

866 +#: advice.c:273

867 msgid "Exiting because of an unresolved conflict."

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

869

861 -#: advice.c:199 builtin/merge.c:1335

870 +#: advice.c:278 builtin/merge.c:1353

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

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

873

865 -#: advice.c:201

874 +#: advice.c:280

875 msgid "Please, commit your changes before merging."

876 msgstr "请在合并前先提交您的修改。"

877

869 -#: advice.c:202

878 +#: advice.c:281

879 msgid "Exiting because of unfinished merge."

880 msgstr "因为存在未完成的合并而退出。"

881

873 -#: advice.c:208

882 +#: advice.c:287

883 #, c-format

884 msgid ""

885 "Note: switching to '%s'.\n"

@@ -1148,7 +1157,7 @@ msgstr "打补丁失败：%s:%ld"

1157 msgid "cannot checkout %s"

1158 msgstr "不能检出 %s"

1159

1151 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298

1160 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

1161 #, c-format

1162 msgid "failed to read %s"

1163 msgstr "无法读取 %s"

@@ -1343,7 +1352,7 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

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

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

1354

1346 -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201

1355 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1356 #, c-format

1357 msgid "cannot open %s"

1358 msgstr "不能打开 %s"

@@ -1409,7 +1418,7 @@ msgstr "不要应用与给出路径向匹配的变更"

1418 msgid "apply changes matching the given path"

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

1420

1412 -#: apply.c:4973 builtin/am.c:2260

1421 +#: apply.c:4973 builtin/am.c:2259

1422 msgid "num"

1423 msgstr "数字"

1424

@@ -1465,7 +1474,7 @@ msgstr "如果一个补丁不能应用则尝试三方合并"

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

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

1476

1468 -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524

1477 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525

1478 msgid "paths are separated with NUL character"

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

1480

@@ -1473,9 +1482,9 @@ msgstr "路径以 NUL 字符分隔"

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

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

1484

1476 -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98

1485 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98

1486 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1478 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508

1487 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332

1488 msgid "action"

1489 msgstr "动作"

1490

@@ -1504,8 +1513,8 @@ msgid "allow overlapping hunks"

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

1514

1515 #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1507 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774

1508 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

1516 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775

1517 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128

1518 msgid "be verbose"

1519 msgstr "冗长输出"

1520

@@ -1517,7 +1526,7 @@ msgstr "允许不正确的文件末尾换行符"

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

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

1528

1520 -#: apply.c:5032 builtin/am.c:2248

1529 +#: apply.c:5032 builtin/am.c:2247

1530 msgid "root"

1531 msgstr "根目录"

1532

@@ -1525,6 +1534,55 @@ msgstr "根目录"

1534 msgid "prepend <root> to all filenames"

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

1536

1537 +#: archive-tar.c:125 archive-zip.c:351

1538 +#, c-format

1539 +msgid "cannot stream blob %s"

1540 +msgstr "不能打开数据对象 %s"

1541 +

1542 +#: archive-tar.c:266 archive-zip.c:369

1543 +#, c-format

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

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

1546 +

1547 +#: archive-tar.c:293 archive-zip.c:359

1548 +#, c-format

1549 +msgid "cannot read %s"

1550 +msgstr "不能读取 %s"

1551 +

1552 +#: archive-tar.c:465

1553 +#, c-format

1554 +msgid "unable to start '%s' filter"

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

1556 +

1557 +#: archive-tar.c:468

1558 +msgid "unable to redirect descriptor"

1559 +msgstr "无法重定向描述符"

1560 +

1561 +#: archive-tar.c:475

1562 +#, c-format

1563 +msgid "'%s' filter reported error"

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

1565 +

1566 +#: archive-zip.c:319

1567 +#, c-format

1568 +msgid "path is not valid UTF-8: %s"

1569 +msgstr "路径不是有效的 UTF-8：%s"

1570 +

1571 +#: archive-zip.c:323

1572 +#, c-format

1573 +msgid "path too long (%d chars, SHA1: %s): %s"

1574 +msgstr "路径太长（%d 字符，SHA1：%s）：%s"

1575 +

1576 +#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235

1577 +#, c-format

1578 +msgid "deflate error (%d)"

1579 +msgstr "压缩错误 (%d)"

1580 +

1581 +#: archive-zip.c:615

1582 +#, c-format

1583 +msgid "timestamp too large for this system: %<PRIuMAX>"

1584 +msgstr "对于本系统时间戳太大：%<PRIuMAX>"

1585 +

1586 #: archive.c:14

1587 msgid "git archive [<options>] <tree-ish> [<path>...]"

1588 msgstr "git archive [<选项>] <树对象> [<路径>...]"

@@ -1543,172 +1601,123 @@ msgstr ""

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

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

1603

1546 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1604 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1605 #, c-format

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

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

1608

1551 -#: archive.c:396

1609 +#: archive.c:401

1610 #, c-format

1611 msgid "no such ref: %.*s"

1612 msgstr "无此引用：%.*s"

1613

1556 -#: archive.c:401

1614 +#: archive.c:407

1615 #, c-format

1616 msgid "not a valid object name: %s"

1617 msgstr "不是一个有效的对象名：%s"

1618

1561 -#: archive.c:414

1619 +#: archive.c:420

1620 #, c-format

1621 msgid "not a tree object: %s"

1622 msgstr "不是一个树对象：%s"

1623

1566 -#: archive.c:426

1624 +#: archive.c:432

1625 msgid "current working directory is untracked"

1626 msgstr "当前工作目录未被跟踪"

1627

1570 -#: archive.c:457

1628 +#: archive.c:464

1629 msgid "fmt"

1630 msgstr "格式"

1631

1574 -#: archive.c:457

1632 +#: archive.c:464

1633 msgid "archive format"

1634 msgstr "归档格式"

1635

1578 -#: archive.c:458 builtin/log.c:1653

1636 +#: archive.c:465 builtin/log.c:1674

1637 msgid "prefix"

1638 msgstr "前缀"

1639

1582 -#: archive.c:459

1640 +#: archive.c:466

1641 msgid "prepend prefix to each pathname in the archive"

1642 msgstr "为归档中每个路径名加上前缀"

1643

1586 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1644 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1645 #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162

1588 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887

1589 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

1646 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907

1647 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564

1648 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

1649 #: parse-options.h:190

1650 msgid "file"

1651 msgstr "文件"

1652

1595 -#: archive.c:461 builtin/archive.c:90

1653 +#: archive.c:468 builtin/archive.c:90

1654 msgid "write the archive to this file"

1655 msgstr "归档写入此文件"

1656

1599 -#: archive.c:463

1657 +#: archive.c:470

1658 msgid "read .gitattributes in working directory"

1659 msgstr "读取工作区中的 .gitattributes"

1660

1603 -#: archive.c:464

1661 +#: archive.c:471

1662 msgid "report archived files on stderr"

1663 msgstr "在标准错误上报告归档文件"

1664

1607 -#: archive.c:465

1665 +#: archive.c:472

1666 msgid "store only"

1667 msgstr "只存储"

1668

1611 -#: archive.c:466

1669 +#: archive.c:473

1670 msgid "compress faster"

1671 msgstr "压缩速度更快"

1672

1615 -#: archive.c:474

1673 +#: archive.c:481

1674 msgid "compress better"

1675 msgstr "压缩效果更好"

1676

1619 -#: archive.c:477

1677 +#: archive.c:484

1678 msgid "list supported archive formats"

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

1680

1623 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1681 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1682 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1683 msgid "repo"

1684 msgstr "仓库"

1685

1628 -#: archive.c:480 builtin/archive.c:92

1686 +#: archive.c:487 builtin/archive.c:92

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

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

1689

1632 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

1690 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1691 #: builtin/notes.c:498

1692 msgid "command"

1693 msgstr "命令"

1694

1637 -#: archive.c:482 builtin/archive.c:94

1695 +#: archive.c:489 builtin/archive.c:94

1696 msgid "path to the remote git-upload-archive command"

1697 msgstr "远程 git-upload-archive 命令的路径"

1698

1641 -#: archive.c:489

1699 +#: archive.c:496

1700 msgid "Unexpected option --remote"

1701 msgstr "未知参数 --remote"

1702

1645 -#: archive.c:491

1703 +#: archive.c:498

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

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

1706

1649 -#: archive.c:493

1707 +#: archive.c:500

1708 msgid "Unexpected option --output"

1709 msgstr "未知参数 --output"

1710

1653 -#: archive.c:515

1711 +#: archive.c:522

1712 #, c-format

1713 msgid "Unknown archive format '%s'"

1714 msgstr "未知归档格式 '%s'"

1715

1658 -#: archive.c:522

1716 +#: archive.c:529

1717 #, c-format

1718 msgid "Argument not supported for format '%s': -%d"

1719 msgstr "参数不支持此格式 '%s'：-%d"

1720

1663 -#: archive-tar.c:125 archive-zip.c:351

1664 -#, c-format

1665 -msgid "cannot stream blob %s"

1666 -msgstr "不能打开数据对象 %s"

1667 -

1668 -#: archive-tar.c:266 archive-zip.c:369

1669 -#, c-format

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

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

1672 -

1673 -#: archive-tar.c:293 archive-zip.c:359

1674 -#, c-format

1675 -msgid "cannot read %s"

1676 -msgstr "不能读取 %s"

1677 -

1678 -#: archive-tar.c:465

1679 -#, c-format

1680 -msgid "unable to start '%s' filter"

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

1682 -

1683 -#: archive-tar.c:468

1684 -msgid "unable to redirect descriptor"

1685 -msgstr "无法重定向描述符"

1686 -

1687 -#: archive-tar.c:475

1688 -#, c-format

1689 -msgid "'%s' filter reported error"

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

1691 -

1692 -#: archive-zip.c:319

1693 -#, c-format

1694 -msgid "path is not valid UTF-8: %s"

1695 -msgstr "路径不是有效的 UTF-8：%s"

1696 -

1697 -#: archive-zip.c:323

1698 -#, c-format

1699 -msgid "path too long (%d chars, SHA1: %s): %s"

1700 -msgstr "路径太长（%d 字符，SHA1：%s）：%s"

1701 -

1702 -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234

1703 -#, c-format

1704 -msgid "deflate error (%d)"

1705 -msgstr "压缩错误 (%d)"

1706 -

1707 -#: archive-zip.c:615

1708 -#, c-format

1709 -msgid "timestamp too large for this system: %<PRIuMAX>"

1710 -msgstr "对于本系统时间戳太大：%<PRIuMAX>"

1711 -

1721 #: attr.c:212

1722 #, c-format

1723 msgid "%.*s is not a valid attribute name"

@@ -1801,12 +1810,12 @@ msgstr "二分查找中：合并基线必须是经过测试的\n"

1810 msgid "a %s revision is needed"

1811 msgstr "需要一个 %s 版本"

1812

1804 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254

1813 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

1814 #, c-format

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

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

1817

1809 -#: bisect.c:966 builtin/merge.c:149

1818 +#: bisect.c:966 builtin/merge.c:151

1819 #, c-format

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

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

@@ -1846,37 +1855,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1855 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1856 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1857

1849 -#: blame.c:2700

1858 +#: blame.c:2777

1859 msgid "--contents and --reverse do not blend well."

1860 msgstr "--contents 和 --reverse 不能混用。"

1861

1853 -#: blame.c:2714

1862 +#: blame.c:2791

1863 msgid "cannot use --contents with final commit object name"

1864 msgstr "不能将 --contents 和最终的提交对象名共用"

1865

1857 -#: blame.c:2735

1866 +#: blame.c:2812

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

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

1869

1861 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006

1862 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388

1863 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215

1864 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290

1870 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1871 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1872 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1873 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291

1874 #: builtin/shortlog.c:192

1875 msgid "revision walk setup failed"

1876 msgstr "版本遍历设置失败"

1877

1869 -#: blame.c:2762

1878 +#: blame.c:2839

1879 msgid ""

1880 "--reverse --first-parent together require range along first-parent chain"

1881 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"

1882

1874 -#: blame.c:2773

1883 +#: blame.c:2850

1884 #, c-format

1885 msgid "no such path %s in %s"

1886 msgstr "在 %2$s 中无此路径 %1$s"

1887

1879 -#: blame.c:2784

1888 +#: blame.c:2861

1889 #, c-format

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

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

@@ -2004,12 +2013,12 @@ msgstr "歧义的对象名：'%s'。"

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

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

2015

2007 -#: branch.c:364

2016 +#: branch.c:365

2017 #, c-format

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

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

2020

2012 -#: branch.c:387

2021 +#: branch.c:388

2022 #, c-format

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

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

@@ -2024,8 +2033,8 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

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

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

2035

2027 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016

2028 -#: builtin/commit.c:815

2036 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2037 +#: builtin/commit.c:814

2038 #, c-format

2039 msgid "could not open '%s'"

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

@@ -2077,7 +2086,7 @@ msgstr "rev-list 终止"

2086 msgid "ref '%s' is excluded by the rev-list options"

2087 msgstr "引用 '%s' 被 rev-list 选项排除"

2088

2080 -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

2089 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2090 #, c-format

2091 msgid "unrecognized argument: %s"

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

@@ -2100,323 +2109,339 @@ msgstr "index-pack 终止"

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

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

2111

2103 -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

2104 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

2105 -#, c-format

2106 -msgid "could not parse %s"

2107 -msgstr "不能解析 %s"

2108 -

2109 -#: commit.c:53

2110 -#, c-format

2111 -msgid "%s %s is not a commit!"

2112 -msgstr "%s %s 不是一个提交！"

2113 -

2114 -#: commit.c:193

2115 -msgid ""

2116 -"Support for <GIT_DIR>/info/grafts is deprecated\n"

2117 -"and will be removed in a future Git version.\n"

2118 -"\n"

2119 -"Please use \"git replace --convert-graft-file\"\n"

2120 -"to convert the grafts into replace refs.\n"

2121 -"\n"

2122 -"Turn this message off by running\n"

2123 -"\"git config advice.graftFileDeprecated false\""

2124 -msgstr ""

2125 -"对 <GIT_DIR>/info/grafts 的支持已被弃用，并将在\n"

2126 -"未来的Git版本中被移除。\n"

2127 -"\n"

2128 -"请使用 \"git replace --convert-graft-file\" 将\n"

2129 -"grafts 转换为替换引用。\n"

2130 -"\n"

2131 -"设置 \"git config advice.graftFileDeprecated false\"\n"

2132 -"可关闭本消息"

2133 -

2134 -#: commit.c:1153

2135 -#, c-format

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

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

2138 -

2139 -#: commit.c:1157

2140 -#, c-format

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

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

2143 -

2144 -#: commit.c:1160

2145 -#, c-format

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

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

2148 -

2149 -#: commit.c:1163

2150 -#, c-format

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

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

2153 -

2154 -#: commit.c:1417

2155 -msgid ""

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

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

2158 -"variable i18n.commitencoding to the encoding your project uses.\n"

2159 -msgstr ""

2160 -"警告：提交说明不符合 UTF-8 字符编码。\n"

2161 -"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

2162 -"设置为您项目所用的字符编码。\n"

2163 -

2164 -#: commit-graph.c:122

2112 +#: commit-graph.c:183

2113 msgid "commit-graph file is too small"

2114 msgstr "提交图形文件太小"

2115

2168 -#: commit-graph.c:189

2116 +#: commit-graph.c:248

2117 #, c-format

2118 msgid "commit-graph signature %X does not match signature %X"

2119 msgstr "提交图形签名 %X 和签名 %X 不匹配"

2120

2173 -#: commit-graph.c:196

2121 +#: commit-graph.c:255

2122 #, c-format

2123 msgid "commit-graph version %X does not match version %X"

2124 msgstr "提交图形版本 %X 和版本 %X 不匹配"

2125

2178 -#: commit-graph.c:203

2126 +#: commit-graph.c:262

2127 #, c-format

2128 msgid "commit-graph hash version %X does not match version %X"

2129 msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"

2130

2183 -#: commit-graph.c:226

2131 +#: commit-graph.c:284

2132 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

2133 msgstr "提交图形块查找表条目丢失，文件可能不完整"

2134

2187 -#: commit-graph.c:237

2135 +#: commit-graph.c:294

2136 #, c-format

2137 msgid "commit-graph improper chunk offset %08x%08x"

2138 msgstr "提交图形不正确的块偏移 %08x%08x"

2139

2192 -#: commit-graph.c:280

2140 +#: commit-graph.c:362

2141 #, c-format

2142 msgid "commit-graph chunk id %08x appears multiple times"

2143 msgstr "提交图形块 id %08x 出现了多次"

2144

2197 -#: commit-graph.c:343

2145 +#: commit-graph.c:436

2146 msgid "commit-graph has no base graphs chunk"

2147 msgstr "提交图形没有基础图形块"

2148

2201 -#: commit-graph.c:353

2149 +#: commit-graph.c:446

2150 msgid "commit-graph chain does not match"

2151 msgstr "提交图形链不匹配"

2152

2205 -#: commit-graph.c:401

2153 +#: commit-graph.c:494

2154 #, c-format

2155 msgid "invalid commit-graph chain: line '%s' not a hash"

2156 msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"

2157

2210 -#: commit-graph.c:425

2158 +#: commit-graph.c:518

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

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

2161

2214 -#: commit-graph.c:558 commit-graph.c:618

2162 +#: commit-graph.c:651 commit-graph.c:711

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

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

2165

2218 -#: commit-graph.c:579

2166 +#: commit-graph.c:672

2167 #, c-format

2168 msgid "could not find commit %s"

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

2170

2223 -#: commit-graph.c:852 builtin/am.c:1292

2171 +#: commit-graph.c:948 builtin/am.c:1292

2172 #, c-format

2173 msgid "unable to parse commit %s"

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

2175

2228 -#: commit-graph.c:1011 builtin/pack-objects.c:2782

2176 +#: commit-graph.c:1096

2177 +msgid "Writing changed paths Bloom filters index"

2178 +msgstr "编写变更路径的 Bloom 过滤器索引"

2179 +

2180 +#: commit-graph.c:1121

2181 +msgid "Writing changed paths Bloom filters data"

2182 +msgstr "编写变更路径的 Bloom 过滤器数据"

2183 +

2184 +#: commit-graph.c:1160 builtin/pack-objects.c:2783

2185 #, c-format

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

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

2188

2233 -#: commit-graph.c:1043

2189 +#: commit-graph.c:1196

2190 msgid "Loading known commits in commit graph"

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

2192

2237 -#: commit-graph.c:1060

2193 +#: commit-graph.c:1213

2194 msgid "Expanding reachable commits in commit graph"

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

2196

2241 -#: commit-graph.c:1079

2197 +#: commit-graph.c:1233

2198 msgid "Clearing commit marks in commit graph"

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

2200

2245 -#: commit-graph.c:1098

2201 +#: commit-graph.c:1252

2202 msgid "Computing commit graph generation numbers"

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

2204

2249 -#: commit-graph.c:1173

2205 +#: commit-graph.c:1300

2206 +msgid "Computing commit changed paths Bloom filters"

2207 +msgstr "计算提交变更路径的 Bloom 过滤器"

2208 +

2209 +#: commit-graph.c:1359

2210 #, c-format

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

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

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

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

2215

2256 -#: commit-graph.c:1186

2216 +#: commit-graph.c:1372

2217 #, c-format

2218 msgid "error adding pack %s"

2219 msgstr "添加包 %s 出错"

2220

2261 -#: commit-graph.c:1190

2221 +#: commit-graph.c:1376

2222 #, c-format

2223 msgid "error opening index for %s"

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

2225

2266 -#: commit-graph.c:1214

2226 +#: commit-graph.c:1405

2227 #, c-format

2228 msgid "Finding commits for commit graph from %d ref"

2229 msgid_plural "Finding commits for commit graph from %d refs"

2230 msgstr[0] "正在从 %d 个引用中查找提交图的提交"

2231 msgstr[1] "正在从 %d 个引用中查找提交图的提交"

2232

2273 -#: commit-graph.c:1234

2233 +#: commit-graph.c:1426

2234 #, c-format

2235 msgid "invalid commit object id: %s"

2236 msgstr "无效的提交对象 ID：%s"

2237

2278 -#: commit-graph.c:1249

2238 +#: commit-graph.c:1442

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

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

2241

2282 -#: commit-graph.c:1264

2242 +#: commit-graph.c:1457

2243 msgid "Counting distinct commits in commit graph"

2244 msgstr "正在计算提交图中不同的提交"

2245

2286 -#: commit-graph.c:1294

2246 +#: commit-graph.c:1489

2247 msgid "Finding extra edges in commit graph"

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

2249

2290 -#: commit-graph.c:1340

2250 +#: commit-graph.c:1538

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

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

2253

2294 -#: commit-graph.c:1373 midx.c:814

2254 +#: commit-graph.c:1572 midx.c:812

2255 #, c-format

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

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

2258

2299 -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248

2259 +#: commit-graph.c:1585

2260 +msgid "unable to create temporary graph layer"

2261 +msgstr "无法创建临时图层"

2262 +

2263 +#: commit-graph.c:1590

2264 #, c-format

2301 -msgid "unable to create '%s'"

2302 -msgstr "不能创建 '%s'"

2265 +msgid "unable to adjust shared permissions for '%s'"

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

2267

2304 -#: commit-graph.c:1445

2268 +#: commit-graph.c:1667

2269 #, c-format

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

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

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

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

2274

2311 -#: commit-graph.c:1486

2275 +#: commit-graph.c:1712

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

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

2278

2315 -#: commit-graph.c:1498

2279 +#: commit-graph.c:1728

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

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

2282

2319 -#: commit-graph.c:1518

2283 +#: commit-graph.c:1748

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

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

2286

2323 -#: commit-graph.c:1631

2287 +#: commit-graph.c:1874

2288 msgid "Scanning merged commits"

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

2290

2327 -#: commit-graph.c:1642

2291 +#: commit-graph.c:1885

2292 #, c-format

2293 msgid "unexpected duplicate commit id %s"

2294 msgstr "意外的重复提交 ID %s"

2295

2332 -#: commit-graph.c:1665

2296 +#: commit-graph.c:1908

2297 msgid "Merging commit-graph"

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

2299

2336 -#: commit-graph.c:1844

2300 +#: commit-graph.c:2096

2301 #, c-format

2302 msgid "the commit graph format cannot write %d commits"

2303 msgstr "提交图格式不能写入 %d 个提交"

2304

2341 -#: commit-graph.c:1855

2305 +#: commit-graph.c:2107

2306 msgid "too many commits to write graph"

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

2308

2345 -#: commit-graph.c:1944

2309 +#: commit-graph.c:2200

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

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

2312

2349 -#: commit-graph.c:1954

2313 +#: commit-graph.c:2210

2314 #, c-format

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

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

2317

2354 -#: commit-graph.c:1964 commit-graph.c:1979

2318 +#: commit-graph.c:2220 commit-graph.c:2235

2319 #, c-format

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

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

2322

2359 -#: commit-graph.c:1971

2323 +#: commit-graph.c:2227

2324 #, c-format

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

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

2327

2364 -#: commit-graph.c:1989

2328 +#: commit-graph.c:2245

2329 msgid "Verifying commits in commit graph"

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

2331

2368 -#: commit-graph.c:2003

2332 +#: commit-graph.c:2259

2333 #, c-format

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

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

2336

2373 -#: commit-graph.c:2010

2337 +#: commit-graph.c:2266

2338 #, c-format

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

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

2341

2378 -#: commit-graph.c:2020

2342 +#: commit-graph.c:2276

2343 #, c-format

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

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

2346

2383 -#: commit-graph.c:2029

2347 +#: commit-graph.c:2285

2348 #, c-format

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

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

2351

2388 -#: commit-graph.c:2042

2352 +#: commit-graph.c:2298

2353 #, c-format

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

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

2356

2393 -#: commit-graph.c:2047

2357 +#: commit-graph.c:2303

2358 #, c-format

2359 msgid ""

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

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

2362

2399 -#: commit-graph.c:2051

2363 +#: commit-graph.c:2307

2364 #, c-format

2365 msgid ""

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

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

2368

2405 -#: commit-graph.c:2066

2369 +#: commit-graph.c:2322

2370 #, c-format

2371 msgid "commit-graph generation for commit %s is %u != %u"

2372 msgstr "提交图形中的提交 %s 的世代号是 %u != %u"

2373

2410 -#: commit-graph.c:2072

2374 +#: commit-graph.c:2328

2375 #, c-format

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

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

2378

2379 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2380 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2381 +#, c-format

2382 +msgid "could not parse %s"

2383 +msgstr "不能解析 %s"

2384 +

2385 +#: commit.c:54

2386 +#, c-format

2387 +msgid "%s %s is not a commit!"

2388 +msgstr "%s %s 不是一个提交！"

2389 +

2390 +#: commit.c:194

2391 +msgid ""

2392 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

2393 +"and will be removed in a future Git version.\n"

2394 +"\n"

2395 +"Please use \"git replace --convert-graft-file\"\n"

2396 +"to convert the grafts into replace refs.\n"

2397 +"\n"

2398 +"Turn this message off by running\n"

2399 +"\"git config advice.graftFileDeprecated false\""

2400 +msgstr ""

2401 +"对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n"

2402 +"未来的Git版本中被移除。\n"

2403 +"\n"

2404 +"请使用 \"git replace --convert-graft-file\" 将\n"

2405 +"grafts 转换为替换引用。\n"

2406 +"\n"

2407 +"设置 \"git config advice.graftFileDeprecated false\"\n"

2408 +"可关闭本消息"

2409 +

2410 +#: commit.c:1168

2411 +#, c-format

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

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

2414 +

2415 +#: commit.c:1172

2416 +#, c-format

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

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

2419 +

2420 +#: commit.c:1175

2421 +#, c-format

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

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

2424 +

2425 +#: commit.c:1178

2426 +#, c-format

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

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

2429 +

2430 +#: commit.c:1432

2431 +msgid ""

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

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

2434 +"variable i18n.commitencoding to the encoding your project uses.\n"

2435 +msgstr ""

2436 +"警告：提交说明不符合 UTF-8 字符编码。\n"

2437 +"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

2438 +"设置为您项目所用的字符编码。\n"

2439 +

2440 #: compat/obstack.c:406 compat/obstack.c:408

2441 msgid "memory exhausted"

2442 msgstr "内存耗尽"

2443

2419 -#: config.c:124

2444 +#: config.c:125

2445 #, c-format

2446 msgid ""

2447 "exceeded maximum include depth (%d) while including\n"

@@ -2431,289 +2456,289 @@ msgstr ""

2456 "\t%2$s\n"

2457 "这可能是因为循环包含。"

2458

2434 -#: config.c:140

2459 +#: config.c:141

2460 #, c-format

2461 msgid "could not expand include path '%s'"

2462 msgstr "无法扩展包含路径 '%s'"

2463

2439 -#: config.c:151

2464 +#: config.c:152

2465 msgid "relative config includes must come from files"

2466 msgstr "相对路径的配置文件引用必须来自于文件"

2467

2443 -#: config.c:197

2468 +#: config.c:198

2469 msgid "relative config include conditionals must come from files"

2470 msgstr "相对路径的配置文件条件引用必须来自于文件"

2471

2447 -#: config.c:376

2472 +#: config.c:378

2473 #, c-format

2474 msgid "key does not contain a section: %s"

2475 msgstr "键名没有包含一个小节名称：%s"

2476

2452 -#: config.c:382

2477 +#: config.c:384

2478 #, c-format

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

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

2481

2457 -#: config.c:406 sequencer.c:2444

2482 +#: config.c:408 sequencer.c:2456

2483 #, c-format

2484 msgid "invalid key: %s"

2485 msgstr "无效键名：%s"

2486

2462 -#: config.c:412

2487 +#: config.c:414

2488 #, c-format

2489 msgid "invalid key (newline): %s"

2490 msgstr "无效键名（有换行符）：%s"

2491

2467 -#: config.c:448 config.c:460

2492 +#: config.c:450 config.c:462

2493 #, c-format

2494 msgid "bogus config parameter: %s"

2495 msgstr "伪配置参数：%s"

2496

2472 -#: config.c:495

2497 +#: config.c:497

2498 #, c-format

2499 msgid "bogus format in %s"

2500 msgstr "%s 中格式错误"

2501

2477 -#: config.c:821

2502 +#: config.c:836

2503 #, c-format

2504 msgid "bad config line %d in blob %s"

2505 msgstr "数据对象 %2$s 中错误的配置行 %1$d"

2506

2482 -#: config.c:825

2507 +#: config.c:840

2508 #, c-format

2509 msgid "bad config line %d in file %s"

2510 msgstr "文件 %2$s 中错误的配置行 %1$d"

2511

2487 -#: config.c:829

2512 +#: config.c:844

2513 #, c-format

2514 msgid "bad config line %d in standard input"

2515 msgstr "标准输入中错误的配置行 %d"

2516

2492 -#: config.c:833

2517 +#: config.c:848

2518 #, c-format

2519 msgid "bad config line %d in submodule-blob %s"

2520 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"

2521

2497 -#: config.c:837

2522 +#: config.c:852

2523 #, c-format

2524 msgid "bad config line %d in command line %s"

2525 msgstr "命令行 %2$s 中错误的配置行 %1$d"

2526

2502 -#: config.c:841

2527 +#: config.c:856

2528 #, c-format

2529 msgid "bad config line %d in %s"

2530 msgstr "在 %2$s 中错误的配置行 %1$d"

2531

2507 -#: config.c:978

2532 +#: config.c:993

2533 msgid "out of range"

2534 msgstr "超出范围"

2535

2511 -#: config.c:978

2536 +#: config.c:993

2537 msgid "invalid unit"

2538 msgstr "无效的单位"

2539

2515 -#: config.c:979

2540 +#: config.c:994

2541 #, c-format

2542 msgid "bad numeric config value '%s' for '%s': %s"

2543 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"

2544

2520 -#: config.c:998

2545 +#: config.c:1013

2546 #, c-format

2547 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

2548 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2549

2525 -#: config.c:1001

2550 +#: config.c:1016

2551 #, c-format

2552 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

2553 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2554

2530 -#: config.c:1004

2555 +#: config.c:1019

2556 #, c-format

2557 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

2558 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"

2559

2535 -#: config.c:1007

2560 +#: config.c:1022

2561 #, c-format

2562 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

2563 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2564

2540 -#: config.c:1010

2565 +#: config.c:1025

2566 #, c-format

2567 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

2568 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2569

2545 -#: config.c:1013

2570 +#: config.c:1028

2571 #, c-format

2572 msgid "bad numeric config value '%s' for '%s' in %s: %s"

2573 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2574

2550 -#: config.c:1108

2575 +#: config.c:1123

2576 #, c-format

2577 msgid "failed to expand user dir in: '%s'"

2578 msgstr "无法扩展用户目录：'%s'"

2579

2555 -#: config.c:1117

2580 +#: config.c:1132

2581 #, c-format

2582 msgid "'%s' for '%s' is not a valid timestamp"

2583 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"

2584

2560 -#: config.c:1208

2585 +#: config.c:1223

2586 #, c-format

2587 msgid "abbrev length out of range: %d"

2588 msgstr "缩写长度超出范围：%d"

2589

2565 -#: config.c:1222 config.c:1233

2590 +#: config.c:1237 config.c:1248

2591 #, c-format

2592 msgid "bad zlib compression level %d"

2593 msgstr "错误的 zlib 压缩级别 %d"

2594

2570 -#: config.c:1325

2595 +#: config.c:1340

2596 msgid "core.commentChar should only be one character"

2597 msgstr "core.commentChar 应该是一个字符"

2598

2574 -#: config.c:1358

2599 +#: config.c:1373

2600 #, c-format

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

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

2603

2579 -#: config.c:1430

2604 +#: config.c:1445

2605 #, c-format

2606 msgid "malformed value for %s"

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

2608

2584 -#: config.c:1456

2609 +#: config.c:1471

2610 #, c-format

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

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

2613

2589 -#: config.c:1457

2614 +#: config.c:1472

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

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

2617

2593 -#: config.c:1518 builtin/pack-objects.c:3541

2618 +#: config.c:1533 builtin/pack-objects.c:3542

2619 #, c-format

2620 msgid "bad pack compression level %d"

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

2622

2598 -#: config.c:1639

2623 +#: config.c:1655

2624 #, c-format

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

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

2627

2603 -#: config.c:1642

2628 +#: config.c:1658

2629 #, c-format

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

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

2632

2608 -#: config.c:1659

2633 +#: config.c:1675

2634 #, c-format

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

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

2637

2613 -#: config.c:1689

2638 +#: config.c:1705

2639 #, c-format

2640 msgid "failed to parse %s"

2641 msgstr "解析 %s 失败"

2642

2618 -#: config.c:1743

2643 +#: config.c:1759

2644 msgid "unable to parse command-line config"

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

2646

2622 -#: config.c:2097

2647 +#: config.c:2113

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

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

2650

2626 -#: config.c:2267

2651 +#: config.c:2283

2652 #, c-format

2653 msgid "Invalid %s: '%s'"

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

2655

2631 -#: config.c:2312

2656 +#: config.c:2328

2657 #, c-format

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

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

2660

2636 -#: config.c:2358

2661 +#: config.c:2374

2662 #, c-format

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

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

2665

2641 -#: config.c:2360

2666 +#: config.c:2376

2667 #, c-format

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

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

2670

2646 -#: config.c:2441

2671 +#: config.c:2457

2672 #, c-format

2673 msgid "invalid section name '%s'"

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

2675

2651 -#: config.c:2473

2676 +#: config.c:2489

2677 #, c-format

2678 msgid "%s has multiple values"

2679 msgstr "%s 有多个取值"

2680

2656 -#: config.c:2502

2681 +#: config.c:2518

2682 #, c-format

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

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

2685

2661 -#: config.c:2754 config.c:3078

2686 +#: config.c:2770 config.c:3094

2687 #, c-format

2688 msgid "could not lock config file %s"

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

2690

2666 -#: config.c:2765

2691 +#: config.c:2781

2692 #, c-format

2693 msgid "opening %s"

2694 msgstr "打开 %s"

2695

2671 -#: config.c:2800 builtin/config.c:344

2696 +#: config.c:2816 builtin/config.c:344

2697 #, c-format

2698 msgid "invalid pattern: %s"

2699 msgstr "无效模式：%s"

2700

2676 -#: config.c:2825

2701 +#: config.c:2841

2702 #, c-format

2703 msgid "invalid config file %s"

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

2705

2681 -#: config.c:2838 config.c:3091

2706 +#: config.c:2854 config.c:3107

2707 #, c-format

2708 msgid "fstat on %s failed"

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

2710

2686 -#: config.c:2849

2711 +#: config.c:2865

2712 #, c-format

2713 msgid "unable to mmap '%s'"

2714 msgstr "不能 mmap '%s'"

2715

2691 -#: config.c:2858 config.c:3096

2716 +#: config.c:2874 config.c:3112

2717 #, c-format

2718 msgid "chmod on %s failed"

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

2720

2696 -#: config.c:2943 config.c:3193

2721 +#: config.c:2959 config.c:3209

2722 #, c-format

2723 msgid "could not write config file %s"

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

2725

2701 -#: config.c:2977

2726 +#: config.c:2993

2727 #, c-format

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

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

2730

2706 -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2731 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2732 #, c-format

2733 msgid "could not unset '%s'"

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

2735

2711 -#: config.c:3069

2736 +#: config.c:3085

2737 #, c-format

2738 msgid "invalid section name: %s"

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

2740

2716 -#: config.c:3236

2741 +#: config.c:3252

2742 #, c-format

2743 msgid "missing value for '%s'"

2744 msgstr "%s 的取值缺失"

@@ -2876,19 +2901,19 @@ msgstr "已阻止奇怪的路径名 '%s'"

2901 msgid "unable to fork"

2902 msgstr "无法 fork"

2903

2879 -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43

2904 +#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45

2905 msgid "Checking connectivity"

2906 msgstr "正在检查连通性"

2907

2883 -#: connected.c:110

2908 +#: connected.c:119

2909 msgid "Could not run 'git rev-list'"

2910 msgstr "不能执行 'git rev-list'"

2911

2887 -#: connected.c:130

2912 +#: connected.c:139

2913 msgid "failed write to rev-list"

2914 msgstr "写入 rev-list 失败"

2915

2891 -#: connected.c:137

2916 +#: connected.c:146

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

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

2919

@@ -2987,35 +3012,63 @@ msgstr "从外部过滤器 '%s' 读取失败"

3012 msgid "external filter '%s' failed"

3013 msgstr "外部过滤器 '%s' 失败"

3014

2990 -#: convert.c:839

3015 +#: convert.c:840

3016 msgid "unexpected filter type"

3017 msgstr "意外的过滤类型"

3018

2994 -#: convert.c:850

3019 +#: convert.c:851

3020 msgid "path name too long for external filter"

3021 msgstr "外部过滤器的路径名太长"

3022

2998 -#: convert.c:924

3023 +#: convert.c:943

3024 #, c-format

3025 msgid ""

3026 "external filter '%s' is not available anymore although not all paths have "

3027 "been filtered"

3028 msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"

3029

3005 -#: convert.c:1223

3030 +#: convert.c:1243

3031 msgid "true/false are no valid working-tree-encodings"

3032 msgstr "true/false 不是有效的工作区编码"

3033

3009 -#: convert.c:1411 convert.c:1445

3034 +#: convert.c:1431 convert.c:1465

3035 #, c-format

3036 msgid "%s: clean filter '%s' failed"

3037 msgstr "%s：clean 过滤器 '%s' 失败"

3038

3014 -#: convert.c:1489

3039 +#: convert.c:1511

3040 #, c-format

3041 msgid "%s: smudge filter %s failed"

3042 msgstr "%s：smudge 过滤器 %s 失败"

3043

3044 +#: credential.c:96

3045 +#, c-format

3046 +msgid "skipping credential lookup for key: credential.%s"

3047 +msgstr "跳过凭据查询：credential.%s"

3048 +

3049 +#: credential.c:112

3050 +msgid "refusing to work with credential missing host field"

3051 +msgstr "拒绝使用缺少主机字段的凭据"

3052 +

3053 +#: credential.c:114

3054 +msgid "refusing to work with credential missing protocol field"

3055 +msgstr "拒绝使用缺少协议字段的凭据"

3056 +

3057 +#: credential.c:396

3058 +#, c-format

3059 +msgid "url contains a newline in its %s component: %s"

3060 +msgstr "URL 的 %s 组件中包含换行符：%s"

3061 +

3062 +#: credential.c:440

3063 +#, c-format

3064 +msgid "url has no scheme: %s"

3065 +msgstr "URL 没有 scheme：%s"

3066 +

3067 +#: credential.c:513

3068 +#, c-format

3069 +msgid "credential url cannot be parsed: %s"

3070 +msgstr "不能解析凭据 URL：%s"

3071 +

3072 #: date.c:138

3073 msgid "in the future"

3074 msgstr "在将来"

@@ -3108,15 +3161,6 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多

3161 msgid "Marked %d islands, done.\n"

3162 msgstr "已标记 %d 个数据岛，结束。\n"

3163

3111 -#: diffcore-order.c:24

3112 -#, c-format

3113 -msgid "failed to read orderfile '%s'"

3114 -msgstr "读取排序文件 '%s' 失败"

3115 -

3116 -#: diffcore-rename.c:543

3117 -msgid "Performing inexact rename detection"

3118 -msgstr "正在进行非精确的重命名探测"

3119 -

3164 #: diff-no-index.c:238

3165 msgid "git diff --no-index [<options>] <path> <path>"

3166 msgstr "git diff --no-index [<选项>] <路径> <路径>"

@@ -3176,35 +3220,35 @@ msgstr ""

3220 "发现配置变量 'diff.dirstat' 中的错误：\n"

3221 "%s"

3222

3179 -#: diff.c:4202

3223 +#: diff.c:4238

3224 #, c-format

3225 msgid "external diff died, stopping at %s"

3226 msgstr "外部 diff 退出，停止在 %s"

3227

3184 -#: diff.c:4547

3228 +#: diff.c:4583

3229 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3230 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

3231

3188 -#: diff.c:4550

3232 +#: diff.c:4586

3233 msgid "-G, -S and --find-object are mutually exclusive"

3234 msgstr "-G、-S 和 --find-object 是互斥的"

3235

3192 -#: diff.c:4628

3236 +#: diff.c:4664

3237 msgid "--follow requires exactly one pathspec"

3238 msgstr "--follow 明确要求只跟一个路径规格"

3239

3196 -#: diff.c:4676

3240 +#: diff.c:4712

3241 #, c-format

3242 msgid "invalid --stat value: %s"

3243 msgstr "无效的 --stat 值：%s"

3244

3201 -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

3245 +#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245

3246 #: parse-options.c:197 parse-options.c:201

3247 #, c-format

3248 msgid "%s expects a numerical value"

3249 msgstr "%s 期望一个数字值"

3250

3207 -#: diff.c:4713

3251 +#: diff.c:4749

3252 #, c-format

3253 msgid ""

3254 "Failed to parse --dirstat/-X option parameter:\n"

@@ -3213,195 +3257,195 @@ msgstr ""

3257 "无法解析 --dirstat/-X 选项的参数：\n"

3258 "%s"

3259

3216 -#: diff.c:4798

3260 +#: diff.c:4834

3261 #, c-format

3262 msgid "unknown change class '%c' in --diff-filter=%s"

3263 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"

3264

3221 -#: diff.c:4822

3265 +#: diff.c:4858

3266 #, c-format

3267 msgid "unknown value after ws-error-highlight=%.*s"

3268 msgstr "ws-error-highlight=%.*s 之后未知的值"

3269

3226 -#: diff.c:4836

3270 +#: diff.c:4872

3271 #, c-format

3272 msgid "unable to resolve '%s'"

3273 msgstr "不能解析 '%s'"

3274

3231 -#: diff.c:4886 diff.c:4892

3275 +#: diff.c:4922 diff.c:4928

3276 #, c-format

3277 msgid "%s expects <n>/<m> form"

3278 msgstr "%s 期望 <n>/<m> 格式"

3279

3236 -#: diff.c:4904

3280 +#: diff.c:4940

3281 #, c-format

3282 msgid "%s expects a character, got '%s'"

3283 msgstr "%s 期望一个字符，得到 '%s'"

3284

3241 -#: diff.c:4925

3285 +#: diff.c:4961

3286 #, c-format

3287 msgid "bad --color-moved argument: %s"

3288 msgstr "坏的 --color-moved 参数：%s"

3289

3246 -#: diff.c:4944

3290 +#: diff.c:4980

3291 #, c-format

3292 msgid "invalid mode '%s' in --color-moved-ws"

3293 msgstr "--color-moved-ws 中的无效模式 '%s' "

3294

3251 -#: diff.c:4984

3295 +#: diff.c:5020

3296 msgid ""

3297 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3298 "\"histogram\""

3299 msgstr ""

3300 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3301

3258 -#: diff.c:5020 diff.c:5040

3302 +#: diff.c:5056 diff.c:5076

3303 #, c-format

3304 msgid "invalid argument to %s"

3305 msgstr "%s 的参数无效"

3306

3263 -#: diff.c:5178

3307 +#: diff.c:5214

3308 #, c-format

3309 msgid "failed to parse --submodule option parameter: '%s'"

3310 msgstr "无法解析 --submodule 选项的参数：'%s'"

3311

3268 -#: diff.c:5234

3312 +#: diff.c:5270

3313 #, c-format

3314 msgid "bad --word-diff argument: %s"

3315 msgstr "坏的 --word-diff 参数：%s"

3316

3273 -#: diff.c:5257

3317 +#: diff.c:5293

3318 msgid "Diff output format options"

3319 msgstr "差异输出格式化选项"

3320

3277 -#: diff.c:5259 diff.c:5265

3321 +#: diff.c:5295 diff.c:5301

3322 msgid "generate patch"

3323 msgstr "生成补丁"

3324

3281 -#: diff.c:5262 builtin/log.c:173

3325 +#: diff.c:5298 builtin/log.c:177

3326 msgid "suppress diff output"

3327 msgstr "不显示差异输出"

3328

3285 -#: diff.c:5267 diff.c:5381 diff.c:5388

3329 +#: diff.c:5303 diff.c:5417 diff.c:5424

3330 msgid "<n>"

3331 msgstr "<n>"

3332

3289 -#: diff.c:5268 diff.c:5271

3333 +#: diff.c:5304 diff.c:5307

3334 msgid "generate diffs with <n> lines context"

3335 msgstr "生成含 <n> 行上下文的差异"

3336

3293 -#: diff.c:5273

3337 +#: diff.c:5309

3338 msgid "generate the diff in raw format"

3339 msgstr "生成原始格式的差异"

3340

3297 -#: diff.c:5276

3341 +#: diff.c:5312

3342 msgid "synonym for '-p --raw'"

3343 msgstr "和 '-p --raw' 同义"

3344

3301 -#: diff.c:5280

3345 +#: diff.c:5316

3346 msgid "synonym for '-p --stat'"

3347 msgstr "和 '-p --stat' 同义"

3348

3305 -#: diff.c:5284

3349 +#: diff.c:5320

3350 msgid "machine friendly --stat"

3351 msgstr "机器友好的 --stat"

3352

3309 -#: diff.c:5287

3353 +#: diff.c:5323

3354 msgid "output only the last line of --stat"

3355 msgstr "只输出 --stat 的最后一行"

3356

3313 -#: diff.c:5289 diff.c:5297

3357 +#: diff.c:5325 diff.c:5333

3358 msgid "<param1,param2>..."

3359 msgstr "<参数1,参数2>..."

3360

3317 -#: diff.c:5290

3361 +#: diff.c:5326

3362 msgid ""

3363 "output the distribution of relative amount of changes for each sub-directory"

3364 msgstr "输出每个子目录相对变更的分布"

3365

3322 -#: diff.c:5294

3366 +#: diff.c:5330

3367 msgid "synonym for --dirstat=cumulative"

3368 msgstr "和 --dirstat=cumulative 同义"

3369

3326 -#: diff.c:5298

3370 +#: diff.c:5334

3371 msgid "synonym for --dirstat=files,param1,param2..."

3372 msgstr "是 --dirstat=files,param1,param2... 的同义词"

3373

3330 -#: diff.c:5302

3374 +#: diff.c:5338

3375 msgid "warn if changes introduce conflict markers or whitespace errors"

3376 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"

3377

3334 -#: diff.c:5305

3378 +#: diff.c:5341

3379 msgid "condensed summary such as creations, renames and mode changes"

3380 msgstr "精简摘要，例如创建、重命名和模式变更"

3381

3338 -#: diff.c:5308

3382 +#: diff.c:5344

3383 msgid "show only names of changed files"

3384 msgstr "只显示变更文件的文件名"

3385

3342 -#: diff.c:5311

3386 +#: diff.c:5347

3387 msgid "show only names and status of changed files"

3388 msgstr "只显示变更文件的文件名和状态"

3389

3346 -#: diff.c:5313

3390 +#: diff.c:5349

3391 msgid "<width>[,<name-width>[,<count>]]"

3392 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"

3393

3350 -#: diff.c:5314

3394 +#: diff.c:5350

3395 msgid "generate diffstat"

3396 msgstr "生成差异统计（diffstat）"

3397

3354 -#: diff.c:5316 diff.c:5319 diff.c:5322

3398 +#: diff.c:5352 diff.c:5355 diff.c:5358

3399 msgid "<width>"

3400 msgstr "<宽度>"

3401

3358 -#: diff.c:5317

3402 +#: diff.c:5353

3403 msgid "generate diffstat with a given width"

3404 msgstr "使用给定的长度生成差异统计"

3405

3362 -#: diff.c:5320

3406 +#: diff.c:5356

3407 msgid "generate diffstat with a given name width"

3408 msgstr "使用给定的文件名长度生成差异统计"

3409

3366 -#: diff.c:5323

3410 +#: diff.c:5359

3411 msgid "generate diffstat with a given graph width"

3412 msgstr "使用给定的图形长度生成差异统计"

3413

3370 -#: diff.c:5325

3414 +#: diff.c:5361

3415 msgid "<count>"

3416 msgstr "<次数>"

3417

3374 -#: diff.c:5326

3418 +#: diff.c:5362

3419 msgid "generate diffstat with limited lines"

3420 msgstr "生成有限行数的差异统计"

3421

3378 -#: diff.c:5329

3422 +#: diff.c:5365

3423 msgid "generate compact summary in diffstat"

3424 msgstr "生成差异统计的简洁摘要"

3425

3382 -#: diff.c:5332

3426 +#: diff.c:5368

3427 msgid "output a binary diff that can be applied"

3428 msgstr "输出一个可以应用的二进制差异"

3429

3386 -#: diff.c:5335

3430 +#: diff.c:5371

3431 msgid "show full pre- and post-image object names on the \"index\" lines"

3432 msgstr "在 \"index\" 行显示完整的前后对象名称"

3433

3390 -#: diff.c:5337

3434 +#: diff.c:5373

3435 msgid "show colored diff"

3436 msgstr "显示带颜色的差异"

3437

3394 -#: diff.c:5338

3438 +#: diff.c:5374

3439 msgid "<kind>"

3440 msgstr "<类型>"

3441

3398 -#: diff.c:5339

3442 +#: diff.c:5375

3443 msgid ""

3444 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3445 "diff"

3446 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"

3447

3404 -#: diff.c:5342

3448 +#: diff.c:5378

3449 msgid ""

3450 "do not munge pathnames and use NULs as output field terminators in --raw or "

3451 "--numstat"

@@ -3409,300 +3453,309 @@ msgstr ""

3453 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"

3454 "符"

3455

3412 -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

3456 +#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493

3457 msgid "<prefix>"

3458 msgstr "<前缀>"

3459

3416 -#: diff.c:5346

3460 +#: diff.c:5382

3461 msgid "show the given source prefix instead of \"a/\""

3462 msgstr "显示给定的源前缀取代 \"a/\""

3463

3420 -#: diff.c:5349

3464 +#: diff.c:5385

3465 msgid "show the given destination prefix instead of \"b/\""

3466 msgstr "显示给定的目标前缀取代 \"b/\""

3467

3424 -#: diff.c:5352

3468 +#: diff.c:5388

3469 msgid "prepend an additional prefix to every line of output"

3470 msgstr "输出的每一行附加前缀"

3471

3428 -#: diff.c:5355

3472 +#: diff.c:5391

3473 msgid "do not show any source or destination prefix"

3474 msgstr "不显示任何源和目标前缀"

3475

3432 -#: diff.c:5358

3476 +#: diff.c:5394

3477 msgid "show context between diff hunks up to the specified number of lines"

3478 msgstr "显示指定行数的差异块间的上下文"

3479

3436 -#: diff.c:5362 diff.c:5367 diff.c:5372

3480 +#: diff.c:5398 diff.c:5403 diff.c:5408

3481 msgid "<char>"

3482 msgstr "<字符>"

3483

3440 -#: diff.c:5363

3484 +#: diff.c:5399

3485 msgid "specify the character to indicate a new line instead of '+'"

3486 msgstr "指定一个字符取代 '+' 来表示新的一行"

3487

3444 -#: diff.c:5368

3488 +#: diff.c:5404

3489 msgid "specify the character to indicate an old line instead of '-'"

3490 msgstr "指定一个字符取代 '-' 来表示旧的一行"

3491

3448 -#: diff.c:5373

3492 +#: diff.c:5409

3493 msgid "specify the character to indicate a context instead of ' '"

3494 msgstr "指定一个字符取代 ' ' 来表示一行上下文"

3495

3452 -#: diff.c:5376

3496 +#: diff.c:5412

3497 msgid "Diff rename options"

3498 msgstr "差异重命名选项"

3499

3456 -#: diff.c:5377

3500 +#: diff.c:5413

3501 msgid "<n>[/<m>]"

3502 msgstr "<n>[/<m>]"

3503

3460 -#: diff.c:5378

3504 +#: diff.c:5414

3505 msgid "break complete rewrite changes into pairs of delete and create"

3506 msgstr "将完全重写的变更打破为成对的删除和创建"

3507

3464 -#: diff.c:5382

3508 +#: diff.c:5418

3509 msgid "detect renames"

3510 msgstr "检测重命名"

3511

3468 -#: diff.c:5386

3512 +#: diff.c:5422

3513 msgid "omit the preimage for deletes"

3514 msgstr "省略删除操作的差异输出"

3515

3472 -#: diff.c:5389

3516 +#: diff.c:5425

3517 msgid "detect copies"

3518 msgstr "检测拷贝"

3519

3476 -#: diff.c:5393

3520 +#: diff.c:5429

3521 msgid "use unmodified files as source to find copies"

3522 msgstr "使用未修改的文件做为发现拷贝的源"

3523

3480 -#: diff.c:5395

3524 +#: diff.c:5431

3525 msgid "disable rename detection"

3526 msgstr "禁用重命名探测"

3527

3484 -#: diff.c:5398

3528 +#: diff.c:5434

3529 msgid "use empty blobs as rename source"

3530 msgstr "使用空的数据对象做为重命名的源"

3531

3488 -#: diff.c:5400

3532 +#: diff.c:5436

3533 msgid "continue listing the history of a file beyond renames"

3534 msgstr "继续列出文件重命名以外的历史记录"

3535

3492 -#: diff.c:5403

3536 +#: diff.c:5439

3537 msgid ""

3538 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3539 "given limit"

3540 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"

3541

3498 -#: diff.c:5405

3542 +#: diff.c:5441

3543 msgid "Diff algorithm options"

3544 msgstr "差异算法选项"

3545

3502 -#: diff.c:5407

3546 +#: diff.c:5443

3547 msgid "produce the smallest possible diff"

3548 msgstr "生成尽可能小的差异"

3549

3506 -#: diff.c:5410

3550 +#: diff.c:5446

3551 msgid "ignore whitespace when comparing lines"

3552 msgstr "行比较时忽略空白字符"

3553

3510 -#: diff.c:5413

3554 +#: diff.c:5449

3555 msgid "ignore changes in amount of whitespace"

3556 msgstr "忽略空白字符的变更"

3557

3514 -#: diff.c:5416

3558 +#: diff.c:5452

3559 msgid "ignore changes in whitespace at EOL"

3560 msgstr "忽略行尾的空白字符变更"

3561

3518 -#: diff.c:5419

3562 +#: diff.c:5455

3563 msgid "ignore carrier-return at the end of line"

3564 msgstr "忽略行尾的回车符（CR）"

3565

3522 -#: diff.c:5422

3566 +#: diff.c:5458

3567 msgid "ignore changes whose lines are all blank"

3568 msgstr "忽略整行都是空白的变更"

3569

3526 -#: diff.c:5425

3570 +#: diff.c:5461

3571 msgid "heuristic to shift diff hunk boundaries for easy reading"

3572 msgstr "启发式转换差异边界以便阅读"

3573

3530 -#: diff.c:5428

3574 +#: diff.c:5464

3575 msgid "generate diff using the \"patience diff\" algorithm"

3576 msgstr "使用 \"patience diff\" 算法生成差异"

3577

3534 -#: diff.c:5432

3578 +#: diff.c:5468

3579 msgid "generate diff using the \"histogram diff\" algorithm"

3580 msgstr "使用 \"histogram diff\" 算法生成差异"

3581

3538 -#: diff.c:5434

3582 +#: diff.c:5470

3583 msgid "<algorithm>"

3584 msgstr "<算法>"

3585

3542 -#: diff.c:5435

3586 +#: diff.c:5471

3587 msgid "choose a diff algorithm"

3588 msgstr "选择一个差异算法"

3589

3546 -#: diff.c:5437

3590 +#: diff.c:5473

3591 msgid "<text>"

3592 msgstr "<文本>"

3593

3550 -#: diff.c:5438

3594 +#: diff.c:5474

3595 msgid "generate diff using the \"anchored diff\" algorithm"

3596 msgstr "使用 \"anchored diff\" 算法生成差异"

3597

3554 -#: diff.c:5440 diff.c:5449 diff.c:5452

3598 +#: diff.c:5476 diff.c:5485 diff.c:5488

3599 msgid "<mode>"

3600 msgstr "<模式>"

3601

3558 -#: diff.c:5441

3602 +#: diff.c:5477

3603 msgid "show word diff, using <mode> to delimit changed words"

3604 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"

3605

3562 -#: diff.c:5443 diff.c:5446 diff.c:5491

3606 +#: diff.c:5479 diff.c:5482 diff.c:5527

3607 msgid "<regex>"

3608 msgstr "<正则>"

3609

3566 -#: diff.c:5444

3610 +#: diff.c:5480

3611 msgid "use <regex> to decide what a word is"

3612 msgstr "使用 <正则表达式> 确定何为一个词"

3613

3570 -#: diff.c:5447

3614 +#: diff.c:5483

3615 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3616 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"

3617

3574 -#: diff.c:5450

3618 +#: diff.c:5486

3619 msgid "moved lines of code are colored differently"

3620 msgstr "移动的代码行用不同方式着色"

3621

3578 -#: diff.c:5453

3622 +#: diff.c:5489

3623 msgid "how white spaces are ignored in --color-moved"

3624 msgstr "在 --color-moved 下如何忽略空白字符"

3625

3582 -#: diff.c:5456

3626 +#: diff.c:5492

3627 msgid "Other diff options"

3628 msgstr "其它差异选项"

3629

3586 -#: diff.c:5458

3630 +#: diff.c:5494

3631 msgid "when run from subdir, exclude changes outside and show relative paths"

3632 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"

3633

3590 -#: diff.c:5462

3634 +#: diff.c:5498

3635 msgid "treat all files as text"

3636 msgstr "把所有文件当做文本处理"

3637

3594 -#: diff.c:5464

3638 +#: diff.c:5500

3639 msgid "swap two inputs, reverse the diff"

3640 msgstr "交换两个输入，反转差异"

3641

3598 -#: diff.c:5466

3642 +#: diff.c:5502

3643 msgid "exit with 1 if there were differences, 0 otherwise"

3644 msgstr "有差异时退出码为 1，否则为 0"

3645

3602 -#: diff.c:5468

3646 +#: diff.c:5504

3647 msgid "disable all output of the program"

3648 msgstr "禁用本程序的所有输出"

3649

3606 -#: diff.c:5470

3650 +#: diff.c:5506

3651 msgid "allow an external diff helper to be executed"

3652 msgstr "允许执行一个外置的差异助手"

3653

3610 -#: diff.c:5472

3654 +#: diff.c:5508

3655 msgid "run external text conversion filters when comparing binary files"

3656 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"

3657

3614 -#: diff.c:5474

3658 +#: diff.c:5510

3659 msgid "<when>"

3660 msgstr "<何时>"

3661

3618 -#: diff.c:5475

3662 +#: diff.c:5511

3663 msgid "ignore changes to submodules in the diff generation"

3664 msgstr "在生成差异时，忽略子模组的更改"

3665

3622 -#: diff.c:5478

3666 +#: diff.c:5514

3667 msgid "<format>"

3668 msgstr "<格式>"

3669

3626 -#: diff.c:5479

3670 +#: diff.c:5515

3671 msgid "specify how differences in submodules are shown"

3672 msgstr "指定子模组的差异如何显示"

3673

3630 -#: diff.c:5483

3674 +#: diff.c:5519

3675 msgid "hide 'git add -N' entries from the index"

3676 msgstr "隐藏索引中 'git add -N' 条目"

3677

3634 -#: diff.c:5486

3678 +#: diff.c:5522

3679 msgid "treat 'git add -N' entries as real in the index"

3680 msgstr "将索引中 'git add -N' 条目当做真实的"

3681

3638 -#: diff.c:5488

3682 +#: diff.c:5524

3683 msgid "<string>"

3684 msgstr "<字符串>"

3685

3642 -#: diff.c:5489

3686 +#: diff.c:5525

3687 msgid ""

3688 "look for differences that change the number of occurrences of the specified "

3689 "string"

3690 msgstr "查找改变了指定字符串出现次数的差异"

3691

3648 -#: diff.c:5492

3692 +#: diff.c:5528

3693 msgid ""

3694 "look for differences that change the number of occurrences of the specified "

3695 "regex"

3696 msgstr "查找改变指定正则匹配出现次数的差异"

3697

3654 -#: diff.c:5495

3698 +#: diff.c:5531

3699 msgid "show all changes in the changeset with -S or -G"

3700 msgstr "显示使用 -S 或 -G 的变更集的所有变更"

3701

3658 -#: diff.c:5498

3702 +#: diff.c:5534

3703 msgid "treat <string> in -S as extended POSIX regular expression"

3704 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"

3705

3662 -#: diff.c:5501

3706 +#: diff.c:5537

3707 msgid "control the order in which files appear in the output"

3708 msgstr "控制输出中的文件显示顺序"

3709

3666 -#: diff.c:5502

3710 +#: diff.c:5538

3711 msgid "<object-id>"

3712 msgstr "<对象 ID>"

3713

3670 -#: diff.c:5503

3714 +#: diff.c:5539

3715 msgid ""

3716 "look for differences that change the number of occurrences of the specified "

3717 "object"

3718 msgstr "查找改变指定对象出现次数的差异"

3719

3676 -#: diff.c:5505

3720 +#: diff.c:5541

3721 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3722 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3723

3680 -#: diff.c:5506

3724 +#: diff.c:5542

3725 msgid "select files by diff type"

3726 msgstr "通过差异类型选择文件"

3727

3684 -#: diff.c:5508

3728 +#: diff.c:5544

3729 msgid "<file>"

3730 msgstr "<文件>"

3731

3688 -#: diff.c:5509

3732 +#: diff.c:5545

3733 msgid "Output to a specific file"

3734 msgstr "输出到一个指定的文件"

3735

3692 -#: diff.c:6164

3736 +#: diff.c:6200

3737 msgid "inexact rename detection was skipped due to too many files."

3738 msgstr "因为文件太多，略过不严格的重命名检查。"

3739

3696 -#: diff.c:6167

3740 +#: diff.c:6203

3741 msgid "only found copies from modified paths due to too many files."

3742 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

3743

3700 -#: diff.c:6170

3744 +#: diff.c:6206

3745 #, c-format

3746 msgid ""

3747 "you may want to set your %s variable to at least %d and retry the command."

3748 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

3749

3750 +#: diffcore-order.c:24

3751 +#, c-format

3752 +msgid "failed to read orderfile '%s'"

3753 +msgstr "读取排序文件 '%s' 失败"

3754 +

3755 +#: diffcore-rename.c:592

3756 +msgid "Performing inexact rename detection"

3757 +msgstr "正在进行非精确的重命名探测"

3758 +

3759 #: dir.c:555

3760 #, c-format

3761 msgid "pathspec '%s' did not match any file(s) known to git"

@@ -3732,35 +3785,35 @@ msgstr "禁止 cone 模式匹配"

3785 msgid "cannot use %s as an exclude file"

3786 msgstr "不能将 %s 用作排除文件"

3787

3735 -#: dir.c:2144

3788 +#: dir.c:2275

3789 #, c-format

3790 msgid "could not open directory '%s'"

3791 msgstr "不能打开目录 '%s'"

3792

3740 -#: dir.c:2479

3793 +#: dir.c:2575

3794 msgid "failed to get kernel name and information"

3795 msgstr "无法获得内核名称和信息"

3796

3744 -#: dir.c:2603

3797 +#: dir.c:2699

3798 msgid "untracked cache is disabled on this system or location"

3799 msgstr "缓存未跟踪文件在本系统或位置中被禁用"

3800

3748 -#: dir.c:3407

3801 +#: dir.c:3481

3802 #, c-format

3803 msgid "index file corrupt in repo %s"

3804 msgstr "仓库 %s 中的索引文件损坏"

3805

3753 -#: dir.c:3452 dir.c:3457

3806 +#: dir.c:3526 dir.c:3531

3807 #, c-format

3808 msgid "could not create directories for %s"

3809 msgstr "不能为 %s 创建目录"

3810

3758 -#: dir.c:3486

3811 +#: dir.c:3560

3812 #, c-format

3813 msgid "could not migrate git directory from '%s' to '%s'"

3814 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

3815

3763 -#: editor.c:73

3816 +#: editor.c:74

3817 #, c-format

3818 msgid "hint: Waiting for your editor to close the file...%c"

3819 msgstr "提示：等待您的编辑器关闭文件...%c"

@@ -3769,17 +3822,17 @@ msgstr "提示：等待您的编辑器关闭文件...%c"

3822 msgid "Filtering content"

3823 msgstr "过滤内容"

3824

3772 -#: entry.c:476

3825 +#: entry.c:479

3826 #, c-format

3827 msgid "could not stat file '%s'"

3828 msgstr "不能对文件 '%s' 调用 stat"

3829

3777 -#: environment.c:149

3830 +#: environment.c:150

3831 #, c-format

3832 msgid "bad git namespace path \"%s\""

3833 msgstr "错误的 git 名字空间路径 \"%s\""

3834

3782 -#: environment.c:331

3835 +#: environment.c:337

3836 #, c-format

3837 msgid "could not set GIT_DIR to '%s'"

3838 msgstr "不能设置 GIT_DIR 为 '%s'"

@@ -3789,244 +3842,244 @@ msgstr "不能设置 GIT_DIR 为 '%s'"

3842 msgid "too many args to run %s"

3843 msgstr "执行 %s 的参数太多"

3844

3792 -#: fetch-pack.c:150

3845 +#: fetch-pack.c:151

3846 msgid "git fetch-pack: expected shallow list"

3847 msgstr "git fetch-pack：应为 shallow 列表"

3848

3796 -#: fetch-pack.c:153

3849 +#: fetch-pack.c:154

3850 msgid "git fetch-pack: expected a flush packet after shallow list"

3851 msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"

3852

3800 -#: fetch-pack.c:164

3853 +#: fetch-pack.c:165

3854 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3855 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

3856

3804 -#: fetch-pack.c:184

3857 +#: fetch-pack.c:185

3858 #, c-format

3859 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3860 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

3861

3809 -#: fetch-pack.c:195

3862 +#: fetch-pack.c:196

3863 msgid "unable to write to remote"

3864 msgstr "无法写到远程"

3865

3813 -#: fetch-pack.c:257

3866 +#: fetch-pack.c:258

3867 msgid "--stateless-rpc requires multi_ack_detailed"

3868 msgstr "--stateless-rpc 需要 multi_ack_detailed"

3869

3817 -#: fetch-pack.c:356 fetch-pack.c:1340

3870 +#: fetch-pack.c:357 fetch-pack.c:1364

3871 #, c-format

3872 msgid "invalid shallow line: %s"

3873 msgstr "无效的 shallow 信息：%s"

3874

3822 -#: fetch-pack.c:362 fetch-pack.c:1346

3875 +#: fetch-pack.c:363 fetch-pack.c:1370

3876 #, c-format

3877 msgid "invalid unshallow line: %s"

3878 msgstr "无效的 unshallow 信息：%s"

3879

3827 -#: fetch-pack.c:364 fetch-pack.c:1348

3880 +#: fetch-pack.c:365 fetch-pack.c:1372

3881 #, c-format

3882 msgid "object not found: %s"

3883 msgstr "对象未找到：%s"

3884

3832 -#: fetch-pack.c:367 fetch-pack.c:1351

3885 +#: fetch-pack.c:368 fetch-pack.c:1375

3886 #, c-format

3887 msgid "error in object: %s"

3888 msgstr "对象中出错：%s"

3889

3837 -#: fetch-pack.c:369 fetch-pack.c:1353

3890 +#: fetch-pack.c:370 fetch-pack.c:1377

3891 #, c-format

3892 msgid "no shallow found: %s"

3893 msgstr "未发现 shallow：%s"

3894

3842 -#: fetch-pack.c:372 fetch-pack.c:1357

3895 +#: fetch-pack.c:373 fetch-pack.c:1381

3896 #, c-format

3897 msgid "expected shallow/unshallow, got %s"

3898 msgstr "应为 shallow/unshallow，却得到 %s"

3899

3847 -#: fetch-pack.c:414

3900 +#: fetch-pack.c:415

3901 #, c-format

3902 msgid "got %s %d %s"

3903 msgstr "得到 %s %d %s"

3904

3852 -#: fetch-pack.c:431

3905 +#: fetch-pack.c:432

3906 #, c-format

3907 msgid "invalid commit %s"

3908 msgstr "无效提交 %s"

3909

3857 -#: fetch-pack.c:462

3910 +#: fetch-pack.c:463

3911 msgid "giving up"

3912 msgstr "放弃"

3913

3861 -#: fetch-pack.c:475 progress.c:323

3914 +#: fetch-pack.c:476 progress.c:336

3915 msgid "done"

3916 msgstr "完成"

3917

3865 -#: fetch-pack.c:487

3918 +#: fetch-pack.c:488

3919 #, c-format

3920 msgid "got %s (%d) %s"

3921 msgstr "得到 %s (%d) %s"

3922

3870 -#: fetch-pack.c:533

3923 +#: fetch-pack.c:534

3924 #, c-format

3925 msgid "Marking %s as complete"

3926 msgstr "标记 %s 为完成"

3927

3875 -#: fetch-pack.c:754

3928 +#: fetch-pack.c:755

3929 #, c-format

3930 msgid "already have %s (%s)"

3931 msgstr "已经有 %s（%s）"

3932

3880 -#: fetch-pack.c:818

3933 +#: fetch-pack.c:819

3934 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3935 msgstr "fetch-pack：无法派生 sideband 多路输出"

3936

3884 -#: fetch-pack.c:826

3937 +#: fetch-pack.c:827

3938 msgid "protocol error: bad pack header"

3939 msgstr "协议错误：坏的包头"

3940

3888 -#: fetch-pack.c:900

3941 +#: fetch-pack.c:901

3942 #, c-format

3943 msgid "fetch-pack: unable to fork off %s"

3944 msgstr "fetch-pack：无法派生进程 %s"

3945

3893 -#: fetch-pack.c:916

3946 +#: fetch-pack.c:917

3947 #, c-format

3948 msgid "%s failed"

3949 msgstr "%s 失败"

3950

3898 -#: fetch-pack.c:918

3951 +#: fetch-pack.c:919

3952 msgid "error in sideband demultiplexer"

3953 msgstr "sideband 多路输出出错"

3954

3902 -#: fetch-pack.c:965

3955 +#: fetch-pack.c:966

3956 #, c-format

3957 msgid "Server version is %.*s"

3958 msgstr "服务器版本 %.*s"

3959

3907 -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

3908 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

3909 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

3910 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

3960 +#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986

3961 +#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002

3962 +#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018

3963 +#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040

3964 #, c-format

3965 msgid "Server supports %s"

3966 msgstr "服务器支持 %s"

3967

3915 -#: fetch-pack.c:972

3968 +#: fetch-pack.c:973

3969 msgid "Server does not support shallow clients"

3970 msgstr "服务器不支持 shalllow 客户端"

3971

3919 -#: fetch-pack.c:1032

3972 +#: fetch-pack.c:1033

3973 msgid "Server does not support --shallow-since"

3974 msgstr "服务器不支持 --shallow-since"

3975

3923 -#: fetch-pack.c:1037

3976 +#: fetch-pack.c:1038

3977 msgid "Server does not support --shallow-exclude"

3978 msgstr "服务器不支持 --shallow-exclude"

3979

3927 -#: fetch-pack.c:1041

3980 +#: fetch-pack.c:1042

3981 msgid "Server does not support --deepen"

3982 msgstr "服务器不支持 --deepen"

3983

3931 -#: fetch-pack.c:1058

3984 +#: fetch-pack.c:1059

3985 msgid "no common commits"

3986 msgstr "没有共同的提交"

3987

3935 -#: fetch-pack.c:1070 fetch-pack.c:1536

3988 +#: fetch-pack.c:1071 fetch-pack.c:1563

3989 msgid "git fetch-pack: fetch failed."

3990 msgstr "git fetch-pack：获取失败。"

3991

3939 -#: fetch-pack.c:1209

3992 +#: fetch-pack.c:1211

3993 msgid "Server does not support shallow requests"

3994 msgstr "服务器不支持 shalllow 请求"

3995

3943 -#: fetch-pack.c:1216

3996 +#: fetch-pack.c:1218

3997 msgid "Server supports filter"

3998 msgstr "服务器支持 filter"

3999

3947 -#: fetch-pack.c:1239

4000 +#: fetch-pack.c:1242

4001 msgid "unable to write request to remote"

4002 msgstr "无法将请求写到远程"

4003

3951 -#: fetch-pack.c:1257

4004 +#: fetch-pack.c:1260

4005 #, c-format

4006 msgid "error reading section header '%s'"

4007 msgstr "读取节标题 '%s' 出错"

4008

3956 -#: fetch-pack.c:1263

4009 +#: fetch-pack.c:1266

4010 #, c-format

4011 msgid "expected '%s', received '%s'"

4012 msgstr "预期 '%s'，得到 '%s'"

4013

3961 -#: fetch-pack.c:1303

4014 +#: fetch-pack.c:1327

4015 #, c-format

4016 msgid "unexpected acknowledgment line: '%s'"

4017 msgstr "意外的确认行：'%s'"

4018

3966 -#: fetch-pack.c:1308

4019 +#: fetch-pack.c:1332

4020 #, c-format

4021 msgid "error processing acks: %d"

4022 msgstr "处理 ack 出错：%d"

4023

3971 -#: fetch-pack.c:1318

4024 +#: fetch-pack.c:1342

4025 msgid "expected packfile to be sent after 'ready'"

4026 msgstr "预期在 'ready' 之后发送 packfile"

4027

3975 -#: fetch-pack.c:1320

4028 +#: fetch-pack.c:1344

4029 msgid "expected no other sections to be sent after no 'ready'"

4030 msgstr "在没有 'ready' 不应该发送其它小节"

4031

3979 -#: fetch-pack.c:1362

4032 +#: fetch-pack.c:1386

4033 #, c-format

4034 msgid "error processing shallow info: %d"

4035 msgstr "处理浅克隆信息出错：%d"

4036

3984 -#: fetch-pack.c:1409

4037 +#: fetch-pack.c:1433

4038 #, c-format

4039 msgid "expected wanted-ref, got '%s'"

4040 msgstr "预期 wanted-ref，得到 '%s'"

4041

3989 -#: fetch-pack.c:1414

4042 +#: fetch-pack.c:1438

4043 #, c-format

4044 msgid "unexpected wanted-ref: '%s'"

4045 msgstr "意外的 wanted-ref：'%s'"

4046

3994 -#: fetch-pack.c:1419

4047 +#: fetch-pack.c:1443

4048 #, c-format

4049 msgid "error processing wanted refs: %d"

4050 msgstr "处理要获取的引用出错：%d"

4051

3999 -#: fetch-pack.c:1762

4052 +#: fetch-pack.c:1789

4053 msgid "no matching remote head"

4054 msgstr "没有匹配的远程分支"

4055

4003 -#: fetch-pack.c:1785 builtin/clone.c:689

4056 +#: fetch-pack.c:1812 builtin/clone.c:692

4057 msgid "remote did not send all necessary objects"

4058 msgstr "远程没有发送所有必需的对象"

4059

4007 -#: fetch-pack.c:1812

4060 +#: fetch-pack.c:1839

4061 #, c-format

4062 msgid "no such remote ref %s"

4063 msgstr "没有这样的远程引用 %s"

4064

4012 -#: fetch-pack.c:1815

4065 +#: fetch-pack.c:1842

4066 #, c-format

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

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

4069

4017 -#: gpg-interface.c:408

4018 -msgid "gpg failed to sign the data"

4019 -msgstr "gpg 数据签名失败"

4020 -

4021 -#: gpg-interface.c:434

4070 +#: gpg-interface.c:272

4071 msgid "could not create temporary file"

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

4073

4025 -#: gpg-interface.c:437

4074 +#: gpg-interface.c:275

4075 #, c-format

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

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

4078

4079 +#: gpg-interface.c:457

4080 +msgid "gpg failed to sign the data"

4081 +msgstr "gpg 数据签名失败"

4082 +

4083 #: graph.c:98

4084 #, c-format

4085 msgid "ignore invalid color '%.*s' in log.graphColors"

@@ -4045,7 +4098,7 @@ msgstr ""

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

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

4100

4048 -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82

4101 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4102 #: builtin/rm.c:135

4103 #, c-format

4104 msgid "failed to stat '%s'"

@@ -4121,7 +4174,7 @@ msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

4174 msgid "These are common Git commands used in various situations:"

4175 msgstr "这些是各种场合常见的 Git 命令："

4176

4124 -#: help.c:363 git.c:98

4177 +#: help.c:363 git.c:99

4178 #, c-format

4179 msgid "unsupported command listing type '%s'"

4180 msgstr "不支持的命令列表类型 '%s'"

@@ -4130,19 +4183,19 @@ msgstr "不支持的命令列表类型 '%s'"

4183 msgid "The common Git guides are:"

4184 msgstr "最常用的 Git 向导有："

4185

4133 -#: help.c:512

4186 +#: help.c:427

4187 msgid "See 'git help <command>' to read about a specific subcommand"

4188 msgstr "执行　'git help <command>' 来查看特定子命令"

4189

4137 -#: help.c:517

4190 +#: help.c:432

4191 msgid "External commands"

4192 msgstr "外部命令"

4193

4141 -#: help.c:532

4194 +#: help.c:447

4195 msgid "Command aliases"

4196 msgstr "命令别名"

4197

4145 -#: help.c:596

4198 +#: help.c:511

4199 #, c-format

4200 msgid ""

4201 "'%s' appears to be a git command, but we were not\n"

@@ -4151,31 +4204,31 @@ msgstr ""

4204 "'%s' 像是一个 git 命令，但却无法运行。\n"

4205 "可能是 git-%s 受损？"

4206

4154 -#: help.c:655

4207 +#: help.c:570

4208 msgid "Uh oh. Your system reports no Git commands at all."

4209 msgstr "唉呀，您的系统中未发现 Git 命令。"

4210

4158 -#: help.c:677

4211 +#: help.c:592

4212 #, c-format

4213 msgid "WARNING: You called a Git command named '%s', which does not exist."

4214 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"

4215

4163 -#: help.c:682

4216 +#: help.c:597

4217 #, c-format

4218 msgid "Continuing under the assumption that you meant '%s'."

4219 msgstr "假定你想要的是 '%s' 并继续。"

4220

4168 -#: help.c:687

4221 +#: help.c:602

4222 #, c-format

4223 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4224 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"

4225

4173 -#: help.c:695

4226 +#: help.c:610

4227 #, c-format

4228 msgid "git: '%s' is not a git command. See 'git --help'."

4229 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

4230

4178 -#: help.c:699

4231 +#: help.c:614

4232 msgid ""

4233 "\n"

4234 "The most similar command is"

@@ -4189,16 +4242,16 @@ msgstr[1] ""

4242 "\n"

4243 "最相似的命令是"

4244

4192 -#: help.c:714

4245 +#: help.c:653

4246 msgid "git version [<options>]"

4247 msgstr "git version [<选项>]"

4248

4196 -#: help.c:783

4249 +#: help.c:708

4250 #, c-format

4251 msgid "%s: %s - %s"

4252 msgstr "%s：%s - %s"

4253

4201 -#: help.c:787

4254 +#: help.c:712

4255 msgid ""

4256 "\n"

4257 "Did you mean this?"

@@ -4265,36 +4318,11 @@ msgstr "不允许空的姓名（对于 <%s>）"

4318 msgid "name consists only of disallowed characters: %s"

4319 msgstr "姓名中仅包含禁用字符：%s"

4320

4268 -#: ident.c:436 builtin/commit.c:635

4321 +#: ident.c:436 builtin/commit.c:634

4322 #, c-format

4323 msgid "invalid date format: %s"

4324 msgstr "无效的日期格式：%s"

4325

4273 -#: list-objects.c:127

4274 -#, c-format

4275 -msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4276 -msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象"

4277 -

4278 -#: list-objects.c:140

4279 -#, c-format

4280 -msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4281 -msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象"

4282 -

4283 -#: list-objects.c:375

4284 -#, c-format

4285 -msgid "unable to load root tree for commit %s"

4286 -msgstr "无法为提交 %s 加载根树"

4287 -

4288 -#: list-objects-filter.c:492

4289 -#, c-format

4290 -msgid "unable to access sparse blob in '%s'"

4291 -msgstr "不能访问 '%s' 中的稀疏数据对象"

4292 -

4293 -#: list-objects-filter.c:495

4294 -#, c-format

4295 -msgid "unable to parse sparse filter data in %s"

4296 -msgstr "无法解析 %s 中的稀疏过滤器数据"

4297 -

4326 #: list-objects-filter-options.c:58

4327 msgid "expected 'tree:<depth>'"

4328 msgstr "期望 'tree:<深度>'"

@@ -4321,7 +4349,32 @@ msgstr "期望在组合后有一些东西："

4349 msgid "multiple filter-specs cannot be combined"

4350 msgstr "不能混用多种过滤规格"

4351

4324 -#: lockfile.c:151

4352 +#: list-objects-filter.c:492

4353 +#, c-format

4354 +msgid "unable to access sparse blob in '%s'"

4355 +msgstr "不能访问 '%s' 中的稀疏数据对象"

4356 +

4357 +#: list-objects-filter.c:495

4358 +#, c-format

4359 +msgid "unable to parse sparse filter data in %s"

4360 +msgstr "无法解析 %s 中的稀疏过滤器数据"

4361 +

4362 +#: list-objects.c:127

4363 +#, c-format

4364 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4365 +msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象"

4366 +

4367 +#: list-objects.c:140

4368 +#, c-format

4369 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4370 +msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"

4371 +

4372 +#: list-objects.c:375

4373 +#, c-format

4374 +msgid "unable to load root tree for commit %s"

4375 +msgstr "无法为提交 %s 加载根树"

4376 +

4377 +#: lockfile.c:152

4378 #, c-format

4379 msgid ""

4380 "Unable to create '%s.lock': %s.\n"

@@ -4339,20 +4392,14 @@ msgstr ""

4392 "可能之前有一个 git 进程在这个仓库中异常退出：\n"

4393 "手动删除这个文件再继续。"

4394

4342 -#: lockfile.c:159

4395 +#: lockfile.c:160

4396 #, c-format

4397 msgid "Unable to create '%s.lock': %s"

4398 msgstr "不能创建 '%s.lock'：%s"

4399

4347 -#: merge.c:41

4348 -msgid "failed to read the cache"

4349 -msgstr "读取缓存失败"

4350 -

4351 -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4352 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4353 -#: builtin/stash.c:265

4354 -msgid "unable to write new index file"

4355 -msgstr "无法写新的索引文件"

4400 +#: ls-refs.c:109

4401 +msgid "expected flush after ls-refs arguments"

4402 +msgstr "在 ls-refs 参数后应该有一个 flush 包"

4403

4404 #: merge-recursive.c:356

4405 msgid "(bad commit)\n"

@@ -4535,7 +4582,7 @@ msgstr "重命名"

4582 msgid "renamed"

4583 msgstr "重命名"

4584

4538 -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117

4585 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129

4586 #, c-format

4587 msgid "Refusing to lose dirty file at %s"

4588 msgstr "拒绝丢失脏文件 '%s'"

@@ -4573,14 +4620,14 @@ msgstr ""

4620 msgid " (left unresolved)"

4621 msgstr "（留下未解决）"

4622

4576 -#: merge-recursive.c:1793

4623 +#: merge-recursive.c:1805

4624 #, c-format

4625 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

4626 msgstr ""

4627 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

4628 "%5$s"

4629

4583 -#: merge-recursive.c:2056

4630 +#: merge-recursive.c:2068

4631 #, c-format

4632 msgid ""

4633 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -4590,7 +4637,7 @@ msgstr ""

4637 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

4638 "其它目录，没有目录包含大部分文件。"

4639

4593 -#: merge-recursive.c:2088

4640 +#: merge-recursive.c:2100

4641 #, c-format

4642 msgid ""

4643 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4599,7 +4646,7 @@ msgstr ""

4646 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

4647 "在：%s。"

4648

4602 -#: merge-recursive.c:2098

4649 +#: merge-recursive.c:2110

4650 #, c-format

4651 msgid ""

4652 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4608,7 +4655,7 @@ msgstr ""

4655 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

4656 "径放置于此：%s"

4657

4611 -#: merge-recursive.c:2190

4658 +#: merge-recursive.c:2202

4659 #, c-format

4660 msgid ""

4661 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -4617,59 +4664,59 @@ msgstr ""

4664 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "

4665 "%4$s->%5$s"

4666

4620 -#: merge-recursive.c:2435

4667 +#: merge-recursive.c:2447

4668 #, c-format

4669 msgid ""

4670 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4671 "renamed."

4672 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

4673

4627 -#: merge-recursive.c:2961

4674 +#: merge-recursive.c:2973

4675 #, c-format

4676 msgid "cannot read object %s"

4677 msgstr "不能读取对象 %s"

4678

4632 -#: merge-recursive.c:2964

4679 +#: merge-recursive.c:2976

4680 #, c-format

4681 msgid "object %s is not a blob"

4682 msgstr "对象 %s 不是一个数据对象"

4683

4637 -#: merge-recursive.c:3028

4684 +#: merge-recursive.c:3040

4685 msgid "modify"

4686 msgstr "修改"

4687

4641 -#: merge-recursive.c:3028

4688 +#: merge-recursive.c:3040

4689 msgid "modified"

4690 msgstr "修改"

4691

4645 -#: merge-recursive.c:3040

4692 +#: merge-recursive.c:3052

4693 msgid "content"

4694 msgstr "内容"

4695

4649 -#: merge-recursive.c:3044

4696 +#: merge-recursive.c:3056

4697 msgid "add/add"

4698 msgstr "添加/添加"

4699

4653 -#: merge-recursive.c:3067

4700 +#: merge-recursive.c:3079

4701 #, c-format

4702 msgid "Skipped %s (merged same as existing)"

4703 msgstr "略过 %s（已经做过相同合并）"

4704

4658 -#: merge-recursive.c:3089 git-submodule.sh:1003

4705 +#: merge-recursive.c:3101 git-submodule.sh:985

4706 msgid "submodule"

4707 msgstr "子模组"

4708

4662 -#: merge-recursive.c:3090

4709 +#: merge-recursive.c:3102

4710 #, c-format

4711 msgid "CONFLICT (%s): Merge conflict in %s"

4712 msgstr "冲突（%s）：合并冲突于 %s"

4713

4667 -#: merge-recursive.c:3120

4714 +#: merge-recursive.c:3132

4715 #, c-format

4716 msgid "Adding as %s instead"

4717 msgstr "而是以 %s 为名添加"

4718

4672 -#: merge-recursive.c:3203

4719 +#: merge-recursive.c:3215

4720 #, c-format

4721 msgid ""

4722 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4677,7 +4724,7 @@ msgid ""

4724 msgstr ""

4725 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

4726

4680 -#: merge-recursive.c:3206

4727 +#: merge-recursive.c:3218

4728 #, c-format

4729 msgid ""

4730 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4686,7 +4733,7 @@ msgstr ""

4733 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"

4734 "到 %s。"

4735

4689 -#: merge-recursive.c:3210

4736 +#: merge-recursive.c:3222

4737 #, c-format

4738 msgid ""

4739 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4695,7 +4742,7 @@ msgstr ""

4742 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"

4743 "动到 %5$s。"

4744

4698 -#: merge-recursive.c:3213

4745 +#: merge-recursive.c:3225

4746 #, c-format

4747 msgid ""

4748 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4704,59 +4751,59 @@ msgstr ""

4751 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

4752 "建议将其移动到 %5$s。"

4753

4707 -#: merge-recursive.c:3327

4754 +#: merge-recursive.c:3339

4755 #, c-format

4756 msgid "Removing %s"

4757 msgstr "删除 %s"

4758

4712 -#: merge-recursive.c:3350

4759 +#: merge-recursive.c:3362

4760 msgid "file/directory"

4761 msgstr "文件/目录"

4762

4716 -#: merge-recursive.c:3355

4763 +#: merge-recursive.c:3367

4764 msgid "directory/file"

4765 msgstr "目录/文件"

4766

4720 -#: merge-recursive.c:3362

4767 +#: merge-recursive.c:3374

4768 #, c-format

4769 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

4770 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

4771

4725 -#: merge-recursive.c:3371

4772 +#: merge-recursive.c:3383

4773 #, c-format

4774 msgid "Adding %s"

4775 msgstr "添加 %s"

4776

4730 -#: merge-recursive.c:3380

4777 +#: merge-recursive.c:3392

4778 #, c-format

4779 msgid "CONFLICT (add/add): Merge conflict in %s"

4780 msgstr "冲突（add/add）：合并冲突于 %s"

4781

4735 -#: merge-recursive.c:3424

4782 +#: merge-recursive.c:3436

4783 msgid "Already up to date!"

4784 msgstr "已经是最新的！"

4785

4739 -#: merge-recursive.c:3433

4786 +#: merge-recursive.c:3445

4787 #, c-format

4788 msgid "merging of trees %s and %s failed"

4789 msgstr "无法合并树 %s 和 %s"

4790

4744 -#: merge-recursive.c:3537

4791 +#: merge-recursive.c:3549

4792 msgid "Merging:"

4793 msgstr "合并："

4794

4748 -#: merge-recursive.c:3550

4795 +#: merge-recursive.c:3562

4796 #, c-format

4797 msgid "found %u common ancestor:"

4798 msgid_plural "found %u common ancestors:"

4799 msgstr[0] "发现 %u 个共同祖先："

4800 msgstr[1] "发现 %u 个共同祖先："

4801

4755 -#: merge-recursive.c:3600

4802 +#: merge-recursive.c:3612

4803 msgid "merge returned no commit"

4804 msgstr "合并未返回提交"

4805

4759 -#: merge-recursive.c:3659

4806 +#: merge-recursive.c:3671

4807 #, c-format

4808 msgid ""

4809 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4765,15 +4812,25 @@ msgstr ""

4812 "您对下列文件的本地修改将被合并操作覆盖：\n"

4813 " %s"

4814

4768 -#: merge-recursive.c:3756

4815 +#: merge-recursive.c:3768

4816 #, c-format

4817 msgid "Could not parse object '%s'"

4818 msgstr "不能解析对象 '%s'"

4819

4773 -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

4820 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885

4821 msgid "Unable to write index."

4822 msgstr "不能写入索引。"

4823

4824 +#: merge.c:41

4825 +msgid "failed to read the cache"

4826 +msgstr "读取缓存失败"

4827 +

4828 +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4829 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816

4830 +#: builtin/stash.c:265

4831 +msgid "unable to write new index file"

4832 +msgstr "无法写新的索引文件"

4833 +

4834 #: midx.c:68

4835 #, c-format

4836 msgid "multi-pack-index file %s is too small"

@@ -4823,107 +4880,115 @@ msgstr "多包索引缺少必需的对象偏移块"

4880 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4881 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

4882

4826 -#: midx.c:210

4883 +#: midx.c:208

4884 #, c-format

4885 msgid "bad pack-int-id: %u (%u total packs)"

4886 msgstr "错的 pack-int-id：%u（共有 %u 个包）"

4887

4831 -#: midx.c:260

4888 +#: midx.c:258

4889 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4890 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

4891

4835 -#: midx.c:288

4892 +#: midx.c:286

4893 msgid "error preparing packfile from multi-pack-index"

4894 msgstr "从多包索引准备 packfile 出错"

4895

4839 -#: midx.c:472

4896 +#: midx.c:470

4897 #, c-format

4898 msgid "failed to add packfile '%s'"

4899 msgstr "添加包文件 '%s' 失败"

4900

4844 -#: midx.c:478

4901 +#: midx.c:476

4902 #, c-format

4903 msgid "failed to open pack-index '%s'"

4904 msgstr "打开包索引 '%s' 失败"

4905

4849 -#: midx.c:538

4906 +#: midx.c:536

4907 #, c-format

4908 msgid "failed to locate object %d in packfile"

4909 msgstr "在包文件中定位对象 %d 失败"

4910

4854 -#: midx.c:842

4911 +#: midx.c:840

4912 msgid "Adding packfiles to multi-pack-index"

4913 msgstr "添加包文件到多包索引"

4914

4858 -#: midx.c:875

4915 +#: midx.c:873

4916 #, c-format

4917 msgid "did not see pack-file %s to drop"

4918 msgstr "没有看到要丢弃的包文件 %s"

4919

4863 -#: midx.c:973

4920 +#: midx.c:925

4921 +msgid "no pack files to index."

4922 +msgstr "没有要索引的包文件。"

4923 +

4924 +#: midx.c:977

4925 msgid "Writing chunks to multi-pack-index"

4926 msgstr "写入块到多包索引"

4927

4867 -#: midx.c:1052

4928 +#: midx.c:1056

4929 #, c-format

4930 msgid "failed to clear multi-pack-index at %s"

4931 msgstr "清理位于 %s 的多包索引失败"

4932

4872 -#: midx.c:1108

4933 +#: midx.c:1112

4934 msgid "Looking for referenced packfiles"

4935 msgstr "正在查找引用的包文件"

4936

4876 -#: midx.c:1123

4937 +#: midx.c:1127

4938 #, c-format

4939 msgid ""

4940 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4941 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4942

4882 -#: midx.c:1128

4943 +#: midx.c:1132

4944 +msgid "the midx contains no oid"

4945 +msgstr "midx 不包含 oid"

4946 +

4947 +#: midx.c:1141

4948 msgid "Verifying OID order in multi-pack-index"

4949 msgstr "校验多包索引中的 OID 顺序"

4950

4886 -#: midx.c:1137

4951 +#: midx.c:1150

4952 #, c-format

4953 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4954 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"

4955

4891 -#: midx.c:1157

4956 +#: midx.c:1170

4957 msgid "Sorting objects by packfile"

4958 msgstr "通过包文件为对象排序"

4959

4895 -#: midx.c:1164

4960 +#: midx.c:1177

4961 msgid "Verifying object offsets"

4962 msgstr "校验对象偏移"

4963

4899 -#: midx.c:1180

4964 +#: midx.c:1193

4965 #, c-format

4966 msgid "failed to load pack entry for oid[%d] = %s"

4967 msgstr "为 oid[%d] = %s 加载包条目失败"

4968

4904 -#: midx.c:1186

4969 +#: midx.c:1199

4970 #, c-format

4971 msgid "failed to load pack-index for packfile %s"

4972 msgstr "为包文件 %s 加载包索引失败"

4973

4909 -#: midx.c:1195

4974 +#: midx.c:1208

4975 #, c-format

4976 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4977 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

4978

4914 -#: midx.c:1220

4979 +#: midx.c:1233

4980 msgid "Counting referenced objects"

4981 msgstr "正在对引用对象计数"

4982

4918 -#: midx.c:1230

4983 +#: midx.c:1243

4984 msgid "Finding and deleting unreferenced packfiles"

4985 msgstr "正在查找和删除未引用的包文件"

4986

4922 -#: midx.c:1388

4987 +#: midx.c:1433

4988 msgid "could not start pack-objects"

4989 msgstr "不能开始 pack-objects"

4990

4926 -#: midx.c:1407

4991 +#: midx.c:1452

4992 msgid "could not finish pack-objects"

4993 msgstr "不能结束 pack-objects"

4994

@@ -5006,6 +5071,11 @@ msgstr "不能解析对象：%s"

5071 msgid "hash mismatch %s"

5072 msgstr "哈希值与 %s 不匹配"

5073

5074 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5075 +#, c-format

5076 +msgid "unable to get size of %s"

5077 +msgstr "无法得到 %s 的大小"

5078 +

5079 #: packfile.c:629

5080 msgid "offset before end of packfile (broken .idx?)"

5081 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

@@ -5020,10 +5090,25 @@ msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

5090 msgid "offset beyond end of pack index for %s (truncated index?)"

5091 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

5092

5023 -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

5093 +#: parse-options-cb.c:20 parse-options-cb.c:24

5094 #, c-format

5025 -msgid "unable to get size of %s"

5026 -msgstr "无法得到 %s 的大小"

5095 +msgid "option `%s' expects a numerical value"

5096 +msgstr "选项 `%s' 期望一个数字值"

5097 +

5098 +#: parse-options-cb.c:41

5099 +#, c-format

5100 +msgid "malformed expiration date '%s'"

5101 +msgstr "格式错误的到期时间：'%s'"

5102 +

5103 +#: parse-options-cb.c:54

5104 +#, c-format

5105 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5106 +msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5107 +

5108 +#: parse-options-cb.c:130 parse-options-cb.c:147

5109 +#, c-format

5110 +msgid "malformed object name '%s'"

5111 +msgstr "格式错误的对象名 '%s'"

5112

5113 #: parse-options.c:38

5114 #, c-format

@@ -5065,26 +5150,31 @@ msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

5150 msgid "did you mean `--%s` (with two dashes)?"

5151 msgstr "你的意思是 `--%s`（有两个短线）？"

5152

5068 -#: parse-options.c:857

5153 +#: parse-options.c:663 parse-options.c:963

5154 +#, c-format

5155 +msgid "alias of --%s"

5156 +msgstr "--%s 的别名"

5157 +

5158 +#: parse-options.c:854

5159 #, c-format

5160 msgid "unknown option `%s'"

5161 msgstr "未知选项 `%s'"

5162

5073 -#: parse-options.c:859

5163 +#: parse-options.c:856

5164 #, c-format

5165 msgid "unknown switch `%c'"

5166 msgstr "未知开关 `%c'"

5167

5078 -#: parse-options.c:861

5168 +#: parse-options.c:858

5169 #, c-format

5170 msgid "unknown non-ascii option in string: `%s'"

5171 msgstr "字符串中未知的非 ascii 字符选项：`%s'"

5172

5083 -#: parse-options.c:885

5173 +#: parse-options.c:882

5174 msgid "..."

5175 msgstr "..."

5176

5087 -#: parse-options.c:904

5177 +#: parse-options.c:901

5178 #, c-format

5179 msgid "usage: %s"

5180 msgstr "用法：%s"

@@ -5092,46 +5182,21 @@ msgstr "用法：%s"

5182 #. TRANSLATORS: the colon here should align with the

5183 #. one in "usage: %s" translation.

5184 #.

5095 -#: parse-options.c:910

5185 +#: parse-options.c:907

5186 #, c-format

5187 msgid " or: %s"

5188 msgstr " 或：%s"

5189

5190 # 译者：为保证在输出中对齐，注意调整句中空格！

5101 -#: parse-options.c:913

5191 +#: parse-options.c:910

5192 #, c-format

5193 msgid " %s"

5194 msgstr " %s"

5195

5106 -#: parse-options.c:952

5196 +#: parse-options.c:949

5197 msgid "-NUM"

5198 msgstr "-数字"

5199

5110 -#: parse-options.c:966

5111 -#, c-format

5112 -msgid "alias of --%s"

5113 -msgstr "--%s 的别名"

5114 -

5115 -#: parse-options-cb.c:20 parse-options-cb.c:24

5116 -#, c-format

5117 -msgid "option `%s' expects a numerical value"

5118 -msgstr "选项 `%s' 期望一个数字值"

5119 -

5120 -#: parse-options-cb.c:41

5121 -#, c-format

5122 -msgid "malformed expiration date '%s'"

5123 -msgstr "格式错误的到期时间：'%s'"

5124 -

5125 -#: parse-options-cb.c:54

5126 -#, c-format

5127 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5128 -msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5129 -

5130 -#: parse-options-cb.c:130 parse-options-cb.c:147

5131 -#, c-format

5132 -msgid "malformed object name '%s'"

5133 -msgstr "格式错误的对象名 '%s'"

5134 -

5200 #: path.c:915

5201 #, c-format

5202 msgid "Could not make %s writable by group"

@@ -5188,27 +5253,27 @@ msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

5253 msgid "%s: 'literal' and 'glob' are incompatible"

5254 msgstr "%s：'literal' 和 'glob' 不兼容"

5255

5191 -#: pathspec.c:442

5256 +#: pathspec.c:445

5257 #, c-format

5258 msgid "%s: '%s' is outside repository at '%s'"

5259 msgstr "%s：'%s' 在位于 '%s' 的仓库之外"

5260

5196 -#: pathspec.c:517

5261 +#: pathspec.c:521

5262 #, c-format

5263 msgid "'%s' (mnemonic: '%c')"

5264 msgstr "'%s'（助记符：'%c'）"

5265

5201 -#: pathspec.c:527

5266 +#: pathspec.c:531

5267 #, c-format

5268 msgid "%s: pathspec magic not supported by this command: %s"

5269 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

5270

5206 -#: pathspec.c:594

5271 +#: pathspec.c:598

5272 #, c-format

5273 msgid "pathspec '%s' is beyond a symbolic link"

5274 msgstr "路径规格 '%s' 位于符号链接中"

5275

5211 -#: pathspec.c:639

5276 +#: pathspec.c:643

5277 #, c-format

5278 msgid "line is badly quoted: %s"

5279 msgstr "行被错误地引用：%s"

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

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

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

5340

5276 -#: pretty.c:981

5341 +#: pretty.c:982

5342 msgid "unable to parse --pretty format"

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

5344

@@ -5286,29 +5351,40 @@ msgstr "远程未设置 URL"

5351 msgid "promisor remote name cannot begin with '/': %s"

5352 msgstr "promisor 远程名称不能以 '/' 开始：%s"

5353

5289 -#: range-diff.c:75

5354 +#: prune-packed.c:35

5355 +msgid "Removing duplicate objects"

5356 +msgstr "正在删除重复对象"

5357 +

5358 +#: range-diff.c:77

5359 msgid "could not start `log`"

5360 msgstr "不能启动 `log`"

5361

5293 -#: range-diff.c:77

5362 +#: range-diff.c:79

5363 msgid "could not read `log` output"

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

5365

5297 -#: range-diff.c:96 sequencer.c:5020

5366 +#: range-diff.c:98 sequencer.c:5143

5367 #, c-format

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

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

5370

5302 -#: range-diff.c:122

5371 +#: range-diff.c:112

5372 +#, c-format

5373 +msgid ""

5374 +"could not parse first line of `log` output: did not start with 'commit ': "

5375 +"'%s'"

5376 +msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"

5377 +

5378 +#: range-diff.c:137

5379 #, c-format

5380 msgid "could not parse git header '%.*s'"

5381 msgstr "无法解析 git 头 '%.*s'"

5382

5307 -#: range-diff.c:285

5383 +#: range-diff.c:301

5384 msgid "failed to generate diff"

5385 msgstr "生成 diff 失败"

5386

5311 -#: range-diff.c:518 range-diff.c:520

5387 +#: range-diff.c:534 range-diff.c:536

5388 #, c-format

5389 msgid "could not parse log for '%s'"

5390 msgstr "不能解析 '%s' 的日志"

@@ -5425,9 +5501,9 @@ msgstr "'%s' 的未排序暂存条目"

5501

5502 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5503 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5428 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5429 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5430 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5504 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5505 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5506 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5507 #: builtin/submodule--helper.c:332

5508 msgid "index file corrupt"

5509 msgstr "索引文件损坏"

@@ -5482,12 +5558,12 @@ msgstr "无法刷新共享索引 '%s'"

5558 msgid "broken index, expect %s in %s, got %s"

5559 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5560

5485 -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5561 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5562 #, c-format

5563 msgid "could not close '%s'"

5564 msgstr "不能关闭 '%s'"

5565

5490 -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5566 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5567 #, c-format

5568 msgid "could not stat '%s'"

5569 msgstr "不能对 '%s' 调用 stat"

@@ -5614,14 +5690,14 @@ msgstr ""

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

5691 "\n"

5692

5617 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5618 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

5693 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5694 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258

5695 #, c-format

5696 msgid "could not write '%s'"

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

5698

5623 -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5624 -#: builtin/rebase.c:234

5699 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5700 +#: builtin/rebase.c:240

5701 #, c-format

5702 msgid "could not write '%s'."

5703 msgstr "不能写入 '%s'。"

@@ -5651,201 +5727,83 @@ msgstr ""

5727 "可选值有：ignore、warn、error。\n"

5728 "\n"

5729

5654 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5655 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5656 -#: builtin/rebase.c:246

5730 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5731 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5732 +#: builtin/rebase.c:252

5733 #, c-format

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

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

5736

5661 -#: refs.c:262

5662 -#, c-format

5663 -msgid "%s does not point to a valid object!"

5664 -msgstr "%s 没有指向一个有效的对象！"

5737 +#: ref-filter.c:42 wt-status.c:1936

5738 +msgid "gone"

5739 +msgstr "丢失"

5740

5666 -#: refs.c:667

5741 +#: ref-filter.c:43

5742 #, c-format

5668 -msgid "ignoring dangling symref %s"

5669 -msgstr "忽略悬空符号引用 %s"

5743 +msgid "ahead %d"

5744 +msgstr "领先 %d"

5745

5671 -#: refs.c:669 ref-filter.c:2098

5746 +#: ref-filter.c:44

5747 #, c-format

5673 -msgid "ignoring broken ref %s"

5674 -msgstr "忽略损坏的引用 %s"

5748 +msgid "behind %d"

5749 +msgstr "落后 %d"

5750

5676 -#: refs.c:804

5751 +#: ref-filter.c:45

5752 #, c-format

5678 -msgid "could not open '%s' for writing: %s"

5679 -msgstr "无法为写入打开 '%s'：%s"

5753 +msgid "ahead %d, behind %d"

5754 +msgstr "领先 %d，落后 %d"

5755

5681 -#: refs.c:814 refs.c:865

5756 +#: ref-filter.c:165

5757 #, c-format

5683 -msgid "could not read ref '%s'"

5684 -msgstr "无法读取引用 '%s'"

5758 +msgid "expected format: %%(color:<color>)"

5759 +msgstr "期望的格式：%%(color:<颜色>)"

5760

5686 -#: refs.c:820

5761 +#: ref-filter.c:167

5762 #, c-format

5688 -msgid "ref '%s' already exists"

5689 -msgstr "引用 '%s' 已经存在"

5763 +msgid "unrecognized color: %%(color:%s)"

5764 +msgstr "未能识别的颜色：%%(color:%s)"

5765

5691 -#: refs.c:825

5766 +#: ref-filter.c:189

5767 #, c-format

5693 -msgid "unexpected object ID when writing '%s'"

5694 -msgstr "写入 '%s' 时意外的对象 ID"

5768 +msgid "Integer value expected refname:lstrip=%s"

5769 +msgstr "期望整数值 refname:lstrip=%s"

5770

5696 -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5697 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5698 -#: wrapper.c:620

5771 +#: ref-filter.c:193

5772 #, c-format

5700 -msgid "could not write to '%s'"

5701 -msgstr "不能写入 '%s'"

5773 +msgid "Integer value expected refname:rstrip=%s"

5774 +msgstr "期望整数值 refname:rstrip=%s"

5775

5703 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5704 -#: builtin/rebase.c:1029

5776 +#: ref-filter.c:195

5777 #, c-format

5706 -msgid "could not open '%s' for writing"

5707 -msgstr "无法打开 '%s' 进行写入"

5778 +msgid "unrecognized %%(%s) argument: %s"

5779 +msgstr "未能识别的 %%(%s) 参数：%s"

5780

5709 -#: refs.c:867

5781 +#: ref-filter.c:250

5782 #, c-format

5711 -msgid "unexpected object ID when deleting '%s'"

5712 -msgstr "删除 '%s' 时意外的对象 ID"

5783 +msgid "%%(objecttype) does not take arguments"

5784 +msgstr "%%(objecttype) 不带参数"

5785

5714 -#: refs.c:998

5786 +#: ref-filter.c:272

5787 #, c-format

5716 -msgid "log for ref %s has gap after %s"

5717 -msgstr "引用 %s 的日志在 %s 之后有缺口"

5788 +msgid "unrecognized %%(objectsize) argument: %s"

5789 +msgstr "未能识别的 %%(objectsize) 参数：%s"

5790

5719 -#: refs.c:1004

5791 +#: ref-filter.c:280

5792 #, c-format

5721 -msgid "log for ref %s unexpectedly ended on %s"

5722 -msgstr "引用 %s 的日志意外终止于 %s "

5793 +msgid "%%(deltabase) does not take arguments"

5794 +msgstr "%%(deltabase) 不带参数"

5795

5724 -#: refs.c:1063

5796 +#: ref-filter.c:292

5797 #, c-format

5726 -msgid "log for %s is empty"

5727 -msgstr "%s 的日志为空"

5798 +msgid "%%(body) does not take arguments"

5799 +msgstr "%%(body) 不带参数"

5800

5729 -#: refs.c:1155

5801 +#: ref-filter.c:301

5802 #, c-format

5731 -msgid "refusing to update ref with bad name '%s'"

5732 -msgstr "拒绝更新有错误名称 '%s' 的引用"

5803 +msgid "%%(subject) does not take arguments"

5804 +msgstr "%%(subject) 不带参数"

5805

5734 -#: refs.c:1231

5735 -#, c-format

5736 -msgid "update_ref failed for ref '%s': %s"

5737 -msgstr "对引用 '%s' 执行 update_ref 失败：%s"

5738 -

5739 -#: refs.c:2023

5740 -#, c-format

5741 -msgid "multiple updates for ref '%s' not allowed"

5742 -msgstr "不允许对引用 '%s' 多次更新"

5743 -

5744 -#: refs.c:2055

5745 -msgid "ref updates forbidden inside quarantine environment"

5746 -msgstr "在隔离环境中禁止更新引用"

5747 -

5748 -#: refs.c:2151 refs.c:2181

5749 -#, c-format

5750 -msgid "'%s' exists; cannot create '%s'"

5751 -msgstr "'%s' 已存在，无法创建 '%s'"

5752 -

5753 -#: refs.c:2157 refs.c:2192

5754 -#, c-format

5755 -msgid "cannot process '%s' and '%s' at the same time"

5756 -msgstr "无法同时处理 '%s' 和 '%s'"

5757 -

5758 -#: refs/files-backend.c:1233

5759 -#, c-format

5760 -msgid "could not remove reference %s"

5761 -msgstr "无法删除引用 %s"

5762 -

5763 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5764 -#: refs/packed-backend.c:1551

5765 -#, c-format

5766 -msgid "could not delete reference %s: %s"

5767 -msgstr "无法删除引用 %s：%s"

5768 -

5769 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5770 -#, c-format

5771 -msgid "could not delete references: %s"

5772 -msgstr "无法删除引用：%s"

5773 -

5774 -#: refspec.c:137

5775 -#, c-format

5776 -msgid "invalid refspec '%s'"

5777 -msgstr "无效的引用表达式：'%s'"

5778 -

5779 -#: ref-filter.c:42 wt-status.c:1938

5780 -msgid "gone"

5781 -msgstr "丢失"

5782 -

5783 -#: ref-filter.c:43

5784 -#, c-format

5785 -msgid "ahead %d"

5786 -msgstr "领先 %d"

5787 -

5788 -#: ref-filter.c:44

5789 -#, c-format

5790 -msgid "behind %d"

5791 -msgstr "落后 %d"

5792 -

5793 -#: ref-filter.c:45

5794 -#, c-format

5795 -msgid "ahead %d, behind %d"

5796 -msgstr "领先 %d，落后 %d"

5797 -

5798 -#: ref-filter.c:165

5799 -#, c-format

5800 -msgid "expected format: %%(color:<color>)"

5801 -msgstr "期望的格式：%%(color:<颜色>)"

5802 -

5803 -#: ref-filter.c:167

5804 -#, c-format

5805 -msgid "unrecognized color: %%(color:%s)"

5806 -msgstr "未能识别的颜色：%%(color:%s)"

5807 -

5808 -#: ref-filter.c:189

5809 -#, c-format

5810 -msgid "Integer value expected refname:lstrip=%s"

5811 -msgstr "期望整数值 refname:lstrip=%s"

5812 -

5813 -#: ref-filter.c:193

5814 -#, c-format

5815 -msgid "Integer value expected refname:rstrip=%s"

5816 -msgstr "期望整数值 refname:rstrip=%s"

5817 -

5818 -#: ref-filter.c:195

5819 -#, c-format

5820 -msgid "unrecognized %%(%s) argument: %s"

5821 -msgstr "未能识别的 %%(%s) 参数：%s"

5822 -

5823 -#: ref-filter.c:250

5824 -#, c-format

5825 -msgid "%%(objecttype) does not take arguments"

5826 -msgstr "%%(objecttype) 不带参数"

5827 -

5828 -#: ref-filter.c:272

5829 -#, c-format

5830 -msgid "unrecognized %%(objectsize) argument: %s"

5831 -msgstr "未能识别的 %%(objectsize) 参数：%s"

5832 -

5833 -#: ref-filter.c:280

5834 -#, c-format

5835 -msgid "%%(deltabase) does not take arguments"

5836 -msgstr "%%(deltabase) 不带参数"

5837 -

5838 -#: ref-filter.c:292

5839 -#, c-format

5840 -msgid "%%(body) does not take arguments"

5841 -msgstr "%%(body) 不带参数"

5842 -

5843 -#: ref-filter.c:301

5844 -#, c-format

5845 -msgid "%%(subject) does not take arguments"

5846 -msgstr "%%(subject) 不带参数"

5847 -

5848 -#: ref-filter.c:323

5806 +#: ref-filter.c:323

5807 #, c-format

5808 msgid "unknown %%(trailers) argument: %s"

5809 msgstr "未知的 %%(trailers) 参数：%s"

@@ -5961,114 +5919,232 @@ msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

5919 msgid "malformed format string %s"

5920 msgstr "错误的格式化字符串 %s"

5921

5964 -#: ref-filter.c:1488

5922 +#: ref-filter.c:1486

5923 #, c-format

5924 msgid "no branch, rebasing %s"

5925 msgstr "非分支，正变基 %s"

5926

5969 -#: ref-filter.c:1491

5927 +#: ref-filter.c:1489

5928 #, c-format

5929 msgid "no branch, rebasing detached HEAD %s"

5930 msgstr "非分支，正变基分离头指针 %s"

5931

5974 -#: ref-filter.c:1494

5932 +#: ref-filter.c:1492

5933 #, c-format

5934 msgid "no branch, bisect started on %s"

5935 msgstr "非分支，二分查找开始于 %s"

5936

5979 -#: ref-filter.c:1504

5937 +#: ref-filter.c:1502

5938 msgid "no branch"

5939 msgstr "非分支"

5940

5983 -#: ref-filter.c:1540 ref-filter.c:1749

5941 +#: ref-filter.c:1538 ref-filter.c:1747

5942 #, c-format

5943 msgid "missing object %s for %s"

5944 msgstr "缺失 %2$s 的对象 %1$s"

5945

5988 -#: ref-filter.c:1550

5946 +#: ref-filter.c:1548

5947 #, c-format

5948 msgid "parse_object_buffer failed on %s for %s"

5949 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

5950

5993 -#: ref-filter.c:2004

5951 +#: ref-filter.c:2001

5952 #, c-format

5953 msgid "malformed object at '%s'"

5954 msgstr "格式错误的对象 '%s'"

5955

5998 -#: ref-filter.c:2093

5956 +#: ref-filter.c:2090

5957 #, c-format

5958 msgid "ignoring ref with broken name %s"

5959 msgstr "忽略带有错误名称 %s 的引用"

5960

6003 -#: ref-filter.c:2389

5961 +#: ref-filter.c:2095 refs.c:625

5962 +#, c-format

5963 +msgid "ignoring broken ref %s"

5964 +msgstr "忽略损坏的引用 %s"

5965 +

5966 +#: ref-filter.c:2395

5967 #, c-format

5968 msgid "format: %%(end) atom missing"

5969 msgstr "格式：缺少 %%(end) 元素"

5970

6008 -#: ref-filter.c:2489

5971 +#: ref-filter.c:2495

5972 #, c-format

5973 msgid "option `%s' is incompatible with --merged"

5974 msgstr "选项 `%s' 和 --merged 不兼容"

5975

6013 -#: ref-filter.c:2492

5976 +#: ref-filter.c:2498

5977 #, c-format

5978 msgid "option `%s' is incompatible with --no-merged"

5979 msgstr "选项 `%s' 和 --no-merged 不兼容"

5980

6018 -#: ref-filter.c:2502

5981 +#: ref-filter.c:2508

5982 #, c-format

5983 msgid "malformed object name %s"

5984 msgstr "格式错误的对象名 %s"

5985

6023 -#: ref-filter.c:2507

5986 +#: ref-filter.c:2513

5987 #, c-format

5988 msgid "option `%s' must point to a commit"

5989 msgstr "选项 `%s' 必须指向一个提交"

5990

6028 -#: remote.c:366

5991 +#: refs.c:262

5992 +#, c-format

5993 +msgid "%s does not point to a valid object!"

5994 +msgstr "%s 没有指向一个有效的对象！"

5995 +

5996 +#: refs.c:623

5997 +#, c-format

5998 +msgid "ignoring dangling symref %s"

5999 +msgstr "忽略悬空符号引用 %s"

6000 +

6001 +#: refs.c:760

6002 +#, c-format

6003 +msgid "could not open '%s' for writing: %s"

6004 +msgstr "无法为写入打开 '%s'：%s"

6005 +

6006 +#: refs.c:770 refs.c:821

6007 +#, c-format

6008 +msgid "could not read ref '%s'"

6009 +msgstr "无法读取引用 '%s'"

6010 +

6011 +#: refs.c:776

6012 +#, c-format

6013 +msgid "ref '%s' already exists"

6014 +msgstr "引用 '%s' 已经存在"

6015 +

6016 +#: refs.c:781

6017 +#, c-format

6018 +msgid "unexpected object ID when writing '%s'"

6019 +msgstr "写入 '%s' 时意外的对象 ID"

6020 +

6021 +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6022 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173

6023 +#: wrapper.c:620

6024 +#, c-format

6025 +msgid "could not write to '%s'"

6026 +msgstr "不能写入 '%s'"

6027 +

6028 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6029 +#: builtin/rebase.c:852

6030 +#, c-format

6031 +msgid "could not open '%s' for writing"

6032 +msgstr "无法打开 '%s' 进行写入"

6033 +

6034 +#: refs.c:823

6035 +#, c-format

6036 +msgid "unexpected object ID when deleting '%s'"

6037 +msgstr "删除 '%s' 时意外的对象 ID"

6038 +

6039 +#: refs.c:954

6040 +#, c-format

6041 +msgid "log for ref %s has gap after %s"

6042 +msgstr "引用 %s 的日志在 %s 之后有缺口"

6043 +

6044 +#: refs.c:960

6045 +#, c-format

6046 +msgid "log for ref %s unexpectedly ended on %s"

6047 +msgstr "引用 %s 的日志意外终止于 %s "

6048 +

6049 +#: refs.c:1019

6050 +#, c-format

6051 +msgid "log for %s is empty"

6052 +msgstr "%s 的日志为空"

6053 +

6054 +#: refs.c:1111

6055 +#, c-format

6056 +msgid "refusing to update ref with bad name '%s'"

6057 +msgstr "拒绝更新有错误名称 '%s' 的引用"

6058 +

6059 +#: refs.c:1187

6060 +#, c-format

6061 +msgid "update_ref failed for ref '%s': %s"

6062 +msgstr "对引用 '%s' 执行 update_ref 失败：%s"

6063 +

6064 +#: refs.c:1979

6065 +#, c-format

6066 +msgid "multiple updates for ref '%s' not allowed"

6067 +msgstr "不允许对引用 '%s' 多次更新"

6068 +

6069 +#: refs.c:2011

6070 +msgid "ref updates forbidden inside quarantine environment"

6071 +msgstr "在隔离环境中禁止更新引用"

6072 +

6073 +#: refs.c:2107 refs.c:2137

6074 +#, c-format

6075 +msgid "'%s' exists; cannot create '%s'"

6076 +msgstr "'%s' 已存在，无法创建 '%s'"

6077 +

6078 +#: refs.c:2113 refs.c:2148

6079 +#, c-format

6080 +msgid "cannot process '%s' and '%s' at the same time"

6081 +msgstr "无法同时处理 '%s' 和 '%s'"

6082 +

6083 +#: refs/files-backend.c:1233

6084 +#, c-format

6085 +msgid "could not remove reference %s"

6086 +msgstr "无法删除引用 %s"

6087 +

6088 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

6089 +#: refs/packed-backend.c:1551

6090 +#, c-format

6091 +msgid "could not delete reference %s: %s"

6092 +msgstr "无法删除引用 %s：%s"

6093 +

6094 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

6095 +#, c-format

6096 +msgid "could not delete references: %s"

6097 +msgstr "无法删除引用：%s"

6098 +

6099 +#: refspec.c:137

6100 +#, c-format

6101 +msgid "invalid refspec '%s'"

6102 +msgstr "无效的引用表达式：'%s'"

6103 +

6104 +#: remote.c:355

6105 #, c-format

6106 msgid "config remote shorthand cannot begin with '/': %s"

6107 msgstr "配置的远程短名称不能以 '/' 开始：%s"

6108

6033 -#: remote.c:414

6109 +#: remote.c:403

6110 msgid "more than one receivepack given, using the first"

6111 msgstr "提供了一个以上的 receivepack，使用第一个"

6112

6037 -#: remote.c:422

6113 +#: remote.c:411

6114 msgid "more than one uploadpack given, using the first"

6115 msgstr "提供了一个以上的 uploadpack，使用第一个"

6116

6041 -#: remote.c:612

6117 +#: remote.c:594

6118 #, c-format

6119 msgid "Cannot fetch both %s and %s to %s"

6120 msgstr "不能同时获取 %s 和 %s 至 %s"

6121

6046 -#: remote.c:616

6122 +#: remote.c:598

6123 #, c-format

6124 msgid "%s usually tracks %s, not %s"

6125 msgstr "%s 通常跟踪 %s，而非 %s"

6126

6051 -#: remote.c:620

6127 +#: remote.c:602

6128 #, c-format

6129 msgid "%s tracks both %s and %s"

6130 msgstr "%s 同时跟踪 %s 和 %s"

6131

6056 -#: remote.c:688

6132 +#: remote.c:670

6133 #, c-format

6134 msgid "key '%s' of pattern had no '*'"

6135 msgstr "模式的键 '%s' 没有 '*'"

6136

6061 -#: remote.c:698

6137 +#: remote.c:680

6138 #, c-format

6139 msgid "value '%s' of pattern has no '*'"

6140 msgstr "模式的值 '%s' 没有 '*'"

6141

6066 -#: remote.c:1004

6142 +#: remote.c:986

6143 #, c-format

6144 msgid "src refspec %s does not match any"

6145 msgstr "源引用表达式 %s 没有匹配"

6146

6071 -#: remote.c:1009

6147 +#: remote.c:991

6148 #, c-format

6149 msgid "src refspec %s matches more than one"

6150 msgstr "源引用表达式 %s 匹配超过一个"

@@ -6077,7 +6153,7 @@ msgstr "源引用表达式 %s 匹配超过一个"

6153 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6154 #. the <src>.

6155 #.

6080 -#: remote.c:1024

6156 +#: remote.c:1006

6157 #, c-format

6158 msgid ""

6159 "The destination you provided is not a full refname (i.e.,\n"

@@ -6099,7 +6175,7 @@ msgstr ""

6175 "\n"

6176 "都不行，所以我们已放弃。您必须给出完整的引用。"

6177

6102 -#: remote.c:1044

6178 +#: remote.c:1026

6179 #, c-format

6180 msgid ""

6181 "The <src> part of the refspec is a commit object.\n"

@@ -6109,7 +6185,7 @@ msgstr ""

6185 "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"

6186 "'%s:refs/heads/%s' 推送么？"

6187

6112 -#: remote.c:1049

6188 +#: remote.c:1031

6189 #, c-format

6190 msgid ""

6191 "The <src> part of the refspec is a tag object.\n"

@@ -6119,7 +6195,7 @@ msgstr ""

6195 "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"

6196 "'%s:refs/tags/%s' 推送么？"

6197

6122 -#: remote.c:1054

6198 +#: remote.c:1036

6199 #, c-format

6200 msgid ""

6201 "The <src> part of the refspec is a tree object.\n"

@@ -6129,7 +6205,7 @@ msgstr ""

6205 "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"

6206 "'%s:refs/tags/%s' 推送么？"

6207

6132 -#: remote.c:1059

6208 +#: remote.c:1041

6209 #, c-format

6210 msgid ""

6211 "The <src> part of the refspec is a blob object.\n"

@@ -6139,114 +6215,114 @@ msgstr ""

6215 "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"

6216 "'%s:refs/tags/%s' 推送么？"

6217

6142 -#: remote.c:1095

6218 +#: remote.c:1077

6219 #, c-format

6220 msgid "%s cannot be resolved to branch"

6221 msgstr "%s 无法被解析为分支"

6222

6147 -#: remote.c:1106

6223 +#: remote.c:1088

6224 #, c-format

6225 msgid "unable to delete '%s': remote ref does not exist"

6226 msgstr "无法删除 '%s'：远程引用不存在"

6227

6152 -#: remote.c:1118

6228 +#: remote.c:1100

6229 #, c-format

6230 msgid "dst refspec %s matches more than one"

6231 msgstr "目标引用表达式 %s 匹配超过一个"

6232

6157 -#: remote.c:1125

6233 +#: remote.c:1107

6234 #, c-format

6235 msgid "dst ref %s receives from more than one src"

6236 msgstr "目标引用 %s 接收超过一个源"

6237

6162 -#: remote.c:1628 remote.c:1729

6238 +#: remote.c:1610 remote.c:1711

6239 msgid "HEAD does not point to a branch"

6240 msgstr "HEAD 没有指向一个分支"

6241

6166 -#: remote.c:1637

6242 +#: remote.c:1619

6243 #, c-format

6244 msgid "no such branch: '%s'"

6245 msgstr "没有此分支：'%s'"

6246

6171 -#: remote.c:1640

6247 +#: remote.c:1622

6248 #, c-format

6249 msgid "no upstream configured for branch '%s'"

6250 msgstr "尚未给分支 '%s' 设置上游"

6251

6176 -#: remote.c:1646

6252 +#: remote.c:1628

6253 #, c-format

6254 msgid "upstream branch '%s' not stored as a remote-tracking branch"

6255 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

6256

6181 -#: remote.c:1661

6257 +#: remote.c:1643

6258 #, c-format

6259 msgid "push destination '%s' on remote '%s' has no local tracking branch"

6260 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

6261

6186 -#: remote.c:1673

6262 +#: remote.c:1655

6263 #, c-format

6264 msgid "branch '%s' has no remote for pushing"

6265 msgstr "分支 '%s' 没有设置要推送的远程服务器"

6266

6191 -#: remote.c:1683

6267 +#: remote.c:1665

6268 #, c-format

6269 msgid "push refspecs for '%s' do not include '%s'"

6270 msgstr "向 '%s' 推送引用规格未包含 '%s'"

6271

6196 -#: remote.c:1696

6272 +#: remote.c:1678

6273 msgid "push has no destination (push.default is 'nothing')"

6274 msgstr "推送无目标（push.default 是 'nothing'）"

6275

6200 -#: remote.c:1718

6276 +#: remote.c:1700

6277 msgid "cannot resolve 'simple' push to a single destination"

6278 msgstr "无法解析 'simple' 推送至一个单独的目标"

6279

6204 -#: remote.c:1844

6280 +#: remote.c:1826

6281 #, c-format

6282 msgid "couldn't find remote ref %s"

6283 msgstr "无法找到远程引用 %s"

6284

6209 -#: remote.c:1857

6285 +#: remote.c:1839

6286 #, c-format

6287 msgid "* Ignoring funny ref '%s' locally"

6288 msgstr "* 在本地忽略可笑的引用 '%s'"

6289

6214 -#: remote.c:2020

6290 +#: remote.c:2002

6291 #, c-format

6292 msgid "Your branch is based on '%s', but the upstream is gone.\n"

6293 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

6294

6219 -#: remote.c:2024

6295 +#: remote.c:2006

6296 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

6297 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

6298

6223 -#: remote.c:2027

6299 +#: remote.c:2009

6300 #, c-format

6301 msgid "Your branch is up to date with '%s'.\n"

6302 msgstr "您的分支与上游分支 '%s' 一致。\n"

6303

6228 -#: remote.c:2031

6304 +#: remote.c:2013

6305 #, c-format

6306 msgid "Your branch and '%s' refer to different commits.\n"

6307 msgstr "您的分支和 '%s' 指向不同的提交。\n"

6308

6233 -#: remote.c:2034

6309 +#: remote.c:2016

6310 #, c-format

6311 msgid " (use \"%s\" for details)\n"

6312 msgstr " （使用 \"%s\" 查看详情）\n"

6313

6238 -#: remote.c:2038

6314 +#: remote.c:2020

6315 #, c-format

6316 msgid "Your branch is ahead of '%s' by %d commit.\n"

6317 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

6318 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

6319 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

6320

6245 -#: remote.c:2044

6321 +#: remote.c:2026

6322 msgid " (use \"git push\" to publish your local commits)\n"

6323 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

6324

6249 -#: remote.c:2047

6325 +#: remote.c:2029

6326 #, c-format

6327 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

6328 msgid_plural ""

@@ -6255,11 +6331,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

6331 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

6332

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

6258 -#: remote.c:2055

6334 +#: remote.c:2037

6335 msgid " (use \"git pull\" to update your local branch)\n"

6336 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

6337

6262 -#: remote.c:2058

6338 +#: remote.c:2040

6339 #, c-format

6340 msgid ""

6341 "Your branch and '%s' have diverged,\n"

@@ -6275,11 +6351,11 @@ msgstr[1] ""

6351 "并且分别有 %d 和 %d 处不同的提交。\n"

6352

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

6278 -#: remote.c:2068

6354 +#: remote.c:2050

6355 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

6356 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

6357

6282 -#: remote.c:2251

6358 +#: remote.c:2233

6359 #, c-format

6360 msgid "cannot parse expected object name '%s'"

6361 msgstr "无法解析期望的对象名 '%s'"

@@ -6299,6 +6375,11 @@ msgstr "重复的替换引用：%s"

6375 msgid "replace depth too high for object %s"

6376 msgstr "对象 %s 的替换层级太深"

6377

6378 +#: repository.c:94 builtin/init-db.c:188

6379 +#, c-format

6380 +msgid "The hash algorithm %s is not supported in this build."

6381 +msgstr "这个版本不支持 %s 哈希算法。"

6382 +

6383 #: rerere.c:217 rerere.c:226 rerere.c:229

6384 msgid "corrupt MERGE_RR"

6385 msgstr "损坏的 MERGE_RR"

@@ -6357,7 +6438,7 @@ msgstr "不能删除 stray '%s'"

6438 msgid "Recorded preimage for '%s'"

6439 msgstr "为 '%s' 记录 preimage"

6440

6360 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

6441 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6442 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6443 #, c-format

6444 msgid "could not create directory '%s'"

@@ -6392,20 +6473,29 @@ msgstr "忘记 '%s' 的解决方案\n"

6473 msgid "unable to open rr-cache directory"

6474 msgstr "不能打开 rr-cache 目录"

6475

6395 -#: revision.c:2497

6476 +#: reset.c:42

6477 +msgid "could not determine HEAD revision"

6478 +msgstr "不能确定 HEAD 版本"

6479 +

6480 +#: reset.c:70 reset.c:76 sequencer.c:3318

6481 +#, c-format

6482 +msgid "failed to find tree of %s"

6483 +msgstr "无法找到 %s 指向的树。"

6484 +

6485 +#: revision.c:2655

6486 msgid "your current branch appears to be broken"

6487 msgstr "您的当前分支好像被损坏"

6488

6399 -#: revision.c:2500

6489 +#: revision.c:2658

6490 #, c-format

6491 msgid "your current branch '%s' does not have any commits yet"

6492 msgstr "您的当前分支 '%s' 尚无任何提交"

6493

6404 -#: revision.c:2708

6494 +#: revision.c:2866

6495 msgid "--first-parent is incompatible with --bisect"

6496 msgstr "--first-parent 与 --bisect 不兼容"

6497

6408 -#: revision.c:2712

6498 +#: revision.c:2870

6499 msgid "-L does not yet support diff formats besides -p and -s"

6500 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

6501

@@ -6427,75 +6517,75 @@ msgstr ""

6517 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"

6518 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"

6519

6430 -#: send-pack.c:144

6520 +#: send-pack.c:145

6521 msgid "unexpected flush packet while reading remote unpack status"

6522 msgstr "读取远程解包状态时收到意外的 flush 包"

6523

6434 -#: send-pack.c:146

6524 +#: send-pack.c:147

6525 #, c-format

6526 msgid "unable to parse remote unpack status: %s"

6527 msgstr "不能解析远程解包状态：%s"

6528

6439 -#: send-pack.c:148

6529 +#: send-pack.c:149

6530 #, c-format

6531 msgid "remote unpack failed: %s"

6532 msgstr "远程解包失败：%s"

6533

6444 -#: send-pack.c:309

6534 +#: send-pack.c:308

6535 msgid "failed to sign the push certificate"

6536 msgstr "为推送证书签名失败"

6537

6448 -#: send-pack.c:423

6538 +#: send-pack.c:399

6539 msgid "the receiving end does not support --signed push"

6540 msgstr "接收端不支持签名推送"

6541

6452 -#: send-pack.c:425

6542 +#: send-pack.c:401

6543 msgid ""

6544 "not sending a push certificate since the receiving end does not support --"

6545 "signed push"

6546 msgstr "未发送推送证书，因为接收端不支持签名推送"

6547

6458 -#: send-pack.c:437

6548 +#: send-pack.c:413

6549 msgid "the receiving end does not support --atomic push"

6550 msgstr "接收端不支持原子推送"

6551

6462 -#: send-pack.c:442

6552 +#: send-pack.c:418

6553 msgid "the receiving end does not support push options"

6554 msgstr "接收端不支持推送选项"

6555

6466 -#: sequencer.c:191

6556 +#: sequencer.c:192

6557 #, c-format

6558 msgid "invalid commit message cleanup mode '%s'"

6559 msgstr "无效的提交信息清理模式 '%s'"

6560

6471 -#: sequencer.c:296

6561 +#: sequencer.c:297

6562 #, c-format

6563 msgid "could not delete '%s'"

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

6565

6476 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6566 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6567 #, c-format

6568 msgid "could not remove '%s'"

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

6570

6481 -#: sequencer.c:325

6571 +#: sequencer.c:326

6572 msgid "revert"

6573 msgstr "还原"

6574

6485 -#: sequencer.c:327

6575 +#: sequencer.c:328

6576 msgid "cherry-pick"

6577 msgstr "拣选"

6578

6489 -#: sequencer.c:329

6579 +#: sequencer.c:330

6580 msgid "rebase"

6581 msgstr "变基"

6582

6493 -#: sequencer.c:331

6583 +#: sequencer.c:332

6584 #, c-format

6585 msgid "unknown action: %d"

6586 msgstr "未知动作：%d"

6587

6498 -#: sequencer.c:389

6588 +#: sequencer.c:390

6589 msgid ""

6590 "after resolving the conflicts, mark the corrected paths\n"

6591 "with 'git add <paths>' or 'git rm <paths>'"

@@ -6503,7 +6593,7 @@ msgstr ""

6593 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

6594 "命令标记修正后的文件"

6595

6506 -#: sequencer.c:392

6596 +#: sequencer.c:393

6597 msgid ""

6598 "after resolving the conflicts, mark the corrected paths\n"

6599 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -6512,44 +6602,43 @@ msgstr ""

6602 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

6603 "对修正后的文件做标记，然后用 'git commit' 提交"

6604

6515 -#: sequencer.c:405 sequencer.c:2901

6605 +#: sequencer.c:406 sequencer.c:2921

6606 #, c-format

6607 msgid "could not lock '%s'"

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

6609

6520 -#: sequencer.c:412

6610 +#: sequencer.c:413

6611 #, c-format

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

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

6614

6525 -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6526 -#: sequencer.c:3185

6615 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6616 +#: sequencer.c:3203

6617 #, c-format

6618 msgid "failed to finalize '%s'"

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

6620

6531 -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6532 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6533 -#: builtin/rebase.c:593

6621 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6622 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6623 #, c-format

6624 msgid "could not read '%s'"

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

6626

6538 -#: sequencer.c:466

6627 +#: sequencer.c:457

6628 #, c-format

6629 msgid "your local changes would be overwritten by %s."

6630 msgstr "您的本地修改将被%s覆盖。"

6631

6543 -#: sequencer.c:470

6632 +#: sequencer.c:461

6633 msgid "commit your changes or stash them to proceed."

6634 msgstr "提交您的修改或贮藏后再继续。"

6635

6547 -#: sequencer.c:502

6636 +#: sequencer.c:493

6637 #, c-format

6638 msgid "%s: fast-forward"

6639 msgstr "%s：快进"

6640

6552 -#: sequencer.c:541 builtin/tag.c:565

6641 +#: sequencer.c:532 builtin/tag.c:566

6642 #, c-format

6643 msgid "Invalid cleanup mode %s"

6644 msgstr "无效的清理模式 %s"

@@ -6557,65 +6646,65 @@ msgstr "无效的清理模式 %s"

6646 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

6647 #. "rebase".

6648 #.

6560 -#: sequencer.c:635

6649 +#: sequencer.c:626

6650 #, c-format

6651 msgid "%s: Unable to write new index file"

6652 msgstr "%s：无法写入新索引文件"

6653

6565 -#: sequencer.c:652

6654 +#: sequencer.c:643

6655 msgid "unable to update cache tree"

6656 msgstr "不能更新缓存树"

6657

6569 -#: sequencer.c:666

6658 +#: sequencer.c:657

6659 msgid "could not resolve HEAD commit"

6660 msgstr "不能解析 HEAD 提交"

6661

6573 -#: sequencer.c:746

6662 +#: sequencer.c:737

6663 #, c-format

6664 msgid "no key present in '%.*s'"

6665 msgstr "在 '%.*s' 中没有 key"

6666

6578 -#: sequencer.c:757

6667 +#: sequencer.c:748

6668 #, c-format

6669 msgid "unable to dequote value of '%s'"

6670 msgstr "无法为 '%s' 的值去引号"

6671

6583 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6584 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6672 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6673 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6674 #, c-format

6675 msgid "could not open '%s' for reading"

6676 msgstr "无法打开 '%s' 进行读取"

6677

6589 -#: sequencer.c:804

6678 +#: sequencer.c:795

6679 msgid "'GIT_AUTHOR_NAME' already given"

6680 msgstr "已经给出 'GIT_AUTHOR_NAME'"

6681

6593 -#: sequencer.c:809

6682 +#: sequencer.c:800

6683 msgid "'GIT_AUTHOR_EMAIL' already given"

6684 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"

6685

6597 -#: sequencer.c:814

6686 +#: sequencer.c:805

6687 msgid "'GIT_AUTHOR_DATE' already given"

6688 msgstr "已经给出 'GIT_AUTHOR_DATE'"

6689

6601 -#: sequencer.c:818

6690 +#: sequencer.c:809

6691 #, c-format

6692 msgid "unknown variable '%s'"

6693 msgstr "未知变量 '%s'"

6694

6606 -#: sequencer.c:823

6695 +#: sequencer.c:814

6696 msgid "missing 'GIT_AUTHOR_NAME'"

6697 msgstr "缺少 'GIT_AUTHOR_NAME'"

6698

6610 -#: sequencer.c:825

6699 +#: sequencer.c:816

6700 msgid "missing 'GIT_AUTHOR_EMAIL'"

6701 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

6702

6614 -#: sequencer.c:827

6703 +#: sequencer.c:818

6704 msgid "missing 'GIT_AUTHOR_DATE'"

6705 msgstr "缺少 'GIT_AUTHOR_DATE'"

6706

6618 -#: sequencer.c:876

6707 +#: sequencer.c:867

6708 #, c-format

6709 msgid ""

6710 "you have staged changes in your working tree\n"

@@ -6644,11 +6733,11 @@ msgstr ""

6733 "\n"

6734 " git rebase --continue\n"

6735

6647 -#: sequencer.c:1148

6736 +#: sequencer.c:1141

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

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

6739

6651 -#: sequencer.c:1154

6740 +#: sequencer.c:1147

6741 msgid ""

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

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

@@ -6672,7 +6761,7 @@ msgstr ""

6761 "\n"

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

6763

6675 -#: sequencer.c:1167

6764 +#: sequencer.c:1160

6765 msgid ""

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

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

@@ -6695,325 +6784,330 @@ msgstr ""

6784 "\n"

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

6786

6698 -#: sequencer.c:1209

6787 +#: sequencer.c:1202

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

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

6790

6702 -#: sequencer.c:1211

6791 +#: sequencer.c:1204

6792 msgid "could not parse newly created commit"

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

6794

6706 -#: sequencer.c:1257

6795 +#: sequencer.c:1250

6796 msgid "unable to resolve HEAD after creating commit"

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

6798

6710 -#: sequencer.c:1259

6799 +#: sequencer.c:1252

6800 msgid "detached HEAD"

6801 msgstr "分离头指针"

6802

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

6715 -#: sequencer.c:1263

6804 +#: sequencer.c:1256

6805 msgid " (root-commit)"

6806 msgstr "（根提交）"

6807

6719 -#: sequencer.c:1284

6808 +#: sequencer.c:1277

6809 msgid "could not parse HEAD"

6810 msgstr "不能解析 HEAD"

6811

6723 -#: sequencer.c:1286

6812 +#: sequencer.c:1279

6813 #, c-format

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

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

6816

6728 -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

6817 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579

6818 msgid "could not parse HEAD commit"

6819 msgstr "不能解析 HEAD 提交"

6820

6732 -#: sequencer.c:1342 sequencer.c:1968

6821 +#: sequencer.c:1335 sequencer.c:1980

6822 msgid "unable to parse commit author"

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

6824

6736 -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

6825 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695

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

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

6828

6740 -#: sequencer.c:1386 sequencer.c:1447

6829 +#: sequencer.c:1379 sequencer.c:1450

6830 #, c-format

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

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

6833

6745 -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6746 -#: builtin/merge.c:911

6834 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894

6835 +#: builtin/merge.c:919

6836 msgid "failed to write commit object"

6837 msgstr "写提交对象失败"

6838

6750 -#: sequencer.c:1474

6839 +#: sequencer.c:1433 sequencer.c:4118

6840 +#, c-format

6841 +msgid "could not update %s"

6842 +msgstr "不能更新 %s"

6843 +

6844 +#: sequencer.c:1481

6845 #, c-format

6846 msgid "could not parse commit %s"

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

6848

6755 -#: sequencer.c:1479

6849 +#: sequencer.c:1486

6850 #, c-format

6851 msgid "could not parse parent commit %s"

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

6853

6760 -#: sequencer.c:1562 sequencer.c:1673

6854 +#: sequencer.c:1569 sequencer.c:1680

6855 #, c-format

6856 msgid "unknown command: %d"

6857 msgstr "未知命令：%d"

6858

6765 -#: sequencer.c:1620 sequencer.c:1645

6859 +#: sequencer.c:1627 sequencer.c:1652

6860 #, c-format

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

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

6863

6770 -#: sequencer.c:1630

6864 +#: sequencer.c:1637

6865 msgid "need a HEAD to fixup"

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

6867

6774 -#: sequencer.c:1632 sequencer.c:3212

6868 +#: sequencer.c:1639 sequencer.c:3230

6869 msgid "could not read HEAD"

6870 msgstr "不能读取 HEAD"

6871

6778 -#: sequencer.c:1634

6872 +#: sequencer.c:1641

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

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

6875

6782 -#: sequencer.c:1640

6876 +#: sequencer.c:1647

6877 #, c-format

6878 msgid "cannot write '%s'"

6879 msgstr "不能写 '%s'"

6880

6787 -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

6881 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496

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

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

6884

6791 -#: sequencer.c:1655

6885 +#: sequencer.c:1662

6886 #, c-format

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

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

6889

6796 -#: sequencer.c:1662

6890 +#: sequencer.c:1669

6891 #, c-format

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

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

6894

6801 -#: sequencer.c:1668

6895 +#: sequencer.c:1675

6896 #, c-format

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

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

6899

6806 -#: sequencer.c:1756

6900 +#: sequencer.c:1763

6901 msgid "your index file is unmerged."

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

6903

6810 -#: sequencer.c:1763

6904 +#: sequencer.c:1770

6905 msgid "cannot fixup root commit"

6906 msgstr "不能修复根提交"

6907

6814 -#: sequencer.c:1782

6908 +#: sequencer.c:1789

6909 #, c-format

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

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

6912

6819 -#: sequencer.c:1790 sequencer.c:1798

6913 +#: sequencer.c:1797 sequencer.c:1805

6914 #, c-format

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

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

6917

6824 -#: sequencer.c:1804

6918 +#: sequencer.c:1811

6919 #, c-format

6920 msgid "cannot get commit message for %s"

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

6922

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

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

6831 -#: sequencer.c:1823

6925 +#: sequencer.c:1830

6926 #, c-format

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

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

6929

6836 -#: sequencer.c:1888

6930 +#: sequencer.c:1895

6931 #, c-format

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

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

6934

6841 -#: sequencer.c:1943

6935 +#: sequencer.c:1952

6936 #, c-format

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

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

6939

6846 -#: sequencer.c:1944

6940 +#: sequencer.c:1953

6941 #, c-format

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

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

6944

6851 -#: sequencer.c:1961

6945 +#: sequencer.c:1972

6946 #, c-format

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

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

6949

6856 -#: sequencer.c:2018

6950 +#: sequencer.c:2030

6951 #, c-format

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

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

6954

6861 -#: sequencer.c:2025

6955 +#: sequencer.c:2037

6956 #, c-format

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

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

6959

6866 -#: sequencer.c:2102

6960 +#: sequencer.c:2114

6961 #, c-format

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

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

6964

6871 -#: sequencer.c:2111

6965 +#: sequencer.c:2123

6966 #, c-format

6967 msgid "missing arguments for %s"

6968 msgstr "缺少 %s 的参数"

6969

6876 -#: sequencer.c:2142

6970 +#: sequencer.c:2154

6971 #, c-format

6972 msgid "could not parse '%s'"

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

6974

6881 -#: sequencer.c:2203

6975 +#: sequencer.c:2215

6976 #, c-format

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

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

6979

6886 -#: sequencer.c:2214

6980 +#: sequencer.c:2226

6981 #, c-format

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

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

6984

6891 -#: sequencer.c:2298

6985 +#: sequencer.c:2310

6986 msgid "cancelling a cherry picking in progress"

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

6988

6895 -#: sequencer.c:2305

l10n: zh_CN: for git v2.27.0 l10n round 1~2