6b77569371 · matheusbsbs/matheus-bagliano

@@ -292,8 +292,8 @@ msgid ""

292 msgstr ""

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

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

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

296 -"PO-Revision-Date: 2020-05-30 00:36+0800\n"

295 +"POT-Creation-Date: 2020-07-10 09:53+0800\n"

296 +"PO-Revision-Date: 2020-07-20 18:34+0800\n"

297 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"

298 "Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"

299 "Language: zh_TW\n"

@@ -395,21 +395,21 @@ msgstr[0] "增加了 %d 個路徑\n"

395 msgid "ignoring unmerged: %s"

396 msgstr "忽略未合併：%s"

397

398 -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366

398 +#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368

399 #, c-format

400 msgid "Only binary files changed.\n"

401 msgstr "只有二進位檔案被修改。\n"

402

403 -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368

403 +#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370

404 #, c-format

405 msgid "No changes.\n"

406 msgstr "沒有修改。\n"

407

408 -#: add-interactive.c:935 git-add--interactive.perl:1376

408 +#: add-interactive.c:935 git-add--interactive.perl:1378

409 msgid "Patch update"

410 msgstr "修補檔更新"

411

412 -#: add-interactive.c:974 git-add--interactive.perl:1754

412 +#: add-interactive.c:974 git-add--interactive.perl:1771

413 msgid "Review diff"

414 msgstr "檢視 diff"

415

@@ -477,11 +477,11 @@ msgstr "選擇編號過的項目"

477 msgid "(empty) select nothing"

478 msgstr "（空）全不選取"

479

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

480 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868

481 msgid "*** Commands ***"

482 msgstr "*** 指令 ***"

483

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

484 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865

485 msgid "What now"

486 msgstr "請選擇"

487

@@ -498,7 +498,7 @@ msgstr "未快取"

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

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

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

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

501 +#: builtin/submodule--helper.c:2148 bugreport.c:135

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

503 msgid "path"

504 msgstr "路徑"

@@ -507,33 +507,38 @@ msgstr "路徑"

507 msgid "could not refresh index"

508 msgstr "無法重新整理索引"

509

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

510 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782

511 #, c-format

512 msgid "Bye.\n"

513 msgstr "再見。\n"

514

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

515 +#: add-patch.c:34 git-add--interactive.perl:1430

516 #, c-format, perl-format

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

518 msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "

519

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

520 +#: add-patch.c:35 git-add--interactive.perl:1431

521 #, c-format, perl-format

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

523 -msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "

523 +msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? "

524

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

525 +#: add-patch.c:36 git-add--interactive.perl:1432

526 +#, c-format, perl-format

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

528 +msgstr "暫存新增變更 [y,n,q,a,d%s,?]? "

529 +

530 +#: add-patch.c:37 git-add--interactive.perl:1433

531 #, c-format, perl-format

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

533 msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "

534

530 -#: add-patch.c:38

535 +#: add-patch.c:39

536 msgid ""

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

538 "staging."

539 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"

540

536 -#: add-patch.c:41

541 +#: add-patch.c:42

542 msgid ""

543 "y - stage this hunk\n"

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

@@ -547,28 +552,33 @@ msgstr ""

552 "a - 暫存此區塊和本檔案中後面的全部區塊\n"

553 "d - 不暫存此區塊和本檔案中後面的全部區塊\n"

554

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

555 +#: add-patch.c:56 git-add--interactive.perl:1436

556 #, c-format, perl-format

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

558 msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "

559

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

560 +#: add-patch.c:57 git-add--interactive.perl:1437

561 #, c-format, perl-format

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

558 -msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? "

563 +msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? "

564

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

565 +#: add-patch.c:58 git-add--interactive.perl:1438

566 +#, c-format, perl-format

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

568 +msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? "

569 +

570 +#: add-patch.c:59 git-add--interactive.perl:1439

571 #, c-format, perl-format

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

573 msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "

574

565 -#: add-patch.c:59

575 +#: add-patch.c:61

576 msgid ""

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

578 "stashing."

579 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"

580

571 -#: add-patch.c:62

581 +#: add-patch.c:64

582 msgid ""

583 "y - stash this hunk\n"

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

@@ -582,28 +592,33 @@ msgstr ""

592 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"

593 "d - 不儲藏此區塊和本檔案中後面的全部區塊\n"

594

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

595 +#: add-patch.c:80 git-add--interactive.perl:1442

596 #, c-format, perl-format

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

598 msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "

599

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

600 +#: add-patch.c:81 git-add--interactive.perl:1443

601 #, c-format, perl-format

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

593 -msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "

603 +msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? "

604

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

605 +#: add-patch.c:82 git-add--interactive.perl:1444

606 +#, c-format, perl-format

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

608 +msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? "

609 +

610 +#: add-patch.c:83 git-add--interactive.perl:1445

611 #, c-format, perl-format

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

613 msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "

614

600 -#: add-patch.c:82

615 +#: add-patch.c:85

616 msgid ""

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

618 "unstaging."

619 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"

620

606 -#: add-patch.c:85

621 +#: add-patch.c:88

622 msgid ""

623 "y - unstage this hunk\n"

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

@@ -617,28 +632,33 @@ msgstr ""

632 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"

633 "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"

634

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

635 +#: add-patch.c:103 git-add--interactive.perl:1448

636 #, c-format, perl-format

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

638 msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "

639

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

640 +#: add-patch.c:104 git-add--interactive.perl:1449

641 #, c-format, perl-format

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

628 -msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? "

643 +msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? "

644

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

645 +#: add-patch.c:105 git-add--interactive.perl:1450

646 +#, c-format, perl-format

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

648 +msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? "

649 +

650 +#: add-patch.c:106 git-add--interactive.perl:1451

651 #, c-format, perl-format

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

653 msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "

654

635 -#: add-patch.c:104 add-patch.c:169 add-patch.c:212

655 +#: add-patch.c:108 add-patch.c:176 add-patch.c:221

656 msgid ""

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

658 "applying."

659 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"

660

641 -#: add-patch.c:107

661 +#: add-patch.c:111

662 msgid ""

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

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

@@ -652,31 +672,37 @@ msgstr ""

672 "a - 套用此區塊和本檔案中後面的全部區塊\n"

673 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"

674

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

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

675 +#: add-patch.c:126 git-add--interactive.perl:1454

676 +#: git-add--interactive.perl:1472

677 #, c-format, perl-format

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

679 msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "

680

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

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

681 +#: add-patch.c:127 git-add--interactive.perl:1455

682 +#: git-add--interactive.perl:1473

683 #, c-format, perl-format

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

665 -msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? "

685 +msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? "

686 +

687 +#: add-patch.c:128 git-add--interactive.perl:1456

688 +#: git-add--interactive.perl:1474

689 +#, c-format, perl-format

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

691 +msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? "

692

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

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

693 +#: add-patch.c:129 git-add--interactive.perl:1457

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

695 #, c-format, perl-format

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

697 msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "

698

673 -#: add-patch.c:126 add-patch.c:148 add-patch.c:191

699 +#: add-patch.c:131 add-patch.c:154 add-patch.c:199

700 msgid ""

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

702 "discarding."

703 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。"

704

679 -#: add-patch.c:129 add-patch.c:194

705 +#: add-patch.c:134 add-patch.c:202

706 msgid ""

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

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

@@ -690,22 +716,27 @@ msgstr ""

716 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"

717 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"

718

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

719 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460

720 #, c-format, perl-format

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

722 msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "

723

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

724 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461

725 #, c-format, perl-format

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

727 msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "

728

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

729 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462

730 +#, c-format, perl-format

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

732 +msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "

733 +

734 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463

735 #, c-format, perl-format

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

737 msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "

738

708 -#: add-patch.c:151

739 +#: add-patch.c:157

740 msgid ""

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

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

@@ -719,22 +750,27 @@ msgstr ""

750 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"

751 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"

752

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

753 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466

754 #, c-format, perl-format

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

756 msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "

757

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

758 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467

759 #, c-format, perl-format

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

730 -msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "

761 +msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? "

762 +

763 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468

764 +#, c-format, perl-format

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

766 +msgstr "套用索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "

767

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

768 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469

769 #, c-format, perl-format

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

771 msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "

772

737 -#: add-patch.c:172

773 +#: add-patch.c:179

774 msgid ""

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

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

@@ -748,7 +784,7 @@ msgstr ""

784 "a - 套用此區塊和本檔案中後面的全部區塊\n"

785 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"

786

751 -#: add-patch.c:215

787 +#: add-patch.c:224

788 msgid ""

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

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

@@ -762,40 +798,40 @@ msgstr ""

798 "a - 套用此區塊和本檔案中後面的全部區塊\n"

799 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"

800

765 -#: add-patch.c:319

801 +#: add-patch.c:328

802 #, c-format

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

804 msgstr "無法解析區塊標頭 '%.*s'"

805

770 -#: add-patch.c:338 add-patch.c:342

806 +#: add-patch.c:347 add-patch.c:351

807 #, c-format

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

809 msgstr "無法解析上色過的區塊標頭 '%.*s'"

810

775 -#: add-patch.c:396

811 +#: add-patch.c:405

812 msgid "could not parse diff"

813 msgstr "無法解析差異 (diff)"

814

779 -#: add-patch.c:415

815 +#: add-patch.c:424

816 msgid "could not parse colored diff"

817 msgstr "無法解析上色過的差異 (diff)"

818

783 -#: add-patch.c:429

819 +#: add-patch.c:438

820 #, c-format

821 msgid "failed to run '%s'"

822 msgstr "無法執行 '%s'"

823

788 -#: add-patch.c:588

824 +#: add-patch.c:602

825 msgid "mismatched output from interactive.diffFilter"

826 msgstr "interactive.diffFilter 的輸出不符"

827

792 -#: add-patch.c:589

828 +#: add-patch.c:603

829 msgid ""

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

831 "between its input and output lines."

832 msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。"

833

798 -#: add-patch.c:762

834 +#: add-patch.c:776

835 #, c-format

836 msgid ""

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

@@ -804,7 +840,7 @@ msgstr ""

840 "應有上下文行 #%d 於\n"

841 "%.*s"

842

807 -#: add-patch.c:777

843 +#: add-patch.c:791

844 #, c-format

845 msgid ""

846 "hunks do not overlap:\n"

@@ -817,11 +853,11 @@ msgstr ""

853 "\t不以下述結尾：\n"

854 "%.*s"

855

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

856 +#: add-patch.c:1067 git-add--interactive.perl:1114

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

858 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"

859

824 -#: add-patch.c:1057

860 +#: add-patch.c:1071

861 #, c-format

862 msgid ""

863 "---\n"

@@ -835,7 +871,7 @@ msgstr ""

871 "以 %c 開始的行將被刪除。\n"

872

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

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

874 +#: add-patch.c:1085 git-add--interactive.perl:1128

875 msgid ""

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

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

@@ -844,11 +880,11 @@ msgstr ""

880 "如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"

881 "此次編輯被終止，此區塊不會被修改。\n"

882

847 -#: add-patch.c:1104

883 +#: add-patch.c:1118

884 msgid "could not parse hunk header"

885 msgstr "無法解析區塊標頭"

886

851 -#: add-patch.c:1149

887 +#: add-patch.c:1163

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

889 msgstr "「git apply --cached」失敗"

890

@@ -864,24 +900,24 @@ msgstr "「git apply --cached」失敗"

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

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

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

867 -#: add-patch.c:1218 git-add--interactive.perl:1239

903 +#: add-patch.c:1232 git-add--interactive.perl:1241

904 msgid ""

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

906 msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? "

907

872 -#: add-patch.c:1261

908 +#: add-patch.c:1275

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

910 msgstr "選取的區塊不會套用進索引！"

911

876 -#: add-patch.c:1262 git-add--interactive.perl:1343

912 +#: add-patch.c:1276 git-add--interactive.perl:1345

913 msgid "Apply them to the worktree anyway? "

914 msgstr "無論如何都要套用到工作區嗎？"

915

880 -#: add-patch.c:1269 git-add--interactive.perl:1346

916 +#: add-patch.c:1283 git-add--interactive.perl:1348

917 msgid "Nothing was applied.\n"

918 msgstr "未套用。\n"

919

884 -#: add-patch.c:1326

920 +#: add-patch.c:1340

921 msgid ""

922 "j - leave this hunk undecided, see next undecided hunk\n"

923 "J - leave this hunk undecided, see next hunk\n"

@@ -903,68 +939,68 @@ msgstr ""

939 "e - 手動編輯目前區塊\n"

940 "? - 顯示說明\n"

941

906 -#: add-patch.c:1447 add-patch.c:1457

942 +#: add-patch.c:1463 add-patch.c:1473

943 msgid "No previous hunk"

944 msgstr "沒有上一個區塊"

945

910 -#: add-patch.c:1452 add-patch.c:1462

946 +#: add-patch.c:1468 add-patch.c:1478

947 msgid "No next hunk"

948 msgstr "沒有下一個區塊"

949

914 -#: add-patch.c:1468

950 +#: add-patch.c:1484

951 msgid "No other hunks to goto"

952 msgstr "沒有其它可供跳轉的區塊"

953

918 -#: add-patch.c:1479 git-add--interactive.perl:1577

954 +#: add-patch.c:1495 git-add--interactive.perl:1594

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

956 msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ "

957

922 -#: add-patch.c:1480 git-add--interactive.perl:1579

958 +#: add-patch.c:1496 git-add--interactive.perl:1596

959 msgid "go to which hunk? "

960 msgstr "跳轉到哪個區塊？"

961

926 -#: add-patch.c:1491

962 +#: add-patch.c:1507

963 #, c-format

964 msgid "Invalid number: '%s'"

965 msgstr "無效數字：'%s'"

966

931 -#: add-patch.c:1496

967 +#: add-patch.c:1512

968 #, c-format

969 msgid "Sorry, only %d hunk available."

970 msgid_plural "Sorry, only %d hunks available."

971 msgstr[0] "對不起，只有 %d 個可用區塊。"

972

937 -#: add-patch.c:1505

973 +#: add-patch.c:1521

974 msgid "No other hunks to search"

975 msgstr "沒有其它可供尋找的區塊"

976

941 -#: add-patch.c:1511 git-add--interactive.perl:1623

977 +#: add-patch.c:1527 git-add--interactive.perl:1640

978 msgid "search for regex? "

979 msgstr "使用正規表示式搜尋？"

980

945 -#: add-patch.c:1526

981 +#: add-patch.c:1542

982 #, c-format

983 msgid "Malformed search regexp %s: %s"

984 msgstr "錯誤的正規表示式 %s：%s"

985

950 -#: add-patch.c:1543

986 +#: add-patch.c:1559

987 msgid "No hunk matches the given pattern"

988 msgstr "沒有和提供模式相符合的區塊"

989

954 -#: add-patch.c:1550

990 +#: add-patch.c:1566

991 msgid "Sorry, cannot split this hunk"

992 msgstr "對不起，不能分割這個區塊"

993

958 -#: add-patch.c:1554

994 +#: add-patch.c:1570

995 #, c-format

996 msgid "Split into %d hunks."

997 msgstr "分割為 %d 塊。"

998

963 -#: add-patch.c:1558

999 +#: add-patch.c:1574

1000 msgid "Sorry, cannot edit this hunk"

1001 msgstr "對不起，不能編輯這個區塊"

1002

967 -#: add-patch.c:1609

1003 +#: add-patch.c:1625

1004 msgid "'git apply' failed"

1005 msgstr "'git apply' 失敗"

1006

@@ -1631,7 +1667,7 @@ msgstr "確保至少符合 <n> 行上下文"

1667

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

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

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

1670 +#: builtin/pack-objects.c:3530 builtin/rebase.c:1332

1671 msgid "action"

1672 msgstr "動作"

1673

@@ -1720,7 +1756,7 @@ msgstr "路徑不是有效的 UTF-8：%s"

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

1757 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"

1758

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

1759 +#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246

1760 #, c-format

1761 msgid "deflate error (%d)"

1762 msgstr "壓縮錯誤 (%d)"

@@ -1789,8 +1825,8 @@ msgid "prepend prefix to each pathname in the archive"

1825 msgstr "為歸檔中每個路徑名加上前綴"

1826

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

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

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

1828 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208

1829 +#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907

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

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

1832 #: parse-options.h:190

@@ -2012,10 +2048,10 @@ msgstr "不能將 --contents 和最終的提交物件名共用"

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

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

2050

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

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

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

2053 #: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

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

2054 +#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363

2055 #: builtin/shortlog.c:192

2056 msgid "revision walk setup failed"

2057 msgstr "版本遍歷設定失敗"

@@ -2168,82 +2204,86 @@ msgstr "'%s' 已經檢出到 '%s'"

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

2205 msgstr "工作區 %s 的 HEAD 指向沒有被更新"

2206

2171 -#: bundle.c:36

2207 +#: bundle.c:47

2208 #, c-format

2209 msgid "'%s' does not look like a v2 bundle file"

2210 msgstr "'%s' 不像是一個 v2 版本的包檔案"

2211

2176 -#: bundle.c:64

2212 +#: bundle.c:69

2213 +msgid "unknown hash algorithm length"

2214 +msgstr "未知的雜湊算法長度"

2215 +

2216 +#: bundle.c:84

2217 #, c-format

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

2219 msgstr "無法識別的包頭：%s%s (%d)"

2220

2181 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2221 +#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2222 #: builtin/commit.c:814

2223 #, c-format

2224 msgid "could not open '%s'"

2225 msgstr "不能開啟 '%s'"

2226

2187 -#: bundle.c:143

2227 +#: bundle.c:163

2228 msgid "Repository lacks these prerequisite commits:"

2229 msgstr "版本庫中缺少這些必備的提交："

2230

2191 -#: bundle.c:146

2231 +#: bundle.c:166

2232 msgid "need a repository to verify a bundle"

2233 msgstr "需要版本庫驗證一個包"

2234

2195 -#: bundle.c:197

2235 +#: bundle.c:217

2236 #, c-format

2237 msgid "The bundle contains this ref:"

2238 msgid_plural "The bundle contains these %d refs:"

2239 msgstr[0] "這個包中含有這 %d 個引用："

2240

2201 -#: bundle.c:204

2241 +#: bundle.c:224

2242 msgid "The bundle records a complete history."

2243 msgstr "這個包記錄一個完整歷史。"

2244

2205 -#: bundle.c:206

2245 +#: bundle.c:226

2246 #, c-format

2247 msgid "The bundle requires this ref:"

2248 msgid_plural "The bundle requires these %d refs:"

2249 msgstr[0] "這個包需要這 %d 個引用："

2250

2211 -#: bundle.c:273

2251 +#: bundle.c:293

2252 msgid "unable to dup bundle descriptor"

2253 msgstr "無法複製 bundle 描述符"

2254

2215 -#: bundle.c:280

2255 +#: bundle.c:300

2256 msgid "Could not spawn pack-objects"

2257 msgstr "不能生成 pack-objects 進程"

2258

2219 -#: bundle.c:291

2259 +#: bundle.c:311

2260 msgid "pack-objects died"

2261 msgstr "pack-objects 終止"

2262

2223 -#: bundle.c:333

2263 +#: bundle.c:353

2264 msgid "rev-list died"

2265 msgstr "rev-list 終止"

2266

2227 -#: bundle.c:382

2267 +#: bundle.c:402

2268 #, c-format

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

2270 msgstr "引用 '%s' 被 rev-list 選項排除"

2271

2232 -#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2272 +#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2273 #, c-format

2274 msgid "unrecognized argument: %s"

2275 msgstr "無法識別的參數：%s"

2276

2237 -#: bundle.c:469

2277 +#: bundle.c:489

2278 msgid "Refusing to create empty bundle."

2279 msgstr "不能建立空包。"

2280

2241 -#: bundle.c:479

2281 +#: bundle.c:499

2282 #, c-format

2283 msgid "cannot create '%s'"

2284 msgstr "不能建立 '%s'"

2285

2246 -#: bundle.c:504

2286 +#: bundle.c:524

2287 msgid "index-pack died"

2288 msgstr "index-pack 終止"

2289

@@ -2252,266 +2292,259 @@ msgstr "index-pack 終止"

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

2293 msgstr "無效的顏色值：%.*s"

2294

2255 -#: commit-graph.c:183

2295 +#: commit-graph.c:238

2296 msgid "commit-graph file is too small"

2297 msgstr "提交圖形檔案太小"

2298

2259 -#: commit-graph.c:248

2299 +#: commit-graph.c:303

2300 #, c-format

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

2302 msgstr "提交圖形簽名 %X 和簽名 %X 不符合"

2303

2264 -#: commit-graph.c:255

2304 +#: commit-graph.c:310

2305 #, c-format

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

2307 msgstr "提交圖形版本 %X 和版本 %X 不符合"

2308

2269 -#: commit-graph.c:262

2309 +#: commit-graph.c:317

2310 #, c-format

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

2312 msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"

2313

2274 -#: commit-graph.c:284

2314 +#: commit-graph.c:339

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

2316 msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整"

2317

2278 -#: commit-graph.c:294

2318 +#: commit-graph.c:349

2319 #, c-format

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

2321 msgstr "提交圖形不正確的區塊位移 %08x%08x"

2322

2283 -#: commit-graph.c:362

2323 +#: commit-graph.c:417

2324 #, c-format

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

2326 msgstr "提交圖形區塊 id %08x 出現了多次"

2327

2288 -#: commit-graph.c:436

2328 +#: commit-graph.c:491

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

2330 msgstr "提交圖形沒有基礎圖形區塊"

2331

2292 -#: commit-graph.c:446

2332 +#: commit-graph.c:501

2333 msgid "commit-graph chain does not match"

2334 msgstr "提交圖形鏈不符合"

2335

2296 -#: commit-graph.c:494

2336 +#: commit-graph.c:549

2337 #, c-format

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

2339 msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"

2340

2301 -#: commit-graph.c:518

2341 +#: commit-graph.c:573

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

2343 msgstr "無法找到所有提交圖形檔案"

2344

2305 -#: commit-graph.c:651 commit-graph.c:711

2345 +#: commit-graph.c:706 commit-graph.c:770

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

2347 msgstr "無效的提交位置。提交圖形可能已損壞"

2348

2309 -#: commit-graph.c:672

2349 +#: commit-graph.c:727

2350 #, c-format

