bc66326381 · 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-07-10 09:53+0800\n"

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

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

296 +"PO-Revision-Date: 2020-10-10 19:26+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"

@@ -301,7 +301,7 @@ msgstr ""

301 "Content-Type: text/plain; charset=UTF-8\n"

302 "Content-Transfer-Encoding: 8bit\n"

303 "Plural-Forms: nplurals=1; plural=0;\n"

304 -"X-Generator: Poedit 2.3.1\n"

304 +"X-Generator: Poedit 2.4.1\n"

305 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"

306 "zhconvert.org\n"

307

@@ -310,9 +310,9 @@ msgstr ""

310 msgid "Huh (%s)?"

311 msgstr "嗯（%s）？"

312

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

314 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518

315 -#: builtin/rebase.c:1919

313 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250

314 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526

315 +#: builtin/rebase.c:1944

316 msgid "could not read index"

317 msgstr "無法讀取索引"

318

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

340 msgid "could not stage '%s'"

341 msgstr "無法暫存「%s」"

342

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

343 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444

344 msgid "could not write index"

345 msgstr "無法寫入索引"

346

@@ -355,7 +355,7 @@ msgstr[0] "已更新 %d 個路徑\n"

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

356 msgstr "註：%s 現已不再追蹤。\n"

357

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

358 +#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295

359 #: builtin/reset.c:145

360 #, c-format

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

@@ -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:1691 git-add--interactive.perl:1368

398 +#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371

399 #, c-format

400 msgid "Only binary files changed.\n"

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

402

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

403 +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373

404 #, c-format

405 msgid "No changes.\n"

406 msgstr "沒有修改。\n"

407

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

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

409 msgid "Patch update"

410 msgstr "修補檔更新"

411

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

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

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:1868

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

481 msgid "*** Commands ***"

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

483

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

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

485 msgid "What now"

486 msgstr "請選擇"

487

@@ -493,12 +493,12 @@ msgstr "快取"

493 msgid "unstaged"

494 msgstr "未快取"

495

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

497 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145

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:135

496 +#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270

497 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123

498 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190

499 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

500 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

501 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

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

503 msgid "path"

504 msgstr "路徑"

@@ -507,27 +507,27 @@ msgstr "路徑"

507 msgid "could not refresh index"

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

509

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

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

511 #, c-format

512 msgid "Bye.\n"

513 msgstr "再見。\n"

514

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

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

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:1431

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

521 #, c-format, perl-format

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

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

524

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

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

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

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

531 #, c-format, perl-format

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

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

@@ -552,22 +552,22 @@ msgstr ""

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

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

554

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

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

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

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

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

561 #, c-format, perl-format

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

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

564

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

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

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

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

571 #, c-format, perl-format

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

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

@@ -592,22 +592,22 @@ msgstr ""

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

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

594

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

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

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

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

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

601 #, c-format, perl-format

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

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

604

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

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

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

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

611 #, c-format, perl-format

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

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

@@ -632,22 +632,22 @@ msgstr ""

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

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

634

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

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

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

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

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

641 #, c-format, perl-format

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

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

644

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

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

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

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

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,?]? "

@@ -672,26 +672,26 @@ msgstr ""

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

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

674

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

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

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

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

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

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

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

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

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

683 #, c-format, perl-format

684 msgid "Discard deletion from worktree [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

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

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

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

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

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

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

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

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,?]? "

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

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

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

718

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

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

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

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

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

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

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

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

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

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

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,?]? "

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

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

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

752

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

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

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

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

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

759 #, c-format, perl-format

760 msgid "Apply deletion to index and worktree [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

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

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

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

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

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,?]? "

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

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

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

800

801 -#: add-patch.c:328

801 +#: add-patch.c:342

802 #, c-format

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

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

805

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

806 +#: add-patch.c:361 add-patch.c:365

807 #, c-format

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

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

810

811 -#: add-patch.c:405

811 +#: add-patch.c:419

812 msgid "could not parse diff"

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

814

815 -#: add-patch.c:424

815 +#: add-patch.c:438

816 msgid "could not parse colored diff"

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

818

819 -#: add-patch.c:438

819 +#: add-patch.c:452

820 #, c-format

821 msgid "failed to run '%s'"

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

823

824 -#: add-patch.c:602

824 +#: add-patch.c:611

825 msgid "mismatched output from interactive.diffFilter"

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

827

828 -#: add-patch.c:603

828 +#: add-patch.c:612

829 msgid ""

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

831 "between its input and output lines."

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

833

834 -#: add-patch.c:776

834 +#: add-patch.c:785

835 #, c-format

836 msgid ""

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

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

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

841 "%.*s"

842

843 -#: add-patch.c:791

843 +#: add-patch.c:800

844 #, c-format

845 msgid ""

846 "hunks do not overlap:\n"

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

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

854 "%.*s"

855

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

856 +#: add-patch.c:1076 git-add--interactive.perl:1117

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

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

859

860 -#: add-patch.c:1071

860 +#: add-patch.c:1080

861 #, c-format

862 msgid ""

863 "---\n"

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

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

872

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

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

874 +#: add-patch.c:1094 git-add--interactive.perl:1131

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"

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

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

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

882

883 -#: add-patch.c:1118

883 +#: add-patch.c:1127

884 msgid "could not parse hunk header"

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

886

887 -#: add-patch.c:1163

887 +#: add-patch.c:1172

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

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

890

@@ -900,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.

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

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

904 msgid ""

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

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

907

908 -#: add-patch.c:1275

908 +#: add-patch.c:1284

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

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

911

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

912 +#: add-patch.c:1285 git-add--interactive.perl:1348

913 msgid "Apply them to the worktree anyway? "

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

915

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

916 +#: add-patch.c:1292 git-add--interactive.perl:1351

917 msgid "Nothing was applied.\n"

918 msgstr "未套用。\n"

919

920 -#: add-patch.c:1340

920 +#: add-patch.c:1349

921 msgid ""

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

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

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

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

940 "? - 顯示說明\n"

941

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

942 +#: add-patch.c:1511 add-patch.c:1521

943 msgid "No previous hunk"

944 msgstr "沒有上一個區塊"

945

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

946 +#: add-patch.c:1516 add-patch.c:1526

947 msgid "No next hunk"

948 msgstr "沒有下一個區塊"

949

950 -#: add-patch.c:1484

950 +#: add-patch.c:1532

951 msgid "No other hunks to goto"

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

953

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

954 +#: add-patch.c:1543 git-add--interactive.perl:1608

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

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

957

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

958 +#: add-patch.c:1544 git-add--interactive.perl:1610

959 msgid "go to which hunk? "

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

961

962 -#: add-patch.c:1507

962 +#: add-patch.c:1555

963 #, c-format

964 msgid "Invalid number: '%s'"

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

966

967 -#: add-patch.c:1512

967 +#: add-patch.c:1560

968 #, c-format

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

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

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

972

973 -#: add-patch.c:1521

973 +#: add-patch.c:1569

974 msgid "No other hunks to search"

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

976

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

977 +#: add-patch.c:1575 git-add--interactive.perl:1663

978 msgid "search for regex? "

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

980

981 -#: add-patch.c:1542

981 +#: add-patch.c:1590

982 #, c-format

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

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

985

986 -#: add-patch.c:1559

986 +#: add-patch.c:1607

987 msgid "No hunk matches the given pattern"

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

989

990 -#: add-patch.c:1566

990 +#: add-patch.c:1614

991 msgid "Sorry, cannot split this hunk"

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

993

994 -#: add-patch.c:1570

994 +#: add-patch.c:1618

995 #, c-format

996 msgid "Split into %d hunks."

997 msgstr "分割為 %d 塊。"

998

999 -#: add-patch.c:1574

999 +#: add-patch.c:1622

1000 msgid "Sorry, cannot edit this hunk"

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

1002

1003 -#: add-patch.c:1625

1003 +#: add-patch.c:1674

1004 msgid "'git apply' failed"

1005 msgstr "'git apply' 失敗"

1006

@@ -1055,7 +1055,7 @@ msgstr ""

1055 msgid "Exiting because of an unresolved conflict."

1056 msgstr "因為存在未解決的衝突而離開。"

1057

1058 -#: advice.c:278 builtin/merge.c:1353

1058 +#: advice.c:278 builtin/merge.c:1349

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

1060 msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"

1061

@@ -1344,7 +1344,7 @@ msgstr "打修補檔失敗：%s:%ld"

1344 msgid "cannot checkout %s"

1345 msgstr "不能檢出 %s"

1346

1347 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

1347 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308

1348 #, c-format

1349 msgid "failed to read %s"

1350 msgstr "無法讀取 %s"

@@ -1364,7 +1364,7 @@ msgstr "路徑 %s 已經被重新命名/刪除"

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

1365 msgstr "%s：不存在於索引中"

1366

1367 -#: apply.c:3537 apply.c:3708

1367 +#: apply.c:3537 apply.c:3708 apply.c:3953

1368 #, c-format

1369 msgid "%s: does not match index"

1370 msgstr "%s：和索引不符合"

@@ -1412,356 +1412,351 @@ msgstr "%s：錯誤類型"

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

1413 msgstr "%s 的類型是 %o，應為 %o"

1414

1415 -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856

1416 -#: read-cache.c:1325

1415 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858

1416 +#: read-cache.c:1313

1417 #, c-format

1418 msgid "invalid path '%s'"

1419 msgstr "無效路徑 '%s'"

1420

1421 -#: apply.c:3936

1421 +#: apply.c:3950

1422 #, c-format

1423 msgid "%s: already exists in index"

1424 msgstr "%s：已經存在於索引中"

1425

1426 -#: apply.c:3939

1426 +#: apply.c:3956

1427 #, c-format

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

1429 msgstr "%s：已經存在於工作區中"

1430

1431 -#: apply.c:3959

1431 +#: apply.c:3976

1432 #, c-format

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

1434 msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"

1435

1436 -#: apply.c:3964

1436 +#: apply.c:3981

1437 #, c-format

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

1439 msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"

1440

1441 -#: apply.c:3984

1441 +#: apply.c:4001

1442 #, c-format

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

1444 msgstr "受影響的檔案 '%s' 位於符號連結中"

1445

1446 -#: apply.c:3988

1446 +#: apply.c:4005

1447 #, c-format

1448 msgid "%s: patch does not apply"

1449 msgstr "%s：修補檔未套用"

1450

1451 -#: apply.c:4003

1451 +#: apply.c:4020

1452 #, c-format

1453 msgid "Checking patch %s..."

1454 msgstr "正在檢查修補檔 %s..."

1455

1456 -#: apply.c:4095

1456 +#: apply.c:4112

1457 #, c-format

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

1459 msgstr "子模組 %s 的 sha1 訊息缺少或無效"

1460

1461 -#: apply.c:4102

1461 +#: apply.c:4119

1462 #, c-format

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

1464 msgstr "%s 的模式變更，但它不在目前 HEAD 中"

1465

1466 -#: apply.c:4105

1466 +#: apply.c:4122

1467 #, c-format

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

1469 msgstr "sha1 訊息缺少或無效（%s）。"

1470

1471 -#: apply.c:4114

1471 +#: apply.c:4131

1472 #, c-format

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

1474 msgstr "不能在暫時索引中新增 %s"

1475

1476 -#: apply.c:4124

1476 +#: apply.c:4141

1477 #, c-format

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

1479 msgstr "不能把暫時索引寫入到 %s"

1480

1481 -#: apply.c:4262

1481 +#: apply.c:4279

1482 #, c-format

1483 msgid "unable to remove %s from index"

1484 msgstr "不能從索引中移除 %s"

1485

1486 -#: apply.c:4296

1486 +#: apply.c:4313

1487 #, c-format

1488 msgid "corrupt patch for submodule %s"

1489 msgstr "子模組 %s 損壞的修補檔"

1490

1491 -#: apply.c:4302

1491 +#: apply.c:4319

1492 #, c-format

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

1494 msgstr "不能對建立檔案 '%s' 呼叫 stat"

1495

1496 -#: apply.c:4310

1496 +#: apply.c:4327

1497 #, c-format

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

1499 msgstr "不能為建立檔案 %s 建立後端儲存"

1500

1501 -#: apply.c:4316 apply.c:4461

1501 +#: apply.c:4333 apply.c:4478

1502 #, c-format

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

1504 msgstr "無法為 %s 新增快取條目"

1505

1506 -#: apply.c:4359

1506 +#: apply.c:4376 builtin/bisect--helper.c:537

1507 #, c-format

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

1509 msgstr "寫入 '%s' 失敗"

1510

1511 -#: apply.c:4363

1511 +#: apply.c:4380

1512 #, c-format

1513 msgid "closing file '%s'"

1514 msgstr "關閉檔案 '%s'"

1515

1516 -#: apply.c:4433

1516 +#: apply.c:4450

1517 #, c-format

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

1519 msgstr "不能寫入檔案 '%s' 權限 %o"

1520

1521 -#: apply.c:4531

1521 +#: apply.c:4548

1522 #, c-format

1523 msgid "Applied patch %s cleanly."

1524 msgstr "成功套用修補檔 %s。"

1525

1526 -#: apply.c:4539

1526 +#: apply.c:4556

1527 msgid "internal error"

1528 msgstr "內部錯誤"

1529

1530 -#: apply.c:4542

1530 +#: apply.c:4559

1531 #, c-format

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

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

1534 msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."

1535

1536 -#: apply.c:4553

1536 +#: apply.c:4570

1537 #, c-format

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

1539 msgstr "截短 .rej 檔案名為 %.*s.rej"

1540

1541 -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1541 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228

1542 #, c-format

1543 msgid "cannot open %s"

1544 msgstr "不能開啟 %s"

1545

1546 -#: apply.c:4575

1546 +#: apply.c:4592

1547 #, c-format

1548 msgid "Hunk #%d applied cleanly."

1549 msgstr "第 #%d 個片段成功應用。"

1550

1551 -#: apply.c:4579

1551 +#: apply.c:4596

1552 #, c-format

1553 msgid "Rejected hunk #%d."

1554 msgstr "拒絕第 #%d 個片段。"

1555

1556 -#: apply.c:4698

1556 +#: apply.c:4715

1557 #, c-format

1558 msgid "Skipped patch '%s'."

1559 msgstr "略過修補檔 '%s'。"

1560

1561 -#: apply.c:4706

1561 +#: apply.c:4723

1562 msgid "unrecognized input"

1563 msgstr "無法識別的輸入"

1564

1565 -#: apply.c:4726

1565 +#: apply.c:4743

1566 msgid "unable to read index file"

1567 msgstr "無法讀取索引檔案"

1568

1569 -#: apply.c:4883

1569 +#: apply.c:4900

1570 #, c-format

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

1572 msgstr "不能開啟修補檔 '%s'：%s"

1573

1574 -#: apply.c:4910

1574 +#: apply.c:4927

1575 #, c-format

1576 msgid "squelched %d whitespace error"

1577 msgid_plural "squelched %d whitespace errors"

1578 msgstr[0] "抑制下仍有 %d 個空白字元誤用"

1579

1580 -#: apply.c:4916 apply.c:4931

1580 +#: apply.c:4933 apply.c:4948

1581 #, c-format

1582 msgid "%d line adds whitespace errors."

1583 msgid_plural "%d lines add whitespace errors."

1584 msgstr[0] "%d 行新增了空白字元誤用。"

1585

1586 -#: apply.c:4924

1586 +#: apply.c:4941

1587 #, c-format

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

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

1590 msgstr[0] "修復空白錯誤後，應用了 %d 行。"

1591

1592 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406

1592 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1593 msgid "Unable to write new index file"

1594 msgstr "無法寫入新索引檔案"

1595

1596 -#: apply.c:4968

1596 +#: apply.c:4985

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

1598 msgstr "不要應用與給出路徑向符合的變更"

1599

1600 -#: apply.c:4971

1600 +#: apply.c:4988

1601 msgid "apply changes matching the given path"

1602 msgstr "應用與給出路徑向符合的變更"

1603

1604 -#: apply.c:4973 builtin/am.c:2259

1604 +#: apply.c:4990 builtin/am.c:2279

1605 msgid "num"

1606 msgstr "數字"

1607

1608 -#: apply.c:4974

1608 +#: apply.c:4991

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

1610 msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"

1611

1612 -#: apply.c:4977

1612 +#: apply.c:4994

1613 msgid "ignore additions made by the patch"

1614 msgstr "忽略修補檔中的新增的檔案"

1615

1616 -#: apply.c:4979

1616 +#: apply.c:4996

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

1618 msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"

1619

1620 -#: apply.c:4983

1620 +#: apply.c:5000

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

1622 msgstr "以十進位數顯示新增和刪除的行數"

1623

1624 -#: apply.c:4985

1624 +#: apply.c:5002

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

1626 msgstr "不套用修補檔，而是顯示輸入的概要"

1627

1628 -#: apply.c:4987

1628 +#: apply.c:5004

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

1630 msgstr "不套用修補檔，而是檢視修補檔是否可應用"

1631

1632 -#: apply.c:4989

1632 +#: apply.c:5006

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

1634 msgstr "確認修補檔可以套用到目前索引"

1635

1636 -#: apply.c:4991

1636 +#: apply.c:5008

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

1638 msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"

1639

1640 -#: apply.c:4993

1640 +#: apply.c:5010

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

1642 msgstr "套用修補檔而不修改工作區"

1643

1644 -#: apply.c:4995

1644 +#: apply.c:5012

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

1646 msgstr "接受修改工作區之外檔案的修補檔"

1647

1648 -#: apply.c:4998

1648 +#: apply.c:5015

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

1650 msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"

1651

1652 -#: apply.c:5000

1652 +#: apply.c:5017

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

1654 msgstr "如果一個修補檔不能應用則嘗試三方合併"

1655

1656 -#: apply.c:5002

1656 +#: apply.c:5019

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

1658 msgstr "建立一個暫時索引基於嵌入的索引訊息"

1659

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

1660 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525

