1a79b2f179 · matheusbsbs/matheus-bagliano

@@ -135,8 +135,8 @@ msgid ""

135 msgstr ""

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

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

138 -"POT-Creation-Date: 2016-11-25 22:50+0800\n"

139 -"PO-Revision-Date: 2017-01-02 20:11+0800\n"

138 +"POT-Creation-Date: 2017-02-18 01:00+0800\n"

139 +"PO-Revision-Date: 2017-02-25 00:10+0800\n"

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

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

142 "Language: zh_CN\n"

@@ -187,7 +187,7 @@ msgstr ""

187 msgid "Exiting because of an unresolved conflict."

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

189

190 -#: advice.c:114 builtin/merge.c:1181

190 +#: advice.c:114 builtin/merge.c:1206

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

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

193

@@ -360,34 +360,34 @@ msgstr "未能识别的二进制补丁位于第 %d 行"

360 msgid "patch with only garbage at line %d"

361 msgstr "补丁文件的第 %d 行只有垃圾数据"

362

363 -#: apply.c:2274

363 +#: apply.c:2265

364 #, c-format

365 msgid "unable to read symlink %s"

366 msgstr "无法读取符号链接 %s"

367

368 -#: apply.c:2278

368 +#: apply.c:2269

369 #, c-format

370 msgid "unable to open or read %s"

371 msgstr "不能打开或读取 %s"

372

373 -#: apply.c:2931

373 +#: apply.c:2922

374 #, c-format

375 msgid "invalid start of line: '%c'"

376 msgstr "无效的行首字符：'%c'"

377

378 -#: apply.c:3050

378 +#: apply.c:3041

379 #, c-format

380 msgid "Hunk #%d succeeded at %d (offset %d line)."

381 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

382 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"

383 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"

384

385 -#: apply.c:3062

385 +#: apply.c:3053

386 #, c-format

387 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

388 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

389

390 -#: apply.c:3068

390 +#: apply.c:3059

391 #, c-format

392 msgid ""

393 "while searching for:\n"

@@ -396,437 +396,438 @@ msgstr ""

396 "当查询：\n"

397 "%.*s"

398

399 -#: apply.c:3090

399 +#: apply.c:3081

400 #, c-format

401 msgid "missing binary patch data for '%s'"

402 msgstr "缺失 '%s' 的二进制补丁数据"

403

404 -#: apply.c:3098

404 +#: apply.c:3089

405 #, c-format

406 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

407 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"

408

409 -#: apply.c:3144

409 +#: apply.c:3135

410 #, c-format

411 msgid "cannot apply binary patch to '%s' without full index line"

412 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"

413

414 -#: apply.c:3154

414 +#: apply.c:3145

415 #, c-format

416 msgid ""

417 "the patch applies to '%s' (%s), which does not match the current contents."

418 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"

419

420 -#: apply.c:3162

420 +#: apply.c:3153

421 #, c-format

422 msgid "the patch applies to an empty '%s' but it is not empty"

423 msgstr "补丁应用到空文件 '%s'，但其并非空文件"

424

425 -#: apply.c:3180

425 +#: apply.c:3171

426 #, c-format

427 msgid "the necessary postimage %s for '%s' cannot be read"

428 msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"

429

430 -#: apply.c:3193

430 +#: apply.c:3184

431 #, c-format

432 msgid "binary patch does not apply to '%s'"

433 msgstr "二进制补丁未应用到 '%s'"

434

435 -#: apply.c:3199

435 +#: apply.c:3190

436 #, c-format

437 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

438 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"

439

440 -#: apply.c:3220

440 +#: apply.c:3211

441 #, c-format

442 msgid "patch failed: %s:%ld"

443 msgstr "打补丁失败：%s:%ld"

444

445 -#: apply.c:3342

445 +#: apply.c:3333

446 #, c-format

447 msgid "cannot checkout %s"

448 msgstr "不能检出 %s"

449

450 -#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248

450 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248

451 #, c-format

452 msgid "failed to read %s"

453 msgstr "无法读取 %s"

454

455 -#: apply.c:3398

455 +#: apply.c:3389

456 #, c-format

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

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

459

460 -#: apply.c:3427 apply.c:3667

460 +#: apply.c:3418 apply.c:3658

461 #, c-format

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

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

464

465 -#: apply.c:3510 apply.c:3681

465 +#: apply.c:3501 apply.c:3672

466 #, c-format

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

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

469

470 -#: apply.c:3519 apply.c:3689

470 +#: apply.c:3510 apply.c:3680

471 #, c-format

472 msgid "%s: does not match index"

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

474

475 -#: apply.c:3554

475 +#: apply.c:3545

476 msgid "repository lacks the necessary blob to fall back on 3-way merge."

477 msgstr "仓库缺乏必要的数据对象以进行三方合并。"

478

479 -#: apply.c:3557

479 +#: apply.c:3548

480 #, c-format

481 msgid "Falling back to three-way merge...\n"

482 msgstr "回落到三方合并...\n"

483

484 -#: apply.c:3573 apply.c:3577

484 +#: apply.c:3564 apply.c:3568

485 #, c-format

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

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

488

489 -#: apply.c:3589

489 +#: apply.c:3580

490 #, c-format

491 msgid "Failed to fall back on three-way merge...\n"

492 msgstr "无法回落到三方合并...\n"

493

494 -#: apply.c:3603

494 +#: apply.c:3594

495 #, c-format

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

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

498

499 -#: apply.c:3608

499 +#: apply.c:3599

500 #, c-format

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

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

503

504 -#: apply.c:3634

504 +#: apply.c:3625

505 msgid "removal patch leaves file contents"

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

507

508 -#: apply.c:3706

508 +#: apply.c:3697

509 #, c-format

510 msgid "%s: wrong type"

511 msgstr "%s：错误类型"

512

513 -#: apply.c:3708

513 +#: apply.c:3699

514 #, c-format

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

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

517

518 -#: apply.c:3859 apply.c:3861

518 +#: apply.c:3850 apply.c:3852

519 #, c-format

520 msgid "invalid path '%s'"

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

522

523 -#: apply.c:3917

523 +#: apply.c:3908

524 #, c-format

525 msgid "%s: already exists in index"

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

527

528 -#: apply.c:3920

528 +#: apply.c:3911

529 #, c-format

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

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

532

533 -#: apply.c:3940

533 +#: apply.c:3931

534 #, c-format

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

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

537

538 -#: apply.c:3945

538 +#: apply.c:3936

539 #, c-format

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

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

542

543 -#: apply.c:3965

543 +#: apply.c:3956

544 #, c-format

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

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

547

548 -#: apply.c:3969

548 +#: apply.c:3960

549 #, c-format

550 msgid "%s: patch does not apply"

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

552

553 -#: apply.c:3984

553 +#: apply.c:3975

554 #, c-format

555 msgid "Checking patch %s..."

556 msgstr "检查补丁 %s..."

557

558 -#: apply.c:4075

558 +#: apply.c:4066

559 #, c-format

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

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

562

563 -#: apply.c:4082

563 +#: apply.c:4073

564 #, c-format

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

566 msgstr "%s 的模式被改变，但它不在当前 HEAD 中"

567

568 -#: apply.c:4085

568 +#: apply.c:4076

569 #, c-format

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

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

572

573 -#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135

573 +#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135

574 #, c-format

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

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

577

578 -#: apply.c:4094

578 +#: apply.c:4085

579 #, c-format

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

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

582

583 -#: apply.c:4104

583 +#: apply.c:4095

584 #, c-format

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

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

587

588 -#: apply.c:4242

588 +#: apply.c:4233

589 #, c-format

590 msgid "unable to remove %s from index"

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

592

593 -#: apply.c:4277

593 +#: apply.c:4268

594 #, c-format

595 msgid "corrupt patch for submodule %s"

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

597

598 -#: apply.c:4283

598 +#: apply.c:4274

599 #, c-format

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

601 msgstr "不能枚举新建文件 '%s' 的状态"

602

603 -#: apply.c:4291

603 +#: apply.c:4282

604 #, c-format

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

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

607

608 -#: apply.c:4297 apply.c:4441

608 +#: apply.c:4288 apply.c:4432

609 #, c-format

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

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

612

613 -#: apply.c:4338

613 +#: apply.c:4329

614 #, c-format

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

616 msgstr "无法写入 '%s'"

617

618 -#: apply.c:4342

618 +#: apply.c:4333

619 #, c-format

620 msgid "closing file '%s'"

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

622

623 -#: apply.c:4412

623 +#: apply.c:4403

624 #, c-format

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

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

627

628 -#: apply.c:4510

628 +#: apply.c:4501

629 #, c-format

630 msgid "Applied patch %s cleanly."

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

632

633 -#: apply.c:4518

633 +#: apply.c:4509

634 msgid "internal error"

635 msgstr "内部错误"

636

637 -#: apply.c:4521

637 +#: apply.c:4512

638 #, c-format

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

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

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

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

643

644 -#: apply.c:4532

644 +#: apply.c:4523

645 #, c-format

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

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

648

649 -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989

649 +#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986

650 #, c-format

651 msgid "cannot open %s"

652 msgstr "不能打开 %s"

653

654 -#: apply.c:4554

654 +#: apply.c:4545

655 #, c-format

656 msgid "Hunk #%d applied cleanly."

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

658

659 -#: apply.c:4558

659 +#: apply.c:4549

660 #, c-format

661 msgid "Rejected hunk #%d."

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

663

664 -#: apply.c:4668

664 +#: apply.c:4659

665 #, c-format

666 msgid "Skipped patch '%s'."

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

668

669 -#: apply.c:4676

669 +#: apply.c:4667

670 msgid "unrecognized input"

671 msgstr "未能识别的输入"

672

673 -#: apply.c:4695

673 +#: apply.c:4686

674 msgid "unable to read index file"

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

676

677 -#: apply.c:4833

677 +#: apply.c:4824

678 #, c-format

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

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

681

682 -#: apply.c:4858

682 +#: apply.c:4849

683 #, c-format

684 msgid "squelched %d whitespace error"

685 msgid_plural "squelched %d whitespace errors"

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

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

688

689 -#: apply.c:4864 apply.c:4879

689 +#: apply.c:4855 apply.c:4870

690 #, c-format

691 msgid "%d line adds whitespace errors."

692 msgid_plural "%d lines add whitespace errors."

693 msgstr[0] "%d 行有空白字符误用。"

694 msgstr[1] "%d 行有空白字符误用。"

695

696 -#: apply.c:4872

696 +#: apply.c:4863

697 #, c-format

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

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

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

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

702

703 -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431

703 +#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

704 msgid "Unable to write new index file"

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

706

707 -#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280

707 +#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280

708 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

709 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407

710 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592

711 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947

709 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

710 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

711 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104

712 +#: git-add--interactive.perl:239

713 msgid "path"

714 msgstr "路径"

715

715 -#: apply.c:4920

716 +#: apply.c:4911

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

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

719

719 -#: apply.c:4923

720 +#: apply.c:4914

721 msgid "apply changes matching the given path"

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

723

723 -#: apply.c:4925 builtin/am.c:2286

724 +#: apply.c:4916 builtin/am.c:2286

725 msgid "num"

726 msgstr "数字"

727

727 -#: apply.c:4926

728 +#: apply.c:4917

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

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

731

731 -#: apply.c:4929

732 +#: apply.c:4920

733 msgid "ignore additions made by the patch"

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

735

735 -#: apply.c:4931

736 +#: apply.c:4922

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

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

739

739 -#: apply.c:4935

740 +#: apply.c:4926

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

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

743

743 -#: apply.c:4937

744 +#: apply.c:4928

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

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

747

747 -#: apply.c:4939

748 +#: apply.c:4930

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

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

751

751 -#: apply.c:4941

752 +#: apply.c:4932

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

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

755

755 -#: apply.c:4943

756 +#: apply.c:4934

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

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

759

759 -#: apply.c:4945

760 +#: apply.c:4936

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

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

763

763 -#: apply.c:4947

764 +#: apply.c:4938

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

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

767

767 -#: apply.c:4949

768 +#: apply.c:4940

769 msgid "attempt three-way merge if a patch does not apply"

770 msgstr "如果一个补丁不能应用则尝试三方合并"

771

771 -#: apply.c:4951

772 +#: apply.c:4942

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

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

775

775 -#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505

776 +#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507

777 msgid "paths are separated with NUL character"

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

779

779 -#: apply.c:4956

780 +#: apply.c:4947

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

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

783

783 -#: apply.c:4957 builtin/am.c:2265

784 +#: apply.c:4948 builtin/am.c:2265

785 msgid "action"

786 msgstr "动作"

787

787 -#: apply.c:4958

788 +#: apply.c:4949

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

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

791

791 -#: apply.c:4961 apply.c:4964

792 +#: apply.c:4952 apply.c:4955

793 msgid "ignore changes in whitespace when finding context"

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

795

795 -#: apply.c:4967

796 +#: apply.c:4958

797 msgid "apply the patch in reverse"

798 msgstr "反向应用补丁"

799

799 -#: apply.c:4969

800 +#: apply.c:4960

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

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

803

803 -#: apply.c:4971

804 +#: apply.c:4962

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

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

807

807 -#: apply.c:4973

808 +#: apply.c:4964

809 msgid "allow overlapping hunks"

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

811

811 -#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

812 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593

813 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114

812 +#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19

813 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

814 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

815 msgid "be verbose"

816 msgstr "冗长输出"

817

817 -#: apply.c:4976

818 +#: apply.c:4967

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

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

821

821 -#: apply.c:4979

822 +#: apply.c:4970

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

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

825

825 -#: apply.c:4981 builtin/am.c:2274

826 +#: apply.c:4972 builtin/am.c:2274

827 msgid "root"

828 msgstr "根目录"

829

829 -#: apply.c:4982

830 +#: apply.c:4973

831 msgid "prepend <root> to all filenames"

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

833

@@ -848,7 +849,7 @@ msgstr ""

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

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

851

851 -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327

852 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

853 #, c-format

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

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

@@ -869,11 +870,11 @@ msgstr "前缀"

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

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

872

872 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603

873 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987

874 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101

875 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401

876 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153

873 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

874 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

875 +#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544

876 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109

877 +#: parse-options.h:153

878 msgid "file"

879 msgstr "文件"

880

@@ -906,7 +907,7 @@ msgid "list supported archive formats"

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

908

909 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

909 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953

910 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969

911 msgid "repo"

912 msgstr "仓库"

913

@@ -1002,7 +1003,7 @@ msgstr ""

1003 #: bisect.c:750

1004 #, c-format

1005 msgid ""

1005 -"Some %s revs are not ancestor of the %s rev.\n"

1006 +"Some %s revs are not ancestors of the %s rev.\n"

1007 "git bisect cannot work properly in this case.\n"

1008 "Maybe you mistook %s and %s revs?\n"

1009 msgstr ""

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

1032 msgid "a %s revision is needed"

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

1034

1034 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

1035 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262

1036 #, c-format

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

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

@@ -1218,7 +1219,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

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

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

1221

1221 -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777

1222 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777

1223 #, c-format

1224 msgid "could not open '%s'"

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

@@ -1227,10 +1228,10 @@ msgstr "不能打开 '%s'"

1228 msgid "Repository lacks these prerequisite commits:"

1229 msgstr "仓库中缺少这些必备的提交："

1230

1230 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374

1231 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348

1231 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290

1232 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348

1233 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1233 -#: builtin/merge.c:356 builtin/shortlog.c:170

1234 +#: builtin/merge.c:360 builtin/shortlog.c:177

1235 msgid "revision walk setup failed"

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

1237

@@ -1269,7 +1270,7 @@ msgstr "rev-list 终止"

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

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

1272

1272 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273

1273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282

1274 #, c-format

1275 msgid "unrecognized argument: %s"

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

@@ -1287,13 +1288,13 @@ msgstr "不能创建 '%s'"

1288 msgid "index-pack died"

1289 msgstr "index-pack 终止"

1290

1290 -#: color.c:290

1291 +#: color.c:300

1292 #, c-format

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

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

1295

1295 -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493

1296 -#: builtin/am.c:2127

1296 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457

1297 +#: builtin/am.c:1493 builtin/am.c:2127

1298 #, c-format

1299 msgid "could not parse %s"

1300 msgstr "不能解析 %s"

@@ -1317,123 +1318,133 @@ msgstr ""

1318 msgid "memory exhausted"

1319 msgstr "内存耗尽"

1320

1320 -#: config.c:516

1321 +#: config.c:518

1322 #, c-format

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

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

1325

1325 -#: config.c:520

1326 +#: config.c:522

1327 #, c-format

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

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

1330

1330 -#: config.c:524

1331 +#: config.c:526

1332 #, c-format

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

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

1335

1335 -#: config.c:528

1336 +#: config.c:530

1337 #, c-format

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

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

1340

1340 -#: config.c:532

1341 +#: config.c:534

1342 #, c-format

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

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

1345

1345 -#: config.c:536

1346 +#: config.c:538

1347 #, c-format

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

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

1350

1350 -#: config.c:655

1351 +#: config.c:657

1352 msgid "out of range"

1353 msgstr "超出范围"

1354

1354 -#: config.c:655

1355 +#: config.c:657

1356 msgid "invalid unit"

1357 msgstr "无效的单位"

1358

1358 -#: config.c:661

1359 +#: config.c:663

1360 #, c-format

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

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

1363

1363 -#: config.c:666

1364 +#: config.c:668

1365 #, c-format

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

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

1368

1368 -#: config.c:669

1369 +#: config.c:671

1370 #, c-format

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

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

1373

1373 -#: config.c:672

1374 +#: config.c:674

1375 #, c-format

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

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

1378

1378 -#: config.c:675

1379 +#: config.c:677

1380 #, c-format

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

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

1383

1383 -#: config.c:678

1384 +#: config.c:680

1385 #, c-format

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

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

1388

1388 -#: config.c:681

1389 +#: config.c:683

1390 #, c-format

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

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

1393

1393 -#: config.c:768

1394 +#: config.c:770

1395 #, c-format

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

1397 msgstr "无法扩展 '%s' 中的用户目录"

1398

1398 -#: config.c:852 config.c:863

1399 +#: config.c:865 config.c:876

1400 #, c-format

1401 msgid "bad zlib compression level %d"

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

1403

1403 -#: config.c:978

1404 +#: config.c:993

1405 #, c-format

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

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

1408

1408 -#: config.c:1312

1409 +#: config.c:1149

1410 +#, c-format

1411 +msgid "bad pack compression level %d"

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

1413 +

1414 +#: config.c:1339

1415 msgid "unable to parse command-line config"

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

1417

1412 -#: config.c:1362

1418 +#: config.c:1389

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

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

1421

1416 -#: config.c:1716

1422 +#: config.c:1743

1423 #, c-format

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

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

1426

1421 -#: config.c:1718

1427 +#: config.c:1745

1428 #, c-format

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

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

1431

1426 -#: config.c:1777

1432 +#: config.c:1804

1433 #, c-format

1434 msgid "%s has multiple values"

1435 msgstr "%s 有多个取值"

1436

1431 -#: config.c:2311

1437 +#: config.c:2225 config.c:2450

1438 +#, c-format

1439 +msgid "fstat on %s failed"

1440 +msgstr "在 %s 上执行 fstat 失败"

1441 +

1442 +#: config.c:2343

1443 #, c-format

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

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

1446

1436 -#: config.c:2313

1447 +#: config.c:2345

1448 #, c-format

1449 msgid "could not unset '%s'"

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

@@ -1453,7 +1464,7 @@ msgstr ""

1464 "\n"

1465 "请确认您有正确的访问权限并且仓库存在。"

1466

1456 -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

1467 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140

1468 msgid "Checking connectivity"

1469 msgstr "检查连接中"

1470

@@ -1591,12 +1602,12 @@ msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"

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

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

1604

1594 -#: diff.c:283

1605 +#: diff.c:281

1606 #, c-format

1607 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

1608 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

1609

1599 -#: diff.c:346

1610 +#: diff.c:344

1611 #, c-format

1612 msgid ""

1613 "Found errors in 'diff.dirstat' config variable:\n"

@@ -1605,20 +1616,20 @@ msgstr ""

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

1617 "%s"

1618

1608 -#: diff.c:3087

1619 +#: diff.c:3085

1620 #, c-format

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

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

1623

1613 -#: diff.c:3412

1624 +#: diff.c:3411

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

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