2351 msgid "could not find commit %s"

2352 msgstr "無法找到提交 %s"

2353

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

2354 +#: commit-graph.c:1009 builtin/am.c:1292

2355 #, c-format

2356 msgid "unable to parse commit %s"

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

2358

2319 -#: commit-graph.c:1096

2359 +#: commit-graph.c:1157

2360 msgid "Writing changed paths Bloom filters index"

2361 msgstr "正在寫入變更路徑的布隆過濾器索引"

2362

2323 -#: commit-graph.c:1121

2363 +#: commit-graph.c:1182

2364 msgid "Writing changed paths Bloom filters data"

2365 msgstr "正在寫入變更路徑的布隆過濾器索引"

2366

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

2367 +#: commit-graph.c:1221 builtin/pack-objects.c:2832

2368 #, c-format

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

2370 msgstr "無法獲得物件 %s 類型"

2371

2332 -#: commit-graph.c:1196

2372 +#: commit-graph.c:1257

2373 msgid "Loading known commits in commit graph"

2374 msgstr "正在載入提交圖中的已知提交"

2375

2336 -#: commit-graph.c:1213

2376 +#: commit-graph.c:1274

2377 msgid "Expanding reachable commits in commit graph"

2378 msgstr "正在擴展提交圖中的可以取得提交"

2379

2340 -#: commit-graph.c:1233

2380 +#: commit-graph.c:1294

2381 msgid "Clearing commit marks in commit graph"

2382 msgstr "正在清除提交圖中的提交標記"

2383

2344 -#: commit-graph.c:1252

2384 +#: commit-graph.c:1313

2385 msgid "Computing commit graph generation numbers"

2386 msgstr "正在計算提交圖世代數字"

2387

2348 -#: commit-graph.c:1300

2388 +#: commit-graph.c:1367

2389 msgid "Computing commit changed paths Bloom filters"

2390 msgstr "正在計算提交變更路徑的布隆過濾器"

2391

2352 -#: commit-graph.c:1359

2392 +#: commit-graph.c:1423

2393 +msgid "Collecting referenced commits"

2394 +msgstr "正在收集引用提交"

2395 +

2396 +#: commit-graph.c:1447

2397 #, c-format

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

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

2400 msgstr[0] "正在 %d 個包中尋找提交圖的提交"

2401

2358 -#: commit-graph.c:1372

2402 +#: commit-graph.c:1460

2403 #, c-format

2404 msgid "error adding pack %s"

2405 msgstr "新增包 %s 發生錯誤"

2406

2363 -#: commit-graph.c:1376

2407 +#: commit-graph.c:1464

2408 #, c-format

2409 msgid "error opening index for %s"

2410 msgstr "為 %s 開啟索引發生錯誤"

2411

2368 -#: commit-graph.c:1405

2369 -#, c-format

2370 -msgid "Finding commits for commit graph from %d ref"

2371 -msgid_plural "Finding commits for commit graph from %d refs"

2372 -msgstr[0] "正在從 %d 個引用中尋找提交圖的提交"

2373 -

2374 -#: commit-graph.c:1426

2375 -#, c-format

2376 -msgid "invalid commit object id: %s"

2377 -msgstr "無效的提交物件 ID：%s"

2378 -

2379 -#: commit-graph.c:1442

2412 +#: commit-graph.c:1503

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

2414 msgstr "正在打包物件中尋找提交圖的提交"

2415

2383 -#: commit-graph.c:1457

2416 +#: commit-graph.c:1518

2417 msgid "Counting distinct commits in commit graph"

2418 msgstr "正在計算提交圖中不同的提交"

2419

2387 -#: commit-graph.c:1489

2420 +#: commit-graph.c:1550

2421 msgid "Finding extra edges in commit graph"

2422 msgstr "正在尋找提交圖中額外的邊"

2423

2391 -#: commit-graph.c:1538

2424 +#: commit-graph.c:1599

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

2426 msgstr "無法寫入正確數量的基礎圖形 ID"

2427

2395 -#: commit-graph.c:1572 midx.c:812

2428 +#: commit-graph.c:1633 midx.c:812

2429 #, c-format

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

2431 msgstr "不能為 %s 建立先導目錄"

2432

2400 -#: commit-graph.c:1585

2433 +#: commit-graph.c:1646

2434 msgid "unable to create temporary graph layer"

2435 msgstr "無法建立暫時的圖形層"

2436

2404 -#: commit-graph.c:1590

2437 +#: commit-graph.c:1651

2438 #, c-format

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

2440 msgstr "無法調整「%s」的共用權限"

2441

2409 -#: commit-graph.c:1667

2442 +#: commit-graph.c:1728

2443 #, c-format

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

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

2446 msgstr[0] "正在用 %d 步寫出提交圖"

2447

2415 -#: commit-graph.c:1712

2448 +#: commit-graph.c:1773

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

2450 msgstr "無法開啟提交圖形鏈檔案"

2451

2419 -#: commit-graph.c:1728

2452 +#: commit-graph.c:1789

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

2454 msgstr "無法重新命名基礎提交圖形檔案"

2455

2423 -#: commit-graph.c:1748

2456 +#: commit-graph.c:1809

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

2458 msgstr "無法重新命名暫時提交圖形檔案"

2459

2427 -#: commit-graph.c:1874

2460 +#: commit-graph.c:1935

2461 msgid "Scanning merged commits"

2462 msgstr "正在掃描合併提交"

2463

2431 -#: commit-graph.c:1885

2464 +#: commit-graph.c:1946

2465 #, c-format

2466 msgid "unexpected duplicate commit id %s"

2467 msgstr "意外的重複提交 ID %s"

2468

2436 -#: commit-graph.c:1908

2469 +#: commit-graph.c:1969

2470 msgid "Merging commit-graph"

2471 msgstr "正在合併提交圖形"

2472

2440 -#: commit-graph.c:2096

2473 +#: commit-graph.c:2156

2474 #, c-format

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

2476 msgstr "提交圖格式不能寫入 %d 個提交"

2477

2445 -#: commit-graph.c:2107

2478 +#: commit-graph.c:2167

2479 msgid "too many commits to write graph"

2480 msgstr "提交太多不能畫圖"

2481

2449 -#: commit-graph.c:2200

2482 +#: commit-graph.c:2260

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

2484 msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"

2485

2453 -#: commit-graph.c:2210

2486 +#: commit-graph.c:2270

2487 #, c-format

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

2489 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"

2490

2458 -#: commit-graph.c:2220 commit-graph.c:2235

2491 +#: commit-graph.c:2280 commit-graph.c:2295

2492 #, c-format

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

2494 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"

2495

2463 -#: commit-graph.c:2227

2496 +#: commit-graph.c:2287

2497 #, c-format

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

2499 msgstr "無法從提交圖形中解析提交 %s"

2500

2468 -#: commit-graph.c:2245

2501 +#: commit-graph.c:2305

2502 msgid "Verifying commits in commit graph"

2503 msgstr "正在驗證提交圖中的提交"

2504

2472 -#: commit-graph.c:2259

2505 +#: commit-graph.c:2320

2506 #, c-format

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

2508 msgstr "無法從提交圖形的物件庫中解析提交 %s"

2509

2477 -#: commit-graph.c:2266

2510 +#: commit-graph.c:2327

2511 #, c-format

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

2513 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"

2514

2482 -#: commit-graph.c:2276

2515 +#: commit-graph.c:2337

2516 #, c-format

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

2518 msgstr "提交 %s 的提交圖形父提交列表太長了"

2519

2487 -#: commit-graph.c:2285

2520 +#: commit-graph.c:2346

2521 #, c-format

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

2523 msgstr "%s 的提交圖形父提交是 %s != %s"

2524

2492 -#: commit-graph.c:2298

2525 +#: commit-graph.c:2360

2526 #, c-format

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

2528 msgstr "提交 %s 的提交圖形父提交列表過早終止"

2529

2497 -#: commit-graph.c:2303

2530 +#: commit-graph.c:2365

2531 #, c-format

2532 msgid ""

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

2534 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"

2535

2503 -#: commit-graph.c:2307

2536 +#: commit-graph.c:2369

2537 #, c-format

2538 msgid ""

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

2540 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"

2541

2509 -#: commit-graph.c:2322

2542 +#: commit-graph.c:2385

2543 #, c-format

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

2545 msgstr "提交圖形中的提交 %s 的世代號是 %u != %u"

2546

2514 -#: commit-graph.c:2328

2547 +#: commit-graph.c:2391

2548 #, c-format

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

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

@@ -2547,27 +2580,27 @@ msgstr ""

2580 "設定 \"git config advice.graftFileDeprecated false\"\n"

2581 "可關閉本消息"

2582

2550 -#: commit.c:1168

2583 +#: commit.c:1172

2584 #, c-format

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

2586 msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"

2587

2555 -#: commit.c:1172

2588 +#: commit.c:1176

2589 #, c-format

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

2591 msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"

2592

2560 -#: commit.c:1175

2593 +#: commit.c:1179

2594 #, c-format

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

2596 msgstr "提交 %s 沒有 GPG 簽名。"

2597

2565 -#: commit.c:1178

2598 +#: commit.c:1182

2599 #, c-format

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

2601 msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"

2602

2570 -#: commit.c:1432

2603 +#: commit.c:1436

2604 msgid ""

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

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

@@ -2755,7 +2788,7 @@ msgstr "%s 的取值格式錯誤：%s"

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

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

2790

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

2791 +#: config.c:1533 builtin/pack-objects.c:3617

2792 #, c-format

2793 msgid "bad pack compression level %d"

2794 msgstr "錯誤的打包壓縮級別 %d"

@@ -2903,72 +2936,81 @@ msgstr ""

2936 msgid "server doesn't support '%s'"

2937 msgstr "伺服器不支援 '%s'"

2938

2906 -#: connect.c:103

2939 +#: connect.c:118

2940 #, c-format

2941 msgid "server doesn't support feature '%s'"

2942 msgstr "伺服器不支援特性 '%s'"

2943

2911 -#: connect.c:114

2944 +#: connect.c:129

2945 msgid "expected flush after capabilities"

2946 msgstr "在能力之後應為一個 flush 包"

2947

2915 -#: connect.c:233

2948 +#: connect.c:263

2949 #, c-format

2950 msgid "ignoring capabilities after first line '%s'"

2951 msgstr "忽略第一行 '%s' 之後的能力欄位"

2952

2920 -#: connect.c:252

2953 +#: connect.c:284

2954 msgid "protocol error: unexpected capabilities^{}"

2955 msgstr "協定錯誤：意外的 capabilities^{}"

2956

2924 -#: connect.c:273

2957 +#: connect.c:306

2958 #, c-format

2959 msgid "protocol error: expected shallow sha-1, got '%s'"

2960 msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"

2961

2929 -#: connect.c:275

2962 +#: connect.c:308

2963 msgid "repository on the other end cannot be shallow"

2964 msgstr "另一端的版本庫不能是淺複製版本庫"

2965

2933 -#: connect.c:313

2966 +#: connect.c:347

2967 msgid "invalid packet"

2968 msgstr "無效封包"

2969

2937 -#: connect.c:333

2970 +#: connect.c:367

2971 #, c-format

2972 msgid "protocol error: unexpected '%s'"

2973 msgstr "協定錯誤：意外的 '%s'"

2974

2942 -#: connect.c:441

2975 +#: connect.c:473

2976 +#, c-format

2977 +msgid "unknown object format '%s' specified by server"

2978 +msgstr "伺服器指定的「%s」物件格式無效"

2979 +

2980 +#: connect.c:500

2981 #, c-format

2982 msgid "invalid ls-refs response: %s"

2983 msgstr "無效的 ls-refs 回應：%s"

2984

2947 -#: connect.c:445

2985 +#: connect.c:504

2986 msgid "expected flush after ref listing"

2987 msgstr "在引用列表之後應該有一個 flush 包"

2988

2951 -#: connect.c:544

2989 +#: connect.c:507

2990 +msgid "expected response end packet after ref listing"

2991 +msgstr "在引用列表後預期要有回應結束封包"

2992 +

2993 +#: connect.c:640

2994 #, c-format

2995 msgid "protocol '%s' is not supported"

2996 msgstr "不支援 '%s' 協定"

2997

2956 -#: connect.c:595

2998 +#: connect.c:691

2999 msgid "unable to set SO_KEEPALIVE on socket"

3000 msgstr "無法為 socket 設定 SO_KEEPALIVE"

3001

2960 -#: connect.c:635 connect.c:698

3002 +#: connect.c:731 connect.c:794

3003 #, c-format

3004 msgid "Looking up %s ... "

3005 msgstr "尋找 %s ... "

3006

2965 -#: connect.c:639

3007 +#: connect.c:735

3008 #, c-format

3009 msgid "unable to look up %s (port %s) (%s)"

3010 msgstr "無法尋找 %s（埠 %s）（%s）"

3011

3012 #. TRANSLATORS: this is the end of "Looking up %s ... "

2971 -#: connect.c:643 connect.c:714

3013 +#: connect.c:739 connect.c:810

3014 #, c-format

3015 msgid ""

3016 "done.\n"

@@ -2977,7 +3019,7 @@ msgstr ""

3019 "完成。\n"

3020 "連線到 %s（埠 %s）... "

3021

2980 -#: connect.c:665 connect.c:742

3022 +#: connect.c:761 connect.c:838

3023 #, c-format

3024 msgid ""

3025 "unable to connect to %s:\n"

@@ -2987,73 +3029,73 @@ msgstr ""

3029 "%s"

3030

3031 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

2990 -#: connect.c:671 connect.c:748

3032 +#: connect.c:767 connect.c:844

3033 msgid "done."

3034 msgstr "完成。"

3035

2994 -#: connect.c:702

3036 +#: connect.c:798

3037 #, c-format

3038 msgid "unable to look up %s (%s)"

3039 msgstr "無法尋找 %s（%s）"

3040

2999 -#: connect.c:708

3041 +#: connect.c:804

3042 #, c-format

3043 msgid "unknown port %s"

3044 msgstr "未知埠 %s"

3045

3004 -#: connect.c:845 connect.c:1175

3046 +#: connect.c:941 connect.c:1271

3047 #, c-format

3048 msgid "strange hostname '%s' blocked"

3049 msgstr "已阻止奇怪的主機名稱 '%s'"

3050

3009 -#: connect.c:847

3051 +#: connect.c:943

3052 #, c-format

3053 msgid "strange port '%s' blocked"

3054 msgstr "已阻止奇怪的埠號 '%s'"

3055

3014 -#: connect.c:857

3056 +#: connect.c:953

3057 #, c-format

3058 msgid "cannot start proxy %s"

3059 msgstr "不能啟動代理 %s"

3060

3019 -#: connect.c:928

3061 +#: connect.c:1024

3062 msgid "no path specified; see 'git help pull' for valid url syntax"

3063 msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"

3064

3023 -#: connect.c:1123

3065 +#: connect.c:1219

3066 msgid "ssh variant 'simple' does not support -4"

3067 msgstr "ssh 變體 'simple' 不支援 -4"

3068

3027 -#: connect.c:1135

3069 +#: connect.c:1231

3070 msgid "ssh variant 'simple' does not support -6"

3071 msgstr "ssh 變體 'simple' 不支援 -6"

3072

3031 -#: connect.c:1152

3073 +#: connect.c:1248

3074 msgid "ssh variant 'simple' does not support setting port"

3075 msgstr "ssh 變體 'simple' 不支援設定埠"

3076

3035 -#: connect.c:1264

3077 +#: connect.c:1360

3078 #, c-format

3079 msgid "strange pathname '%s' blocked"

3080 msgstr "已阻止奇怪的路徑名 '%s'"

3081

3040 -#: connect.c:1311

3082 +#: connect.c:1407

3083 msgid "unable to fork"

3084 msgstr "無法 fork"

3085

3044 -#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45

3086 +#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45

3087 msgid "Checking connectivity"

3088 msgstr "正在檢查連通性"

3089

3048 -#: connected.c:119

3090 +#: connected.c:121

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

3092 msgstr "不能執行 'git rev-list'"

3093

3052 -#: connected.c:139

3094 +#: connected.c:141

3095 msgid "failed write to rev-list"

3096 msgstr "寫入 rev-list 失敗"

3097

3056 -#: connected.c:146

3098 +#: connected.c:148

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

3100 msgstr "關閉 rev-list 的標準輸入失敗"

3101

@@ -3302,18 +3344,18 @@ msgid ""

3344 msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"

3345

3346 # 譯者：請維持前導空格

3305 -#: diff.c:155

3347 +#: diff.c:156

3348 #, c-format

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

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

3351

3352 # 譯者：請維持前導空格

3311 -#: diff.c:160

3353 +#: diff.c:161

3354 #, c-format

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

3356 msgstr " 未知的 dirstat 參數 '%s'\n"

3357

3316 -#: diff.c:296

3358 +#: diff.c:297

3359 msgid ""

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

3361 "'dimmed-zebra', 'plain'"

@@ -3321,7 +3363,7 @@ msgstr ""

3363 "移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "

3364 "'plain'"

3365

3324 -#: diff.c:324

3366 +#: diff.c:325

3367 #, c-format

3368 msgid ""

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

@@ -3330,18 +3372,18 @@ msgstr ""

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

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

3374

3333 -#: diff.c:332

3375 +#: diff.c:333

3376 msgid ""

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

3378 "whitespace modes"

3379 msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"

3380

3339 -#: diff.c:405

3381 +#: diff.c:410

3382 #, c-format

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

3384 msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"

3385

3344 -#: diff.c:465

3386 +#: diff.c:470

3387 #, c-format

3388 msgid ""

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

@@ -3350,35 +3392,35 @@ msgstr ""

3392 "發現設定變數 'diff.dirstat' 中的錯誤：\n"

3393 "%s"

3394

3353 -#: diff.c:4238

3395 +#: diff.c:4243

3396 #, c-format

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

3398 msgstr "外部 diff 離開，停止在 %s"

3399

3358 -#: diff.c:4583

3400 +#: diff.c:4589

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

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

3403

3362 -#: diff.c:4586

3404 +#: diff.c:4592

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

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

3407

3366 -#: diff.c:4664

3408 +#: diff.c:4670

3409 msgid "--follow requires exactly one pathspec"

3410 msgstr "--follow 明確要求只跟一個路徑規格"

3411

3370 -#: diff.c:4712

3412 +#: diff.c:4718

3413 #, c-format

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

3415 msgstr "無效的 --stat 值：%s"

3416

3375 -#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245

3417 +#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250

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

3419 #, c-format

3420 msgid "%s expects a numerical value"

3421 msgstr "%s 期望一個數字值"

3422

3381 -#: diff.c:4749

3423 +#: diff.c:4755

3424 #, c-format

3425 msgid ""

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

@@ -3387,195 +3429,195 @@ msgstr ""

3429 "無法解析 --dirstat/-X 選項的參數：\n"

3430 "%s"

3431

3390 -#: diff.c:4834

3432 +#: diff.c:4840

3433 #, c-format

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

3435 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"

3436

3395 -#: diff.c:4858

3437 +#: diff.c:4864

3438 #, c-format

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

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

3441

3400 -#: diff.c:4872

3442 +#: diff.c:4878

3443 #, c-format

3444 msgid "unable to resolve '%s'"

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

3446

3405 -#: diff.c:4922 diff.c:4928

3447 +#: diff.c:4928 diff.c:4934

3448 #, c-format

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

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

3451

3410 -#: diff.c:4940

3452 +#: diff.c:4946

3453 #, c-format

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

3455 msgstr "%s 期望一個字元，得到 '%s'"

3456

3415 -#: diff.c:4961

3457 +#: diff.c:4967

3458 #, c-format

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

3460 msgstr "壞的 --color-moved 參數：%s"

3461

3420 -#: diff.c:4980

3462 +#: diff.c:4986

3463 #, c-format

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

3465 msgstr "--color-moved-ws 中的無效模式 '%s'"

3466

3425 -#: diff.c:5020

3467 +#: diff.c:5026

3468 msgid ""

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

3470 "\"histogram\""

3471 msgstr ""

3472 "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3473

3432 -#: diff.c:5056 diff.c:5076

3474 +#: diff.c:5062 diff.c:5082

3475 #, c-format

3476 msgid "invalid argument to %s"

3477 msgstr "%s 的參數無效"

3478

3437 -#: diff.c:5214

3479 +#: diff.c:5219

3480 #, c-format

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

3482 msgstr "無法解析 --submodule 選項的參數：'%s'"

3483

3442 -#: diff.c:5270

3484 +#: diff.c:5275

3485 #, c-format

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

3487 msgstr "壞的 --word-diff 參數：%s"

3488

3447 -#: diff.c:5293

3489 +#: diff.c:5298

3490 msgid "Diff output format options"

3491 msgstr "差異輸出格式化選項"

3492

3451 -#: diff.c:5295 diff.c:5301

3493 +#: diff.c:5300 diff.c:5306

3494 msgid "generate patch"

3495 msgstr "生成修補檔"

3496

3455 -#: diff.c:5298 builtin/log.c:177

3497 +#: diff.c:5303 builtin/log.c:177

3498 msgid "suppress diff output"

3499 msgstr "不顯示差異輸出"

3500

3459 -#: diff.c:5303 diff.c:5417 diff.c:5424

3501 +#: diff.c:5308 diff.c:5422 diff.c:5429

3502 msgid "<n>"

3503 msgstr "<n>"

3504

3463 -#: diff.c:5304 diff.c:5307

3505 +#: diff.c:5309 diff.c:5312

3506 msgid "generate diffs with <n> lines context"

3507 msgstr "生成含 <n> 行上下文的差異"

3508

3467 -#: diff.c:5309

3509 +#: diff.c:5314

3510 msgid "generate the diff in raw format"

3511 msgstr "生成原始格式的差異"

3512

3471 -#: diff.c:5312

3513 +#: diff.c:5317

3514 msgid "synonym for '-p --raw'"

3515 msgstr "和 '-p --raw' 同義"

3516

3475 -#: diff.c:5316

3517 +#: diff.c:5321

3518 msgid "synonym for '-p --stat'"

3519 msgstr "和 '-p --stat' 同義"

3520

3479 -#: diff.c:5320

3521 +#: diff.c:5325

3522 msgid "machine friendly --stat"

3523 msgstr "機器友好的 --stat"

3524

3483 -#: diff.c:5323