1661 msgid "paths are separated with NUL character"

1662 msgstr "路徑以 NUL 字元分隔"

1663

1664 -#: apply.c:5007

1664 +#: apply.c:5024

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

1666 msgstr "確保至少符合 <n> 行上下文"

1667

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

1668 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98

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

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

1670 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340

1671 msgid "action"

1672 msgstr "動作"

1673

1674 -#: apply.c:5009

1674 +#: apply.c:5026

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

1676 msgstr "檢查新增和修改的行中間的空白字元濫用"

1677

1678 -#: apply.c:5012 apply.c:5015

1678 +#: apply.c:5029 apply.c:5032

1679 msgid "ignore changes in whitespace when finding context"

1680 msgstr "尋找上下文時忽略空白字元的變更"

1681

1682 -#: apply.c:5018

1682 +#: apply.c:5035

1683 msgid "apply the patch in reverse"

1684 msgstr "反向套用修補檔"

1685

1686 -#: apply.c:5020

1686 +#: apply.c:5037

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

1688 msgstr "無需至少一行上下文"

1689

1690 -#: apply.c:5022

1690 +#: apply.c:5039

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

1692 msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中"

1693

1694 -#: apply.c:5024

1694 +#: apply.c:5041

1695 msgid "allow overlapping hunks"

1696 msgstr "允許重疊的修補檔片段"

1697

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

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

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

1698 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22

1699 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1700 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128

1701 msgid "be verbose"

1702 msgstr "詳細輸出"

1703

1704 -#: apply.c:5027

1704 +#: apply.c:5044

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

1706 msgstr "允許不正確的檔案末尾換行符號"

1707

1708 -#: apply.c:5030

1708 +#: apply.c:5047

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

1710 msgstr "不信任修補檔片段的標頭訊息中的行號"

1711

1712 -#: apply.c:5032 builtin/am.c:2247

1712 +#: apply.c:5049 builtin/am.c:2267

1713 msgid "root"

1714 msgstr "根目錄"

1715

1716 -#: apply.c:5033

1716 +#: apply.c:5050

1717 msgid "prepend <root> to all filenames"

1718 msgstr "為所有檔案名前新增 <根目錄>"

1719

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

1720 +#: archive-tar.c:125 archive-zip.c:345

1721 #, c-format

1722 msgid "cannot stream blob %s"

1723 msgstr "不能開啟資料物件 %s"

1724

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

1725 +#: archive-tar.c:265 archive-zip.c:358

1726 #, c-format

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

1728 msgstr "不支援的檔案模式：0%o (SHA1: %s)"

1729

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

1731 -#, c-format

1732 -msgid "cannot read %s"

1733 -msgstr "不能讀取 %s"

1734 -

1735 -#: archive-tar.c:465

1730 +#: archive-tar.c:449

1731 #, c-format

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

1733 msgstr "無法啟動 '%s' 過濾器"

1734

1740 -#: archive-tar.c:468

1735 +#: archive-tar.c:452

1736 msgid "unable to redirect descriptor"

1737 msgstr "無法重定向描述符"

1738

1744 -#: archive-tar.c:475

1739 +#: archive-tar.c:459

1740 #, c-format

1741 msgid "'%s' filter reported error"

1742 msgstr "'%s' 過濾器報告了錯誤"

1743

1749 -#: archive-zip.c:319

1744 +#: archive-zip.c:318

1745 #, c-format

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

1747 msgstr "路徑不是有效的 UTF-8：%s"

1748

1754 -#: archive-zip.c:323

1749 +#: archive-zip.c:322

1750 #, c-format

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

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

1753

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

1754 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247

1755 #, c-format

1756 msgid "deflate error (%d)"

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

1758

1764 -#: archive-zip.c:615

1759 +#: archive-zip.c:603

1760 #, c-format

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

1762 msgstr "對於本系統時間戳太大：%<PRIuMAX>"

@@ -1784,119 +1779,149 @@ msgstr ""

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

1780 msgstr "git archive --remote <版本庫> [--exec <指令>] --list"

1781

1787 -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1782 +#: archive.c:192

1783 +#, c-format

1784 +msgid "cannot read %s"

1785 +msgstr "不能讀取 %s"

1786 +

1787 +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852

1788 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786

1789 +#: builtin/merge.c:1124

1790 +#, c-format

1791 +msgid "could not read '%s'"

1792 +msgstr "不能讀取 '%s'"

1793 +

1794 +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315

1795 #, c-format

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

1797 msgstr "路徑規格 '%s' 未符合任何檔案"

1798

1792 -#: archive.c:401

1799 +#: archive.c:454

1800 #, c-format

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

1802 msgstr "無此引用：%.*s"

1803

1797 -#: archive.c:407

1804 +#: archive.c:460

1805 #, c-format

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

1807 msgstr "不是一個有效的物件名：%s"

1808

1802 -#: archive.c:420

1809 +#: archive.c:473

1810 #, c-format

1811 msgid "not a tree object: %s"

1812 msgstr "不是一個樹狀物件：%s"

1813

1807 -#: archive.c:432

1814 +#: archive.c:485

1815 msgid "current working directory is untracked"

1816 msgstr "目前工作目錄未被追蹤"

1817

1811 -#: archive.c:464

1818 +#: archive.c:526

1819 +#, c-format

1820 +msgid "File not found: %s"

1821 +msgstr "找不到檔案：%s"

1822 +

1823 +#: archive.c:528

1824 +#, c-format

1825 +msgid "Not a regular file: %s"

1826 +msgstr "不是一般檔案：%s"

1827 +

1828 +#: archive.c:553

1829 msgid "fmt"

1830 msgstr "格式"

1831

1815 -#: archive.c:464

1832 +#: archive.c:553

1833 msgid "archive format"

1834 msgstr "歸檔格式"

1835

1819 -#: archive.c:465 builtin/log.c:1674

1836 +#: archive.c:554 builtin/log.c:1760

1837 msgid "prefix"

1838 msgstr "前綴"

1839

1823 -#: archive.c:466

1840 +#: archive.c:555

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

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

1843

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

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

1844 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888

1845 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133

1846 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1847 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105

1848 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1849 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1850 msgid "file"

1851 msgstr "檔案"

1852

1836 -#: archive.c:468 builtin/archive.c:90

1853 +#: archive.c:557

1854 +msgid "add untracked file to archive"

1855 +msgstr "將未追蹤檔案加入歸檔"

1856 +

1857 +#: archive.c:560 builtin/archive.c:90

1858 msgid "write the archive to this file"

1859 msgstr "歸檔寫入此檔案"

1860

1840 -#: archive.c:470

1861 +#: archive.c:562

1862 msgid "read .gitattributes in working directory"

1863 msgstr "讀取工作區中的 .gitattributes"

1864

1844 -#: archive.c:471

1865 +#: archive.c:563

1866 msgid "report archived files on stderr"

1867 msgstr "在標準錯誤上報告歸檔檔案"

1868

1848 -#: archive.c:472

1869 +#: archive.c:564

1870 msgid "store only"

1871 msgstr "只儲存"

1872

1852 -#: archive.c:473

1873 +#: archive.c:565

1874 msgid "compress faster"

1875 msgstr "壓縮速度更快"

1876

1856 -#: archive.c:481

1877 +#: archive.c:573

1878 msgid "compress better"

1879 msgstr "壓縮效果更好"

1880

1860 -#: archive.c:484

1881 +#: archive.c:576

1882 msgid "list supported archive formats"

1883 msgstr "列出支援的歸檔格式"

1884

1864 -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

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

1885 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1886 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1887 msgid "repo"

1888 msgstr "版本庫"

1889

1869 -#: archive.c:487 builtin/archive.c:92

1890 +#: archive.c:579 builtin/archive.c:92

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

1892 msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"

1893

1873 -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1894 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715

1895 #: builtin/notes.c:498

1896 msgid "command"

1897 msgstr "指令"

1898

1878 -#: archive.c:489 builtin/archive.c:94

1899 +#: archive.c:581 builtin/archive.c:94

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

1901 msgstr "遠端 git-upload-archive 指令的路徑"

1902

1882 -#: archive.c:496

1903 +#: archive.c:588

1904 msgid "Unexpected option --remote"

1905 msgstr "未知參數 --remote"

1906

1886 -#: archive.c:498

1907 +#: archive.c:590

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

1909 msgstr "選項 --exec 只能和 --remote 同時使用"

1910

1890 -#: archive.c:500

1911 +#: archive.c:592

1912 msgid "Unexpected option --output"

1913 msgstr "未知參數 --output"

1914

1894 -#: archive.c:522

1915 +#: archive.c:594

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

1917 +msgstr "--add-file 和 --remote 選項不能同時使用"

1918 +

1919 +#: archive.c:616

1920 #, c-format

1921 msgid "Unknown archive format '%s'"

1922 msgstr "未知歸檔格式 '%s'"

1923

1899 -#: archive.c:529

1924 +#: archive.c:623

1925 #, c-format

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

1927 msgstr "參數不支援此格式 '%s'：-%d"

@@ -1919,22 +1944,22 @@ msgstr ""

1944 "反向模式在 git attributes 中被忽略\n"

1945 "當字串確定要以驚嘆號開始時，使用 '\\!'。"

1946

1922 -#: bisect.c:468

1947 +#: bisect.c:476

1948 #, c-format

1949 msgid "Badly quoted content in file '%s': %s"

1950 msgstr "檔案 '%s' 包含錯誤的引用格式：%s"

1951

1927 -#: bisect.c:678

1952 +#: bisect.c:686

1953 #, c-format

1954 msgid "We cannot bisect more!\n"

1955 msgstr "我們無法進行更多的二分尋找！\n"

1956

1932 -#: bisect.c:745

1957 +#: bisect.c:753

1958 #, c-format

1959 msgid "Not a valid commit name %s"

1960 msgstr "不是一個有效的提交名 %s"

1961

1937 -#: bisect.c:770

1962 +#: bisect.c:778

1963 #, c-format

1964 msgid ""

1965 "The merge base %s is bad.\n"

@@ -1943,7 +1968,7 @@ msgstr ""

1968 "合併基礎 %s 是壞的。\n"

1969 "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"

1970

1946 -#: bisect.c:775

1971 +#: bisect.c:783

1972 #, c-format

1973 msgid ""

1974 "The merge base %s is new.\n"

@@ -1952,7 +1977,7 @@ msgstr ""

1977 "合併基礎 %s 是新的。\n"

1978 "介於 %s 和 [%s] 之間的屬性已經被修改。\n"

1979

1955 -#: bisect.c:780

1980 +#: bisect.c:788

1981 #, c-format

1982 msgid ""

1983 "The merge base %s is %s.\n"

@@ -1961,7 +1986,7 @@ msgstr ""

1986 "合併基礎 %s 是 %s。\n"

1987 "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"

1988

1964 -#: bisect.c:788

1989 +#: bisect.c:796

1990 #, c-format

1991 msgid ""

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

@@ -1972,7 +1997,7 @@ msgstr ""

1997 "這種情況下 git 二分尋找無法正常工作。\n"

1998 "您可能弄錯了 %s 和 %s 版本？\n"

1999

1975 -#: bisect.c:801

2000 +#: bisect.c:809

2001 #, c-format

2002 msgid ""

2003 "the merge base between %s and [%s] must be skipped.\n"

@@ -1983,36 +2008,36 @@ msgstr ""

2008 "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"

2009 "我們仍舊繼續。"

2010

1986 -#: bisect.c:840

2011 +#: bisect.c:848

2012 #, c-format

2013 msgid "Bisecting: a merge base must be tested\n"

2014 msgstr "二分尋找中：合併基礎必須是經過測試的\n"

2015

1991 -#: bisect.c:890

2016 +#: bisect.c:898

2017 #, c-format

2018 msgid "a %s revision is needed"

2019 msgstr "需要一個 %s 版本"

2020

1996 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

2021 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255

2022 #, c-format

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

2024 msgstr "不能建立檔案 '%s'"

2025

2001 -#: bisect.c:966 builtin/merge.c:151

2026 +#: bisect.c:974 builtin/merge.c:150

2027 #, c-format

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

2029 msgstr "不能讀取檔案 '%s'"

2030

2006 -#: bisect.c:997

2031 +#: bisect.c:1014

2032 msgid "reading bisect refs failed"

2033 msgstr "讀取二分尋找引用失敗"

2034

2010 -#: bisect.c:1019

2035 +#: bisect.c:1044

2036 #, c-format

2037 msgid "%s was both %s and %s\n"

2038 msgstr "%s 同時為 %s 和 %s\n"

2039

2015 -#: bisect.c:1028

2040 +#: bisect.c:1053

2041 #, c-format

2042 msgid ""

2043 "No testable commit found.\n"

@@ -2021,7 +2046,7 @@ msgstr ""

2046 "沒有發現可測試的提交。\n"

2047 "可能您在執行時使用了錯誤的路徑參數？\n"

2048

2024 -#: bisect.c:1057

2049 +#: bisect.c:1082

2050 #, c-format

2051 msgid "(roughly %d step)"

2052 msgid_plural "(roughly %d steps)"

@@ -2030,43 +2055,43 @@ msgstr[0] "（大概 %d 步）"

2055 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

2056 #. steps)" translation.

2057 #.

2033 -#: bisect.c:1063

2058 +#: bisect.c:1088

2059 #, c-format

2060 msgid "Bisecting: %d revision left to test after this %s\n"

2061 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

2062 msgstr[0] "二分尋找中：在此之後，還剩 %d 個版本待測試 %s\n"

2063

2039 -#: blame.c:2777

2064 +#: blame.c:2778

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

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

2067

2043 -#: blame.c:2791

2068 +#: blame.c:2792

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

2070 msgstr "不能將 --contents 和最終的提交物件名共用"

2071

2047 -#: blame.c:2812

2072 +#: blame.c:2813

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

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

2075

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

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

2055 -#: builtin/shortlog.c:192

2076 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105

2077 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404

2078 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319

2079 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

2080 +#: builtin/shortlog.c:320

2081 msgid "revision walk setup failed"

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

2083

2059 -#: blame.c:2839

2084 +#: blame.c:2840

2085 msgid ""

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

2087 msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"

2088

2064 -#: blame.c:2850

2089 +#: blame.c:2851

2090 #, c-format

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

2092 msgstr "在 %2$s 中無此路徑 %1$s"

2093

2069 -#: blame.c:2861

2094 +#: blame.c:2862

2095 #, c-format

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

2097 msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"

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

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

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

2231

2207 -#: bundle.c:47

2232 +#: bundle.c:41

2233 +#, c-format

2234 +msgid "unrecognized bundle hash algorithm: %s"

2235 +msgstr "無法識別的包雜湊演算法：%s"

2236 +

2237 +#: bundle.c:45

2238 #, c-format

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

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

2239 +msgid "unknown capability '%s'"

2240 +msgstr "未知功能 '%s'"

2241

2212 -#: bundle.c:69

2213 -msgid "unknown hash algorithm length"

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

2242 +#: bundle.c:71

2243 +#, c-format

2244 +msgid "'%s' does not look like a v2 or v3 bundle file"

2245 +msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案"

2246

2216 -#: bundle.c:84

2247 +#: bundle.c:110

2248 #, c-format

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

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

2251

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

2252 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142

2253 #: builtin/commit.c:814

2254 #, c-format

2255 msgid "could not open '%s'"

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

2257

2227 -#: bundle.c:163

2258 +#: bundle.c:189

2259 msgid "Repository lacks these prerequisite commits:"

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

2261

2231 -#: bundle.c:166

2262 +#: bundle.c:192

2263 msgid "need a repository to verify a bundle"

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

2265

2235 -#: bundle.c:217

2266 +#: bundle.c:243

2267 #, c-format

2268 msgid "The bundle contains this ref:"

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

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

2271

2241 -#: bundle.c:224

2272 +#: bundle.c:250

2273 msgid "The bundle records a complete history."

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

2275

2245 -#: bundle.c:226

2276 +#: bundle.c:252

2277 #, c-format

2278 msgid "The bundle requires this ref:"

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

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

2281

2251 -#: bundle.c:293

2282 +#: bundle.c:319

2283 msgid "unable to dup bundle descriptor"

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

2285

2255 -#: bundle.c:300

2286 +#: bundle.c:326

2287 msgid "Could not spawn pack-objects"

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

2289

2259 -#: bundle.c:311

2290 +#: bundle.c:337

2291 msgid "pack-objects died"

2292 msgstr "pack-objects 終止"

2293

2263 -#: bundle.c:353

2294 +#: bundle.c:379

2295 msgid "rev-list died"

2296 msgstr "rev-list 終止"

2297

2267 -#: bundle.c:402

2298 +#: bundle.c:428

2299 #, c-format

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

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

2302

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

2303 +#: bundle.c:498

2304 +#, c-format

2305 +msgid "unsupported bundle version %d"

2306 +msgstr "不支援的包版本 %d"

2307 +

2308 +#: bundle.c:500

2309 +#, c-format

2310 +msgid "cannot write bundle version %d with algorithm %s"

2311 +msgstr "無法寫入 %2$s 演算法的包版本 %1$d"

2312 +

2313 +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461

2314 #, c-format

2315 msgid "unrecognized argument: %s"

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

2317

2277 -#: bundle.c:489

2318 +#: bundle.c:530

2319 msgid "Refusing to create empty bundle."

2320 msgstr "不能建立空包。"

2321

2281 -#: bundle.c:499

2322 +#: bundle.c:540

2323 #, c-format

2324 msgid "cannot create '%s'"

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

2326

2286 -#: bundle.c:524

2327 +#: bundle.c:565

2328 msgid "index-pack died"

2329 msgstr "index-pack 終止"

2330

@@ -2292,265 +2333,262 @@ msgstr "index-pack 終止"

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

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

2335

2295 -#: commit-graph.c:238

2336 +#: commit-graph.c:188 midx.c:46

2337 +msgid "invalid hash version"

2338 +msgstr "無效的雜湊版本"

2339 +