1627

1617 -#: diff.c:3502

1628 +#: diff.c:3501

1629 msgid "--follow requires exactly one pathspec"

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

1631

1621 -#: diff.c:3665

1632 +#: diff.c:3664

1633 #, c-format

1634 msgid ""

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

@@ -1627,33 +1638,38 @@ msgstr ""

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

1639 "%s"

1640

1630 -#: diff.c:3679

1641 +#: diff.c:3678

1642 #, c-format

1643 msgid "Failed to parse --submodule option parameter: '%s'"

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

1645

1635 -#: diff.c:4700

1646 +#: diff.c:4696

1647 msgid "inexact rename detection was skipped due to too many files."

1648 msgstr "因为文件太多，略过不严格的重命名检查。"

1649

1639 -#: diff.c:4703

1650 +#: diff.c:4699

1651 msgid "only found copies from modified paths due to too many files."

1652 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

1653

1643 -#: diff.c:4706

1654 +#: diff.c:4702

1655 #, c-format

1656 msgid ""

1657 "you may want to set your %s variable to at least %d and retry the command."

1658 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

1659

1649 -#: dir.c:1866

1660 +#: dir.c:1862

1661 msgid "failed to get kernel name and information"

1662 msgstr "无法获得内核名称和信息"

1663

1653 -#: dir.c:1985

1664 +#: dir.c:1981

1665 msgid "Untracked cache is disabled on this system or location."

1666 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"

1667

1668 +#: dir.c:2759

1669 +#, c-format

1670 +msgid "could not migrate git directory from '%s' to '%s'"

1671 +msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

1672 +

1673 #: fetch-pack.c:213

1674 msgid "git fetch-pack: expected shallow list"

1675 msgstr "git fetch-pack：应为 shallow 列表"

@@ -1834,35 +1850,40 @@ msgstr "不能创建临时文件"

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

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

1852

1837 -#: grep.c:1782

1853 +#: graph.c:96

1854 +#, c-format

1855 +msgid "ignore invalid color '%.*s' in log.graphColors"

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

1857 +

1858 +#: grep.c:1794

1859 #, c-format

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

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

1862

1842 -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155

1863 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133

1864 #, c-format

1865 msgid "failed to stat '%s'"

1866 msgstr "无法枚举 '%s' 状态"

1867

1847 -#: grep.c:1810

1868 +#: grep.c:1822

1869 #, c-format

1870 msgid "'%s': short read"

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

1872

1852 -#: help.c:203

1873 +#: help.c:218

1874 #, c-format

1875 msgid "available git commands in '%s'"

1876 msgstr "在 '%s' 下可用的 git 命令"

1877

1857 -#: help.c:210

1878 +#: help.c:225

1879 msgid "git commands available from elsewhere on your $PATH"

1880 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

1881

1861 -#: help.c:241

1882 +#: help.c:256

1883 msgid "These are common Git commands used in various situations:"

1884 msgstr "这些是各种场合常见的 Git 命令："

1885

1865 -#: help.c:306

1886 +#: help.c:321

1887 #, c-format

1888 msgid ""

1889 "'%s' appears to be a git command, but we were not\n"

@@ -1871,11 +1892,11 @@ msgstr ""

1892 "'%s' 像是一个 git 命令，但却无法运行。\n"

1893 "可能是 git-%s 受损？"

1894

1874 -#: help.c:361

1895 +#: help.c:376

1896 msgid "Uh oh. Your system reports no Git commands at all."

1897 msgstr "唉呀，您的系统中未发现 Git 命令。"

1898

1878 -#: help.c:383

1899 +#: help.c:398

1900 #, c-format

1901 msgid ""

1902 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -1884,17 +1905,17 @@ msgstr ""

1905 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"

1906 "是 '%s'"

1907

1887 -#: help.c:388

1908 +#: help.c:403

1909 #, c-format

1910 msgid "in %0.1f seconds automatically..."

1911 msgstr "在 %0.1f 秒钟后自动运行..."

1912

1892 -#: help.c:395

1913 +#: help.c:410

1914 #, c-format

1915 msgid "git: '%s' is not a git command. See 'git --help'."

1916 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

1917

1897 -#: help.c:399 help.c:465

1918 +#: help.c:414 help.c:480

1919 msgid ""

1920 "\n"

1921 "Did you mean this?"

@@ -1908,7 +1929,7 @@ msgstr[1] ""

1929 "\n"

1930 "您指的是这其中的某一个么？"

1931

1911 -#: help.c:461

1932 +#: help.c:476

1933 #, c-format

1934 msgid "%s: %s - %s"

1935 msgstr "%s：%s - %s"

@@ -1974,69 +1995,69 @@ msgstr "无法写新的索引文件"

1995 msgid "(bad commit)\n"

1996 msgstr "（坏提交）\n"

1997

1977 -#: merge-recursive.c:231

1998 +#: merge-recursive.c:231 merge-recursive.c:239

1999 #, c-format

2000 msgid "addinfo_cache failed for path '%s'"

2001 msgstr "为路径 '%s' addinfo_cache 失败"

2002

1982 -#: merge-recursive.c:301

2003 +#: merge-recursive.c:303

2004 msgid "error building trees"

2005 msgstr "无法创建树"

2006

1986 -#: merge-recursive.c:720

2007 +#: merge-recursive.c:727

2008 #, c-format

2009 msgid "failed to create path '%s'%s"

2010 msgstr "无法创建路径 '%s'%s"

2011

1991 -#: merge-recursive.c:731

2012 +#: merge-recursive.c:738

2013 #, c-format

2014 msgid "Removing %s to make room for subdirectory\n"

2015 msgstr "删除 %s 以便为子目录留出空间\n"

2016

1996 -#: merge-recursive.c:745 merge-recursive.c:764

2017 +#: merge-recursive.c:752 merge-recursive.c:771

2018 msgid ": perhaps a D/F conflict?"

2019 msgstr "：可能是一个目录/文件冲突？"

2020

2000 -#: merge-recursive.c:754

2021 +#: merge-recursive.c:761

2022 #, c-format

2023 msgid "refusing to lose untracked file at '%s'"

2024 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

2025

2005 -#: merge-recursive.c:796 builtin/cat-file.c:34

2026 +#: merge-recursive.c:803 builtin/cat-file.c:34

2027 #, c-format

2028 msgid "cannot read object %s '%s'"

2029 msgstr "不能读取对象 %s '%s'"

2030

2010 -#: merge-recursive.c:798

2031 +#: merge-recursive.c:805

2032 #, c-format

2033 msgid "blob expected for %s '%s'"

2034 msgstr "%s '%s' 应为数据对象"

2035

2015 -#: merge-recursive.c:822

2036 +#: merge-recursive.c:829

2037 #, c-format

2038 msgid "failed to open '%s': %s"

2039 msgstr "无法打开 '%s'：%s"

2040

2020 -#: merge-recursive.c:833

2041 +#: merge-recursive.c:840

2042 #, c-format

2043 msgid "failed to symlink '%s': %s"

2044 msgstr "无法创建符号链接 '%s'：%s"

2045

2025 -#: merge-recursive.c:838

2046 +#: merge-recursive.c:845

2047 #, c-format

2048 msgid "do not know what to do with %06o %s '%s'"

2049 msgstr "不知道如何处理 %06o %s '%s'"

2050

2030 -#: merge-recursive.c:978

2051 +#: merge-recursive.c:985

2052 msgid "Failed to execute internal merge"

2053 msgstr "无法执行内部合并"

2054

2034 -#: merge-recursive.c:982

2055 +#: merge-recursive.c:989

2056 #, c-format

2057 msgid "Unable to add %s to database"

2058 msgstr "不能添加 %s 至对象库"

2059

2039 -#: merge-recursive.c:1081 merge-recursive.c:1095

2060 +#: merge-recursive.c:1088 merge-recursive.c:1102

2061 #, c-format

2062 msgid ""

2063 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2045,7 +2066,7 @@ msgstr ""

2066 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

2067 "的版本被保留。"

2068

2048 -#: merge-recursive.c:1087 merge-recursive.c:1100

2069 +#: merge-recursive.c:1094 merge-recursive.c:1107

2070 #, c-format

2071 msgid ""

2072 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2054,20 +2075,20 @@ msgstr ""

2075 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

2076 "的版本保留于 %8$s 中。"

2077

2057 -#: merge-recursive.c:1143

2078 +#: merge-recursive.c:1150

2079 msgid "rename"

2080 msgstr "重命名"

2081

2061 -#: merge-recursive.c:1143

2082 +#: merge-recursive.c:1150

2083 msgid "renamed"

2084 msgstr "重命名"

2085

2065 -#: merge-recursive.c:1200

2086 +#: merge-recursive.c:1207

2087 #, c-format

2088 msgid "%s is a directory in %s adding as %s instead"

2089 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

2090

2070 -#: merge-recursive.c:1225

2091 +#: merge-recursive.c:1232

2092 #, c-format

2093 msgid ""

2094 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -2076,135 +2097,135 @@ msgstr ""

2097 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

2098 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

2099

2079 -#: merge-recursive.c:1230

2100 +#: merge-recursive.c:1237

2101 msgid " (left unresolved)"

2102 msgstr "（留下未解决）"

2103

2083 -#: merge-recursive.c:1292

2104 +#: merge-recursive.c:1299

2105 #, c-format

2106 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2107 msgstr ""

2108 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

2109 "%5$s"

2110

2090 -#: merge-recursive.c:1325

2111 +#: merge-recursive.c:1332

2112 #, c-format

2113 msgid "Renaming %s to %s and %s to %s instead"

2114 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

2115

2095 -#: merge-recursive.c:1531

2116 +#: merge-recursive.c:1535

2117 #, c-format

2118 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2119 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

2120

2100 -#: merge-recursive.c:1546

2121 +#: merge-recursive.c:1550

2122 #, c-format

2123 msgid "Adding merged %s"

2124 msgstr "添加合并后的 %s"

2125

2105 -#: merge-recursive.c:1553 merge-recursive.c:1766

2126 +#: merge-recursive.c:1557 merge-recursive.c:1771

2127 #, c-format

2128 msgid "Adding as %s instead"

2129 msgstr "而是以 %s 为名添加"

2130

2110 -#: merge-recursive.c:1610

2131 +#: merge-recursive.c:1614

2132 #, c-format

2133 msgid "cannot read object %s"

2134 msgstr "不能读取对象 %s"

2135

2115 -#: merge-recursive.c:1613

2136 +#: merge-recursive.c:1617

2137 #, c-format

2138 msgid "object %s is not a blob"

2139 msgstr "对象 %s 不是一个数据对象"

2140

2120 -#: merge-recursive.c:1666

2141 +#: merge-recursive.c:1670

2142 msgid "modify"

2143 msgstr "修改"

2144

2124 -#: merge-recursive.c:1666

2145 +#: merge-recursive.c:1670

2146 msgid "modified"

2147 msgstr "修改"

2148

2128 -#: merge-recursive.c:1676

2149 +#: merge-recursive.c:1680

2150 msgid "content"

2151 msgstr "内容"

2152

2132 -#: merge-recursive.c:1683

2153 +#: merge-recursive.c:1687

2154 msgid "add/add"

2155 msgstr "添加/添加"

2156

2136 -#: merge-recursive.c:1718

2157 +#: merge-recursive.c:1723

2158 #, c-format

2159 msgid "Skipped %s (merged same as existing)"

2160 msgstr "略过 %s（已经做过相同合并）"

2161

2141 -#: merge-recursive.c:1732

2162 +#: merge-recursive.c:1737

2163 #, c-format

2164 msgid "Auto-merging %s"

2165 msgstr "自动合并 %s"

2166

2146 -#: merge-recursive.c:1736 git-submodule.sh:924

2167 +#: merge-recursive.c:1741 git-submodule.sh:930

2168 msgid "submodule"

2169 msgstr "子模组"

2170

2150 -#: merge-recursive.c:1737

2171 +#: merge-recursive.c:1742

2172 #, c-format

2173 msgid "CONFLICT (%s): Merge conflict in %s"

2174 msgstr "冲突（%s）：合并冲突于 %s"

2175

2155 -#: merge-recursive.c:1831

2176 +#: merge-recursive.c:1836

2177 #, c-format

2178 msgid "Removing %s"

2179 msgstr "删除 %s"

2180

2160 -#: merge-recursive.c:1857

2181 +#: merge-recursive.c:1862

2182 msgid "file/directory"

2183 msgstr "文件/目录"

2184

2164 -#: merge-recursive.c:1863

2185 +#: merge-recursive.c:1868

2186 msgid "directory/file"

2187 msgstr "目录/文件"

2188

2168 -#: merge-recursive.c:1868

2189 +#: merge-recursive.c:1874

2190 #, c-format

2191 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2192 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

2193

2173 -#: merge-recursive.c:1877

2194 +#: merge-recursive.c:1883

2195 #, c-format

2196 msgid "Adding %s"

2197 msgstr "添加 %s"

2198

2178 -#: merge-recursive.c:1914

2199 +#: merge-recursive.c:1920

2200 msgid "Already up-to-date!"

2201 msgstr "已经是最新的！"

2202

2182 -#: merge-recursive.c:1923

2203 +#: merge-recursive.c:1929

2204 #, c-format

2205 msgid "merging of trees %s and %s failed"

2206 msgstr "无法合并树 %s 和 %s"

2207

2187 -#: merge-recursive.c:2006

2208 +#: merge-recursive.c:2012

2209 msgid "Merging:"

2210 msgstr "合并："

2211

2191 -#: merge-recursive.c:2019

2212 +#: merge-recursive.c:2025

2213 #, c-format

2214 msgid "found %u common ancestor:"

2215 msgid_plural "found %u common ancestors:"

2216 msgstr[0] "发现 %u 个共同祖先："

2217 msgstr[1] "发现 %u 个共同祖先："

2218

2198 -#: merge-recursive.c:2058

2219 +#: merge-recursive.c:2064

2220 msgid "merge returned no commit"

2221 msgstr "合并未返回提交"

2222

2202 -#: merge-recursive.c:2121

2223 +#: merge-recursive.c:2127

2224 #, c-format

2225 msgid "Could not parse object '%s'"

2226 msgstr "不能解析对象 '%s'"

2227

2207 -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

2228 +#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792

2229 msgid "Unable to write index."

2230 msgstr "不能写入索引。"

2231

@@ -2216,8 +2237,8 @@ msgid ""

2237 "commit/abort the previous merge before you start a new notes merge."

2238 msgstr ""

2239 "您的前一次注释合并尚未结束（存在 %s）。\n"

2219 -"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 "

2220 -"'git notes merge --abort' 来提交/终止前一次合并。"

2240 +"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "

2241 +"notes merge --abort' 来提交/终止前一次合并。"

2242

2243 #: notes-merge.c:280

2244 #, c-format

@@ -2245,7 +2266,7 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

2266 msgid "Bad %s value: '%s'"

2267 msgstr "坏的 %s 值：'%s'"

2268

2248 -#: object.c:242

2269 +#: object.c:240

2270 #, c-format

2271 msgid "unable to parse object: %s"

2272 msgstr "不能解析对象：%s"

@@ -2286,56 +2307,61 @@ msgstr "非法的对象名 '%s'"

2307 msgid "Could not make %s writable by group"

2308 msgstr "不能设置 %s 为组可写"

2309

2289 -#: pathspec.c:133

2310 +#: pathspec.c:142

2311 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2312 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

2313

2293 -#: pathspec.c:143

2314 +#: pathspec.c:149

2315 msgid ""

2316 "global 'literal' pathspec setting is incompatible with all other global "

2317 "pathspec settings"

2318 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

2319

2299 -#: pathspec.c:177

2320 +#: pathspec.c:188

2321 msgid "invalid parameter for pathspec magic 'prefix'"

2322 msgstr "路径规格包含无效的神奇前缀"

2323

2303 -#: pathspec.c:183

2324 +#: pathspec.c:201

2325 #, c-format

2326 msgid "Invalid pathspec magic '%.*s' in '%s'"

2327 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

2328

2308 -#: pathspec.c:187

2329 +#: pathspec.c:206

2330 #, c-format

2331 msgid "Missing ')' at the end of pathspec magic in '%s'"

2332 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

2333

2313 -#: pathspec.c:205

2334 +#: pathspec.c:238

2335 #, c-format

2336 msgid "Unimplemented pathspec magic '%c' in '%s'"

2337 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

2338

2318 -#: pathspec.c:230

2339 +#: pathspec.c:293 pathspec.c:315

2340 +#, c-format

2341 +msgid "Pathspec '%s' is in submodule '%.*s'"

2342 +msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

2343 +

2344 +#: pathspec.c:350

2345 #, c-format

2346 msgid "%s: 'literal' and 'glob' are incompatible"

2347 msgstr "%s：'literal' 和 'glob' 不兼容"

2348

2323 -#: pathspec.c:241

2349 +#: pathspec.c:363

2350 #, c-format

2351 msgid "%s: '%s' is outside repository"

2352 msgstr "%s：'%s' 在仓库之外"

2353

2328 -#: pathspec.c:291

2354 +#: pathspec.c:451

2355 #, c-format

2330 -msgid "Pathspec '%s' is in submodule '%.*s'"

2331 -msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

2356 +msgid "'%s' (mnemonic: '%c')"

2357 +msgstr "'%s'（助记符：'%c'）"

2358

2333 -#: pathspec.c:353

2359 +#: pathspec.c:461

2360 #, c-format

2361 msgid "%s: pathspec magic not supported by this command: %s"

2362 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

2363

2338 -#: pathspec.c:408

2364 +#: pathspec.c:511

2365 msgid ""

2366 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2367 "use . instead if you meant to match all paths"

@@ -2343,12 +2369,12 @@ msgstr ""

2369 "在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"

2370 "请代之以 ."

2371

2346 -#: pathspec.c:440

2372 +#: pathspec.c:535

2373 #, c-format

2374 msgid "pathspec '%s' is beyond a symbolic link"

2375 msgstr "路径规格 '%s' 位于符号链接中"

2376

2351 -#: pathspec.c:449

2377 +#: pathspec.c:544

2378 msgid ""

2379 "There is nothing to exclude from by :(exclude) patterns.\n"

2380 "Perhaps you forgot to add either ':/' or '.' ?"

@@ -2356,11 +2382,11 @@ msgstr ""

2382 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"

2383 "添加 ':/' 或 '.' ？"

2384

2359 -#: pretty.c:971

2385 +#: pretty.c:982

2386 msgid "unable to parse --pretty format"

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

2388

2363 -#: read-cache.c:1315

2389 +#: read-cache.c:1307

2390 #, c-format

2391 msgid ""

2392 "index.version set, but the value is invalid.\n"

@@ -2369,7 +2395,7 @@ msgstr ""

2395 "设置了 index.version，但是取值无效。\n"

2396 "使用版本 %i"

2397

2372 -#: read-cache.c:1325

2398 +#: read-cache.c:1317

2399 #, c-format

2400 msgid ""

2401 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -2378,7 +2404,7 @@ msgstr ""

2404 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

2405 "使用版本 %i"

2406

2381 -#: refs.c:576 builtin/merge.c:840

2407 +#: refs.c:576 builtin/merge.c:844

2408 #, c-format

2409 msgid "Could not open '%s' for writing"

2410 msgstr "无法打开 '%s' 进行写入"

@@ -2398,227 +2424,232 @@ msgstr "无法删除引用：%s"

2424 msgid "could not remove reference %s"

2425 msgstr "无法删除引用 %s"

2426

2401 -#: ref-filter.c:55

2427 +#: ref-filter.c:56

2428 #, c-format

2429 msgid "expected format: %%(color:<color>)"

2430 msgstr "期望的格式：%%(color:<color>)"

2431

2406 -#: ref-filter.c:57

2432 +#: ref-filter.c:58

2433 #, c-format

2434 msgid "unrecognized color: %%(color:%s)"

2435 msgstr "未能识别的颜色：%%(color:%s)"

2436

2411 -#: ref-filter.c:71

2437 +#: ref-filter.c:72

2438 #, c-format

2439 msgid "unrecognized format: %%(%s)"

2440 msgstr "未能识别的格式：%%(%s)"

2441

2416 -#: ref-filter.c:77

2442 +#: ref-filter.c:78

2443 #, c-format

2444 msgid "%%(body) does not take arguments"

2445 msgstr "%%(body) 不带参数"

2446