3525 +#: diff.c:5328

3526 msgid "output only the last line of --stat"

3527 msgstr "只輸出 --stat 的最後一行"

3528

3487 -#: diff.c:5325 diff.c:5333

3529 +#: diff.c:5330 diff.c:5338

3530 msgid "<param1,param2>..."

3531 msgstr "<參數1,參數2>..."

3532

3491 -#: diff.c:5326

3533 +#: diff.c:5331

3534 msgid ""

3535 "output the distribution of relative amount of changes for each sub-directory"

3536 msgstr "輸出每個子目錄相對變更的分布"

3537

3496 -#: diff.c:5330

3538 +#: diff.c:5335

3539 msgid "synonym for --dirstat=cumulative"

3540 msgstr "和 --dirstat=cumulative 同義"

3541

3500 -#: diff.c:5334

3542 +#: diff.c:5339

3543 msgid "synonym for --dirstat=files,param1,param2..."

3544 msgstr "是 --dirstat=files,param1,param2... 的同義詞"

3545

3504 -#: diff.c:5338

3546 +#: diff.c:5343

3547 msgid "warn if changes introduce conflict markers or whitespace errors"

3548 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"

3549

3508 -#: diff.c:5341

3550 +#: diff.c:5346

3551 msgid "condensed summary such as creations, renames and mode changes"

3552 msgstr "精簡摘要，例如建立、重新命名和模式變更"

3553

3512 -#: diff.c:5344

3554 +#: diff.c:5349

3555 msgid "show only names of changed files"

3556 msgstr "只顯示變更檔案的檔案名"

3557

3516 -#: diff.c:5347

3558 +#: diff.c:5352

3559 msgid "show only names and status of changed files"

3560 msgstr "只顯示變更檔案的檔案名和狀態"

3561

3520 -#: diff.c:5349

3562 +#: diff.c:5354

3563 msgid "<width>[,<name-width>[,<count>]]"

3564 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"

3565

3524 -#: diff.c:5350

3566 +#: diff.c:5355

3567 msgid "generate diffstat"

3568 msgstr "生成差異統計（diffstat）"

3569

3528 -#: diff.c:5352 diff.c:5355 diff.c:5358

3570 +#: diff.c:5357 diff.c:5360 diff.c:5363

3571 msgid "<width>"

3572 msgstr "<寬度>"

3573

3532 -#: diff.c:5353

3574 +#: diff.c:5358

3575 msgid "generate diffstat with a given width"

3576 msgstr "使用提供的長度生成差異統計"

3577

3536 -#: diff.c:5356

3578 +#: diff.c:5361

3579 msgid "generate diffstat with a given name width"

3580 msgstr "使用提供的檔案名長度生成差異統計"

3581

3540 -#: diff.c:5359

3582 +#: diff.c:5364

3583 msgid "generate diffstat with a given graph width"

3584 msgstr "使用提供的圖形長度生成差異統計"

3585

3544 -#: diff.c:5361

3586 +#: diff.c:5366

3587 msgid "<count>"

3588 msgstr "<次數>"

3589

3548 -#: diff.c:5362

3590 +#: diff.c:5367

3591 msgid "generate diffstat with limited lines"

3592 msgstr "生成有限行數的差異統計"

3593

3552 -#: diff.c:5365

3594 +#: diff.c:5370

3595 msgid "generate compact summary in diffstat"

3596 msgstr "生成差異統計的簡潔摘要"

3597

3556 -#: diff.c:5368

3598 +#: diff.c:5373

3599 msgid "output a binary diff that can be applied"

3600 msgstr "輸出一個可以應用的二進位差異"

3601

3560 -#: diff.c:5371

3602 +#: diff.c:5376

3603 msgid "show full pre- and post-image object names on the \"index\" lines"

3604 msgstr "在 \"index\" 行顯示完整的前後物件名稱"

3605

3564 -#: diff.c:5373

3606 +#: diff.c:5378

3607 msgid "show colored diff"

3608 msgstr "顯示帶顏色的差異"

3609

3568 -#: diff.c:5374

3610 +#: diff.c:5379

3611 msgid "<kind>"

3612 msgstr "<類型>"

3613

3572 -#: diff.c:5375

3614 +#: diff.c:5380

3615 msgid ""

3616 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3617 "diff"

3618 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"

3619

3578 -#: diff.c:5378

3620 +#: diff.c:5383

3621 msgid ""

3622 "do not munge pathnames and use NULs as output field terminators in --raw or "

3623 "--numstat"

@@ -3583,295 +3625,295 @@ msgstr ""

3625 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"

3626 "符"

3627

3586 -#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493

3628 +#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498

3629 msgid "<prefix>"

3630 msgstr "<前綴>"

3631

3590 -#: diff.c:5382

3632 +#: diff.c:5387

3633 msgid "show the given source prefix instead of \"a/\""

3634 msgstr "顯示提供的源前綴取代 \"a/\""

3635

3594 -#: diff.c:5385

3636 +#: diff.c:5390

3637 msgid "show the given destination prefix instead of \"b/\""

3638 msgstr "顯示提供的目標前綴取代 \"b/\""

3639

3598 -#: diff.c:5388

3640 +#: diff.c:5393

3641 msgid "prepend an additional prefix to every line of output"

3642 msgstr "輸出的每一行附加前綴"

3643

3602 -#: diff.c:5391

3644 +#: diff.c:5396

3645 msgid "do not show any source or destination prefix"

3646 msgstr "不顯示任何源和目標前綴"

3647

3606 -#: diff.c:5394

3648 +#: diff.c:5399

3649 msgid "show context between diff hunks up to the specified number of lines"

3650 msgstr "顯示指定行數的差異區塊間的上下文"

3651

3610 -#: diff.c:5398 diff.c:5403 diff.c:5408

3652 +#: diff.c:5403 diff.c:5408 diff.c:5413

3653 msgid "<char>"

3654 msgstr "<字元>"

3655

3614 -#: diff.c:5399

3656 +#: diff.c:5404

3657 msgid "specify the character to indicate a new line instead of '+'"

3658 msgstr "指定一個字元取代 '+' 來表示新的一行"

3659

3618 -#: diff.c:5404

3660 +#: diff.c:5409

3661 msgid "specify the character to indicate an old line instead of '-'"

3662 msgstr "指定一個字元取代 '-' 來表示舊的一行"

3663

3622 -#: diff.c:5409

3664 +#: diff.c:5414

3665 msgid "specify the character to indicate a context instead of ' '"

3666 msgstr "指定一個字元取代 ' ' 來表示一行上下文"

3667

3626 -#: diff.c:5412

3668 +#: diff.c:5417

3669 msgid "Diff rename options"

3670 msgstr "差異重新命名選項"

3671

3630 -#: diff.c:5413

3672 +#: diff.c:5418

3673 msgid "<n>[/<m>]"

3674 msgstr "<n>[/<m>]"

3675

3634 -#: diff.c:5414

3676 +#: diff.c:5419

3677 msgid "break complete rewrite changes into pairs of delete and create"

3678 msgstr "將完全重寫的變更打破為成對的刪除和建立"

3679

3638 -#: diff.c:5418

3680 +#: diff.c:5423

3681 msgid "detect renames"

3682 msgstr "檢測重新命名"

3683

3642 -#: diff.c:5422

3684 +#: diff.c:5427

3685 msgid "omit the preimage for deletes"

3644 -msgstr "省略刪除動作的差異輸出"

3686 +msgstr "省略刪除變更的差異輸出"

3687

3646 -#: diff.c:5425

3688 +#: diff.c:5430

3689 msgid "detect copies"

3690 msgstr "檢測複製"

3691

3650 -#: diff.c:5429

3692 +#: diff.c:5434

3693 msgid "use unmodified files as source to find copies"

3694 msgstr "使用未修改的檔案做為發現複製的源"

3695

3654 -#: diff.c:5431

3696 +#: diff.c:5436

3697 msgid "disable rename detection"

3698 msgstr "停用重新命名偵測"

3699

3658 -#: diff.c:5434

3700 +#: diff.c:5439

3701 msgid "use empty blobs as rename source"

3702 msgstr "使用空的資料物件做為重新命名的源"

3703

3662 -#: diff.c:5436

3704 +#: diff.c:5441

3705 msgid "continue listing the history of a file beyond renames"

3706 msgstr "繼續列出檔案重新命名以外的歷史記錄"

3707

3666 -#: diff.c:5439

3708 +#: diff.c:5444

3709 msgid ""

3710 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3711 "given limit"

3712 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"

3713

3672 -#: diff.c:5441

3714 +#: diff.c:5446

3715 msgid "Diff algorithm options"

3716 msgstr "差異演算法選項"

3717

3676 -#: diff.c:5443

3718 +#: diff.c:5448

3719 msgid "produce the smallest possible diff"

3720 msgstr "生成儘可能小的差異"

3721

3680 -#: diff.c:5446

3722 +#: diff.c:5451

3723 msgid "ignore whitespace when comparing lines"

3724 msgstr "行比較時忽略空白字元"

3725

3684 -#: diff.c:5449

3726 +#: diff.c:5454

3727 msgid "ignore changes in amount of whitespace"

3728 msgstr "忽略空白字元的變更"

3729

3688 -#: diff.c:5452

3730 +#: diff.c:5457

3731 msgid "ignore changes in whitespace at EOL"

3732 msgstr "忽略行尾的空白字元變更"

3733

3692 -#: diff.c:5455

3734 +#: diff.c:5460

3735 msgid "ignore carrier-return at the end of line"

3736 msgstr "忽略行尾的Enter符（CR）"

3737

3696 -#: diff.c:5458

3738 +#: diff.c:5463

3739 msgid "ignore changes whose lines are all blank"

3740 msgstr "忽略整行都是空白的變更"

3741

3700 -#: diff.c:5461

3742 +#: diff.c:5466

3743 msgid "heuristic to shift diff hunk boundaries for easy reading"

3744 msgstr "啟發式轉換差異邊界以便閱讀"

3745

3704 -#: diff.c:5464

3746 +#: diff.c:5469

3747 msgid "generate diff using the \"patience diff\" algorithm"

3748 msgstr "使用 \"patience diff\" 演算法生成差異"

3749

3708 -#: diff.c:5468

3750 +#: diff.c:5473

3751 msgid "generate diff using the \"histogram diff\" algorithm"

3752 msgstr "使用 \"histogram diff\" 演算法生成差異"

3753

3712 -#: diff.c:5470

3754 +#: diff.c:5475

3755 msgid "<algorithm>"

3756 msgstr "<演算法>"

3757

3716 -#: diff.c:5471

3758 +#: diff.c:5476

3759 msgid "choose a diff algorithm"

3760 msgstr "選擇一個差異演算法"

3761

3720 -#: diff.c:5473

3762 +#: diff.c:5478

3763 msgid "<text>"

3764 msgstr "<文字>"

3765

3724 -#: diff.c:5474

3766 +#: diff.c:5479

3767 msgid "generate diff using the \"anchored diff\" algorithm"

3768 msgstr "使用 \"anchored diff\" 演算法生成差異"

3769

3728 -#: diff.c:5476 diff.c:5485 diff.c:5488

3770 +#: diff.c:5481 diff.c:5490 diff.c:5493

3771 msgid "<mode>"

3772 msgstr "<模式>"

3773

3732 -#: diff.c:5477

3774 +#: diff.c:5482

3775 msgid "show word diff, using <mode> to delimit changed words"

3776 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"

3777

3736 -#: diff.c:5479 diff.c:5482 diff.c:5527

3778 +#: diff.c:5484 diff.c:5487 diff.c:5532

3779 msgid "<regex>"

3780 msgstr "<正則>"

3781

3740 -#: diff.c:5480

3782 +#: diff.c:5485

3783 msgid "use <regex> to decide what a word is"

3784 msgstr "使用 <正規表示式> 確定何為一個詞"

3785

3744 -#: diff.c:5483

3786 +#: diff.c:5488

3787 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3788 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"

3789

3748 -#: diff.c:5486

3790 +#: diff.c:5491

3791 msgid "moved lines of code are colored differently"

3792 msgstr "移動的程式碼行用不同方式著色"

3793

3752 -#: diff.c:5489

3794 +#: diff.c:5494

3795 msgid "how white spaces are ignored in --color-moved"

3796 msgstr "在 --color-moved 下如何忽略空白字元"

3797

3756 -#: diff.c:5492

3798 +#: diff.c:5497

3799 msgid "Other diff options"

3800 msgstr "其它差異選項"

3801

3760 -#: diff.c:5494

3802 +#: diff.c:5499

3803 msgid "when run from subdir, exclude changes outside and show relative paths"

3804 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"

3805

3764 -#: diff.c:5498

3806 +#: diff.c:5503

3807 msgid "treat all files as text"

3808 msgstr "把所有檔案當做文字處理"

3809

3768 -#: diff.c:5500

3810 +#: diff.c:5505

3811 msgid "swap two inputs, reverse the diff"

3812 msgstr "交換兩個輸入，反轉差異"

3813

3772 -#: diff.c:5502

3814 +#: diff.c:5507

3815 msgid "exit with 1 if there were differences, 0 otherwise"

3816 msgstr "有差異時離開碼為 1，否則為 0"

3817

3776 -#: diff.c:5504

3818 +#: diff.c:5509

3819 msgid "disable all output of the program"

3820 msgstr "停用本程式的所有輸出"

3821

3780 -#: diff.c:5506

3822 +#: diff.c:5511

3823 msgid "allow an external diff helper to be executed"

3824 msgstr "允許執行一個外部的差異助手"

3825

3784 -#: diff.c:5508

3826 +#: diff.c:5513

3827 msgid "run external text conversion filters when comparing binary files"

3828 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"

3829

3788 -#: diff.c:5510

3830 +#: diff.c:5515

3831 msgid "<when>"

3832 msgstr "<何時>"

3833

3792 -#: diff.c:5511

3834 +#: diff.c:5516

3835 msgid "ignore changes to submodules in the diff generation"

3836 msgstr "在生成差異時，忽略子模組的更改"

3837

3796 -#: diff.c:5514

3838 +#: diff.c:5519

3839 msgid "<format>"

3840 msgstr "<格式>"

3841

3800 -#: diff.c:5515

3842 +#: diff.c:5520

3843 msgid "specify how differences in submodules are shown"

3844 msgstr "指定子模組的差異如何顯示"

3845

3804 -#: diff.c:5519

3846 +#: diff.c:5524

3847 msgid "hide 'git add -N' entries from the index"

3848 msgstr "隱藏索引中 'git add -N' 條目"

3849

3808 -#: diff.c:5522

3850 +#: diff.c:5527

3851 msgid "treat 'git add -N' entries as real in the index"

3852 msgstr "將索引中 'git add -N' 條目當做真實的"

3853

3812 -#: diff.c:5524

3854 +#: diff.c:5529

3855 msgid "<string>"

3856 msgstr "<字串>"

3857

3816 -#: diff.c:5525

3858 +#: diff.c:5530

3859 msgid ""

3860 "look for differences that change the number of occurrences of the specified "

3861 "string"

3862 msgstr "尋找改變了指定字串出現次數的差異"

3863

3822 -#: diff.c:5528

3864 +#: diff.c:5533

3865 msgid ""

3866 "look for differences that change the number of occurrences of the specified "

3867 "regex"

3868 msgstr "尋找改變指定正則符合出現次數的差異"

3869

3828 -#: diff.c:5531

3870 +#: diff.c:5536

3871 msgid "show all changes in the changeset with -S or -G"

3872 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"

3873

3832 -#: diff.c:5534

3874 +#: diff.c:5539

3875 msgid "treat <string> in -S as extended POSIX regular expression"

3876 msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"

3877

3836 -#: diff.c:5537

3878 +#: diff.c:5542

3879 msgid "control the order in which files appear in the output"

3880 msgstr "控制輸出中的檔案顯示順序"

3881

3840 -#: diff.c:5538

3882 +#: diff.c:5543

3883 msgid "<object-id>"

3884 msgstr "<物件 ID>"

3885

3844 -#: diff.c:5539

3886 +#: diff.c:5544

3887 msgid ""

3888 "look for differences that change the number of occurrences of the specified "

3889 "object"

3890 msgstr "尋找改變指定物件出現次數的差異"

3891

3850 -#: diff.c:5541

3892 +#: diff.c:5546

3893 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3894 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3895

3854 -#: diff.c:5542

3896 +#: diff.c:5547

3897 msgid "select files by diff type"

3898 msgstr "透過差異類型選擇檔案"

3899

3858 -#: diff.c:5544

3900 +#: diff.c:5549

3901 msgid "<file>"

3902 msgstr "<檔案>"

3903

3862 -#: diff.c:5545

3904 +#: diff.c:5550

3905 msgid "Output to a specific file"

3906 msgstr "輸出到一個指定的檔案"

3907

3866 -#: diff.c:6200

3908 +#: diff.c:6205

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

3910 msgstr "因為檔案太多，略過不嚴格的重新命名檢查。"

3911

3870 -#: diff.c:6203

3912 +#: diff.c:6208

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

3914 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"

3915

3874 -#: diff.c:6206

3916 +#: diff.c:6211

3917 #, c-format

3918 msgid ""

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

@@ -3886,59 +3928,59 @@ msgstr "讀取排序檔案 '%s' 失敗"

3928 msgid "Performing inexact rename detection"

3929 msgstr "正在進行非精確的重新命名偵測"

3930

3889 -#: dir.c:555

3931 +#: dir.c:573

3932 #, c-format

3933 msgid "pathspec '%s' did not match any file(s) known to git"

3934 msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"

3935

3894 -#: dir.c:695 dir.c:724 dir.c:737

3936 +#: dir.c:713 dir.c:742 dir.c:755

3937 #, c-format

3938 msgid "unrecognized pattern: '%s'"

3939 msgstr "無法識別樣式：「%s」"

3940

3899 -#: dir.c:754 dir.c:768

3941 +#: dir.c:772 dir.c:786

3942 #, c-format

3943 msgid "unrecognized negative pattern: '%s'"

3944 msgstr "無法識別反向模式：「%s」"

3945

3904 -#: dir.c:786

3946 +#: dir.c:804

3947 #, c-format

3948 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3949 msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複"

3950

3909 -#: dir.c:796

3951 +#: dir.c:814

3952 msgid "disabling cone pattern matching"

3953 msgstr "停用 cone 樣式符合模式"

3954

3913 -#: dir.c:1173

3955 +#: dir.c:1191

3956 #, c-format

3957 msgid "cannot use %s as an exclude file"

3958 msgstr "不能將 %s 用作排除檔案"

3959

3918 -#: dir.c:2275

3960 +#: dir.c:2296

3961 #, c-format

3962 msgid "could not open directory '%s'"

3963 msgstr "不能開啟目錄 '%s'"

3964

3923 -#: dir.c:2575

3965 +#: dir.c:2596

3966 msgid "failed to get kernel name and information"

3967 msgstr "無法獲得核心名稱和訊息"

3968

3927 -#: dir.c:2699

3969 +#: dir.c:2720

3970 msgid "untracked cache is disabled on this system or location"

3971 msgstr "快取未追蹤檔案在本系統或位置中被停用"

3972

3931 -#: dir.c:3481

3973 +#: dir.c:3502

3974 #, c-format

3975 msgid "index file corrupt in repo %s"

3976 msgstr "版本庫 %s 中的索引檔案損壞"

3977

3936 -#: dir.c:3526 dir.c:3531

3978 +#: dir.c:3547 dir.c:3552

3979 #, c-format

3980 msgid "could not create directories for %s"

3981 msgstr "不能為 %s 建立目錄"

3982

3941 -#: dir.c:3560

3983 +#: dir.c:3581

3984 #, c-format

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

3986 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

@@ -3948,11 +3990,11 @@ msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

3990 msgid "hint: Waiting for your editor to close the file...%c"

3991 msgstr "提示：等待您的編輯器關閉檔案...%c"

3992

3951 -#: entry.c:178

3993 +#: entry.c:177

3994 msgid "Filtering content"

3995 msgstr "過濾內容"

3996

3955 -#: entry.c:479

3997 +#: entry.c:478

3998 #, c-format

3999 msgid "could not stat file '%s'"

4000 msgstr "不能對檔案 '%s' 呼叫 stat"

@@ -3972,227 +4014,245 @@ msgstr "不能設定 GIT_DIR 為 '%s'"

4014 msgid "too many args to run %s"

4015 msgstr "執行 %s 的參數太多"

4016

3975 -#: fetch-pack.c:151

4017 +#: fetch-pack.c:152

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

4019 msgstr "git fetch-pack：應為 shallow 列表"

4020

3979 -#: fetch-pack.c:154

4021 +#: fetch-pack.c:155

4022 msgid "git fetch-pack: expected a flush packet after shallow list"

4023 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"

4024

3983 -#: fetch-pack.c:165

4025 +#: fetch-pack.c:166

4026 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

4027 msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"

4028

3987 -#: fetch-pack.c:185

4029 +#: fetch-pack.c:186

4030 #, c-format

4031 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

4032 msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"

4033

3992 -#: fetch-pack.c:196

4034 +#: fetch-pack.c:197

4035 msgid "unable to write to remote"

4036 msgstr "無法寫到遠端"

4037

3996 -#: fetch-pack.c:258

4038 +#: fetch-pack.c:259

4039 msgid "--stateless-rpc requires multi_ack_detailed"

4040 msgstr "--stateless-rpc 需要 multi_ack_detailed"

4041

4000 -#: fetch-pack.c:357 fetch-pack.c:1364

4042 +#: fetch-pack.c:358 fetch-pack.c:1408

4043 #, c-format

4044 msgid "invalid shallow line: %s"

4045 msgstr "無效的 shallow 訊息：%s"

4046

4005 -#: fetch-pack.c:363 fetch-pack.c:1370

4047 +#: fetch-pack.c:364 fetch-pack.c:1414

4048 #, c-format

4049 msgid "invalid unshallow line: %s"

4050 msgstr "無效的 unshallow 訊息：%s"

4051

4010 -#: fetch-pack.c:365 fetch-pack.c:1372

4052 +#: fetch-pack.c:366 fetch-pack.c:1416

4053 #, c-format

4054 msgid "object not found: %s"

4055 msgstr "物件未找到：%s"

4056

4015 -#: fetch-pack.c:368 fetch-pack.c:1375

4057 +#: fetch-pack.c:369 fetch-pack.c:1419

4058 #, c-format