2340 +#: commit-graph.c:246

2341 msgid "commit-graph file is too small"

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

2343

2299 -#: commit-graph.c:303

2344 +#: commit-graph.c:311

2345 #, c-format

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

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

2348

2304 -#: commit-graph.c:310

2349 +#: commit-graph.c:318

2350 #, c-format

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

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

2353

2309 -#: commit-graph.c:317

2354 +#: commit-graph.c:325

2355 #, c-format

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

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

2358

2314 -#: commit-graph.c:339

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

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

2359 +#: commit-graph.c:342

2360 +#, c-format

2361 +msgid "commit-graph file is too small to hold %u chunks"

2362 +msgstr "commit-graph 檔案不夠放置 %u 個區塊"

2363

2318 -#: commit-graph.c:349

2364 +#: commit-graph.c:361

2365 #, c-format

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

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

2368

2323 -#: commit-graph.c:417

2369 +#: commit-graph.c:433

2370 #, c-format

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

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

2373

2328 -#: commit-graph.c:491

2374 +#: commit-graph.c:499

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

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

2377

2332 -#: commit-graph.c:501

2378 +#: commit-graph.c:509

2379 msgid "commit-graph chain does not match"

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

2381

2336 -#: commit-graph.c:549

2382 +#: commit-graph.c:557

2383 #, c-format

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

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

2386

2341 -#: commit-graph.c:573

2387 +#: commit-graph.c:581

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

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

2390

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

2391 +#: commit-graph.c:721 commit-graph.c:785

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

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

2394

2349 -#: commit-graph.c:727

2395 +#: commit-graph.c:742

2396 #, c-format

2397 msgid "could not find commit %s"

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

2399

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

2400 +#: commit-graph.c:1042 builtin/am.c:1306

2401 #, c-format

2402 msgid "unable to parse commit %s"

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

2404

2359 -#: commit-graph.c:1157

2360 -msgid "Writing changed paths Bloom filters index"

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

2362 -

2363 -#: commit-graph.c:1182

2364 -msgid "Writing changed paths Bloom filters data"

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

2366 -

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

2405 +#: commit-graph.c:1265 builtin/pack-objects.c:2864

2406 #, c-format

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

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

2409

2372 -#: commit-graph.c:1257

2410 +#: commit-graph.c:1301

2411 msgid "Loading known commits in commit graph"

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

2413

2376 -#: commit-graph.c:1274

2414 +#: commit-graph.c:1318

2415 msgid "Expanding reachable commits in commit graph"

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

2417

2380 -#: commit-graph.c:1294

2418 +#: commit-graph.c:1338

2419 msgid "Clearing commit marks in commit graph"

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

2421

2384 -#: commit-graph.c:1313

2422 +#: commit-graph.c:1357

2423 msgid "Computing commit graph generation numbers"

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

2425

2388 -#: commit-graph.c:1367

2426 +#: commit-graph.c:1424

2427 msgid "Computing commit changed paths Bloom filters"

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

2429

2392 -#: commit-graph.c:1423

2430 +#: commit-graph.c:1501

2431 msgid "Collecting referenced commits"

2432 msgstr "正在收集引用提交"

2433

2396 -#: commit-graph.c:1447

2434 +#: commit-graph.c:1526

2435 #, c-format

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

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

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

2439

2402 -#: commit-graph.c:1460

2440 +#: commit-graph.c:1539

2441 #, c-format

2442 msgid "error adding pack %s"

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

2444

2407 -#: commit-graph.c:1464

2445 +#: commit-graph.c:1543

2446 #, c-format

2447 msgid "error opening index for %s"

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

2449

2412 -#: commit-graph.c:1503

2450 +#: commit-graph.c:1582

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

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

2453

2416 -#: commit-graph.c:1518

2454 +#: commit-graph.c:1597

2455 msgid "Counting distinct commits in commit graph"

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

2457

2420 -#: commit-graph.c:1550

2458 +#: commit-graph.c:1629

2459 msgid "Finding extra edges in commit graph"

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

2461

2424 -#: commit-graph.c:1599

2462 +#: commit-graph.c:1678

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

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

2465

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

2466 +#: commit-graph.c:1720 midx.c:826

2467 #, c-format

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

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

2470

2433 -#: commit-graph.c:1646

2471 +#: commit-graph.c:1733

2472 msgid "unable to create temporary graph layer"

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

2474

2437 -#: commit-graph.c:1651

2475 +#: commit-graph.c:1738

2476 #, c-format

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

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

2479

2442 -#: commit-graph.c:1728

2480 +#: commit-graph.c:1808

2481 #, c-format

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

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

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

2485

2448 -#: commit-graph.c:1773

2486 +#: commit-graph.c:1853

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

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

2489

2452 -#: commit-graph.c:1789

2490 +#: commit-graph.c:1869

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

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

2493

2456 -#: commit-graph.c:1809

2494 +#: commit-graph.c:1889

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

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

2497

2460 -#: commit-graph.c:1935

2498 +#: commit-graph.c:2015

2499 msgid "Scanning merged commits"

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

2501

2464 -#: commit-graph.c:1946

2502 +#: commit-graph.c:2026

2503 #, c-format

2504 msgid "unexpected duplicate commit id %s"

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

2506

2469 -#: commit-graph.c:1969

2507 +#: commit-graph.c:2049

2508 msgid "Merging commit-graph"

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

2510

2473 -#: commit-graph.c:2156

2511 +#: commit-graph.c:2259

2512 #, c-format

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

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

2515

2478 -#: commit-graph.c:2167

2516 +#: commit-graph.c:2270

2517 msgid "too many commits to write graph"

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

2519

2482 -#: commit-graph.c:2260

2520 +#: commit-graph.c:2363

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

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

2523

2486 -#: commit-graph.c:2270

2524 +#: commit-graph.c:2373

2525 #, c-format

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

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

2528

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

2529 +#: commit-graph.c:2383 commit-graph.c:2398

2530 #, c-format

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

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

2533

2496 -#: commit-graph.c:2287

2534 +#: commit-graph.c:2390

2535 #, c-format

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

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

2538

2501 -#: commit-graph.c:2305

2539 +#: commit-graph.c:2408

2540 msgid "Verifying commits in commit graph"

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

2542

2505 -#: commit-graph.c:2320

2543 +#: commit-graph.c:2423

2544 #, c-format

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

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

2547

2510 -#: commit-graph.c:2327

2548 +#: commit-graph.c:2430

2549 #, c-format

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

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

2552

2515 -#: commit-graph.c:2337

2553 +#: commit-graph.c:2440

2554 #, c-format

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

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

2557

2520 -#: commit-graph.c:2346

2558 +#: commit-graph.c:2449

2559 #, c-format

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

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

2562

2525 -#: commit-graph.c:2360

2563 +#: commit-graph.c:2463

2564 #, c-format

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

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

2567

2530 -#: commit-graph.c:2365

2568 +#: commit-graph.c:2468

2569 #, c-format

2570 msgid ""

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

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

2573

2536 -#: commit-graph.c:2369

2574 +#: commit-graph.c:2472

2575 #, c-format

2576 msgid ""

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

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

2579

2542 -#: commit-graph.c:2385

2580 +#: commit-graph.c:2488

2581 #, c-format

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

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

2584

2547 -#: commit-graph.c:2391

2585 +#: commit-graph.c:2494

2586 #, c-format

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

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

2589

2552 -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2553 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2590 +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417

2591 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457

2592 #, c-format

2593 msgid "could not parse %s"

2594 msgstr "不能解析 %s"

@@ -2652,7 +2690,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s"

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

2691 msgstr "鍵名沒有包含變數名：%s"

2692

2655 -#: config.c:408 sequencer.c:2456

2693 +#: config.c:408 sequencer.c:2547

2694 #, c-format

2695 msgid "invalid key: %s"

2696 msgstr "無效鍵名：%s"

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

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

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

2828

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

2829 +#: config.c:1533 builtin/pack-objects.c:3649

2830 #, c-format

2831 msgid "bad pack compression level %d"

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

@@ -2817,101 +2855,101 @@ msgstr "解析 %s 失敗"

2855 msgid "unable to parse command-line config"

2856 msgstr "無法解析指令列中的設定"

2857

2820 -#: config.c:2113

2858 +#: config.c:2122

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

2860 msgstr "在讀取設定檔案時遇到未知錯誤"

2861

2824 -#: config.c:2283

2862 +#: config.c:2296

2863 #, c-format

2864 msgid "Invalid %s: '%s'"

2865 msgstr "無效 %s：'%s'"

2866

2829 -#: config.c:2328

2867 +#: config.c:2341

2868 #, c-format

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

2870 msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"

2871

2834 -#: config.c:2374

2872 +#: config.c:2387

2873 #, c-format

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

2875 msgstr "無法解析指令列設定中的 '%s'"

2876

2839 -#: config.c:2376

2877 +#: config.c:2389

2878 #, c-format

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

2880 msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"

2881

2844 -#: config.c:2457

2882 +#: config.c:2470

2883 #, c-format

2884 msgid "invalid section name '%s'"

2885 msgstr "無效的小節名稱 '%s'"

2886

2849 -#: config.c:2489

2887 +#: config.c:2502

2888 #, c-format

2889 msgid "%s has multiple values"

2890 msgstr "%s 有多個取值"

2891

2854 -#: config.c:2518

2892 +#: config.c:2531

2893 #, c-format

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

2895 msgstr "寫入新的設定檔案 %s 失敗"

2896

2859 -#: config.c:2770 config.c:3094

2897 +#: config.c:2783 config.c:3107

2898 #, c-format

2899 msgid "could not lock config file %s"

2900 msgstr "不能鎖定設定檔案 %s"

2901

2864 -#: config.c:2781

2902 +#: config.c:2794

2903 #, c-format

2904 msgid "opening %s"

2905 msgstr "開啟 %s"

2906

2869 -#: config.c:2816 builtin/config.c:344

2907 +#: config.c:2829 builtin/config.c:354

2908 #, c-format

2909 msgid "invalid pattern: %s"

2910 msgstr "無效模式：%s"

2911

2874 -#: config.c:2841

2912 +#: config.c:2854

2913 #, c-format

2914 msgid "invalid config file %s"

2915 msgstr "無效的設定檔案 %s"

2916

2879 -#: config.c:2854 config.c:3107

2917 +#: config.c:2867 config.c:3120

2918 #, c-format

2919 msgid "fstat on %s failed"

2920 msgstr "對 %s 呼叫 fstat 失敗"

2921

2884 -#: config.c:2865

2922 +#: config.c:2878

2923 #, c-format

2924 msgid "unable to mmap '%s'"

2925 msgstr "不能 mmap '%s'"

2926

2889 -#: config.c:2874 config.c:3112

2927 +#: config.c:2887 config.c:3125

2928 #, c-format

2929 msgid "chmod on %s failed"

2930 msgstr "對 %s 呼叫 chmod 失敗"

2931

2894 -#: config.c:2959 config.c:3209

2932 +#: config.c:2972 config.c:3222

2933 #, c-format

2934 msgid "could not write config file %s"

2935 msgstr "不能寫入設定檔案 %s"

2936

2899 -#: config.c:2993

2937 +#: config.c:3006

2938 #, c-format

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

2940 msgstr "不能設定 '%s' 為 '%s'"

2941

2904 -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2942 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858

2943 #, c-format

2944 msgid "could not unset '%s'"

2945 msgstr "不能取消設定 '%s'"

2946

2909 -#: config.c:3085

2947 +#: config.c:3098

2948 #, c-format

2949 msgid "invalid section name: %s"

2950 msgstr "無效的小節名稱：%s"

2951

2914 -#: config.c:3252

2952 +#: config.c:3265

2953 #, c-format

2954 msgid "missing value for '%s'"

2955 msgstr "%s 的取值缺少"

@@ -3079,23 +3117,23 @@ msgstr "ssh 變體 'simple' 不支援設定埠"

3117 msgid "strange pathname '%s' blocked"

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

3119

3082 -#: connect.c:1407

3120 +#: connect.c:1408

3121 msgid "unable to fork"

3122 msgstr "無法 fork"

3123

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

3124 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45

3125 msgid "Checking connectivity"

3126 msgstr "正在檢查連通性"

3127

3090 -#: connected.c:121

3128 +#: connected.c:120

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

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

3131

3094 -#: connected.c:141

3132 +#: connected.c:144

3133 msgid "failed write to rev-list"

3134 msgstr "寫入 rev-list 失敗"

3135

3098 -#: connected.c:148

3136 +#: connected.c:149

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

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

3139

@@ -3168,56 +3206,56 @@ msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼"

3206 msgid "encoding '%s' from %s to %s and back is not the same"

3207 msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致"

3208

3171 -#: convert.c:668

3209 +#: convert.c:665

3210 #, c-format

3211 msgid "cannot fork to run external filter '%s'"

3212 msgstr "不能 fork 以執行外部過濾器 '%s'"

3213

3176 -#: convert.c:688

3214 +#: convert.c:685

3215 #, c-format

3216 msgid "cannot feed the input to external filter '%s'"

3217 msgstr "不能將輸入傳遞給外部過濾器 '%s'"

3218

3181 -#: convert.c:695

3219 +#: convert.c:692

3220 #, c-format

3221 msgid "external filter '%s' failed %d"

3222 msgstr "外部過濾器 '%s' 失敗碼 %d"

3223

3186 -#: convert.c:730 convert.c:733

3224 +#: convert.c:727 convert.c:730

3225 #, c-format

3226 msgid "read from external filter '%s' failed"

3227 msgstr "從外部過濾器 '%s' 讀取失敗"

3228

3191 -#: convert.c:736 convert.c:791

3229 +#: convert.c:733 convert.c:788

3230 #, c-format

3231 msgid "external filter '%s' failed"

3232 msgstr "外部過濾器 '%s' 失敗"

3233

3196 -#: convert.c:840

3234 +#: convert.c:837

3235 msgid "unexpected filter type"

3236 msgstr "意外的過濾類型"

3237

3200 -#: convert.c:851

3238 +#: convert.c:848

3239 msgid "path name too long for external filter"

3240 msgstr "外部過濾器的路徑名太長"

3241

3204 -#: convert.c:943

3242 +#: convert.c:940

3243 #, c-format

3244 msgid ""

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

3246 "been filtered"

3247 msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"

3248

3211 -#: convert.c:1243

3249 +#: convert.c:1240

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

3251 msgstr "true/false 不是有效的工作區編碼"

3252

3215 -#: convert.c:1431 convert.c:1465

3253 +#: convert.c:1428 convert.c:1462

3254 #, c-format

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

3256 msgstr "%s：clean 過濾器 '%s' 失敗"

3257

3220 -#: convert.c:1511

3258 +#: convert.c:1508

3259 #, c-format

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

3261 msgstr "%s：smudge 過濾器 %s 失敗"

@@ -3235,17 +3273,17 @@ msgstr "拒絕使用缺少主機欄位的憑證"

3273 msgid "refusing to work with credential missing protocol field"

3274 msgstr "拒絕使用缺少通訊協定欄位的憑證"

3275

3238 -#: credential.c:396

3276 +#: credential.c:394

3277 #, c-format

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

3279 msgstr "URL 的 %s 部分有換行：%s"

3280

3243 -#: credential.c:440

3281 +#: credential.c:438

3282 #, c-format

3283 msgid "url has no scheme: %s"

3284 msgstr "URL 沒有 Scheme：%s"

3285

3248 -#: credential.c:513

3286 +#: credential.c:511

3287 #, c-format

3288 msgid "credential url cannot be parsed: %s"

3289 msgstr "無法解析憑證 URL：%s"

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

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

3431 "%s"

3432

3395 -#: diff.c:4243

3433 +#: diff.c:4269

3434 #, c-format

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

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

3437

3400 -#: diff.c:4589

3438 +#: diff.c:4618

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

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

3441

3404 -#: diff.c:4592

3442 +#: diff.c:4621

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

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

3445

3408 -#: diff.c:4670

3446 +#: diff.c:4699

3447 msgid "--follow requires exactly one pathspec"

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

3449

3412 -#: diff.c:4718

3450 +#: diff.c:4747

3451 #, c-format

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

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

3454

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

3455 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279

3456 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3457 #, c-format

3458 msgid "%s expects a numerical value"

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

3460

3423 -#: diff.c:4755

3461 +#: diff.c:4784

3462 #, c-format

3463 msgid ""

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

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

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

3468 "%s"

3469

3432 -#: diff.c:4840

3470 +#: diff.c:4869

3471 #, c-format

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

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

3474

3437 -#: diff.c:4864

3475 +#: diff.c:4893

3476 #, c-format

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

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

3479

3442 -#: diff.c:4878

3480 +#: diff.c:4907

3481 #, c-format

3482 msgid "unable to resolve '%s'"

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

3484

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

3485 +#: diff.c:4957 diff.c:4963

3486 #, c-format

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

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

3489

3452 -#: diff.c:4946

3490 +#: diff.c:4975

3491 #, c-format

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

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

3494

3457 -#: diff.c:4967

3495 +#: diff.c:4996

3496 #, c-format

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

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

3499

3462 -#: diff.c:4986

3500 +#: diff.c:5015

3501 #, c-format

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

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

3504

3467 -#: diff.c:5026

3505 +#: diff.c:5055

3506 msgid ""

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

3508 "\"histogram\""

3509 msgstr ""

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

3511

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

3512 +#: diff.c:5091 diff.c:5111

3513 #, c-format

3514 msgid "invalid argument to %s"

3515 msgstr "%s 的參數無效"

3516

3479 -#: diff.c:5219

3517 +#: diff.c:5248

3518 #, c-format

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

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

3521

3484 -#: diff.c:5275

3522 +#: diff.c:5304

3523 #, c-format

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

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

3526

3489 -#: diff.c:5298

3527 +#: diff.c:5327

3528 msgid "Diff output format options"

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

3530

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

3531 +#: diff.c:5329 diff.c:5335

3532 msgid "generate patch"

3533 msgstr "生成修補檔"