2421 -#: ref-filter.c:84

2447 +#: ref-filter.c:85

2448 #, c-format

2449 msgid "%%(subject) does not take arguments"

2450 msgstr "%%(subject) 不带参数"

2451

2426 -#: ref-filter.c:101

2452 +#: ref-filter.c:92

2453 +#, c-format

2454 +msgid "%%(trailers) does not take arguments"

2455 +msgstr "%%(trailers) 不带参数"

2456 +

2457 +#: ref-filter.c:111

2458 #, c-format

2459 msgid "positive value expected contents:lines=%s"

2460 msgstr "要为 contents:lines=%s 提供一个正数"

2461

2431 -#: ref-filter.c:103

2462 +#: ref-filter.c:113

2463 #, c-format

2464 msgid "unrecognized %%(contents) argument: %s"

2465 msgstr "未能识别的 %%(contents) 参数：%s"

2466

2436 -#: ref-filter.c:113

2467 +#: ref-filter.c:123

2468 #, c-format

2469 msgid "unrecognized %%(objectname) argument: %s"

2470 msgstr "未能识别的 %%(objectname) 参数：%s"

2471

2441 -#: ref-filter.c:135

2472 +#: ref-filter.c:145

2473 #, c-format

2474 msgid "expected format: %%(align:<width>,<position>)"

2475 msgstr "期望的格式：%%(align:<width>,<position>)"

2476

2446 -#: ref-filter.c:147

2477 +#: ref-filter.c:157

2478 #, c-format

2479 msgid "unrecognized position:%s"

2480 msgstr "未能识别的位置：%s"

2481

2451 -#: ref-filter.c:151

2482 +#: ref-filter.c:161

2483 #, c-format

2484 msgid "unrecognized width:%s"

2485 msgstr "未能识别的宽度：%s"

2486

2456 -#: ref-filter.c:157

2487 +#: ref-filter.c:167

2488 #, c-format

2489 msgid "unrecognized %%(align) argument: %s"

2490 msgstr "未能识别的 %%(align) 参数：%s"

2491

2461 -#: ref-filter.c:161

2492 +#: ref-filter.c:171

2493 #, c-format

2494 msgid "positive width expected with the %%(align) atom"

2495 msgstr "元素 %%(align) 需要一个正数的宽度"

2496

2466 -#: ref-filter.c:244

2497 +#: ref-filter.c:255

2498 #, c-format

2499 msgid "malformed field name: %.*s"

2500 msgstr "非法的字段名：%.*s"

2501

2471 -#: ref-filter.c:270

2502 +#: ref-filter.c:281

2503 #, c-format

2504 msgid "unknown field name: %.*s"

2505 msgstr "未知的字段名：%.*s"

2506

2476 -#: ref-filter.c:372

2507 +#: ref-filter.c:383

2508 #, c-format

2509 msgid "format: %%(end) atom used without corresponding atom"

2510 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

2511

2481 -#: ref-filter.c:424

2512 +#: ref-filter.c:435

2513 #, c-format

2514 msgid "malformed format string %s"

2515 msgstr "非法的格式化字符串 %s"

2516

2486 -#: ref-filter.c:878

2517 +#: ref-filter.c:898

2518 msgid ":strip= requires a positive integer argument"

2519 msgstr ":strip= 需要一个正整型参数"

2520

2490 -#: ref-filter.c:883

2521 +#: ref-filter.c:903

2522 #, c-format

2523 msgid "ref '%s' does not have %ld components to :strip"

2524 msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"

2525

2495 -#: ref-filter.c:1046

2526 +#: ref-filter.c:1066

2527 #, c-format

2528 msgid "unknown %.*s format %s"

2529 msgstr "未知的 %.*s 格式 %s"

2530

2500 -#: ref-filter.c:1066 ref-filter.c:1097

2531 +#: ref-filter.c:1086 ref-filter.c:1117

2532 #, c-format

2533 msgid "missing object %s for %s"

2534 msgstr "缺失 %2$s 的对象 %1$s"

2535

2505 -#: ref-filter.c:1069 ref-filter.c:1100

2536 +#: ref-filter.c:1089 ref-filter.c:1120

2537 #, c-format

2538 msgid "parse_object_buffer failed on %s for %s"

2539 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

2540

2510 -#: ref-filter.c:1311

2541 +#: ref-filter.c:1343

2542 #, c-format

2543 msgid "malformed object at '%s'"

2544 msgstr "非法的对象于 '%s'"

2545

2515 -#: ref-filter.c:1373

2546 +#: ref-filter.c:1410

2547 #, c-format

2548 msgid "ignoring ref with broken name %s"

2549 msgstr "忽略带有错误名称 %s 的引用"

2550

2520 -#: ref-filter.c:1378

2551 +#: ref-filter.c:1415

2552 #, c-format

2553 msgid "ignoring broken ref %s"

2554 msgstr "忽略损坏的引用 %s"

2555

2525 -#: ref-filter.c:1633

2556 +#: ref-filter.c:1670

2557 #, c-format

2558 msgid "format: %%(end) atom missing"

2559 msgstr "格式：缺少 %%(end) 元素"

2560

2530 -#: ref-filter.c:1687

2561 +#: ref-filter.c:1734

2562 #, c-format

2563 msgid "malformed object name %s"

2564 msgstr "非法的对象名 %s"

2565

2535 -#: remote.c:746

2566 +#: remote.c:754

2567 #, c-format

2568 msgid "Cannot fetch both %s and %s to %s"

2569 msgstr "不能同时获取 %s 和 %s 至 %s"

2570

2540 -#: remote.c:750

2571 +#: remote.c:758

2572 #, c-format

2573 msgid "%s usually tracks %s, not %s"

2574 msgstr "%s 通常跟踪 %s，而非 %s"

2575

2545 -#: remote.c:754

2576 +#: remote.c:762

2577 #, c-format

2578 msgid "%s tracks both %s and %s"

2579 msgstr "%s 同时跟踪 %s 和 %s"

2580

2550 -#: remote.c:762

2581 +#: remote.c:770

2582 msgid "Internal error"

2583 msgstr "内部错误"

2584

2554 -#: remote.c:1677 remote.c:1720

2585 +#: remote.c:1685 remote.c:1787

2586 msgid "HEAD does not point to a branch"

2587 msgstr "HEAD 没有指向一个分支"

2588

2558 -#: remote.c:1686

2589 +#: remote.c:1694

2590 #, c-format

2591 msgid "no such branch: '%s'"

2592 msgstr "没有此分支：'%s'"

2593

2563 -#: remote.c:1689

2594 +#: remote.c:1697

2595 #, c-format

2596 msgid "no upstream configured for branch '%s'"

2597 msgstr "尚未给分支 '%s' 设置上游"

2598

2568 -#: remote.c:1695

2599 +#: remote.c:1703

2600 #, c-format

2601 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2602 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

2603

2573 -#: remote.c:1710

2604 +#: remote.c:1718

2605 #, c-format

2606 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2607 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

2608

2578 -#: remote.c:1725

2609 +#: remote.c:1730

2610 #, c-format

2611 msgid "branch '%s' has no remote for pushing"

2612 msgstr "分支 '%s' 没有设置要推送的远程服务器"

2613

2583 -#: remote.c:1736

2614 +#: remote.c:1741

2615 #, c-format

2616 msgid "push refspecs for '%s' do not include '%s'"

2617 msgstr "向 '%s' 推送引用规格未包含 '%s'"

2618

2588 -#: remote.c:1749

2619 +#: remote.c:1754

2620 msgid "push has no destination (push.default is 'nothing')"

2621 msgstr "推送无目标（push.default 是 'nothing'）"

2622

2592 -#: remote.c:1771

2623 +#: remote.c:1776

2624 msgid "cannot resolve 'simple' push to a single destination"

2625 msgstr "无法解析 'simple' 推送至一个单独的目标"

2626

2596 -#: remote.c:2073

2627 +#: remote.c:2081

2628 #, c-format

2629 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2630 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

2631

2601 -#: remote.c:2077

2632 +#: remote.c:2085

2633 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2634 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

2635

2605 -#: remote.c:2080

2636 +#: remote.c:2088

2637 #, c-format

2638 msgid "Your branch is up-to-date with '%s'.\n"

2639 msgstr "您的分支与上游分支 '%s' 一致。\n"

2640

2610 -#: remote.c:2084

2641 +#: remote.c:2092

2642 #, c-format

2643 msgid "Your branch is ahead of '%s' by %d commit.\n"

2644 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

2645 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

2646 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

2647

2617 -#: remote.c:2090

2648 +#: remote.c:2098

2649 msgid " (use \"git push\" to publish your local commits)\n"

2650 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

2651

2621 -#: remote.c:2093

2652 +#: remote.c:2101

2653 #, c-format

2654 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

2655 msgid_plural ""

@@ -2627,11 +2658,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

2658 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

2659

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

2630 -#: remote.c:2101

2661 +#: remote.c:2109

2662 msgid " (use \"git pull\" to update your local branch)\n"

2663 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

2664

2634 -#: remote.c:2104

2665 +#: remote.c:2112

2666 #, c-format

2667 msgid ""

2668 "Your branch and '%s' have diverged,\n"

@@ -2647,7 +2678,7 @@ msgstr[1] ""

2678 "并且分别有 %d 和 %d 处不同的提交。\n"

2679

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

2650 -#: remote.c:2114

2681 +#: remote.c:2122

2682 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2683 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

2684

@@ -2664,11 +2695,11 @@ msgstr "您的当前分支 '%s' 尚无任何提交"

2695 msgid "--first-parent is incompatible with --bisect"

2696 msgstr "--first-parent 与 --bisect 不兼容"

2697

2667 -#: run-command.c:106

2698 +#: run-command.c:125

2699 msgid "open /dev/null failed"

2700 msgstr "不能打开 /dev/null"

2701

2671 -#: run-command.c:108

2702 +#: run-command.c:127

2703 #, c-format

2704 msgid "dup2(%d,%d) failed"

2705 msgstr "不能调用 dup2(%d,%d)"

@@ -2695,15 +2726,24 @@ msgstr "接收端不支持原子推送"

2726 msgid "the receiving end does not support push options"

2727 msgstr "接收端不支持推送选项"

2728

2698 -#: sequencer.c:171

2729 +#: sequencer.c:215

2730 msgid "revert"

2731 msgstr "还原"

2732

2702 -#: sequencer.c:171

2733 +#: sequencer.c:217

2734 msgid "cherry-pick"

2735 msgstr "拣选"

2736

2706 -#: sequencer.c:228

2737 +#: sequencer.c:219

2738 +msgid "rebase -i"

2739 +msgstr "rebase -i"

2740 +

2741 +#: sequencer.c:221

2742 +#, c-format

2743 +msgid "Unknown action: %d"

2744 +msgstr "未知动作：%d"

2745 +

2746 +#: sequencer.c:278

2747 msgid ""

2748 "after resolving the conflicts, mark the corrected paths\n"

2749 "with 'git add <paths>' or 'git rm <paths>'"

@@ -2711,7 +2751,7 @@ msgstr ""

2751 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

2752 "命令标记修正后的文件"

2753

2714 -#: sequencer.c:231

2754 +#: sequencer.c:281

2755 msgid ""

2756 "after resolving the conflicts, mark the corrected paths\n"

2757 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -2720,60 +2760,63 @@ msgstr ""

2760 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

2761 "对修正后的文件做标记，然后用 'git commit' 提交"

2762

2723 -#: sequencer.c:244 sequencer.c:1209

2763 +#: sequencer.c:294 sequencer.c:1667

2764 #, c-format

2765 msgid "could not lock '%s'"

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

2767

2728 -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214

2768 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686

2769 #, c-format

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

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

2772

2733 -#: sequencer.c:251

2773 +#: sequencer.c:301

2774 #, c-format

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

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

2777

2738 -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216

2778 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674

2779 #, c-format

2780 msgid "failed to finalize '%s'."

2781 msgstr "无法完成 '%s'。"

2782

2743 -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032

2783 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259

2784 +#: builtin/commit.c:749 builtin/merge.c:1036

2785 #, c-format

2786 msgid "could not read '%s'"

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

2788

2748 -#: sequencer.c:305

2789 +#: sequencer.c:355

2790 #, c-format

2791 msgid "your local changes would be overwritten by %s."

2792 msgstr "您的本地修改将被%s覆盖。"

2793

2753 -#: sequencer.c:309

2794 +#: sequencer.c:359

2795 msgid "commit your changes or stash them to proceed."

2796 msgstr "提交您的修改或保存进度后再继续。"

2797

2757 -#: sequencer.c:324

2798 +#: sequencer.c:388

2799 #, c-format

2800 msgid "%s: fast-forward"

2801 msgstr "%s：快进"

2802

2762 -#. TRANSLATORS: %s will be "revert" or "cherry-pick"

2763 -#: sequencer.c:399

2803 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or

2804 +#. * "rebase -i".

2805 +#.

2806 +#: sequencer.c:470

2807 #, c-format

2808 msgid "%s: Unable to write new index file"

2809 msgstr "%s：无法写入新索引文件"

2810

2768 -#: sequencer.c:418

2811 +#: sequencer.c:489

2812 msgid "could not resolve HEAD commit\n"

2813 msgstr "不能解析 HEAD 提交\n"

2814

2772 -#: sequencer.c:438

2815 +#: sequencer.c:509

2816 msgid "unable to update cache tree\n"

2817 msgstr "不能更新缓存树\n"

2818

2776 -#: sequencer.c:483

2819 +#: sequencer.c:592

2820 #, c-format

2821 msgid ""

2822 "you have staged changes in your working tree\n"

@@ -2789,7 +2832,8 @@ msgid ""

2832 "\n"

2833 " git rebase --continue\n"

2834 msgstr ""

2792 -"您的工作区中存在已暂存的修改\n如果这些修改需要被并入前一个提交，执行：\n"

2835 +"您的工作区中存在已暂存的修改\n"

2836 +"如果这些修改需要被并入前一个提交，执行：\n"

2837 "\n"

2838 " git commit --amend %s\n"

2839 "\n"

@@ -2801,172 +2845,390 @@ msgstr ""

2845 "\n"

2846 " git rebase --continue\n"

2847

2804 -#: sequencer.c:567

2848 +#: sequencer.c:688

2849 #, c-format

2850 msgid "could not parse commit %s\n"

2851 msgstr "不能解析提交 %s\n"

2852

2809 -#: sequencer.c:572

2853 +#: sequencer.c:693

2854 #, c-format

2855 msgid "could not parse parent commit %s\n"

2856 msgstr "不能解析父提交 %s\n"

2857

2814 -#: sequencer.c:656

2858 +#: sequencer.c:815

2859 +#, c-format

2860 +msgid ""

2861 +"unexpected 1st line of squash message:\n"

2862 +"\n"

2863 +"\t%.*s"

2864 +msgstr ""

2865 +"意外的压缩提交首行提交信息：\n"

2866 +"\n"

2867 +"\t%.*s"

2868 +

2869 +#: sequencer.c:821

2870 +#, c-format

2871 +msgid ""

2872 +"invalid 1st line of squash message:\n"

2873 +"\n"

2874 +"\t%.*s"

2875 +msgstr ""

2876 +"压缩提交的首行提交信息无效：\n"

2877 +"\n"

2878 +"\t%.*s"

2879 +

2880 +#: sequencer.c:827 sequencer.c:852

2881 +#, c-format

2882 +msgid "This is a combination of %d commits."

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

2884 +

2885 +#: sequencer.c:836

2886 +msgid "need a HEAD to fixup"

2887 +msgstr "需要一个 HEAD 来修复"

2888 +

2889 +#: sequencer.c:838

2890 +msgid "could not read HEAD"

2891 +msgstr "不能读取 HEAD"

2892 +

2893 +#: sequencer.c:840

2894 +msgid "could not read HEAD's commit message"

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

2896 +

2897 +#: sequencer.c:846

2898 +#, c-format

2899 +msgid "cannot write '%s'"

2900 +msgstr "不能写 '%s'"

2901 +

2902 +#: sequencer.c:855 git-rebase--interactive.sh:445

2903 +msgid "This is the 1st commit message:"

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

2905 +

2906 +#: sequencer.c:863

2907 +#, c-format

2908 +msgid "could not read commit message of %s"

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

2910 +

2911 +#: sequencer.c:870

2912 +#, c-format

2913 +msgid "This is the commit message #%d:"

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

2915 +

2916 +#: sequencer.c:875

2917 +#, c-format

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

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

2920 +

2921 +#: sequencer.c:880

2922 +#, c-format

2923 +msgid "unknown command: %d"

2924 +msgstr "未知命令：%d"

2925 +

2926 +#: sequencer.c:946

2927 msgid "your index file is unmerged."

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

2929

2818 -#: sequencer.c:675

2930 +#: sequencer.c:964

2931 #, c-format

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

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

2934

2823 -#: sequencer.c:683

2935 +#: sequencer.c:972

2936 #, c-format

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

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

2939

2828 -#: sequencer.c:687

2940 +#: sequencer.c:976

2941 #, c-format

2942 msgid "mainline was specified but commit %s is not a merge."

2943 msgstr "指定了主线，但是提交 %s 不是一个合并提交。"

2944

2945 +#: sequencer.c:982

2946 +#, c-format

2947 +msgid "cannot get commit message for %s"

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

2949 +

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

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

2835 -#: sequencer.c:700

2952 +#: sequencer.c:1001

2953 #, c-format

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

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

2956

2840 -#: sequencer.c:705

2957 +#: sequencer.c:1063 sequencer.c:1812

2958 #, c-format

2842 -msgid "cannot get commit message for %s"

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

2959 +msgid "could not rename '%s' to '%s'"

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

2961

2845 -#: sequencer.c:797

2962 +#: sequencer.c:1114

2963 #, c-format

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

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

2966

2850 -#: sequencer.c:798

2967 +#: sequencer.c:1115

2968 #, c-format

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

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

2971

2855 -#: sequencer.c:833

2972 +#: sequencer.c:1157

2973 msgid "empty commit set passed"

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

2975

2859 -#: sequencer.c:843

2976 +#: sequencer.c:1167

2977 #, c-format

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

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

2980

2864 -#: sequencer.c:850

2981 +#: sequencer.c:1174

2982 #, c-format

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

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

2985

2869 -#: sequencer.c:944

2986 +#: sequencer.c:1294

2987 #, c-format

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

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

2990

2874 -#: sequencer.c:950

2875 -msgid "no commits parsed."

2876 -msgstr "没有解析提交。"

2991 +#: sequencer.c:1302

2992 +#, c-format

2993 +msgid "cannot '%s' without a previous commit"

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

2995

2878 -#: sequencer.c:966

2996 +#: sequencer.c:1334

2997 #, c-format

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

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

3000

2883 -#: sequencer.c:972

3001 +#: sequencer.c:1341

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

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

3004 +

3005 +#: sequencer.c:1343

3006 #, c-format

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

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

3009

2888 -#: sequencer.c:983

3010 +#: sequencer.c:1348

3011 +msgid "no commits parsed."

3012 +msgstr "没有解析提交。"

3013 +

3014 +#: sequencer.c:1359

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

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

3017

2892 -#: sequencer.c:985

3018 +#: sequencer.c:1361

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

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

3021

2896 -#: sequencer.c:1028

3022 +#: sequencer.c:1424

3023 #, c-format

3024 msgid "invalid key: %s"

3025 msgstr "无效键名：%s"

3026

2901 -#: sequencer.c:1031

3027 +#: sequencer.c:1427

3028 #, c-format

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

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

3031

2906 -#: sequencer.c:1063

3032 +#: sequencer.c:1484

3033 #, c-format

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

3035 msgstr "非法的选项清单：'%s'"

3036

2911 -#: sequencer.c:1101

3037 +#: sequencer.c:1522

3038 msgid "a cherry-pick or revert is already in progress"

3039 msgstr "一个拣选或还原操作已在进行"

3040

2915 -#: sequencer.c:1102

3041 +#: sequencer.c:1523

3042 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3043 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

3044

2919 -#: sequencer.c:1106

3045 +#: sequencer.c:1526

3046 #, c-format

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

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

3049

2924 -#: sequencer.c:1120

3050 +#: sequencer.c:1540

3051 msgid "could not lock HEAD"

3052 msgstr "不能锁定 HEAD"

3053

2928 -#: sequencer.c:1151 sequencer.c:1289