4059 msgid "error in object: %s"

4060 msgstr "物件中發生錯誤：%s"

4061

4020 -#: fetch-pack.c:370 fetch-pack.c:1377

4062 +#: fetch-pack.c:371 fetch-pack.c:1421

4063 #, c-format

4064 msgid "no shallow found: %s"

4065 msgstr "未發現 shallow：%s"

4066

4025 -#: fetch-pack.c:373 fetch-pack.c:1381

4067 +#: fetch-pack.c:374 fetch-pack.c:1425

4068 #, c-format

4069 msgid "expected shallow/unshallow, got %s"

4070 msgstr "應為 shallow/unshallow，卻得到 %s"

4071

4030 -#: fetch-pack.c:415

4072 +#: fetch-pack.c:416

4073 #, c-format

4074 msgid "got %s %d %s"

4075 msgstr "得到 %s %d %s"

4076

4035 -#: fetch-pack.c:432

4077 +#: fetch-pack.c:433

4078 #, c-format

4079 msgid "invalid commit %s"

4080 msgstr "無效提交 %s"

4081

4040 -#: fetch-pack.c:463

4082 +#: fetch-pack.c:464

4083 msgid "giving up"

4084 msgstr "放棄"

4085

4044 -#: fetch-pack.c:476 progress.c:336

4086 +#: fetch-pack.c:477 progress.c:336

4087 msgid "done"

4088 msgstr "完成"

4089

4048 -#: fetch-pack.c:488

4090 +#: fetch-pack.c:489

4091 #, c-format

4092 msgid "got %s (%d) %s"

4093 msgstr "得到 %s (%d) %s"

4094

4053 -#: fetch-pack.c:534

4095 +#: fetch-pack.c:535

4096 #, c-format

4097 msgid "Marking %s as complete"

4098 msgstr "標記 %s 為完成"

4099

4058 -#: fetch-pack.c:755

4100 +#: fetch-pack.c:756

4101 #, c-format

4102 msgid "already have %s (%s)"

4103 msgstr "已經有 %s（%s）"

4104

4063 -#: fetch-pack.c:819

4105 +#: fetch-pack.c:821

4106 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4107 msgstr "fetch-pack：無法衍生 sideband 多路輸出"

4108

4067 -#: fetch-pack.c:827

4109 +#: fetch-pack.c:829

4110 msgid "protocol error: bad pack header"

4111 msgstr "協定錯誤：壞的包頭"

4112

4071 -#: fetch-pack.c:901

4113 +#: fetch-pack.c:910

4114 #, c-format

4115 msgid "fetch-pack: unable to fork off %s"

4116 msgstr "fetch-pack：無法衍生進程 %s"

4117

4076 -#: fetch-pack.c:917

4118 +#: fetch-pack.c:927

4119 #, c-format

4120 msgid "%s failed"

4121 msgstr "%s 失敗"

4122

4081 -#: fetch-pack.c:919

4123 +#: fetch-pack.c:929

4124 msgid "error in sideband demultiplexer"

4125 msgstr "sideband 多路輸出發生錯誤"

4126

4085 -#: fetch-pack.c:966

4127 +#: fetch-pack.c:976

4128 #, c-format

4129 msgid "Server version is %.*s"

4130 msgstr "伺服器版本 %.*s"

4131

4090 -#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986

4091 -#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002

4092 -#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018

4093 -#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040

4132 +#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996

4133 +#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012

4134 +#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028

4135 +#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

4136 #, c-format

4137 msgid "Server supports %s"

4138 msgstr "伺服器支援 %s"

4139

4098 -#: fetch-pack.c:973

4140 +#: fetch-pack.c:983

4141 msgid "Server does not support shallow clients"

4142 msgstr "伺服器不支援 shalllow 用戶端"

4143

4102 -#: fetch-pack.c:1033

4144 +#: fetch-pack.c:1043

4145 msgid "Server does not support --shallow-since"

4146 msgstr "伺服器不支援 --shallow-since"

4147

4106 -#: fetch-pack.c:1038

4148 +#: fetch-pack.c:1048

4149 msgid "Server does not support --shallow-exclude"

4150 msgstr "伺服器不支援 --shallow-exclude"

4151

4110 -#: fetch-pack.c:1042

4152 +#: fetch-pack.c:1052

4153 msgid "Server does not support --deepen"

4154 msgstr "伺服器不支援 --deepen"

4155

4114 -#: fetch-pack.c:1059

4156 +#: fetch-pack.c:1054

4157 +msgid "Server does not support this repository's object format"

4158 +msgstr "伺服器不支援此版本庫的物件格式"

4159 +

4160 +#: fetch-pack.c:1071

4161 msgid "no common commits"

4162 msgstr "沒有共同的提交"

4163

4118 -#: fetch-pack.c:1071 fetch-pack.c:1563

4164 +#: fetch-pack.c:1083 fetch-pack.c:1639

4165 msgid "git fetch-pack: fetch failed."

4166 msgstr "git fetch-pack：取得失敗。"

4167

4168 #: fetch-pack.c:1211

4169 +#, c-format

4170 +msgid "mismatched algorithms: client %s; server %s"

4171 +msgstr "算法不一致：用戶端 %s；伺服器 %s"

4172 +

4173 +#: fetch-pack.c:1215

4174 +#, c-format

4175 +msgid "the server does not support algorithm '%s'"

4176 +msgstr "伺服器不支援「%s」算法"

4177 +

4178 +#: fetch-pack.c:1235

4179 msgid "Server does not support shallow requests"

4180 msgstr "伺服器不支援 shalllow 請求"

4181

4126 -#: fetch-pack.c:1218

4182 +#: fetch-pack.c:1242

4183 msgid "Server supports filter"

4184 msgstr "伺服器支援 filter"

4185

4130 -#: fetch-pack.c:1242

4186 +#: fetch-pack.c:1286

4187 msgid "unable to write request to remote"

4188 msgstr "無法將請求寫到遠端"

4189

4134 -#: fetch-pack.c:1260

4190 +#: fetch-pack.c:1304

4191 #, c-format

4192 msgid "error reading section header '%s'"

4193 msgstr "讀取節標題 '%s' 發生錯誤"

4194

4139 -#: fetch-pack.c:1266

4195 +#: fetch-pack.c:1310

4196 #, c-format

4197 msgid "expected '%s', received '%s'"

4198 msgstr "預期 '%s'，得到 '%s'"

4199

4144 -#: fetch-pack.c:1327

4200 +#: fetch-pack.c:1371

4201 #, c-format

4202 msgid "unexpected acknowledgment line: '%s'"

4203 msgstr "意外的確認行：'%s'"

4204

4149 -#: fetch-pack.c:1332

4205 +#: fetch-pack.c:1376

4206 #, c-format

4207 msgid "error processing acks: %d"

4208 msgstr "處理 ack 發生錯誤：%d"

4209

4154 -#: fetch-pack.c:1342

4210 +#: fetch-pack.c:1386

4211 msgid "expected packfile to be sent after 'ready'"

4212 msgstr "預期在 'ready' 之後傳送 packfile"

4213

4158 -#: fetch-pack.c:1344

4214 +#: fetch-pack.c:1388

4215 msgid "expected no other sections to be sent after no 'ready'"

4216 msgstr "在沒有 'ready' 不應該傳送其它小節"

4217

4162 -#: fetch-pack.c:1386

4218 +#: fetch-pack.c:1430

4219 #, c-format

4220 msgid "error processing shallow info: %d"

4221 msgstr "處理淺複製訊息發生錯誤：%d"

4222

4167 -#: fetch-pack.c:1433

4223 +#: fetch-pack.c:1477

4224 #, c-format

4225 msgid "expected wanted-ref, got '%s'"

4226 msgstr "預期 wanted-ref，得到 '%s'"

4227

4172 -#: fetch-pack.c:1438

4228 +#: fetch-pack.c:1482

4229 #, c-format

4230 msgid "unexpected wanted-ref: '%s'"

4231 msgstr "意外的 wanted-ref：'%s'"

4232

4177 -#: fetch-pack.c:1443

4233 +#: fetch-pack.c:1487

4234 #, c-format

4235 msgid "error processing wanted refs: %d"

4236 msgstr "處理要取得的引用發生錯誤：%d"

4237

4182 -#: fetch-pack.c:1789

4238 +#: fetch-pack.c:1517

4239 +msgid "git fetch-pack: expected response end packet"

4240 +msgstr "git fetch-pack: 預期要有回應結束封包"

4241 +

4242 +#: fetch-pack.c:1921

4243 msgid "no matching remote head"

4244 msgstr "沒有符合的遠端分支"

4245

4186 -#: fetch-pack.c:1812 builtin/clone.c:692

4246 +#: fetch-pack.c:1944 builtin/clone.c:692

4247 msgid "remote did not send all necessary objects"

4248 msgstr "遠端沒有傳送所有必需的物件"

4249

4190 -#: fetch-pack.c:1839

4250 +#: fetch-pack.c:1971

4251 #, c-format

4252 msgid "no such remote ref %s"

4253 msgstr "沒有這樣的遠端引用 %s"

4254

4195 -#: fetch-pack.c:1842

4255 +#: fetch-pack.c:1974

4256 #, c-format

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

4258 msgstr "伺服器不允許請求未公開的物件 %s"

@@ -4228,7 +4288,7 @@ msgstr ""

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

4289 msgstr "'%s'：無法讀取 %s"

4290

4231 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4291 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

4292 #: builtin/rm.c:135

4293 #, c-format

4294 msgid "failed to stat '%s'"

@@ -4369,16 +4429,16 @@ msgstr[0] ""

4429 "\n"

4430 "最類似的指令有"

4431

4372 -#: help.c:653

4432 +#: help.c:654

4433 msgid "git version [<options>]"

4434 msgstr "git version [<選項>]"

4435

4376 -#: help.c:708

4436 +#: help.c:709

4437 #, c-format

4438 msgid "%s: %s - %s"

4439 msgstr "%s：%s - %s"

4440

4381 -#: help.c:712

4441 +#: help.c:713

4442 msgid ""

4443 "\n"

4444 "Did you mean this?"

@@ -4473,6 +4533,10 @@ msgstr "期望在組合後有一些東西："

4533 msgid "multiple filter-specs cannot be combined"

4534 msgstr "不能混用多種過濾規格"

4535

4536 +#: list-objects-filter-options.c:330

4537 +msgid "unable to upgrade repository format to support partial clone"

4538 +msgstr "無法升級版本庫格式，以致不支援部分複製"

4539 +

4540 #: list-objects-filter.c:492

4541 #, c-format

4542 msgid "unable to access sparse blob in '%s'"

@@ -4827,7 +4891,7 @@ msgstr "新增/新增"

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

4892 msgstr "略過 %s（已經做過相同合併）"

4893

4830 -#: merge-recursive.c:3101 git-submodule.sh:985

4894 +#: merge-recursive.c:3101 git-submodule.sh:959

4895 msgid "submodule"

4896 msgstr "子模組"

4897

@@ -4950,7 +5014,7 @@ msgid "failed to read the cache"

5014 msgstr "讀取快取失敗"

5015

5016 #: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4953 -#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816

5017 +#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

5018 #: builtin/stash.c:265

5019 msgid "unable to write new index file"

5020 msgstr "無法寫新的索引檔案"

@@ -5195,21 +5259,21 @@ msgstr "不能解析物件：%s"

5259 msgid "hash mismatch %s"

5260 msgstr "雜湊值與 %s 不符合"

5261

5198 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5262 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

5263 #, c-format

5264 msgid "unable to get size of %s"

5265 msgstr "不能得到 %s 的大小"

5266

5203 -#: packfile.c:629

5267 +#: packfile.c:630

5268 msgid "offset before end of packfile (broken .idx?)"

5269 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

5270

5207 -#: packfile.c:1899

5271 +#: packfile.c:1900

5272 #, c-format

5273 msgid "offset before start of pack index for %s (corrupt index?)"

5274 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

5275

5212 -#: packfile.c:1903

5276 +#: packfile.c:1904

5277 #, c-format

5278 msgid "offset beyond end of pack index for %s (truncated index?)"

5279 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

@@ -5411,44 +5475,48 @@ msgid "unable to write delim packet"

5475 msgstr "無法寫 delim 包"

5476

5477 #: pkt-line.c:106

5478 +msgid "unable to write stateless separator packet"

5479 +msgstr "無法寫入無狀態的分隔符號封包"

5480 +

5481 +#: pkt-line.c:113

5482 msgid "flush packet write failed"

5483 msgstr "flush 包寫錯誤"

5484

5417 -#: pkt-line.c:146 pkt-line.c:232

5485 +#: pkt-line.c:153 pkt-line.c:239

5486 msgid "protocol error: impossibly long line"

5487 msgstr "協定錯誤：不可能的長行"

5488

5421 -#: pkt-line.c:162 pkt-line.c:164

5489 +#: pkt-line.c:169 pkt-line.c:171

5490 msgid "packet write with format failed"

5491 msgstr "格式化包寫入錯誤"

5492

5425 -#: pkt-line.c:196

5493 +#: pkt-line.c:203

5494 msgid "packet write failed - data exceeds max packet size"

5495 msgstr "寫封包失敗：資料超過了包的最大長度"

5496

5429 -#: pkt-line.c:203 pkt-line.c:210

5497 +#: pkt-line.c:210 pkt-line.c:217

5498 msgid "packet write failed"

5499 msgstr "封包寫入失敗"

5500

5433 -#: pkt-line.c:295

5501 +#: pkt-line.c:302

5502 msgid "read error"

5503 msgstr "讀取錯誤"

5504

5437 -#: pkt-line.c:303

5505 +#: pkt-line.c:310

5506 msgid "the remote end hung up unexpectedly"

5507 msgstr "遠端意外掛斷了"

5508

5441 -#: pkt-line.c:331

5509 +#: pkt-line.c:338

5510 #, c-format

5511 msgid "protocol error: bad line length character: %.4s"

5512 msgstr "協定錯誤：錯誤的行長度字串：%.4s"

5513

5446 -#: pkt-line.c:341 pkt-line.c:346

5514 +#: pkt-line.c:352 pkt-line.c:357

5515 #, c-format

5516 msgid "protocol error: bad line length %d"

5517 msgstr "協定錯誤：錯誤的行長度 %d"

5518

5451 -#: pkt-line.c:362

5519 +#: pkt-line.c:373

5520 #, c-format

5521 msgid "remote error: %s"

5522 msgstr "遠端錯誤：%s"

@@ -5625,7 +5693,7 @@ msgstr "'%s' 的未排序暫存條目"

5693

5694 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5695 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5628 -#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5696 +#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5697 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5698 #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5699 #: builtin/submodule--helper.c:332

@@ -5682,7 +5750,7 @@ msgstr "無法重新整理共享索引 '%s'"

5750 msgid "broken index, expect %s in %s, got %s"

5751 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5752

5685 -#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5753 +#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5754 #, c-format

5755 msgid "could not close '%s'"

5756 msgstr "不能關閉 '%s'"

@@ -5857,7 +5925,7 @@ msgstr ""

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

5926 msgstr "不能讀取 '%s'。"

5927

5860 -#: ref-filter.c:42 wt-status.c:1936

5928 +#: ref-filter.c:42 wt-status.c:1977

5929 msgid "gone"

5930 msgstr "遺失"

5931

@@ -6081,7 +6149,7 @@ msgstr "格式錯誤的物件 '%s'"

6149 msgid "ignoring ref with broken name %s"

6150 msgstr "忽略帶有錯誤名稱 %s 的引用"

6151

6084 -#: ref-filter.c:2095 refs.c:625

6152 +#: ref-filter.c:2095 refs.c:657

6153 #, c-format

6154 msgid "ignoring broken ref %s"

6155 msgstr "忽略損壞的引用 %s"

@@ -6111,94 +6179,108 @@ msgstr "格式錯誤的物件名 %s"

6179 msgid "option `%s' must point to a commit"

6180 msgstr "選項 `%s' 必須指向一個提交"

6181

6114 -#: refs.c:262

6182 +#: refs.c:264

6183 #, c-format

6184 msgid "%s does not point to a valid object!"

6185 msgstr "%s 沒有指向一個有效的物件！"

6186

6119 -#: refs.c:623

6187 +#: refs.c:572

6188 +#, c-format

6189 +msgid "could not retrieve `%s`"

6190 +msgstr "無法擷取「%s」"

6191 +

6192 +#: refs.c:579

6193 +#, c-format

6194 +msgid "invalid branch name: %s = %s"

6195 +msgstr "分支名稱無效：%s = %s"

6196 +

6197 +#: refs.c:655

6198 #, c-format

6199 msgid "ignoring dangling symref %s"

6200 msgstr "忽略懸空符號引用 %s"

6201

6124 -#: refs.c:760

6202 +#: refs.c:792

6203 #, c-format

6204 msgid "could not open '%s' for writing: %s"

6205 msgstr "無法為寫入開啟 '%s'：%s"

6206

6129 -#: refs.c:770 refs.c:821

6207 +#: refs.c:802 refs.c:853

6208 #, c-format

6209 msgid "could not read ref '%s'"

6210 msgstr "無法讀取引用 '%s'"

6211

6134 -#: refs.c:776

6212 +#: refs.c:808

6213 #, c-format

6214 msgid "ref '%s' already exists"

6215 msgstr "引用 '%s' 已經存在"

6216

6139 -#: refs.c:781

6217 +#: refs.c:813

6218 #, c-format

6219 msgid "unexpected object ID when writing '%s'"

6220 msgstr "寫入 '%s' 時意外的物件 ID"

6221

6144 -#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6145 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173

6146 -#: wrapper.c:620

6222 +#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6223 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168

6224 +#: wrapper.c:628

6225 #, c-format

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

6227 msgstr "不能寫入 '%s'"

6228

6151 -#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6229 +#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

6230 #: builtin/rebase.c:852

6231 #, c-format

6232 msgid "could not open '%s' for writing"

6233 msgstr "無法開啟 '%s' 進行寫入"

6234

6157 -#: refs.c:823

6235 +#: refs.c:855

6236 #, c-format

6237 msgid "unexpected object ID when deleting '%s'"

6238 msgstr "刪除 '%s' 時意外的物件 ID"

6239

6162 -#: refs.c:954

6240 +#: refs.c:986

6241 #, c-format

6242 msgid "log for ref %s has gap after %s"

6243 msgstr "引用 %s 的日誌在 %s 之後有缺口"

6244

6167 -#: refs.c:960

6245 +#: refs.c:992

6246 #, c-format

6247 msgid "log for ref %s unexpectedly ended on %s"

6248 msgstr "引用 %s 的日誌意外終止於 %s"

6249

6172 -#: refs.c:1019

6250 +#: refs.c:1051

6251 #, c-format

6252 msgid "log for %s is empty"

6253 msgstr "%s 的日誌為空"

6254

6177 -#: refs.c:1111

6255 +#: refs.c:1143

6256 #, c-format

6257 msgid "refusing to update ref with bad name '%s'"

6258 msgstr "拒絕更新有錯誤名稱 '%s' 的引用"

6259

6182 -#: refs.c:1187

6260 +#: refs.c:1219

6261 #, c-format

6262 msgid "update_ref failed for ref '%s': %s"

6263 msgstr "對引用 '%s' 執行 update_ref 失敗：%s"

6264

6187 -#: refs.c:1979

6265 +#: refs.c:2011

6266 #, c-format

6267 msgid "multiple updates for ref '%s' not allowed"

6268 msgstr "不允許對引用 '%s' 多次更新"

6269

6192 -#: refs.c:2011

6270 +#: refs.c:2098

6271 msgid "ref updates forbidden inside quarantine environment"

6272 msgstr "在隔離環境中禁止更新引用"

6273

6196 -#: refs.c:2107 refs.c:2137

6274 +#: refs.c:2109

6275 +msgid "ref updates aborted by hook"

6276 +msgstr "引用更新被掛鉤拒絕"

6277 +

6278 +#: refs.c:2209 refs.c:2239

6279 #, c-format

6280 msgid "'%s' exists; cannot create '%s'"

6281 msgstr "'%s' 已存在，無法建立 '%s'"

6282

6201 -#: refs.c:2113 refs.c:2148

6283 +#: refs.c:2215 refs.c:2250

6284 #, c-format

6285 msgid "cannot process '%s' and '%s' at the same time"

6286 msgstr "無法同時處理 '%s' 和 '%s'"

@@ -6473,7 +6555,7 @@ msgstr[0] ""

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

6556 msgstr " （使用 \"git pull\" 來合併遠端分支）\n"

6557

6476 -#: remote.c:2233

6558 +#: remote.c:2241

6559 #, c-format

6560 msgid "cannot parse expected object name '%s'"

6561 msgstr "無法解析期望的物件名 '%s'"

@@ -6600,20 +6682,20 @@ msgstr "不能確定 HEAD 版本"

6682 msgid "failed to find tree of %s"

6683 msgstr "無法找到 %s 指向的樹"

6684

6603 -#: revision.c:2655

6685 +#: revision.c:2661

6686 msgid "your current branch appears to be broken"

6687 msgstr "您的目前分支好像被損壞"

6688

6607 -#: revision.c:2658

6689 +#: revision.c:2664

6690 #, c-format

6691 msgid "your current branch '%s' does not have any commits yet"

6692 msgstr "您的目前分支 '%s' 尚無任何提交"

6693

6612 -#: revision.c:2866

6694 +#: revision.c:2873

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

6696 msgstr "--first-parent 與 --bisect 不相容"

6697

6616 -#: revision.c:2870

6698 +#: revision.c:2877

6699 msgid "-L does not yet support diff formats besides -p and -s"

6700 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"

6701

@@ -6653,21 +6735,25 @@ msgstr "遠端解包失敗：%s"

6735 msgid "failed to sign the push certificate"

6736 msgstr "為推送證書籤名失敗"

6737

6656 -#: send-pack.c:399

6738 +#: send-pack.c:394

6739 +msgid "the receiving end does not support this repository's hash algorithm"

6740 +msgstr "接收端不支援此版本庫的雜湊算法"

6741 +

6742 +#: send-pack.c:403

6743 msgid "the receiving end does not support --signed push"

6744 msgstr "接收端不支援簽名推送"

6745

6660 -#: send-pack.c:401

6746 +#: send-pack.c:405

6747 msgid ""

6748 "not sending a push certificate since the receiving end does not support --"

6749 "signed push"