3534

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

3535 +#: diff.c:5332 builtin/log.c:176

3536 msgid "suppress diff output"

3537 msgstr "不顯示差異輸出"

3538

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

3539 +#: diff.c:5337 diff.c:5451 diff.c:5458

3540 msgid "<n>"

3541 msgstr "<n>"

3542

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

3543 +#: diff.c:5338 diff.c:5341

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

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

3546

3509 -#: diff.c:5314

3547 +#: diff.c:5343

3548 msgid "generate the diff in raw format"

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

3550

3513 -#: diff.c:5317

3551 +#: diff.c:5346

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

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

3554

3517 -#: diff.c:5321

3555 +#: diff.c:5350

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

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

3558

3521 -#: diff.c:5325

3559 +#: diff.c:5354

3560 msgid "machine friendly --stat"

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

3562

3525 -#: diff.c:5328

3563 +#: diff.c:5357

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

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

3566

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

3567 +#: diff.c:5359 diff.c:5367

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

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

3570

3533 -#: diff.c:5331

3571 +#: diff.c:5360

3572 msgid ""

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

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

3575

3538 -#: diff.c:5335

3576 +#: diff.c:5364

3577 msgid "synonym for --dirstat=cumulative"

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

3579

3542 -#: diff.c:5339

3580 +#: diff.c:5368

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

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

3583

3546 -#: diff.c:5343

3584 +#: diff.c:5372

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

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

3587

3550 -#: diff.c:5346

3588 +#: diff.c:5375

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

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

3591

3554 -#: diff.c:5349

3592 +#: diff.c:5378

3593 msgid "show only names of changed files"

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

3595

3558 -#: diff.c:5352

3596 +#: diff.c:5381

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

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

3599

3562 -#: diff.c:5354

3600 +#: diff.c:5383

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

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

3603

3566 -#: diff.c:5355

3604 +#: diff.c:5384

3605 msgid "generate diffstat"

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

3607

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

3608 +#: diff.c:5386 diff.c:5389 diff.c:5392

3609 msgid "<width>"

3610 msgstr "<寬度>"

3611

3574 -#: diff.c:5358

3612 +#: diff.c:5387

3613 msgid "generate diffstat with a given width"

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

3615

3578 -#: diff.c:5361

3616 +#: diff.c:5390

3617 msgid "generate diffstat with a given name width"

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

3619

3582 -#: diff.c:5364

3620 +#: diff.c:5393

3621 msgid "generate diffstat with a given graph width"

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

3623

3586 -#: diff.c:5366

3624 +#: diff.c:5395

3625 msgid "<count>"

3626 msgstr "<次數>"

3627

3590 -#: diff.c:5367

3628 +#: diff.c:5396

3629 msgid "generate diffstat with limited lines"

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

3631

3594 -#: diff.c:5370

3632 +#: diff.c:5399

3633 msgid "generate compact summary in diffstat"

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

3635

3598 -#: diff.c:5373

3636 +#: diff.c:5402

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

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

3639

3602 -#: diff.c:5376

3640 +#: diff.c:5405

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

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

3643

3606 -#: diff.c:5378

3644 +#: diff.c:5407

3645 msgid "show colored diff"

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

3647

3610 -#: diff.c:5379

3648 +#: diff.c:5408

3649 msgid "<kind>"

3650 msgstr "<類型>"

3651

3614 -#: diff.c:5380

3652 +#: diff.c:5409

3653 msgid ""

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

3655 "diff"

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

3657

3620 -#: diff.c:5383

3658 +#: diff.c:5412

3659 msgid ""

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

3661 "--numstat"

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

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

3664 "符"

3665

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

3666 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527

3667 msgid "<prefix>"

3668 msgstr "<前綴>"

3669

3632 -#: diff.c:5387

3670 +#: diff.c:5416

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

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

3673

3636 -#: diff.c:5390

3674 +#: diff.c:5419

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

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

3677

3640 -#: diff.c:5393

3678 +#: diff.c:5422

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

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

3681

3644 -#: diff.c:5396

3682 +#: diff.c:5425

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

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

3685

3648 -#: diff.c:5399

3686 +#: diff.c:5428

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

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

3689

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

3690 +#: diff.c:5432 diff.c:5437 diff.c:5442

3691 msgid "<char>"

3692 msgstr "<字元>"

3693

3656 -#: diff.c:5404

3694 +#: diff.c:5433

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

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

3697

3660 -#: diff.c:5409

3698 +#: diff.c:5438

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

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

3701

3664 -#: diff.c:5414

3702 +#: diff.c:5443

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

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

3705

3668 -#: diff.c:5417

3706 +#: diff.c:5446

3707 msgid "Diff rename options"

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

3709

3672 -#: diff.c:5418

3710 +#: diff.c:5447

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

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

3713

3676 -#: diff.c:5419

3714 +#: diff.c:5448

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

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

3717

3680 -#: diff.c:5423

3718 +#: diff.c:5452

3719 msgid "detect renames"

3720 msgstr "檢測重新命名"

3721

3684 -#: diff.c:5427

3722 +#: diff.c:5456

3723 msgid "omit the preimage for deletes"

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

3725

3688 -#: diff.c:5430

3726 +#: diff.c:5459

3727 msgid "detect copies"

3728 msgstr "檢測複製"

3729

3692 -#: diff.c:5434

3730 +#: diff.c:5463

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

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

3733

3696 -#: diff.c:5436

3734 +#: diff.c:5465

3735 msgid "disable rename detection"

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

3737

3700 -#: diff.c:5439

3738 +#: diff.c:5468

3739 msgid "use empty blobs as rename source"

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

3741

3704 -#: diff.c:5441

3742 +#: diff.c:5470

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

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

3745

3708 -#: diff.c:5444

3746 +#: diff.c:5473

3747 msgid ""

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

3749 "given limit"

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

3751

3714 -#: diff.c:5446

3752 +#: diff.c:5475

3753 msgid "Diff algorithm options"

3754 msgstr "差異演算法選項"

3755

3718 -#: diff.c:5448

3756 +#: diff.c:5477

3757 msgid "produce the smallest possible diff"

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

3759

3722 -#: diff.c:5451

3760 +#: diff.c:5480

3761 msgid "ignore whitespace when comparing lines"

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

3763

3726 -#: diff.c:5454

3764 +#: diff.c:5483

3765 msgid "ignore changes in amount of whitespace"

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

3767

3730 -#: diff.c:5457

3768 +#: diff.c:5486

3769 msgid "ignore changes in whitespace at EOL"

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

3771

3734 -#: diff.c:5460

3772 +#: diff.c:5489

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

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

3775

3738 -#: diff.c:5463

3776 +#: diff.c:5492

3777 msgid "ignore changes whose lines are all blank"

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

3779

3742 -#: diff.c:5466

3780 +#: diff.c:5495

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

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

3783

3746 -#: diff.c:5469

3784 +#: diff.c:5498

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

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

3787

3750 -#: diff.c:5473

3788 +#: diff.c:5502

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

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

3791

3754 -#: diff.c:5475

3792 +#: diff.c:5504

3793 msgid "<algorithm>"

3794 msgstr "<演算法>"

3795

3758 -#: diff.c:5476

3796 +#: diff.c:5505

3797 msgid "choose a diff algorithm"

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

3799

3762 -#: diff.c:5478

3800 +#: diff.c:5507

3801 msgid "<text>"

3802 msgstr "<文字>"

3803

3766 -#: diff.c:5479

3804 +#: diff.c:5508

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

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

3807

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

3808 +#: diff.c:5510 diff.c:5519 diff.c:5522

3809 msgid "<mode>"

3810 msgstr "<模式>"

3811

3774 -#: diff.c:5482

3812 +#: diff.c:5511

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

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

3815

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

3816 +#: diff.c:5513 diff.c:5516 diff.c:5561

3817 msgid "<regex>"

3818 msgstr "<正則>"

3819

3782 -#: diff.c:5485

3820 +#: diff.c:5514

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

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

3823

3786 -#: diff.c:5488

3824 +#: diff.c:5517

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

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

3827

3790 -#: diff.c:5491

3828 +#: diff.c:5520

3829 msgid "moved lines of code are colored differently"

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

3831

3794 -#: diff.c:5494

3832 +#: diff.c:5523

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

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

3835

3798 -#: diff.c:5497

3836 +#: diff.c:5526

3837 msgid "Other diff options"

3838 msgstr "其它差異選項"

3839

3802 -#: diff.c:5499

3840 +#: diff.c:5528

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

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

3843

3806 -#: diff.c:5503

3844 +#: diff.c:5532

3845 msgid "treat all files as text"

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

3847

3810 -#: diff.c:5505

3848 +#: diff.c:5534

3849 msgid "swap two inputs, reverse the diff"

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

3851

3814 -#: diff.c:5507

3852 +#: diff.c:5536

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

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

3855

3818 -#: diff.c:5509

3856 +#: diff.c:5538

3857 msgid "disable all output of the program"

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

3859

3822 -#: diff.c:5511

3860 +#: diff.c:5540

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

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

3862 +msgstr "允許執行一個外部的差異協助工具"

3863

3826 -#: diff.c:5513

3864 +#: diff.c:5542

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

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

3867

3830 -#: diff.c:5515

3868 +#: diff.c:5544

3869 msgid "<when>"

3870 msgstr "<何時>"

3871

3834 -#: diff.c:5516

3872 +#: diff.c:5545

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

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

3875

3838 -#: diff.c:5519

3876 +#: diff.c:5548

3877 msgid "<format>"

3878 msgstr "<格式>"

3879

3842 -#: diff.c:5520

3880 +#: diff.c:5549

3881 msgid "specify how differences in submodules are shown"

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

3883

3846 -#: diff.c:5524

3884 +#: diff.c:5553

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

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

3887

3850 -#: diff.c:5527

3888 +#: diff.c:5556

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

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

3891

3854 -#: diff.c:5529

3892 +#: diff.c:5558

3893 msgid "<string>"

3894 msgstr "<字串>"

3895

3858 -#: diff.c:5530

3896 +#: diff.c:5559

3897 msgid ""

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

3899 "string"

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

3901

3864 -#: diff.c:5533

3902 +#: diff.c:5562

3903 msgid ""

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

3905 "regex"

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

3907

3870 -#: diff.c:5536

3908 +#: diff.c:5565

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

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

3911

3874 -#: diff.c:5539

3912 +#: diff.c:5568

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

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

3915

3878 -#: diff.c:5542

3916 +#: diff.c:5571

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

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

3919

3882 -#: diff.c:5543

3920 +#: diff.c:5572

3921 msgid "<object-id>"

3922 msgstr "<物件 ID>"

3923

3886 -#: diff.c:5544

3924 +#: diff.c:5573

3925 msgid ""

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

3927 "object"

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

3929

3892 -#: diff.c:5546

3930 +#: diff.c:5575

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

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

3933

3896 -#: diff.c:5547

3934 +#: diff.c:5576

3935 msgid "select files by diff type"

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

3937

3900 -#: diff.c:5549

3938 +#: diff.c:5578

3939 msgid "<file>"

3940 msgstr "<檔案>"

3941

3904 -#: diff.c:5550

3942 +#: diff.c:5579

3943 msgid "Output to a specific file"

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

3945

3908 -#: diff.c:6205

3946 +#: diff.c:6236

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

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

3949

3912 -#: diff.c:6208

3950 +#: diff.c:6239

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

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

3953

3916 -#: diff.c:6211

3954 +#: diff.c:6242

3955 #, c-format

3956 msgid ""

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

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

3966 msgid "Performing inexact rename detection"

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

3968

3931 -#: dir.c:573

3969 +#: dir.c:578

3970 #, c-format

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

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

3973

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

3974 +#: dir.c:718 dir.c:747 dir.c:760

3975 #, c-format

3976 msgid "unrecognized pattern: '%s'"

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

3978

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

3979 +#: dir.c:777 dir.c:791

3980 #, c-format

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

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

3983

3946 -#: dir.c:804

3984 +#: dir.c:809

3985 #, c-format

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

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

3988

3951 -#: dir.c:814

3989 +#: dir.c:819

3990 msgid "disabling cone pattern matching"

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

3992

3955 -#: dir.c:1191

3993 +#: dir.c:1198

3994 #, c-format

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

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

3997

3960 -#: dir.c:2296

3998 +#: dir.c:2305

3999 #, c-format

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

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

4002

3965 -#: dir.c:2596

4003 +#: dir.c:2605

4004 msgid "failed to get kernel name and information"

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

4006

3969 -#: dir.c:2720

4007 +#: dir.c:2729

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

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

4010

3973 -#: dir.c:3502

4011 +#: dir.c:3520

4012 #, c-format

4013 msgid "index file corrupt in repo %s"

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

4015

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

4016 +#: dir.c:3565 dir.c:3570

4017 #, c-format

4018 msgid "could not create directories for %s"

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

4020

3983 -#: dir.c:3581

4021 +#: dir.c:3599

4022 #, c-format

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

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

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

4052 msgid "too many args to run %s"

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

4054

4017 -#: fetch-pack.c:152

4055 +#: fetch-pack.c:176

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

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

4058

4021 -#: fetch-pack.c:155

4059 +#: fetch-pack.c:179

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

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

4062

4025 -#: fetch-pack.c:166

4063 +#: fetch-pack.c:190

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

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

4066

4029 -#: fetch-pack.c:186

4067 +#: fetch-pack.c:210

4068 #, c-format

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

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

4071

4034 -#: fetch-pack.c:197

4072 +#: fetch-pack.c:221

4073 msgid "unable to write to remote"

4074 msgstr "無法寫到遠端"

4075

4038 -#: fetch-pack.c:259

4076 +#: fetch-pack.c:282

4077 msgid "--stateless-rpc requires multi_ack_detailed"

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

4079

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

4080 +#: fetch-pack.c:375 fetch-pack.c:1397

4081 #, c-format

4082 msgid "invalid shallow line: %s"

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

4084

4047 -#: fetch-pack.c:364 fetch-pack.c:1414

4085 +#: fetch-pack.c:381 fetch-pack.c:1403

4086 #, c-format

4087 msgid "invalid unshallow line: %s"

4088 msgstr "無效的 unshallow 訊息：%s"

4089

4052 -#: fetch-pack.c:366 fetch-pack.c:1416

4090 +#: fetch-pack.c:383 fetch-pack.c:1405

4091 #, c-format

4092 msgid "object not found: %s"

4093 msgstr "物件未找到：%s"

4094

4057 -#: fetch-pack.c:369 fetch-pack.c:1419

4095 +#: fetch-pack.c:386 fetch-pack.c:1408

4096 #, c-format

4097 msgid "error in object: %s"

4098 msgstr "物件中發生錯誤：%s"

4099

4062 -#: fetch-pack.c:371 fetch-pack.c:1421

4100 +#: fetch-pack.c:388 fetch-pack.c:1410

4101 #, c-format

4102 msgid "no shallow found: %s"

4103 msgstr "未發現 shallow：%s"

4104

4067 -#: fetch-pack.c:374 fetch-pack.c:1425

4105 +#: fetch-pack.c:391 fetch-pack.c:1414

4106 #, c-format

4107 msgid "expected shallow/unshallow, got %s"

4108 msgstr "應為 shallow/unshallow，卻得到 %s"

4109

4072 -#: fetch-pack.c:416

4110 +#: fetch-pack.c:431

4111 #, c-format

4112 msgid "got %s %d %s"

4113 msgstr "得到 %s %d %s"

4114

4077 -#: fetch-pack.c:433

4115 +#: fetch-pack.c:448

4116 #, c-format

4117 msgid "invalid commit %s"

4118 msgstr "無效提交 %s"

4119

4082 -#: fetch-pack.c:464

4120 +#: fetch-pack.c:479

4121 msgid "giving up"

4122 msgstr "放棄"

4123

4086 -#: fetch-pack.c:477 progress.c:336

4124 +#: fetch-pack.c:492 progress.c:339

4125 msgid "done"

4126 msgstr "完成"

4127

4090 -#: fetch-pack.c:489

4128 +#: fetch-pack.c:504

4129 #, c-format

4130 msgid "got %s (%d) %s"

4131 msgstr "得到 %s (%d) %s"

4132

4095 -#: fetch-pack.c:535

4133 +#: fetch-pack.c:540

4134 #, c-format

4135 msgid "Marking %s as complete"

4136 msgstr "標記 %s 為完成"

4137

4100 -#: fetch-pack.c:756

4138 +#: fetch-pack.c:755

4139 #, c-format

4140 msgid "already have %s (%s)"

4141 msgstr "已經有 %s（%s）"

4142

4105 -#: fetch-pack.c:821

4143 +#: fetch-pack.c:824

4144 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4145 msgstr "fetch-pack：無法衍生 sideband 多路輸出"

4146

4109 -#: fetch-pack.c:829

4147 +#: fetch-pack.c:832

4148 msgid "protocol error: bad pack header"

4149 msgstr "協定錯誤：壞的包頭"

4150

4113 -#: fetch-pack.c:910

4151 +#: fetch-pack.c:916

4152 #, c-format

4153 msgid "fetch-pack: unable to fork off %s"

4154 msgstr "fetch-pack：無法衍生進程 %s"

4155

4118 -#: fetch-pack.c:927

4156 +#: fetch-pack.c:933

4157 #, c-format

4158 msgid "%s failed"

4159 msgstr "%s 失敗"

4160

4123 -#: fetch-pack.c:929

4161 +#: fetch-pack.c:935

4162 msgid "error in sideband demultiplexer"

4163 msgstr "sideband 多路輸出發生錯誤"

4164

4127 -#: fetch-pack.c:976

4165 +#: fetch-pack.c:978

4166 #, c-format

4167 msgid "Server version is %.*s"

4168 msgstr "伺服器版本 %.*s"

4169

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

4170 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998

4171 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014

4172 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030

4173 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052

4174 #, c-format

4175 msgid "Server supports %s"

4176 msgstr "伺服器支援 %s"

4177