3054 +#: sequencer.c:1596 sequencer.c:2150

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

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

3057

2932 -#: sequencer.c:1153

3058 +#: sequencer.c:1598

3059 msgid "cannot resolve HEAD"

3060 msgstr "不能解析 HEAD"

3061

2936 -#: sequencer.c:1155 sequencer.c:1189

3062 +#: sequencer.c:1600 sequencer.c:1634

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

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

3065

2940 -#: sequencer.c:1175 builtin/grep.c:578

3066 +#: sequencer.c:1620 builtin/grep.c:904

3067 #, c-format

3068 msgid "cannot open '%s'"

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

3070

2945 -#: sequencer.c:1177

3071 +#: sequencer.c:1622

3072 #, c-format

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

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

3075

2950 -#: sequencer.c:1178

3076 +#: sequencer.c:1623

3077 msgid "unexpected end of file"

3078 msgstr "意外的文件结束"

3079

2954 -#: sequencer.c:1184

3080 +#: sequencer.c:1629

3081 #, c-format

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

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

3084

2959 -#: sequencer.c:1354

3085 +#: sequencer.c:1640

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

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

3088 +

3089 +#: sequencer.c:1777 sequencer.c:2049

3090 +msgid "cannot read HEAD"

3091 +msgstr "不能读取 HEAD"

3092 +

3093 +#: sequencer.c:1817 builtin/difftool.c:574

3094 +#, c-format

3095 +msgid "could not copy '%s' to '%s'"

3096 +msgstr "不能拷贝 '%s' 至 '%s'"

3097 +

3098 +#: sequencer.c:1833

3099 +msgid "could not read index"

3100 +msgstr "不能读取索引"

3101 +

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

3103 +#: sequencer.c:1838

3104 +#, c-format

3105 +msgid ""

3106 +"execution failed: %s\n"

3107 +"%sYou can fix the problem, and then run\n"

3108 +"\n"

3109 +" git rebase --continue\n"

3110 +"\n"

3111 +msgstr ""

3112 +"执行失败：%s\n"

3113 +"%s您可以改正该问题，然后运行\n"

3114 +"\n"

3115 +" git rebase --continue\n"

3116 +"\n"

3117 +

3118 +#: sequencer.c:1844

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

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

3121 +

3122 +#: sequencer.c:1850

3123 +#, c-format

3124 +msgid ""

3125 +"execution succeeded: %s\n"

3126 +"but left changes to the index and/or the working tree\n"

3127 +"Commit or stash your changes, and then run\n"

3128 +"\n"

3129 +" git rebase --continue\n"

3130 +"\n"

3131 +msgstr ""

3132 +"执行成功：%s\n"

3133 +"但是在索引和/或工作区中存在变更\n"

3134 +"提交或暂存修改，然后运行\n"

3135 +"\n"

3136 +" git rebase --continue\n"

3137 +"\n"

3138 +

3139 +#: sequencer.c:1905 git-rebase.sh:168

3140 +#, c-format

3141 +msgid "Applied autostash."

3142 +msgstr "成功应用 autostash。"

3143 +

3144 +#: sequencer.c:1917

3145 +#, c-format

3146 +msgid "cannot store %s"

3147 +msgstr "不能存储 %s"

3148 +

3149 +#: sequencer.c:1919 git-rebase.sh:172

3150 +#, c-format

3151 +msgid ""

3152 +"Applying autostash resulted in conflicts.\n"

3153 +"Your changes are safe in the stash.\n"

3154 +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3155 +msgstr ""

3156 +"应用 autostash 导致冲突。\n"

3157 +"您的修改安全地保存在 stash 中。\n"

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

3159 +

3160 +#: sequencer.c:2000

3161 +#, c-format

3162 +msgid "stopped at %s... %.*s"

3163 +msgstr "停止在 %s... %.*s"

3164 +

3165 +#: sequencer.c:2027

3166 +#, c-format

3167 +msgid "unknown command %d"

3168 +msgstr "未知命令 %d"

3169 +

3170 +#: sequencer.c:2057

3171 +msgid "could not read orig-head"

3172 +msgstr "不能读取 orig-head"

3173 +

3174 +#: sequencer.c:2061

3175 +msgid "could not read 'onto'"

3176 +msgstr "不能读取 'onto'"

3177 +

3178 +#: sequencer.c:2068

3179 +#, c-format

3180 +msgid "could not update %s"

3181 +msgstr "不能更新 %s"

3182 +

3183 +#: sequencer.c:2075

3184 +#, c-format

3185 +msgid "could not update HEAD to %s"

3186 +msgstr "不能更新 HEAD 为 %s"

3187 +

3188 +#: sequencer.c:2159

3189 +msgid "cannot rebase: You have unstaged changes."

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

3191 +

3192 +#: sequencer.c:2164

3193 +msgid "could not remove CHERRY_PICK_HEAD"

3194 +msgstr "不能删除 CHERRY_PICK_HEAD"

3195 +

3196 +#: sequencer.c:2173

3197 +msgid "cannot amend non-existing commit"

3198 +msgstr "不能修补不存在的提交"

3199 +

3200 +#: sequencer.c:2175

3201 +#, c-format

3202 +msgid "invalid file: '%s'"

3203 +msgstr "无效文件：'%s'"

3204 +

3205 +#: sequencer.c:2177

3206 +#, c-format

3207 +msgid "invalid contents: '%s'"

3208 +msgstr "无效内容：'%s'"

3209 +

3210 +#: sequencer.c:2180

3211 +msgid ""

3212 +"\n"

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

3214 +"first and then run 'git rebase --continue' again."

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

3216 +

3217 +#: sequencer.c:2190

3218 +msgid "could not commit staged changes."

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

3220 +

3221 +#: sequencer.c:2270

3222 #, c-format

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

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

3225

2964 -#: sequencer.c:1358

3226 +#: sequencer.c:2274

3227 #, c-format

3228 msgid "%s: bad revision"

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

3230

2969 -#: sequencer.c:1391

3231 +#: sequencer.c:2307

3232 msgid "can't revert as initial commit"

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

3234

@@ -3001,29 +3263,29 @@ msgstr ""

3263 "使用 '--' 来分隔版本和路径，例如：\n"

3264 "'git <command> [<revision>...] -- [<file>...]'"

3265

3004 -#: setup.c:468

3266 +#: setup.c:470

3267 #, c-format

3268 msgid "Expected git repo version <= %d, found %d"

3269 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

3270

3009 -#: setup.c:476

3271 +#: setup.c:478

3272 msgid "unknown repository extensions found:"

3273 msgstr "发现未知的仓库扩展："

3274

3013 -#: setup.c:762

3275 +#: setup.c:768

3276 #, c-format

3277 msgid "Not a git repository (or any of the parent directories): %s"

3278 msgstr "不是一个 git 仓库（或者任何父目录）：%s"

3279

3018 -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

3280 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643

3281 msgid "Cannot come back to cwd"

3282 msgstr "无法返回当前工作目录"

3283

3022 -#: setup.c:845

3284 +#: setup.c:852

3285 msgid "Unable to read current working directory"

3286 msgstr "不能读取当前工作目录"

3287

3026 -#: setup.c:920

3288 +#: setup.c:927

3289 #, c-format

3290 msgid ""

3291 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3032,12 +3294,12 @@ msgstr ""

3294 "不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"

3295 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

3296

3035 -#: setup.c:927

3297 +#: setup.c:934

3298 #, c-format

3299 msgid "Cannot change to '%s/..'"

3300 msgstr "不能切换到 '%s/..'"

3301

3040 -#: setup.c:989

3302 +#: setup.c:996

3303 #, c-format

3304 msgid ""

3305 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3046,41 +3308,41 @@ msgstr ""

3308 "参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"

3309 "文件属主必须始终拥有读写权限。"

3310

3049 -#: sha1_file.c:473

3311 +#: sha1_file.c:490

3312 #, c-format

3313 msgid "path '%s' does not exist"

3314 msgstr "路径 '%s' 不存在"

3315

3054 -#: sha1_file.c:499

3316 +#: sha1_file.c:516

3317 #, c-format

3318 msgid "reference repository '%s' as a linked checkout is not supported yet."

3319 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

3320

3059 -#: sha1_file.c:505

3321 +#: sha1_file.c:522

3322 #, c-format

3323 msgid "reference repository '%s' is not a local repository."

3324 msgstr "参考仓库 '%s' 不是一个本地仓库。"

3325

3064 -#: sha1_file.c:511

3326 +#: sha1_file.c:528

3327 #, c-format

3328 msgid "reference repository '%s' is shallow"

3329 msgstr "参考仓库 '%s' 是一个浅克隆"

3330

3069 -#: sha1_file.c:519

3331 +#: sha1_file.c:536

3332 #, c-format

3333 msgid "reference repository '%s' is grafted"

3334 msgstr "参考仓库 '%s' 已被嫁接"

3335

3074 -#: sha1_file.c:1159

3336 +#: sha1_file.c:1176

3337 msgid "offset before end of packfile (broken .idx?)"

3338 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

3339

3078 -#: sha1_file.c:2592

3340 +#: sha1_file.c:2637

3341 #, c-format

3342 msgid "offset before start of pack index for %s (corrupt index?)"

3343 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

3344

3083 -#: sha1_file.c:2596

3345 +#: sha1_file.c:2641

3346 #, c-format

3347 msgid "offset beyond end of pack index for %s (truncated index?)"

3348 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

@@ -3115,88 +3377,131 @@ msgstr ""

3377 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

3378 "命令关闭本消息通知。"

3379

3118 -#: submodule.c:64 submodule.c:98

3380 +#: submodule.c:65 submodule.c:99

3381 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3382 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"

3383

3122 -#: submodule.c:68 submodule.c:102

3384 +#: submodule.c:69 submodule.c:103

3385 #, c-format

3386 msgid "Could not find section in .gitmodules where path=%s"

3387 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

3388

3127 -#: submodule.c:76

3389 +#: submodule.c:77

3390 #, c-format

3391 msgid "Could not update .gitmodules entry %s"

3392 msgstr "不能更新 .gitmodules 条目 %s"

3393

3132 -#: submodule.c:109

3394 +#: submodule.c:110

3395 #, c-format

3396 msgid "Could not remove .gitmodules entry for %s"

3397 msgstr "无法移除 %s 的 .gitmodules 条目"

3398

3137 -#: submodule.c:120

3399 +#: submodule.c:121

3400 msgid "staging updated .gitmodules failed"

3401 msgstr "将更新后 .gitmodules 添加暂存区失败"

3402

3141 -#: submodule.c:158

3403 +#: submodule.c:159

3404 msgid "negative values not allowed for submodule.fetchJobs"

3405 msgstr "submodule.fetchJobs 不允许为负值"

3406

3145 -#: submodule-config.c:358

3407 +#: submodule.c:1184

3408 +#, c-format

3409 +msgid "could not start 'git status in submodule '%s'"

3410 +msgstr "无法在子模组 '%s' 中启动 git status"

3411 +

3412 +#: submodule.c:1197

3413 +#, c-format

3414 +msgid "could not run 'git status in submodule '%s'"

3415 +msgstr "无法在子模组 '%s' 中执行 git status"

3416 +

3417 +#: submodule.c:1398

3418 +#, c-format

3419 +msgid ""

3420 +"relocate_gitdir for submodule '%s' with more than one worktree not supported"

3421 +msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"

3422 +

3423 +#: submodule.c:1410 submodule.c:1471

3424 +#, c-format

3425 +msgid "could not lookup name for submodule '%s'"

3426 +msgstr "不能查询子模组 '%s' 的名称"

3427 +

3428 +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640

3429 +#: builtin/submodule--helper.c:650

3430 +#, c-format

3431 +msgid "could not create directory '%s'"

3432 +msgstr "不能创建目录 '%s'"

3433 +

3434 +#: submodule.c:1420

3435 +#, c-format

3436 +msgid ""

3437 +"Migrating git directory of '%s%s' from\n"

3438 +"'%s' to\n"

3439 +"'%s'\n"

3440 +msgstr ""

3441 +"将 '%s%s' 的 git 目录从\n"

3442 +"'%s' 迁移至\n"

3443 +"'%s'\n"

3444 +

3445 +#: submodule.c:1512

3446 +#, c-format

3447 +msgid "could not recurse into submodule '%s'"

3448 +msgstr "无法递归进子模组路径 '%s'"

3449 +

3450 +#: submodule-config.c:360

3451 #, c-format

3452 msgid "invalid value for %s"

3453 msgstr "%s 的值无效"

3454

3150 -#: trailer.c:238

3455 +#: trailer.c:240

3456 #, c-format

3457 msgid "running trailer command '%s' failed"

3458 msgstr "执行 trailer 命令 '%s' 失败"

3459

3155 -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537

3156 -#: trailer.c:541

3460 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539

3461 +#: trailer.c:543

3462 #, c-format

3463 msgid "unknown value '%s' for key '%s'"

3464 msgstr "键 '%2$s' 的未知取值 '%1$s'"

3465

3161 -#: trailer.c:523 trailer.c:528 builtin/remote.c:289

3466 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289

3467 #, c-format

3468 msgid "more than one %s"

3469 msgstr "多于一个 %s"

3470

3166 -#: trailer.c:672

3471 +#: trailer.c:702

3472 #, c-format

3473 msgid "empty trailer token in trailer '%.*s'"

3474 msgstr "签名 '%.*s' 的键为空"

3475

3171 -#: trailer.c:695

3476 +#: trailer.c:722

3477 #, c-format

3478 msgid "could not read input file '%s'"

3479 msgstr "不能读取输入文件 '%s'"

3480

3176 -#: trailer.c:698

3481 +#: trailer.c:725

3482 msgid "could not read from stdin"

3483 msgstr "不能自标准输入读取"

3484

3180 -#: trailer.c:929 builtin/am.c:44

3485 +#: trailer.c:949 builtin/am.c:44

3486 #, c-format

3487 msgid "could not stat %s"

3488 msgstr "不能获取 %s 的文件状态"

3489

3185 -#: trailer.c:931

3490 +#: trailer.c:951

3491 #, c-format

3492 msgid "file %s is not a regular file"

3493 msgstr "文件 %s 不是一个正规文件"

3494

3190 -#: trailer.c:933

3495 +#: trailer.c:953

3496 #, c-format

3497 msgid "file %s is not writable by user"

3498 msgstr "文件 %s 用户不可写"

3499

3195 -#: trailer.c:945

3500 +#: trailer.c:965

3501 msgid "could not open temporary file"

3502 msgstr "不能打开临时文件"

3503

3199 -#: trailer.c:983

3504 +#: trailer.c:1001

3505 #, c-format

3506 msgid "could not rename temporary file to %s"

3507 msgstr "不能重命名临时文件为 %s"

@@ -3211,14 +3516,14 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

3516 msgid "transport: invalid depth option '%s'"

3517 msgstr "传输：无效的深度选项 '%s'"

3518

3214 -#: transport.c:817

3519 +#: transport.c:885

3520 #, c-format

3521 msgid ""

3522 "The following submodule paths contain changes that can\n"

3523 "not be found on any remote:\n"

3524 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

3525

3221 -#: transport.c:821

3526 +#: transport.c:889

3527 #, c-format

3528 msgid ""

3529 "\n"

@@ -3245,11 +3550,11 @@ msgstr ""

3550 "以推送至远程。\n"

3551 "\n"

3552

3248 -#: transport.c:829

3553 +#: transport.c:897

3554 msgid "Aborting."

3555 msgstr "正在终止。"

3556

3252 -#: transport-helper.c:1075

3557 +#: transport-helper.c:1082

3558 #, c-format

3559 msgid "Could not read ref %s"

3560 msgstr "不能读取引用 %s"

@@ -3270,7 +3575,7 @@ msgstr "树对象条目中空的文件名"

3575 msgid "too-short tree file"

3576 msgstr "太短的树文件"

3577

3273 -#: unpack-trees.c:64

3578 +#: unpack-trees.c:99

3579 #, c-format

3580 msgid ""

3581 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3279,7 +3584,7 @@ msgstr ""

3584 "您对下列文件的本地修改将被检出操作覆盖：\n"

3585 "%%s请在切换分支前提交您的修改或者保存进度。"

3586

3282 -#: unpack-trees.c:66

3587 +#: unpack-trees.c:101

3588 #, c-format

3589 msgid ""

3590 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3288,7 +3593,7 @@ msgstr ""

3593 "您对下列文件的本地修改将被检出操作覆盖：\n"

3594 "%%s"

3595

3291 -#: unpack-trees.c:69

3596 +#: unpack-trees.c:104

3597 #, c-format

3598 msgid ""

3599 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3297,7 +3602,7 @@ msgstr ""

3602 "您对下列文件的本地修改将被合并操作覆盖：\n"

3603 "%%s请在合并前提交您的修改或者保存进度。"

3604

3300 -#: unpack-trees.c:71

3605 +#: unpack-trees.c:106

3606 #, c-format

3607 msgid ""

3608 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3306,7 +3611,7 @@ msgstr ""

3611 "您对下列文件的本地修改将被合并操作覆盖：\n"

3612 "%%s"

3613

3309 -#: unpack-trees.c:74

3614 +#: unpack-trees.c:109

3615 #, c-format

3616 msgid ""

3617 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3315,7 +3620,7 @@ msgstr ""

3620 "您对下列文件的本地修改将被 %s 覆盖：\n"

3621 "%%s请在 %s 之前提交您的修改或者保存进度。"

3622

3318 -#: unpack-trees.c:76

3623 +#: unpack-trees.c:111

3624 #, c-format

3625 msgid ""

3626 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3324,16 +3629,16 @@ msgstr ""

3629 "您对下列文件的本地修改将被 %s 覆盖：\n"

3630 "%%s"

3631

3327 -#: unpack-trees.c:81

3632 +#: unpack-trees.c:116

3633 #, c-format

3634 msgid ""

3330 -"Updating the following directories would lose untracked files in it:\n"

3635 +"Updating the following directories would lose untracked files in them:\n"

3636 "%s"

3637 msgstr ""

3638 "更新如下目录将会丢失其中未跟踪的文件：\n"

3639 "%s"

3640

3336 -#: unpack-trees.c:85

3641 +#: unpack-trees.c:120

3642 #, c-format

3643 msgid ""

3644 "The following untracked working tree files would be removed by checkout:\n"

@@ -3342,7 +3647,7 @@ msgstr ""

3647 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

3648 "%%s请在切换分支之前移动或删除。"

3649

3345 -#: unpack-trees.c:87

3650 +#: unpack-trees.c:122

3651 #, c-format

3652 msgid ""

3653 "The following untracked working tree files would be removed by checkout:\n"

@@ -3351,7 +3656,7 @@ msgstr ""

3656 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

3657 "%%s"

3658

3354 -#: unpack-trees.c:90

3659 +#: unpack-trees.c:125

3660 #, c-format

3661 msgid ""

3662 "The following untracked working tree files would be removed by merge:\n"

@@ -3360,7 +3665,7 @@ msgstr ""

3665 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

3666 "%%s请在合并前移动或删除。"

3667

3363 -#: unpack-trees.c:92

3668 +#: unpack-trees.c:127

3669 #, c-format

3670 msgid ""

3671 "The following untracked working tree files would be removed by merge:\n"

@@ -3369,7 +3674,7 @@ msgstr ""

3674 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

3675 "%%s"

3676

3372 -#: unpack-trees.c:95

3677 +#: unpack-trees.c:130

3678 #, c-format

3679 msgid ""

3680 "The following untracked working tree files would be removed by %s:\n"

@@ -3378,7 +3683,7 @@ msgstr ""

3683 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

3684 "%%s请在 %s 前移动或删除。"

3685

3381 -#: unpack-trees.c:97

3686 +#: unpack-trees.c:132

3687 #, c-format

3688 msgid ""

3689 "The following untracked working tree files would be removed by %s:\n"

@@ -3387,7 +3692,7 @@ msgstr ""

3692 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

3693 "%%s"

3694

3390 -#: unpack-trees.c:102

3695 +#: unpack-trees.c:137

3696 #, c-format

3697 msgid ""

3698 "The following untracked working tree files would be overwritten by "

@@ -3397,7 +3702,7 @@ msgstr ""

3702 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

3703 "%%s请在切换分支前移动或删除。"

3704

3400 -#: unpack-trees.c:104

3705 +#: unpack-trees.c:139

3706 #, c-format

3707 msgid ""