6750 msgstr "未傳送推送證書，因為接收端不支援簽名推送"

6751

6666 -#: send-pack.c:413

6752 +#: send-pack.c:417

6753 msgid "the receiving end does not support --atomic push"

6754 msgstr "接收端不支援原子推送"

6755

6670 -#: send-pack.c:418

6756 +#: send-pack.c:422

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

6758 msgstr "接收端不支援推送選項"

6759

@@ -6787,7 +6873,7 @@ msgstr "在 '%.*s' 中沒有 key"

6873 msgid "unable to dequote value of '%s'"

6874 msgstr "無法為 '%s' 的值去引號"

6875

6790 -#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6876 +#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

6877 #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6878 #, c-format

6879 msgid "could not open '%s' for reading"

@@ -7616,84 +7702,84 @@ msgstr "無法使用無效設定來建立工作區"

7702 msgid "this operation must be run in a work tree"

7703 msgstr "該動作必須在一個工作區中執行"

7704

7619 -#: setup.c:569

7705 +#: setup.c:604

7706 #, c-format

7707 msgid "Expected git repo version <= %d, found %d"

7708 msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"

7709

7624 -#: setup.c:577

7710 +#: setup.c:612

7711 msgid "unknown repository extensions found:"

7712 msgstr "發現未知的版本庫擴展："

7713

7628 -#: setup.c:596

7714 +#: setup.c:631

7715 #, c-format

7716 msgid "error opening '%s'"

7717 msgstr "開啟 '%s' 發生錯誤"

7718

7633 -#: setup.c:598

7719 +#: setup.c:633

7720 #, c-format

7721 msgid "too large to be a .git file: '%s'"

7722 msgstr "檔案太大，無法作為 .git 檔案：'%s'"

7723

7638 -#: setup.c:600

7724 +#: setup.c:635

7725 #, c-format

7726 msgid "error reading %s"

7727 msgstr "讀取 %s 發生錯誤"

7728

7643 -#: setup.c:602

7729 +#: setup.c:637

7730 #, c-format

7731 msgid "invalid gitfile format: %s"

7732 msgstr "無效的 gitfile 格式：%s"

7733

7648 -#: setup.c:604

7734 +#: setup.c:639

7735 #, c-format

7736 msgid "no path in gitfile: %s"

7737 msgstr "在 gitfile 中沒有路徑：%s"

7738

7653 -#: setup.c:606

7739 +#: setup.c:641

7740 #, c-format

7741 msgid "not a git repository: %s"

7742 msgstr "不是一個 git 版本庫：%s"

7743

7658 -#: setup.c:708

7744 +#: setup.c:743

7745 #, c-format

7746 msgid "'$%s' too big"

7747 msgstr "'$%s' 太大"

7748

7663 -#: setup.c:722

7749 +#: setup.c:757

7750 #, c-format

7751 msgid "not a git repository: '%s'"

7752 msgstr "不是一個 git 版本庫：'%s'"

7753

7668 -#: setup.c:751 setup.c:753 setup.c:784

7754 +#: setup.c:786 setup.c:788 setup.c:819

7755 #, c-format

7756 msgid "cannot chdir to '%s'"

7757 msgstr "不能切換目錄到 '%s'"

7758

7673 -#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869

7759 +#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904

7760 msgid "cannot come back to cwd"

7761 msgstr "無法返回目前工作目錄"

7762

7677 -#: setup.c:883

7763 +#: setup.c:918

7764 #, c-format

7765 msgid "failed to stat '%*s%s%s'"

7766 msgstr "取得 '%*s%s%s' 狀態（stat）失敗"

7767

7682 -#: setup.c:1121

7768 +#: setup.c:1156

7769 msgid "Unable to read current working directory"

7770 msgstr "不能讀取目前工作目錄"

7771

7686 -#: setup.c:1130 setup.c:1136

7772 +#: setup.c:1165 setup.c:1171

7773 #, c-format

7774 msgid "cannot change to '%s'"

7775 msgstr "不能切換到 '%s'"

7776

7691 -#: setup.c:1141

7777 +#: setup.c:1176

7778 #, c-format

7779 msgid "not a git repository (or any of the parent directories): %s"

7780 msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"

7781

7696 -#: setup.c:1147

7782 +#: setup.c:1182

7783 #, c-format

7784 msgid ""

7785 "not a git repository (or any parent up to mount point %s)\n"

@@ -7702,7 +7788,7 @@ msgstr ""

7788 "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"

7789 "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

7790

7705 -#: setup.c:1258

7791 +#: setup.c:1293

7792 #, c-format

7793 msgid ""

7794 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -7711,15 +7797,15 @@ msgstr ""

7797 "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"

7798 "檔案所有者必須始終擁有讀寫權限。"

7799

7714 -#: setup.c:1304

7800 +#: setup.c:1340

7801 msgid "open /dev/null or dup failed"

7802 msgstr "不能開啟或者複製 /dev/null"

7803

7718 -#: setup.c:1319

7804 +#: setup.c:1355

7805 msgid "fork failed"

7806 msgstr "fork 失敗"

7807

7722 -#: setup.c:1324

7808 +#: setup.c:1360

7809 msgid "setsid failed"

7810 msgstr "setsid 失敗"

7811

@@ -7899,7 +7985,7 @@ msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"

7985 msgid "confused by unstable object source data for %s"

7986 msgstr "被 %s 的不穩定物件源資料搞糊塗了"

7987

7902 -#: sha1-file.c:1906 builtin/pack-objects.c:1055

7988 +#: sha1-file.c:1906 builtin/pack-objects.c:1085

7989 #, c-format

7990 msgid "failed utime() on %s"

7991 msgstr "在 %s 上呼叫 utime() 失敗"

@@ -8075,56 +8161,56 @@ msgid "invalid object name '%.*s'."

8161 msgstr "'%.*s' 物件名稱無效。"

8162

8163 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

8078 -#: strbuf.c:853

8164 +#: strbuf.c:848

8165 #, c-format

8166 msgid "%u.%2.2u GiB"

8167 msgstr "%u.%2.2u GiB"

8168

8169 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

8084 -#: strbuf.c:855

8170 +#: strbuf.c:850

8171 #, c-format

8172 msgid "%u.%2.2u GiB/s"

8173 msgstr "%u.%2.2u GiB/s"

8174

8175 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

8090 -#: strbuf.c:863

8176 +#: strbuf.c:858

8177 #, c-format

8178 msgid "%u.%2.2u MiB"

8179 msgstr "%u.%2.2u MiB"

8180

8181 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

8096 -#: strbuf.c:865

8182 +#: strbuf.c:860

8183 #, c-format

8184 msgid "%u.%2.2u MiB/s"

8185 msgstr "%u.%2.2u MiB/s"

8186

8187 #. TRANSLATORS: IEC 80000-13:2008 kibibyte

8102 -#: strbuf.c:872

8188 +#: strbuf.c:867

8189 #, c-format

8190 msgid "%u.%2.2u KiB"

8191 msgstr "%u.%2.2u KiB"

8192

8193 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second

8108 -#: strbuf.c:874

8194 +#: strbuf.c:869

8195 #, c-format

8196 msgid "%u.%2.2u KiB/s"

8197 msgstr "%u.%2.2u KiB/s"

8198

8199 #. TRANSLATORS: IEC 80000-13:2008 byte

8114 -#: strbuf.c:880

8200 +#: strbuf.c:875

8201 #, c-format

8202 msgid "%u byte"

8203 msgid_plural "%u bytes"

8204 msgstr[0] "%u 位元組"

8205

8206 #. TRANSLATORS: IEC 80000-13:2008 byte/second

8121 -#: strbuf.c:882

8207 +#: strbuf.c:877

8208 #, c-format

8209 msgid "%u byte/s"

8210 msgid_plural "%u bytes/s"

8211 msgstr[0] "%u 位元組/秒"

8212

8127 -#: strbuf.c:1180

8213 +#: strbuf.c:1175

8214 #, c-format

8215 msgid "could not edit '%s'"

8216 msgstr "無法編輯 '%s'"

@@ -8363,7 +8449,7 @@ msgstr "不能讀取輸入檔案 '%s'"

8449 msgid "could not read from stdin"

8450 msgstr "不能自標準輸入讀取"

8451

8366 -#: trailer.c:1011 wrapper.c:665

8452 +#: trailer.c:1011 wrapper.c:673

8453 #, c-format

8454 msgid "could not stat %s"

8455 msgstr "不能對 %s 呼叫 stat"

@@ -8387,177 +8473,182 @@ msgstr "不能開啟暫存檔"

8473 msgid "could not rename temporary file to %s"

8474 msgstr "不能重新命名暫存檔為 %s"

8475

8390 -#: transport-helper.c:61 transport-helper.c:90

8476 +#: transport-helper.c:62 transport-helper.c:91

8477 msgid "full write to remote helper failed"

8478 msgstr "完整寫入遠端助手失敗"

8479

8394 -#: transport-helper.c:144

8480 +#: transport-helper.c:145

8481 #, c-format

8482 msgid "unable to find remote helper for '%s'"

8483 msgstr "無法為 '%s' 找到遠端助手"

8484

8399 -#: transport-helper.c:160 transport-helper.c:571

8485 +#: transport-helper.c:161 transport-helper.c:575

8486 msgid "can't dup helper output fd"

8487 msgstr "無法複製助手輸出檔案句柄"

8488

8403 -#: transport-helper.c:211

8489 +#: transport-helper.c:214

8490 #, c-format

8491 msgid ""

8492 "unknown mandatory capability %s; this remote helper probably needs newer "

8493 "version of Git"

8494 msgstr "未知的強制能力 %s，該遠端助手可能需要新版本的Git"

8495

8410 -#: transport-helper.c:217

8496 +#: transport-helper.c:220

8497 msgid "this remote helper should implement refspec capability"

8498 msgstr "遠端助手需要實現 refspec 能力"

8499

8414 -#: transport-helper.c:284 transport-helper.c:425

8500 +#: transport-helper.c:287 transport-helper.c:429

8501 #, c-format

8502 msgid "%s unexpectedly said: '%s'"

8503 msgstr "%s 意外地說：'%s'"

8504

8419 -#: transport-helper.c:414

8505 +#: transport-helper.c:417

8506 #, c-format

8507 msgid "%s also locked %s"

8508 msgstr "%s 也鎖定了 %s"

8509

8424 -#: transport-helper.c:493

8510 +#: transport-helper.c:497

8511 msgid "couldn't run fast-import"

8512 msgstr "不能執行 fast-import"

8513

8428 -#: transport-helper.c:516

8514 +#: transport-helper.c:520

8515 msgid "error while running fast-import"

8516 msgstr "執行 fast-import 發生錯誤"

8517

8432 -#: transport-helper.c:545 transport-helper.c:1135

8518 +#: transport-helper.c:549 transport-helper.c:1156

8519 #, c-format

8520 msgid "could not read ref %s"

8521 msgstr "無法讀取引用 %s"

8522

8437 -#: transport-helper.c:590

8523 +#: transport-helper.c:594

8524 #, c-format

8525 msgid "unknown response to connect: %s"

8526 msgstr "連線時未知的回應：%s"

8527

8442 -#: transport-helper.c:612

8528 +#: transport-helper.c:616

8529 msgid "setting remote service path not supported by protocol"

8530 msgstr "協定不支援設定遠端服務路徑"

8531

8446 -#: transport-helper.c:614

8532 +#: transport-helper.c:618

8533 msgid "invalid remote service path"

8534 msgstr "無效的遠端服務路徑"

8535

8450 -#: transport-helper.c:657 transport.c:1339

8536 +#: transport-helper.c:661 transport.c:1347

8537 msgid "operation not supported by protocol"

8538 msgstr "協定不支援該動作"

8539

8454 -#: transport-helper.c:660

8540 +#: transport-helper.c:664

8541 #, c-format

8542 msgid "can't connect to subservice %s"

8543 msgstr "不能連線到子服務 %s"

8544

8459 -#: transport-helper.c:736

8545 +#: transport-helper.c:740

8546 #, c-format

8547 msgid "expected ok/error, helper said '%s'"

8548 msgstr "預期 ok/error，助手說 '%s'"

8549

8464 -#: transport-helper.c:789

8550 +#: transport-helper.c:793

8551 #, c-format

8552 msgid "helper reported unexpected status of %s"

8553 msgstr "助手報告 %s 的意外狀態"

8554

8469 -#: transport-helper.c:850

8555 +#: transport-helper.c:854

8556 #, c-format

8557 msgid "helper %s does not support dry-run"

8558 msgstr "助手 %s 不支援 dry-run"

8559

8474 -#: transport-helper.c:853

8560 +#: transport-helper.c:857

8561 #, c-format

8562 msgid "helper %s does not support --signed"

8563 msgstr "助手 %s 不支援 --signed"

8564

8479 -#: transport-helper.c:856

8565 +#: transport-helper.c:860

8566 #, c-format

8567 msgid "helper %s does not support --signed=if-asked"

8568 msgstr "助手 %s 不支援 --signed=if-asked"

8569

8484 -#: transport-helper.c:861

8570 +#: transport-helper.c:865

8571 #, c-format

8572 msgid "helper %s does not support --atomic"

8573 msgstr "助手 %s 不支援 --atomic"

8574

8489 -#: transport-helper.c:867

8575 +#: transport-helper.c:871

8576 #, c-format

8577 msgid "helper %s does not support 'push-option'"

8578 msgstr "助手 %s 不支援 'push-option'"

8579

8494 -#: transport-helper.c:966

8580 +#: transport-helper.c:970

8581 msgid "remote-helper doesn't support push; refspec needed"

8582 msgstr "remote-heper 不支援 push，需要引用表達式"

8583

8498 -#: transport-helper.c:971

8584 +#: transport-helper.c:975

8585 #, c-format

8586 msgid "helper %s does not support 'force'"

8587 msgstr "助手 %s 不支援 'force'"

8588

8503 -#: transport-helper.c:1018

8589 +#: transport-helper.c:1022

8590 msgid "couldn't run fast-export"

8591 msgstr "無法執行 fast-export"

8592

8507 -#: transport-helper.c:1023

8593 +#: transport-helper.c:1027

8594 msgid "error while running fast-export"

8595 msgstr "執行 fast-export 時發生錯誤"

8596

8511 -#: transport-helper.c:1048

8597 +#: transport-helper.c:1052

8598 #, c-format

8599 msgid ""

8600 "No refs in common and none specified; doing nothing.\n"

8515 -"Perhaps you should specify a branch such as 'master'.\n"

8601 +"Perhaps you should specify a branch.\n"

8602 msgstr ""

8603 "沒有共同的引用並且也沒有指定，什麼也不會做。\n"

8518 -"可能您應該指定一個分支如 'master'。\n"

8604 +"您或許得指定一個分支。\n"

8605

8520 -#: transport-helper.c:1121

8606 +#: transport-helper.c:1133

8607 +#, c-format

8608 +msgid "unsupported object format '%s'"

8609 +msgstr "不支援的物件格式「%s」"

8610 +

8611 +#: transport-helper.c:1142

8612 #, c-format

8613 msgid "malformed response in ref list: %s"

8614 msgstr "引用列表中格式錯誤的回應：%s"

8615

8525 -#: transport-helper.c:1273

8616 +#: transport-helper.c:1294

8617 #, c-format

8618 msgid "read(%s) failed"

8619 msgstr "讀取（%s）失敗"

8620

8530 -#: transport-helper.c:1300

8621 +#: transport-helper.c:1321

8622 #, c-format

8623 msgid "write(%s) failed"

8624 msgstr "寫（%s）失敗"

8625

8535 -#: transport-helper.c:1349

8626 +#: transport-helper.c:1370

8627 #, c-format

8628 msgid "%s thread failed"

8629 msgstr "%s 執行緒失敗"

8630

8540 -#: transport-helper.c:1353

8631 +#: transport-helper.c:1374

8632 #, c-format

8633 msgid "%s thread failed to join: %s"

8634 msgstr "%s 執行緒等待失敗：%s"

8635

8545 -#: transport-helper.c:1372 transport-helper.c:1376

8636 +#: transport-helper.c:1393 transport-helper.c:1397

8637 #, c-format

8638 msgid "can't start thread for copying data: %s"

8639 msgstr "不能啟動執行緒來複製資料：%s"

8640

8550 -#: transport-helper.c:1413

8641 +#: transport-helper.c:1434

8642 #, c-format

8643 msgid "%s process failed to wait"

8644 msgstr "%s 進程等待失敗"

8645

8555 -#: transport-helper.c:1417

8646 +#: transport-helper.c:1438

8647 #, c-format

8648 msgid "%s process failed"

8649 msgstr "%s 進程失敗"

8650

8560 -#: transport-helper.c:1435 transport-helper.c:1444

8651 +#: transport-helper.c:1456 transport-helper.c:1465

8652 msgid "can't start thread for copying data"

8653 msgstr "不能啟動執行緒來複製資料"

8654

@@ -8571,33 +8662,33 @@ msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"

8662 msgid "could not read bundle '%s'"

8663 msgstr "無法讀取 bundle '%s'"

8664

8574 -#: transport.c:214

8665 +#: transport.c:220

8666 #, c-format

8667 msgid "transport: invalid depth option '%s'"

8668 msgstr "傳輸：無效的深度選項 '%s'"

8669

8579 -#: transport.c:266

8670 +#: transport.c:272

8671 msgid "see protocol.version in 'git help config' for more details"

8672 msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"

8673

8583 -#: transport.c:267

8674 +#: transport.c:273

8675 msgid "server options require protocol version 2 or later"

8676 msgstr "服務端選項需要版本 2 協定或更高"

8677

8587 -#: transport.c:632

8678 +#: transport.c:631

8679 msgid "could not parse transport.color.* config"

8680 msgstr "不能解析 transport.color.* 設定"

8681

8591 -#: transport.c:705

8682 +#: transport.c:704

8683 msgid "support for protocol v2 not implemented yet"

8684 msgstr "協定 v2 的支援尚未實現"

8685

8595 -#: transport.c:839

8686 +#: transport.c:838

8687 #, c-format

8688 msgid "unknown value for config '%s': %s"

8689 msgstr "設定 '%s' 的取值未知：%s"

8690

8600 -#: transport.c:905

8691 +#: transport.c:904

8692 #, c-format

8693 msgid "transport '%s' not allowed"

8694 msgstr "傳輸 '%s' 不允許"

@@ -8606,14 +8697,14 @@ msgstr "傳輸 '%s' 不允許"

8697 msgid "git-over-rsync is no longer supported"

8698 msgstr "不再支援 git-over-rsync"

8699

8609 -#: transport.c:1052

8700 +#: transport.c:1059

8701 #, c-format

8702 msgid ""

8703 "The following submodule paths contain changes that can\n"

8704 "not be found on any remote:\n"

8705 msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n"

8706

8616 -#: transport.c:1056

8707 +#: transport.c:1063

8708 #, c-format

8709 msgid ""

8710 "\n"

@@ -8640,11 +8731,11 @@ msgstr ""

8731 "以推送至遠端。\n"

8732 "\n"

8733

8643 -#: transport.c:1064

8734 +#: transport.c:1071

8735 msgid "Aborting."

8736 msgstr "正在終止。"

8737

8647 -#: transport.c:1209

8738 +#: transport.c:1216

8739 msgid "failed to push all needed submodules"

8740 msgstr "不能推送全部需要的子模組"

8741

@@ -8909,7 +9000,7 @@ msgstr ""

9000 msgid "Updating index flags"

9001 msgstr "正在更新索引旗標"

9002

8912 -#: upload-pack.c:1337

9003 +#: upload-pack.c:1415

9004 msgid "expected flush after fetch arguments"

9005 msgstr "在 fetch 引數應為一個 flush 包"

9006

@@ -8946,47 +9037,47 @@ msgstr "無效的 '..' 路徑片段"

9037 msgid "Fetching objects"

9038 msgstr "正在抓取物件"

9039

8949 -#: worktree.c:262 builtin/am.c:2098

9040 +#: worktree.c:248 builtin/am.c:2098

9041 #, c-format

9042 msgid "failed to read '%s'"

9043 msgstr "讀取 '%s' 失敗"

9044

8954 -#: worktree.c:309

9045 +#: worktree.c:295

9046 #, c-format

9047 msgid "'%s' at main working tree is not the repository directory"

9048 msgstr "在主工作區的 '%s' 不是版本庫目錄"

9049

8959 -#: worktree.c:320

9050 +#: worktree.c:306

9051 #, c-format

9052 msgid "'%s' file does not contain absolute path to the working tree location"

9053 msgstr "檔案 '%s' 不包含工作區的絕對路徑"

9054

8964 -#: worktree.c:332

9055 +#: worktree.c:318

9056 #, c-format

9057 msgid "'%s' does not exist"

9058 msgstr "'%s' 不存在"

9059

8969 -#: worktree.c:338

9060 +#: worktree.c:324

9061 #, c-format

9062 msgid "'%s' is not a .git file, error code %d"

9063 msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d"

9064

8974 -#: worktree.c:347

9065 +#: worktree.c:333

9066 #, c-format

9067 msgid "'%s' does not point back to '%s'"

9068 msgstr "'%s' 沒有指回到 '%s'"

9069

8979 -#: wrapper.c:186 wrapper.c:356

9070 +#: wrapper.c:194 wrapper.c:364

9071 #, c-format

9072 msgid "could not open '%s' for reading and writing"

9073 msgstr "無法開啟 '%s' 進行讀寫"

9074

8984 -#: wrapper.c:387 wrapper.c:588

9075 +#: wrapper.c:395 wrapper.c:596

9076 #, c-format

9077 msgid "unable to access '%s'"

9078 msgstr "不能存取 '%s'"

9079

8989 -#: wrapper.c:596

9080 +#: wrapper.c:604

9081 msgid "unable to get current working directory"

9082 msgstr "不能取得目前工作目錄"

9083

@@ -9394,39 +9485,44 @@ msgstr "您在執行二分尋找動作。"

9485 msgid " (use \"git bisect reset\" to get back to the original branch)"

9486 msgstr " （使用 \"git bisect reset\" 檢出原有分支）"

9487

9397 -#: wt-status.c:1692

9488 +#: wt-status.c:1494

9489 +#, c-format

9490 +msgid "You are in a sparse checkout with %d%% of tracked files present."

9491 +msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。"

9492 +

9493 +#: wt-status.c:1733

