6806dd88f3 · 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-10-10 09:32+0800\n"

296 -"PO-Revision-Date: 2020-10-10 19:26+0800\n"

295 +"POT-Creation-Date: 2020-12-21 07:10+0800\n"

296 +"PO-Revision-Date: 2020-12-23 22:30+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,201 +301,201 @@ 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.4.1\n"

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

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

306 "zhconvert.org\n"

307

308 -#: add-interactive.c:368

308 +#: add-interactive.c:376

309 #, c-format

310 msgid "Huh (%s)?"

311 msgstr "嗯（%s）？"

312

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

313 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284

314 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532

315 +#: builtin/rebase.c:1955

316 msgid "could not read index"

317 msgstr "無法讀取索引"

318

319 -#: add-interactive.c:576 git-add--interactive.perl:269

319 +#: add-interactive.c:584 git-add--interactive.perl:269

320 #: git-add--interactive.perl:294

321 msgid "binary"

322 msgstr "二進位"

323

324 -#: add-interactive.c:634 git-add--interactive.perl:278

324 +#: add-interactive.c:642 git-add--interactive.perl:278

325 #: git-add--interactive.perl:332

326 msgid "nothing"

327 msgstr "無"

328

329 -#: add-interactive.c:635 git-add--interactive.perl:314

329 +#: add-interactive.c:643 git-add--interactive.perl:314

330 #: git-add--interactive.perl:329

331 msgid "unchanged"

332 msgstr "未變更"

333

334 -#: add-interactive.c:672 git-add--interactive.perl:643

334 +#: add-interactive.c:680 git-add--interactive.perl:641

335 msgid "Update"

336 msgstr "更新"

337

338 -#: add-interactive.c:689 add-interactive.c:877

338 +#: add-interactive.c:697 add-interactive.c:885

339 #, c-format

340 msgid "could not stage '%s'"

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

342

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

343 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478

344 msgid "could not write index"

345 msgstr "無法寫入索引"

346

347 -#: add-interactive.c:698 git-add--interactive.perl:628

347 +#: add-interactive.c:706 git-add--interactive.perl:626

348 #, c-format, perl-format

349 msgid "updated %d path\n"

350 msgid_plural "updated %d paths\n"

351 msgstr[0] "已更新 %d 個路徑\n"

352

353 -#: add-interactive.c:716 git-add--interactive.perl:678

353 +#: add-interactive.c:724 git-add--interactive.perl:676

354 #, c-format, perl-format

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

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

357

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

358 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295

359 #: builtin/reset.c:145

360 #, c-format

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

362 msgstr "「%s」路徑執行 make_cache_entry 失敗"

363

364 -#: add-interactive.c:751 git-add--interactive.perl:655

364 +#: add-interactive.c:759 git-add--interactive.perl:653

365 msgid "Revert"

366 msgstr "還原"

367

368 -#: add-interactive.c:767

368 +#: add-interactive.c:775

369 msgid "Could not parse HEAD^{tree}"

370 msgstr "不能解析 HEAD^{樹}"

371

372 -#: add-interactive.c:805 git-add--interactive.perl:631

372 +#: add-interactive.c:813 git-add--interactive.perl:629

373 #, c-format, perl-format

374 msgid "reverted %d path\n"

375 msgid_plural "reverted %d paths\n"

376 msgstr[0] "還原了 %d 個路徑\n"

377

378 -#: add-interactive.c:856 git-add--interactive.perl:695

378 +#: add-interactive.c:864 git-add--interactive.perl:693

379 #, c-format

380 msgid "No untracked files.\n"

381 msgstr "沒有未追蹤的檔案。\n"

382

383 -#: add-interactive.c:860 git-add--interactive.perl:689

383 +#: add-interactive.c:868 git-add--interactive.perl:687

384 msgid "Add untracked"

385 msgstr "新增未追蹤的"

386

387 -#: add-interactive.c:887 git-add--interactive.perl:625

387 +#: add-interactive.c:895 git-add--interactive.perl:623

388 #, c-format, perl-format

389 msgid "added %d path\n"

390 msgid_plural "added %d paths\n"

391 msgstr[0] "增加了 %d 個路徑\n"

392

393 -#: add-interactive.c:917

393 +#: add-interactive.c:925

394 #, c-format

395 msgid "ignoring unmerged: %s"

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

397

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

398 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369

399 #, c-format

400 msgid "Only binary files changed.\n"

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

402

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

403 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371

404 #, c-format

405 msgid "No changes.\n"

406 msgstr "沒有修改。\n"

407

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

408 +#: add-interactive.c:943 git-add--interactive.perl:1379

409 msgid "Patch update"

410 msgstr "修補檔更新"

411

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

412 +#: add-interactive.c:982 git-add--interactive.perl:1792

413 msgid "Review diff"

414 msgstr "檢視 diff"

415

416 -#: add-interactive.c:1002

416 +#: add-interactive.c:1010

417 msgid "show paths with changes"

418 msgstr "顯示有變更的路徑"

419

420 -#: add-interactive.c:1004

420 +#: add-interactive.c:1012

421 msgid "add working tree state to the staged set of changes"

422 msgstr "加入工作區狀態至暫存列表"

423

424 -#: add-interactive.c:1006

424 +#: add-interactive.c:1014

425 msgid "revert staged set of changes back to the HEAD version"

426 msgstr "還原修改的暫存集至 HEAD 版本"

427

428 -#: add-interactive.c:1008

428 +#: add-interactive.c:1016

429 msgid "pick hunks and update selectively"

430 msgstr "挑選區塊並選擇性更新"

431

432 -#: add-interactive.c:1010

432 +#: add-interactive.c:1018

433 msgid "view diff between HEAD and index"

434 msgstr "檢視 HEAD 及索引之間的差異"

435

436 -#: add-interactive.c:1012

436 +#: add-interactive.c:1020

437 msgid "add contents of untracked files to the staged set of changes"

438 msgstr "加入未追蹤檔案的內容至暫存列表"

439

440 -#: add-interactive.c:1020 add-interactive.c:1069

440 +#: add-interactive.c:1028 add-interactive.c:1077

441 msgid "Prompt help:"

442 msgstr "提示說明："

443

444 -#: add-interactive.c:1022

444 +#: add-interactive.c:1030

445 msgid "select a single item"

446 msgstr "選擇單一項目"

447

448 -#: add-interactive.c:1024

448 +#: add-interactive.c:1032

449 msgid "select a range of items"

450 msgstr "選擇項目範圍"

451

452 -#: add-interactive.c:1026

452 +#: add-interactive.c:1034

453 msgid "select multiple ranges"

454 msgstr "選擇多個範圍"

455

456 -#: add-interactive.c:1028 add-interactive.c:1073

456 +#: add-interactive.c:1036 add-interactive.c:1081

457 msgid "select item based on unique prefix"

458 msgstr "基於唯一前綴選擇項目"

459

460 -#: add-interactive.c:1030

460 +#: add-interactive.c:1038

461 msgid "unselect specified items"

462 msgstr "取消選擇指定項目"

463

464 -#: add-interactive.c:1032

464 +#: add-interactive.c:1040

465 msgid "choose all items"

466 msgstr "選擇所有項目"

467

468 -#: add-interactive.c:1034

468 +#: add-interactive.c:1042

469 msgid "(empty) finish selecting"

470 msgstr "（空）完成選取"

471

472 -#: add-interactive.c:1071

472 +#: add-interactive.c:1079

473 msgid "select a numbered item"

474 msgstr "選擇編號過的項目"

475

476 -#: add-interactive.c:1075

476 +#: add-interactive.c:1083

477 msgid "(empty) select nothing"

478 msgstr "（空）全不選取"

479

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

480 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896

481 msgid "*** Commands ***"

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

483

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

484 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893

485 msgid "What now"

486 msgstr "請選擇"

487

488 -#: add-interactive.c:1136 git-add--interactive.perl:213

488 +#: add-interactive.c:1144 git-add--interactive.perl:213

489 msgid "staged"

490 msgstr "快取"

491

492 -#: add-interactive.c:1136 git-add--interactive.perl:213

492 +#: add-interactive.c:1144 git-add--interactive.perl:213

493 msgid "unstaged"

494 msgstr "未快取"

495

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

496 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257

497 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124

498 +#: builtin/fetch.c:147 builtin/merge.c:284 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

@@ -503,31 +503,31 @@ msgstr "未快取"

503 msgid "path"

504 msgstr "路徑"

505

506 -#: add-interactive.c:1143

506 +#: add-interactive.c:1151

507 msgid "could not refresh index"

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

509

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

510 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803

511 #, c-format

512 msgid "Bye.\n"

513 msgstr "再見。\n"

514

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -831,7 +831,7 @@ msgid ""

831 "between its input and output lines."

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

833

834 -#: add-patch.c:785

834 +#: add-patch.c:790

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

843 +#: add-patch.c:805

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:1076 git-add--interactive.perl:1117

856 +#: add-patch.c:1081 git-add--interactive.perl:1115

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

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

859

860 -#: add-patch.c:1080

860 +#: add-patch.c:1085

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:1094 git-add--interactive.perl:1131

874 +#: add-patch.c:1099 git-add--interactive.perl:1129

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

883 +#: add-patch.c:1132

884 msgid "could not parse hunk header"

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

886

887 -#: add-patch.c:1172

887 +#: add-patch.c:1177

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:1241 git-add--interactive.perl:1244

903 +#: add-patch.c:1246 git-add--interactive.perl:1242

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

908 +#: add-patch.c:1289

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

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

911

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

912 +#: add-patch.c:1290 git-add--interactive.perl:1346

913 msgid "Apply them to the worktree anyway? "

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

915

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

916 +#: add-patch.c:1297 git-add--interactive.perl:1349

917 msgid "Nothing was applied.\n"

918 msgstr "未套用。\n"

919

920 -#: add-patch.c:1349

920 +#: add-patch.c:1354

921 msgid ""

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

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

@@ -939,72 +939,72 @@ msgstr ""

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

940 "? - 顯示說明\n"

941

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

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

943 msgid "No previous hunk"

944 msgstr "沒有上一個區塊"

945

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

946 +#: add-patch.c:1521 add-patch.c:1531

947 msgid "No next hunk"

948 msgstr "沒有下一個區塊"

949

950 -#: add-patch.c:1532

950 +#: add-patch.c:1537

951 msgid "No other hunks to goto"

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

953

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

954 +#: add-patch.c:1548 git-add--interactive.perl:1606

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

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

957

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

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

959 msgid "go to which hunk? "

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

961

962 -#: add-patch.c:1555

962 +#: add-patch.c:1560

963 #, c-format

964 msgid "Invalid number: '%s'"

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

966

967 -#: add-patch.c:1560

967 +#: add-patch.c:1565

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

973 +#: add-patch.c:1574

974 msgid "No other hunks to search"

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

976

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

977 +#: add-patch.c:1580 git-add--interactive.perl:1661

978 msgid "search for regex? "

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

980

981 -#: add-patch.c:1590

981 +#: add-patch.c:1595

982 #, c-format

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

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

985

986 -#: add-patch.c:1607

986 +#: add-patch.c:1612

987 msgid "No hunk matches the given pattern"

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

989

990 -#: add-patch.c:1614

990 +#: add-patch.c:1619

991 msgid "Sorry, cannot split this hunk"

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

993

994 -#: add-patch.c:1618

994 +#: add-patch.c:1623

995 #, c-format

996 msgid "Split into %d hunks."

997 msgstr "分割為 %d 塊。"

998

999 -#: add-patch.c:1622

999 +#: add-patch.c:1627

1000 msgid "Sorry, cannot edit this hunk"

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

1002

1003 -#: add-patch.c:1674

1003 +#: add-patch.c:1679

1004 msgid "'git apply' failed"

1005 msgstr "'git apply' 失敗"

1006

1007 -#: advice.c:140

1007 +#: advice.c:143

1008 #, c-format

1009 msgid ""

1010 "\n"

@@ -1013,37 +1013,37 @@ msgstr ""

1013 "\n"

1014 "請使用「git config advice.%s false」來停用此訊息"

1015

1016 -#: advice.c:156

1016 +#: advice.c:159

1017 #, c-format

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

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

1020

1021 -#: advice.c:247

1021 +#: advice.c:250

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

1023 msgstr "無法揀選，因為您有未合併的檔案。"

1024

1025 -#: advice.c:249

1025 +#: advice.c:252

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

1027 msgstr "無法提交，因為您有未合併的檔案。"

1028

1029 -#: advice.c:251

1029 +#: advice.c:254

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

1031 msgstr "無法合併，因為您有未合併的檔案。"

1032

1033 -#: advice.c:253

1033 +#: advice.c:256

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

1035 msgstr "無法拉取，因為您有未合併的檔案。"

1036

1037 -#: advice.c:255

1037 +#: advice.c:258

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

1039 msgstr "無法還原提交，因為您有未合併的檔案。"

1040

1041 -#: advice.c:257

1041 +#: advice.c:260

1042 #, c-format

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

1044 msgstr "無法 %s，因為您有未合併的檔案。"

1045

1046 -#: advice.c:265

1046 +#: advice.c:268

1047 msgid ""

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

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

@@ -1051,23 +1051,23 @@ msgstr ""

1051 "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"

1052 "解決方案並提交。"

1053

1054 -#: advice.c:273

1054 +#: advice.c:276

1055 msgid "Exiting because of an unresolved conflict."

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

1057

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

1058 +#: advice.c:281 builtin/merge.c:1369

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

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

1061

1062 -#: advice.c:280

1062 +#: advice.c:283

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

1064 msgstr "請在合併前先提交您的修改。"

1065

1066 -#: advice.c:281

1066 +#: advice.c:284

1067 msgid "Exiting because of unfinished merge."

1068 msgstr "因為存在未完成的合併而離開。"

1069

1070 -#: advice.c:287

1070 +#: advice.c:290

1071 #, c-format

1072 msgid ""

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

@@ -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:72 setup.c:308

1347 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 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 apply.c:3953

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

1368 #, c-format

1369 msgid "%s: does not match index"

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

@@ -1423,297 +1423,297 @@ msgstr "無效路徑 '%s'"

1423 msgid "%s: already exists in index"

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

1425

1426 -#: apply.c:3956

1426 +#: apply.c:3954

1427 #, c-format

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

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

1430

1431 -#: apply.c:3976

1431 +#: apply.c:3974

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

1436 +#: apply.c:3979

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

1441 +#: apply.c:3999

1442 #, c-format

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

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

1445

1446 -#: apply.c:4005

1446 +#: apply.c:4003

1447 #, c-format

1448 msgid "%s: patch does not apply"

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

1450

1451 -#: apply.c:4020

1451 +#: apply.c:4018

1452 #, c-format

1453 msgid "Checking patch %s..."

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

1455

1456 -#: apply.c:4112

1456 +#: apply.c:4110

1457 #, c-format

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

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

1460

1461 -#: apply.c:4119

1461 +#: apply.c:4117

1462 #, c-format

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

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

1465

1466 -#: apply.c:4122

1466 +#: apply.c:4120

1467 #, c-format

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

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

1470

1471 -#: apply.c:4131

1471 +#: apply.c:4129

1472 #, c-format

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

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

1475

1476 -#: apply.c:4141

1476 +#: apply.c:4139

1477 #, c-format

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

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

1480

1481 -#: apply.c:4279

1481 +#: apply.c:4277

1482 #, c-format

1483 msgid "unable to remove %s from index"

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

1485

1486 -#: apply.c:4313

1486 +#: apply.c:4311

1487 #, c-format

1488 msgid "corrupt patch for submodule %s"

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

1490

1491 -#: apply.c:4319

1491 +#: apply.c:4317

1492 #, c-format

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

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

1495

1496 -#: apply.c:4327

1496 +#: apply.c:4325

1497 #, c-format

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

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

1500

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

1501 +#: apply.c:4331 apply.c:4476

1502 #, c-format

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

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

1505

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

1506 +#: apply.c:4374 builtin/bisect--helper.c:524

1507 #, c-format

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

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

1510

1511 -#: apply.c:4380

1511 +#: apply.c:4378

1512 #, c-format

1513 msgid "closing file '%s'"

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

1515

1516 -#: apply.c:4450

1516 +#: apply.c:4448

1517 #, c-format

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

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

1520

1521 -#: apply.c:4548

1521 +#: apply.c:4546

1522 #, c-format

1523 msgid "Applied patch %s cleanly."

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

1525

1526 -#: apply.c:4556

1526 +#: apply.c:4554

1527 msgid "internal error"

1528 msgstr "內部錯誤"

1529

1530 -#: apply.c:4559

1530 +#: apply.c:4557

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

1536 +#: apply.c:4568

1537 #, c-format

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

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

1540

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

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

1542 #, c-format

1543 msgid "cannot open %s"

1544 msgstr "不能開啟 %s"

1545

1546 -#: apply.c:4592

1546 +#: apply.c:4590

1547 #, c-format

1548 msgid "Hunk #%d applied cleanly."

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

1550

1551 -#: apply.c:4596

1551 +#: apply.c:4594

1552 #, c-format

1553 msgid "Rejected hunk #%d."

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

1555

1556 -#: apply.c:4715

1556 +#: apply.c:4718

1557 #, c-format

1558 msgid "Skipped patch '%s'."

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

1560

1561 -#: apply.c:4723

1561 +#: apply.c:4726

1562 msgid "unrecognized input"