3708 "The following untracked working tree files would be overwritten by "

@@ -3407,7 +3712,7 @@ msgstr ""

3712 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

3713 "%%s"

3714

3410 -#: unpack-trees.c:107

3715 +#: unpack-trees.c:142

3716 #, c-format

3717 msgid ""

3718 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3416,7 +3721,7 @@ msgstr ""

3721 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

3722 "%%s请在合并前移动或删除。"

3723

3419 -#: unpack-trees.c:109

3724 +#: unpack-trees.c:144

3725 #, c-format

3726 msgid ""

3727 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3425,7 +3730,7 @@ msgstr ""

3730 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

3731 "%%s"

3732

3428 -#: unpack-trees.c:112

3733 +#: unpack-trees.c:147

3734 #, c-format

3735 msgid ""

3736 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3434,7 +3739,7 @@ msgstr ""

3739 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

3740 "%%s请在 %s 前移动或删除。"

3741

3437 -#: unpack-trees.c:114

3742 +#: unpack-trees.c:149

3743 #, c-format

3744 msgid ""

3745 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3443,12 +3748,12 @@ msgstr ""

3748 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

3749 "%%s"

3750

3446 -#: unpack-trees.c:121

3751 +#: unpack-trees.c:156

3752 #, c-format

3753 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3754 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

3755

3451 -#: unpack-trees.c:124

3756 +#: unpack-trees.c:159

3757 #, c-format

3758 msgid ""

3759 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

@@ -3457,7 +3762,7 @@ msgstr ""

3762 "无法更新稀疏检出：如下条目不是最新：\n"

3763 "%s"

3764

3460 -#: unpack-trees.c:126

3765 +#: unpack-trees.c:161

3766 #, c-format

3767 msgid ""

3768 "The following working tree files would be overwritten by sparse checkout "

@@ -3467,7 +3772,7 @@ msgstr ""

3772 "工作区中下列文件将被稀疏检出更新所覆盖：\n"

3773 "%s"

3774

3470 -#: unpack-trees.c:128

3775 +#: unpack-trees.c:163

3776 #, c-format

3777 msgid ""

3778 "The following working tree files would be removed by sparse checkout "

@@ -3477,12 +3782,12 @@ msgstr ""

3782 "工作区中下列文件将被稀疏检出更新所删除：\n"

3783 "%s"

3784

3480 -#: unpack-trees.c:205

3785 +#: unpack-trees.c:240

3786 #, c-format

3787 msgid "Aborting\n"

3788 msgstr "终止中\n"

3789

3485 -#: unpack-trees.c:237

3790 +#: unpack-trees.c:270

3791 msgid "Checking out files"

3792 msgstr "正在检出文件"

3793

@@ -3531,7 +3836,7 @@ msgid "could not open '%s' for writing"

3836 msgstr "无法打开 '%s' 进行写入"

3837

3838 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

3534 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029

3839 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

3840 #: builtin/pull.c:341

3841 #, c-format

3842 msgid "could not open '%s' for reading"

@@ -3758,27 +4063,31 @@ msgstr " （使用 \"git am --skip\" 跳过此补丁）"

4063 msgid " (use \"git am --abort\" to restore the original branch)"

4064 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

4065

3761 -#: wt-status.c:1172

4066 +#: wt-status.c:1176

4067 +msgid "git-rebase-todo is missing."

4068 +msgstr "git-rebase-todo 丢失。"

4069 +

4070 +#: wt-status.c:1178

4071 msgid "No commands done."

4072 msgstr "没有命令被执行。"

4073

3765 -#: wt-status.c:1175

4074 +#: wt-status.c:1181

4075 #, c-format

4076 msgid "Last command done (%d command done):"

4077 msgid_plural "Last commands done (%d commands done):"

4078 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："

4079 msgstr[1] "最后的命令已完成（%d 条命令被执行）："

4080

3772 -#: wt-status.c:1186

4081 +#: wt-status.c:1192

4082 #, c-format

4083 msgid " (see more in file %s)"

4084 msgstr " （更多参见文件 %s）"

4085

3777 -#: wt-status.c:1191

4086 +#: wt-status.c:1197

4087 msgid "No commands remaining."

4088 msgstr "未剩下任何命令。"

4089

3781 -#: wt-status.c:1194

4090 +#: wt-status.c:1200

4091 #, c-format

4092 msgid "Next command to do (%d remaining command):"

4093 msgid_plural "Next commands to do (%d remaining commands):"

@@ -3786,165 +4095,165 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："

4095 msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："

4096

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

3789 -#: wt-status.c:1202

4098 +#: wt-status.c:1208

4099 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4100 msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"

4101

3793 -#: wt-status.c:1215

4102 +#: wt-status.c:1221

4103 #, c-format

4104 msgid "You are currently rebasing branch '%s' on '%s'."

4105 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"

4106

3798 -#: wt-status.c:1220

4107 +#: wt-status.c:1226

4108 msgid "You are currently rebasing."

4109 msgstr "您在执行变基操作。"

4110

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

3803 -#: wt-status.c:1234

4112 +#: wt-status.c:1240

4113 msgid " (fix conflicts and then run \"git rebase --continue\")"

4114 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"

4115

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

3808 -#: wt-status.c:1236

4117 +#: wt-status.c:1242

4118 msgid " (use \"git rebase --skip\" to skip this patch)"

4119 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

4120

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

3813 -#: wt-status.c:1238

4122 +#: wt-status.c:1244

4123 msgid " (use \"git rebase --abort\" to check out the original branch)"

4124 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

4125

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

3818 -#: wt-status.c:1244

4127 +#: wt-status.c:1250

4128 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4129 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

4130

3822 -#: wt-status.c:1248

4131 +#: wt-status.c:1254

4132 #, c-format

4133 msgid ""

4134 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

4135 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"

4136

3828 -#: wt-status.c:1253

4137 +#: wt-status.c:1259

4138 msgid "You are currently splitting a commit during a rebase."

4139 msgstr "您在执行变基操作时拆分提交。"

4140

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

3833 -#: wt-status.c:1256

4142 +#: wt-status.c:1262

4143 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4144 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

4145

3837 -#: wt-status.c:1260

4146 +#: wt-status.c:1266

4147 #, c-format

4148 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4149 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"

4150

3842 -#: wt-status.c:1265

4151 +#: wt-status.c:1271

4152 msgid "You are currently editing a commit during a rebase."

4153 msgstr "您在执行变基操作时编辑提交。"

4154

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

3847 -#: wt-status.c:1268

4156 +#: wt-status.c:1274

4157 msgid " (use \"git commit --amend\" to amend the current commit)"

4158 msgstr " （使用 \"git commit --amend\" 修补当前提交）"

4159

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

3852 -#: wt-status.c:1270

4161 +#: wt-status.c:1276

4162 msgid ""

4163 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4164 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

4165

3857 -#: wt-status.c:1280

4166 +#: wt-status.c:1286

4167 #, c-format

4168 msgid "You are currently cherry-picking commit %s."

4169 msgstr "您在执行拣选提交 %s 的操作。"

4170

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

3863 -#: wt-status.c:1285

4172 +#: wt-status.c:1291

4173 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4174 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"

4175

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

3868 -#: wt-status.c:1288

4177 +#: wt-status.c:1294

4178 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4179 msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"

4180

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

3873 -#: wt-status.c:1290

4182 +#: wt-status.c:1296

4183 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4184 msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"

4185

3877 -#: wt-status.c:1299

4186 +#: wt-status.c:1305

4187 #, c-format

4188 msgid "You are currently reverting commit %s."

4189 msgstr "您在执行反转提交 %s 的操作。"

4190

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

3883 -#: wt-status.c:1304

4192 +#: wt-status.c:1310

4193 msgid " (fix conflicts and run \"git revert --continue\")"

4194 msgstr " （解决冲突并运行 \"git revert --continue\"）"

4195

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

3888 -#: wt-status.c:1307

4197 +#: wt-status.c:1313

4198 msgid " (all conflicts fixed: run \"git revert --continue\")"

4199 msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

4200

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

3893 -#: wt-status.c:1309

4202 +#: wt-status.c:1315

4203 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4204 msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"

4205

3897 -#: wt-status.c:1320

4206 +#: wt-status.c:1326

4207 #, c-format

4208 msgid "You are currently bisecting, started from branch '%s'."

4209 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"

4210

3902 -#: wt-status.c:1324

4211 +#: wt-status.c:1330

4212 msgid "You are currently bisecting."

4213 msgstr "您在执行二分查找操作。"

4214

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

3907 -#: wt-status.c:1327

4216 +#: wt-status.c:1333

4217 msgid " (use \"git bisect reset\" to get back to the original branch)"

4218 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

4219

3911 -#: wt-status.c:1524

4220 +#: wt-status.c:1530

4221 msgid "On branch "

4222 msgstr "位于分支 "

4223

3915 -#: wt-status.c:1530

4224 +#: wt-status.c:1536

4225 msgid "interactive rebase in progress; onto "

4226 msgstr "交互式变基操作正在进行中；至 "

4227

3919 -#: wt-status.c:1532

4228 +#: wt-status.c:1538

4229 msgid "rebase in progress; onto "

4230 msgstr "变基操作正在进行中；至 "

4231

3923 -#: wt-status.c:1537

4232 +#: wt-status.c:1543

4233 msgid "HEAD detached at "

4234 msgstr "头指针分离于 "

4235

3927 -#: wt-status.c:1539

4236 +#: wt-status.c:1545

4237 msgid "HEAD detached from "

4238 msgstr "头指针分离自 "

4239

3931 -#: wt-status.c:1542

4240 +#: wt-status.c:1548

4241 msgid "Not currently on any branch."

4242 msgstr "当前不在任何分支上。"

4243

3935 -#: wt-status.c:1560

4244 +#: wt-status.c:1566

4245 msgid "Initial commit"

4246 msgstr "初始提交"

4247

3939 -#: wt-status.c:1574

4248 +#: wt-status.c:1580

4249 msgid "Untracked files"

4250 msgstr "未跟踪的文件"

4251

3943 -#: wt-status.c:1576

4252 +#: wt-status.c:1582

4253 msgid "Ignored files"

4254 msgstr "忽略的文件"

4255

3947 -#: wt-status.c:1580

4256 +#: wt-status.c:1586

4257 #, c-format

4258 msgid ""

4259 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -3954,98 +4263,98 @@ msgstr ""

4263 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"

4264 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"

4265

3957 -#: wt-status.c:1586

4266 +#: wt-status.c:1592

4267 #, c-format

4268 msgid "Untracked files not listed%s"

4269 msgstr "未跟踪的文件没有列出%s"

4270

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

3963 -#: wt-status.c:1588

4272 +#: wt-status.c:1594

4273 msgid " (use -u option to show untracked files)"

4274 msgstr "（使用 -u 参数显示未跟踪的文件）"

4275

3967 -#: wt-status.c:1594

4276 +#: wt-status.c:1600

4277 msgid "No changes"

4278 msgstr "没有修改"

4279

3971 -#: wt-status.c:1599

4280 +#: wt-status.c:1605

4281 #, c-format

4282 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4283 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

4284

3976 -#: wt-status.c:1602

4285 +#: wt-status.c:1608

4286 #, c-format

4287 msgid "no changes added to commit\n"

4288 msgstr "修改尚未加入提交\n"

4289

3981 -#: wt-status.c:1605

4290 +#: wt-status.c:1611

4291 #, c-format

4292 msgid ""

4293 "nothing added to commit but untracked files present (use \"git add\" to "

4294 "track)\n"

4295 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

4296

3988 -#: wt-status.c:1608

4297 +#: wt-status.c:1614

4298 #, c-format

4299 msgid "nothing added to commit but untracked files present\n"

4300 msgstr "提交为空，但是存在尚未跟踪的文件\n"

4301

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

3994 -#: wt-status.c:1611

4303 +#: wt-status.c:1617

4304 #, c-format

4305 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4306 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

4307

3999 -#: wt-status.c:1614 wt-status.c:1619

4308 +#: wt-status.c:1620 wt-status.c:1625

4309 #, c-format

4310 msgid "nothing to commit\n"

4311 msgstr "无文件要提交\n"

4312

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

4005 -#: wt-status.c:1617

4314 +#: wt-status.c:1623

4315 #, c-format

4316 msgid "nothing to commit (use -u to show untracked files)\n"

4317 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

4318

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

4011 -#: wt-status.c:1621

4320 +#: wt-status.c:1627

4321 #, c-format

4322 msgid "nothing to commit, working tree clean\n"

4323 msgstr "无文件要提交，干净的工作区\n"

4324

4325 # 译者：注意保持句尾空格

4017 -#: wt-status.c:1728

4326 +#: wt-status.c:1734

4327 msgid "Initial commit on "

4328 msgstr "初始提交于 "

4329

4021 -#: wt-status.c:1732

4330 +#: wt-status.c:1738

4331 msgid "HEAD (no branch)"

4332 msgstr "HEAD（非分支）"

4333

4025 -#: wt-status.c:1761

4334 +#: wt-status.c:1767

4335 msgid "gone"

4336 msgstr "丢失"

4337

4338 # 译者：注意保持句尾空格

4030 -#: wt-status.c:1763 wt-status.c:1771

4339 +#: wt-status.c:1769 wt-status.c:1777

4340 msgid "behind "

4341 msgstr "落后 "

4342

4034 -#: wt-status.c:1766 wt-status.c:1769

4343 +#: wt-status.c:1772 wt-status.c:1775

4344 msgid "ahead "

4345 msgstr "领先 "

4346

4347 #. TRANSLATORS: the action is e.g. "pull with rebase"

4039 -#: wt-status.c:2270

4348 +#: wt-status.c:2277

4349 #, c-format

4350 msgid "cannot %s: You have unstaged changes."

4351 msgstr "不能%s：您有未暂存的变更。"

4352

4044 -#: wt-status.c:2276

4353 +#: wt-status.c:2283

4354 msgid "additionally, your index contains uncommitted changes."

4355 msgstr "另外，您的索引中包含未提交的变更。"

4356

4048 -#: wt-status.c:2278

4357 +#: wt-status.c:2285

4358 #, c-format

4359 msgid "cannot %s: Your index contains uncommitted changes."

4360 msgstr "不能%s：您的索引中包含未提交的变更。"

@@ -4077,7 +4386,7 @@ msgstr "删除 '%s'\n"

4386 msgid "Unstaged changes after refreshing the index:"

4387 msgstr "刷新索引之后尚未被暂存的变更："

4388

4080 -#: builtin/add.c:209 builtin/rev-parse.c:840

4389 +#: builtin/add.c:209 builtin/rev-parse.c:845

4390 msgid "Could not read the index"

4391 msgstr "不能读取索引"

4392

@@ -4112,9 +4421,9 @@ msgstr "不能应用 '%s'"

4421 msgid "The following paths are ignored by one of your .gitignore files:\n"

4422 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

4423

4115 -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111

4116 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521

4117 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162

4424 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123

4425 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4426 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

4427 msgid "dry run"

4428 msgstr "演习"

4429

@@ -4122,7 +4431,7 @@ msgstr "演习"

4431 msgid "interactive picking"

4432 msgstr "交互式拣选"

4433

4125 -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286

4434 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

4435 msgid "select hunks interactively"

4436 msgstr "交互式挑选数据块"

4437

@@ -4204,7 +4513,7 @@ msgstr "也许您想要执行 'git add .'？\n"

4513

4514 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279

4515 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

4207 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

4516 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

4517 #: builtin/submodule--helper.c:244

4518 msgid "index file corrupt"

4519 msgstr "索引文件损坏"

@@ -4323,7 +4632,7 @@ msgstr "回落到基础版本上打补丁及进行三方合并..."

4632 msgid "Failed to merge in the changes."

4633 msgstr "无法合并变更。"

4634

4326 -#: builtin/am.c:1686 builtin/merge.c:628

4635 +#: builtin/am.c:1686 builtin/merge.c:632

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

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

4638

@@ -4331,8 +4640,8 @@ msgstr "git write-tree 无法写入一树对象"

4640 msgid "applying to an empty history"

4641 msgstr "正应用到一个空历史上"

4642

4334 -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798

4335 -#: builtin/merge.c:823

4643 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802

4644 +#: builtin/merge.c:827

4645 msgid "failed to write commit object"

4646 msgstr "无法写提交对象"

4647

@@ -4442,7 +4751,7 @@ msgid "allow fall back on 3way merging if needed"

4751 msgstr "如果必要，允许使用三方合并。"

4752

4753 #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57

4445 -#: builtin/repack.c:172

4754 +#: builtin/repack.c:178

4755 msgid "be quiet"

4756 msgstr "静默模式"

4757

@@ -4485,15 +4794,15 @@ msgid "pass it through git-apply"

4794 msgstr "传递给 git-apply"

4795

4796 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4488 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135

4489 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185

4490 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340

4797 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135

4798 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4799 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

4800 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

4801 msgid "n"

4802 msgstr "n"

4803

4804 #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

4496 -#: builtin/tag.c:372

4805 +#: builtin/tag.c:387 builtin/verify-tag.c:38

4806 msgid "format"

4807 msgstr "格式"

4808

@@ -4529,8 +4838,8 @@ msgstr "将作者日期作为提交日期"

4838 msgid "use current timestamp for author date"

4839 msgstr "用当前时间作为作者日期"

4840

4532 -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229

4533 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355

4841 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233

4842 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

4843 msgid "key-id"

4844 msgstr "key-id"

4845

@@ -4631,115 +4940,111 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"

4940 msgid "<rev-opts> are documented in git-rev-list(1)"

4941 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"

4942

4634 -#: builtin/blame.c:1781

4943 +#: builtin/blame.c:1786

4944 msgid "Blaming lines"

4945 msgstr "追踪代码行"

4946

4638 -#: builtin/blame.c:2577

4947 +#: builtin/blame.c:2582

4948 msgid "Show blame entries as we find them, incrementally"

4949 msgstr "增量式地显示发现的 blame 条目"

4950

4642 -#: builtin/blame.c:2578

4951 +#: builtin/blame.c:2583

4952 msgid "Show blank SHA-1 for boundary commits (Default: off)"

4953 msgstr "边界提交显示空的 SHA-1（默认：关闭）"

4954

4646 -#: builtin/blame.c:2579

4955 +#: builtin/blame.c:2584

4956 msgid "Do not treat root commits as boundaries (Default: off)"

4957 msgstr "不把根提交作为边界（默认：关闭）"

4958

4650 -#: builtin/blame.c:2580

4959 +#: builtin/blame.c:2585

4960 msgid "Show work cost statistics"

4961 msgstr "显示命令消耗统计"

4962

4654 -#: builtin/blame.c:2581

4963 +#: builtin/blame.c:2586

4964 msgid "Force progress reporting"

4965 msgstr "强制进度显示"

4966

4658 -#: builtin/blame.c:2582

4967 +#: builtin/blame.c:2587

4968 msgid "Show output score for blame entries"

4969 msgstr "显示判断 blame 条目位移的得分诊断信息"

4970

4662 -#: builtin/blame.c:2583

4971 +#: builtin/blame.c:2588

4972 msgid "Show original filename (Default: auto)"

4973 msgstr "显示原始文件名（默认：自动）"

4974

4666 -#: builtin/blame.c:2584

4975 +#: builtin/blame.c:2589

4976 msgid "Show original linenumber (Default: off)"

4977 msgstr "显示原始的行号（默认：关闭）"

4978

4670 -#: builtin/blame.c:2585

4979 +#: builtin/blame.c:2590

4980 msgid "Show in a format designed for machine consumption"

4981 msgstr "显示为一个适合机器读取的格式"

4982

4674 -#: builtin/blame.c:2586

4983 +#: builtin/blame.c:2591

4984 msgid "Show porcelain format with per-line commit information"

4985 msgstr "为每一行显示机器适用的提交信息"

4986

4678 -#: builtin/blame.c:2587

4987 +#: builtin/blame.c:2592

4988 msgid "Use the same output mode as git-annotate (Default: off)"

4989 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"

4990

4682 -#: builtin/blame.c:2588

4991 +#: builtin/blame.c:2593

4992 msgid "Show raw timestamp (Default: off)"

4993 msgstr "显示原始时间戳（默认：关闭）"

4994

4686 -#: builtin/blame.c:2589

4995 +#: builtin/blame.c:2594

4996 msgid "Show long commit SHA1 (Default: off)"