9494 msgid "On branch "

9495 msgstr "位於分支 "

9496

9401 -#: wt-status.c:1699

9497 +#: wt-status.c:1740

9498 msgid "interactive rebase in progress; onto "

9499 msgstr "互動式重定基底動作正在進行中；至 "

9500

9405 -#: wt-status.c:1701

9501 +#: wt-status.c:1742

9502 msgid "rebase in progress; onto "

9503 msgstr "重定基底動作正在進行中；至 "

9504

9409 -#: wt-status.c:1711

9505 +#: wt-status.c:1752

9506 msgid "Not currently on any branch."

9507 msgstr "目前不在任何分支上。"

9508

9413 -#: wt-status.c:1728

9509 +#: wt-status.c:1769

9510 msgid "Initial commit"

9511 msgstr "初始提交"

9512

9417 -#: wt-status.c:1729

9513 +#: wt-status.c:1770

9514 msgid "No commits yet"

9515 msgstr "尚無提交"

9516

9421 -#: wt-status.c:1743

9517 +#: wt-status.c:1784

9518 msgid "Untracked files"

9519 msgstr "未追蹤的檔案"

9520

9425 -#: wt-status.c:1745

9521 +#: wt-status.c:1786

9522 msgid "Ignored files"

9523 msgstr "忽略的檔案"

9524

9429 -#: wt-status.c:1749

9525 +#: wt-status.c:1790

9526 #, c-format

9527 msgid ""

9528 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -9436,97 +9532,97 @@ msgstr ""

9532 "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"

9533 "但您需要小心不要忘了新增新檔案（參見 'git help status'）。"

9534

9439 -#: wt-status.c:1755

9535 +#: wt-status.c:1796

9536 #, c-format

9537 msgid "Untracked files not listed%s"

9538 msgstr "未追蹤的檔案沒有列出%s"

9539

9540 # 譯者：中文字串拼接，可刪除前導空格

9445 -#: wt-status.c:1757

9541 +#: wt-status.c:1798

9542 msgid " (use -u option to show untracked files)"

9543 msgstr " （使用 -u 參數顯示未追蹤的檔案）"

9544

9449 -#: wt-status.c:1763

9545 +#: wt-status.c:1804

9546 msgid "No changes"

9547 msgstr "沒有修改"

9548

9453 -#: wt-status.c:1768

9549 +#: wt-status.c:1809

9550 #, c-format

9551 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

9552 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

9553

9458 -#: wt-status.c:1771

9554 +#: wt-status.c:1812

9555 #, c-format

9556 msgid "no changes added to commit\n"

9557 msgstr "修改尚未加入提交\n"

9558

9463 -#: wt-status.c:1774

9559 +#: wt-status.c:1815

9560 #, c-format

9561 msgid ""

9562 "nothing added to commit but untracked files present (use \"git add\" to "

9563 "track)\n"

9564 msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"

9565

9470 -#: wt-status.c:1777

9566 +#: wt-status.c:1818

9567 #, c-format

9568 msgid "nothing added to commit but untracked files present\n"

9569 msgstr "提交為空，但是存在尚未追蹤的檔案\n"

9570

9571 # 譯者：中文字串拼接，可刪除前導空格

9476 -#: wt-status.c:1780

9572 +#: wt-status.c:1821

9573 #, c-format

9574 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

9575 msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"

9576

9481 -#: wt-status.c:1783 wt-status.c:1788

9577 +#: wt-status.c:1824 wt-status.c:1829

9578 #, c-format

9579 msgid "nothing to commit\n"

9580 msgstr "無檔案要提交\n"

9581

9582 # 譯者：中文字串拼接，可刪除前導空格

9487 -#: wt-status.c:1786

9583 +#: wt-status.c:1827

9584 #, c-format

9585 msgid "nothing to commit (use -u to show untracked files)\n"

9586 msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n"

9587

9588 # 譯者：中文字串拼接，可刪除前導空格

9493 -#: wt-status.c:1790

9589 +#: wt-status.c:1831

9590 #, c-format

9591 msgid "nothing to commit, working tree clean\n"

9592 msgstr "沒有要提交的檔案，工作區為乾淨狀態\n"

9593

9498 -#: wt-status.c:1903

9594 +#: wt-status.c:1944

9595 msgid "No commits yet on "

9596 msgstr "尚無提交在 "

9597

9502 -#: wt-status.c:1907

9598 +#: wt-status.c:1948

9599 msgid "HEAD (no branch)"

9600 msgstr "HEAD（非分支）"

9601

9506 -#: wt-status.c:1938

9602 +#: wt-status.c:1979

9603 msgid "different"

9604 msgstr "不同"

9605

9606 # 譯者：請維持句尾空格

9511 -#: wt-status.c:1940 wt-status.c:1948

9607 +#: wt-status.c:1981 wt-status.c:1989

9608 msgid "behind "

9609 msgstr "落後 "

9610

9515 -#: wt-status.c:1943 wt-status.c:1946

9611 +#: wt-status.c:1984 wt-status.c:1987

9612 msgid "ahead "

9613 msgstr "領先 "

9614

9615 #. TRANSLATORS: the action is e.g. "pull with rebase"

9520 -#: wt-status.c:2468

9616 +#: wt-status.c:2509

9617 #, c-format

9618 msgid "cannot %s: You have unstaged changes."

9619 msgstr "不能%s：您有未暫存的變更。"

9620

9525 -#: wt-status.c:2474

9621 +#: wt-status.c:2515

9622 msgid "additionally, your index contains uncommitted changes."

9623 msgstr "另外，您的索引中包含未提交的變更。"

9624

9529 -#: wt-status.c:2476

9625 +#: wt-status.c:2517

9626 #, c-format

9627 msgid "cannot %s: Your index contains uncommitted changes."

9628 msgstr "不能%s：您的索引中包含未提交的變更。"

@@ -9603,7 +9699,7 @@ msgstr "測試執行"

9699 msgid "interactive picking"

9700 msgstr "互動式揀選"

9701

9606 -#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308

9702 +#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308

9703 msgid "select hunks interactively"

9704 msgstr "互動式挑選資料區塊"

9705

@@ -9728,12 +9824,12 @@ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用"

9824 msgid "--chmod param '%s' must be either -x or +x"

9825 msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"

9826

9731 -#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351

9827 +#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351

9828 #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506

9829 msgid "--pathspec-from-file is incompatible with pathspec arguments"

9830 msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"

9831

9736 -#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357

9832 +#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357

9833 #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512

9834 msgid "--pathspec-file-nul requires --pathspec-from-file"

9835 msgstr "--pathspec-file-nul 需要 --pathspec-from-file"

@@ -9989,7 +10085,7 @@ msgstr "老的參數 —— 無作用"

10085 msgid "allow fall back on 3way merging if needed"

10086 msgstr "如果必要，允許使用三方合併"

10087

9992 -#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16

10088 +#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16

10089 #: builtin/repack.c:306 builtin/stash.c:816

10090 msgid "be quiet"

10091 msgstr "靜默模式"

@@ -10044,7 +10140,7 @@ msgstr "n"

10140

10141 #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38

10142 #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38

10047 -#: bugreport.c:131

10143 +#: bugreport.c:137

10144 msgid "format"

10145 msgstr "格式"

10146

@@ -10334,111 +10430,115 @@ msgstr ""

10430 "指令 'git bisect terms' 的參數 %s 無效。\n"

10431 "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"

10432

10337 -#: builtin/bisect--helper.c:478

10433 +#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473

10434 +msgid "'' is not a valid term"

10435 +msgstr "'' 不是一個有效的術語"

10436 +

10437 +#: builtin/bisect--helper.c:483

10438 #, c-format

10439 msgid "unrecognized option: '%s'"

10440 msgstr "未識別的選項：'%s'"

10441

10342 -#: builtin/bisect--helper.c:482

10442 +#: builtin/bisect--helper.c:487

10443 #, c-format

10444 msgid "'%s' does not appear to be a valid revision"

10445 msgstr "'%s' 看起來不是一個有效的版本"

10446

10347 -#: builtin/bisect--helper.c:514

10447 +#: builtin/bisect--helper.c:519

10448 msgid "bad HEAD - I need a HEAD"

10449 msgstr "壞的 HEAD - 我需要一個 HEAD"

10450

10351 -#: builtin/bisect--helper.c:529

10451 +#: builtin/bisect--helper.c:534

10452 #, c-format

10453 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

10454 msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"

10455

10356 -#: builtin/bisect--helper.c:550

10456 +#: builtin/bisect--helper.c:555

10457 msgid "won't bisect on cg-seek'ed tree"

10458 msgstr "不會在做了 cg-seek 的樹上做二分尋找"

10459

10360 -#: builtin/bisect--helper.c:553

10460 +#: builtin/bisect--helper.c:558

10461 msgid "bad HEAD - strange symbolic ref"

10462 msgstr "壞的 HEAD - 奇怪的符號引用"

10463

10364 -#: builtin/bisect--helper.c:577

10464 +#: builtin/bisect--helper.c:582

10465 #, c-format

10466 msgid "invalid ref: '%s'"

10467 msgstr "無效的引用：'%s'"

10468

10369 -#: builtin/bisect--helper.c:633

10469 +#: builtin/bisect--helper.c:638

10470 msgid "perform 'git bisect next'"

10471 msgstr "執行 'git bisect next'"

10472

10373 -#: builtin/bisect--helper.c:635

10473 +#: builtin/bisect--helper.c:640

10474 msgid "write the terms to .git/BISECT_TERMS"

10475 msgstr "將術語寫入 .git/BISECT_TERMS"

10476

10377 -#: builtin/bisect--helper.c:637

10477 +#: builtin/bisect--helper.c:642

10478 msgid "cleanup the bisection state"

10479 msgstr "清除二分尋找狀態"

10480

10381 -#: builtin/bisect--helper.c:639

10481 +#: builtin/bisect--helper.c:644

10482 msgid "check for expected revs"

10483 msgstr "檢查預期的版本"

10484

10385 -#: builtin/bisect--helper.c:641

10485 +#: builtin/bisect--helper.c:646

10486 msgid "reset the bisection state"

10487 msgstr "清除二分尋找狀態"

10488

10389 -#: builtin/bisect--helper.c:643

10489 +#: builtin/bisect--helper.c:648

10490 msgid "write out the bisection state in BISECT_LOG"

10491 msgstr "將二分尋找的狀態寫入 BISECT_LOG"

10492

10393 -#: builtin/bisect--helper.c:645

10493 +#: builtin/bisect--helper.c:650

10494 msgid "check and set terms in a bisection state"

10495 msgstr "在一個二分尋找狀態中檢查和設定術語"

10496

10397 -#: builtin/bisect--helper.c:647

10497 +#: builtin/bisect--helper.c:652

10498 msgid "check whether bad or good terms exist"

10499 msgstr "檢查壞的或好的術語是否存在"

10500

10401 -#: builtin/bisect--helper.c:649

10501 +#: builtin/bisect--helper.c:654

10502 msgid "print out the bisect terms"

10503 msgstr "列印二分尋找術語"

10504

10405 -#: builtin/bisect--helper.c:651

10505 +#: builtin/bisect--helper.c:656

10506 msgid "start the bisect session"

10507 msgstr "啟動二分尋找過程"

10508

10409 -#: builtin/bisect--helper.c:653

10509 +#: builtin/bisect--helper.c:658

10510 msgid "update BISECT_HEAD instead of checking out the current commit"

10511 msgstr "更新 BISECT_HEAD 而非檢出目前提交"

10512

10413 -#: builtin/bisect--helper.c:655

10513 +#: builtin/bisect--helper.c:660

10514 msgid "no log for BISECT_WRITE"

10515 msgstr "BISECT_WRITE 無日誌"

10516

10417 -#: builtin/bisect--helper.c:673

10517 +#: builtin/bisect--helper.c:678

10518 msgid "--write-terms requires two arguments"

10519 msgstr "--write-terms 需要兩個參數"

10520

10421 -#: builtin/bisect--helper.c:677

10521 +#: builtin/bisect--helper.c:682

10522 msgid "--bisect-clean-state requires no arguments"

10523 msgstr "--bisect-clean-state 不帶參數"

10524

10425 -#: builtin/bisect--helper.c:684

10525 +#: builtin/bisect--helper.c:689

10526 msgid "--bisect-reset requires either no argument or a commit"

10527 msgstr "--bisect-reset 無需參數或者需要一個提交"

10528

10429 -#: builtin/bisect--helper.c:688

10529 +#: builtin/bisect--helper.c:693

10530 msgid "--bisect-write requires either 4 or 5 arguments"

10531 msgstr "--bisect-write 需要 4 或 5 個參數"

10532

10433 -#: builtin/bisect--helper.c:694

10533 +#: builtin/bisect--helper.c:699

10534 msgid "--check-and-set-terms requires 3 arguments"

10535 msgstr "--check-and-set-terms 需要 3 個參數"

10536

10437 -#: builtin/bisect--helper.c:700

10537 +#: builtin/bisect--helper.c:705

10538 msgid "--bisect-next-check requires 2 or 3 arguments"

10539 msgstr "--bisect-next-check 需要 2 或 3 個參數"

10540

10441 -#: builtin/bisect--helper.c:706

10541 +#: builtin/bisect--helper.c:711

10542 msgid "--bisect-terms requires 0 or 1 argument"

10543 msgstr "--bisect-terms 需要 0 或 1 個參數"

10544

@@ -11035,19 +11135,19 @@ msgstr "git bundle list-heads <檔案> [<參考名稱>...]"

11135 msgid "git bundle unbundle <file> [<refname>...]"

11136 msgstr "git bundle unbundle <檔案> [<參考名稱>...]"

11137

11038 -#: builtin/bundle.c:66 builtin/pack-objects.c:3376

11138 +#: builtin/bundle.c:66 builtin/pack-objects.c:3448

11139 msgid "do not show progress meter"

11140 msgstr "不顯示進度表"

11141

11042 -#: builtin/bundle.c:68 builtin/pack-objects.c:3378

11142 +#: builtin/bundle.c:68 builtin/pack-objects.c:3450

11143 msgid "show progress meter"

11144 msgstr "顯示進度表"

11145

11046 -#: builtin/bundle.c:70 builtin/pack-objects.c:3380

11146 +#: builtin/bundle.c:70 builtin/pack-objects.c:3452

11147 msgid "show progress meter during object writing phase"

11148 msgstr "在物件寫入階段顯示進度表"

11149

11050 -#: builtin/bundle.c:73 builtin/pack-objects.c:3383

11150 +#: builtin/bundle.c:73 builtin/pack-objects.c:3455

11151 msgid "similar to --all-progress when progress meter is shown"

11152 msgstr "當進度表顯示時類似於 --all-progress"

11153

@@ -11086,12 +11186,15 @@ msgstr ""

11186 "p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"

11187

11188 #: builtin/cat-file.c:599

11189 +#| msgid ""

11190 +#| "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "

11191 +#| "--filters]"

11192 msgid ""

11090 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

11091 -"filters]"

11193 +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"

11194 +"symlinks] [--textconv | --filters]"

11195 msgstr ""

11093 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

11094 -"filters]"

11196 +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"

11197 +"symlinks] [--textconv | --filters]"

11198

11199 #: builtin/cat-file.c:620

11200 msgid "only one batch option may be specified"

@@ -11125,7 +11228,7 @@ msgstr "對於資料物件，對其內容做文字轉換"

11228 msgid "for blob objects, run filters on object's content"

11229 msgstr "對於資料物件，對其內容做過濾"

11230

11128 -#: builtin/cat-file.c:648 git-submodule.sh:984

11231 +#: builtin/cat-file.c:648 git-submodule.sh:958

11232 msgid "blob"

11233 msgstr "blob"

11234

@@ -11185,8 +11288,8 @@ msgstr "從標準輸入讀出檔案名"

11288 msgid "terminate input and output records by a NUL character"

11289 msgstr "輸入和輸出的紀錄使用 NUL 字元終結"

11290

11188 -#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537

11189 -#: builtin/worktree.c:502

11291 +#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537

11292 +#: builtin/worktree.c:561

11293 msgid "suppress progress reporting"

11294 msgstr "不顯示進度報告"

11295

@@ -11278,7 +11381,7 @@ msgstr "將內容寫入暫存檔"

11381 #: builtin/checkout-index.c:178 builtin/column.c:31

11382 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403

11383 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909

11281 -#: builtin/worktree.c:675

11384 +#: builtin/worktree.c:754

11385 msgid "string"

11386 msgstr "字串"

11387

@@ -11390,11 +11493,11 @@ msgstr "'%s' 或 '%s' 不能和 %s 一起使用"

11493 msgid "path '%s' is unmerged"

11494 msgstr "路徑 '%s' 未合併"

11495

11393 -#: builtin/checkout.c:704

11496 +#: builtin/checkout.c:702

11497 msgid "you need to resolve your current index first"

11498 msgstr "您需要先解決目前索引的衝突"

11499

11397 -#: builtin/checkout.c:758

11500 +#: builtin/checkout.c:756

11501 #, c-format

11502 msgid ""

11503 "cannot continue with staged changes in the following files:\n"

@@ -11403,51 +11506,51 @@ msgstr ""

11506 "不能繼續，下列檔案有暫存的修改：\n"

11507 "%s"

11508

11406 -#: builtin/checkout.c:861

11509 +#: builtin/checkout.c:859

11510 #, c-format

11511 msgid "Can not do reflog for '%s': %s\n"

11512 msgstr "不能對 '%s' 執行 reflog 動作：%s\n"

11513

11411 -#: builtin/checkout.c:903

11514 +#: builtin/checkout.c:901

11515 msgid "HEAD is now at"

11516 msgstr "HEAD 目前位於"

11517

11415 -#: builtin/checkout.c:907 builtin/clone.c:720

11518 +#: builtin/checkout.c:905 builtin/clone.c:720

11519 msgid "unable to update HEAD"

11520 msgstr "不能更新 HEAD"

11521

11419 -#: builtin/checkout.c:911

11522 +#: builtin/checkout.c:909

11523 #, c-format

11524 msgid "Reset branch '%s'\n"

11525 msgstr "重設分支 '%s'\n"

11526

11424 -#: builtin/checkout.c:914

11527 +#: builtin/checkout.c:912

11528 #, c-format

11529 msgid "Already on '%s'\n"

11530 msgstr "已經位於 '%s'\n"

11531

11429 -#: builtin/checkout.c:918

11532 +#: builtin/checkout.c:916

11533 #, c-format

11534 msgid "Switched to and reset branch '%s'\n"

11535 msgstr "切換並重設分支 '%s'\n"

11536

11434 -#: builtin/checkout.c:920 builtin/checkout.c:1344

11537 +#: builtin/checkout.c:918 builtin/checkout.c:1342

11538 #, c-format

11539 msgid "Switched to a new branch '%s'\n"

11540 msgstr "切換到一個新分支 '%s'\n"

11541

11439 -#: builtin/checkout.c:922

11542 +#: builtin/checkout.c:920

11543 #, c-format

11544 msgid "Switched to branch '%s'\n"

11545 msgstr "切換到分支 '%s'\n"

11546

11547 # 譯者：請維持前導空格

11445 -#: builtin/checkout.c:973

11548 +#: builtin/checkout.c:971

11549 #, c-format

11550 msgid " ... and %d more.\n"

11551 msgstr " ... 及其它 %d 個。\n"

11552

11450 -#: builtin/checkout.c:979

11553 +#: builtin/checkout.c:977

11554 #, c-format

11555 msgid ""

11556 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -11464,7 +11567,7 @@ msgstr[0] ""

11567 "\n"

11568 "%s\n"

11569

11467 -#: builtin/checkout.c:998

11570 +#: builtin/checkout.c:996

11571 #, c-format

11572 msgid ""

11573 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -11485,19 +11588,19 @@ msgstr[0] ""

11588 " git branch <新分支名> %s\n"

11589 "\n"

11590

11488 -#: builtin/checkout.c:1033

11591 +#: builtin/checkout.c:1031

11592 msgid "internal error in revision walk"

11593 msgstr "在版本遍歷時遇到內部錯誤"

11594

11492 -#: builtin/checkout.c:1037

11595 +#: builtin/checkout.c:1035

11596 msgid "Previous HEAD position was"

11597 msgstr "之前的 HEAD 位置是"

11598

11496 -#: builtin/checkout.c:1077 builtin/checkout.c:1339

11599 +#: builtin/checkout.c:1075 builtin/checkout.c:1337

11600 msgid "You are on a branch yet to be born"

11601 msgstr "您位於一個尚未初始化的分支"

11602

11500 -#: builtin/checkout.c:1152

11603 +#: builtin/checkout.c:1150

11604 #, c-format

11605 msgid ""

11606 "'%s' could be both a local file and a tracking branch.\n"

@@ -11506,7 +11609,7 @@ msgstr ""

11609 "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"

11610 "請使用 --（和可選的 --no-guess）來消除歧義"

11611

11509 -#: builtin/checkout.c:1159

11612 +#: builtin/checkout.c:1157

11613 msgid ""

11614 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"

11615 "you can do so by fully qualifying the name with the --track option:\n"

@@ -11525,51 +11628,51 @@ msgstr ""

11628 "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"

11629 "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"

11630

11528 -#: builtin/checkout.c:1169

11631 +#: builtin/checkout.c:1167

11632 #, c-format

11633 msgid "'%s' matched multiple (%d) remote tracking branches"

11634 msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"

11635

11533 -#: builtin/checkout.c:1235

11636 +#: builtin/checkout.c:1233

11637 msgid "only one reference expected"

11638 msgstr "預期只有一個引用"

11639

11537 -#: builtin/checkout.c:1252

11640 +#: builtin/checkout.c:1250

11641 #, c-format

11642 msgid "only one reference expected, %d given."

11643 msgstr "應只有一個引用，卻提供了 %d 個。"

11644

11542 -#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451

11645 +#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510

11646 #, c-format

11647 msgid "invalid reference: %s"

11648 msgstr "無效引用：%s"

11649

11547 -#: builtin/checkout.c:1311 builtin/checkout.c:1677

11650 +#: builtin/checkout.c:1309 builtin/checkout.c:1675

11651 #, c-format

11652 msgid "reference is not a tree: %s"

11653 msgstr "引用不是一個樹：%s"

11654

11552 -#: builtin/checkout.c:1358

11655 +#: builtin/checkout.c:1356

11656 #, c-format