1563 msgstr "無法識別的輸入"

1564

1565 -#: apply.c:4743

1565 +#: apply.c:4746

1566 msgid "unable to read index file"

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

1568

1569 -#: apply.c:4900

1569 +#: apply.c:4903

1570 #, c-format

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

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

1573

1574 -#: apply.c:4927

1574 +#: apply.c:4930

1575 #, c-format

1576 msgid "squelched %d whitespace error"

1577 msgid_plural "squelched %d whitespace errors"

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

1579

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

1580 +#: apply.c:4936 apply.c:4951

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

1586 +#: apply.c:4944

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:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1592 +#: apply.c:4960 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:4985

1596 +#: apply.c:4988

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

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

1599

1600 -#: apply.c:4988

1600 +#: apply.c:4991

1601 msgid "apply changes matching the given path"

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

1603

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

1604 +#: apply.c:4993 builtin/am.c:2266

1605 msgid "num"

1606 msgstr "數字"

1607

1608 -#: apply.c:4991

1608 +#: apply.c:4994

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

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

1611

1612 -#: apply.c:4994

1612 +#: apply.c:4997

1613 msgid "ignore additions made by the patch"

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

1615

1616 -#: apply.c:4996

1616 +#: apply.c:4999

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

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

1619

1620 -#: apply.c:5000

1620 +#: apply.c:5003

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

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

1623

1624 -#: apply.c:5002

1624 +#: apply.c:5005

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

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

1627

1628 -#: apply.c:5004

1628 +#: apply.c:5007

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

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

1631

1632 -#: apply.c:5006

1632 +#: apply.c:5009

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

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

1635

1636 -#: apply.c:5008

1636 +#: apply.c:5011

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

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

1639

1640 -#: apply.c:5010

1640 +#: apply.c:5013

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

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

1643

1644 -#: apply.c:5012

1644 +#: apply.c:5015

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

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

1647

1648 -#: apply.c:5015

1648 +#: apply.c:5018

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

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

1651

1652 -#: apply.c:5017

1652 +#: apply.c:5020

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

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

1655

1656 -#: apply.c:5019

1656 +#: apply.c:5022

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

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

1659

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

1660 +#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525

1661 msgid "paths are separated with NUL character"

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

1663

1664 -#: apply.c:5024

1664 +#: apply.c:5027

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

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

1667

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

1668 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98

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

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

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

1671 msgid "action"

1672 msgstr "動作"

1673

1674 -#: apply.c:5026

1674 +#: apply.c:5029

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

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

1677

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

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

1679 msgid "ignore changes in whitespace when finding context"

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

1681

1682 -#: apply.c:5035

1682 +#: apply.c:5038

1683 msgid "apply the patch in reverse"

1684 msgstr "反向套用修補檔"

1685

1686 -#: apply.c:5037

1686 +#: apply.c:5040

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

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

1689

1690 -#: apply.c:5039

1690 +#: apply.c:5042

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

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

1693

1694 -#: apply.c:5041

1694 +#: apply.c:5044

1695 msgid "allow overlapping hunks"

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

1697

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

1698 +#: apply.c:5045 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

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

1701 msgid "be verbose"

1702 msgstr "詳細輸出"

1703

1704 -#: apply.c:5044

1704 +#: apply.c:5047

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

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

1707

1708 -#: apply.c:5047

1708 +#: apply.c:5050

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

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

1711

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

1712 +#: apply.c:5052 builtin/am.c:2254

1713 msgid "root"

1714 msgstr "根目錄"

1715

1716 -#: apply.c:5050

1716 +#: apply.c:5053

1717 msgid "prepend <root> to all filenames"

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

1719

@@ -1727,16 +1727,16 @@ msgstr "不能開啟資料物件 %s"

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

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

1729

1730 -#: archive-tar.c:449

1730 +#: archive-tar.c:450

1731 #, c-format

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

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

1734

1735 -#: archive-tar.c:452

1735 +#: archive-tar.c:453

1736 msgid "unable to redirect descriptor"

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

1738

1739 -#: archive-tar.c:459

1739 +#: archive-tar.c:460

1740 #, c-format

1741 msgid "'%s' filter reported error"

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

@@ -1784,9 +1784,9 @@ msgstr "git archive --remote <版本庫> [--exec <指令>] --list"

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

1787 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886

1788 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786

1789 +#: builtin/merge.c:1138

1790 #, c-format

1791 msgid "could not read '%s'"

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

@@ -1825,118 +1825,110 @@ msgstr "找不到檔案：%s"

1825 msgid "Not a regular file: %s"

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

1827

1828 -#: archive.c:553

1828 +#: archive.c:555

1829 msgid "fmt"

1830 msgstr "格式"

1831

1832 -#: archive.c:553

1832 +#: archive.c:555

1833 msgid "archive format"

1834 msgstr "歸檔格式"

1835

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

1836 +#: archive.c:556 builtin/log.c:1765

1837 msgid "prefix"

1838 msgstr "前綴"

1839

1840 -#: archive.c:555

1840 +#: archive.c:557

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

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

1843

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

1844 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890

1845 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135

1846 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1847 +#: builtin/fast-export.c:1213 builtin/grep.c:919 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

1853 -#: archive.c:557

1853 +#: archive.c:559

1854 msgid "add untracked file to archive"

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

1856

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

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

1858 msgid "write the archive to this file"

1859 msgstr "歸檔寫入此檔案"

1860

1861 -#: archive.c:562

1861 +#: archive.c:564

1862 msgid "read .gitattributes in working directory"

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

1864

1865 -#: archive.c:563

1865 +#: archive.c:565

1866 msgid "report archived files on stderr"

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

1868

1869 -#: archive.c:564

1870 -msgid "store only"

1871 -msgstr "只儲存"

1872 -

1873 -#: archive.c:565

1874 -msgid "compress faster"

1875 -msgstr "壓縮速度更快"

1876 -

1877 -#: archive.c:573

1878 -msgid "compress better"

1879 -msgstr "壓縮效果更好"

1869 +#: archive.c:567

1870 +msgid "set compression level"

1871 +msgstr "設定壓縮級別"

1872

1881 -#: archive.c:576

1873 +#: archive.c:570

1874 msgid "list supported archive formats"

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

1876

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

1877 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117

1878 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1879 msgid "repo"

1880 msgstr "版本庫"

1881

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

1882 +#: archive.c:573 builtin/archive.c:92

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

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

1885

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

1886 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714

1887 #: builtin/notes.c:498

1888 msgid "command"

1889 msgstr "指令"

1890

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

1891 +#: archive.c:575 builtin/archive.c:94

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

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

1894

1903 -#: archive.c:588

1895 +#: archive.c:582

1896 msgid "Unexpected option --remote"

1897 msgstr "未知參數 --remote"

1898

1907 -#: archive.c:590

1899 +#: archive.c:584

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

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

1902

1911 -#: archive.c:592

1903 +#: archive.c:586

1904 msgid "Unexpected option --output"

1905 msgstr "未知參數 --output"

1906

1915 -#: archive.c:594

1907 +#: archive.c:588

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

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

1910

1919 -#: archive.c:616

1911 +#: archive.c:610

1912 #, c-format

1913 msgid "Unknown archive format '%s'"

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

1915

1924 -#: archive.c:623

1916 +#: archive.c:619

1917 #, c-format

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

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

1920

1929 -#: attr.c:212

1921 +#: attr.c:202

1922 #, c-format

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

1924 msgstr "%.*s 不是一個有效的屬性名"

1925

1934 -#: attr.c:369

1926 +#: attr.c:359

1927 #, c-format

1928 msgid "%s not allowed: %s:%d"

1929 msgstr "不允許 %s：%s:%d"

1930

1939 -#: attr.c:409

1931 +#: attr.c:399

1932 msgid ""

1933 "Negative patterns are ignored in git attributes\n"

1934 "Use '\\!' for literal leading exclamation."

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

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

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

1938

1947 -#: bisect.c:476

1939 +#: bisect.c:489

1940 #, c-format

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

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

1943

1952 -#: bisect.c:686

1944 +#: bisect.c:699

1945 #, c-format

1946 msgid "We cannot bisect more!\n"

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

1948

1957 -#: bisect.c:753

1949 +#: bisect.c:766

1950 #, c-format

1951 msgid "Not a valid commit name %s"

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

1953

1962 -#: bisect.c:778

1954 +#: bisect.c:791

1955 #, c-format

1956 msgid ""

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

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

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

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

1962

1971 -#: bisect.c:783

1963 +#: bisect.c:796

1964 #, c-format

1965 msgid ""

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

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

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

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

1971

1980 -#: bisect.c:788

1972 +#: bisect.c:801

1973 #, c-format

1974 msgid ""

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

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

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

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

1980

1989 -#: bisect.c:796

1981 +#: bisect.c:809

1982 #, c-format

1983 msgid ""

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

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

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

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

1991

2000 -#: bisect.c:809

1992 +#: bisect.c:822

1993 #, c-format

1994 msgid ""

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

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

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

2001 "我們仍舊繼續。"

2002

2011 -#: bisect.c:848

2003 +#: bisect.c:861

2004 #, c-format

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

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

2007

2016 -#: bisect.c:898

2008 +#: bisect.c:911

2009 #, c-format

2010 msgid "a %s revision is needed"

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

2012

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

2013 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255

2014 #, c-format

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

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

2017

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

2018 +#: bisect.c:987 builtin/merge.c:152

2019 #, c-format

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

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

2022

2031 -#: bisect.c:1014

2023 +#: bisect.c:1027

2024 msgid "reading bisect refs failed"

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

2026

2035 -#: bisect.c:1044

2027 +#: bisect.c:1057

2028 #, c-format

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

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

2031

2040 -#: bisect.c:1053

2032 +#: bisect.c:1066

2033 #, c-format

2034 msgid ""

2035 "No testable commit found.\n"

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

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

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

2040

2049 -#: bisect.c:1082

2041 +#: bisect.c:1095

2042 #, c-format

2043 msgid "(roughly %d step)"

2044 msgid_plural "(roughly %d steps)"

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

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

2048 #. steps)" translation.

2049 #.

2058 -#: bisect.c:1088

2050 +#: bisect.c:1101

2051 #, c-format

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

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

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

2055

2064 -#: blame.c:2778

2056 +#: blame.c:2777

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

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

2059

2068 -#: blame.c:2792

2060 +#: blame.c:2791

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

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

2063

2072 -#: blame.c:2813

2064 +#: blame.c:2812

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

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

2067

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

2068 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138

2069 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409

2070 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336

2071 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

2072 +#: builtin/shortlog.c:267

2073 msgid "revision walk setup failed"

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

2075

2084 -#: blame.c:2840

2076 +#: blame.c:2839

2077 msgid ""

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

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

2080

2089 -#: blame.c:2851

2081 +#: blame.c:2850

2082 #, c-format

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

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

2085

2094 -#: blame.c:2862

2086 +#: blame.c:2861

2087 #, c-format

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

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

@@ -2249,7 +2241,7 @@ msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案"

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

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

2243

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

2244 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176

2245 #: builtin/commit.c:814

2246 #, c-format

2247 msgid "could not open '%s'"

@@ -2310,7 +2302,7 @@ msgstr "不支援的包版本 %d"

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

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

2304

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

2305 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408

2306 #, c-format

2307 msgid "unrecognized argument: %s"

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

@@ -2333,7 +2325,7 @@ msgstr "index-pack 終止"

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

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

2327

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

2328 +#: commit-graph.c:188 midx.c:47

2329 msgid "invalid hash version"

2330 msgstr "無效的雜湊版本"

2331

@@ -2397,198 +2389,188 @@ msgstr "無效的提交位置。提交圖形可能已損壞"

2389 msgid "could not find commit %s"

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

2391

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

2392 +#: commit-graph.c:1036 builtin/am.c:1292

2393 #, c-format

2394 msgid "unable to parse commit %s"

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

2396

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

2397 +#: commit-graph.c:1252 builtin/pack-objects.c:2864

2398 #, c-format

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

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

2401

2410 -#: commit-graph.c:1301

2402 +#: commit-graph.c:1283

2403 msgid "Loading known commits in commit graph"

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

2405

2414 -#: commit-graph.c:1318

2406 +#: commit-graph.c:1300

2407 msgid "Expanding reachable commits in commit graph"

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

2409

2418 -#: commit-graph.c:1338

2410 +#: commit-graph.c:1320

2411 msgid "Clearing commit marks in commit graph"

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

2413

2422 -#: commit-graph.c:1357

2414 +#: commit-graph.c:1339

2415 msgid "Computing commit graph generation numbers"

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

2417

2426 -#: commit-graph.c:1424

2418 +#: commit-graph.c:1406

2419 msgid "Computing commit changed paths Bloom filters"

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

2421

2430 -#: commit-graph.c:1501

2422 +#: commit-graph.c:1483

2423 msgid "Collecting referenced commits"

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

2425

2434 -#: commit-graph.c:1526

2426 +#: commit-graph.c:1508

2427 #, c-format

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

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

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

2431

2440 -#: commit-graph.c:1539

2432 +#: commit-graph.c:1521

2433 #, c-format

2434 msgid "error adding pack %s"

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

2436

2445 -#: commit-graph.c:1543

2437 +#: commit-graph.c:1525

2438 #, c-format

2439 msgid "error opening index for %s"

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

2441

2450 -#: commit-graph.c:1582

2442 +#: commit-graph.c:1562

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

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

2445

2454 -#: commit-graph.c:1597

2455 -msgid "Counting distinct commits in commit graph"

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

2457 -

2458 -#: commit-graph.c:1629

2446 +#: commit-graph.c:1580

2447 msgid "Finding extra edges in commit graph"

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

2449

2462 -#: commit-graph.c:1678

2450 +#: commit-graph.c:1628

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

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

2453

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

2454 +#: commit-graph.c:1670 midx.c:819

2455 #, c-format

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

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

2458

2471 -#: commit-graph.c:1733

2459 +#: commit-graph.c:1683

2460 msgid "unable to create temporary graph layer"

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

2462

2475 -#: commit-graph.c:1738

2463 +#: commit-graph.c:1688

2464 #, c-format

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

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

2467

2480 -#: commit-graph.c:1808

2468 +#: commit-graph.c:1758

2469 #, c-format

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

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

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

2473

2486 -#: commit-graph.c:1853

2474 +#: commit-graph.c:1803

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

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

2477

2490 -#: commit-graph.c:1869

2478 +#: commit-graph.c:1819

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

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

2481

2494 -#: commit-graph.c:1889

2482 +#: commit-graph.c:1839

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

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

2485

2498 -#: commit-graph.c:2015

2486 +#: commit-graph.c:1965

2487 msgid "Scanning merged commits"

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

2489

2502 -#: commit-graph.c:2026

2503 -#, c-format

2504 -msgid "unexpected duplicate commit id %s"

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

2506 -

2507 -#: commit-graph.c:2049

2490 +#: commit-graph.c:2009

2491 msgid "Merging commit-graph"

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

2493

2511 -#: commit-graph.c:2259

2512 -#, c-format

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

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

2494 +#: commit-graph.c:2115

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

2496 +msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用。"

2497

2516 -#: commit-graph.c:2270

2498 +#: commit-graph.c:2214

2499 msgid "too many commits to write graph"

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

2501

2520 -#: commit-graph.c:2363

2502 +#: commit-graph.c:2307

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

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

2505

2524 -#: commit-graph.c:2373

2506 +#: commit-graph.c:2317

2507 #, c-format

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

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

2510

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

2511 +#: commit-graph.c:2327 commit-graph.c:2342

2512 #, c-format

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

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

2515

2534 -#: commit-graph.c:2390

2516 +#: commit-graph.c:2334

2517 #, c-format

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

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

2520

2539 -#: commit-graph.c:2408

2521 +#: commit-graph.c:2352

2522 msgid "Verifying commits in commit graph"

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

2524

2543 -#: commit-graph.c:2423

2525 +#: commit-graph.c:2367

2526 #, c-format

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

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

2529

2548 -#: commit-graph.c:2430

2530 +#: commit-graph.c:2374

2531 #, c-format

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

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

2534

2553 -#: commit-graph.c:2440

2535 +#: commit-graph.c:2384

2536 #, c-format

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

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

2539

2558 -#: commit-graph.c:2449

2540 +#: commit-graph.c:2393

2541 #, c-format

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

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

2544

2563 -#: commit-graph.c:2463

2545 +#: commit-graph.c:2407

2546 #, c-format

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

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

2549

2568 -#: commit-graph.c:2468

2550 +#: commit-graph.c:2412

2551 #, c-format

2552 msgid ""

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

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

2555

2574 -#: commit-graph.c:2472

2556 +#: commit-graph.c:2416

2557 #, c-format

2558 msgid ""

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

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

2561

2580 -#: commit-graph.c:2488

2562 +#: commit-graph.c:2432

2563 #, c-format

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

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

2566

2585 -#: commit-graph.c:2494

2567 +#: commit-graph.c:2438

2568 #, c-format

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

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

2571

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

2572 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403

2573 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457

2574 #, c-format

2575 msgid "could not parse %s"

2576 msgstr "不能解析 %s"

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

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

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

2674

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

2675 +#: config.c:408 sequencer.c:2580

2676 #, c-format

2677 msgid "invalid key: %s"

2678 msgstr "無效鍵名：%s"

@@ -2879,77 +2861,77 @@ msgstr "無法解析指令列設定中的 '%s'"

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

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