4997 msgstr "显示长的 SHA1 提交号（默认：关闭）"

4998

4690 -#: builtin/blame.c:2590

4999 +#: builtin/blame.c:2595

5000 msgid "Suppress author name and timestamp (Default: off)"

5001 msgstr "隐藏作者名字和时间戳（默认：关闭）"

5002

4694 -#: builtin/blame.c:2591

5003 +#: builtin/blame.c:2596

5004 msgid "Show author email instead of name (Default: off)"

5005 msgstr "显示作者的邮箱而不是名字（默认：关闭）"

5006

4698 -#: builtin/blame.c:2592

5007 +#: builtin/blame.c:2597

5008 msgid "Ignore whitespace differences"

5009 msgstr "忽略空白差异"

5010

4702 -#: builtin/blame.c:2599

4703 -msgid "Use an experimental indent-based heuristic to improve diffs"

4704 -msgstr "使用一个试验性的基于缩进的启发式算法改进差异显示"

4705 -

4706 -#: builtin/blame.c:2600

4707 -msgid "Use an experimental blank-line-based heuristic to improve diffs"

4708 -msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"

5011 +#: builtin/blame.c:2604

5012 +msgid "Use an experimental heuristic to improve diffs"

5013 +msgstr "使用一个试验性的启发式算法改进差异显示"

5014

4710 -#: builtin/blame.c:2602

5015 +#: builtin/blame.c:2606

5016 msgid "Spend extra cycles to find better match"

5017 msgstr "花费额外的循环来找到更好的匹配"

5018

4714 -#: builtin/blame.c:2603

5019 +#: builtin/blame.c:2607

5020 msgid "Use revisions from <file> instead of calling git-rev-list"

5021 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"

5022

4718 -#: builtin/blame.c:2604

5023 +#: builtin/blame.c:2608

5024 msgid "Use <file>'s contents as the final image"

5025 msgstr "使用 <文件> 的内容作为最终的图片"

5026

4722 -#: builtin/blame.c:2605 builtin/blame.c:2606

5027 +#: builtin/blame.c:2609 builtin/blame.c:2610

5028 msgid "score"

5029 msgstr "得分"

5030

4726 -#: builtin/blame.c:2605

5031 +#: builtin/blame.c:2609

5032 msgid "Find line copies within and across files"

5033 msgstr "找到文件内及跨文件的行拷贝"

5034

4730 -#: builtin/blame.c:2606

5035 +#: builtin/blame.c:2610

5036 msgid "Find line movements within and across files"

5037 msgstr "找到文件内及跨文件的行移动"

5038

4734 -#: builtin/blame.c:2607

5039 +#: builtin/blame.c:2611

5040 msgid "n,m"

5041 msgstr "n,m"

5042

4738 -#: builtin/blame.c:2607

5043 +#: builtin/blame.c:2611

5044 msgid "Process only line range n,m, counting from 1"

5045 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

5046

4742 -#: builtin/blame.c:2654

5047 +#: builtin/blame.c:2658

5048 msgid "--progress can't be used with --incremental or porcelain formats"

5049 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"

5050

@@ -4749,38 +5054,38 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"

5054 #. takes 22 places, is the longest among various forms of

5055 #. relative timestamps, but your language may need more or

5056 #. fewer display columns.

4752 -#: builtin/blame.c:2700

5057 +#: builtin/blame.c:2706

5058 msgid "4 years, 11 months ago"

5059 msgstr "4 年 11 个月前"

5060

4756 -#: builtin/blame.c:2780

5061 +#: builtin/blame.c:2786

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

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

5064

4760 -#: builtin/blame.c:2800

5065 +#: builtin/blame.c:2806

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

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

5068

4764 -#: builtin/blame.c:2805

5069 +#: builtin/blame.c:2811

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

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

5072

4768 -#: builtin/blame.c:2832

5073 +#: builtin/blame.c:2838

5074 msgid ""

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

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

5077

4773 -#: builtin/blame.c:2843

5078 +#: builtin/blame.c:2849

5079 #, c-format

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

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

5082

4778 -#: builtin/blame.c:2854

5083 +#: builtin/blame.c:2860

5084 #, c-format

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

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

5087

4783 -#: builtin/blame.c:2873

5088 +#: builtin/blame.c:2879

5089 #, c-format

5090 msgid "file %s has only %lu line"

5091 msgid_plural "file %s has only %lu lines"

@@ -4960,44 +5265,44 @@ msgstr "（头指针分离自 %s）"

5265 msgid "(no branch)"

5266 msgstr "（非分支）"

5267

4963 -#: builtin/branch.c:544

5268 +#: builtin/branch.c:535

5269 #, c-format

5270 msgid "Branch %s is being rebased at %s"

5271 msgstr "分支 %s 正被变基到 %s"

5272

4968 -#: builtin/branch.c:548

5273 +#: builtin/branch.c:539

5274 #, c-format

5275 msgid "Branch %s is being bisected at %s"

5276 msgstr "分支 %s 正被二分查找于 %s"

5277

4973 -#: builtin/branch.c:563

5278 +#: builtin/branch.c:554

5279 msgid "cannot rename the current branch while not on any."

5280 msgstr "无法重命名当前分支因为不处于任何分支上。"

5281

4977 -#: builtin/branch.c:573

5282 +#: builtin/branch.c:564

5283 #, c-format

5284 msgid "Invalid branch name: '%s'"

5285 msgstr "无效的分支名：'%s'"

5286

4982 -#: builtin/branch.c:590

5287 +#: builtin/branch.c:581

5288 msgid "Branch rename failed"

5289 msgstr "分支重命名失败"

5290

4986 -#: builtin/branch.c:594

5291 +#: builtin/branch.c:585

5292 #, c-format

5293 msgid "Renamed a misnamed branch '%s' away"

5294 msgstr "重命名掉一个错误命名的旧分支 '%s'"

5295

4991 -#: builtin/branch.c:597

5296 +#: builtin/branch.c:588

5297 #, c-format

5298 msgid "Branch renamed to %s, but HEAD is not updated!"

5299 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

5300

4996 -#: builtin/branch.c:604

5301 +#: builtin/branch.c:595

5302 msgid "Branch is renamed, but update of config-file failed"

5303 msgstr "分支被重命名，但更新 config 文件失败"

5304

5000 -#: builtin/branch.c:620

5305 +#: builtin/branch.c:611

5306 #, c-format

5307 msgid ""

5308 "Please edit the description for the branch\n"

@@ -5008,200 +5313,204 @@ msgstr ""

5313 " %s\n"

5314 "以 '%c' 开头的行将被过滤。\n"

5315

5011 -#: builtin/branch.c:651

5316 +#: builtin/branch.c:643

5317 msgid "Generic options"

5318 msgstr "通用选项"

5319

5015 -#: builtin/branch.c:653

5320 +#: builtin/branch.c:645

5321 msgid "show hash and subject, give twice for upstream branch"

5322 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"

5323

5019 -#: builtin/branch.c:654

5324 +#: builtin/branch.c:646

5325 msgid "suppress informational messages"

5326 msgstr "不显示信息"

5327

5023 -#: builtin/branch.c:655

5328 +#: builtin/branch.c:647

5329 msgid "set up tracking mode (see git-pull(1))"

5330 msgstr "设置跟踪模式（参见 git-pull(1)）"

5331

5027 -#: builtin/branch.c:657

5332 +#: builtin/branch.c:649

5333 msgid "change upstream info"

5334 msgstr "改变上游信息"

5335

5031 -#: builtin/branch.c:659

5336 +#: builtin/branch.c:651

5337 msgid "upstream"

5338 msgstr "上游"

5339

5035 -#: builtin/branch.c:659

5340 +#: builtin/branch.c:651

5341 msgid "change the upstream info"

5342 msgstr "改变上游信息"

5343

5039 -#: builtin/branch.c:660

5344 +#: builtin/branch.c:652

5345 msgid "Unset the upstream info"

5346 msgstr "取消上游信息的设置"

5347

5043 -#: builtin/branch.c:661

5348 +#: builtin/branch.c:653

5349 msgid "use colored output"

5350 msgstr "使用彩色输出"

5351

5047 -#: builtin/branch.c:662

5352 +#: builtin/branch.c:654

5353 msgid "act on remote-tracking branches"

5354 msgstr "作用于远程跟踪分支"

5355

5051 -#: builtin/branch.c:664 builtin/branch.c:665

5356 +#: builtin/branch.c:656 builtin/branch.c:657

5357 msgid "print only branches that contain the commit"

5358 msgstr "只打印包含该提交的分支"

5359

5055 -#: builtin/branch.c:668

5360 +#: builtin/branch.c:660

5361 msgid "Specific git-branch actions:"

5362 msgstr "具体的 git-branch 动作："

5363

5059 -#: builtin/branch.c:669

5364 +#: builtin/branch.c:661

5365 msgid "list both remote-tracking and local branches"

5366 msgstr "列出远程跟踪及本地分支"

5367

5063 -#: builtin/branch.c:671

5368 +#: builtin/branch.c:663

5369 msgid "delete fully merged branch"

5370 msgstr "删除完全合并的分支"

5371

5067 -#: builtin/branch.c:672

5372 +#: builtin/branch.c:664

5373 msgid "delete branch (even if not merged)"

5374 msgstr "删除分支（即使没有合并）"

5375

5071 -#: builtin/branch.c:673

5376 +#: builtin/branch.c:665

5377 msgid "move/rename a branch and its reflog"

5378 msgstr "移动/重命名一个分支，以及它的引用日志"

5379

5075 -#: builtin/branch.c:674

5380 +#: builtin/branch.c:666

5381 msgid "move/rename a branch, even if target exists"

5382 msgstr "移动/重命名一个分支，即使目标已存在"

5383

5079 -#: builtin/branch.c:675

5384 +#: builtin/branch.c:667

5385 msgid "list branch names"

5386 msgstr "列出分支名"

5387

5083 -#: builtin/branch.c:676

5388 +#: builtin/branch.c:668

5389 msgid "create the branch's reflog"

5390 msgstr "创建分支的引用日志"

5391

5087 -#: builtin/branch.c:678

5392 +#: builtin/branch.c:670

5393 msgid "edit the description for the branch"

5394 msgstr "标记分支的描述"

5395

5091 -#: builtin/branch.c:679

5396 +#: builtin/branch.c:671

5397 msgid "force creation, move/rename, deletion"

5398 msgstr "强制创建、移动/重命名、删除"

5399

5095 -#: builtin/branch.c:680

5400 +#: builtin/branch.c:672

5401 msgid "print only branches that are merged"

5402 msgstr "只打印已经合并的分支"

5403

5099 -#: builtin/branch.c:681

5404 +#: builtin/branch.c:673

5405 msgid "print only branches that are not merged"

5406 msgstr "只打印尚未合并的分支"

5407

5103 -#: builtin/branch.c:682

5408 +#: builtin/branch.c:674

5409 msgid "list branches in columns"

5410 msgstr "以列的方式显示分支"

5411

5107 -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366

5412 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

5413 msgid "key"

5414 msgstr "key"

5415

5111 -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367

5416 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

5417 msgid "field name to sort on"

5418 msgstr "排序的字段名"

5419

5115 -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404

5420 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

5421 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

5117 -#: builtin/tag.c:369

5422 +#: builtin/tag.c:384

5423 msgid "object"

5424 msgstr "对象"

5425

5121 -#: builtin/branch.c:687

5426 +#: builtin/branch.c:679

5427 msgid "print only branches of the object"

5428 msgstr "只打印指向该对象的分支"

5429

5125 -#: builtin/branch.c:705

5430 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388

5431 +msgid "sorting and filtering are case insensitive"

5432 +msgstr "排序和过滤属于大小写不敏感"

5433 +

5434 +#: builtin/branch.c:698

5435 msgid "Failed to resolve HEAD as a valid ref."

5436 msgstr "无法将 HEAD 解析为有效引用。"

5437

5129 -#: builtin/branch.c:709 builtin/clone.c:706

5438 +#: builtin/branch.c:702 builtin/clone.c:706

5439 msgid "HEAD not found below refs/heads!"

5440 msgstr "HEAD 没有位于 /refs/heads 之下！"

5441

5133 -#: builtin/branch.c:729

5442 +#: builtin/branch.c:724

5443 msgid "--column and --verbose are incompatible"

5444 msgstr "--column 和 --verbose 不兼容"

5445

5137 -#: builtin/branch.c:740 builtin/branch.c:782

5446 +#: builtin/branch.c:735 builtin/branch.c:787

5447 msgid "branch name required"

5448 msgstr "必须提供分支名"

5449

5141 -#: builtin/branch.c:758

5450 +#: builtin/branch.c:763

5451 msgid "Cannot give description to detached HEAD"

5452 msgstr "不能向分离头指针提供描述"

5453

5145 -#: builtin/branch.c:763

5454 +#: builtin/branch.c:768

5455 msgid "cannot edit description of more than one branch"

5456 msgstr "不能为一个以上的分支编辑描述"

5457

5149 -#: builtin/branch.c:770

5458 +#: builtin/branch.c:775

5459 #, c-format

5460 msgid "No commit on branch '%s' yet."

5461 msgstr "分支 '%s' 尚无提交。"

5462

5154 -#: builtin/branch.c:773

5463 +#: builtin/branch.c:778

5464 #, c-format

5465 msgid "No branch named '%s'."

5466 msgstr "没有分支 '%s'。"

5467

5159 -#: builtin/branch.c:788

5468 +#: builtin/branch.c:793

5469 msgid "too many branches for a rename operation"

5470 msgstr "为重命名操作提供了太多的分支名"

5471

5163 -#: builtin/branch.c:793

5472 +#: builtin/branch.c:798

5473 msgid "too many branches to set new upstream"

5474 msgstr "为设置新上游提供了太多的分支名"

5475

5167 -#: builtin/branch.c:797

5476 +#: builtin/branch.c:802

5477 #, c-format

5478 msgid ""

5479 "could not set upstream of HEAD to %s when it does not point to any branch."

5480 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"

5481

5173 -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843

5482 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

5483 #, c-format

5484 msgid "no such branch '%s'"

5485 msgstr "没有此分支 '%s'"

5486

5178 -#: builtin/branch.c:804

5487 +#: builtin/branch.c:809

5488 #, c-format

5489 msgid "branch '%s' does not exist"

5490 msgstr "分支 '%s' 不存在"

5491

5183 -#: builtin/branch.c:816

5492 +#: builtin/branch.c:821

5493 msgid "too many branches to unset upstream"

5494 msgstr "为取消上游设置操作提供了太多的分支名"

5495

5187 -#: builtin/branch.c:820

5496 +#: builtin/branch.c:825

5497 msgid "could not unset upstream of HEAD when it does not point to any branch."

5498 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"

5499

5191 -#: builtin/branch.c:826

5500 +#: builtin/branch.c:831

5501 #, c-format

5502 msgid "Branch '%s' has no upstream information"

5503 msgstr "分支 '%s' 没有上游信息"

5504

5196 -#: builtin/branch.c:840

5505 +#: builtin/branch.c:845

5506 msgid "it does not make sense to create 'HEAD' manually"

5507 msgstr "手工创建 'HEAD' 没有意义"

5508

5200 -#: builtin/branch.c:846

5509 +#: builtin/branch.c:851

5510 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5511 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

5512

5204 -#: builtin/branch.c:849

5513 +#: builtin/branch.c:854

5514 #, c-format

5515 msgid ""

5516 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -5209,7 +5518,7 @@ msgid ""

5518 msgstr ""

5519 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"

5520

5212 -#: builtin/branch.c:866

5521 +#: builtin/branch.c:871

5522 #, c-format

5523 msgid ""

5524 "\n"

@@ -5277,7 +5586,7 @@ msgstr "对于数据对象，对其内容做文本转换"

5586 msgid "for blob objects, run filters on object's content"

5587 msgstr "对于数据对象，对其内容做过滤"

5588

5280 -#: builtin/cat-file.c:561 git-submodule.sh:923

5589 +#: builtin/cat-file.c:561 git-submodule.sh:929

5590 msgid "blob"

5591 msgstr "数据对象"

5592

@@ -5333,7 +5642,7 @@ msgstr "从标准输入读出文件名"

5642 msgid "terminate input and output records by a NUL character"

5643 msgstr "输入和输出的记录使用 NUL 字符终结"

5644

5336 -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325

5645 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

5646 msgid "suppress progress reporting"

5647 msgstr "不显示进度报告"

5648

@@ -5423,9 +5732,9 @@ msgid "write the content to temporary files"

5732 msgstr "将内容写入临时文件"

5733

5734 #: builtin/checkout-index.c:174 builtin/column.c:30

5426 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598

5427 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951

5428 -#: builtin/worktree.c:469

5735 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600

5736 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967

5737 +#: builtin/worktree.c:471

5738 msgid "string"

5739 msgstr "字符串"

5740

@@ -5500,51 +5809,51 @@ msgstr "路径 '%s' 未合并"

5809 msgid "you need to resolve your current index first"

5810 msgstr "您需要先解决当前索引的冲突"

5811

5503 -#: builtin/checkout.c:624

5812 +#: builtin/checkout.c:625

5813 #, c-format

5814 msgid "Can not do reflog for '%s': %s\n"

5815 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

5816

5508 -#: builtin/checkout.c:663

5817 +#: builtin/checkout.c:666

5818 msgid "HEAD is now at"

5819 msgstr "HEAD 目前位于"

5820

5512 -#: builtin/checkout.c:667 builtin/clone.c:660

5821 +#: builtin/checkout.c:670 builtin/clone.c:660

5822 msgid "unable to update HEAD"

5823 msgstr "不能更新 HEAD"

5824

5516 -#: builtin/checkout.c:671

5825 +#: builtin/checkout.c:674

5826 #, c-format

5827 msgid "Reset branch '%s'\n"

5828 msgstr "重置分支 '%s'\n"

5829

5521 -#: builtin/checkout.c:674

5830 +#: builtin/checkout.c:677

5831 #, c-format

5832 msgid "Already on '%s'\n"

5833 msgstr "已经位于 '%s'\n"

5834

5526 -#: builtin/checkout.c:678

5835 +#: builtin/checkout.c:681

5836 #, c-format

5837 msgid "Switched to and reset branch '%s'\n"

5838 msgstr "切换并重置分支 '%s'\n"

5839

5531 -#: builtin/checkout.c:680 builtin/checkout.c:1069

5840 +#: builtin/checkout.c:683 builtin/checkout.c:1072

5841 #, c-format

5842 msgid "Switched to a new branch '%s'\n"

5843 msgstr "切换到一个新分支 '%s'\n"

5844

5536 -#: builtin/checkout.c:682

5845 +#: builtin/checkout.c:685

5846 #, c-format

5847 msgid "Switched to branch '%s'\n"

5848 msgstr "切换到分支 '%s'\n"

5849

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

5542 -#: builtin/checkout.c:733

5851 +#: builtin/checkout.c:736

5852 #, c-format

5853 msgid " ... and %d more.\n"

5854 msgstr " ... 及其它 %d 个。\n"

5855

5547 -#: builtin/checkout.c:739

5856 +#: builtin/checkout.c:742

5857 #, c-format

5858 msgid ""

5859 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -5565,7 +5874,7 @@ msgstr[1] ""

5874 "\n"

5875 "%s\n"

5876

5568 -#: builtin/checkout.c:758

5877 +#: builtin/checkout.c:761

5878 #, c-format

5879 msgid ""

5880 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -5592,150 +5901,150 @@ msgstr[1] ""

5901 " git branch <新分支名> %s\n"

5902 "\n"

5903

5595 -#: builtin/checkout.c:794

5904 +#: builtin/checkout.c:797

5905 msgid "internal error in revision walk"

5906 msgstr "在版本遍历时遇到内部错误"

5907

5599 -#: builtin/checkout.c:798

5908 +#: builtin/checkout.c:801

5909 msgid "Previous HEAD position was"

5910 msgstr "之前的 HEAD 位置是"

5911

5603 -#: builtin/checkout.c:825 builtin/checkout.c:1064

5912 +#: builtin/checkout.c:828 builtin/checkout.c:1067

5913 msgid "You are on a branch yet to be born"

5914 msgstr "您位于一个尚未初始化的分支"

5915

5607 -#: builtin/checkout.c:970

5916 +#: builtin/checkout.c:973

5917 #, c-format

5918 msgid "only one reference expected, %d given."