11657 msgid "a branch is expected, got tag '%s'"

11658 msgstr "期望一個分支，得到標籤 '%s'"

11659

11557 -#: builtin/checkout.c:1360

11660 +#: builtin/checkout.c:1358

11661 #, c-format

11662 msgid "a branch is expected, got remote branch '%s'"

11663 msgstr "期望一個分支，得到遠端分支 '%s'"

11664

11562 -#: builtin/checkout.c:1361 builtin/checkout.c:1369

11665 +#: builtin/checkout.c:1359 builtin/checkout.c:1367

11666 #, c-format

11667 msgid "a branch is expected, got '%s'"

11668 msgstr "期望一個分支，得到 '%s'"

11669

11567 -#: builtin/checkout.c:1364

11670 +#: builtin/checkout.c:1362

11671 #, c-format

11672 msgid "a branch is expected, got commit '%s'"

11673 msgstr "期望一個分支，得到提交 '%s'"

11674

11572 -#: builtin/checkout.c:1380

11675 +#: builtin/checkout.c:1378

11676 msgid ""

11677 "cannot switch branch while merging\n"

11678 "Consider \"git merge --quit\" or \"git worktree add\"."

@@ -11577,7 +11680,7 @@ msgstr ""

11680 "不能在合併時切換分支\n"

11681 "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"

11682

11580 -#: builtin/checkout.c:1384

11683 +#: builtin/checkout.c:1382

11684 msgid ""

11685 "cannot switch branch in the middle of an am session\n"

11686 "Consider \"git am --quit\" or \"git worktree add\"."

@@ -11585,7 +11688,7 @@ msgstr ""

11688 "不能在 am 工作階段期間切換分支\n"

11689 "考慮使用 \"git am --quit\" 或 \"git worktree add\"。"

11690

11588 -#: builtin/checkout.c:1388

11691 +#: builtin/checkout.c:1386

11692 msgid ""

11693 "cannot switch branch while rebasing\n"

11694 "Consider \"git rebase --quit\" or \"git worktree add\"."

@@ -11593,7 +11696,7 @@ msgstr ""

11696 "不能在重定基底時切換分支\n"

11697 "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"

11698

11596 -#: builtin/checkout.c:1392

11699 +#: builtin/checkout.c:1390

11700 msgid ""

11701 "cannot switch branch while cherry-picking\n"

11702 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."

@@ -11601,7 +11704,7 @@ msgstr ""

11704 "不能在揀選時切換分支\n"

11705 "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"

11706

11604 -#: builtin/checkout.c:1396

11707 +#: builtin/checkout.c:1394

11708 msgid ""

11709 "cannot switch branch while reverting\n"

11710 "Consider \"git revert --quit\" or \"git worktree add\"."

@@ -11609,213 +11712,214 @@ msgstr ""

11712 "不能在還原時切換分支\n"

11713 "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"

11714

11612 -#: builtin/checkout.c:1400

11715 +#: builtin/checkout.c:1398

11716 msgid "you are switching branch while bisecting"

11717 msgstr "您在執行二分尋找時切換分支"

11718

11616 -#: builtin/checkout.c:1407

11719 +#: builtin/checkout.c:1405

11720 msgid "paths cannot be used with switching branches"

11721 msgstr "路徑不能和切換分支同時使用"

11722

11620 -#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418

11723 +#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416

11724 #, c-format

11725 msgid "'%s' cannot be used with switching branches"

11726 msgstr "'%s' 不能和切換分支同時使用"

11727

11625 -#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428

11626 -#: builtin/checkout.c:1433 builtin/checkout.c:1438

11728 +#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426

11729 +#: builtin/checkout.c:1431 builtin/checkout.c:1436

11730 #, c-format

11731 msgid "'%s' cannot be used with '%s'"

11732 msgstr "'%s' 不能和 '%s' 同時使用"

11733

11631 -#: builtin/checkout.c:1435

11734 +#: builtin/checkout.c:1433

11735 #, c-format

11736 msgid "'%s' cannot take <start-point>"

11737 msgstr "'%s' 不帶 <起始點>"

11738

11636 -#: builtin/checkout.c:1443

11739 +#: builtin/checkout.c:1441

11740 #, c-format

11741 msgid "Cannot switch branch to a non-commit '%s'"

11742 msgstr "不能切換分支到一個非提交 '%s'"

11743

11641 -#: builtin/checkout.c:1450

11744 +#: builtin/checkout.c:1448

11745 msgid "missing branch or commit argument"

11746 msgstr "缺少分支或提交參數"

11747

11645 -#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80

11646 -#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288

11748 +#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82

11749 +#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288

11750 #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561

11751 #: builtin/send-pack.c:173

11752 msgid "force progress reporting"

11753 msgstr "強制顯示進度報告"

11754

11652 -#: builtin/checkout.c:1493

11755 +#: builtin/checkout.c:1491

11756 msgid "perform a 3-way merge with the new branch"

11757 msgstr "和新的分支執行三方合併"

11758

11656 -#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322

11759 +#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322

11760 msgid "style"

11761 msgstr "風格"

11762

11660 -#: builtin/checkout.c:1495

11763 +#: builtin/checkout.c:1493

11764 msgid "conflict style (merge or diff3)"

11765 msgstr "衝突輸出風格（merge 或 diff3）"

11766

11664 -#: builtin/checkout.c:1507 builtin/worktree.c:499

11767 +#: builtin/checkout.c:1505 builtin/worktree.c:558

11768 msgid "detach HEAD at named commit"

11769 msgstr "HEAD 從指定的提交分離"

11770

11668 -#: builtin/checkout.c:1508

11771 +#: builtin/checkout.c:1506

11772 msgid "set upstream info for new branch"

11773 msgstr "為新的分支設定上游訊息"

11774

11672 -#: builtin/checkout.c:1510

11775 +#: builtin/checkout.c:1508

11776 msgid "force checkout (throw away local modifications)"

11777 msgstr "強制檢出（捨棄本機修改）"

11778

11676 -#: builtin/checkout.c:1512

11779 +#: builtin/checkout.c:1510

11780 msgid "new-branch"

11781 msgstr "新分支"

11782

11680 -#: builtin/checkout.c:1512

11783 +#: builtin/checkout.c:1510

11784 msgid "new unparented branch"

11785 msgstr "新的沒有父提交的分支"

11786

11684 -#: builtin/checkout.c:1514 builtin/merge.c:292

11787 +#: builtin/checkout.c:1512 builtin/merge.c:292

11788 msgid "update ignored files (default)"

11789 msgstr "更新忽略的檔案（預設）"

11790

11688 -#: builtin/checkout.c:1517

11791 +#: builtin/checkout.c:1515

11792 msgid "do not check if another worktree is holding the given ref"

11793 msgstr "不檢查指定的引用是否被其他工作區所占用"

11794

11692 -#: builtin/checkout.c:1530

11795 +#: builtin/checkout.c:1528

11796 msgid "checkout our version for unmerged files"

11797 msgstr "對尚未合併的檔案檢出我們的版本"

11798

11696 -#: builtin/checkout.c:1533

11799 +#: builtin/checkout.c:1531

11800 msgid "checkout their version for unmerged files"

11801 msgstr "對尚未合併的檔案檢出他們的版本"

11802

11700 -#: builtin/checkout.c:1537

11803 +#: builtin/checkout.c:1535

11804 msgid "do not limit pathspecs to sparse entries only"

11805 msgstr "對路徑不做稀疏檢出的限制"

11806

11704 -#: builtin/checkout.c:1592

11807 +#: builtin/checkout.c:1590

11808 #, c-format

11809 msgid "-%c, -%c and --orphan are mutually exclusive"

11810 msgstr "-%c、-%c 和 --orphan 是互斥的"

11811

11709 -#: builtin/checkout.c:1596

11812 +#: builtin/checkout.c:1594

11813 msgid "-p and --overlay are mutually exclusive"

11814 msgstr "-p 和 --overlay 互斥"

11815

11713 -#: builtin/checkout.c:1633

11816 +#: builtin/checkout.c:1631

11817 msgid "--track needs a branch name"

11818 msgstr "--track 需要一個分支名"

11819

11717 -#: builtin/checkout.c:1638

11820 +#: builtin/checkout.c:1636

11821 #, c-format

11822 msgid "missing branch name; try -%c"

11823 msgstr "缺少分支名稱，請嘗試 -%c"

11824

11722 -#: builtin/checkout.c:1670

11825 +#: builtin/checkout.c:1668

11826 #, c-format

11827 msgid "could not resolve %s"

11828 msgstr "無法解析 %s"

11829

11727 -#: builtin/checkout.c:1686

11830 +#: builtin/checkout.c:1684

11831 msgid "invalid path specification"

11832 msgstr "無效的路徑規格"

11833

11731 -#: builtin/checkout.c:1693

11834 +#: builtin/checkout.c:1691

11835 #, c-format

11836 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

11837 msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"

11838

11736 -#: builtin/checkout.c:1697

11839 +#: builtin/checkout.c:1695

11840 #, c-format

11841 msgid "git checkout: --detach does not take a path argument '%s'"

11842 msgstr "git checkout：--detach 不能接收路徑參數 '%s'"

11843

11741 -#: builtin/checkout.c:1706

11844 +#: builtin/checkout.c:1704

11845 msgid "--pathspec-from-file is incompatible with --detach"

11846 msgstr "--pathspec-from-file 與 --detach 不相容"

11847

11745 -#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503

11848 +#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503

11849 msgid "--pathspec-from-file is incompatible with --patch"

11850 msgstr "--pathspec-from-file 與 --patch 不相容"

11851

11749 -#: builtin/checkout.c:1720

11852 +#: builtin/checkout.c:1718

11853 msgid ""

11854 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

11855 "checking out of the index."

11856 msgstr ""

11857 "git checkout：在從索引檢出時，--ours/--theirs、--force 和 --merge 不相容。"

11858

11756 -#: builtin/checkout.c:1725

11859 +#: builtin/checkout.c:1723

11860 msgid "you must specify path(s) to restore"

11861 msgstr "您必須指定一個要復原的路徑"

11862

11760 -#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802

11761 -#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170

11762 -#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497

11863 +#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800

11864 +#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170

11865 +#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554

11866 +#: builtin/worktree.c:556

11867 msgid "branch"

11868 msgstr "分支"

11869

11766 -#: builtin/checkout.c:1752

11870 +#: builtin/checkout.c:1750

11871 msgid "create and checkout a new branch"

11872 msgstr "建立並檢出一個新的分支"

11873

11770 -#: builtin/checkout.c:1754

11874 +#: builtin/checkout.c:1752

11875 msgid "create/reset and checkout a branch"

11876 msgstr "建立/重設並檢出一個分支"

11877

11774 -#: builtin/checkout.c:1755

11878 +#: builtin/checkout.c:1753

11879 msgid "create reflog for new branch"

11880 msgstr "為新的分支建立引用日誌"

11881

11778 -#: builtin/checkout.c:1757

11882 +#: builtin/checkout.c:1755

11883 msgid "second guess 'git checkout <no-such-branch>' (default)"

11884 msgstr "二次猜測 'git checkout <無此分支>'（預設）"

11885

11782 -#: builtin/checkout.c:1758

11886 +#: builtin/checkout.c:1756

11887 msgid "use overlay mode (default)"

11888 msgstr "使用疊加模式（預設）"

11889

11786 -#: builtin/checkout.c:1803

11890 +#: builtin/checkout.c:1801

11891 msgid "create and switch to a new branch"

11892 msgstr "建立並切換一個新分支"

11893

11790 -#: builtin/checkout.c:1805

11894 +#: builtin/checkout.c:1803

11895 msgid "create/reset and switch to a branch"

11896 msgstr "建立/重設並切換一個分支"

11897

11794 -#: builtin/checkout.c:1807

11898 +#: builtin/checkout.c:1805

11899 msgid "second guess 'git switch <no-such-branch>'"

11900 msgstr "二次猜測 'git switch <無此分支>'"

11901

11798 -#: builtin/checkout.c:1809

11902 +#: builtin/checkout.c:1807

11903 msgid "throw away local modifications"

11904 msgstr "捨棄本機修改"

11905

11802 -#: builtin/checkout.c:1843

11906 +#: builtin/checkout.c:1841

11907 msgid "which tree-ish to checkout from"

11908 msgstr "要檢出哪一個樹"

11909

11806 -#: builtin/checkout.c:1845

11910 +#: builtin/checkout.c:1843

11911 msgid "restore the index"

11912 msgstr "復原索引"

11913

11810 -#: builtin/checkout.c:1847

11914 +#: builtin/checkout.c:1845

11915 msgid "restore the working tree (default)"

11916 msgstr "復原工作區（預設）"

11917

11814 -#: builtin/checkout.c:1849

11918 +#: builtin/checkout.c:1847

11919 msgid "ignore unmerged entries"

11920 msgstr "忽略未合併條目"

11921

11818 -#: builtin/checkout.c:1850

11922 +#: builtin/checkout.c:1848

11923 msgid "use overlay mode"

11924 msgstr "使用疊加模式"

11925

@@ -11977,24 +12081,24 @@ msgstr "也刪除忽略的檔案"

12081 msgid "remove only ignored files"

12082 msgstr "只刪除忽略的檔案"

12083

11980 -#: builtin/clean.c:931

11981 -msgid "-x and -X cannot be used together"

11982 -msgstr "-x 和 -X 不能同時使用"

11983 -

11984 -#: builtin/clean.c:935

12084 +#: builtin/clean.c:929

12085 msgid ""

12086 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

12087 "clean"

12088 msgstr ""

12089 "clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"

12090

11991 -#: builtin/clean.c:938

12091 +#: builtin/clean.c:932

12092 msgid ""

12093 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

12094 "refusing to clean"

12095 msgstr ""

12096 "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"

12097

12098 +#: builtin/clean.c:944

12099 +msgid "-x and -X cannot be used together"

12100 +msgstr "-x 和 -X 不能同時使用"

12101 +

12102 #: builtin/clone.c:45

12103 msgid "git clone [<options>] [--] <repo> [<dir>]"

12104 msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"

@@ -12003,7 +12107,7 @@ msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"

12107 msgid "don't create a checkout"

12108 msgstr "不建立一個檢出"

12109

12006 -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536

12110 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554

12111 msgid "create a bare repository"

12112 msgstr "建立一個純版本庫"

12113

@@ -12035,11 +12139,11 @@ msgstr "在複製時初始化子模組"

12139 msgid "number of submodules cloned in parallel"

12140 msgstr "並發複製的子模組的數量"

12141

12038 -#: builtin/clone.c:111 builtin/init-db.c:533

12142 +#: builtin/clone.c:111 builtin/init-db.c:551

12143 msgid "template-directory"

12144 msgstr "範本目錄"

12145

12042 -#: builtin/clone.c:112 builtin/init-db.c:534

12146 +#: builtin/clone.c:112 builtin/init-db.c:552

12147 msgid "directory from which templates will be used"

12148 msgstr "範本目錄將被使用"

12149

@@ -12053,8 +12157,8 @@ msgstr "參考版本庫"

12157 msgid "use --reference only while cloning"

12158 msgstr "僅在複製時參考 --reference 指向的本機版本庫"

12159

12056 -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46

12057 -#: builtin/pack-objects.c:3442 builtin/repack.c:329

12160 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562

12161 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329

12162 msgid "name"

12163 msgstr "名稱"

12164

@@ -12079,7 +12183,7 @@ msgstr "深度"

12183 msgid "create a shallow clone of that depth"

12184 msgstr "建立一個指定深度的淺複製"

12185

12082 -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431

12186 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503

12187 #: builtin/pull.c:211

12188 msgid "time"

12189 msgstr "時間"

@@ -12110,11 +12214,11 @@ msgstr "不要複製任何標籤，並且後續取得動作也不下載它們"

12214 msgid "any cloned submodules will be shallow"

12215 msgstr "子模組將以淺下載模式複製"

12216

12113 -#: builtin/clone.c:137 builtin/init-db.c:542

12217 +#: builtin/clone.c:137 builtin/init-db.c:560

12218 msgid "gitdir"

12219 msgstr "git目錄"

12220

12117 -#: builtin/clone.c:138 builtin/init-db.c:543

12221 +#: builtin/clone.c:138 builtin/init-db.c:561

12222 msgid "separate git dir from working tree"

12223 msgstr "git目錄和工作區分離"

12224

@@ -12241,7 +12345,7 @@ msgstr "無法執行 repack 來清理"

12345 msgid "cannot unlink temporary alternates file"

12346 msgstr "無法刪除暫時的 alternates 檔案"

12347

12244 -#: builtin/clone.c:971 builtin/receive-pack.c:1972

12348 +#: builtin/clone.c:971 builtin/receive-pack.c:1982

12349 msgid "Too many arguments."

12350 msgstr "太多參數。"

12351

@@ -12258,83 +12362,83 @@ msgstr "--bare 和 --origin %s 選項不相容。"

12362 msgid "--bare and --separate-git-dir are incompatible."

12363 msgstr "--bare 和 --separate-git-dir 選項不相容。"

12364

12261 -#: builtin/clone.c:1004

12365 +#: builtin/clone.c:1007

12366 #, c-format

12367 msgid "repository '%s' does not exist"

12368 msgstr "版本庫 '%s' 不存在"

12369

12266 -#: builtin/clone.c:1010 builtin/fetch.c:1789

12370 +#: builtin/clone.c:1011 builtin/fetch.c:1794

12371 #, c-format

12372 msgid "depth %s is not a positive number"

12373 msgstr "深度 %s 不是一個正數"

12374

12271 -#: builtin/clone.c:1020

12375 +#: builtin/clone.c:1021

12376 #, c-format

12377 msgid "destination path '%s' already exists and is not an empty directory."

12378 msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。"

12379

12276 -#: builtin/clone.c:1030

12380 +#: builtin/clone.c:1033

12381 #, c-format

12382 msgid "working tree '%s' already exists."

12383 msgstr "工作區 '%s' 已經存在。"

12384

12281 -#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271

12282 -#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327

12385 +#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271

12386 +#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386

12387 #, c-format

12388 msgid "could not create leading directories of '%s'"

12389 msgstr "不能為 '%s' 建立先導目錄"

12390

12287 -#: builtin/clone.c:1050

12391 +#: builtin/clone.c:1053

12392 #, c-format

12393 msgid "could not create work tree dir '%s'"

12394 msgstr "不能建立工作區目錄 '%s'"

12395

12292 -#: builtin/clone.c:1070

12396 +#: builtin/clone.c:1073

12397 #, c-format

12398 msgid "Cloning into bare repository '%s'...\n"

12399 msgstr "複製到純版本庫 '%s'...\n"

12400

12297 -#: builtin/clone.c:1072

12401 +#: builtin/clone.c:1075

12402 #, c-format

12403 msgid "Cloning into '%s'...\n"

12404 msgstr "正複製到 '%s'...\n"

12405

12302 -#: builtin/clone.c:1096

12406 +#: builtin/clone.c:1099

12407 msgid ""

12408 "clone --recursive is not compatible with both --reference and --reference-if-"

12409 "able"

12410 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容"

12411

12308 -#: builtin/clone.c:1160

12412 +#: builtin/clone.c:1164

12413 msgid "--depth is ignored in local clones; use file:// instead."

12414 msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。"

12415

12312 -#: builtin/clone.c:1162

12416 +#: builtin/clone.c:1166

12417 msgid "--shallow-since is ignored in local clones; use file:// instead."

12418 msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。"

12419

12316 -#: builtin/clone.c:1164

12420 +#: builtin/clone.c:1168

12421 msgid "--shallow-exclude is ignored in local clones; use file:// instead."

12422 msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。"

12423

12320 -#: builtin/clone.c:1166

12424 +#: builtin/clone.c:1170

12425 msgid "--filter is ignored in local clones; use file:// instead."

12426 msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。"

12427

12324 -#: builtin/clone.c:1169

12428 +#: builtin/clone.c:1173

12429 msgid "source repository is shallow, ignoring --local"

12430 msgstr "源版本庫是淺複製，忽略 --local"

12431

12328 -#: builtin/clone.c:1174

12432 +#: builtin/clone.c:1178

12433 msgid "--local is ignored"

12434 msgstr "--local 被忽略"

12435

12332 -#: builtin/clone.c:1249 builtin/clone.c:1257

12436 +#: builtin/clone.c:1262 builtin/clone.c:1270

12437 #, c-format

12438 msgid "Remote branch %s not found in upstream %s"

12439 msgstr "遠端分支 %s 在上游 %s 未發現"

12440

12337 -#: builtin/clone.c:1260

12441 +#: builtin/clone.c:1273

12442 msgid "You appear to have cloned an empty repository."

12443 msgstr "您似乎複製了一個空版本庫。"

12444

@@ -12370,14 +12474,14 @@ msgstr "兩列之間的填充空間"

12474 msgid "--command must be the first argument"

12475 msgstr "--command 必須是第一個參數"

12476

12373 -#: builtin/commit-graph.c:11 builtin/commit-graph.c:19

12477 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:21

12478 msgid ""

12479 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"

12480 msgstr ""

12481 "git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"

12482 "[no-]progress]"

12483

12380 -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24

12484 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:26

12485 msgid ""

12486 "git commit-graph write [--object-dir <objdir>] [--append] [--"

12487 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

@@ -12387,79 +12491,88 @@ msgstr ""

12491 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

12492 "paths] [--[no-]progress] <split options>"

12493

12390 -#: builtin/commit-graph.c:60

12494 +#: builtin/commit-graph.c:62

12495 #, c-format

12496 msgid "could not find object directory matching %s"

12497 msgstr "找不到符合 %s 的物件目錄"

12498

12395 -#: builtin/commit-graph.c:76 builtin/commit-graph.c:152

12396 -#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678

12499 +#: builtin/commit-graph.c:78 builtin/commit-graph.c:177

12500 +#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678

12501 msgid "dir"

12502 msgstr "目錄"

12503

12400 -#: builtin/commit-graph.c:77 builtin/commit-graph.c:153

12401 -#: builtin/commit-graph.c:258

12504 +#: builtin/commit-graph.c:79 builtin/commit-graph.c:178

12505 +#: builtin/commit-graph.c:277

12506 msgid "The object directory to store the graph"

12507 msgstr "儲存圖形的物件目錄"

12508

12405 -#: builtin/commit-graph.c:79

12509 +#: builtin/commit-graph.c:81