2863

2882 -#: config.c:2470

2864 +#: config.c:2473

2865 #, c-format

2866 msgid "invalid section name '%s'"

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

2868

2887 -#: config.c:2502

2869 +#: config.c:2505

2870 #, c-format

2871 msgid "%s has multiple values"

2872 msgstr "%s 有多個取值"

2873

2892 -#: config.c:2531

2874 +#: config.c:2534

2875 #, c-format

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

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

2878

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

2879 +#: config.c:2786 config.c:3112

2880 #, c-format

2881 msgid "could not lock config file %s"

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

2883

2902 -#: config.c:2794

2884 +#: config.c:2797

2885 #, c-format

2886 msgid "opening %s"

2887 msgstr "開啟 %s"

2888

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

2889 +#: config.c:2834 builtin/config.c:361

2890 #, c-format

2891 msgid "invalid pattern: %s"

2892 msgstr "無效模式：%s"

2893

2912 -#: config.c:2854

2894 +#: config.c:2859

2895 #, c-format

2896 msgid "invalid config file %s"

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

2898

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

2899 +#: config.c:2872 config.c:3125

2900 #, c-format

2901 msgid "fstat on %s failed"

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

2903

2922 -#: config.c:2878

2904 +#: config.c:2883

2905 #, c-format

2906 msgid "unable to mmap '%s'"

2907 msgstr "不能 mmap '%s'"

2908

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

2909 +#: config.c:2892 config.c:3130

2910 #, c-format

2911 msgid "chmod on %s failed"

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

2913

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

2914 +#: config.c:2977 config.c:3227

2915 #, c-format

2916 msgid "could not write config file %s"

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

2918

2937 -#: config.c:3006

2919 +#: config.c:3011

2920 #, c-format

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

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

2923

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

2924 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2925 #, c-format

2926 msgid "could not unset '%s'"

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

2928

2947 -#: config.c:3098

2929 +#: config.c:3103

2930 #, c-format

2931 msgid "invalid section name: %s"

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

2933

2952 -#: config.c:3265

2934 +#: config.c:3270

2935 #, c-format

2936 msgid "missing value for '%s'"

2937 msgstr "%s 的取值缺少"

@@ -3371,6 +3353,26 @@ msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多

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

3354 msgstr "已標記 %d 個資料島，結束。\n"

3355

3356 +#: diff-lib.c:534

3357 +msgid "--merge-base does not work with ranges"

3358 +msgstr "—merge-base 跟範圍無法搭配運作"

3359 +

3360 +#: diff-lib.c:536

3361 +msgid "--merge-base only works with commits"

3362 +msgstr "--merge-base 只能跟提交搭配才能運作"

3363 +

3364 +#: diff-lib.c:553

3365 +msgid "unable to get HEAD"

3366 +msgstr "不能取得 HEAD"

3367 +

3368 +#: diff-lib.c:560

3369 +msgid "no merge base found"

3370 +msgstr "找不到合併基底"

3371 +

3372 +#: diff-lib.c:562

3373 +msgid "multiple merge bases found"

3374 +msgstr "找到多個合併基底"

3375 +

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

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

3378 msgstr "git diff --no-index [<選項>] <路徑> <路徑>"

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

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

3433 "%s"

3434

3433 -#: diff.c:4269

3435 +#: diff.c:4276

3436 #, c-format

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

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

3439

3438 -#: diff.c:4618

3440 +#: diff.c:4625

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

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

3443

3442 -#: diff.c:4621

3444 +#: diff.c:4628

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

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

3447

3446 -#: diff.c:4699

3448 +#: diff.c:4707

3449 msgid "--follow requires exactly one pathspec"

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

3451

3450 -#: diff.c:4747

3452 +#: diff.c:4755

3453 #, c-format

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

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

3456

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

3457 +#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303

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

3459 #, c-format

3460 msgid "%s expects a numerical value"

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

3462

3461 -#: diff.c:4784

3463 +#: diff.c:4792

3464 #, c-format

3465 msgid ""

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

@@ -3467,195 +3469,200 @@ msgstr ""

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

3470 "%s"

3471

3470 -#: diff.c:4869

3472 +#: diff.c:4877

3473 #, c-format

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

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

3476

3475 -#: diff.c:4893

3477 +#: diff.c:4901

3478 #, c-format

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

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

3481

3480 -#: diff.c:4907

3482 +#: diff.c:4915

3483 #, c-format

3484 msgid "unable to resolve '%s'"

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

3486

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

3487 +#: diff.c:4965 diff.c:4971

3488 #, c-format

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

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

3491

3490 -#: diff.c:4975

3492 +#: diff.c:4983

3493 #, c-format

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

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

3496

3495 -#: diff.c:4996

3497 +#: diff.c:5004

3498 #, c-format

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

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

3501

3500 -#: diff.c:5015

3502 +#: diff.c:5023

3503 #, c-format

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

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

3506

3505 -#: diff.c:5055

3507 +#: diff.c:5063

3508 msgid ""

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

3510 "\"histogram\""

3511 msgstr ""

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

3513

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

3514 +#: diff.c:5099 diff.c:5119

3515 #, c-format

3516 msgid "invalid argument to %s"

3517 msgstr "%s 的參數無效"

3518

3517 -#: diff.c:5248

3519 +#: diff.c:5223

3520 +#, c-format

3521 +msgid "invalid regex given to -I: '%s'"

3522 +msgstr "傳入 -I 的正規表示式無效：「%s」"

3523 +

3524 +#: diff.c:5272

3525 #, c-format

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

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

3528

3522 -#: diff.c:5304

3529 +#: diff.c:5328

3530 #, c-format

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

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

3533

3527 -#: diff.c:5327

3534 +#: diff.c:5351

3535 msgid "Diff output format options"

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

3537

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

3538 +#: diff.c:5353 diff.c:5359

3539 msgid "generate patch"

3540 msgstr "生成修補檔"

3541

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

3542 +#: diff.c:5356 builtin/log.c:178

3543 msgid "suppress diff output"

3544 msgstr "不顯示差異輸出"

3545

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

3546 +#: diff.c:5361 diff.c:5475 diff.c:5482

3547 msgid "<n>"

3548 msgstr "<n>"

3549

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

3550 +#: diff.c:5362 diff.c:5365

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

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

3553

3547 -#: diff.c:5343

3554 +#: diff.c:5367

3555 msgid "generate the diff in raw format"

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

3557

3551 -#: diff.c:5346

3558 +#: diff.c:5370

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

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

3561

3555 -#: diff.c:5350

3562 +#: diff.c:5374

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

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

3565

3559 -#: diff.c:5354

3566 +#: diff.c:5378

3567 msgid "machine friendly --stat"

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

3569

3563 -#: diff.c:5357

3570 +#: diff.c:5381

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

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

3573

3567 -#: diff.c:5359 diff.c:5367

3574 +#: diff.c:5383 diff.c:5391

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

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

3577

3571 -#: diff.c:5360

3578 +#: diff.c:5384

3579 msgid ""

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

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

3582

3576 -#: diff.c:5364

3583 +#: diff.c:5388

3584 msgid "synonym for --dirstat=cumulative"

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

3586

3580 -#: diff.c:5368

3587 +#: diff.c:5392

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

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

3590

3584 -#: diff.c:5372

3591 +#: diff.c:5396

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

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

3594

3588 -#: diff.c:5375

3595 +#: diff.c:5399

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

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

3598

3592 -#: diff.c:5378

3599 +#: diff.c:5402

3600 msgid "show only names of changed files"

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

3602

3596 -#: diff.c:5381

3603 +#: diff.c:5405

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

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

3606

3600 -#: diff.c:5383

3607 +#: diff.c:5407

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

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

3610

3604 -#: diff.c:5384

3611 +#: diff.c:5408

3612 msgid "generate diffstat"

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

3614

3608 -#: diff.c:5386 diff.c:5389 diff.c:5392

3615 +#: diff.c:5410 diff.c:5413 diff.c:5416

3616 msgid "<width>"

3617 msgstr "<寬度>"

3618

3612 -#: diff.c:5387

3619 +#: diff.c:5411

3620 msgid "generate diffstat with a given width"

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

3622

3616 -#: diff.c:5390

3623 +#: diff.c:5414

3624 msgid "generate diffstat with a given name width"

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

3626

3620 -#: diff.c:5393

3627 +#: diff.c:5417

3628 msgid "generate diffstat with a given graph width"

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

3630

3624 -#: diff.c:5395

3631 +#: diff.c:5419

3632 msgid "<count>"

3633 msgstr "<次數>"

3634

3628 -#: diff.c:5396

3635 +#: diff.c:5420

3636 msgid "generate diffstat with limited lines"

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

3638

3632 -#: diff.c:5399

3639 +#: diff.c:5423

3640 msgid "generate compact summary in diffstat"

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

3642

3636 -#: diff.c:5402

3643 +#: diff.c:5426

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

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

3646

3640 -#: diff.c:5405

3647 +#: diff.c:5429

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

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

3650

3644 -#: diff.c:5407

3651 +#: diff.c:5431

3652 msgid "show colored diff"

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

3654

3648 -#: diff.c:5408

3655 +#: diff.c:5432

3656 msgid "<kind>"

3657 msgstr "<類型>"

3658

3652 -#: diff.c:5409

3659 +#: diff.c:5433

3660 msgid ""

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

3662 "diff"

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

3664

3658 -#: diff.c:5412

3665 +#: diff.c:5436

3666 msgid ""

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

3668 "--numstat"

@@ -3663,295 +3670,299 @@ msgstr ""

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

3671 "符"

3672

3666 -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527

3673 +#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554

3674 msgid "<prefix>"

3675 msgstr "<前綴>"

3676

3670 -#: diff.c:5416

3677 +#: diff.c:5440

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

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

3680

3674 -#: diff.c:5419

3681 +#: diff.c:5443

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

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

3684

3678 -#: diff.c:5422

3685 +#: diff.c:5446

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

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

3688

3682 -#: diff.c:5425

3689 +#: diff.c:5449

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

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

3692

3686 -#: diff.c:5428

3693 +#: diff.c:5452

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

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

3696

3690 -#: diff.c:5432 diff.c:5437 diff.c:5442

3697 +#: diff.c:5456 diff.c:5461 diff.c:5466

3698 msgid "<char>"

3699 msgstr "<字元>"

3700

3694 -#: diff.c:5433

3701 +#: diff.c:5457

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

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

3704

3698 -#: diff.c:5438

3705 +#: diff.c:5462

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

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

3708

3702 -#: diff.c:5443

3709 +#: diff.c:5467

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

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

3712

3706 -#: diff.c:5446

3713 +#: diff.c:5470

3714 msgid "Diff rename options"

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

3716

3710 -#: diff.c:5447

3717 +#: diff.c:5471

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

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

3720

3714 -#: diff.c:5448

3721 +#: diff.c:5472

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

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

3724

3718 -#: diff.c:5452

3725 +#: diff.c:5476

3726 msgid "detect renames"

3727 msgstr "檢測重新命名"

3728

3722 -#: diff.c:5456

3729 +#: diff.c:5480

3730 msgid "omit the preimage for deletes"

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

3732

3726 -#: diff.c:5459

3733 +#: diff.c:5483

3734 msgid "detect copies"

3735 msgstr "檢測複製"

3736

3730 -#: diff.c:5463

3737 +#: diff.c:5487

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

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

3740

3734 -#: diff.c:5465

3741 +#: diff.c:5489

3742 msgid "disable rename detection"

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

3744

3738 -#: diff.c:5468

3745 +#: diff.c:5492

3746 msgid "use empty blobs as rename source"

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

3748

3742 -#: diff.c:5470

3749 +#: diff.c:5494

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

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

3752

3746 -#: diff.c:5473

3753 +#: diff.c:5497

3754 msgid ""

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

3756 "given limit"

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

3758

3752 -#: diff.c:5475

3759 +#: diff.c:5499

3760 msgid "Diff algorithm options"

3761 msgstr "差異演算法選項"

3762

3756 -#: diff.c:5477

3763 +#: diff.c:5501

3764 msgid "produce the smallest possible diff"

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

3766

3760 -#: diff.c:5480

3767 +#: diff.c:5504

3768 msgid "ignore whitespace when comparing lines"

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

3770

3764 -#: diff.c:5483

3771 +#: diff.c:5507

3772 msgid "ignore changes in amount of whitespace"

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

3774

3768 -#: diff.c:5486

3775 +#: diff.c:5510

3776 msgid "ignore changes in whitespace at EOL"

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

3778

3772 -#: diff.c:5489

3779 +#: diff.c:5513

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

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

3782

3776 -#: diff.c:5492

3783 +#: diff.c:5516

3784 msgid "ignore changes whose lines are all blank"

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

3786

3780 -#: diff.c:5495

3787 +#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588

3788 +msgid "<regex>"

3789 +msgstr "<正則>"

3790 +

3791 +#: diff.c:5519

3792 +msgid "ignore changes whose all lines match <regex>"

3793 +msgstr "忽略整行符合 <regex> 的變更"

3794 +

3795 +#: diff.c:5522

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

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

3798

3784 -#: diff.c:5498

3799 +#: diff.c:5525

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

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

3802

3788 -#: diff.c:5502

3803 +#: diff.c:5529

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

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

3806

3792 -#: diff.c:5504

3807 +#: diff.c:5531

3808 msgid "<algorithm>"

3809 msgstr "<演算法>"

3810

3796 -#: diff.c:5505

3811 +#: diff.c:5532

3812 msgid "choose a diff algorithm"

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

3814

3800 -#: diff.c:5507

3815 +#: diff.c:5534

3816 msgid "<text>"

3817 msgstr "<文字>"

3818

3804 -#: diff.c:5508

3819 +#: diff.c:5535

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

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

3822

3808 -#: diff.c:5510 diff.c:5519 diff.c:5522

3823 +#: diff.c:5537 diff.c:5546 diff.c:5549

3824 msgid "<mode>"

3825 msgstr "<模式>"

3826

3812 -#: diff.c:5511

3827 +#: diff.c:5538

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

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

3830

3816 -#: diff.c:5513 diff.c:5516 diff.c:5561

3817 -msgid "<regex>"

3818 -msgstr "<正則>"

3819 -

3820 -#: diff.c:5514

3831 +#: diff.c:5541

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

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

3834

3824 -#: diff.c:5517

3835 +#: diff.c:5544

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

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

3838

3828 -#: diff.c:5520

3839 +#: diff.c:5547

3840 msgid "moved lines of code are colored differently"

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

3842

3832 -#: diff.c:5523

3843 +#: diff.c:5550

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

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

3846

3836 -#: diff.c:5526

3847 +#: diff.c:5553

3848 msgid "Other diff options"

3849 msgstr "其它差異選項"

3850

3840 -#: diff.c:5528

3851 +#: diff.c:5555

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

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

3854

3844 -#: diff.c:5532

3855 +#: diff.c:5559

3856 msgid "treat all files as text"

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

3858

3848 -#: diff.c:5534

3859 +#: diff.c:5561

3860 msgid "swap two inputs, reverse the diff"

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

3862

3852 -#: diff.c:5536

3863 +#: diff.c:5563

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

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

3866

3856 -#: diff.c:5538

3867 +#: diff.c:5565

3868 msgid "disable all output of the program"

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

3870

3860 -#: diff.c:5540

3871 +#: diff.c:5567

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

3873 msgstr "允許執行一個外部的差異協助工具"

3874

3864 -#: diff.c:5542

3875 +#: diff.c:5569

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

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

3878

3868 -#: diff.c:5544

3879 +#: diff.c:5571

3880 msgid "<when>"

3881 msgstr "<何時>"

3882

3872 -#: diff.c:5545

3883 +#: diff.c:5572

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

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

3886

3876 -#: diff.c:5548

3887 +#: diff.c:5575

3888 msgid "<format>"

3889 msgstr "<格式>"

3890

3880 -#: diff.c:5549

3891 +#: diff.c:5576

3892 msgid "specify how differences in submodules are shown"

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

3894

3884 -#: diff.c:5553

3895 +#: diff.c:5580

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

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

3898

3888 -#: diff.c:5556

3899 +#: diff.c:5583

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

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

3902

3892 -#: diff.c:5558

3903 +#: diff.c:5585

3904 msgid "<string>"

3905 msgstr "<字串>"

3906

3896 -#: diff.c:5559

3907 +#: diff.c:5586

3908 msgid ""

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

3910 "string"

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

3912

3902 -#: diff.c:5562

3913 +#: diff.c:5589

3914 msgid ""

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

3916 "regex"

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

3918

3908 -#: diff.c:5565

3919 +#: diff.c:5592

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

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

3922

3912 -#: diff.c:5568

3923 +#: diff.c:5595

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

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

3926

3916 -#: diff.c:5571

3927 +#: diff.c:5598

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

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

3930

3920 -#: diff.c:5572

3931 +#: diff.c:5599

3932 msgid "<object-id>"

3933 msgstr "<物件 ID>"

3934

3924 -#: diff.c:5573

3935 +#: diff.c:5600

3936 msgid ""

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

3938 "object"

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

3940

3930 -#: diff.c:5575

3941 +#: diff.c:5602

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

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

3944

3934 -#: diff.c:5576

3945 +#: diff.c:5603

3946 msgid "select files by diff type"

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

3948

3938 -#: diff.c:5578

3949 +#: diff.c:5605