5919 msgstr "应只有一个引用，却给出了 %d 个"

5920

5612 -#: builtin/checkout.c:1010 builtin/worktree.c:214

5921 +#: builtin/checkout.c:1013 builtin/worktree.c:214

5922 #, c-format

5923 msgid "invalid reference: %s"

5924 msgstr "无效引用：%s"

5925

5617 -#: builtin/checkout.c:1039

5926 +#: builtin/checkout.c:1042

5927 #, c-format

5928 msgid "reference is not a tree: %s"

5929 msgstr "引用不是一个树：%s"

5930

5622 -#: builtin/checkout.c:1078

5931 +#: builtin/checkout.c:1081

5932 msgid "paths cannot be used with switching branches"

5933 msgstr "路径不能和切换分支同时使用"

5934

5626 -#: builtin/checkout.c:1081 builtin/checkout.c:1085

5935 +#: builtin/checkout.c:1084 builtin/checkout.c:1088

5936 #, c-format

5937 msgid "'%s' cannot be used with switching branches"

5938 msgstr "'%s' 不能和切换分支同时使用"

5939

5631 -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097

5632 -#: builtin/checkout.c:1100

5940 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100

5941 +#: builtin/checkout.c:1103

5942 #, c-format

5943 msgid "'%s' cannot be used with '%s'"

5944 msgstr "'%s' 不能和 '%s' 同时使用"

5945

5637 -#: builtin/checkout.c:1105

5946 +#: builtin/checkout.c:1108

5947 #, c-format

5948 msgid "Cannot switch branch to a non-commit '%s'"

5949 msgstr "不能切换分支到一个非提交 '%s'"

5950

5642 -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93

5951 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

5952 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5953 #: builtin/worktree.c:326

5954 msgid "branch"

5955 msgstr "分支"

5956

5648 -#: builtin/checkout.c:1139

5957 +#: builtin/checkout.c:1142

5958 msgid "create and checkout a new branch"

5959 msgstr "创建并检出一个新的分支"

5960

5652 -#: builtin/checkout.c:1141

5961 +#: builtin/checkout.c:1144

5962 msgid "create/reset and checkout a branch"

5963 msgstr "创建/重置并检出一个分支"

5964

5656 -#: builtin/checkout.c:1142

5965 +#: builtin/checkout.c:1145

5966 msgid "create reflog for new branch"

5967 msgstr "为新的分支创建引用日志"

5968

5660 -#: builtin/checkout.c:1143 builtin/worktree.c:328

5969 +#: builtin/checkout.c:1146 builtin/worktree.c:328

5970 msgid "detach HEAD at named commit"

5971 msgstr "HEAD 从指定的提交分离"

5972

5664 -#: builtin/checkout.c:1144

5973 +#: builtin/checkout.c:1147

5974 msgid "set upstream info for new branch"

5975 msgstr "为新的分支设置上游信息"

5976

5668 -#: builtin/checkout.c:1146

5977 +#: builtin/checkout.c:1149

5978 msgid "new-branch"

5979 msgstr "新分支"

5980

5672 -#: builtin/checkout.c:1146

5981 +#: builtin/checkout.c:1149

5982 msgid "new unparented branch"

5983 msgstr "新的没有父提交的分支"

5984

5676 -#: builtin/checkout.c:1147

5985 +#: builtin/checkout.c:1150

5986 msgid "checkout our version for unmerged files"

5987 msgstr "对尚未合并的文件检出我们的版本"

5988

5680 -#: builtin/checkout.c:1149

5989 +#: builtin/checkout.c:1152

5990 msgid "checkout their version for unmerged files"

5991 msgstr "对尚未合并的文件检出他们的版本"

5992

5684 -#: builtin/checkout.c:1151

5993 +#: builtin/checkout.c:1154

5994 msgid "force checkout (throw away local modifications)"

5995 msgstr "强制检出（丢弃本地修改）"

5996

5688 -#: builtin/checkout.c:1152

5997 +#: builtin/checkout.c:1155

5998 msgid "perform a 3-way merge with the new branch"

5999 msgstr "和新的分支执行三方合并"

6000

5692 -#: builtin/checkout.c:1153 builtin/merge.c:231

6001 +#: builtin/checkout.c:1156 builtin/merge.c:235

6002 msgid "update ignored files (default)"

6003 msgstr "更新忽略的文件（默认）"

6004

5696 -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251

6005 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

6006 msgid "style"

6007 msgstr "风格"

6008

5700 -#: builtin/checkout.c:1155

6009 +#: builtin/checkout.c:1158

6010 msgid "conflict style (merge or diff3)"

6011 msgstr "冲突输出风格（merge 或 diff3）"

6012

5704 -#: builtin/checkout.c:1158

6013 +#: builtin/checkout.c:1161

6014 msgid "do not limit pathspecs to sparse entries only"

6015 msgstr "对路径不做稀疏检出的限制"

6016

5708 -#: builtin/checkout.c:1160

6017 +#: builtin/checkout.c:1163

6018 msgid "second guess 'git checkout <no-such-branch>'"

6019 msgstr "二次猜测'git checkout <无此分支>'"

6020

5712 -#: builtin/checkout.c:1162

6021 +#: builtin/checkout.c:1165

6022 msgid "do not check if another worktree is holding the given ref"

6023 msgstr "不检查指定的引用是否被其他工作区所占用"

6024

5716 -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119

5717 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536

6025 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119

6026 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

6027 #: builtin/send-pack.c:168

6028 msgid "force progress reporting"

6029 msgstr "强制显示进度报告"

6030

5722 -#: builtin/checkout.c:1194

6031 +#: builtin/checkout.c:1197

6032 msgid "-b, -B and --orphan are mutually exclusive"

6033 msgstr "-b、-B 和 --orphan 是互斥的"

6034

5726 -#: builtin/checkout.c:1211

6035 +#: builtin/checkout.c:1214

6036 msgid "--track needs a branch name"

6037 msgstr "--track 需要一个分支名"

6038

5730 -#: builtin/checkout.c:1216

6039 +#: builtin/checkout.c:1219

6040 msgid "Missing branch name; try -b"

6041 msgstr "缺少分支名；尝试 -b"

6042

5734 -#: builtin/checkout.c:1252

6043 +#: builtin/checkout.c:1255

6044 msgid "invalid path specification"

6045 msgstr "无效的路径规格"

6046

5738 -#: builtin/checkout.c:1259

6047 +#: builtin/checkout.c:1262

6048 #, c-format

6049 msgid ""

6050 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -5744,12 +6053,12 @@ msgstr ""

6053 "不能同时更新路径并切换到分支'%s'。\n"

6054 "您是想要检出 '%s' 但其未能解析为提交么？"

6055

5747 -#: builtin/checkout.c:1264

6056 +#: builtin/checkout.c:1267

6057 #, c-format

6058 msgid "git checkout: --detach does not take a path argument '%s'"

6059 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

6060

5752 -#: builtin/checkout.c:1268

6061 +#: builtin/checkout.c:1271

6062 msgid ""

6063 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

6064 "checking out of the index."

@@ -5787,19 +6096,21 @@ msgstr "将忽略仓库 %s\n"

6096 msgid "failed to remove %s"

6097 msgstr "无法删除 %s"

6098

5790 -#: builtin/clean.c:291

6099 +#: builtin/clean.c:291 git-add--interactive.perl:623

6100 +#, c-format

6101 msgid ""

6102 "Prompt help:\n"

6103 "1 - select a numbered item\n"

6104 "foo - select item based on unique prefix\n"

5795 -" - (empty) select nothing"

6105 +" - (empty) select nothing\n"

6106 msgstr ""

6107 "帮助：\n"

6108 "1 - 通过编号选择一个选项\n"

5799 -"foo - 通过标题选择一个选项\n"

5800 -" - （空）什么也不选择"

6109 +"foo - 通过唯一前缀选择一个选项\n"

6110 +" - （空）什么也不选择\n"

6111

5802 -#: builtin/clean.c:295

6112 +#: builtin/clean.c:295 git-add--interactive.perl:632

6113 +#, c-format

6114 msgid ""

6115 "Prompt help:\n"

6116 "1 - select a single item\n"

@@ -5808,21 +6119,22 @@ msgid ""

6119 "foo - select item based on unique prefix\n"

6120 "-... - unselect specified items\n"

6121 "* - choose all items\n"

5811 -" - (empty) finish selecting"

6122 +" - (empty) finish selecting\n"

6123 msgstr ""

6124 "帮助：\n"

6125 "1 - 选择一个选项\n"

6126 "3-5 - 选择一个范围内的所有选项\n"

6127 "2-3,6-9 - 选择多个范围内的所有选项\n"

5817 -"foo - 通过标题选择一个选项\n"

6128 +"foo - 通过唯一前缀选择一个选项\n"

6129 "-... - 反选特定的选项\n"

6130 "* - 选择所有选项\n"

5820 -" - （空）结束选择"

6131 +" - （空）结束选择\n"

6132

5822 -#: builtin/clean.c:511

5823 -#, c-format

5824 -msgid "Huh (%s)?"

5825 -msgstr "嗯（%s）？"

6133 +#: builtin/clean.c:511 git-add--interactive.perl:598

6134 +#: git-add--interactive.perl:603

6135 +#, c-format, perl-format

6136 +msgid "Huh (%s)?\n"

6137 +msgstr "嗯（%s）？\n"

6138

6139 #: builtin/clean.c:653

6140 #, c-format

@@ -5844,9 +6156,10 @@ msgstr "选择要删除的条目"

6156 msgid "Remove %s [y/N]? "

6157 msgstr "删除 %s [y/N]？"

6158

5847 -#: builtin/clean.c:777

5848 -msgid "Bye."

5849 -msgstr "再见。"

6159 +#: builtin/clean.c:777 git-add--interactive.perl:1669

6160 +#, c-format

6161 +msgid "Bye.\n"

6162 +msgstr "再见。\n"

6163

6164 #: builtin/clean.c:785

6165 msgid ""

@@ -5866,11 +6179,11 @@ msgstr ""

6179 "help - 显示本帮助\n"

6180 "? - 显示如何在提示符下选择的帮助"

6181

5869 -#: builtin/clean.c:812

6182 +#: builtin/clean.c:812 git-add--interactive.perl:1745

6183 msgid "*** Commands ***"

6184 msgstr "*** 命令 ***"

6185

5873 -#: builtin/clean.c:813

6186 +#: builtin/clean.c:813 git-add--interactive.perl:1742

6187 msgid "What now"

6188 msgstr "请选择"

6189

@@ -5900,8 +6213,8 @@ msgstr "交互式清除"

6213 msgid "remove whole directories"

6214 msgstr "删除整个目录"

6215

5903 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725

5904 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182

6216 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

6217 +#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176

6218 msgid "pattern"

6219 msgstr "模式"

6220

@@ -5979,8 +6292,8 @@ msgstr "模板目录"

6292 msgid "directory from which templates will be used"

6293 msgstr "模板目录将被使用"

6294

5982 -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602

5983 -#: builtin/submodule--helper.c:954

6295 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604

6296 +#: builtin/submodule--helper.c:970

6297 msgid "reference repository"

6298 msgstr "参考仓库"

6299

@@ -6004,7 +6317,7 @@ msgstr "检出 <分支> 而不是远程 HEAD"

6317 msgid "path to git-upload-pack on the remote"

6318 msgstr "远程 git-upload-pack 路径"

6319

6007 -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668

6320 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999

6321 #: builtin/pull.c:202

6322 msgid "depth"

6323 msgstr "深度"

@@ -6013,7 +6326,7 @@ msgstr "深度"

6326 msgid "create a shallow clone of that depth"

6327 msgstr "创建一个指定深度的浅克隆"

6328

6016 -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848

6329 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

6330 #: parse-options.h:142

6331 msgid "time"

6332 msgstr "时间"

@@ -6027,8 +6340,8 @@ msgid "revision"

6340 msgstr "版本"

6341

6342 #: builtin/clone.c:102 builtin/fetch.c:125

6030 -msgid "deepen history of shallow clone by excluding rev"

6031 -msgstr "通过排除版本来深化浅克隆的历史"

6343 +msgid "deepen history of shallow clone, excluding rev"

6344 +msgstr "深化浅克隆的历史，除了特定版本"

6345

6346 #: builtin/clone.c:104

6347 msgid "clone only one branch, HEAD or --branch"

@@ -6054,11 +6367,11 @@ msgstr "key=value"

6367 msgid "set config inside the new repository"

6368 msgstr "在新仓库中设置配置信息"

6369

6057 -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547

6370 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

6371 msgid "use IPv4 addresses only"

6372 msgstr "只使用 IPv4 地址"

6373

6061 -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549

6374 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

6375 msgid "use IPv6 addresses only"

6376 msgstr "只使用 IPv6 地址"

6377

@@ -6171,7 +6484,7 @@ msgstr "--bare 和 --separate-git-dir 选项不兼容。"

6484 msgid "repository '%s' does not exist"

6485 msgstr "仓库 '%s' 不存在"

6486

6174 -#: builtin/clone.c:905 builtin/fetch.c:1338

6487 +#: builtin/clone.c:905 builtin/fetch.c:1335

6488 #, c-format

6489 msgid "depth %s is not a positive number"

6490 msgstr "深度 %s 不是一个正数"

@@ -6186,8 +6499,9 @@ msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

6499 msgid "working tree '%s' already exists."

6500 msgstr "工作区 '%s' 已经存在。"

6501

6189 -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657

6190 -#: builtin/worktree.c:222 builtin/worktree.c:249

6502 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252

6503 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222

6504 +#: builtin/worktree.c:249

6505 #, c-format

6506 msgid "could not create leading directories of '%s'"

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

@@ -6447,7 +6761,7 @@ msgstr "无法选择一个未被当前提交说明使用的注释字符"

6761 msgid "could not lookup commit %s"

6762 msgstr "不能查询提交 %s"

6763

6450 -#: builtin/commit.c:704 builtin/shortlog.c:286

6764 +#: builtin/commit.c:704 builtin/shortlog.c:295

6765 #, c-format

6766 msgid "(reading log message from standard input)\n"

6767 msgstr "（正从标准输入中读取日志信息）\n"

@@ -6546,7 +6860,7 @@ msgstr "无法读取索引"

6860 msgid "Error building trees"

6861 msgstr "无法创建树对象"

6862

6549 -#: builtin/commit.c:969 builtin/tag.c:266

6863 +#: builtin/commit.c:968 builtin/tag.c:280

6864 #, c-format

6865 msgid "Please supply the message using either -m or -F option.\n"

6866 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

@@ -6556,7 +6870,7 @@ msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

6870 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

6871 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"

6872

6559 -#: builtin/commit.c:1086 builtin/commit.c:1327

6873 +#: builtin/commit.c:1086 builtin/commit.c:1325

6874 #, c-format

6875 msgid "Invalid untracked files mode '%s'"

6876 msgstr "无效的未追踪文件参数 '%s'"

@@ -6606,265 +6920,261 @@ msgid "No paths with --include/--only does not make sense."

6920 msgstr "参数 --include/--only 不跟路径没有意义。"

6921

6922 #: builtin/commit.c:1212

6609 -msgid "Clever... amending the last one with dirty index."

6610 -msgstr "聪明... 用脏索引修补最后一个提交。"

6611 -

6612 -#: builtin/commit.c:1214

6923 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

6924 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."

6925

6616 -#: builtin/commit.c:1226 builtin/tag.c:474

6926 +#: builtin/commit.c:1224 builtin/tag.c:495

6927 #, c-format

6928 msgid "Invalid cleanup mode %s"

6929 msgstr "无效的清理模式 %s"

6930

6621 -#: builtin/commit.c:1231

6931 +#: builtin/commit.c:1229

6932 msgid "Paths with -a does not make sense."

6933 msgstr "路径和 -a 选项同时使用没有意义。"

6934

6625 -#: builtin/commit.c:1341 builtin/commit.c:1617

6935 +#: builtin/commit.c:1339 builtin/commit.c:1612

6936 msgid "show status concisely"

6937 msgstr "以简洁的格式显示状态"

6938

6629 -#: builtin/commit.c:1343 builtin/commit.c:1619

6939 +#: builtin/commit.c:1341 builtin/commit.c:1614

6940 msgid "show branch information"

6941 msgstr "显示分支信息"

6942

6633 -#: builtin/commit.c:1345

6943 +#: builtin/commit.c:1343

6944 msgid "version"

6945 msgstr "版本"

6946

6637 -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522

6638 -#: builtin/worktree.c:440

6947 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525

6948 +#: builtin/worktree.c:442

6949 msgid "machine-readable output"

6950 msgstr "机器可读的输出"

6951

6642 -#: builtin/commit.c:1348 builtin/commit.c:1623

6952 +#: builtin/commit.c:1346 builtin/commit.c:1618

6953 msgid "show status in long format (default)"

6954 msgstr "以长格式显示状态（默认）"

6955

6646 -#: builtin/commit.c:1351 builtin/commit.c:1626

6956 +#: builtin/commit.c:1349 builtin/commit.c:1621

6957 msgid "terminate entries with NUL"

6958 msgstr "条目以 NUL 字符结尾"

6959

6650 -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981

6651 -#: builtin/fast-export.c:984 builtin/tag.c:353

6960 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981

6961 +#: builtin/fast-export.c:984 builtin/tag.c:368

6962 msgid "mode"

6963 msgstr "模式"

6964

6655 -#: builtin/commit.c:1354 builtin/commit.c:1629

6965 +#: builtin/commit.c:1352 builtin/commit.c:1624

6966 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

6967 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

6968

6659 -#: builtin/commit.c:1357

6969 +#: builtin/commit.c:1355

6970 msgid "show ignored files"

6971 msgstr "显示忽略的文件"

6972

6663 -#: builtin/commit.c:1358 parse-options.h:155

6973 +#: builtin/commit.c:1356 parse-options.h:155

6974 msgid "when"

6975 msgstr "何时"

6976

6667 -#: builtin/commit.c:1359

6977 +#: builtin/commit.c:1357

6978 msgid ""

6979 "ignore changes to submodules, optional when: all, dirty, untracked. "

6980 "(Default: all)"

6981 msgstr ""

6982 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

6983

6674 -#: builtin/commit.c:1361

6984 +#: builtin/commit.c:1359

6985 msgid "list untracked files in columns"

6986 msgstr "以列的方式显示未跟踪的文件"

6987

6678 -#: builtin/commit.c:1437

6988 +#: builtin/commit.c:1435

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

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

6991

6682 -#: builtin/commit.c:1439

6992 +#: builtin/commit.c:1437

6993 msgid "could not parse newly created commit"

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

6995

6686 -#: builtin/commit.c:1484

6996 +#: builtin/commit.c:1482

6997 msgid "detached HEAD"

6998 msgstr "分离头指针"

6999

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

6691 -#: builtin/commit.c:1487

7001 +#: builtin/commit.c:1485

7002 msgid " (root-commit)"

7003 msgstr "（根提交）"

7004

6695 -#: builtin/commit.c:1587

7005 +#: builtin/commit.c:1582

7006 msgid "suppress summary after successful commit"

7007 msgstr "提交成功后不显示概述信息"

7008

6699 -#: builtin/commit.c:1588

7009 +#: builtin/commit.c:1583

7010 msgid "show diff in commit message template"

7011 msgstr "在提交说明模板里显示差异"

7012

6703 -#: builtin/commit.c:1590

7013 +#: builtin/commit.c:1585

7014 msgid "Commit message options"

7015 msgstr "提交说明选项"

7016

6707 -#: builtin/commit.c:1591 builtin/tag.c:351

7017 +#: builtin/commit.c:1586 builtin/tag.c:366

7018 msgid "read message from file"

7019 msgstr "从文件中读取提交说明"

7020

6711 -#: builtin/commit.c:1592

7021 +#: builtin/commit.c:1587

7022 msgid "author"

7023 msgstr "作者"

7024

6715 -#: builtin/commit.c:1592

7025 +#: builtin/commit.c:1587

7026 msgid "override author for commit"

7027 msgstr "提交时覆盖作者"

7028

6719 -#: builtin/commit.c:1593 builtin/gc.c:326

7029 +#: builtin/commit.c:1588 builtin/gc.c:333

7030 msgid "date"

7031 msgstr "日期"

7032

6723 -#: builtin/commit.c:1593

7033 +#: builtin/commit.c:1588

7034 msgid "override date for commit"