4140 -#: fetch-pack.c:983

4178 +#: fetch-pack.c:985

4179 msgid "Server does not support shallow clients"

4180 msgstr "伺服器不支援 shalllow 用戶端"

4181

4144 -#: fetch-pack.c:1043

4182 +#: fetch-pack.c:1045

4183 msgid "Server does not support --shallow-since"

4184 msgstr "伺服器不支援 --shallow-since"

4185

4148 -#: fetch-pack.c:1048

4186 +#: fetch-pack.c:1050

4187 msgid "Server does not support --shallow-exclude"

4188 msgstr "伺服器不支援 --shallow-exclude"

4189

4152 -#: fetch-pack.c:1052

4190 +#: fetch-pack.c:1054

4191 msgid "Server does not support --deepen"

4192 msgstr "伺服器不支援 --deepen"

4193

4156 -#: fetch-pack.c:1054

4194 +#: fetch-pack.c:1056

4195 msgid "Server does not support this repository's object format"

4196 msgstr "伺服器不支援此版本庫的物件格式"

4197

4160 -#: fetch-pack.c:1071

4198 +#: fetch-pack.c:1069

4199 msgid "no common commits"

4200 msgstr "沒有共同的提交"

4201

4164 -#: fetch-pack.c:1083 fetch-pack.c:1639

4202 +#: fetch-pack.c:1081 fetch-pack.c:1619

4203 msgid "git fetch-pack: fetch failed."

4204 msgstr "git fetch-pack：取得失敗。"

4205

4168 -#: fetch-pack.c:1211

4206 +#: fetch-pack.c:1205

4207 #, c-format

4208 msgid "mismatched algorithms: client %s; server %s"

4209 msgstr "算法不一致：用戶端 %s；伺服器 %s"

4210

4173 -#: fetch-pack.c:1215

4211 +#: fetch-pack.c:1209

4212 #, c-format

4213 msgid "the server does not support algorithm '%s'"

4214 msgstr "伺服器不支援「%s」算法"

4215

4178 -#: fetch-pack.c:1235

4216 +#: fetch-pack.c:1229

4217 msgid "Server does not support shallow requests"

4218 msgstr "伺服器不支援 shalllow 請求"

4219

4182 -#: fetch-pack.c:1242

4220 +#: fetch-pack.c:1236

4221 msgid "Server supports filter"

4222 msgstr "伺服器支援 filter"

4223

4186 -#: fetch-pack.c:1286

4224 +#: fetch-pack.c:1275

4225 msgid "unable to write request to remote"

4226 msgstr "無法將請求寫到遠端"

4227

4190 -#: fetch-pack.c:1304

4228 +#: fetch-pack.c:1293

4229 #, c-format

4230 msgid "error reading section header '%s'"

4231 msgstr "讀取節標題 '%s' 發生錯誤"

4232

4195 -#: fetch-pack.c:1310

4233 +#: fetch-pack.c:1299

4234 #, c-format

4235 msgid "expected '%s', received '%s'"

4236 msgstr "預期 '%s'，得到 '%s'"

4237

4200 -#: fetch-pack.c:1371

4238 +#: fetch-pack.c:1360

4239 #, c-format

4240 msgid "unexpected acknowledgment line: '%s'"

4241 msgstr "意外的確認行：'%s'"

4242

4205 -#: fetch-pack.c:1376

4243 +#: fetch-pack.c:1365

4244 #, c-format

4245 msgid "error processing acks: %d"

4246 msgstr "處理 ack 發生錯誤：%d"

4247

4210 -#: fetch-pack.c:1386

4248 +#: fetch-pack.c:1375

4249 msgid "expected packfile to be sent after 'ready'"

4250 msgstr "預期在 'ready' 之後傳送 packfile"

4251

4214 -#: fetch-pack.c:1388

4252 +#: fetch-pack.c:1377

4253 msgid "expected no other sections to be sent after no 'ready'"

4254 msgstr "在沒有 'ready' 不應該傳送其它小節"

4255

4218 -#: fetch-pack.c:1430

4256 +#: fetch-pack.c:1419

4257 #, c-format

4258 msgid "error processing shallow info: %d"

4259 msgstr "處理淺複製訊息發生錯誤：%d"

4260

4223 -#: fetch-pack.c:1477

4261 +#: fetch-pack.c:1466

4262 #, c-format

4263 msgid "expected wanted-ref, got '%s'"

4264 msgstr "預期 wanted-ref，得到 '%s'"

4265

4228 -#: fetch-pack.c:1482

4266 +#: fetch-pack.c:1471

4267 #, c-format

4268 msgid "unexpected wanted-ref: '%s'"

4269 msgstr "意外的 wanted-ref：'%s'"

4270

4233 -#: fetch-pack.c:1487

4271 +#: fetch-pack.c:1476

4272 #, c-format

4273 msgid "error processing wanted refs: %d"

4274 msgstr "處理要取得的引用發生錯誤：%d"

4275

4238 -#: fetch-pack.c:1517

4276 +#: fetch-pack.c:1506

4277 msgid "git fetch-pack: expected response end packet"

4278 msgstr "git fetch-pack: 預期要有回應結束封包"

4279

4242 -#: fetch-pack.c:1921

4280 +#: fetch-pack.c:1887

4281 msgid "no matching remote head"

4282 msgstr "沒有符合的遠端分支"

4283

4246 -#: fetch-pack.c:1944 builtin/clone.c:692

4284 +#: fetch-pack.c:1910 builtin/clone.c:692

4285 msgid "remote did not send all necessary objects"

4286 msgstr "遠端沒有傳送所有必需的物件"

4287

4250 -#: fetch-pack.c:1971

4288 +#: fetch-pack.c:1937

4289 #, c-format

4290 msgid "no such remote ref %s"

4291 msgstr "沒有這樣的遠端引用 %s"

4292

4255 -#: fetch-pack.c:1974

4293 +#: fetch-pack.c:1940

4294 #, c-format

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

4296 msgstr "伺服器不允許請求未公開的物件 %s"

@@ -4349,43 +4387,43 @@ msgstr "低級指令 / 同步版本庫"

4387

4388 #: help.c:38

4389 msgid "Low-level Commands / Internal Helpers"

4352 -msgstr "低級指令/內部助手"

4390 +msgstr "低級指令/內部協助工具"

4391

4354 -#: help.c:298

4392 +#: help.c:300

4393 #, c-format

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

4395 msgstr "在 '%s' 下可用的 git 指令"

4396

4359 -#: help.c:305

4397 +#: help.c:307

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

4399 msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"

4400

4363 -#: help.c:314

4401 +#: help.c:316

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

4403 msgstr "這些是各種場合常見的 Git 指令："

4404

4367 -#: help.c:363 git.c:99

4405 +#: help.c:365 git.c:99

4406 #, c-format

4407 msgid "unsupported command listing type '%s'"

4408 msgstr "不支援的指令列表類型 '%s'"

4409

4372 -#: help.c:403

4373 -msgid "The common Git guides are:"

4374 -msgstr "最常用的 Git 嚮導有："

4410 +#: help.c:405

4411 +msgid "The Git concept guides are:"

4412 +msgstr "Git 概念嚮導有："

4413

4376 -#: help.c:427

4414 +#: help.c:429

4415 msgid "See 'git help <command>' to read about a specific subcommand"

4416 msgstr "執行　'git help <command>' 來檢視特定子指令"

4417

4380 -#: help.c:432

4418 +#: help.c:434

4419 msgid "External commands"

4420 msgstr "外部指令"

4421

4384 -#: help.c:447

4422 +#: help.c:449

4423 msgid "Command aliases"

4424 msgstr "指令別名"

4425

4388 -#: help.c:511

4426 +#: help.c:513

4427 #, c-format

4428 msgid ""

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

@@ -4394,31 +4432,31 @@ msgstr ""

4432 "'%s' 像是一個 git 指令，但卻無法執行。\n"

4433 "可能是 git-%s 受損？"

4434

4397 -#: help.c:570

4435 +#: help.c:572

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

4437 msgstr "唉呀，您的系統中未發現 Git 指令。"

4438

4401 -#: help.c:592

4439 +#: help.c:594

4440 #, c-format

4441 msgid "WARNING: You called a Git command named '%s', which does not exist."

4442 msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"

4443

4406 -#: help.c:597

4444 +#: help.c:599

4445 #, c-format

4446 msgid "Continuing under the assumption that you meant '%s'."

4447 msgstr "假定你想要的是 '%s' 並繼續。"

4448

4411 -#: help.c:602

4449 +#: help.c:604

4450 #, c-format

4451 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4452 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"

4453

4416 -#: help.c:610

4454 +#: help.c:612

4455 #, c-format

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

4457 msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"

4458

4421 -#: help.c:614

4459 +#: help.c:616

4460 msgid ""

4461 "\n"

4462 "The most similar command is"

@@ -4429,16 +4467,16 @@ msgstr[0] ""

4467 "\n"

4468 "最類似的指令有"

4469

4432 -#: help.c:654

4470 +#: help.c:656

4471 msgid "git version [<options>]"

4472 msgstr "git version [<選項>]"

4473

4436 -#: help.c:709

4474 +#: help.c:711

4475 #, c-format

4476 msgid "%s: %s - %s"

4477 msgstr "%s：%s - %s"

4478

4441 -#: help.c:713

4479 +#: help.c:715

4480 msgid ""

4481 "\n"

4482 "Did you mean this?"

@@ -4449,7 +4487,15 @@ msgstr[0] ""

4487 "\n"

4488 "您指的是這個嗎？"

4489

4452 -#: ident.c:349

4490 +#: ident.c:353

4491 +msgid "Author identity unknown\n"

4492 +msgstr "作者身分未知\n"

4493 +

4494 +#: ident.c:356

4495 +msgid "Committer identity unknown\n"

4496 +msgstr "提交者身分未知\n"

4497 +

4498 +#: ident.c:362

4499 msgid ""

4500 "\n"

4501 "*** Please tell me who you are.\n"

@@ -4474,66 +4520,66 @@ msgstr ""

4520 "來設定您帳號的預設身份標記。\n"

4521 "如果僅在本版本庫設定身份標記，則省略 --global 參數。\n"

4522

4477 -#: ident.c:379

4523 +#: ident.c:397

4524 msgid "no email was given and auto-detection is disabled"

4525 msgstr "未提供信件位址且自動偵測被停用"

4526

4481 -#: ident.c:384

4527 +#: ident.c:402

4528 #, c-format

4529 msgid "unable to auto-detect email address (got '%s')"

4530 msgstr "無法自動偵測信件位址（得到 '%s'）"

4531

4486 -#: ident.c:401

4532 +#: ident.c:419

4533 msgid "no name was given and auto-detection is disabled"

4534 msgstr "未提供姓名且自動偵測被停用"

4535

4490 -#: ident.c:407

4536 +#: ident.c:425

4537 #, c-format

4538 msgid "unable to auto-detect name (got '%s')"

4539 msgstr "無法自動偵測姓名（得到 '%s'）"

4540

4495 -#: ident.c:415

4541 +#: ident.c:433

4542 #, c-format

4543 msgid "empty ident name (for <%s>) not allowed"

4544 msgstr "不允許空的姓名（對於 <%s>）"

4545

4500 -#: ident.c:421

4546 +#: ident.c:439

4547 #, c-format

4548 msgid "name consists only of disallowed characters: %s"

4549 msgstr "姓名中僅包含停用字元：%s"

4550

4505 -#: ident.c:436 builtin/commit.c:634

4551 +#: ident.c:454 builtin/commit.c:634

4552 #, c-format

4553 msgid "invalid date format: %s"

4554 msgstr "無效的日期格式：%s"

4555

4510 -#: list-objects-filter-options.c:58

4556 +#: list-objects-filter-options.c:81

4557 msgid "expected 'tree:<depth>'"

4558 msgstr "期望 'tree:<深度>'"

4559

4514 -#: list-objects-filter-options.c:73

4560 +#: list-objects-filter-options.c:96

4561 msgid "sparse:path filters support has been dropped"

4562 msgstr "sparse:path 過濾器支援已被刪除"

4563

4518 -#: list-objects-filter-options.c:86

4564 +#: list-objects-filter-options.c:109

4565 #, c-format

4566 msgid "invalid filter-spec '%s'"

4567 msgstr "無效的過濾器表達式 '%s'"

4568

4523 -#: list-objects-filter-options.c:102

4569 +#: list-objects-filter-options.c:125

4570 #, c-format

4571 msgid "must escape char in sub-filter-spec: '%c'"

4572 msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'"

4573

4528 -#: list-objects-filter-options.c:144

4574 +#: list-objects-filter-options.c:167

4575 msgid "expected something after combine:"

4576 msgstr "期望在組合後有一些東西："

4577

4532 -#: list-objects-filter-options.c:226

4578 +#: list-objects-filter-options.c:249

4579 msgid "multiple filter-specs cannot be combined"

4580 msgstr "不能混用多種過濾規格"

4581

4536 -#: list-objects-filter-options.c:330

4582 +#: list-objects-filter-options.c:361

4583 msgid "unable to upgrade repository format to support partial clone"

4584 msgstr "無法升級版本庫格式，以致不支援部分複製"

4585

@@ -4891,7 +4937,7 @@ msgstr "新增/新增"

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

4938 msgstr "略過 %s（已經做過相同合併）"

4939

4894 -#: merge-recursive.c:3101 git-submodule.sh:959

4940 +#: merge-recursive.c:3101

4941 msgid "submodule"

4942 msgstr "子模組"

4943

@@ -4977,21 +5023,21 @@ msgstr "已經是最新的！"

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

5024 msgstr "無法合併樹 %s 和 %s"

5025

4980 -#: merge-recursive.c:3549

5026 +#: merge-recursive.c:3550

5027 msgid "Merging:"

5028 msgstr "合併："

5029

4984 -#: merge-recursive.c:3562

5030 +#: merge-recursive.c:3563

5031 #, c-format

5032 msgid "found %u common ancestor:"

5033 msgid_plural "found %u common ancestors:"

5034 msgstr[0] "發現 %u 個共同祖先："

5035

4990 -#: merge-recursive.c:3612

5036 +#: merge-recursive.c:3613

5037 msgid "merge returned no commit"

5038 msgstr "合併未返回提交"

5039

4994 -#: merge-recursive.c:3671

5040 +#: merge-recursive.c:3672

5041 #, c-format

5042 msgid ""

5043 "Your local changes to the following files would be overwritten by merge:\n"

@@ -5000,12 +5046,12 @@ msgstr ""

5046 "您對下列檔案的本機修改將被合併動作覆蓋：\n"

5047 " %s"

5048

5003 -#: merge-recursive.c:3768

5049 +#: merge-recursive.c:3769

5050 #, c-format

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

5052 msgstr "不能解析物件 '%s'"

5053

5008 -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885

5054 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881

5055 msgid "Unable to write index."

5056 msgstr "不能寫入索引。"

5057

@@ -5013,170 +5059,174 @@ msgstr "不能寫入索引。"

5059 msgid "failed to read the cache"

5060 msgstr "讀取快取失敗"

5061

5016 -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

5017 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

5062 +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930

5063 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816

5064 #: builtin/stash.c:265

5065 msgid "unable to write new index file"

5066 msgstr "無法寫新的索引檔案"

5067

5022 -#: midx.c:68

5068 +#: midx.c:79

5069 #, c-format

5070 msgid "multi-pack-index file %s is too small"

5071 msgstr "多包索引檔案 %s 太小"

5072

5027 -#: midx.c:84

5073 +#: midx.c:95

5074 #, c-format

5075 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5076 msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"

5077

5032 -#: midx.c:89

5078 +#: midx.c:100

5079 #, c-format

5080 msgid "multi-pack-index version %d not recognized"

5081 msgstr "multi-pack-index 版本 %d 不能被識別"

5082

5037 -#: midx.c:94

5083 +#: midx.c:105

5084 #, c-format

5039 -msgid "hash version %u does not match"

5040 -msgstr "散列版本 %u 不符合"

5085 +msgid "multi-pack-index hash version %u does not match version %u"

5086 +msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"

5087

5042 -#: midx.c:108

5088 +#: midx.c:122

5089 msgid "invalid chunk offset (too large)"

5090 msgstr "無效的區塊位移（太大）"

5091

5046 -#: midx.c:132

5092 +#: midx.c:146

5093 msgid "terminating multi-pack-index chunk id appears earlier than expected"

5094 msgstr "終止多包索引區塊 id 出現時間早於預期"

5095

5050 -#: midx.c:145

5096 +#: midx.c:159

5097 msgid "multi-pack-index missing required pack-name chunk"

5098 msgstr "多包索引缺少必需的包名塊"

5099

5054 -#: midx.c:147

5100 +#: midx.c:161

5101 msgid "multi-pack-index missing required OID fanout chunk"

5102 msgstr "多包索引缺少必需的物件 ID 扇出塊"

5103

5058 -#: midx.c:149

5104 +#: midx.c:163

5105 msgid "multi-pack-index missing required OID lookup chunk"

5106 msgstr "多包索引缺少必需的物件 ID 查詢塊"

5107

5062 -#: midx.c:151

5108 +#: midx.c:165

5109 msgid "multi-pack-index missing required object offsets chunk"

5110 msgstr "多包索引缺少必需的物件位移塊"

5111

5066 -#: midx.c:165

5112 +#: midx.c:179

5113 #, c-format

5114 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5115 msgstr "多包索引包名無序：'%s' 在 '%s' 之前"

5116

5071 -#: midx.c:208

5117 +#: midx.c:222

5118 #, c-format

5119 msgid "bad pack-int-id: %u (%u total packs)"

5120 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"

5121

5076 -#: midx.c:258

5122 +#: midx.c:272

5123 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5124 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"

5125

5080 -#: midx.c:286

5126 +#: midx.c:300

5127 msgid "error preparing packfile from multi-pack-index"

5128 msgstr "從多包索引準備 packfile 時發生錯誤"

5129

5084 -#: midx.c:470