3950 msgid "<file>"

3951 msgstr "<檔案>"

3952

3942 -#: diff.c:5579

3953 +#: diff.c:5606

3954 msgid "Output to a specific file"

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

3956

3946 -#: diff.c:6236

3957 +#: diff.c:6263

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

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

3960

3950 -#: diff.c:6239

3961 +#: diff.c:6266

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

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

3964

3954 -#: diff.c:6242

3965 +#: diff.c:6269

3966 #, c-format

3967 msgid ""

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

@@ -4052,245 +4063,245 @@ msgstr "不能設定 GIT_DIR 為 '%s'"

4063 msgid "too many args to run %s"

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

4065

4055 -#: fetch-pack.c:176

4066 +#: fetch-pack.c:177

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

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

4069

4059 -#: fetch-pack.c:179

4070 +#: fetch-pack.c:180

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

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

4073

4063 -#: fetch-pack.c:190

4074 +#: fetch-pack.c:191

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

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

4077

4067 -#: fetch-pack.c:210

4078 +#: fetch-pack.c:211

4079 #, c-format

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

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

4082

4072 -#: fetch-pack.c:221

4083 +#: fetch-pack.c:222

4084 msgid "unable to write to remote"

4085 msgstr "無法寫到遠端"

4086

4076 -#: fetch-pack.c:282

4087 +#: fetch-pack.c:283

4088 msgid "--stateless-rpc requires multi_ack_detailed"

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

4090

4080 -#: fetch-pack.c:375 fetch-pack.c:1397

4091 +#: fetch-pack.c:378 fetch-pack.c:1406

4092 #, c-format

4093 msgid "invalid shallow line: %s"

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

4095

4085 -#: fetch-pack.c:381 fetch-pack.c:1403

4096 +#: fetch-pack.c:384 fetch-pack.c:1412

4097 #, c-format

4098 msgid "invalid unshallow line: %s"

4099 msgstr "無效的 unshallow 訊息：%s"

4100

4090 -#: fetch-pack.c:383 fetch-pack.c:1405

4101 +#: fetch-pack.c:386 fetch-pack.c:1414

4102 #, c-format

4103 msgid "object not found: %s"

4104 msgstr "物件未找到：%s"

4105

4095 -#: fetch-pack.c:386 fetch-pack.c:1408

4106 +#: fetch-pack.c:389 fetch-pack.c:1417

4107 #, c-format

4108 msgid "error in object: %s"

4109 msgstr "物件中發生錯誤：%s"

4110

4100 -#: fetch-pack.c:388 fetch-pack.c:1410

4111 +#: fetch-pack.c:391 fetch-pack.c:1419

4112 #, c-format

4113 msgid "no shallow found: %s"

4114 msgstr "未發現 shallow：%s"

4115

4105 -#: fetch-pack.c:391 fetch-pack.c:1414

4116 +#: fetch-pack.c:394 fetch-pack.c:1423

4117 #, c-format

4118 msgid "expected shallow/unshallow, got %s"

4119 msgstr "應為 shallow/unshallow，卻得到 %s"

4120

4110 -#: fetch-pack.c:431

4121 +#: fetch-pack.c:434

4122 #, c-format

4123 msgid "got %s %d %s"

4124 msgstr "得到 %s %d %s"

4125

4115 -#: fetch-pack.c:448

4126 +#: fetch-pack.c:451

4127 #, c-format

4128 msgid "invalid commit %s"

4129 msgstr "無效提交 %s"

4130

4120 -#: fetch-pack.c:479

4131 +#: fetch-pack.c:482

4132 msgid "giving up"

4133 msgstr "放棄"

4134

4124 -#: fetch-pack.c:492 progress.c:339

4135 +#: fetch-pack.c:495 progress.c:339

4136 msgid "done"

4137 msgstr "完成"

4138

4128 -#: fetch-pack.c:504

4139 +#: fetch-pack.c:507

4140 #, c-format

4141 msgid "got %s (%d) %s"

4142 msgstr "得到 %s (%d) %s"

4143

4133 -#: fetch-pack.c:540

4144 +#: fetch-pack.c:543

4145 #, c-format

4146 msgid "Marking %s as complete"

4147 msgstr "標記 %s 為完成"

4148

4138 -#: fetch-pack.c:755

4149 +#: fetch-pack.c:758

4150 #, c-format

4151 msgid "already have %s (%s)"

4152 msgstr "已經有 %s（%s）"

4153

4143 -#: fetch-pack.c:824

4154 +#: fetch-pack.c:827

4155 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4156 msgstr "fetch-pack：無法衍生 sideband 多路輸出"

4157

4147 -#: fetch-pack.c:832

4158 +#: fetch-pack.c:835

4159 msgid "protocol error: bad pack header"

4160 msgstr "協定錯誤：壞的包頭"

4161

4151 -#: fetch-pack.c:916

4162 +#: fetch-pack.c:919

4163 #, c-format

4164 msgid "fetch-pack: unable to fork off %s"

4165 msgstr "fetch-pack：無法衍生進程 %s"

4166

4156 -#: fetch-pack.c:933

4167 +#: fetch-pack.c:937

4168 #, c-format

4169 msgid "%s failed"

4170 msgstr "%s 失敗"

4171

4161 -#: fetch-pack.c:935

4172 +#: fetch-pack.c:939

4173 msgid "error in sideband demultiplexer"

4174 msgstr "sideband 多路輸出發生錯誤"

4175

4165 -#: fetch-pack.c:978

4176 +#: fetch-pack.c:982

4177 #, c-format

4178 msgid "Server version is %.*s"

4179 msgstr "伺服器版本 %.*s"

4180

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

4181 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005

4182 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021

4183 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037

4184 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059

4185 #, c-format

4186 msgid "Server supports %s"

4187 msgstr "伺服器支援 %s"

4188

4178 -#: fetch-pack.c:985

4189 +#: fetch-pack.c:992

4190 msgid "Server does not support shallow clients"

4191 msgstr "伺服器不支援 shalllow 用戶端"

4192

4182 -#: fetch-pack.c:1045

4193 +#: fetch-pack.c:1052

4194 msgid "Server does not support --shallow-since"

4195 msgstr "伺服器不支援 --shallow-since"

4196

4186 -#: fetch-pack.c:1050

4197 +#: fetch-pack.c:1057

4198 msgid "Server does not support --shallow-exclude"

4199 msgstr "伺服器不支援 --shallow-exclude"

4200

4190 -#: fetch-pack.c:1054

4201 +#: fetch-pack.c:1061

4202 msgid "Server does not support --deepen"

4203 msgstr "伺服器不支援 --deepen"

4204

4194 -#: fetch-pack.c:1056

4205 +#: fetch-pack.c:1063

4206 msgid "Server does not support this repository's object format"

4207 msgstr "伺服器不支援此版本庫的物件格式"

4208

4198 -#: fetch-pack.c:1069

4209 +#: fetch-pack.c:1076

4210 msgid "no common commits"

4211 msgstr "沒有共同的提交"

4212

4202 -#: fetch-pack.c:1081 fetch-pack.c:1619

4213 +#: fetch-pack.c:1088 fetch-pack.c:1628

4214 msgid "git fetch-pack: fetch failed."

4215 msgstr "git fetch-pack：取得失敗。"

4216

4206 -#: fetch-pack.c:1205

4217 +#: fetch-pack.c:1214

4218 #, c-format

4219 msgid "mismatched algorithms: client %s; server %s"

4220 msgstr "算法不一致：用戶端 %s；伺服器 %s"

4221

4211 -#: fetch-pack.c:1209

4222 +#: fetch-pack.c:1218

4223 #, c-format

4224 msgid "the server does not support algorithm '%s'"

4225 msgstr "伺服器不支援「%s」算法"

4226

4216 -#: fetch-pack.c:1229

4227 +#: fetch-pack.c:1238

4228 msgid "Server does not support shallow requests"

4229 msgstr "伺服器不支援 shalllow 請求"

4230

4220 -#: fetch-pack.c:1236

4231 +#: fetch-pack.c:1245

4232 msgid "Server supports filter"

4233 msgstr "伺服器支援 filter"

4234

4224 -#: fetch-pack.c:1275

4235 +#: fetch-pack.c:1284

4236 msgid "unable to write request to remote"

4237 msgstr "無法將請求寫到遠端"

4238

4228 -#: fetch-pack.c:1293

4239 +#: fetch-pack.c:1302

4240 #, c-format

4241 msgid "error reading section header '%s'"

4242 msgstr "讀取節標題 '%s' 發生錯誤"

4243

4233 -#: fetch-pack.c:1299

4244 +#: fetch-pack.c:1308

4245 #, c-format

4246 msgid "expected '%s', received '%s'"

4247 msgstr "預期 '%s'，得到 '%s'"

4248

4238 -#: fetch-pack.c:1360

4249 +#: fetch-pack.c:1369

4250 #, c-format

4251 msgid "unexpected acknowledgment line: '%s'"

4252 msgstr "意外的確認行：'%s'"

4253

4243 -#: fetch-pack.c:1365

4254 +#: fetch-pack.c:1374

4255 #, c-format

4256 msgid "error processing acks: %d"

4257 msgstr "處理 ack 發生錯誤：%d"

4258

4248 -#: fetch-pack.c:1375

4259 +#: fetch-pack.c:1384

4260 msgid "expected packfile to be sent after 'ready'"

4261 msgstr "預期在 'ready' 之後傳送 packfile"

4262

4252 -#: fetch-pack.c:1377

4263 +#: fetch-pack.c:1386

4264 msgid "expected no other sections to be sent after no 'ready'"

4265 msgstr "在沒有 'ready' 不應該傳送其它小節"

4266

4256 -#: fetch-pack.c:1419

4267 +#: fetch-pack.c:1428

4268 #, c-format

4269 msgid "error processing shallow info: %d"

4270 msgstr "處理淺複製訊息發生錯誤：%d"

4271

4261 -#: fetch-pack.c:1466

4272 +#: fetch-pack.c:1475

4273 #, c-format

4274 msgid "expected wanted-ref, got '%s'"

4275 msgstr "預期 wanted-ref，得到 '%s'"

4276

4266 -#: fetch-pack.c:1471

4277 +#: fetch-pack.c:1480

4278 #, c-format

4279 msgid "unexpected wanted-ref: '%s'"

4280 msgstr "意外的 wanted-ref：'%s'"

4281

4271 -#: fetch-pack.c:1476

4282 +#: fetch-pack.c:1485

4283 #, c-format

4284 msgid "error processing wanted refs: %d"

4285 msgstr "處理要取得的引用發生錯誤：%d"

4286

4276 -#: fetch-pack.c:1506

4287 +#: fetch-pack.c:1515

4288 msgid "git fetch-pack: expected response end packet"

4289 msgstr "git fetch-pack: 預期要有回應結束封包"

4290

4280 -#: fetch-pack.c:1887

4291 +#: fetch-pack.c:1897

4292 msgid "no matching remote head"

4293 msgstr "沒有符合的遠端分支"

4294

4284 -#: fetch-pack.c:1910 builtin/clone.c:692

4295 +#: fetch-pack.c:1920 builtin/clone.c:693

4296 msgid "remote did not send all necessary objects"

4297 msgstr "遠端沒有傳送所有必需的物件"

4298

4288 -#: fetch-pack.c:1937

4299 +#: fetch-pack.c:1947

4300 #, c-format

4301 msgid "no such remote ref %s"

4302 msgstr "沒有這樣的遠端引用 %s"

4303

4293 -#: fetch-pack.c:1940

4304 +#: fetch-pack.c:1950

4305 #, c-format

4306 msgid "Server does not allow request for unadvertised object %s"

4307 msgstr "伺服器不允許請求未公開的物件 %s"

@@ -4313,7 +4324,7 @@ msgstr "gpg 無法為資料簽名"

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

4325 msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'"

4326

4316 -#: grep.c:668

4327 +#: grep.c:640

4328 msgid ""

4329 "given pattern contains NULL byte (via -f <file>). This is only supported "

4330 "with -P under PCRE v2"

@@ -4321,18 +4332,18 @@ msgstr ""

4332 "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"

4333 "功能"

4334

4324 -#: grep.c:2128

4335 +#: grep.c:2100

4336 #, c-format

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

4338 msgstr "'%s'：無法讀取 %s"

4339

4329 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

4340 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89

4341 #: builtin/rm.c:135

4342 #, c-format

4343 msgid "failed to stat '%s'"

4344 msgstr "對 '%s' 呼叫 stat 失敗"

4345

4335 -#: grep.c:2156

4346 +#: grep.c:2128

4347 #, c-format

4348 msgid "'%s': short read"

4349 msgstr "'%s'：讀取不完整"

@@ -4423,7 +4434,7 @@ msgstr "外部指令"

4434 msgid "Command aliases"

4435 msgstr "指令別名"

4436

4426 -#: help.c:513

4437 +#: help.c:527

4438 #, c-format

4439 msgid ""

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

@@ -4432,31 +4443,31 @@ msgstr ""

4443 "'%s' 像是一個 git 指令，但卻無法執行。\n"

4444 "可能是 git-%s 受損？"

4445

4435 -#: help.c:572

4446 +#: help.c:543 help.c:631

4447 +#, c-format

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

4449 +msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"

4450 +

4451 +#: help.c:591

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

4453 msgstr "唉呀，您的系統中未發現 Git 指令。"

4454

4439 -#: help.c:594

4455 +#: help.c:613

4456 #, c-format

4457 msgid "WARNING: You called a Git command named '%s', which does not exist."

4458 msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"

4459

4444 -#: help.c:599

4460 +#: help.c:618

4461 #, c-format

4462 msgid "Continuing under the assumption that you meant '%s'."

4463 msgstr "假定你想要的是 '%s' 並繼續。"

4464

4449 -#: help.c:604

4465 +#: help.c:623

4466 #, c-format

4467 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4468 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"

4469

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 -

4459 -#: help.c:616

4470 +#: help.c:635

4471 msgid ""

4472 "\n"

4473 "The most similar command is"

@@ -4467,16 +4478,16 @@ msgstr[0] ""

4478 "\n"

4479 "最類似的指令有"

4480

4470 -#: help.c:656

4481 +#: help.c:675

4482 msgid "git version [<options>]"

4483 msgstr "git version [<選項>]"

4484

4474 -#: help.c:711

4485 +#: help.c:730

4486 #, c-format

4487 msgid "%s: %s - %s"

4488 msgstr "%s：%s - %s"

4489

4479 -#: help.c:715

4490 +#: help.c:734

4491 msgid ""

4492 "\n"

4493 "Did you mean this?"

@@ -4635,6 +4646,20 @@ msgstr "不能建立 '%s.lock'：%s"

4646 msgid "expected flush after ls-refs arguments"

4647 msgstr "在 ls-refs 引數之後應該有一個 flush 包"

4648

4649 +#: merge-ort-wrappers.c:13 merge-recursive.c:3672

4650 +#, c-format

4651 +msgid ""

4652 +"Your local changes to the following files would be overwritten by merge:\n"

4653 +" %s"

4654 +msgstr ""

4655 +"您對下列檔案的本機修改將被合併動作覆蓋：\n"

4656 +" %s"

4657 +

4658 +#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4659 +#, c-format

4660 +msgid "Already up to date!"

4661 +msgstr "已經是最新的！"

4662 +

4663 #: merge-recursive.c:356

4664 msgid "(bad commit)\n"

4665 msgstr "（壞提交）\n"

@@ -5014,10 +5039,6 @@ msgstr "新增 %s"

5039 msgid "CONFLICT (add/add): Merge conflict in %s"

5040 msgstr "衝突（add/add）：合併衝突於 %s"

5041

5017 -#: merge-recursive.c:3436

5018 -msgid "Already up to date!"

5019 -msgstr "已經是最新的！"

5020 -

5042 #: merge-recursive.c:3445

5043 #, c-format

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

@@ -5037,21 +5058,12 @@ msgstr[0] "發現 %u 個共同祖先："

5058 msgid "merge returned no commit"

5059 msgstr "合併未返回提交"

5060

5040 -#: merge-recursive.c:3672

5041 -#, c-format

5042 -msgid ""

5043 -"Your local changes to the following files would be overwritten by merge:\n"

5044 -" %s"

5045 -msgstr ""

5046 -"您對下列檔案的本機修改將被合併動作覆蓋：\n"

5047 -" %s"

5048 -

5061 #: merge-recursive.c:3769

5062 #, c-format

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

5064 msgstr "不能解析物件 '%s'"

5065

5054 -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881

5066 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895

5067 msgid "Unable to write index."

5068 msgstr "不能寫入索引。"

5069

@@ -5059,174 +5071,170 @@ msgstr "不能寫入索引。"

5071 msgid "failed to read the cache"

5072 msgstr "讀取快取失敗"

5073

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

5074 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917

5075 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817

5076 #: builtin/stash.c:265

5077 msgid "unable to write new index file"

5078 msgstr "無法寫新的索引檔案"

5079

5068 -#: midx.c:79

5080 +#: midx.c:80

5081 #, c-format

5082 msgid "multi-pack-index file %s is too small"

5083 msgstr "多包索引檔案 %s 太小"

5084

5073 -#: midx.c:95

5085 +#: midx.c:96

5086 #, c-format

5087 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5088 msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"

5089

5078 -#: midx.c:100

5090 +#: midx.c:101

5091 #, c-format

5092 msgid "multi-pack-index version %d not recognized"