7035 msgstr "提交时覆盖日期"

7036

6727 -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398

6728 -#: builtin/notes.c:561 builtin/tag.c:349

7037 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398

7038 +#: builtin/notes.c:561 builtin/tag.c:364

7039 msgid "message"

7040 msgstr "说明"

7041

6732 -#: builtin/commit.c:1594

7042 +#: builtin/commit.c:1589

7043 msgid "commit message"

7044 msgstr "提交说明"

7045

6736 -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597

6737 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79

7046 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592

7047 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81

7048 msgid "commit"

7049 msgstr "提交"

7050

6741 -#: builtin/commit.c:1595

7051 +#: builtin/commit.c:1590

7052 msgid "reuse and edit message from specified commit"

7053 msgstr "重用并编辑指定提交的提交说明"

7054

6745 -#: builtin/commit.c:1596

7055 +#: builtin/commit.c:1591

7056 msgid "reuse message from specified commit"

7057 msgstr "重用指定提交的提交说明"

7058

6749 -#: builtin/commit.c:1597

7059 +#: builtin/commit.c:1592

7060 msgid "use autosquash formatted message to fixup specified commit"

7061 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

7062

6753 -#: builtin/commit.c:1598

7063 +#: builtin/commit.c:1593

7064 msgid "use autosquash formatted message to squash specified commit"

7065 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

7066

6757 -#: builtin/commit.c:1599

7067 +#: builtin/commit.c:1594

7068 msgid "the commit is authored by me now (used with -C/-c/--amend)"

7069 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

7070

6761 -#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86

7071 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86

7072 msgid "add Signed-off-by:"

7073 msgstr "添加 Signed-off-by: 签名"

7074

6765 -#: builtin/commit.c:1601

7075 +#: builtin/commit.c:1596

7076 msgid "use specified template file"

7077 msgstr "使用指定的模板文件"

7078

6769 -#: builtin/commit.c:1602

7079 +#: builtin/commit.c:1597

7080 msgid "force edit of commit"

7081 msgstr "强制编辑提交"

7082

7083 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

6774 -#: builtin/commit.c:1603

7084 +#: builtin/commit.c:1598

7085 msgid "default"

7086 msgstr "default"

7087

6778 -#: builtin/commit.c:1603 builtin/tag.c:354

7088 +#: builtin/commit.c:1598 builtin/tag.c:369

7089 msgid "how to strip spaces and #comments from message"

7090 msgstr "设置如何删除提交说明里的空格和#注释"

7091

6782 -#: builtin/commit.c:1604

7092 +#: builtin/commit.c:1599

7093 msgid "include status in commit message template"

7094 msgstr "在提交说明模板里包含状态信息"

7095

6786 -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166

7096 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166

7097 #: builtin/revert.c:93

7098 msgid "GPG sign commit"

7099 msgstr "GPG 提交签名"

7100

6791 -#: builtin/commit.c:1609

7101 +#: builtin/commit.c:1604

7102 msgid "Commit contents options"

7103 msgstr "提交内容选项"

7104

6795 -#: builtin/commit.c:1610

7105 +#: builtin/commit.c:1605

7106 msgid "commit all changed files"

7107 msgstr "提交所有改动的文件"

7108

6799 -#: builtin/commit.c:1611

7109 +#: builtin/commit.c:1606

7110 msgid "add specified files to index for commit"

7111 msgstr "添加指定的文件到索引区等待提交"

7112

6803 -#: builtin/commit.c:1612

7113 +#: builtin/commit.c:1607

7114 msgid "interactively add files"

7115 msgstr "交互式添加文件"

7116

6807 -#: builtin/commit.c:1613

7117 +#: builtin/commit.c:1608

7118 msgid "interactively add changes"

7119 msgstr "交互式添加变更"

7120

6811 -#: builtin/commit.c:1614

7121 +#: builtin/commit.c:1609

7122 msgid "commit only specified files"

7123 msgstr "只提交指定的文件"

7124

6815 -#: builtin/commit.c:1615

7125 +#: builtin/commit.c:1610

7126 msgid "bypass pre-commit and commit-msg hooks"

7127 msgstr "绕过 pre-commit 和 commit-msg 钩子"

7128

6819 -#: builtin/commit.c:1616

7129 +#: builtin/commit.c:1611

7130 msgid "show what would be committed"

7131 msgstr "显示将要提交的内容"

7132

6823 -#: builtin/commit.c:1627

7133 +#: builtin/commit.c:1622

7134 msgid "amend previous commit"

7135 msgstr "修改先前的提交"

7136

6827 -#: builtin/commit.c:1628

7137 +#: builtin/commit.c:1623

7138 msgid "bypass post-rewrite hook"

7139 msgstr "绕过 post-rewrite 钩子"

7140

6831 -#: builtin/commit.c:1633

7141 +#: builtin/commit.c:1628

7142 msgid "ok to record an empty change"

7143 msgstr "允许一个空提交"

7144

6835 -#: builtin/commit.c:1635

7145 +#: builtin/commit.c:1630

7146 msgid "ok to record a change with an empty message"

7147 msgstr "允许空的提交说明"

7148

6839 -#: builtin/commit.c:1664

7149 +#: builtin/commit.c:1659

7150 msgid "could not parse HEAD commit"

7151 msgstr "不能解析 HEAD 提交"

7152

6843 -#: builtin/commit.c:1712

7153 +#: builtin/commit.c:1707

7154 #, c-format

7155 msgid "Corrupt MERGE_HEAD file (%s)"

7156 msgstr "损坏的 MERGE_HEAD 文件（%s）"

7157

6848 -#: builtin/commit.c:1719

7158 +#: builtin/commit.c:1714

7159 msgid "could not read MERGE_MODE"

7160 msgstr "不能读取 MERGE_MODE"

7161

6852 -#: builtin/commit.c:1738

7162 +#: builtin/commit.c:1733

7163 #, c-format

7164 msgid "could not read commit message: %s"

7165 msgstr "不能读取提交说明：%s"

7166

6857 -#: builtin/commit.c:1749

7167 +#: builtin/commit.c:1744

7168 #, c-format

7169 msgid "Aborting commit; you did not edit the message.\n"

7170 msgstr "终止提交；您未更改来自模版的提交说明。\n"

7171

6862 -#: builtin/commit.c:1754

7172 +#: builtin/commit.c:1749

7173 #, c-format

7174 msgid "Aborting commit due to empty commit message.\n"

7175 msgstr "终止提交因为提交说明为空。\n"

7176

6867 -#: builtin/commit.c:1802

7177 +#: builtin/commit.c:1797

7178 msgid ""

7179 "Repository has been updated, but unable to write\n"

7180 "new_index file. Check that disk is not full and quota is\n"

@@ -7186,35 +7496,118 @@ msgstr "没有发现名称，无法描述任何东西。"

7496 msgid "--dirty is incompatible with commit-ishes"

7497 msgstr "--dirty 不能与提交同时使用"

7498

7189 -#: builtin/diff.c:86

7499 +#: builtin/diff.c:83

7500 #, c-format

7501 msgid "'%s': not a regular file or symlink"

7502 msgstr "'%s'：不是一个正规文件或符号链接"

7503

7194 -#: builtin/diff.c:237

7504 +#: builtin/diff.c:234

7505 #, c-format

7506 msgid "invalid option: %s"

7507 msgstr "无效选项：%s"

7508

7199 -#: builtin/diff.c:361

7509 +#: builtin/diff.c:358

7510 msgid "Not a git repository"

7511 msgstr "不是一个 git 仓库"

7512

7203 -#: builtin/diff.c:404

7513 +#: builtin/diff.c:401

7514 #, c-format

7515 msgid "invalid object '%s' given."

7516 msgstr "提供了无效对象 '%s'。"

7517

7208 -#: builtin/diff.c:413

7518 +#: builtin/diff.c:410

7519 #, c-format

7520 msgid "more than two blobs given: '%s'"

7521 msgstr "提供了超过两个数据对象：'%s'"

7522

7213 -#: builtin/diff.c:420

7523 +#: builtin/diff.c:417

7524 #, c-format

7525 msgid "unhandled object '%s' given."

7526 msgstr "无法处理的对象 '%s'。"

7527

7528 +#: builtin/difftool.c:28

7529 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

7530 +msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"

7531 +

7532 +#: builtin/difftool.c:241

7533 +#, c-format

7534 +msgid "failed: %d"

7535 +msgstr "失败：%d"

7536 +

7537 +#: builtin/difftool.c:342

7538 +msgid ""

7539 +"combined diff formats('-c' and '--cc') are not supported in\n"

7540 +"directory diff mode('-d' and '--dir-diff')."

7541 +msgstr "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--cc'）。"

7542 +

7543 +#: builtin/difftool.c:567

7544 +#, c-format

7545 +msgid "both files modified: '%s' and '%s'."

7546 +msgstr "两个文件都被修改：'%s' 和 '%s'。"

7547 +

7548 +#: builtin/difftool.c:569

7549 +msgid "working tree file has been left."

7550 +msgstr "工作区文件被留了下来。"

7551 +

7552 +#: builtin/difftool.c:580

7553 +#, c-format

7554 +msgid "temporary files exist in '%s'."

7555 +msgstr "临时文件存在于 '%s'。"

7556 +

7557 +#: builtin/difftool.c:581

7558 +msgid "you may want to cleanup or recover these."

7559 +msgstr "您可能想要清理或者恢复它们。"

7560 +

7561 +#: builtin/difftool.c:626

7562 +msgid "use `diff.guitool` instead of `diff.tool`"

7563 +msgstr "使用 `diff.guitool` 代替 `diff.tool`"

7564 +

7565 +#: builtin/difftool.c:628

7566 +msgid "perform a full-directory diff"

7567 +msgstr "执行一个全目录差异比较"

7568 +

7569 +#: builtin/difftool.c:630

7570 +msgid "do not prompt before launching a diff tool"

7571 +msgstr "启动差异比较工具之前不提示"

7572 +

7573 +#: builtin/difftool.c:636

7574 +msgid "use symlinks in dir-diff mode"

7575 +msgstr "在 dir-diff 模式中使用符号链接"

7576 +

7577 +#: builtin/difftool.c:637

7578 +msgid "<tool>"

7579 +msgstr "<工具>"

7580 +

7581 +#: builtin/difftool.c:638

7582 +msgid "use the specified diff tool"

7583 +msgstr "使用指定的差异比较工具"

7584 +

7585 +#: builtin/difftool.c:640

7586 +msgid "print a list of diff tools that may be used with `--tool`"

7587 +msgstr "显示可以用在 `--tool` 参数后的差异工具列表"

7588 +

7589 +#: builtin/difftool.c:643

7590 +msgid ""

7591 +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "

7592 +"code"

7593 +msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"

7594 +

7595 +#: builtin/difftool.c:645

7596 +msgid "<command>"

7597 +msgstr "<命令>"

7598 +

7599 +#: builtin/difftool.c:646

7600 +msgid "specify a custom command for viewing diffs"

7601 +msgstr "指定一个用于查看差异的自定义命令"

7602 +

7603 +#: builtin/difftool.c:670

7604 +msgid "no <tool> given for --tool=<tool>"

7605 +msgstr "没有为 --tool=<工具> 参数提供 <工具>"

7606 +

7607 +#: builtin/difftool.c:677

7608 +msgid "no <cmd> given for --extcmd=<cmd>"

7609 +msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"

7610 +

7611 #: builtin/fast-export.c:25

7612 msgid "git fast-export [rev-list-opts]"

7613 msgstr "git fast-export [rev-list-opts]"

@@ -7372,77 +7765,77 @@ msgstr "引用映射"

7765 msgid "specify fetch refmap"

7766 msgstr "指定获取操作的引用映射"

7767

7375 -#: builtin/fetch.c:398

7768 +#: builtin/fetch.c:395

7769 msgid "Couldn't find remote ref HEAD"

7770 msgstr "无法发现远程 HEAD 引用"

7771

7379 -#: builtin/fetch.c:514

7772 +#: builtin/fetch.c:511

7773 #, c-format

7774 msgid "configuration fetch.output contains invalid value %s"

7775 msgstr "配置变量 fetch.output 包含无效值 %s"

7776

7384 -#: builtin/fetch.c:607

7777 +#: builtin/fetch.c:604

7778 #, c-format

7779 msgid "object %s not found"

7780 msgstr "对象 %s 未发现"

7781

7389 -#: builtin/fetch.c:611

7782 +#: builtin/fetch.c:608

7783 msgid "[up to date]"

7784 msgstr "[最新]"

7785

7393 -#: builtin/fetch.c:624 builtin/fetch.c:704

7786 +#: builtin/fetch.c:621 builtin/fetch.c:701

7787 msgid "[rejected]"

7788 msgstr "[已拒绝]"

7789

7397 -#: builtin/fetch.c:625

7790 +#: builtin/fetch.c:622

7791 msgid "can't fetch in current branch"

7792 msgstr "当前分支下不能执行获取操作"

7793

7401 -#: builtin/fetch.c:634

7794 +#: builtin/fetch.c:631

7795 msgid "[tag update]"

7796 msgstr "[标签更新]"

7797

7405 -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684

7406 -#: builtin/fetch.c:699

7798 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681

7799 +#: builtin/fetch.c:696

7800 msgid "unable to update local ref"

7801 msgstr "不能更新本地引用"

7802

7410 -#: builtin/fetch.c:654

7803 +#: builtin/fetch.c:651

7804 msgid "[new tag]"

7805 msgstr "[新标签]"

7806

7414 -#: builtin/fetch.c:657

7807 +#: builtin/fetch.c:654

7808 msgid "[new branch]"

7809 msgstr "[新分支]"

7810

7418 -#: builtin/fetch.c:660

7811 +#: builtin/fetch.c:657

7812 msgid "[new ref]"

7813 msgstr "[新引用]"

7814

7422 -#: builtin/fetch.c:699

7815 +#: builtin/fetch.c:696

7816 msgid "forced update"

7817 msgstr "强制更新"

7818

7426 -#: builtin/fetch.c:704

7819 +#: builtin/fetch.c:701

7820 msgid "non-fast-forward"

7821 msgstr "非快进"

7822

7430 -#: builtin/fetch.c:749

7823 +#: builtin/fetch.c:746

7824 #, c-format

7825 msgid "%s did not send all necessary objects\n"

7826 msgstr "%s 未发送所有必须的对象\n"

7827

7435 -#: builtin/fetch.c:769

7828 +#: builtin/fetch.c:766

7829 #, c-format

7830 msgid "reject %s because shallow roots are not allowed to be updated"

7831 msgstr "拒绝 %s 因为浅克隆不允许被更新"

7832

7440 -#: builtin/fetch.c:856 builtin/fetch.c:952

7833 +#: builtin/fetch.c:853 builtin/fetch.c:949

7834 #, c-format

7835 msgid "From %.*s\n"

7836 msgstr "来自 %.*s\n"

7837

7445 -#: builtin/fetch.c:867

7838 +#: builtin/fetch.c:864

7839 #, c-format

7840 msgid ""

7841 "some local refs could not be updated; try running\n"

@@ -7452,95 +7845,95 @@ msgstr ""

7845 " 'git remote prune %s' 来删除旧的、有冲突的分支"

7846

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

7455 -#: builtin/fetch.c:922

7848 +#: builtin/fetch.c:919

7849 #, c-format

7850 msgid " (%s will become dangling)"

7851 msgstr " （%s 将成为摇摆状态）"

7852

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

7461 -#: builtin/fetch.c:923

7854 +#: builtin/fetch.c:920

7855 #, c-format

7856 msgid " (%s has become dangling)"

7857 msgstr " （%s 已成为摇摆状态）"

7858

7466 -#: builtin/fetch.c:955

7859 +#: builtin/fetch.c:952

7860 msgid "[deleted]"

7861 msgstr "[已删除]"

7862

7470 -#: builtin/fetch.c:956 builtin/remote.c:1020

7863 +#: builtin/fetch.c:953 builtin/remote.c:1020

7864 msgid "(none)"

7865 msgstr "（无）"

7866

7474 -#: builtin/fetch.c:979

7867 +#: builtin/fetch.c:976

7868 #, c-format

7869 msgid "Refusing to fetch into current branch %s of non-bare repository"

7870 msgstr "拒绝获取到非纯仓库的当前分支 %s"

7871

7479 -#: builtin/fetch.c:998

7872 +#: builtin/fetch.c:995

7873 #, c-format

7874 msgid "Option \"%s\" value \"%s\" is not valid for %s"

7875 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

7876

7484 -#: builtin/fetch.c:1001

7877 +#: builtin/fetch.c:998

7878 #, c-format

7879 msgid "Option \"%s\" is ignored for %s\n"

7880 msgstr "选项 \"%s\" 为 %s 所忽略\n"

7881

7489 -#: builtin/fetch.c:1077

7882 +#: builtin/fetch.c:1074

7883 #, c-format

7884 msgid "Don't know how to fetch from %s"

7885 msgstr "不知道如何从 %s 获取"

7886

7494 -#: builtin/fetch.c:1237

7887 +#: builtin/fetch.c:1234

7888 #, c-format

7889 msgid "Fetching %s\n"

7890 msgstr "正在获取 %s\n"

7891

7499 -#: builtin/fetch.c:1239 builtin/remote.c:96

7892 +#: builtin/fetch.c:1236 builtin/remote.c:96

7893 #, c-format

7894 msgid "Could not fetch %s"

7895 msgstr "不能获取 %s"

7896

7504 -#: builtin/fetch.c:1257

7897 +#: builtin/fetch.c:1254

7898 msgid ""

7899 "No remote repository specified. Please, specify either a URL or a\n"

7900 "remote name from which new revisions should be fetched."

7901 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"

7902

7510 -#: builtin/fetch.c:1280

7903 +#: builtin/fetch.c:1277

7904 msgid "You need to specify a tag name."

7905 msgstr "您需要指定一个标签名称。"

7906

7514 -#: builtin/fetch.c:1322

7907 +#: builtin/fetch.c:1319

7908 msgid "Negative depth in --deepen is not supported"

7909 msgstr "--deepen 不支持负数深度"

7910

7518 -#: builtin/fetch.c:1324

7911 +#: builtin/fetch.c:1321

7912 msgid "--deepen and --depth are mutually exclusive"

7913 msgstr "--deepen 和 --depth 是互斥的"

7914

7522 -#: builtin/fetch.c:1329

7915 +#: builtin/fetch.c:1326

7916 msgid "--depth and --unshallow cannot be used together"

7917 msgstr "--depth 和 --unshallow 不能同时使用"

7918

7526 -#: builtin/fetch.c:1331

7919 +#: builtin/fetch.c:1328

7920 msgid "--unshallow on a complete repository does not make sense"

7921 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"

7922

7530 -#: builtin/fetch.c:1353

7923 +#: builtin/fetch.c:1350

7924 msgid "fetch --all does not take a repository argument"

7925 msgstr "fetch --all 不能带一个仓库参数"

7926

7534 -#: builtin/fetch.c:1355

7927 +#: builtin/fetch.c:1352

7928 msgid "fetch --all does not make sense with refspecs"

7929 msgstr "fetch --all 带引用规格没有任何意义"

7930

7538 -#: builtin/fetch.c:1366

7931 +#: builtin/fetch.c:1363

7932 #, c-format

7933 msgid "No such remote or remote group: %s"

7934 msgstr "没有这样的远程或远程组：%s"

7935

7543 -#: builtin/fetch.c:1374

7936 +#: builtin/fetch.c:1371

7937 msgid "Fetching a group and specifying refspecs does not make sense"

7938 msgstr "获取组并指定引用规格没有意义"

7939

@@ -7605,7 +7998,7 @@ msgstr "引用占位符适用于 Tcl"

7998 msgid "show only <n> matched refs"

7999 msgstr "只显示 <n> 个匹配的引用"

8000

7608 -#: builtin/for-each-ref.c:37 builtin/tag.c:372

8001 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38

8002 msgid "format to use for the output"

8003 msgstr "输出格式"

8004

@@ -7625,63 +8018,63 @@ msgstr "只打印没有合并的引用"

8018 msgid "print only refs which contain the commit"

8019 msgstr "只打印包含该提交的引用"

8020

7628 -#: builtin/fsck.c:519

8021 +#: builtin/fsck.c:554

8022 msgid "Checking object directories"

l10n: zh_CN: for git v2.12.0 l10n round 2