5130 +#: midx.c:485

5131 #, c-format

5132 msgid "failed to add packfile '%s'"

5133 msgstr "新增 packfile '%s' 失敗"

5134

5089 -#: midx.c:476

5135 +#: midx.c:491

5136 #, c-format

5137 msgid "failed to open pack-index '%s'"

5138 msgstr "開啟包索引 '%s' 失敗"

5139

5094 -#: midx.c:536

5140 +#: midx.c:551

5141 #, c-format

5142 msgid "failed to locate object %d in packfile"

5143 msgstr "在 packfile 中定位物件 %d 失敗"

5144

5099 -#: midx.c:840

5145 +#: midx.c:853

5146 msgid "Adding packfiles to multi-pack-index"

5147 msgstr "正在新增 packfile 至多包索引"

5148

5103 -#: midx.c:873

5149 +#: midx.c:886

5150 #, c-format

5151 msgid "did not see pack-file %s to drop"

5152 msgstr "沒有看到要捨棄的包檔案 %s"

5153

5108 -#: midx.c:925

5154 +#: midx.c:938

5155 msgid "no pack files to index."

5156 msgstr "沒有要索引的 pack 檔案。"

5157

5112 -#: midx.c:977

5158 +#: midx.c:990

5159 msgid "Writing chunks to multi-pack-index"

5160 msgstr "寫入區塊至多包索引"

5161

5116 -#: midx.c:1056

5162 +#: midx.c:1068

5163 #, c-format

5164 msgid "failed to clear multi-pack-index at %s"

5165 msgstr "清理位於 %s 的多包索引失敗"

5166

5121 -#: midx.c:1112

5167 +#: midx.c:1124

5168 +msgid "multi-pack-index file exists, but failed to parse"

5169 +msgstr "有 multi-pack-index 檔案，但無法解析"

5170 +

5171 +#: midx.c:1132

5172 msgid "Looking for referenced packfiles"

5173 msgstr "正在尋找引用的 packfile"

5174

5125 -#: midx.c:1127

5175 +#: midx.c:1147

5176 #, c-format

5177 msgid ""

5178 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5179 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5180

5131 -#: midx.c:1132

5181 +#: midx.c:1152

5182 msgid "the midx contains no oid"

5183 msgstr "midx 沒有 oid"

5184

5135 -#: midx.c:1141

5185 +#: midx.c:1161

5186 msgid "Verifying OID order in multi-pack-index"

5187 msgstr "正在驗證多包索引中的物件 ID 順序"

5188

5139 -#: midx.c:1150

5189 +#: midx.c:1170

5190 #, c-format

5191 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5192 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"

5193

5144 -#: midx.c:1170

5194 +#: midx.c:1190

5195 msgid "Sorting objects by packfile"

5196 msgstr "透過 packfile 為物件排序"

5197

5148 -#: midx.c:1177

5198 +#: midx.c:1197

5199 msgid "Verifying object offsets"

5200 msgstr "正在驗證物件位移"

5201

5152 -#: midx.c:1193

5202 +#: midx.c:1213

5203 #, c-format

5204 msgid "failed to load pack entry for oid[%d] = %s"

5205 msgstr "為 oid[%d] = %s 載入包條目失敗"

5206

5157 -#: midx.c:1199

5207 +#: midx.c:1219

5208 #, c-format

5209 msgid "failed to load pack-index for packfile %s"

5210 msgstr "為 packfile %s 載入包索引失敗"

5211

5162 -#: midx.c:1208

5212 +#: midx.c:1228

5213 #, c-format

5214 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5215 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"

5216

5167 -#: midx.c:1233

5217 +#: midx.c:1253

5218 msgid "Counting referenced objects"

5219 msgstr "正在計算引用物件"

5220

5171 -#: midx.c:1243

5221 +#: midx.c:1263

5222 msgid "Finding and deleting unreferenced packfiles"

5223 msgstr "正在尋找並刪除沒有參考的 packfile"

5224

5175 -#: midx.c:1433

5225 +#: midx.c:1454

5226 msgid "could not start pack-objects"

5227 msgstr "不能開始 pack-objects"

5228

5179 -#: midx.c:1452

5229 +#: midx.c:1474

5230 msgid "could not finish pack-objects"

5231 msgstr "不能結束 pack-objects"

5232

@@ -5259,7 +5309,7 @@ msgstr "不能解析物件：%s"

5309 msgid "hash mismatch %s"

5310 msgstr "雜湊值與 %s 不符合"

5311

5262 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

5312 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216

5313 #, c-format

5314 msgid "unable to get size of %s"

5315 msgstr "不能得到 %s 的大小"

@@ -5268,12 +5318,12 @@ msgstr "不能得到 %s 的大小"

5318 msgid "offset before end of packfile (broken .idx?)"

5319 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

5320

5271 -#: packfile.c:1900

5321 +#: packfile.c:1922

5322 #, c-format

5323 msgid "offset before start of pack index for %s (corrupt index?)"

5324 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

5325

5276 -#: packfile.c:1904

5326 +#: packfile.c:1926

5327 #, c-format

5328 msgid "offset beyond end of pack index for %s (truncated index?)"

5329 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

@@ -5293,7 +5343,7 @@ msgstr "格式錯誤的到期時間：'%s'"

5343 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5344 msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5345

5296 -#: parse-options-cb.c:130 parse-options-cb.c:147

5346 +#: parse-options-cb.c:132 parse-options-cb.c:149

5347 #, c-format

5348 msgid "malformed object name '%s'"

5349 msgstr "格式錯誤的物件名 '%s'"

@@ -5338,31 +5388,31 @@ msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"

5388 msgid "did you mean `--%s` (with two dashes)?"

5389 msgstr "你的意思是 `--%s`（有兩個短線）嗎？"

5390

5341 -#: parse-options.c:663 parse-options.c:963

5391 +#: parse-options.c:666 parse-options.c:971

5392 #, c-format

5393 msgid "alias of --%s"

5394 msgstr "--%s 的別名"

5395

5346 -#: parse-options.c:854

5396 +#: parse-options.c:862

5397 #, c-format

5398 msgid "unknown option `%s'"

5399 msgstr "未知選項 `%s'"

5400

5351 -#: parse-options.c:856

5401 +#: parse-options.c:864

5402 #, c-format

5403 msgid "unknown switch `%c'"

5404 msgstr "未知開關 `%c'"

5405

5356 -#: parse-options.c:858

5406 +#: parse-options.c:866

5407 #, c-format

5408 msgid "unknown non-ascii option in string: `%s'"

5409 msgstr "字串中未知的非 ascii 字元選項：`%s'"

5410

5361 -#: parse-options.c:882

5411 +#: parse-options.c:890

5412 msgid "..."

5413 msgstr "..."

5414

5365 -#: parse-options.c:901

5415 +#: parse-options.c:909

5416 #, c-format

5417 msgid "usage: %s"

5418 msgstr "用法：%s"

@@ -5370,18 +5420,18 @@ msgstr "用法：%s"

5420 #. TRANSLATORS: the colon here should align with the

5421 #. one in "usage: %s" translation.

5422 #.

5373 -#: parse-options.c:907

5423 +#: parse-options.c:915

5424 #, c-format

5425 msgid " or: %s"

5426 msgstr " 或：%s"

5427

5428 # 譯者：為保證在輸出中對齊，注意調整句中空格！

5379 -#: parse-options.c:910

5429 +#: parse-options.c:918

5430 #, c-format

5431 msgid " %s"

5432 msgstr " %s"

5433

5384 -#: parse-options.c:949

5434 +#: parse-options.c:957

5435 msgid "-NUM"

5436 msgstr "-數字"

5437

@@ -5516,7 +5566,7 @@ msgstr "協定錯誤：錯誤的行長度字串：%.4s"

5566 msgid "protocol error: bad line length %d"

5567 msgstr "協定錯誤：錯誤的行長度 %d"

5568

5519 -#: pkt-line.c:373

5569 +#: pkt-line.c:373 sideband.c:150

5570 #, c-format

5571 msgid "remote error: %s"

5572 msgstr "遠端錯誤：%s"

@@ -5530,15 +5580,23 @@ msgstr "正在重新整理索引"

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

5581 msgstr "無法建立執行緒 lstat：%s"

5582

5533 -#: pretty.c:982

5583 +#: pretty.c:983

5584 msgid "unable to parse --pretty format"

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

5586

5537 -#: promisor-remote.c:23

5538 -msgid "Remote with no URL"

5539 -msgstr "遠端未設定 URL"

5587 +#: promisor-remote.c:30

5588 +msgid "promisor-remote: unable to fork off fetch subprocess"

5589 +msgstr "promisor-remote: 無法 fork fetch 子處理程序"

5590 +

5591 +#: promisor-remote.c:35 promisor-remote.c:37

5592 +msgid "promisor-remote: could not write to fetch subprocess"

5593 +msgstr "promisor-remote: 無法寫入 fetch 子處理程序"

5594

5541 -#: promisor-remote.c:58

5595 +#: promisor-remote.c:41

5596 +msgid "promisor-remote: could not close stdin to fetch subprocess"

5597 +msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin"

5598 +

5599 +#: promisor-remote.c:53

5600 #, c-format

5601 msgid "promisor remote name cannot begin with '/': %s"

5602 msgstr "promisor 遠端名稱不能以 '/' 開始：%s"

@@ -5555,7 +5613,7 @@ msgstr "不能啟動 `log`"

5613 msgid "could not read `log` output"

5614 msgstr "不能讀取 `log` 的輸出"

5615

5558 -#: range-diff.c:98 sequencer.c:5143

5616 +#: range-diff.c:98 sequencer.c:5283

5617 #, c-format

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

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

@@ -5581,50 +5639,50 @@ msgstr "生成 diff 失敗"

5639 msgid "could not parse log for '%s'"

5640 msgstr "不能解析 '%s' 的日誌"

5641

5584 -#: read-cache.c:680

5642 +#: read-cache.c:682

5643 #, c-format

5644 msgid "will not add file alias '%s' ('%s' already exists in index)"

5645 msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"

5646

5589 -#: read-cache.c:696

5647 +#: read-cache.c:698

5648 msgid "cannot create an empty blob in the object database"

5649 msgstr "不能在物件資料庫中建立空的資料物件"

5650

5593 -#: read-cache.c:718

5651 +#: read-cache.c:720

5652 #, c-format

5653 msgid "%s: can only add regular files, symbolic links or git-directories"

5654 msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"

5655

5598 -#: read-cache.c:723

5656 +#: read-cache.c:725

5657 #, c-format

5658 msgid "'%s' does not have a commit checked out"

5659 msgstr "'%s' 沒有檢出一個提交"

5660

5603 -#: read-cache.c:775

5661 +#: read-cache.c:777

5662 #, c-format

5663 msgid "unable to index file '%s'"

5664 msgstr "無法索引檔案 '%s'"

5665

5608 -#: read-cache.c:794

5666 +#: read-cache.c:796

5667 #, c-format

5668 msgid "unable to add '%s' to index"

5669 msgstr "無法在索引中新增 '%s'"

5670

5613 -#: read-cache.c:805

5671 +#: read-cache.c:807

5672 #, c-format

5673 msgid "unable to stat '%s'"

5674 msgstr "無法對 %s 執行 stat"

5675

5618 -#: read-cache.c:1330

5676 +#: read-cache.c:1318

5677 #, c-format

5678 msgid "'%s' appears as both a file and as a directory"

5679 msgstr "'%s' 看起來既是檔案又是目錄"

5680

5623 -#: read-cache.c:1536

5681 +#: read-cache.c:1524

5682 msgid "Refresh index"

5683 msgstr "重新整理索引"

5684

5627 -#: read-cache.c:1651

5685 +#: read-cache.c:1639

5686 #, c-format

5687 msgid ""

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

@@ -5633,7 +5691,7 @@ msgstr ""

5691 "設定了 index.version，但是取值無效。\n"

5692 "使用版本 %i"

5693

5636 -#: read-cache.c:1661

5694 +#: read-cache.c:1649

5695 #, c-format

5696 msgid ""

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

@@ -5642,140 +5700,140 @@ msgstr ""

5700 "設定了 GIT_INDEX_VERSION，但是取值無效。\n"

5701 "使用版本 %i"

5702

5645 -#: read-cache.c:1717

5703 +#: read-cache.c:1705

5704 #, c-format

5705 msgid "bad signature 0x%08x"

5706 msgstr "壞的簽名 0x%08x"

5707

5650 -#: read-cache.c:1720

5708 +#: read-cache.c:1708

5709 #, c-format

5710 msgid "bad index version %d"

5711 msgstr "壞的索引版本 %d"

5712

5655 -#: read-cache.c:1729

5713 +#: read-cache.c:1717

5714 msgid "bad index file sha1 signature"

5715 msgstr "壞的索引檔案 sha1 簽名"

5716

5659 -#: read-cache.c:1759

5717 +#: read-cache.c:1747

5718 #, c-format

5719 msgid "index uses %.4s extension, which we do not understand"

5720 msgstr "索引使用不被支援的 %.4s 擴展"

5721

5722 #

5665 -#: read-cache.c:1761

5723 +#: read-cache.c:1749

5724 #, c-format

5725 msgid "ignoring %.4s extension"

5726 msgstr "忽略 %.4s 擴展"

5727

5670 -#: read-cache.c:1798

5728 +#: read-cache.c:1786

5729 #, c-format

5730 msgid "unknown index entry format 0x%08x"

5731 msgstr "未知的索引條目格式 0x%08x"

5732

5675 -#: read-cache.c:1814

5733 +#: read-cache.c:1802

5734 #, c-format

5735 msgid "malformed name field in the index, near path '%s'"

5736 msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"

5737

5680 -#: read-cache.c:1871

5738 +#: read-cache.c:1859

5739 msgid "unordered stage entries in index"

5740 msgstr "索引中有未排序的暫存條目"

5741

5684 -#: read-cache.c:1874

5742 +#: read-cache.c:1862

5743 #, c-format

5744 msgid "multiple stage entries for merged file '%s'"

5745 msgstr "合併檔案 '%s' 有多個暫存條目"

5746

5689 -#: read-cache.c:1877

5747 +#: read-cache.c:1865

5748 #, c-format

5749 msgid "unordered stage entries for '%s'"

5750 msgstr "'%s' 的未排序暫存條目"

5751

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

5696 -#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5752 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5753 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5754 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991

5755 #: 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

5756 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5757 #: builtin/submodule--helper.c:332

5758 msgid "index file corrupt"

5759 msgstr "索引檔案損壞"

5760

5703 -#: read-cache.c:2124

5761 +#: read-cache.c:2115

5762 #, c-format

5763 msgid "unable to create load_cache_entries thread: %s"

5764 msgstr "無法建立 load_cache_entries 執行緒：%s"

5765

5708 -#: read-cache.c:2137

5766 +#: read-cache.c:2128

5767 #, c-format

5768 msgid "unable to join load_cache_entries thread: %s"

5769 msgstr "無法加入 load_cache_entries 執行緒：%s"

5770

5713 -#: read-cache.c:2170

5771 +#: read-cache.c:2161

5772 #, c-format

5773 msgid "%s: index file open failed"

5774 msgstr "%s：開啟索引檔案失敗"

5775

5718 -#: read-cache.c:2174

5776 +#: read-cache.c:2165

5777 #, c-format

5778 msgid "%s: cannot stat the open index"

5779 msgstr "%s：不能對開啟的索引執行 stat 動作"

5780

5723 -#: read-cache.c:2178

5781 +#: read-cache.c:2169

5782 #, c-format

5783 msgid "%s: index file smaller than expected"

5784 msgstr "%s：索引檔案比預期的小"

5785

5728 -#: read-cache.c:2182

5786 +#: read-cache.c:2173

5787 #, c-format

5788 msgid "%s: unable to map index file"

5789 msgstr "%s：無法對索引檔案執行 map 動作"

5790

5733 -#: read-cache.c:2224

5791 +#: read-cache.c:2215

5792 #, c-format

5793 msgid "unable to create load_index_extensions thread: %s"

5794 msgstr "無法建立 load_index_extensions 執行緒：%s"

5795

5738 -#: read-cache.c:2251

5796 +#: read-cache.c:2242

5797 #, c-format

5798 msgid "unable to join load_index_extensions thread: %s"

5799 msgstr "無法加入 load_index_extensions 執行緒：%s"

5800

5743 -#: read-cache.c:2283

5801 +#: read-cache.c:2274

5802 #, c-format

5803 msgid "could not freshen shared index '%s'"

5804 msgstr "無法重新整理共享索引 '%s'"

5805

5748 -#: read-cache.c:2330

5806 +#: read-cache.c:2321

5807 #, c-format

5808 msgid "broken index, expect %s in %s, got %s"

5809 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5810

5753 -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5811 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126

5812 #, c-format

5813 msgid "could not close '%s'"

5814 msgstr "不能關閉 '%s'"

5815

5758 -#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5816 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185

5817 #, c-format

5818 msgid "could not stat '%s'"

5819 msgstr "不能對 '%s' 呼叫 stat"

5820

5763 -#: read-cache.c:3142

5821 +#: read-cache.c:3133

5822 #, c-format

5823 msgid "unable to open git dir: %s"

5824 msgstr "不能開啟 git 目錄：%s"

5825

5768 -#: read-cache.c:3154

5826 +#: read-cache.c:3145

5827 #, c-format

5828 msgid "unable to unlink: %s"

5829 msgstr "無法刪除：%s"

5830

5773 -#: read-cache.c:3179

5831 +#: read-cache.c:3170

5832 #, c-format

5833 msgid "cannot fix permission bits on '%s'"

5834 msgstr "不能修復 '%s' 的權限位"

5835

5778 -#: read-cache.c:3328

5836 +#: read-cache.c:3319

5837 #, c-format

5838 msgid "%s: cannot drop to stage #0"

5839 msgstr "%s：不能落到暫存區 #0"

@@ -5841,7 +5899,7 @@ msgid "Rebase %s onto %s (%d command)"