5093 msgstr "multi-pack-index 版本 %d 不能被識別"

5094

5083 -#: midx.c:105

5095 +#: midx.c:106

5096 #, c-format

5097 msgid "multi-pack-index hash version %u does not match version %u"

5098 msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"

5099

5088 -#: midx.c:122

5100 +#: midx.c:123

5101 msgid "invalid chunk offset (too large)"

5102 msgstr "無效的區塊位移（太大）"

5103

5092 -#: midx.c:146

5104 +#: midx.c:147

5105 msgid "terminating multi-pack-index chunk id appears earlier than expected"

5106 msgstr "終止多包索引區塊 id 出現時間早於預期"

5107

5096 -#: midx.c:159

5108 +#: midx.c:160

5109 msgid "multi-pack-index missing required pack-name chunk"

5110 msgstr "多包索引缺少必需的包名塊"

5111

5100 -#: midx.c:161

5112 +#: midx.c:162

5113 msgid "multi-pack-index missing required OID fanout chunk"

5114 msgstr "多包索引缺少必需的物件 ID 扇出塊"

5115

5104 -#: midx.c:163

5116 +#: midx.c:164

5117 msgid "multi-pack-index missing required OID lookup chunk"

5118 msgstr "多包索引缺少必需的物件 ID 查詢塊"

5119

5108 -#: midx.c:165

5120 +#: midx.c:166

5121 msgid "multi-pack-index missing required object offsets chunk"

5122 msgstr "多包索引缺少必需的物件位移塊"

5123

5112 -#: midx.c:179

5124 +#: midx.c:180

5125 #, c-format

5126 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5127 msgstr "多包索引包名無序：'%s' 在 '%s' 之前"

5128

5117 -#: midx.c:222

5129 +#: midx.c:223

5130 #, c-format

5131 msgid "bad pack-int-id: %u (%u total packs)"

5132 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"

5133

5122 -#: midx.c:272

5134 +#: midx.c:273

5135 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5136 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"

5137

5126 -#: midx.c:300

5127 -msgid "error preparing packfile from multi-pack-index"

5128 -msgstr "從多包索引準備 packfile 時發生錯誤"

5129 -

5130 -#: midx.c:485

5138 +#: midx.c:480

5139 #, c-format

5140 msgid "failed to add packfile '%s'"

5141 msgstr "新增 packfile '%s' 失敗"

5142

5135 -#: midx.c:491

5143 +#: midx.c:486

5144 #, c-format

5145 msgid "failed to open pack-index '%s'"

5146 msgstr "開啟包索引 '%s' 失敗"

5147

5140 -#: midx.c:551

5148 +#: midx.c:546

5149 #, c-format

5150 msgid "failed to locate object %d in packfile"

5151 msgstr "在 packfile 中定位物件 %d 失敗"

5152

5145 -#: midx.c:853

5153 +#: midx.c:846

5154 msgid "Adding packfiles to multi-pack-index"

5155 msgstr "正在新增 packfile 至多包索引"

5156

5149 -#: midx.c:886

5157 +#: midx.c:879

5158 #, c-format

5159 msgid "did not see pack-file %s to drop"

5160 msgstr "沒有看到要捨棄的包檔案 %s"

5161

5154 -#: midx.c:938

5162 +#: midx.c:931

5163 msgid "no pack files to index."

5164 msgstr "沒有要索引的 pack 檔案。"

5165

5158 -#: midx.c:990

5166 +#: midx.c:982

5167 msgid "Writing chunks to multi-pack-index"

5168 msgstr "寫入區塊至多包索引"

5169

5162 -#: midx.c:1068

5170 +#: midx.c:1060

5171 #, c-format

5172 msgid "failed to clear multi-pack-index at %s"

5173 msgstr "清理位於 %s 的多包索引失敗"

5174

5167 -#: midx.c:1124

5175 +#: midx.c:1116

5176 msgid "multi-pack-index file exists, but failed to parse"

5177 msgstr "有 multi-pack-index 檔案，但無法解析"

5178

5171 -#: midx.c:1132

5179 +#: midx.c:1124

5180 msgid "Looking for referenced packfiles"

5181 msgstr "正在尋找引用的 packfile"

5182

5175 -#: midx.c:1147

5183 +#: midx.c:1139

5184 #, c-format

5185 msgid ""

5186 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5187 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5188

5181 -#: midx.c:1152

5189 +#: midx.c:1144

5190 msgid "the midx contains no oid"

5191 msgstr "midx 沒有 oid"

5192

5185 -#: midx.c:1161

5193 +#: midx.c:1153

5194 msgid "Verifying OID order in multi-pack-index"

5195 msgstr "正在驗證多包索引中的物件 ID 順序"

5196

5189 -#: midx.c:1170

5197 +#: midx.c:1162

5198 #, c-format

5199 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5200 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"

5201

5194 -#: midx.c:1190

5202 +#: midx.c:1182

5203 msgid "Sorting objects by packfile"

5204 msgstr "透過 packfile 為物件排序"

5205

5198 -#: midx.c:1197

5206 +#: midx.c:1189

5207 msgid "Verifying object offsets"

5208 msgstr "正在驗證物件位移"

5209

5202 -#: midx.c:1213

5210 +#: midx.c:1205

5211 #, c-format

5212 msgid "failed to load pack entry for oid[%d] = %s"

5213 msgstr "為 oid[%d] = %s 載入包條目失敗"

5214

5207 -#: midx.c:1219

5215 +#: midx.c:1211

5216 #, c-format

5217 msgid "failed to load pack-index for packfile %s"

5218 msgstr "為 packfile %s 載入包索引失敗"

5219

5212 -#: midx.c:1228

5220 +#: midx.c:1220

5221 #, c-format

5222 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5223 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"

5224

5217 -#: midx.c:1253

5225 +#: midx.c:1245

5226 msgid "Counting referenced objects"

5227 msgstr "正在計算引用物件"

5228

5221 -#: midx.c:1263

5229 +#: midx.c:1255

5230 msgid "Finding and deleting unreferenced packfiles"

5231 msgstr "正在尋找並刪除沒有參考的 packfile"

5232

5225 -#: midx.c:1454

5233 +#: midx.c:1446

5234 msgid "could not start pack-objects"

5235 msgstr "不能開始 pack-objects"

5236

5229 -#: midx.c:1474

5237 +#: midx.c:1466

5238 msgid "could not finish pack-objects"

5239 msgstr "不能結束 pack-objects"

5240

@@ -5314,16 +5322,16 @@ msgstr "雜湊值與 %s 不符合"

5322 msgid "unable to get size of %s"

5323 msgstr "不能得到 %s 的大小"

5324

5317 -#: packfile.c:630

5325 +#: packfile.c:615

5326 msgid "offset before end of packfile (broken .idx?)"

5327 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

5328

5321 -#: packfile.c:1922

5329 +#: packfile.c:1907

5330 #, c-format

5331 msgid "offset before start of pack index for %s (corrupt index?)"

5332 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

5333

5326 -#: packfile.c:1926

5334 +#: packfile.c:1911

5335 #, c-format

5336 msgid "offset beyond end of pack index for %s (truncated index?)"

5337 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

@@ -5566,7 +5574,7 @@ msgstr "協定錯誤：錯誤的行長度字串：%.4s"

5574 msgid "protocol error: bad line length %d"

5575 msgstr "協定錯誤：錯誤的行長度 %d"

5576

5569 -#: pkt-line.c:373 sideband.c:150

5577 +#: pkt-line.c:373 sideband.c:165

5578 #, c-format

5579 msgid "remote error: %s"

5580 msgstr "遠端錯誤：%s"

@@ -5613,7 +5621,7 @@ msgstr "不能啟動 `log`"

5621 msgid "could not read `log` output"

5622 msgstr "不能讀取 `log` 的輸出"

5623

5616 -#: range-diff.c:98 sequencer.c:5283

5624 +#: range-diff.c:98 sequencer.c:5310

5625 #, c-format

5626 msgid "could not parse commit '%s'"

5627 msgstr "不能解析提交 '%s'"

@@ -5630,11 +5638,11 @@ msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s

5638 msgid "could not parse git header '%.*s'"

5639 msgstr "無法解析 git 頭 '%.*s'"

5640

5633 -#: range-diff.c:301

5641 +#: range-diff.c:299

5642 msgid "failed to generate diff"

5643 msgstr "生成 diff 失敗"

5644

5637 -#: range-diff.c:534 range-diff.c:536

5645 +#: range-diff.c:532 range-diff.c:534

5646 #, c-format

5647 msgid "could not parse log for '%s'"

5648 msgstr "不能解析 '%s' 的日誌"

@@ -5751,8 +5759,8 @@ msgstr "'%s' 的未排序暫存條目"

5759

5760 #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5761 #: 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

5762 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991

5763 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507

5764 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5765 #: builtin/submodule--helper.c:332

5766 msgid "index file corrupt"

@@ -5808,12 +5816,12 @@ msgstr "無法重新整理共享索引 '%s'"

5816 msgid "broken index, expect %s in %s, got %s"

5817 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5818

5811 -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126

5819 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140

5820 #, c-format

5821 msgid "could not close '%s'"

5822 msgstr "不能關閉 '%s'"

5823

5816 -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185

5824 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231

5825 #, c-format

5826 msgid "could not stat '%s'"

5827 msgstr "不能對 '%s' 呼叫 stat"

@@ -5939,14 +5947,14 @@ msgstr ""

5947 "然而，如果您刪除全部內容，重定基底動作將會終止。\n"

5948 "\n"

5949

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

5950 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607

5951 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270

5952 #, c-format

5953 msgid "could not write '%s'"

5954 msgstr "不能寫入 '%s'"

5955

5948 -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222

5949 -#: builtin/rebase.c:246

5956 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228

5957 +#: builtin/rebase.c:252

5958 #, c-format

5959 msgid "could not write '%s'."

5960 msgstr "不能寫入 '%s'。"

@@ -5976,9 +5984,9 @@ msgstr ""

5984 "可選值有：ignore、warn、error。\n"

5985 "\n"

5986

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

5987 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394

5988 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239

5989 +#: builtin/rebase.c:264

5990 #, c-format

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

5992 msgstr "不能讀取 '%s'。"

@@ -6173,61 +6181,61 @@ msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"

6181 msgid "malformed format string %s"

6182 msgstr "錯誤的格式化字串 %s"

6183

6176 -#: ref-filter.c:1541

6184 +#: ref-filter.c:1549

6185 #, c-format

6186 msgid "no branch, rebasing %s"

6187 msgstr "非分支，正重定基底 %s"

6188

6181 -#: ref-filter.c:1544

6189 +#: ref-filter.c:1552

6190 #, c-format

6191 msgid "no branch, rebasing detached HEAD %s"

6192 msgstr "非分支，正重定基底分離開頭指標 %s"

6193

6186 -#: ref-filter.c:1547

6194 +#: ref-filter.c:1555

6195 #, c-format

6196 msgid "no branch, bisect started on %s"

6197 msgstr "非分支，二分尋找開始於 %s"

6198

6191 -#: ref-filter.c:1557

6199 +#: ref-filter.c:1565

6200 msgid "no branch"

6201 msgstr "非分支"

6202

6195 -#: ref-filter.c:1591 ref-filter.c:1800

6203 +#: ref-filter.c:1599 ref-filter.c:1808

6204 #, c-format

6205 msgid "missing object %s for %s"

6206 msgstr "缺少 %2$s 的物件 %1$s"

6207

6200 -#: ref-filter.c:1601

6208 +#: ref-filter.c:1609

6209 #, c-format

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

6211 msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"

6212

6205 -#: ref-filter.c:2054

6213 +#: ref-filter.c:2062

6214 #, c-format

6215 msgid "malformed object at '%s'"

6216 msgstr "格式錯誤的物件 '%s'"

6217

6210 -#: ref-filter.c:2143

6218 +#: ref-filter.c:2151

6219 #, c-format

6220 msgid "ignoring ref with broken name %s"

6221 msgstr "忽略帶有錯誤名稱 %s 的引用"

6222

6215 -#: ref-filter.c:2148 refs.c:657

6223 +#: ref-filter.c:2156 refs.c:676

6224 #, c-format

6225 msgid "ignoring broken ref %s"

6226 msgstr "忽略損壞的引用 %s"

6227

6220 -#: ref-filter.c:2464

6228 +#: ref-filter.c:2472

6229 #, c-format

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

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

6232

6225 -#: ref-filter.c:2563

6233 +#: ref-filter.c:2571

6234 #, c-format

6235 msgid "malformed object name %s"

6236 msgstr "格式錯誤的物件名 %s"

6237

6230 -#: ref-filter.c:2568

6238 +#: ref-filter.c:2576

6239 #, c-format

6240 msgid "option `%s' must point to a commit"

6241 msgstr "選項 `%s' 必須指向一個提交"

@@ -6237,65 +6245,90 @@ msgstr "選項 `%s' 必須指向一個提交"

6245 msgid "%s does not point to a valid object!"

6246 msgstr "%s 沒有指向一個有效的物件！"

6247

6240 -#: refs.c:572

6248 +#: refs.c:566

6249 +#, c-format

6250 +msgid ""

6251 +"Using '%s' as the name for the initial branch. This default branch name\n"

6252 +"is subject to change. To configure the initial branch name to use in all\n"

6253 +"of your new repositories, which will suppress this warning, call:\n"

6254 +"\n"

6255 +"\tgit config --global init.defaultBranch <name>\n"

6256 +"\n"

6257 +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"

6258 +"'development'. The just-created branch can be renamed via this command:\n"

6259 +"\n"

6260 +"\tgit branch -m <name>\n"

6261 +msgstr ""

6262 +"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n"

6263 +"如果要設定所有新版本庫要使用的初始分支名稱，\n"

6264 +"請呼叫（會隱藏這個警告）：\n"

6265 +"\n"

6266 +"\tgit config —global init.defaultBranch <name>\n"

6267 +"\n"

6268 +"除了 ‘master’ 外，常用的分支名稱有 ‘main’, ‘trunk’ 以及\n"

6269 +"‘development’。剛建立的分支可以用這個命令重新命名：\n"

6270 +"\n"

6271 +"\tgit branch -m <name>\n"

6272 +

6273 +#: refs.c:588

6274 #, c-format

6275 msgid "could not retrieve `%s`"

6276 msgstr "無法擷取「%s」"

6277

6245 -#: refs.c:579

6278 +#: refs.c:598

6279 #, c-format

6280 msgid "invalid branch name: %s = %s"

6281 msgstr "分支名稱無效：%s = %s"

6282

6250 -#: refs.c:655

6283 +#: refs.c:674

6284 #, c-format

6285 msgid "ignoring dangling symref %s"

6286 msgstr "忽略懸空符號引用 %s"

6287

6255 -#: refs.c:892

6288 +#: refs.c:911

6289 #, c-format

6290 msgid "log for ref %s has gap after %s"

6291 msgstr "引用 %s 的日誌在 %s 之後有缺口"

6292

6260 -#: refs.c:898

6293 +#: refs.c:917

6294 #, c-format

6295 msgid "log for ref %s unexpectedly ended on %s"

6296 msgstr "引用 %s 的日誌意外終止於 %s"

6297

6265 -#: refs.c:957

6298 +#: refs.c:976

6299 #, c-format

6300 msgid "log for %s is empty"

6301 msgstr "%s 的日誌為空"

6302

6270 -#: refs.c:1049

6303 +#: refs.c:1068

6304 #, c-format

6305 msgid "refusing to update ref with bad name '%s'"

6306 msgstr "拒絕更新有錯誤名稱 '%s' 的引用"

6307

6275 -#: refs.c:1120

6308 +#: refs.c:1139

6309 #, c-format

6310 msgid "update_ref failed for ref '%s': %s"

6311 msgstr "對引用 '%s' 執行 update_ref 失敗：%s"

6312

6280 -#: refs.c:1944

6313 +#: refs.c:1963

6314 #, c-format

6315 msgid "multiple updates for ref '%s' not allowed"

6316 msgstr "不允許對引用 '%s' 多次更新"

6317

6285 -#: refs.c:2024

6318 +#: refs.c:2043

6319 msgid "ref updates forbidden inside quarantine environment"

6320 msgstr "在隔離環境中禁止更新引用"

6321

6289 -#: refs.c:2035

6322 +#: refs.c:2054

6323 msgid "ref updates aborted by hook"

6324 msgstr "引用更新被掛鉤拒絕"

6325

6293 -#: refs.c:2135 refs.c:2165

6326 +#: refs.c:2154 refs.c:2184

6327 #, c-format

6328 msgid "'%s' exists; cannot create '%s'"

6329 msgstr "'%s' 已存在，無法建立 '%s'"

6330

6298 -#: refs.c:2141 refs.c:2176

6331 +#: refs.c:2160 refs.c:2195

6332 #, c-format

6333 msgid "cannot process '%s' and '%s' at the same time"

6334 msgstr "無法同時處理 '%s' 和 '%s'"

@@ -6316,7 +6349,7 @@ msgstr "無法刪除引用 %s：%s"

6349 msgid "could not delete references: %s"

6350 msgstr "無法刪除引用：%s"

6351

6319 -#: refspec.c:167

6352 +#: refspec.c:170

6353 #, c-format

6354 msgid "invalid refspec '%s'"

6355 msgstr "無效的引用表達式：'%s'"