12510 msgid "if the commit-graph is split, only verify the tip file"

12511 msgstr "如果提交圖形被分割，只驗證頭一個檔案"

12512

12409 -#: builtin/commit-graph.c:102

12513 +#: builtin/commit-graph.c:104

12514 #, c-format

12515 msgid "Could not open commit-graph '%s'"

12516 msgstr "無法開啟提交圖形 '%s'"

12517

12414 -#: builtin/commit-graph.c:136

12518 +#: builtin/commit-graph.c:138

12519 #, c-format

12520 msgid "unrecognized --split argument, %s"

12521 msgstr "無法識別的 --split 參數，%s"

12522

12419 -#: builtin/commit-graph.c:155

12523 +#: builtin/commit-graph.c:151

12524 +#, c-format

12525 +msgid "unexpected non-hex object ID: %s"

12526 +msgstr "非期望的非十六進位物件 ID：%s"

12527 +

12528 +#: builtin/commit-graph.c:156

12529 +#, c-format

12530 +msgid "invalid object: %s"

12531 +msgstr "物件無效：%s"

12532 +

12533 +#: builtin/commit-graph.c:180

12534 msgid "start walk at all refs"

12535 msgstr "開始遍歷所有引用"

12536

12423 -#: builtin/commit-graph.c:157

12537 +#: builtin/commit-graph.c:182

12538 msgid "scan pack-indexes listed by stdin for commits"

12539 msgstr "從標準輸入中的包索引檔案列表中掃描提交"

12540

12427 -#: builtin/commit-graph.c:159

12541 +#: builtin/commit-graph.c:184

12542 msgid "start walk at commits listed by stdin"

12543 msgstr "從標準輸入中的提交開始掃描"

12544

12431 -#: builtin/commit-graph.c:161

12545 +#: builtin/commit-graph.c:186

12546 msgid "include all commits already in the commit-graph file"

12547 msgstr "包含 commit-graph 檔案中已有所有提交"

12548

12435 -#: builtin/commit-graph.c:163

12549 +#: builtin/commit-graph.c:188

12550 msgid "enable computation for changed paths"

12551 msgstr "啟用已變更路徑的計算"

12552

12439 -#: builtin/commit-graph.c:166

12553 +#: builtin/commit-graph.c:191

12554 msgid "allow writing an incremental commit-graph file"

12555 msgstr "允許寫一個增量提交圖形檔案"

12556

12443 -#: builtin/commit-graph.c:170

12557 +#: builtin/commit-graph.c:195

12558 msgid "maximum number of commits in a non-base split commit-graph"

12559 msgstr "在非基本分割提交圖形中的最大提交數"

12560

12447 -#: builtin/commit-graph.c:172

12561 +#: builtin/commit-graph.c:197

12562 msgid "maximum ratio between two levels of a split commit-graph"

12563 msgstr "一個分割提交圖形的兩個級別之間的最大比率"

12564

12451 -#: builtin/commit-graph.c:174

12565 +#: builtin/commit-graph.c:199

12566 msgid "only expire files older than a given date-time"

12567 msgstr "只將舊於指定日期與時間的檔案設為過期"

12568

12455 -#: builtin/commit-graph.c:190

12569 +#: builtin/commit-graph.c:215

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

12571 msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"

12572

12459 -#: builtin/commit-graph.c:229

12460 -#, c-format

12461 -msgid "unexpected non-hex object ID: %s"

12462 -msgstr "非期望的非十六進位物件 ID：%s"

12573 +#: builtin/commit-graph.c:245

12574 +msgid "Collecting commits from input"

12575 +msgstr "正在從輸入收集提交"

12576

12577 #: builtin/commit-tree.c:18

12578 msgid ""

@@ -12855,7 +12968,7 @@ msgid "version"

12968 msgstr "版本"

12969

12970 #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549

12858 -#: builtin/worktree.c:646

12971 +#: builtin/worktree.c:722

12972 msgid "machine-readable output"

12973 msgstr "機器可讀的輸出"

12974

@@ -12868,8 +12981,8 @@ msgid "terminate entries with NUL"

12981 msgstr "條目以 NUL 字元結尾"

12982

12983 #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543

12871 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156

12872 -#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336

12984 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202

12985 +#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336

12986 msgid "mode"

12987 msgstr "模式"

12988

@@ -13544,35 +13657,45 @@ msgstr "--dirty 與提交號不相容"

13657 msgid "--broken is incompatible with commit-ishes"

13658 msgstr "--broken 與提交號不相容"

13659

13547 -#: builtin/diff.c:84

13660 +#: builtin/diff.c:91

13661 #, c-format

13662 msgid "'%s': not a regular file or symlink"

13663 msgstr "'%s'：不是一個正規檔案或符號連結"

13664

13552 -#: builtin/diff.c:235

13665 +#: builtin/diff.c:242

13666 #, c-format

13667 msgid "invalid option: %s"

13668 msgstr "無效選項：%s"

13669

13557 -#: builtin/diff.c:350

13670 +#: builtin/diff.c:359

13671 +#, c-format

13672 +msgid "%s...%s: no merge base"

13673 +msgstr "%s...%s: 無合併基底"

13674 +

13675 +#: builtin/diff.c:469

13676 msgid "Not a git repository"

13677 msgstr "不是一個 git 版本庫"

13678

13561 -#: builtin/diff.c:394

13679 +#: builtin/diff.c:514

13680 #, c-format

13681 msgid "invalid object '%s' given."

13682 msgstr "提供了無效物件 '%s'。"

13683

13566 -#: builtin/diff.c:403

13684 +#: builtin/diff.c:525

13685 #, c-format

13686 msgid "more than two blobs given: '%s'"

13687 msgstr "提供了超過兩個資料物件：'%s'"

13688

13571 -#: builtin/diff.c:408

13689 +#: builtin/diff.c:530

13690 #, c-format

13691 msgid "unhandled object '%s' given."

13692 msgstr "無法處理的物件 '%s'。"

13693

13694 +#: builtin/diff.c:564

13695 +#, c-format

13696 +msgid "%s...%s: multiple merge bases, using %s"

13697 +msgstr "%s...%s：多個合併基底，使用 %s"

13698 +

13699 #: builtin/difftool.c:30

13700 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

13701 msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]"

@@ -13717,82 +13840,103 @@ msgstr "選項 `--default' 和 `type=ulong` 期望一個無符號長整型，不

13840 msgid "git fast-export [rev-list-opts]"

13841 msgstr "git fast-export [rev-list-opts]"

13842

13720 -#: builtin/fast-export.c:853

13843 +#: builtin/fast-export.c:868

13844 msgid "Error: Cannot export nested tags unless --mark-tags is specified."

13845 msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。"

13846

13724 -#: builtin/fast-export.c:1152

13847 +#: builtin/fast-export.c:1178

13848 +msgid "--anonymize-map token cannot be empty"

13849 +msgstr "--anonymize-map 的鍵不能空白"

13850 +

13851 +#: builtin/fast-export.c:1198

13852 msgid "show progress after <n> objects"

13853 msgstr "在 <n> 個物件之後顯示進度"

13854

13728 -#: builtin/fast-export.c:1154

13855 +#: builtin/fast-export.c:1200

13856 msgid "select handling of signed tags"

13857 msgstr "選擇如何處理簽名標籤"

13858

13732 -#: builtin/fast-export.c:1157

13859 +#: builtin/fast-export.c:1203

13860 msgid "select handling of tags that tag filtered objects"

13861 msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式"

13862

13736 -#: builtin/fast-export.c:1160

13863 +#: builtin/fast-export.c:1206

13864 msgid "select handling of commit messages in an alternate encoding"

13865 msgstr "選擇使用備用編碼處理提交說明"

13866

13740 -#: builtin/fast-export.c:1163

13867 +#: builtin/fast-export.c:1209

13868 msgid "Dump marks to this file"

13869 msgstr "把標記儲存到這個檔案"

13870

13744 -#: builtin/fast-export.c:1165

13871 +#: builtin/fast-export.c:1211

13872 msgid "Import marks from this file"

13873 msgstr "從這個檔案匯入標記"

13874

13748 -#: builtin/fast-export.c:1169

13875 +#: builtin/fast-export.c:1215

13876 msgid "Import marks from this file if it exists"

13877 msgstr "從該檔案匯入標記（如果存在的話）"

13878

13752 -#: builtin/fast-export.c:1171

13879 +#: builtin/fast-export.c:1217

13880 msgid "Fake a tagger when tags lack one"

13881 msgstr "當標籤缺少標記者欄位時，假裝提供一個"

13882

13756 -#: builtin/fast-export.c:1173

13883 +#: builtin/fast-export.c:1219

13884 msgid "Output full tree for each commit"

13885 msgstr "每次提交都輸出整個樹"

13886

13760 -#: builtin/fast-export.c:1175

13887 +#: builtin/fast-export.c:1221

13888 msgid "Use the done feature to terminate the stream"

13889 msgstr "使用 done 功能來終止流"

13890

13764 -#: builtin/fast-export.c:1176

13891 +#: builtin/fast-export.c:1222

13892 msgid "Skip output of blob data"

13893 msgstr "跳過資料物件的輸出"

13894

13768 -#: builtin/fast-export.c:1177 builtin/log.c:1724

13895 +#: builtin/fast-export.c:1223 builtin/log.c:1724

13896 msgid "refspec"

13897 msgstr "參照規格"

13898

13772 -#: builtin/fast-export.c:1178

13899 +#: builtin/fast-export.c:1224

13900 msgid "Apply refspec to exported refs"

13901 msgstr "對匯出的引用應用引用規格"

13902

13776 -#: builtin/fast-export.c:1179

13903 +#: builtin/fast-export.c:1225

13904 msgid "anonymize output"

13905 msgstr "匿名輸出"

13906

13780 -#: builtin/fast-export.c:1181

13907 +#: builtin/fast-export.c:1226

13908 +msgid "from:to"

13909 +msgstr "from:to"

13910 +

13911 +#: builtin/fast-export.c:1227

13912 +msgid "convert <from> to <to> in anonymized output"

13913 +msgstr "在匿名輸出中將 <from> 轉換為 <to>"

13914 +

13915 +#: builtin/fast-export.c:1230

13916 msgid "Reference parents which are not in fast-export stream by object id"

13917 msgstr "引用父物件 ID 不在 fast-export 流中"

13918

13784 -#: builtin/fast-export.c:1183

13919 +#: builtin/fast-export.c:1232

13920 msgid "Show original object ids of blobs/commits"

13921 msgstr "顯示資料物件/提交的原始物件 ID"

13922

13788 -#: builtin/fast-export.c:1185

13923 +#: builtin/fast-export.c:1234

13924 msgid "Label tags with mark ids"

13925 msgstr "對帶有標記 ID 的標籤做標記"

13926

13792 -#: builtin/fast-export.c:1220

13927 +#: builtin/fast-export.c:1257

13928 +msgid "--anonymize-map without --anonymize does not make sense"

13929 +msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義"

13930 +

13931 +#: builtin/fast-export.c:1272

13932 msgid "Cannot pass both --import-marks and --import-marks-if-exists"

13933 msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"

13934

13935 +#: builtin/fetch-pack.c:245

13936 +#, c-format

13937 +msgid "Lockfile created but not reported: %s"

13938 +msgstr "已建立鎖定檔案，但尚未回報：%s"

13939 +

13940 #: builtin/fetch.c:35

13941 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

13942 msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]"

@@ -14113,40 +14257,40 @@ msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指

14257 msgid "You need to specify a tag name."

14258 msgstr "您需要指定一個標籤名稱。"

14259

14116 -#: builtin/fetch.c:1773

14260 +#: builtin/fetch.c:1778

14261 msgid "Negative depth in --deepen is not supported"

14262 msgstr "--deepen 不支援負數深度"

14263

14120 -#: builtin/fetch.c:1775

14264 +#: builtin/fetch.c:1780

14265 msgid "--deepen and --depth are mutually exclusive"

14266 msgstr "--deepen 和 --depth 是互斥的"

14267

14124 -#: builtin/fetch.c:1780

14268 +#: builtin/fetch.c:1785

14269 msgid "--depth and --unshallow cannot be used together"

14270 msgstr "--depth 和 --unshallow 不能同時使用"

14271

14128 -#: builtin/fetch.c:1782

14272 +#: builtin/fetch.c:1787

14273 msgid "--unshallow on a complete repository does not make sense"

14274 msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"

14275

14132 -#: builtin/fetch.c:1798

14276 +#: builtin/fetch.c:1800

14277 msgid "fetch --all does not take a repository argument"

14278 msgstr "fetch --all 不能帶一個版本庫參數"

14279

14136 -#: builtin/fetch.c:1800

14280 +#: builtin/fetch.c:1802

14281 msgid "fetch --all does not make sense with refspecs"

14282 msgstr "fetch --all 帶引用規格沒有任何意義"

14283

14140 -#: builtin/fetch.c:1809

14284 +#: builtin/fetch.c:1811

14285 #, c-format

14286 msgid "No such remote or remote group: %s"

14287 msgstr "沒有這樣的遠端或遠端組：%s"

14288

14145 -#: builtin/fetch.c:1816

14289 +#: builtin/fetch.c:1818

14290 msgid "Fetching a group and specifying refspecs does not make sense"

14291 msgstr "取得組並指定引用規格沒有意義"

14292

14149 -#: builtin/fetch.c:1834

14293 +#: builtin/fetch.c:1836

14294 msgid ""

14295 "--filter can only be used with the remote configured in extensions."

14296 "partialclone"

@@ -14592,8 +14736,8 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"

14736 #. variable for tweaking threads, currently

14737 #. grep.threads

14738 #.

14595 -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730

14596 -#: builtin/pack-objects.c:2855

14739 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727

14740 +#: builtin/pack-objects.c:2904

14741 #, c-format

14742 msgid "no threads support, ignoring %s"

14743 msgstr "沒有執行緒支援，忽略 %s"

@@ -14823,11 +14967,11 @@ msgstr "--untracked 不支援與 --recurse-submodules 一起使用"

14967 msgid "invalid option combination, ignoring --threads"

14968 msgstr "無效的選項組合，忽略 --threads"

14969

14826 -#: builtin/grep.c:1084 builtin/pack-objects.c:3548

14970 +#: builtin/grep.c:1084 builtin/pack-objects.c:3623

14971 msgid "no threads support, ignoring --threads"

14972 msgstr "沒有執行緒支援，忽略 --threads"

14973

14830 -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852

14974 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901

14975 #, c-format

14976 msgid "invalid number of threads specified (%d)"

14977 msgstr "指定的執行緒數無效（%d）"

@@ -15027,7 +15171,7 @@ msgstr "輸入上的讀錯誤"

15171 msgid "used more bytes than were available"

15172 msgstr "用掉了超過可用的位元組"

15173

15030 -#: builtin/index-pack.c:288 builtin/pack-objects.c:607

15174 +#: builtin/index-pack.c:288 builtin/pack-objects.c:618

15175 msgid "pack too large for current definition of off_t"

15176 msgstr "包太大超過了目前 off_t 的定義"

15177

@@ -15097,8 +15241,8 @@ msgstr "解壓縮嚴重的不一致"

15241 msgid "SHA1 COLLISION FOUND WITH %s !"

15242 msgstr "發現 %s 出現 SHA1 衝突！"

15243

15100 -#: builtin/index-pack.c:738 builtin/pack-objects.c:159

15101 -#: builtin/pack-objects.c:219 builtin/pack-objects.c:314

15244 +#: builtin/index-pack.c:738 builtin/pack-objects.c:170

15245 +#: builtin/pack-objects.c:230 builtin/pack-objects.c:325

15246 #, c-format

15247 msgid "unable to read %s"

15248 msgstr "不能讀 %s"

@@ -15159,7 +15303,7 @@ msgstr "parse_pack_objects() 中遇到不可理喻的問題"

15303 msgid "Resolving deltas"

15304 msgstr "處理 delta 中"

15305

15162 -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616

15306 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665

15307 #, c-format

15308 msgid "unable to create thread: %s"

15309 msgstr "不能建立執行緒：%s"

@@ -15222,56 +15366,65 @@ msgstr "無法儲存包檔案"

15366 msgid "cannot store index file"

15367 msgstr "無法儲存索引檔案"

15368

15225 -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863

15369 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912

15370 #, c-format

15371 msgid "bad pack.indexversion=%<PRIu32>"

15372 msgstr "壞的 pack.indexversion=%<PRIu32>"

15373

15230 -#: builtin/index-pack.c:1596

15374 +#: builtin/index-pack.c:1592

15375 #, c-format

15376 msgid "Cannot open existing pack file '%s'"

15377 msgstr "無法開啟現存包檔案 '%s'"

15378

15235 -#: builtin/index-pack.c:1598

15379 +#: builtin/index-pack.c:1594

15380 #, c-format

15381 msgid "Cannot open existing pack idx file for '%s'"

15382 msgstr "無法為 %s 開啟包索引檔案"

15383

15240 -#: builtin/index-pack.c:1646

15384 +#: builtin/index-pack.c:1642

15385 #, c-format

15386 msgid "non delta: %d object"

15387 msgid_plural "non delta: %d objects"

15388 msgstr[0] "非 delta：%d 個物件"

15389

15246 -#: builtin/index-pack.c:1653

15390 +#: builtin/index-pack.c:1649

15391 #, c-format

15392 msgid "chain length = %d: %lu object"

15393 msgid_plural "chain length = %d: %lu objects"

15394 msgstr[0] "鏈長 = %d: %lu 物件"

15395

15252 -#: builtin/index-pack.c:1692

15396 +#: builtin/index-pack.c:1689

15397 msgid "Cannot come back to cwd"

15398 msgstr "無法返回目前工作目錄"

15399

15256 -#: builtin/index-pack.c:1741 builtin/index-pack.c:1744

15257 -#: builtin/index-pack.c:1760 builtin/index-pack.c:1764

15400 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741

15401 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761

15402 #, c-format

15403 msgid "bad %s"

15404 msgstr "錯誤選項 %s"

15405

15262 -#: builtin/index-pack.c:1780

15406 +#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621

15407 +#, c-format

15408 +msgid "unknown hash algorithm '%s'"

15409 +msgstr "未知的「%s」雜湊算法"

15410 +

15411 +#: builtin/index-pack.c:1782

15412 msgid "--fix-thin cannot be used without --stdin"

15413 msgstr "--fix-thin 不能和 --stdin 同時使用"

15414

15266 -#: builtin/index-pack.c:1782

15415 +#: builtin/index-pack.c:1784

15416 msgid "--stdin requires a git repository"

15417 msgstr "--stdin 需要一個 git 版本庫"

15418

15270 -#: builtin/index-pack.c:1788

15419 +#: builtin/index-pack.c:1786

15420 +msgid "--object-format cannot be used with --stdin"

15421 +msgstr "--object-format 不能和 --stdin 同時使用"

15422 +

15423 +#: builtin/index-pack.c:1792

15424 msgid "--verify with no packfile name given"

15425 msgstr "--verify 沒有提供 packfile 名稱參數"

15426

15274 -#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582

15427 +#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582

15428 msgid "fsck error in pack objects"

15429 msgstr "在打包物件中 fsck 檢查發生錯誤"

15430

@@ -15315,51 +15468,56 @@ msgstr "沒有在 %s 中找到範本"

15468 msgid "not copying templates from '%s': %s"

15469 msgstr "沒有從 '%s' 複製範本：%s"

15470

15318 -#: builtin/init-db.c:356

15471 +#: builtin/init-db.c:276

15472 +#, c-format

15473 +msgid "invalid initial branch name: '%s'"

15474 +msgstr "無效的初始分支名稱：'%s'"

15475 +

15476 +#: builtin/init-db.c:368

15477 #, c-format

15478 msgid "unable to handle file type %d"

15479 msgstr "不能處理 %d 類型的檔案"

15480

15323 -#: builtin/init-db.c:359

15481 +#: builtin/init-db.c:371

15482 #, c-format

15483 msgid "unable to move %s to %s"

15484 msgstr "不能移動 %s 至 %s"

15485

15328 -#: builtin/init-db.c:374

15486 +#: builtin/init-db.c:386

15487 msgid "attempt to reinitialize repository with different hash"

15488 msgstr "嘗試以不同的雜湊值重新初始化版本庫"

15489

15332 -#: builtin/init-db.c:380 builtin/init-db.c:601

15333 -#, c-format

15334 -msgid "unknown hash algorithm '%s'"

15335 -msgstr "未知的「%s」雜湊算法"

15336 -

15337 -#: builtin/init-db.c:397 builtin/init-db.c:400

15490 +#: builtin/init-db.c:410 builtin/init-db.c:413

15491 #, c-format

15492 msgid "%s already exists"

15493 msgstr "%s 已經存在"

15494

15342 -#: builtin/init-db.c:458

15495 +#: builtin/init-db.c:444

15496 +#, c-format

15497 +msgid "re-init: ignored --initial-branch=%s"

15498 +msgstr "re-init: 忽略 --initial-branch=%s"

15499 +

15500 +#: builtin/init-db.c:475

15501 #, c-format

15502 msgid "Reinitialized existing shared Git repository in %s%s\n"

15503 msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"

15504

15347 -#: builtin/init-db.c:459

15505 +#: builtin/init-db.c:476

15506 #, c-format

15507 msgid "Reinitialized existing Git repository in %s%s\n"

15508 msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"

15509

15352 -#: builtin/init-db.c:463

15510 +#: builtin/init-db.c:480

15511 #, c-format

15512 msgid "Initialized empty shared Git repository in %s%s\n"

15513 msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"

15514

15357 -#: builtin/init-db.c:464

15515 +#: builtin/init-db.c:481

15516 #, c-format

15517 msgid "Initialized empty Git repository in %s%s\n"

15518 msgstr "已初始化空的 Git 版本庫於 %s%s\n"

15519

15362 -#: builtin/init-db.c:513

15520 +#: builtin/init-db.c:530

15521 msgid ""

15522 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

15523 "shared[=<permissions>]] [<directory>]"

@@ -15367,40 +15525,44 @@ msgstr ""

15525 "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] "

15526 "[<目錄>]"

15527

15370 -#: builtin/init-db.c:538

15528 +#: builtin/init-db.c:556

15529 msgid "permissions"

15530 msgstr "權限"

l10n: zh_TW.po: v2.28.0 round 1 (0 untranslated)