5899 msgid_plural "Rebase %s onto %s (%d commands)"

5900 msgstr[0] "重定基底 %s 到 %s（%d 個提交）"

5901

5844 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228

5902 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

5903 msgid ""

5904 "\n"

5905 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -5849,7 +5907,7 @@ msgstr ""

5907 "\n"

5908 "不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"

5909

5852 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232

5910 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

5911 msgid ""

5912 "\n"

5913 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -5857,7 +5915,7 @@ msgstr ""

5915 "\n"

5916 "如果您在這裡刪除一行，對應的提交將會遺失。\n"

5917

5860 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871

5918 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

5919 msgid ""

5920 "\n"

5921 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -5871,7 +5929,7 @@ msgstr ""

5929 " git rebase --continue\n"

5930 "\n"

5931

5874 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948

5932 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

5933 msgid ""

5934 "\n"

5935 "However, if you remove everything, the rebase will be aborted.\n"

@@ -5881,14 +5939,14 @@ msgstr ""

5939 "然而，如果您刪除全部內容，重定基底動作將會終止。\n"

5940 "\n"

5941

5884 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5885 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258

5942 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571

5943 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264

5944 #, c-format

5945 msgid "could not write '%s'"

5946 msgstr "不能寫入 '%s'"

5947

5890 -#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5891 -#: builtin/rebase.c:240

5948 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222

5949 +#: builtin/rebase.c:246

5950 #, c-format

5951 msgid "could not write '%s'."

5952 msgstr "不能寫入 '%s'。"

@@ -5918,14 +5976,14 @@ msgstr ""

5976 "可選值有：ignore、warn、error。\n"

5977 "\n"

5978

5921 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5922 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5923 -#: builtin/rebase.c:252

5979 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361

5980 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233

5981 +#: builtin/rebase.c:258

5982 #, c-format

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

5984 msgstr "不能讀取 '%s'。"

5985

5928 -#: ref-filter.c:42 wt-status.c:1977

5986 +#: ref-filter.c:42 wt-status.c:1973

5987 msgid "gone"

5988 msgstr "遺失"

5989

@@ -5944,237 +6002,232 @@ msgstr "落後 %d"

6002 msgid "ahead %d, behind %d"

6003 msgstr "領先 %d，落後 %d"

6004

5947 -#: ref-filter.c:165

6005 +#: ref-filter.c:169

6006 #, c-format

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

6008 msgstr "期望的格式：%%(color:<顏色>)"

6009

5952 -#: ref-filter.c:167

6010 +#: ref-filter.c:171

6011 #, c-format

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

6013 msgstr "無法識別的顏色：%%(color:%s)"

6014

5957 -#: ref-filter.c:189

6015 +#: ref-filter.c:193

6016 #, c-format

6017 msgid "Integer value expected refname:lstrip=%s"

6018 msgstr "期望整數值 refname:lstrip=%s"

6019

5962 -#: ref-filter.c:193

6020 +#: ref-filter.c:197

6021 #, c-format

6022 msgid "Integer value expected refname:rstrip=%s"

6023 msgstr "期望整數值 refname:rstrip=%s"

6024

5967 -#: ref-filter.c:195

6025 +#: ref-filter.c:199

6026 #, c-format

6027 msgid "unrecognized %%(%s) argument: %s"

6028 msgstr "無法識別的 %%(%s) 參數：%s"

6029

5972 -#: ref-filter.c:250

6030 +#: ref-filter.c:254

6031 #, c-format

6032 msgid "%%(objecttype) does not take arguments"

6033 msgstr "%%(objecttype) 不帶參數"

6034

5977 -#: ref-filter.c:272

6035 +#: ref-filter.c:276

6036 #, c-format

6037 msgid "unrecognized %%(objectsize) argument: %s"

6038 msgstr "無法識別的 %%(objectsize) 參數：%s"

6039

5982 -#: ref-filter.c:280

6040 +#: ref-filter.c:284

6041 #, c-format

6042 msgid "%%(deltabase) does not take arguments"

6043 msgstr "%%(deltabase) 不帶參數"

6044

5987 -#: ref-filter.c:292

6045 +#: ref-filter.c:296

6046 #, c-format

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

6048 msgstr "%%(body) 不帶參數"

6049

5992 -#: ref-filter.c:301

6050 +#: ref-filter.c:309

6051 #, c-format

5994 -msgid "%%(subject) does not take arguments"

5995 -msgstr "%%(subject) 不帶參數"

6052 +msgid "unrecognized %%(subject) argument: %s"

6053 +msgstr "無法識別的 %%(subject) 引數：%s"

6054

5997 -#: ref-filter.c:323

6055 +#: ref-filter.c:330

6056 #, c-format

6057 msgid "unknown %%(trailers) argument: %s"

6058 msgstr "未知的 %%(trailers) 參數：%s"

6059

6002 -#: ref-filter.c:352

6060 +#: ref-filter.c:363

6061 #, c-format

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

6063 msgstr "期望一個正數 contents:lines=%s"

6064

6007 -#: ref-filter.c:354

6065 +#: ref-filter.c:365

6066 #, c-format

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

6068 msgstr "無法識別的 %%(contents) 參數：%s"

6069

6012 -#: ref-filter.c:369

6070 +#: ref-filter.c:380

6071 +#, c-format

6072 +msgid "positive value expected '%s' in %%(%s)"

6073 +msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"

6074 +

6075 +#: ref-filter.c:384

6076 #, c-format

6014 -msgid "positive value expected objectname:short=%s"

6015 -msgstr "期望一個正數 objectname:short=%s"

6077 +msgid "unrecognized argument '%s' in %%(%s)"

6078 +msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"

6079

6017 -#: ref-filter.c:373

6080 +#: ref-filter.c:398

6081 #, c-format

6019 -msgid "unrecognized %%(objectname) argument: %s"

6020 -msgstr "無法識別的 %%(objectname) 參數：%s"

6082 +msgid "unrecognized email option: %s"

6083 +msgstr "無法識別的 email 選項：%s"

6084

6022 -#: ref-filter.c:403

6085 +#: ref-filter.c:428

6086 #, c-format

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

6088 msgstr "期望的格式：%%(align:<寬度>,<位置>)"

6089

6027 -#: ref-filter.c:415

6090 +#: ref-filter.c:440

6091 #, c-format

6092 msgid "unrecognized position:%s"

6093 msgstr "無法識別的位置：%s"

6094

6032 -#: ref-filter.c:422

6095 +#: ref-filter.c:447

6096 #, c-format

6097 msgid "unrecognized width:%s"

6098 msgstr "無法識別的寬度：%s"

6099

6037 -#: ref-filter.c:431

6100 +#: ref-filter.c:456

6101 #, c-format

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

6103 msgstr "無法識別的 %%(align) 參數：%s"

6104

6042 -#: ref-filter.c:439

6105 +#: ref-filter.c:464

6106 #, c-format

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

6108 msgstr "元素 %%(align) 需要一個正數的寬度"

6109

6047 -#: ref-filter.c:457

6110 +#: ref-filter.c:482

6111 #, c-format

6112 msgid "unrecognized %%(if) argument: %s"

6113 msgstr "無法識別的 %%(if) 參數：%s"

6114

6052 -#: ref-filter.c:559

6115 +#: ref-filter.c:584

6116 #, c-format

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

6118 msgstr "格式錯誤的欄位名：%.*s"

6119

6057 -#: ref-filter.c:586

6120 +#: ref-filter.c:611

6121 #, c-format

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

6123 msgstr "未知的欄位名：%.*s"

6124

6062 -#: ref-filter.c:590

6125 +#: ref-filter.c:615

6126 #, c-format

6127 msgid ""

6128 "not a git repository, but the field '%.*s' requires access to object data"

6129 msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料"

6130

6068 -#: ref-filter.c:714

6131 +#: ref-filter.c:739

6132 #, c-format

6133 msgid "format: %%(if) atom used without a %%(then) atom"

6134 msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"

6135

6073 -#: ref-filter.c:777

6136 +#: ref-filter.c:802

6137 #, c-format

6138 msgid "format: %%(then) atom used without an %%(if) atom"

6139 msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"

6140

6078 -#: ref-filter.c:779

6141 +#: ref-filter.c:804

6142 #, c-format

6143 msgid "format: %%(then) atom used more than once"

6144 msgstr "格式：%%(then) 元素用了多次"

6145

6083 -#: ref-filter.c:781

6146 +#: ref-filter.c:806

6147 #, c-format

6148 msgid "format: %%(then) atom used after %%(else)"

6149 msgstr "格式：%%(then) 元素用在了 %%(else) 之後"

6150

6088 -#: ref-filter.c:809

6151 +#: ref-filter.c:834

6152 #, c-format

6153 msgid "format: %%(else) atom used without an %%(if) atom"

6154 msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素"

6155

6093 -#: ref-filter.c:811

6156 +#: ref-filter.c:836

6157 #, c-format

6158 msgid "format: %%(else) atom used without a %%(then) atom"

6159 msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"

6160

6098 -#: ref-filter.c:813

6161 +#: ref-filter.c:838

6162 #, c-format

6163 msgid "format: %%(else) atom used more than once"

6164 msgstr "格式：%%(else) 元素用了多次"

6165

6103 -#: ref-filter.c:828

6166 +#: ref-filter.c:853

6167 #, c-format

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

6169 msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"

6170

6108 -#: ref-filter.c:885

6171 +#: ref-filter.c:910

6172 #, c-format

6173 msgid "malformed format string %s"

6174 msgstr "錯誤的格式化字串 %s"

6175

6113 -#: ref-filter.c:1486

6176 +#: ref-filter.c:1541

6177 #, c-format

6178 msgid "no branch, rebasing %s"

6179 msgstr "非分支，正重定基底 %s"

6180

6118 -#: ref-filter.c:1489

6181 +#: ref-filter.c:1544

6182 #, c-format

6183 msgid "no branch, rebasing detached HEAD %s"

6184 msgstr "非分支，正重定基底分離開頭指標 %s"

6185

6123 -#: ref-filter.c:1492

6186 +#: ref-filter.c:1547

6187 #, c-format

6188 msgid "no branch, bisect started on %s"

6189 msgstr "非分支，二分尋找開始於 %s"

6190

6128 -#: ref-filter.c:1502

6191 +#: ref-filter.c:1557

6192 msgid "no branch"

6193 msgstr "非分支"

6194

6132 -#: ref-filter.c:1538 ref-filter.c:1747

6195 +#: ref-filter.c:1591 ref-filter.c:1800

6196 #, c-format

6197 msgid "missing object %s for %s"

6198 msgstr "缺少 %2$s 的物件 %1$s"

6199

6137 -#: ref-filter.c:1548

6200 +#: ref-filter.c:1601

6201 #, c-format

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

6203 msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"

6204

6142 -#: ref-filter.c:2001

6205 +#: ref-filter.c:2054

6206 #, c-format

6207 msgid "malformed object at '%s'"

6208 msgstr "格式錯誤的物件 '%s'"

6209

6147 -#: ref-filter.c:2090

6210 +#: ref-filter.c:2143

6211 #, c-format

6212 msgid "ignoring ref with broken name %s"

6213 msgstr "忽略帶有錯誤名稱 %s 的引用"

6214

6152 -#: ref-filter.c:2095 refs.c:657

6215 +#: ref-filter.c:2148 refs.c:657

6216 #, c-format

6217 msgid "ignoring broken ref %s"

6218 msgstr "忽略損壞的引用 %s"

6219

6157 -#: ref-filter.c:2395

6220 +#: ref-filter.c:2464

6221 #, c-format

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

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

6224

6162 -#: ref-filter.c:2495

6163 -#, c-format

6164 -msgid "option `%s' is incompatible with --merged"

6165 -msgstr "選項 `%s' 和 --merged 不相容"

6166 -

6167 -#: ref-filter.c:2498

6168 -#, c-format

6169 -msgid "option `%s' is incompatible with --no-merged"

6170 -msgstr "選項 `%s' 和 --no-merged 不相容"

6171 -

6172 -#: ref-filter.c:2508

6225 +#: ref-filter.c:2563

6226 #, c-format

6227 msgid "malformed object name %s"

6228 msgstr "格式錯誤的物件名 %s"

6229

6177 -#: ref-filter.c:2513

6230 +#: ref-filter.c:2568

6231 #, c-format

6232 msgid "option `%s' must point to a commit"

6233 msgstr "選項 `%s' 必須指向一個提交"

@@ -6199,157 +6252,119 @@ msgstr "分支名稱無效：%s = %s"

6252 msgid "ignoring dangling symref %s"

6253 msgstr "忽略懸空符號引用 %s"

6254

6202 -#: refs.c:792

6203 -#, c-format

6204 -msgid "could not open '%s' for writing: %s"

6205 -msgstr "無法為寫入開啟 '%s'：%s"

6206 -

6207 -#: refs.c:802 refs.c:853

6208 -#, c-format

6209 -msgid "could not read ref '%s'"

6210 -msgstr "無法讀取引用 '%s'"

6211 -

6212 -#: refs.c:808

6213 -#, c-format

6214 -msgid "ref '%s' already exists"

6215 -msgstr "引用 '%s' 已經存在"

6216 -

6217 -#: refs.c:813

6218 -#, c-format

6219 -msgid "unexpected object ID when writing '%s'"

6220 -msgstr "寫入 '%s' 時意外的物件 ID"

6221 -

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 -

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 -

6235 -#: refs.c:855

6236 -#, c-format

6237 -msgid "unexpected object ID when deleting '%s'"

6238 -msgstr "刪除 '%s' 時意外的物件 ID"

6239 -

6240 -#: refs.c:986

6255 +#: refs.c:892

6256 #, c-format

6257 msgid "log for ref %s has gap after %s"

6258 msgstr "引用 %s 的日誌在 %s 之後有缺口"

6259

6245 -#: refs.c:992

6260 +#: refs.c:898

6261 #, c-format

6262 msgid "log for ref %s unexpectedly ended on %s"

6263 msgstr "引用 %s 的日誌意外終止於 %s"

6264

6250 -#: refs.c:1051

6265 +#: refs.c:957

6266 #, c-format

6267 msgid "log for %s is empty"

6268 msgstr "%s 的日誌為空"

6269

6255 -#: refs.c:1143

6270 +#: refs.c:1049

6271 #, c-format

6272 msgid "refusing to update ref with bad name '%s'"

6273 msgstr "拒絕更新有錯誤名稱 '%s' 的引用"

6274

6260 -#: refs.c:1219

6275 +#: refs.c:1120

6276 #, c-format

6277 msgid "update_ref failed for ref '%s': %s"

6278 msgstr "對引用 '%s' 執行 update_ref 失敗：%s"

6279

6265 -#: refs.c:2011

6280 +#: refs.c:1944

6281 #, c-format

6282 msgid "multiple updates for ref '%s' not allowed"

6283 msgstr "不允許對引用 '%s' 多次更新"

6284

6270 -#: refs.c:2098

6285 +#: refs.c:2024

6286 msgid "ref updates forbidden inside quarantine environment"

6287 msgstr "在隔離環境中禁止更新引用"

6288

6274 -#: refs.c:2109

6289 +#: refs.c:2035

6290 msgid "ref updates aborted by hook"

6291 msgstr "引用更新被掛鉤拒絕"

6292

6278 -#: refs.c:2209 refs.c:2239

6293 +#: refs.c:2135 refs.c:2165

6294 #, c-format

6295 msgid "'%s' exists; cannot create '%s'"

6296 msgstr "'%s' 已存在，無法建立 '%s'"

6297

6283 -#: refs.c:2215 refs.c:2250

6298 +#: refs.c:2141 refs.c:2176

6299 #, c-format

6300 msgid "cannot process '%s' and '%s' at the same time"

6301 msgstr "無法同時處理 '%s' 和 '%s'"

6302

6288 -#: refs/files-backend.c:1233

6303 +#: refs/files-backend.c:1228

6304 #, c-format

6305 msgid "could not remove reference %s"

6306 msgstr "無法刪除引用 %s"

6307

6293 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

6294 -#: refs/packed-backend.c:1551

6308 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542

6309 +#: refs/packed-backend.c:1552

6310 #, c-format

6311 msgid "could not delete reference %s: %s"

6312 msgstr "無法刪除引用 %s：%s"

6313

6299 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

6314 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555

6315 #, c-format

6316 msgid "could not delete references: %s"

6317 msgstr "無法刪除引用：%s"

6318

6304 -#: refspec.c:137

6319 +#: refspec.c:167

6320 #, c-format

6321 msgid "invalid refspec '%s'"

6322 msgstr "無效的引用表達式：'%s'"

6323

6309 -#: remote.c:355

6324 +#: remote.c:351

6325 #, c-format

6326 msgid "config remote shorthand cannot begin with '/': %s"

6327 msgstr "設定的遠端短名稱不能以 '/' 開始：%s"

6328

6314 -#: remote.c:403

6329 +#: remote.c:399

6330 msgid "more than one receivepack given, using the first"

6331 msgstr "提供了一個以上的 receivepack，使用第一個"

6332

6318 -#: remote.c:411

6333 +#: remote.c:407

6334 msgid "more than one uploadpack given, using the first"

6335 msgstr "提供了一個以上的 uploadpack，使用第一個"

6336

6322 -#: remote.c:594

6337 +#: remote.c:590

6338 #, c-format

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

6340 msgstr "不能同時取得 %s 和 %s 至 %s"

6341

6327 -#: remote.c:598

6342 +#: remote.c:594

6343 #, c-format

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

6345 msgstr "%s 通常追蹤 %s，而非 %s"

6346

6332 -#: remote.c:602

6347 +#: remote.c:598

6348 #, c-format

6349 msgid "%s tracks both %s and %s"

6350 msgstr "%s 同時追蹤 %s 和 %s"

6351

6337 -#: remote.c:670

6352 +#: remote.c:666

6353 #, c-format

6354 msgid "key '%s' of pattern had no '*'"

6355 msgstr "模式的鍵 '%s' 沒有 '*'"

6356

6342 -#: remote.c:680

6357 +#: remote.c:676

6358 #, c-format

6359 msgid "value '%s' of pattern has no '*'"

6360 msgstr "模式的值 '%s' 沒有 '*'"

6361

6347 -#: remote.c:986

6362 +#: remote.c:1073

6363 #, c-format

6364 msgid "src refspec %s does not match any"

6365 msgstr "源引用表達式 %s 沒有符合"

6366

6352 -#: remote.c:991

6367 +#: remote.c:1078

6368 #, c-format

6369 msgid "src refspec %s matches more than one"

6370 msgstr "源引用表達式 %s 符合超過一個"

@@ -6358,7 +6373,7 @@ msgstr "源引用表達式 %s 符合超過一個"

6373 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6374 #. the <src>.

6375 #.

6361 -#: remote.c:1006

6376 +#: remote.c:1093

6377 #, c-format

6378 msgid ""

6379 "The destination you provided is not a full refname (i.e.,\n"

@@ -6380,7 +6395,7 @@ msgstr ""

6395 "\n"

6396 "都不行，所以我們已放棄。您必須給出完整的引用。"

6397

6383 -#: remote.c:1026

6398 +#: remote.c:1113

6399 #, c-format

6400 msgid ""

6401 "The <src> part of the refspec is a commit object.\n"

@@ -6390,7 +6405,7 @@ msgstr ""

6405 "引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n"

6406 "'%s:refs/heads/%s' 推送嗎？"

6407

6393 -#: remote.c:1031

6408 +#: remote.c:1118

6409 #, c-format

6410 msgid ""

6411 "The <src> part of the refspec is a tag object.\n"

@@ -6400,7 +6415,7 @@ msgstr ""

6415 "引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n"

6416 "'%s:refs/tags/%s' 推送嗎？"

6417

6403 -#: remote.c:1036

6418 +#: remote.c:1123

6419 #, c-format

6420 msgid ""

6421 "The <src> part of the refspec is a tree object.\n"

@@ -6410,7 +6425,7 @@ msgstr ""

6425 "引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n"

6426 "'%s:refs/tags/%s' 推送嗎？"

6427

6413 -#: remote.c:1041

6428 +#: remote.c:1128

6429 #, c-format

6430 msgid ""

6431 "The <src> part of the refspec is a blob object.\n"

@@ -6420,113 +6435,113 @@ msgstr ""

6435 "引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n"

6436 "'%s:refs/tags/%s' 推送嗎？"

6437

6423 -#: remote.c:1077

6438 +#: remote.c:1164

6439 #, c-format

6440 msgid "%s cannot be resolved to branch"

6441 msgstr "%s 無法被解析為分支"

6442

6428 -#: remote.c:1088

6443 +#: remote.c:1175

6444 #, c-format

6445 msgid "unable to delete '%s': remote ref does not exist"

6446 msgstr "無法刪除 '%s'：遠端引用不存在"

6447

6433 -#: remote.c:1100

6448 +#: remote.c:1187

6449 #, c-format

6450 msgid "dst refspec %s matches more than one"

6451 msgstr "目標引用表達式 %s 符合超過一個"

6452

6438 -#: remote.c:1107

6453 +#: remote.c:1194

6454 #, c-format

6455 msgid "dst ref %s receives from more than one src"

6456 msgstr "目標引用 %s 接收超過一個源"

6457

6443 -#: remote.c:1610 remote.c:1711

6458 +#: remote.c:1703 remote.c:1804

6459 msgid "HEAD does not point to a branch"

6460 msgstr "HEAD 沒有指向一個分支"

6461

6447 -#: remote.c:1619

6462 +#: remote.c:1712

6463 #, c-format

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

6465 msgstr "沒有此分支：'%s'"

6466

6452 -#: remote.c:1622

6467 +#: remote.c:1715

6468 #, c-format

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

6470 msgstr "尚未給分支 '%s' 設定上游"

6471

6457 -#: remote.c:1628

6472 +#: remote.c:1721

6473 #, c-format

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

6475 msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"

6476

6462 -#: remote.c:1643

6477 +#: remote.c:1736

6478 #, c-format

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

6480 msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支"

6481

6467 -#: remote.c:1655

6482 +#: remote.c:1748

6483 #, c-format

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

6485 msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"

6486

6472 -#: remote.c:1665

6487 +#: remote.c:1758

6488 #, c-format

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

6490 msgstr "向 '%s' 推送引用規格未包含 '%s'"

6491

6477 -#: remote.c:1678

6492 +#: remote.c:1771

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

6494 msgstr "推送無目標（push.default 是 'nothing'）"

6495

6481 -#: remote.c:1700

6496 +#: remote.c:1793

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

6498 msgstr "無法解析 'simple' 推送至一個單獨的目標"

6499

6485 -#: remote.c:1826

6500 +#: remote.c:1922

6501 #, c-format

6502 msgid "couldn't find remote ref %s"

6503 msgstr "無法找到遠端引用 %s"

6504

6490 -#: remote.c:1839

6505 +#: remote.c:1935

6506 #, c-format

6507 msgid "* Ignoring funny ref '%s' locally"

6508 msgstr "* 在本機忽略可笑的引用 '%s'"

6509

6495 -#: remote.c:2002

6510 +#: remote.c:2098

6511 #, c-format

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

6513 msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"

6514

6500 -#: remote.c:2006

6515 +#: remote.c:2102

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

6517 msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n"

6518

6504 -#: remote.c:2009

6519 +#: remote.c:2105

6520 #, c-format

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

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

6523

6509 -#: remote.c:2013

6524 +#: remote.c:2109

6525 #, c-format

6526 msgid "Your branch and '%s' refer to different commits.\n"

6527 msgstr "您的分支和 '%s' 指向不同的提交。\n"

6528

6514 -#: remote.c:2016

6529 +#: remote.c:2112

6530 #, c-format

6531 msgid " (use \"%s\" for details)\n"

6532 msgstr " （使用 \"%s\" 檢視詳情）\n"

6533

6519 -#: remote.c:2020

6534 +#: remote.c:2116

6535 #, c-format

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

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

6538 msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"

6539

6525 -#: remote.c:2026

6540 +#: remote.c:2122

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

6542 msgstr " （使用 \"git push\" 來發布您的本機提交）\n"

6543

6529 -#: remote.c:2029

6544 +#: remote.c:2125

6545 #, c-format

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

6547 msgid_plural ""

@@ -6534,11 +6549,11 @@ msgid_plural ""

6549 msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"

6550

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

6537 -#: remote.c:2037

6552 +#: remote.c:2133

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

6554 msgstr " （使用 \"git pull\" 來更新您的本機分支）\n"

6555

6541 -#: remote.c:2040

6556 +#: remote.c:2136

6557 #, c-format

6558 msgid ""

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

@@ -6551,11 +6566,11 @@ msgstr[0] ""

6566 "並且分別有 %d 和 %d 處不同的提交。\n"

6567

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

6554 -#: remote.c:2050

6569 +#: remote.c:2146

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

6571 msgstr " （使用 \"git pull\" 來合併遠端分支）\n"

6572

6558 -#: remote.c:2241

6573 +#: remote.c:2337

6574 #, c-format

6575 msgid "cannot parse expected object name '%s'"

6576 msgstr "無法解析期望的物件名 '%s'"

@@ -6575,11 +6590,6 @@ msgstr "重複的取代引用：%s"

6590 msgid "replace depth too high for object %s"

6591 msgstr "物件 %s 的取代層級太深"

6592

6578 -#: repository.c:94 builtin/init-db.c:188

6579 -#, c-format

6580 -msgid "The hash algorithm %s is not supported in this build."

6581 -msgstr "此組建不支援 %s 雜湊算法。"

6582 -

6593 #: rerere.c:217 rerere.c:226 rerere.c:229

6594 msgid "corrupt MERGE_RR"

6595 msgstr "損壞的 MERGE_RR"

@@ -6638,8 +6648,8 @@ msgstr "不能刪除 stray '%s'"

6648 msgid "Recorded preimage for '%s'"

6649 msgstr "為 '%s' 記錄 preimage"

6650

6641 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6642 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6651 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975

6652 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6653 #, c-format

6654 msgid "could not create directory '%s'"

6655 msgstr "不能建立目錄 '%s'"

@@ -6677,25 +6687,31 @@ msgstr "不能開啟 rr-cache 目錄"

6687 msgid "could not determine HEAD revision"

6688 msgstr "不能確定 HEAD 版本"

6689

6680 -#: reset.c:70 reset.c:76 sequencer.c:3318

6690 +#: reset.c:70 reset.c:76 sequencer.c:3426

6691 #, c-format

6692 msgid "failed to find tree of %s"

6693 msgstr "無法找到 %s 指向的樹"

6694

6685 -#: revision.c:2661

6695 +#: revision.c:2344

6696 +#| msgid "git-over-rsync is no longer supported"

6697 +msgid "--unpacked=<packfile> no longer supported"

6698 +msgstr "--unpacked=<packfile> 已不受支援"

6699 +

6700 +#: revision.c:2364

6701 +#, c-format

6702 +msgid "unknown value for --diff-merges: %s"

6703 +msgstr "--diff-merges 的值無效：%s"

6704 +

6705 +#: revision.c:2702

6706 msgid "your current branch appears to be broken"

6707 msgstr "您的目前分支好像被損壞"

6708

6689 -#: revision.c:2664

6709 +#: revision.c:2705

6710 #, c-format

6711 msgid "your current branch '%s' does not have any commits yet"

6712 msgstr "您的目前分支 '%s' 尚無任何提交"

6713

6694 -#: revision.c:2873

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

6696 -msgstr "--first-parent 與 --bisect 不相容"

6697 -

6698 -#: revision.c:2877

6714 +#: revision.c:2915

6715 msgid "-L does not yet support diff formats besides -p and -s"

6716 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"

6717

@@ -6703,12 +6719,12 @@ msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"

6719 msgid "open /dev/null failed"

6720 msgstr "不能開啟 /dev/null"

6721

6706 -#: run-command.c:1269

6722 +#: run-command.c:1270

6723 #, c-format

6724 msgid "cannot create async thread: %s"

6725 msgstr "不能建立 async 執行緒：%s"

6726

6711 -#: run-command.c:1333

6727 +#: run-command.c:1334

6728 #, c-format

6729 msgid ""

6730 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6731,65 +6747,65 @@ msgstr "不能解析遠端解包狀態：%s"

6747 msgid "remote unpack failed: %s"

6748 msgstr "遠端解包失敗：%s"

6749

6734 -#: send-pack.c:308

6750 +#: send-pack.c:372

6751 msgid "failed to sign the push certificate"

6752 msgstr "為推送證書籤名失敗"

6753

6738 -#: send-pack.c:394

6754 +#: send-pack.c:460

6755 msgid "the receiving end does not support this repository's hash algorithm"

6756 msgstr "接收端不支援此版本庫的雜湊算法"

6757

6742 -#: send-pack.c:403

6758 +#: send-pack.c:469

6759 msgid "the receiving end does not support --signed push"

6760 msgstr "接收端不支援簽名推送"

6761

6746 -#: send-pack.c:405

6762 +#: send-pack.c:471

6763 msgid ""

6764 "not sending a push certificate since the receiving end does not support --"

6765 "signed push"

6766 msgstr "未傳送推送證書，因為接收端不支援簽名推送"

6767

6752 -#: send-pack.c:417

6768 +#: send-pack.c:483

6769 msgid "the receiving end does not support --atomic push"

6770 msgstr "接收端不支援原子推送"

6771

6756 -#: send-pack.c:422

6772 +#: send-pack.c:488

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

6774 msgstr "接收端不支援推送選項"

6775

6760 -#: sequencer.c:192

6776 +#: sequencer.c:194

6777 #, c-format

6778 msgid "invalid commit message cleanup mode '%s'"

6779 msgstr "無效的提交訊息清理模式 '%s'"

6780

6765 -#: sequencer.c:297

6781 +#: sequencer.c:308

6782 #, c-format

6783 msgid "could not delete '%s'"

6784 msgstr "無法刪除 '%s'"

6785

6770 -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6786 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385

6787 #, c-format

6788 msgid "could not remove '%s'"

6789 msgstr "無法刪除 '%s'"

6790

6775 -#: sequencer.c:326

6791 +#: sequencer.c:339

6792 msgid "revert"

6793 msgstr "復原"

6794

6779 -#: sequencer.c:328

6795 +#: sequencer.c:341

6796 msgid "cherry-pick"

6797 msgstr "摘取"

6798

6783 -#: sequencer.c:330

6799 +#: sequencer.c:343

6800 msgid "rebase"

6801 msgstr "rebase"

6802

6787 -#: sequencer.c:332

6803 +#: sequencer.c:345

6804 #, c-format

6805 msgid "unknown action: %d"

6806 msgstr "未知動作：%d"

6807

6792 -#: sequencer.c:390

6808 +#: sequencer.c:404

6809 msgid ""

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

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

@@ -6797,7 +6813,7 @@ msgstr ""

6813 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"

6814 "指令標記修正後的檔案"

6815

6800 -#: sequencer.c:393

6816 +#: sequencer.c:407

6817 msgid ""

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

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

@@ -6806,43 +6822,43 @@ msgstr ""

6822 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"

6823 "對修正後的檔案做標記，然後用 'git commit' 提交"

6824

6809 -#: sequencer.c:406 sequencer.c:2921

6825 +#: sequencer.c:420 sequencer.c:3028

6826 #, c-format

6827 msgid "could not lock '%s'"

6828 msgstr "不能鎖定 '%s'"

6829

6814 -#: sequencer.c:413

6830 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046

6831 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631

6832 +#, c-format

6833 +msgid "could not write to '%s'"

6834 +msgstr "不能寫入 '%s'"

6835 +

6836 +#: sequencer.c:427

6837 #, c-format

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

6839 msgstr "不能將換行符號寫入 '%s'"

6840

6819 -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6820 -#: sequencer.c:3203

6841 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048

6842 +#: sequencer.c:3311

6843 #, c-format

6844 msgid "failed to finalize '%s'"

6845 msgstr "無法完成 '%s'"

6846

6825 -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6826 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6827 -#, c-format

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

6829 -msgstr "不能讀取 '%s'"

6830 -

6831 -#: sequencer.c:457

6847 +#: sequencer.c:471

6848 #, c-format

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

6850 msgstr "您的本機修改將被%s覆蓋。"

6851

6836 -#: sequencer.c:461

6852 +#: sequencer.c:475

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

6854 msgstr "提交您的修改或儲藏後再繼續。"

6855

6840 -#: sequencer.c:493

6856 +#: sequencer.c:507

6857 #, c-format

6858 msgid "%s: fast-forward"

6859 msgstr "%s：快轉"

6860

6845 -#: sequencer.c:532 builtin/tag.c:566

6861 +#: sequencer.c:546 builtin/tag.c:566

6862 #, c-format

6863 msgid "Invalid cleanup mode %s"

6864 msgstr "無效的清理模式 %s"

@@ -6850,65 +6866,65 @@ msgstr "無效的清理模式 %s"

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

6867 #. "rebase".

6868 #.

6853 -#: sequencer.c:626

6869 +#: sequencer.c:640

6870 #, c-format

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

6872 msgstr "%s：無法寫入新索引檔案"

6873

6858 -#: sequencer.c:643

6874 +#: sequencer.c:657

6875 msgid "unable to update cache tree"

6876 msgstr "不能更新快取樹"

6877

6862 -#: sequencer.c:657

6878 +#: sequencer.c:671

6879 msgid "could not resolve HEAD commit"

6880 msgstr "不能解析 HEAD 提交"

6881

6866 -#: sequencer.c:737

6882 +#: sequencer.c:751

6883 #, c-format

6884 msgid "no key present in '%.*s'"

6885 msgstr "在 '%.*s' 中沒有 key"

6886

6871 -#: sequencer.c:748

6887 +#: sequencer.c:762

6888 #, c-format

6889 msgid "unable to dequote value of '%s'"

6890 msgstr "無法為 '%s' 的值去引號"

6891

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

6892 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724

6893 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902

6894 #, c-format

6895 msgid "could not open '%s' for reading"

6896 msgstr "無法開啟 '%s' 進行讀取"

6897

6882 -#: sequencer.c:795

6898 +#: sequencer.c:809

6899 msgid "'GIT_AUTHOR_NAME' already given"

6900 msgstr "已經給出 'GIT_AUTHOR_NAME'"

6901

6886 -#: sequencer.c:800

6902 +#: sequencer.c:814

6903 msgid "'GIT_AUTHOR_EMAIL' already given"

6904 msgstr "已經給出 'GIT_AUTHOR_EMAIL'"

6905

6890 -#: sequencer.c:805

6906 +#: sequencer.c:819

6907 msgid "'GIT_AUTHOR_DATE' already given"

6908 msgstr "已經給出 'GIT_AUTHOR_DATE'"

6909

6894 -#: sequencer.c:809

6910 +#: sequencer.c:823

6911 #, c-format

6912 msgid "unknown variable '%s'"

6913 msgstr "未知變數 '%s'"

6914

6899 -#: sequencer.c:814

6915 +#: sequencer.c:828

6916 msgid "missing 'GIT_AUTHOR_NAME'"

6917 msgstr "缺少 'GIT_AUTHOR_NAME'"

6918

6903 -#: sequencer.c:816

6919 +#: sequencer.c:830

6920 msgid "missing 'GIT_AUTHOR_EMAIL'"

6921 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

6922

6907 -#: sequencer.c:818

6923 +#: sequencer.c:832

6924 msgid "missing 'GIT_AUTHOR_DATE'"

6925 msgstr "缺少 'GIT_AUTHOR_DATE'"

6926

6911 -#: sequencer.c:867

6927 +#: sequencer.c:897

6928 #, c-format

l10n: zh_TW.po: v2.29.0 round 2 (2 untranslated)