@@ -6455,93 +6488,93 @@ msgstr "目標引用表達式 %s 符合超過一個"

6488 msgid "dst ref %s receives from more than one src"

6489 msgstr "目標引用 %s 接收超過一個源"

6490

6458 -#: remote.c:1703 remote.c:1804

6491 +#: remote.c:1714 remote.c:1815

6492 msgid "HEAD does not point to a branch"

6493 msgstr "HEAD 沒有指向一個分支"

6494

6462 -#: remote.c:1712

6495 +#: remote.c:1723

6496 #, c-format

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

6498 msgstr "沒有此分支：'%s'"

6499

6467 -#: remote.c:1715

6500 +#: remote.c:1726

6501 #, c-format

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

6503 msgstr "尚未給分支 '%s' 設定上游"

6504

6472 -#: remote.c:1721

6505 +#: remote.c:1732

6506 #, c-format

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

6508 msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"

6509

6477 -#: remote.c:1736

6510 +#: remote.c:1747

6511 #, c-format

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

6513 msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支"

6514

6482 -#: remote.c:1748

6515 +#: remote.c:1759

6516 #, c-format

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

6518 msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"

6519

6487 -#: remote.c:1758

6520 +#: remote.c:1769

6521 #, c-format

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

6523 msgstr "向 '%s' 推送引用規格未包含 '%s'"

6524

6492 -#: remote.c:1771

6525 +#: remote.c:1782

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

6527 msgstr "推送無目標（push.default 是 'nothing'）"

6528

6496 -#: remote.c:1793

6529 +#: remote.c:1804

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

6531 msgstr "無法解析 'simple' 推送至一個單獨的目標"

6532

6500 -#: remote.c:1922

6533 +#: remote.c:1933

6534 #, c-format

6535 msgid "couldn't find remote ref %s"

6536 msgstr "無法找到遠端引用 %s"

6537

6505 -#: remote.c:1935

6538 +#: remote.c:1946

6539 #, c-format

6540 msgid "* Ignoring funny ref '%s' locally"

6541 msgstr "* 在本機忽略可笑的引用 '%s'"

6542

6510 -#: remote.c:2098

6543 +#: remote.c:2109

6544 #, c-format

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

6546 msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"

6547

6515 -#: remote.c:2102

6548 +#: remote.c:2113

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

6550 msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n"

6551

6519 -#: remote.c:2105

6552 +#: remote.c:2116

6553 #, c-format

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

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

6556

6524 -#: remote.c:2109

6557 +#: remote.c:2120

6558 #, c-format

6559 msgid "Your branch and '%s' refer to different commits.\n"

6560 msgstr "您的分支和 '%s' 指向不同的提交。\n"

6561

6529 -#: remote.c:2112

6562 +#: remote.c:2123

6563 #, c-format

6564 msgid " (use \"%s\" for details)\n"

6565 msgstr " （使用 \"%s\" 檢視詳情）\n"

6566

6534 -#: remote.c:2116

6567 +#: remote.c:2127

6568 #, c-format

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

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

6571 msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"

6572

6540 -#: remote.c:2122

6573 +#: remote.c:2133

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

6575 msgstr " （使用 \"git push\" 來發布您的本機提交）\n"

6576

6544 -#: remote.c:2125

6577 +#: remote.c:2136

6578 #, c-format

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

6580 msgid_plural ""

@@ -6549,11 +6582,11 @@ msgid_plural ""

6582 msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"

6583

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

6552 -#: remote.c:2133

6585 +#: remote.c:2144

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

6587 msgstr " （使用 \"git pull\" 來更新您的本機分支）\n"

6588

6556 -#: remote.c:2136

6589 +#: remote.c:2147

6590 #, c-format

6591 msgid ""

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

@@ -6566,11 +6599,11 @@ msgstr[0] ""

6599 "並且分別有 %d 和 %d 處不同的提交。\n"

6600

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

6569 -#: remote.c:2146

6602 +#: remote.c:2157

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

6604 msgstr " （使用 \"git pull\" 來合併遠端分支）\n"

6605

6573 -#: remote.c:2337

6606 +#: remote.c:2349

6607 #, c-format

6608 msgid "cannot parse expected object name '%s'"

6609 msgstr "無法解析期望的物件名 '%s'"

@@ -6648,7 +6681,7 @@ msgstr "不能刪除 stray '%s'"

6681 msgid "Recorded preimage for '%s'"

6682 msgstr "為 '%s' 記錄 preimage"

6683

6651 -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975

6684 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992

6685 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6686 #, c-format

6687 msgid "could not create directory '%s'"

@@ -6687,44 +6720,43 @@ msgstr "不能開啟 rr-cache 目錄"

6720 msgid "could not determine HEAD revision"

6721 msgstr "不能確定 HEAD 版本"

6722

6690 -#: reset.c:70 reset.c:76 sequencer.c:3426

6723 +#: reset.c:70 reset.c:76 sequencer.c:3460

6724 #, c-format

6725 msgid "failed to find tree of %s"

6726 msgstr "無法找到 %s 指向的樹"

6727

6695 -#: revision.c:2344

6696 -#| msgid "git-over-rsync is no longer supported"

6728 +#: revision.c:2336

6729 msgid "--unpacked=<packfile> no longer supported"

6730 msgstr "--unpacked=<packfile> 已不受支援"

6731

6700 -#: revision.c:2364

6732 +#: revision.c:2356

6733 #, c-format

6734 msgid "unknown value for --diff-merges: %s"

6735 msgstr "--diff-merges 的值無效：%s"

6736

6705 -#: revision.c:2702

6737 +#: revision.c:2694

6738 msgid "your current branch appears to be broken"

6739 msgstr "您的目前分支好像被損壞"

6740

6709 -#: revision.c:2705

6741 +#: revision.c:2697

6742 #, c-format

6743 msgid "your current branch '%s' does not have any commits yet"

6744 msgstr "您的目前分支 '%s' 尚無任何提交"

6745

6714 -#: revision.c:2915

6746 +#: revision.c:2907

6747 msgid "-L does not yet support diff formats besides -p and -s"

6748 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"

6749

6718 -#: run-command.c:763

6750 +#: run-command.c:764

6751 msgid "open /dev/null failed"

6752 msgstr "不能開啟 /dev/null"

6753

6722 -#: run-command.c:1270

6754 +#: run-command.c:1271

6755 #, c-format

6756 msgid "cannot create async thread: %s"

6757 msgstr "不能建立 async 執行緒：%s"

6758

6727 -#: run-command.c:1334

6759 +#: run-command.c:1335

6760 #, c-format

6761 msgid ""

6762 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6733,79 +6765,79 @@ msgstr ""

6765 "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"

6766 "設定 `git config advice.ignoredHook false` 來關閉這條警告。"

6767

6736 -#: send-pack.c:145

6768 +#: send-pack.c:146

6769 msgid "unexpected flush packet while reading remote unpack status"

6770 msgstr "讀取遠端解包狀態時收到意外的 flush 包"

6771

6740 -#: send-pack.c:147

6772 +#: send-pack.c:148

6773 #, c-format

6774 msgid "unable to parse remote unpack status: %s"

6775 msgstr "不能解析遠端解包狀態：%s"

6776

6745 -#: send-pack.c:149

6777 +#: send-pack.c:150

6778 #, c-format

6779 msgid "remote unpack failed: %s"

6780 msgstr "遠端解包失敗：%s"

6781

6750 -#: send-pack.c:372

6782 +#: send-pack.c:374

6783 msgid "failed to sign the push certificate"

6784 msgstr "為推送證書籤名失敗"

6785

6754 -#: send-pack.c:460

6786 +#: send-pack.c:467

6787 msgid "the receiving end does not support this repository's hash algorithm"

6788 msgstr "接收端不支援此版本庫的雜湊算法"

6789

6758 -#: send-pack.c:469

6790 +#: send-pack.c:476

6791 msgid "the receiving end does not support --signed push"

6792 msgstr "接收端不支援簽名推送"

6793

6762 -#: send-pack.c:471

6794 +#: send-pack.c:478

6795 msgid ""

6796 "not sending a push certificate since the receiving end does not support --"

6797 "signed push"

6798 msgstr "未傳送推送證書，因為接收端不支援簽名推送"

6799

6768 -#: send-pack.c:483

6800 +#: send-pack.c:490

6801 msgid "the receiving end does not support --atomic push"

6802 msgstr "接收端不支援原子推送"

6803

6772 -#: send-pack.c:488

6804 +#: send-pack.c:495

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

6806 msgstr "接收端不支援推送選項"

6807

6776 -#: sequencer.c:194

6808 +#: sequencer.c:195

6809 #, c-format

6810 msgid "invalid commit message cleanup mode '%s'"

6811 msgstr "無效的提交訊息清理模式 '%s'"

6812

6781 -#: sequencer.c:308

6813 +#: sequencer.c:323

6814 #, c-format

6815 msgid "could not delete '%s'"

6816 msgstr "無法刪除 '%s'"

6817

6786 -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385

6818 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385

6819 #, c-format

6820 msgid "could not remove '%s'"

6821 msgstr "無法刪除 '%s'"

6822

6791 -#: sequencer.c:339

6823 +#: sequencer.c:353

6824 msgid "revert"

6825 msgstr "復原"

6826

6795 -#: sequencer.c:341

6827 +#: sequencer.c:355

6828 msgid "cherry-pick"

6829 msgstr "摘取"

6830

6799 -#: sequencer.c:343

6831 +#: sequencer.c:357

6832 msgid "rebase"

6833 msgstr "rebase"

6834

6803 -#: sequencer.c:345

6835 +#: sequencer.c:359

6836 #, c-format

6837 msgid "unknown action: %d"

6838 msgstr "未知動作：%d"

6839

6808 -#: sequencer.c:404

6840 +#: sequencer.c:418

6841 msgid ""

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

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

@@ -6813,7 +6845,7 @@ msgstr ""

6845 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"

6846 "指令標記修正後的檔案"

6847

6816 -#: sequencer.c:407

6848 +#: sequencer.c:421

6849 msgid ""

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

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

@@ -6822,43 +6854,43 @@ msgstr ""

6854 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"

6855 "對修正後的檔案做標記，然後用 'git commit' 提交"

6856

6825 -#: sequencer.c:420 sequencer.c:3028

6857 +#: sequencer.c:434 sequencer.c:3062

6858 #, c-format

6859 msgid "could not lock '%s'"

6860 msgstr "不能鎖定 '%s'"

6861

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

6862 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080

6863 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631

6864 #, c-format

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

6866 msgstr "不能寫入 '%s'"

6867

6836 -#: sequencer.c:427

6868 +#: sequencer.c:441

6869 #, c-format

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

6871 msgstr "不能將換行符號寫入 '%s'"

6872

6841 -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048

6842 -#: sequencer.c:3311

6873 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082

6874 +#: sequencer.c:3345

6875 #, c-format

6876 msgid "failed to finalize '%s'"

6877 msgstr "無法完成 '%s'"

6878

6847 -#: sequencer.c:471

6879 +#: sequencer.c:485

6880 #, c-format

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

6882 msgstr "您的本機修改將被%s覆蓋。"

6883

6852 -#: sequencer.c:475

6884 +#: sequencer.c:489

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

6886 msgstr "提交您的修改或儲藏後再繼續。"

6887

6856 -#: sequencer.c:507

6888 +#: sequencer.c:521

6889 #, c-format

6890 msgid "%s: fast-forward"

6891 msgstr "%s：快轉"

6892

6861 -#: sequencer.c:546 builtin/tag.c:566

6893 +#: sequencer.c:560 builtin/tag.c:566

6894 #, c-format

6895 msgid "Invalid cleanup mode %s"

6896 msgstr "無效的清理模式 %s"

@@ -6866,65 +6898,65 @@ msgstr "無效的清理模式 %s"

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

6899 #. "rebase".

6900 #.

6869 -#: sequencer.c:640

6901 +#: sequencer.c:670

6902 #, c-format

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

6904 msgstr "%s：無法寫入新索引檔案"

6905

6874 -#: sequencer.c:657

6906 +#: sequencer.c:687

6907 msgid "unable to update cache tree"

6908 msgstr "不能更新快取樹"

6909

6878 -#: sequencer.c:671

6910 +#: sequencer.c:701

6911 msgid "could not resolve HEAD commit"

6912 msgstr "不能解析 HEAD 提交"

6913

6882 -#: sequencer.c:751

6914 +#: sequencer.c:781

6915 #, c-format

6916 msgid "no key present in '%.*s'"

6917 msgstr "在 '%.*s' 中沒有 key"

6918

6887 -#: sequencer.c:762

6919 +#: sequencer.c:792

6920 #, c-format

6921 msgid "unable to dequote value of '%s'"

6922 msgstr "無法為 '%s' 的值去引號"

6923

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

6924 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710

6925 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908

6926 #, c-format

6927 msgid "could not open '%s' for reading"

6928 msgstr "無法開啟 '%s' 進行讀取"

6929

6898 -#: sequencer.c:809

6930 +#: sequencer.c:839

6931 msgid "'GIT_AUTHOR_NAME' already given"

6932 msgstr "已經給出 'GIT_AUTHOR_NAME'"

6933

6902 -#: sequencer.c:814

6934 +#: sequencer.c:844

6935 msgid "'GIT_AUTHOR_EMAIL' already given"

6936 msgstr "已經給出 'GIT_AUTHOR_EMAIL'"

6937

6906 -#: sequencer.c:819

6938 +#: sequencer.c:849

6939 msgid "'GIT_AUTHOR_DATE' already given"

6940 msgstr "已經給出 'GIT_AUTHOR_DATE'"

6941

6910 -#: sequencer.c:823

6942 +#: sequencer.c:853

6943 #, c-format

6944 msgid "unknown variable '%s'"

6945 msgstr "未知變數 '%s'"

6946

6915 -#: sequencer.c:828

6947 +#: sequencer.c:858

6948 msgid "missing 'GIT_AUTHOR_NAME'"

6949 msgstr "缺少 'GIT_AUTHOR_NAME'"

6950

6919 -#: sequencer.c:830

6951 +#: sequencer.c:860

6952 msgid "missing 'GIT_AUTHOR_EMAIL'"

6953 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

6954

6923 -#: sequencer.c:832

6955 +#: sequencer.c:862

6956 msgid "missing 'GIT_AUTHOR_DATE'"

6957 msgstr "缺少 'GIT_AUTHOR_DATE'"

6958

6927 -#: sequencer.c:897

6959 +#: sequencer.c:927

6960 #, c-format

6961 msgid ""

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

@@ -6953,11 +6985,11 @@ msgstr ""

6985 "\n"

6986 " git rebase --continue\n"

6987

6956 -#: sequencer.c:1178

6988 +#: sequencer.c:1208

6989 msgid "'prepare-commit-msg' hook failed"

6990 msgstr "'prepare-commit-msg' 掛鉤失敗"

6991

6960 -#: sequencer.c:1184

6992 +#: sequencer.c:1214

6993 msgid ""

6994 "Your name and email address were configured automatically based\n"

6995 "on your username and hostname. Please check that they are accurate.\n"

@@ -6981,7 +7013,7 @@ msgstr ""

7013 "\n"

7014 " git commit --amend --reset-author\n"

7015

6984 -#: sequencer.c:1197

7016 +#: sequencer.c:1227

7017 msgid ""

7018 "Your name and email address were configured automatically based\n"

7019 "on your username and hostname. Please check that they are accurate.\n"

@@ -7004,339 +7036,339 @@ msgstr ""

7036 "\n"

7037 " git commit --amend --reset-author\n"

7038

7007 -#: sequencer.c:1239

7039 +#: sequencer.c:1269

7040 msgid "couldn't look up newly created commit"

7041 msgstr "無法找到新建立的提交"

7042

7011 -#: sequencer.c:1241

7043 +#: sequencer.c:1271

7044 msgid "could not parse newly created commit"

7045 msgstr "不能解析新建立的提交"

7046

7015 -#: sequencer.c:1287

7047 +#: sequencer.c:1317

7048 msgid "unable to resolve HEAD after creating commit"

7049 msgstr "建立提交後，不能解析 HEAD"

7050

7019 -#: sequencer.c:1289

7051 +#: sequencer.c:1319

7052 msgid "detached HEAD"

7053 msgstr "分離 HEAD"

7054

7055 # 譯者：中文字串拼接，可刪除前導空格

7024 -#: sequencer.c:1293

7056 +#: sequencer.c:1323

7057 msgid " (root-commit)"

7058 msgstr " (根提交)"

7059

7028 -#: sequencer.c:1314

7060 +#: sequencer.c:1344

7061 msgid "could not parse HEAD"

7062 msgstr "不能解析 HEAD"

7063

7032 -#: sequencer.c:1316

7064 +#: sequencer.c:1346

7065 #, c-format

7066 msgid "HEAD %s is not a commit!"

7067 msgstr "HEAD %s 不是一個提交！"

7068

7037 -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577

7069 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577

7070 msgid "could not parse HEAD commit"

7071 msgstr "不能解析 HEAD 提交"

7072

7041 -#: sequencer.c:1373 sequencer.c:2067

7073 +#: sequencer.c:1403 sequencer.c:2100

7074 msgid "unable to parse commit author"

7075 msgstr "不能解析提交作者"

7076

7045 -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692

7077 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701

7078 msgid "git write-tree failed to write a tree"

7079 msgstr "git write-tree 無法寫入樹狀物件"

7080

7049 -#: sequencer.c:1417 sequencer.c:1535

7081 +#: sequencer.c:1447 sequencer.c:1565

7082 #, c-format

7083 msgid "unable to read commit message from '%s'"

7084 msgstr "不能從 '%s' 讀取提交說明"

7085

7054 -#: sequencer.c:1446 sequencer.c:1478

7086 +#: sequencer.c:1476 sequencer.c:1508

7087 #, c-format

7088 msgid "invalid author identity '%s'"

7089 msgstr "無效的作者身分 '%s'"

7090

7059 -#: sequencer.c:1452

7091 +#: sequencer.c:1482

7092 msgid "corrupt author: missing date information"

7093 msgstr "作者資訊損壞：缺少日期資訊"

7094

7063 -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890

7064 -#: builtin/merge.c:915

7095 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904

7096 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78

7097 msgid "failed to write commit object"

7098 msgstr "寫提交物件失敗"

7099

7068 -#: sequencer.c:1518 sequencer.c:4237

7100 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198

7101 #, c-format

7102 msgid "could not update %s"

7103 msgstr "不能更新 %s"

7104

7073 -#: sequencer.c:1567

7105 +#: sequencer.c:1597

7106 #, c-format

7107 msgid "could not parse commit %s"

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

7109

7078 -#: sequencer.c:1572

7110 +#: sequencer.c:1602

7111 #, c-format

7112 msgid "could not parse parent commit %s"

7113 msgstr "不能解析父提交 %s"

7114

7083 -#: sequencer.c:1655 sequencer.c:1766

7115 +#: sequencer.c:1685 sequencer.c:1796

7116 #, c-format

7117 msgid "unknown command: %d"

7118 msgstr "未知指令：%d"

7119

7088 -#: sequencer.c:1713 sequencer.c:1738

7120 +#: sequencer.c:1743 sequencer.c:1768

7121 #, c-format

7122 msgid "This is a combination of %d commits."

7123 msgstr "這是一個 %d 個提交的組合。"

7124

7093 -#: sequencer.c:1723

7125 +#: sequencer.c:1753

7126 msgid "need a HEAD to fixup"

7127 msgstr "需要一個 HEAD 來修復"

7128

7097 -#: sequencer.c:1725 sequencer.c:3338

7129 +#: sequencer.c:1755 sequencer.c:3372

7130 msgid "could not read HEAD"

7131 msgstr "不能讀取 HEAD"

7132

7101 -#: sequencer.c:1727

7133 +#: sequencer.c:1757

7134 msgid "could not read HEAD's commit message"

7135 msgstr "不能讀取 HEAD 的提交說明"

7136

7105 -#: sequencer.c:1733

7137 +#: sequencer.c:1763

7138 #, c-format

7139 msgid "cannot write '%s'"

7140 msgstr "不能寫 '%s'"

7141

7110 -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486

7142 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486

7143 msgid "This is the 1st commit message:"

7144 msgstr "這是第一個提交說明："

7145

7114 -#: sequencer.c:1748

7146 +#: sequencer.c:1778

7147 #, c-format

7148 msgid "could not read commit message of %s"

7149 msgstr "不能讀取 %s 的提交說明"

7150

7119 -#: sequencer.c:1755

7151 +#: sequencer.c:1785

7152 #, c-format

7153 msgid "This is the commit message #%d:"

7154 msgstr "這是提交說明 #%d："

7155

7124 -#: sequencer.c:1761

7156 +#: sequencer.c:1791

7157 #, c-format

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

7159 msgstr "提交說明 #%d 將被跳過："

7160

7129 -#: sequencer.c:1849

7161 +#: sequencer.c:1879

7162 msgid "your index file is unmerged."

7163 msgstr "您的索引檔案未完成合併。"

7164

7133 -#: sequencer.c:1856

7165 +#: sequencer.c:1886

7166 msgid "cannot fixup root commit"

7167 msgstr "不能修復根提交"

7168

7137 -#: sequencer.c:1875

7169 +#: sequencer.c:1905

7170 #, c-format

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

7172 msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"

7173

7142 -#: sequencer.c:1883 sequencer.c:1891

7174 +#: sequencer.c:1913 sequencer.c:1921

7175 #, c-format

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

7177 msgstr "提交 %s 沒有第 %d 個父提交"

7178

7147 -#: sequencer.c:1897

7179 +#: sequencer.c:1927

7180 #, c-format

7181 msgid "cannot get commit message for %s"

7182 msgstr "不能得到 %s 的提交說明"

7183

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

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

7154 -#: sequencer.c:1916

7186 +#: sequencer.c:1946

7187 #, c-format

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

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

7190

7159 -#: sequencer.c:1981

7191 +#: sequencer.c:2011

7192 #, c-format

7193 msgid "could not rename '%s' to '%s'"

7194 msgstr "不能將 '%s' 重新命名為 '%s'"

7195

7164 -#: sequencer.c:2038

7196 +#: sequencer.c:2071

7197 #, c-format

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

7199 msgstr "不能還原 %s... %s"

7200

7169 -#: sequencer.c:2039

7201 +#: sequencer.c:2072

7202 #, c-format

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

7204 msgstr "不能應用 %s... %s"

7205

7174 -#: sequencer.c:2059

7206 +#: sequencer.c:2092

7207 #, c-format

7208 msgid "dropping %s %s -- patch contents already upstream\n"

7209 msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"

7210

7179 -#: sequencer.c:2117

7211 +#: sequencer.c:2150

7212 #, c-format

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

7214 msgstr "git %s：無法讀取索引"

7215

7184 -#: sequencer.c:2124

7216 +#: sequencer.c:2157

7217 #, c-format

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

7219 msgstr "git %s：無法重新整理索引"

7220

7189 -#: sequencer.c:2201

7221 +#: sequencer.c:2234

7222 #, c-format

7223 msgid "%s does not accept arguments: '%s'"

7224 msgstr "%s 不接受參數：'%s'"

7225

7194 -#: sequencer.c:2210

7226 +#: sequencer.c:2243

7227 #, c-format

7228 msgid "missing arguments for %s"

7229 msgstr "缺少 %s 的參數"

7230

7199 -#: sequencer.c:2241

7231 +#: sequencer.c:2274

7232 #, c-format

7233 msgid "could not parse '%s'"

7234 msgstr "無法解析 '%s'"

7235

7204 -#: sequencer.c:2302

7236 +#: sequencer.c:2335

7237 #, c-format

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

7239 msgstr "無效行 %d：%.*s"

7240

7209 -#: sequencer.c:2313

7241 +#: sequencer.c:2346

7242 #, c-format

7243 msgid "cannot '%s' without a previous commit"

7244 msgstr "沒有父提交的情況下不能 '%s'"

7245

7214 -#: sequencer.c:2399

7246 +#: sequencer.c:2432

7247 msgid "cancelling a cherry picking in progress"

7248 msgstr "正在取消一個進行中的揀選"

7249

7218 -#: sequencer.c:2408

7250 +#: sequencer.c:2441

7251 msgid "cancelling a revert in progress"

7252 msgstr "正在取消一個進行中的還原"

7253

7222 -#: sequencer.c:2452

7254 +#: sequencer.c:2485

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

7256 msgstr "請用 'git rebase --edit-todo' 來修改。"

7257

7226 -#: sequencer.c:2454

7258 +#: sequencer.c:2487

7259 #, c-format

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

7261 msgstr "不可用的指令清單：'%s'"

7262

7231 -#: sequencer.c:2459

7263 +#: sequencer.c:2492

7264 msgid "no commits parsed."

7265 msgstr "沒有解析提交。"

7266

7235 -#: sequencer.c:2470

7267 +#: sequencer.c:2503

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

7269 msgstr "不能在還原提交中執行揀選。"

7270

7239 -#: sequencer.c:2472

7271 +#: sequencer.c:2505

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

7273 msgstr "不能在揀選中執行還原提交。"

7274

7243 -#: sequencer.c:2550

7275 +#: sequencer.c:2583

7276 #, c-format

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

7278 msgstr "%s 的值無效：%s"

7279

7248 -#: sequencer.c:2657

7280 +#: sequencer.c:2690

7281 msgid "unusable squash-onto"

7282 msgstr "不可用的 squash-onto"

7283

7252 -#: sequencer.c:2677

7284 +#: sequencer.c:2710

7285 #, c-format

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

7287 msgstr "格式錯誤的選項清單：'%s'"

7288

7257 -#: sequencer.c:2769 sequencer.c:4609

7289 +#: sequencer.c:2803 sequencer.c:4636

7290 msgid "empty commit set passed"

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

7292

7261 -#: sequencer.c:2786

7293 +#: sequencer.c:2820

7294 msgid "revert is already in progress"

7295 msgstr "一個還原動作已在進行"

7296

7265 -#: sequencer.c:2788

7297 +#: sequencer.c:2822

7298 #, c-format

7299 msgid "try \"git revert (--continue | %s--abort | --quit)\""

7300 msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""

7301

7270 -#: sequencer.c:2791

7302 +#: sequencer.c:2825

7303 msgid "cherry-pick is already in progress"

7304 msgstr "揀選動作已在進行"

7305

7274 -#: sequencer.c:2793

7306 +#: sequencer.c:2827

7307 #, c-format

7308 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7309 msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""

7310

7279 -#: sequencer.c:2807

7311 +#: sequencer.c:2841

7312 #, c-format

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

7314 msgstr "不能建立序列目錄 '%s'"

7315

7284 -#: sequencer.c:2822

7316 +#: sequencer.c:2856

7317 msgid "could not lock HEAD"

7318 msgstr "不能鎖定 HEAD"

7319

7288 -#: sequencer.c:2882 sequencer.c:4325

7320 +#: sequencer.c:2916 sequencer.c:4371

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

7322 msgstr "揀選或還原動作並未進行"

7323

7292 -#: sequencer.c:2884 sequencer.c:2895

7324 +#: sequencer.c:2918 sequencer.c:2929

7325 msgid "cannot resolve HEAD"

7326 msgstr "不能解析 HEAD"

7327

7296 -#: sequencer.c:2886 sequencer.c:2930

7328 +#: sequencer.c:2920 sequencer.c:2964

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

7330 msgstr "不能從尚未建立的分支終止"

7331

7300 -#: sequencer.c:2916 builtin/grep.c:745

7332 +#: sequencer.c:2950 builtin/grep.c:756

7333 #, c-format

7334 msgid "cannot open '%s'"

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

7336

7305 -#: sequencer.c:2918

7337 +#: sequencer.c:2952

7338 #, c-format

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

7340 msgstr "不能讀取 '%s'：%s"

7341

7310 -#: sequencer.c:2919

7342 +#: sequencer.c:2953

7343 msgid "unexpected end of file"

7344 msgstr "意外的檔案結束"

7345

7314 -#: sequencer.c:2925

7346 +#: sequencer.c:2959

7347 #, c-format

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

7349 msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"

7350

7319 -#: sequencer.c:2936

7351 +#: sequencer.c:2970

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

7353 msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！"

7354

7323 -#: sequencer.c:2977

7355 +#: sequencer.c:3011

7356 msgid "no revert in progress"

7357 msgstr "沒有正在進行的還原"

7358

7327 -#: sequencer.c:2986

7359 +#: sequencer.c:3020

7360 msgid "no cherry-pick in progress"

7361 msgstr "沒有正在進行的揀選"

7362

7331 -#: sequencer.c:2996

7363 +#: sequencer.c:3030

7364 msgid "failed to skip the commit"

7365 msgstr "無法跳過這個提交"

7366

7335 -#: sequencer.c:3003

7367 +#: sequencer.c:3037

7368 msgid "there is nothing to skip"

7369 msgstr "沒有要跳過的"

7370

7339 -#: sequencer.c:3006

7371 +#: sequencer.c:3040

7372 #, c-format

7373 msgid ""

7374 "have you committed already?\n"

@@ -7345,16 +7377,16 @@ msgstr ""

7377 "您已經提交了嗎？\n"

7378 "試試 \"git %s --continue\""

7379

7348 -#: sequencer.c:3168 sequencer.c:4217

7380 +#: sequencer.c:3202 sequencer.c:4263

7381 msgid "cannot read HEAD"

7382 msgstr "不能讀取 HEAD"

7383

7352 -#: sequencer.c:3185

7384 +#: sequencer.c:3219

7385 #, c-format

7386 msgid "unable to copy '%s' to '%s'"

7387 msgstr "無法複製 '%s' 至 '%s'"

7388

7357 -#: sequencer.c:3193

7389 +#: sequencer.c:3227

7390 #, c-format

7391 msgid ""

7392 "You can amend the commit now, with\n"

@@ -7373,28 +7405,28 @@ msgstr ""

7405 "\n"

7406 " git rebase --continue\n"

7407

7376 -#: sequencer.c:3203

7408 +#: sequencer.c:3237

7409 #, c-format

7410 msgid "Could not apply %s... %.*s"

7411 msgstr "不能應用 %s... %.*s"

7412

7381 -#: sequencer.c:3210

7413 +#: sequencer.c:3244

7414 #, c-format

7415 msgid "Could not merge %.*s"

7416 msgstr "不能合併 %.*s"

7417

7386 -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641

7418 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640

7419 #, c-format

7420 msgid "could not copy '%s' to '%s'"

7421 msgstr "不能複製 '%s' 至 '%s'"

7422

7391 -#: sequencer.c:3240

7423 +#: sequencer.c:3274

7424 #, c-format

7425 msgid "Executing: %s\n"

7426 msgstr "執行：%s\n"

7427

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

7397 -#: sequencer.c:3255

7429 +#: sequencer.c:3289

7430 #, c-format

7431 msgid ""

7432 "execution failed: %s\n"

@@ -7409,11 +7441,11 @@ msgstr ""

7441 " git rebase --continue\n"

7442 "\n"

7443

7412 -#: sequencer.c:3261

7444 +#: sequencer.c:3295

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

7446 msgstr "並且修改索引和/或工作區\n"

7447

7416 -#: sequencer.c:3267

7448 +#: sequencer.c:3301

7449 #, c-format

7450 msgid ""

7451 "execution succeeded: %s\n"

@@ -7430,90 +7462,90 @@ msgstr ""

7462 " git rebase --continue\n"

7463 "\n"

7464

7433 -#: sequencer.c:3328

7465 +#: sequencer.c:3362

7466 #, c-format

7467 msgid "illegal label name: '%.*s'"

7468 msgstr "非法的標籤名稱：'%.*s'"

7469

7438 -#: sequencer.c:3382

7470 +#: sequencer.c:3416

7471 msgid "writing fake root commit"

7472 msgstr "寫偽根提交"

7473

7442 -#: sequencer.c:3387

7474 +#: sequencer.c:3421

7475 msgid "writing squash-onto"

7476 msgstr "寫入 squash-onto"

7477

7446 -#: sequencer.c:3471

7478 +#: sequencer.c:3505

7479 #, c-format

7480 msgid "could not resolve '%s'"

7481 msgstr "無法解析 '%s'"

7482

7451 -#: sequencer.c:3502

7483 +#: sequencer.c:3538

7484 msgid "cannot merge without a current revision"

7485 msgstr "沒有目前版本不能合併"

7486

7455 -#: sequencer.c:3524

7487 +#: sequencer.c:3560

7488 #, c-format

7489 msgid "unable to parse '%.*s'"

7490 msgstr "無法解析 '%.*s'"

7491

7460 -#: sequencer.c:3533

7492 +#: sequencer.c:3569

7493 #, c-format

7494 msgid "nothing to merge: '%.*s'"

7495 msgstr "無可用合併：'%.*s'"

7496

7465 -#: sequencer.c:3545

7497 +#: sequencer.c:3581

7498 msgid "octopus merge cannot be executed on top of a [new root]"

7499 msgstr "章魚合並不能在一個新的根提交上執行"

7500

7469 -#: sequencer.c:3561

7501 +#: sequencer.c:3597

7502 #, c-format

7503 msgid "could not get commit message of '%s'"

7504 msgstr "不能取得 '%s' 的提交說明"

7505

7474 -#: sequencer.c:3730

7506 +#: sequencer.c:3780

7507 #, c-format

7508 msgid "could not even attempt to merge '%.*s'"

7509 msgstr "甚至不能嘗試合併 '%.*s'"

7510

7479 -#: sequencer.c:3746

7511 +#: sequencer.c:3796

7512 msgid "merge: Unable to write new index file"

7513 msgstr "合併：無法寫入新索引檔案"

7514

7483 -#: sequencer.c:3820

7515 +#: sequencer.c:3870

7516 msgid "Cannot autostash"

7517 msgstr "無法 autostash"

7518

7487 -#: sequencer.c:3823

7519 +#: sequencer.c:3873

7520 #, c-format

7521 msgid "Unexpected stash response: '%s'"

7522 msgstr "意外的 stash 回應：'%s'"

7523

7492 -#: sequencer.c:3829

7524 +#: sequencer.c:3879

7525 #, c-format

7526 msgid "Could not create directory for '%s'"

7527 msgstr "不能為 '%s' 建立目錄"

7528

7497 -#: sequencer.c:3832

7529 +#: sequencer.c:3882

7530 #, c-format

7531 msgid "Created autostash: %s\n"

7532 msgstr "建立了 autostash：%s\n"

7533

7502 -#: sequencer.c:3836

7534 +#: sequencer.c:3886

7535 msgid "could not reset --hard"

7536 msgstr "無法 reset --hard"

7537

7506 -#: sequencer.c:3861

7538 +#: sequencer.c:3911

7539 #, c-format

7540 msgid "Applied autostash.\n"

7541 msgstr "已應用 autostash。\n"

7542

7511 -#: sequencer.c:3873

7543 +#: sequencer.c:3923

7544 #, c-format

7545 msgid "cannot store %s"

7546 msgstr "不能儲存 %s"

7547

7516 -#: sequencer.c:3876

7548 +#: sequencer.c:3926

7549 #, c-format

7550 msgid ""

7551 "%s\n"

@@ -7524,34 +7556,29 @@ msgstr ""

7556 "您的修改安全地儲存在儲藏區中。\n"

7557 "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"

7558

7527 -#: sequencer.c:3881

7559 +#: sequencer.c:3931

7560 msgid "Applying autostash resulted in conflicts."

7561 msgstr "因套用自動儲藏而導致衝突。"

7562

7531 -#: sequencer.c:3882

7563 +#: sequencer.c:3932

7564 msgid "Autostash exists; creating a new stash entry."

7565 msgstr "已有自動儲藏；建立新儲藏項目。"

7566

7535 -#: sequencer.c:3974

7536 -#, c-format

7537 -msgid "%s: not a valid OID"

7538 -msgstr "%s：不是一個有效的物件 ID"

7539 -

7540 -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769

7567 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769

7568 msgid "could not detach HEAD"

7569 msgstr "不能分離開頭指標"

7570

7544 -#: sequencer.c:3994

7571 +#: sequencer.c:4040

7572 #, c-format

7573 msgid "Stopped at HEAD\n"

7574 msgstr "停止在 HEAD\n"

7575

7549 -#: sequencer.c:3996

7576 +#: sequencer.c:4042

7577 #, c-format

7578 msgid "Stopped at %s\n"

7579 msgstr "停止在 %s\n"

7580

7554 -#: sequencer.c:4004

7581 +#: sequencer.c:4050

7582 #, c-format

7583 msgid ""

7584 "Could not execute the todo command\n"

@@ -7571,58 +7598,58 @@ msgstr ""

7598 " git rebase --edit-todo\n"

7599 " git rebase --continue\n"

7600

7574 -#: sequencer.c:4050

7601 +#: sequencer.c:4096

7602 #, c-format

7603 msgid "Rebasing (%d/%d)%s"

7604 msgstr "正在重定基底 (%d/%d)%s"

7605

7579 -#: sequencer.c:4095

7606 +#: sequencer.c:4141

7607 #, c-format

7608 msgid "Stopped at %s... %.*s\n"

7609 msgstr "停止在 %s... %.*s\n"

7610

7584 -#: sequencer.c:4166

7611 +#: sequencer.c:4212

7612 #, c-format

7613 msgid "unknown command %d"

7614 msgstr "未知指令 %d"

7615

7589 -#: sequencer.c:4225

7616 +#: sequencer.c:4271

7617 msgid "could not read orig-head"

7618 msgstr "不能讀取 orig-head"

7619

7593 -#: sequencer.c:4230

7620 +#: sequencer.c:4276

7621 msgid "could not read 'onto'"

7622 msgstr "不能讀取 'onto'"

7623

7597 -#: sequencer.c:4244

7624 +#: sequencer.c:4290

7625 #, c-format

7626 msgid "could not update HEAD to %s"

7627 msgstr "不能更新 HEAD 為 %s"

7628

7602 -#: sequencer.c:4304

7629 +#: sequencer.c:4350

7630 #, c-format

7631 msgid "Successfully rebased and updated %s.\n"

7632 msgstr "成功重定基底並更新 %s。\n"

7633

7607 -#: sequencer.c:4337

7634 +#: sequencer.c:4383

7635 msgid "cannot rebase: You have unstaged changes."

7636 msgstr "不能重定基底：您有未暫存的變更。"

7637

7611 -#: sequencer.c:4346

7638 +#: sequencer.c:4392

7639 msgid "cannot amend non-existing commit"

7640 msgstr "不能修補不存在的提交"

7641

7615 -#: sequencer.c:4348

7642 +#: sequencer.c:4394

7643 #, c-format

7644 msgid "invalid file: '%s'"

7645 msgstr "無效檔案：'%s'"

7646

7620 -#: sequencer.c:4350

7647 +#: sequencer.c:4396

7648 #, c-format

7649 msgid "invalid contents: '%s'"

7650 msgstr "無效內容：'%s'"

7651

7625 -#: sequencer.c:4353

7652 +#: sequencer.c:4399

7653 msgid ""

7654 "\n"

7655 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -7631,55 +7658,50 @@ msgstr ""

7658 "\n"

7659 "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"

7660

7634 -#: sequencer.c:4389 sequencer.c:4428

7661 +#: sequencer.c:4435 sequencer.c:4474

7662 #, c-format

7663 msgid "could not write file: '%s'"

7664 msgstr "不能寫入檔案：'%s'"

7665

7639 -#: sequencer.c:4444

7666 +#: sequencer.c:4490

7667 msgid "could not remove CHERRY_PICK_HEAD"

7668 msgstr "不能刪除 CHERRY_PICK_HEAD"

7669

7643 -#: sequencer.c:4451

7670 +#: sequencer.c:4497

7671 msgid "could not commit staged changes."

7672 msgstr "不能提交暫存的修改。"

7673

7647 -#: sequencer.c:4477

7648 -#, c-format

7649 -msgid "invalid committer '%s'"

7650 -msgstr "無效的提交者 '%s'"

7651 -

7652 -#: sequencer.c:4586

7674 +#: sequencer.c:4613

7675 #, c-format

7676 msgid "%s: can't cherry-pick a %s"

7677 msgstr "%s：不能揀選一個%s"

7678

7657 -#: sequencer.c:4590

7679 +#: sequencer.c:4617

7680 #, c-format

7681 msgid "%s: bad revision"

7682 msgstr "%s：錯誤的版本"

7683

7662 -#: sequencer.c:4625

7684 +#: sequencer.c:4652

7685 msgid "can't revert as initial commit"

7686 msgstr "不能作為初始提交還原提交"

7687

7666 -#: sequencer.c:5102

7688 +#: sequencer.c:5129

7689 msgid "make_script: unhandled options"

7690 msgstr "make_script：有未能處理的選項"

7691

7670 -#: sequencer.c:5105

7692 +#: sequencer.c:5132

7693 msgid "make_script: error preparing revisions"

7694 msgstr "make_script：準備版本時錯誤"

7695

7674 -#: sequencer.c:5347 sequencer.c:5364

7696 +#: sequencer.c:5374 sequencer.c:5391

7697 msgid "nothing to do"

7698 msgstr "無事可做"

7699

7678 -#: sequencer.c:5383

7700 +#: sequencer.c:5410

7701 msgid "could not skip unnecessary pick commands"

7702 msgstr "無法跳過不必要的揀選"

7703

7682 -#: sequencer.c:5480

7704 +#: sequencer.c:5504

7705 msgid "the script was already rearranged."

7706 msgstr "腳本已經重新編排。"

7707

@@ -7843,256 +7865,256 @@ msgstr "fork 失敗"

7865 msgid "setsid failed"

7866 msgstr "setsid 失敗"

7867

7846 -#: sha1-file.c:470

7868 +#: sha1-file.c:480

7869 #, c-format

7870 msgid "object directory %s does not exist; check .git/objects/info/alternates"

7871 msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"

7872

7851 -#: sha1-file.c:521

7873 +#: sha1-file.c:531

7874 #, c-format

7875 msgid "unable to normalize alternate object path: %s"

7876 msgstr "無法規範化備用物件路徑：%s"

7877

7856 -#: sha1-file.c:593

7878 +#: sha1-file.c:603

7879 #, c-format

7880 msgid "%s: ignoring alternate object stores, nesting too deep"

7881 msgstr "%s：忽略備用物件庫，嵌套太深"

7882

7861 -#: sha1-file.c:600

7883 +#: sha1-file.c:610

7884 #, c-format

7885 msgid "unable to normalize object directory: %s"

7886 msgstr "無法規範化物件目錄: %s"

7887

7866 -#: sha1-file.c:643

7888 +#: sha1-file.c:653

7889 msgid "unable to fdopen alternates lockfile"

7890 msgstr "無法 fdopen 取代鎖檔案"

7891

7870 -#: sha1-file.c:661

7892 +#: sha1-file.c:671

7893 msgid "unable to read alternates file"

7894 msgstr "無法讀取替代檔案"

7895

7874 -#: sha1-file.c:668

7896 +#: sha1-file.c:678

7897 msgid "unable to move new alternates file into place"

7898 msgstr "無法將新的替代檔案移動到位"

7899

7878 -#: sha1-file.c:703

7900 +#: sha1-file.c:713

7901 #, c-format

7902 msgid "path '%s' does not exist"

7903 msgstr "路徑 '%s' 不存在"

7904

7883 -#: sha1-file.c:724

7905 +#: sha1-file.c:734

7906 #, c-format

7907 msgid "reference repository '%s' as a linked checkout is not supported yet."

7908 msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。"

7909

7888 -#: sha1-file.c:730

7910 +#: sha1-file.c:740

7911 #, c-format

7912 msgid "reference repository '%s' is not a local repository."

7913 msgstr "參考版本庫 '%s' 不是一個本機版本庫。"

7914

7893 -#: sha1-file.c:736

7915 +#: sha1-file.c:746

7916 #, c-format

7917 msgid "reference repository '%s' is shallow"

7918 msgstr "參考版本庫 '%s' 是一個淺複製"

7919

7898 -#: sha1-file.c:744

7920 +#: sha1-file.c:754

7921 #, c-format

7922 msgid "reference repository '%s' is grafted"

7923 msgstr "參考版本庫 '%s' 已被移植"

7924

7903 -#: sha1-file.c:804

7925 +#: sha1-file.c:814

7926 #, c-format

7927 msgid "invalid line while parsing alternate refs: %s"

7928 msgstr "解析備用引用時無效的行：%s"

7929

7908 -#: sha1-file.c:954

7930 +#: sha1-file.c:964

7931 #, c-format

7932 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

7933 msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"

7934

7913 -#: sha1-file.c:975

7935 +#: sha1-file.c:985

7936 msgid "mmap failed"

7937 msgstr "mmap 失敗"

7938

7917 -#: sha1-file.c:1139

7939 +#: sha1-file.c:1149

7940 #, c-format

7941 msgid "object file %s is empty"

7942 msgstr "物件檔案 %s 為空"

7943

7922 -#: sha1-file.c:1274 sha1-file.c:2467

7944 +#: sha1-file.c:1284 sha1-file.c:2477

7945 #, c-format

7946 msgid "corrupt loose object '%s'"

7947 msgstr "損壞的鬆散物件 '%s'"

7948

7927 -#: sha1-file.c:1276 sha1-file.c:2471

7949 +#: sha1-file.c:1286 sha1-file.c:2481

7950 #, c-format

7951 msgid "garbage at end of loose object '%s'"

7952 msgstr "鬆散物件 '%s' 後面有垃圾資料"

7953

7932 -#: sha1-file.c:1318

7954 +#: sha1-file.c:1328

7955 msgid "invalid object type"

7956 msgstr "無效的物件類型"

7957

7936 -#: sha1-file.c:1402

7958 +#: sha1-file.c:1412

7959 #, c-format

7960 msgid "unable to unpack %s header with --allow-unknown-type"

7961 msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"

7962

7941 -#: sha1-file.c:1405

7963 +#: sha1-file.c:1415

7964 #, c-format

7965 msgid "unable to unpack %s header"

7966 msgstr "無法解開 %s 頭部"

7967

7946 -#: sha1-file.c:1411

7968 +#: sha1-file.c:1421

7969 #, c-format

7970 msgid "unable to parse %s header with --allow-unknown-type"

7971 msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"

7972

7951 -#: sha1-file.c:1414

7973 +#: sha1-file.c:1424

7974 #, c-format

7975 msgid "unable to parse %s header"

7976 msgstr "無法解析 %s 頭部"

7977

7956 -#: sha1-file.c:1641

7978 +#: sha1-file.c:1651

7979 #, c-format

7980 msgid "failed to read object %s"

7981 msgstr "讀取物件 %s 失敗"

7982

7961 -#: sha1-file.c:1645

7983 +#: sha1-file.c:1655

7984 #, c-format

7985 msgid "replacement %s not found for %s"

7986 msgstr "找不到 %2$s 的替代 %1$s"

7987

7966 -#: sha1-file.c:1649

7988 +#: sha1-file.c:1659

7989 #, c-format

7990 msgid "loose object %s (stored in %s) is corrupt"

7991 msgstr "鬆散物件 %s（儲存在 %s）已損壞"

7992

7971 -#: sha1-file.c:1653

7993 +#: sha1-file.c:1663

7994 #, c-format

7995 msgid "packed object %s (stored in %s) is corrupt"

7996 msgstr "打包物件 %s（儲存在 %s）已損壞"

7997

7976 -#: sha1-file.c:1758

7998 +#: sha1-file.c:1768

7999 #, c-format

8000 msgid "unable to write file %s"

8001 msgstr "無法寫檔案 %s"

8002

7981 -#: sha1-file.c:1765

8003 +#: sha1-file.c:1775

8004 #, c-format

8005 msgid "unable to set permission to '%s'"

8006 msgstr "無法為 '%s' 設定權限"

8007

7986 -#: sha1-file.c:1772

8008 +#: sha1-file.c:1782

8009 msgid "file write error"

8010 msgstr "檔案寫錯誤"

8011

7990 -#: sha1-file.c:1792

8012 +#: sha1-file.c:1802

8013 msgid "error when closing loose object file"

8014 msgstr "關閉鬆散物件檔案時發生錯誤"

8015

7994 -#: sha1-file.c:1857

8016 +#: sha1-file.c:1867

8017 #, c-format

8018 msgid "insufficient permission for adding an object to repository database %s"

8019 msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"

8020

7999 -#: sha1-file.c:1859

8021 +#: sha1-file.c:1869

8022 msgid "unable to create temporary file"

8023 msgstr "無法建立暫存檔"

8024

8003 -#: sha1-file.c:1883

8025 +#: sha1-file.c:1893

8026 msgid "unable to write loose object file"

8027 msgstr "不能寫鬆散物件檔案"

8028

8007 -#: sha1-file.c:1889

8029 +#: sha1-file.c:1899

8030 #, c-format

8031 msgid "unable to deflate new object %s (%d)"

8032 msgstr "不能壓縮新物件 %s（%d）"

8033

8012 -#: sha1-file.c:1893

8034 +#: sha1-file.c:1903

8035 #, c-format

8036 msgid "deflateEnd on object %s failed (%d)"

8037 msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"

8038

8017 -#: sha1-file.c:1897

8039 +#: sha1-file.c:1907

8040 #, c-format

8041 msgid "confused by unstable object source data for %s"

8042 msgstr "被 %s 的不穩定物件源資料搞糊塗了"

8043

8022 -#: sha1-file.c:1907 builtin/pack-objects.c:1086

8044 +#: sha1-file.c:1917 builtin/pack-objects.c:1086

8045 #, c-format

8046 msgid "failed utime() on %s"

8047 msgstr "在 %s 上呼叫 utime() 失敗"

8048

8027 -#: sha1-file.c:1984

8049 +#: sha1-file.c:1994

8050 #, c-format

8051 msgid "cannot read object for %s"

8052 msgstr "不能讀取物件 %s"

8053

8032 -#: sha1-file.c:2035

8054 +#: sha1-file.c:2045

8055 msgid "corrupt commit"

8056 msgstr "損壞的提交"

8057

8036 -#: sha1-file.c:2043

8058 +#: sha1-file.c:2053

8059 msgid "corrupt tag"

8060 msgstr "損壞的標籤"

8061

8040 -#: sha1-file.c:2143

8062 +#: sha1-file.c:2153

8063 #, c-format

8064 msgid "read error while indexing %s"

8065 msgstr "索引 %s 時讀取錯誤"

8066

8045 -#: sha1-file.c:2146

8067 +#: sha1-file.c:2156

8068 #, c-format

8069 msgid "short read while indexing %s"

8070 msgstr "索引 %s 時讀入不完整"

8071

8050 -#: sha1-file.c:2219 sha1-file.c:2229

8072 +#: sha1-file.c:2229 sha1-file.c:2239

8073 #, c-format

8074 msgid "%s: failed to insert into database"

8075 msgstr "%s：插入資料庫失敗"

8076

8055 -#: sha1-file.c:2235

8077 +#: sha1-file.c:2245

8078 #, c-format

8079 msgid "%s: unsupported file type"

8080 msgstr "%s：不支援的檔案類型"

8081

8060 -#: sha1-file.c:2259

8082 +#: sha1-file.c:2269

8083 #, c-format

8084 msgid "%s is not a valid object"

8085 msgstr "%s 不是一個有效的物件"

8086

8065 -#: sha1-file.c:2261

8087 +#: sha1-file.c:2271

8088 #, c-format

8089 msgid "%s is not a valid '%s' object"

8090 msgstr "%s 不是一個有效的 '%s' 物件"

8091

8070 -#: sha1-file.c:2288 builtin/index-pack.c:192

8092 +#: sha1-file.c:2298 builtin/index-pack.c:192

8093 #, c-format

l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated)