7157c2b5c9 · matheusbsbs/matheus-bagliano

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

139 msgstr ""

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

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

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

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

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

143 +"PO-Revision-Date: 2020-07-17 10:27+0800\n"

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

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

146 "Language: zh_CN\n"

@@ -242,21 +242,21 @@ msgstr[1] "增加了 %d 个路径\n"

242 msgid "ignoring unmerged: %s"

243 msgstr "忽略未合入的：%s"

244

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

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

246 #, c-format

247 msgid "Only binary files changed.\n"

248 msgstr "只有二进制文件被修改。\n"

249

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

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

251 #, c-format

252 msgid "No changes.\n"

253 msgstr "没有修改。\n"

254

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

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

256 msgid "Patch update"

257 msgstr "补丁更新"

258

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

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

260 msgid "Review diff"

261 msgstr "检视 diff"

262

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

324 msgid "(empty) select nothing"

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

326

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

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

328 msgid "*** Commands ***"

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

330

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

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

332 msgid "What now"

333 msgstr "请选择"

334

@@ -345,7 +345,7 @@ msgstr "未缓存"

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

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

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

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

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

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

350 msgid "path"

351 msgstr "路径"

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

354 msgid "could not refresh index"

355 msgstr "不能刷新索引"

356

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

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

358 #, c-format

359 msgid "Bye.\n"

360 msgstr "再见。\n"

361

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

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

363 #, c-format, perl-format

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

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

366

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

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

368 #, c-format, perl-format

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

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

371

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

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

373 +#, c-format, perl-format

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

375 +msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "

376 +

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

378 #, c-format, perl-format

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

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

381

377 -#: add-patch.c:38

382 +#: add-patch.c:39

383 msgid ""

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

385 "staging."

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

387

383 -#: add-patch.c:41

388 +#: add-patch.c:42

389 msgid ""

390 "y - stage this hunk\n"

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

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

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

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

401

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

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

403 #, c-format, perl-format

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

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

406

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

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

408 #, c-format, perl-format

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

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

411

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

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

413 +#, c-format, perl-format

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

415 +msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "

416 +

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

418 #, c-format, perl-format

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

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

421

412 -#: add-patch.c:59

422 +#: add-patch.c:61

423 msgid ""

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

425 "stashing."

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

427

418 -#: add-patch.c:62

428 +#: add-patch.c:64

429 msgid ""

430 "y - stash this hunk\n"

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

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

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

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

441

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

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

443 #, c-format, perl-format

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

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

446

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

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

448 #, c-format, perl-format

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

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

451

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

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

453 +#, c-format, perl-format

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

455 +msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "

456 +

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

458 #, c-format, perl-format

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

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

461

447 -#: add-patch.c:82

462 +#: add-patch.c:85

463 msgid ""

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

465 "unstaging."

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

467

453 -#: add-patch.c:85

468 +#: add-patch.c:88

469 msgid ""

470 "y - unstage this hunk\n"

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

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

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

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

481

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

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

483 #, c-format, perl-format

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

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

486

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

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

488 #, c-format, perl-format

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

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

491

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

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

493 +#, c-format, perl-format

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

495 +msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "

496 +

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

498 #, c-format, perl-format

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

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

501

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

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

503 msgid ""

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

505 "applying."

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

507

488 -#: add-patch.c:107

508 +#: add-patch.c:111

509 msgid ""

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

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

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

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

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

521

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

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

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

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

524 #, c-format, perl-format

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

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

527

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

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

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

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

530 #, c-format, perl-format

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

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

533

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

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

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

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

536 +#, c-format, perl-format

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

538 +msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "

539 +

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

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

542 #, c-format, perl-format

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

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

545

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

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

547 msgid ""

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

549 "discarding."

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

551

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

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

553 msgid ""

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

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

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

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

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

565

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

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

567 #, c-format, perl-format

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

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

570

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

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

572 #, c-format, perl-format

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

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

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

575

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

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

577 +#, c-format, perl-format

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

579 +msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "

580 +

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

582 #, c-format, perl-format

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

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

585

555 -#: add-patch.c:151

586 +#: add-patch.c:157

587 msgid ""

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

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

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

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

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

599

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

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

601 #, c-format, perl-format

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

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

604

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

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

606 #, c-format, perl-format

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

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

609

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

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

611 +#, c-format, perl-format

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

613 +msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "

614 +

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

616 #, c-format, perl-format

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

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

619

584 -#: add-patch.c:172

620 +#: add-patch.c:179

621 msgid ""

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

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

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

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

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

633

598 -#: add-patch.c:215

634 +#: add-patch.c:224

635 msgid ""

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

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

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

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

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

647

612 -#: add-patch.c:319

648 +#: add-patch.c:328

649 #, c-format

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

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

652

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

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

654 #, c-format

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

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

657

622 -#: add-patch.c:396

658 +#: add-patch.c:405

659 msgid "could not parse diff"

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

661

626 -#: add-patch.c:415

662 +#: add-patch.c:424

663 msgid "could not parse colored diff"

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

665

630 -#: add-patch.c:429

666 +#: add-patch.c:438

667 #, c-format

668 msgid "failed to run '%s'"

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

670

635 -#: add-patch.c:588

671 +#: add-patch.c:602

672 msgid "mismatched output from interactive.diffFilter"

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

674

639 -#: add-patch.c:589

675 +#: add-patch.c:603

676 msgid ""

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

678 "between its input and output lines."

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

680

645 -#: add-patch.c:762

681 +#: add-patch.c:776

682 #, c-format

683 msgid ""

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

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

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

688 "%.*s"

689

654 -#: add-patch.c:777

690 +#: add-patch.c:791

691 #, c-format

692 msgid ""

693 "hunks do not overlap:\n"

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

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

701 "%.*s"

702

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

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

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

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

706

671 -#: add-patch.c:1057

707 +#: add-patch.c:1071

708 #, c-format

709 msgid ""

710 "---\n"

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

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

719

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

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

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

722 msgid ""

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

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

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

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

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

729

694 -#: add-patch.c:1104

730 +#: add-patch.c:1118

731 msgid "could not parse hunk header"

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

733

698 -#: add-patch.c:1149

734 +#: add-patch.c:1163

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

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

737

@@ -711,24 +747,24 @@ msgstr "'git apply --cached' 失败"

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

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

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

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

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

751 msgid ""

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

753 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "

754

719 -#: add-patch.c:1261

755 +#: add-patch.c:1275

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

757 msgstr "选中的块不能应用到索引！"

758

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

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

760 msgid "Apply them to the worktree anyway? "

761 msgstr "无论如何都要应用到工作区么？"

762

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

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

764 msgid "Nothing was applied.\n"

765 msgstr "未应用。\n"

766

731 -#: add-patch.c:1326

767 +#: add-patch.c:1340

768 msgid ""

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

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

@@ -750,69 +786,69 @@ msgstr ""

786 "e - 手动编辑当前块\n"

787 "? - 显示帮助\n"

788

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

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

790 msgid "No previous hunk"

791 msgstr "没有前一个块"

792

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

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

794 msgid "No next hunk"

795 msgstr "没有下一个块"

796

761 -#: add-patch.c:1468

797 +#: add-patch.c:1484

798 msgid "No other hunks to goto"

799 msgstr "没有其它可供跳转的块"

800

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

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

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

803 msgstr "跳转到哪个块（<回车> 查看更多）？ "

804

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

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

806 msgid "go to which hunk? "

807 msgstr "跳转到哪个块？"

808

773 -#: add-patch.c:1491

809 +#: add-patch.c:1507

810 #, c-format

811 msgid "Invalid number: '%s'"

812 msgstr "无效数字：'%s'"

813

778 -#: add-patch.c:1496

814 +#: add-patch.c:1512

815 #, c-format

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

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

818 msgstr[0] "对不起，只有 %d 个可用块。"

819 msgstr[1] "对不起，只有 %d 个可用块。"

820

785 -#: add-patch.c:1505

821 +#: add-patch.c:1521

822 msgid "No other hunks to search"

823 msgstr "没有其它可供查找的块"

824

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

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

826 msgid "search for regex? "

827 msgstr "使用正则表达式搜索？"

828

793 -#: add-patch.c:1526

829 +#: add-patch.c:1542

830 #, c-format

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

832 msgstr "错误的正则表达式 %s：%s"

833

798 -#: add-patch.c:1543

834 +#: add-patch.c:1559

835 msgid "No hunk matches the given pattern"

836 msgstr "没有和给定模式相匹配的块"

837

802 -#: add-patch.c:1550

838 +#: add-patch.c:1566

839 msgid "Sorry, cannot split this hunk"

840 msgstr "对不起，不能拆分这个块"

841

806 -#: add-patch.c:1554

842 +#: add-patch.c:1570

843 #, c-format

844 msgid "Split into %d hunks."

845 msgstr "拆分为 %d 块。"

846

811 -#: add-patch.c:1558

847 +#: add-patch.c:1574

848 msgid "Sorry, cannot edit this hunk"

849 msgstr "对不起，不能编辑这个块"

850

815 -#: add-patch.c:1609

851 +#: add-patch.c:1625

852 msgid "'git apply' failed"

853 msgstr "'git apply' 失败"

854

@@ -1484,7 +1520,7 @@ msgstr "确保至少匹配 <n> 行上下文"

1520

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

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

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

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

1524 msgid "action"

1525 msgstr "动作"

1526

@@ -1573,7 +1609,7 @@ msgstr "路径不是有效的 UTF-8：%s"

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

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

1611

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

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

1613 #, c-format

1614 msgid "deflate error (%d)"

1615 msgstr "压缩错误 (%d)"

@@ -1642,8 +1678,8 @@ msgid "prepend prefix to each pathname in the archive"

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

1679

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

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

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

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

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

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

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

1685 #: parse-options.h:190

@@ -1867,10 +1903,10 @@ msgstr "不能将 --contents 和最终的提交对象名共用"

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

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

1905

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

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

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

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

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

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

1910 #: builtin/shortlog.c:192

1911 msgid "revision walk setup failed"

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

@@ -2023,84 +2059,88 @@ msgstr "'%s' 已经检出到 '%s'"

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

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

2061

2026 -#: bundle.c:36

2062 +#: bundle.c:47

2063 #, c-format

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

2065 msgstr "'%s' 不像是一个 v2 版本的包文件"

2066

2031 -#: bundle.c:64

2067 +#: bundle.c:69

2068 +msgid "unknown hash algorithm length"

2069 +msgstr "未知的哈希算法长度"

2070 +

2071 +#: bundle.c:84

2072 #, c-format

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

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

2075

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

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

2077 #: builtin/commit.c:814

2078 #, c-format

2079 msgid "could not open '%s'"

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

2081

2042 -#: bundle.c:143

2082 +#: bundle.c:163

2083 msgid "Repository lacks these prerequisite commits:"

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

2085

2046 -#: bundle.c:146

2086 +#: bundle.c:166

2087 msgid "need a repository to verify a bundle"

2088 msgstr "需要一个仓库来校验一个包"

2089

2050 -#: bundle.c:197

2090 +#: bundle.c:217

2091 #, c-format

2092 msgid "The bundle contains this ref:"

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

2094 msgstr[0] "这个包中含有这个引用："

2095 msgstr[1] "这个包中含有 %d 个引用："

2096

2057 -#: bundle.c:204

2097 +#: bundle.c:224

2098 msgid "The bundle records a complete history."

2099 msgstr "这个包记录一个完整历史。"

2100

2061 -#: bundle.c:206

2101 +#: bundle.c:226

2102 #, c-format

2103 msgid "The bundle requires this ref:"

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

2105 msgstr[0] "这个包需要这个引用："

2106 msgstr[1] "这个包需要 %d 个引用："

2107

2068 -#: bundle.c:273

2108 +#: bundle.c:293

2109 msgid "unable to dup bundle descriptor"

2110 msgstr "无法复制 bundle 描述符"

2111

2072 -#: bundle.c:280

2112 +#: bundle.c:300

2113 msgid "Could not spawn pack-objects"

2114 msgstr "不能生成 pack-objects 进程"

2115

2076 -#: bundle.c:291

2116 +#: bundle.c:311

2117 msgid "pack-objects died"

2118 msgstr "pack-objects 终止"

2119

2080 -#: bundle.c:333

2120 +#: bundle.c:353

2121 msgid "rev-list died"

2122 msgstr "rev-list 终止"

2123

2084 -#: bundle.c:382

2124 +#: bundle.c:402

2125 #, c-format

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

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

2128

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

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

2130 #, c-format

2131 msgid "unrecognized argument: %s"

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

2133

2094 -#: bundle.c:469

2134 +#: bundle.c:489

2135 msgid "Refusing to create empty bundle."

2136 msgstr "不能创建空包。"

2137

2098 -#: bundle.c:479

2138 +#: bundle.c:499

2139 #, c-format

2140 msgid "cannot create '%s'"

2141 msgstr "不能创建 '%s'"

2142

2103 -#: bundle.c:504

2143 +#: bundle.c:524

2144 msgid "index-pack died"

2145 msgstr "index-pack 终止"

2146

@@ -2109,269 +2149,261 @@ msgstr "index-pack 终止"

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

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

2151

2112 -#: commit-graph.c:183

2152 +#: commit-graph.c:238

2153 msgid "commit-graph file is too small"

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

2155

2116 -#: commit-graph.c:248

2156 +#: commit-graph.c:303

2157 #, c-format

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

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

2160

2121 -#: commit-graph.c:255

2161 +#: commit-graph.c:310

2162 #, c-format

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

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

2165

2126 -#: commit-graph.c:262

2166 +#: commit-graph.c:317

2167 #, c-format

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

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

2170

2131 -#: commit-graph.c:284

2171 +#: commit-graph.c:339

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

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

2174

2135 -#: commit-graph.c:294

2175 +#: commit-graph.c:349

2176 #, c-format

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

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

2179

2140 -#: commit-graph.c:362

2180 +#: commit-graph.c:417

2181 #, c-format

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

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

2184

2145 -#: commit-graph.c:436

2185 +#: commit-graph.c:491

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

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

2188

2149 -#: commit-graph.c:446

2189 +#: commit-graph.c:501

2190 msgid "commit-graph chain does not match"

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

2192

2153 -#: commit-graph.c:494

2193 +#: commit-graph.c:549

2194 #, c-format

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

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

2197

2158 -#: commit-graph.c:518

2198 +#: commit-graph.c:573

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

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

2201

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

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

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

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

2205

2166 -#: commit-graph.c:672

2206 +#: commit-graph.c:727

2207 #, c-format

2208 msgid "could not find commit %s"

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

2210

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

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

2212 #, c-format

2213 msgid "unable to parse commit %s"

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

2215

2176 -#: commit-graph.c:1096

2216 +#: commit-graph.c:1157

2217 msgid "Writing changed paths Bloom filters index"

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

2219

2180 -#: commit-graph.c:1121

2220 +#: commit-graph.c:1182

2221 msgid "Writing changed paths Bloom filters data"

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

2223

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

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

2225 #, c-format

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

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

2228

2189 -#: commit-graph.c:1196

2229 +#: commit-graph.c:1257

2230 msgid "Loading known commits in commit graph"

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

2232

2193 -#: commit-graph.c:1213

2233 +#: commit-graph.c:1274

2234 msgid "Expanding reachable commits in commit graph"

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

2236

2197 -#: commit-graph.c:1233

2237 +#: commit-graph.c:1294

2238 msgid "Clearing commit marks in commit graph"

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

2240

2201 -#: commit-graph.c:1252

2241 +#: commit-graph.c:1313

2242 msgid "Computing commit graph generation numbers"

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

2244

2205 -#: commit-graph.c:1300

2245 +#: commit-graph.c:1367

2246 msgid "Computing commit changed paths Bloom filters"

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

2248

2209 -#: commit-graph.c:1359

2249 +#: commit-graph.c:1423

2250 +msgid "Collecting referenced commits"

2251 +msgstr "正在收集引用的提交"

2252 +

2253 +#: commit-graph.c:1447

2254 #, c-format

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

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

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

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

2259

2216 -#: commit-graph.c:1372

2260 +#: commit-graph.c:1460

2261 #, c-format

2262 msgid "error adding pack %s"

2263 msgstr "添加包 %s 出错"

2264

2221 -#: commit-graph.c:1376

2265 +#: commit-graph.c:1464

2266 #, c-format

2267 msgid "error opening index for %s"

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

2269

2226 -#: commit-graph.c:1405

2227 -#, c-format

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

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

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

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

2232 -

2233 -#: commit-graph.c:1426

2234 -#, c-format

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

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

2237 -

2238 -#: commit-graph.c:1442

2270 +#: commit-graph.c:1503

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

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

2273

2242 -#: commit-graph.c:1457

2274 +#: commit-graph.c:1518

2275 msgid "Counting distinct commits in commit graph"

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

2277

2246 -#: commit-graph.c:1489

2278 +#: commit-graph.c:1550

2279 msgid "Finding extra edges in commit graph"

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

2281

2250 -#: commit-graph.c:1538

2282 +#: commit-graph.c:1599

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

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

2285

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

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

2287 #, c-format

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

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

2290

2259 -#: commit-graph.c:1585

2291 +#: commit-graph.c:1646

2292 msgid "unable to create temporary graph layer"

2293 msgstr "无法创建临时图层"

2294

2263 -#: commit-graph.c:1590

2295 +#: commit-graph.c:1651

2296 #, c-format

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

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

2299

2268 -#: commit-graph.c:1667

2300 +#: commit-graph.c:1728

2301 #, c-format

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

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

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

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

2306

2275 -#: commit-graph.c:1712

2307 +#: commit-graph.c:1773

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

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

2310

2279 -#: commit-graph.c:1728

2311 +#: commit-graph.c:1789

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

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

2314

2283 -#: commit-graph.c:1748

2315 +#: commit-graph.c:1809

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

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

2318

2287 -#: commit-graph.c:1874

2319 +#: commit-graph.c:1935

2320 msgid "Scanning merged commits"

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

2322

2291 -#: commit-graph.c:1885

2323 +#: commit-graph.c:1946

2324 #, c-format

2325 msgid "unexpected duplicate commit id %s"

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

2327

2296 -#: commit-graph.c:1908

2328 +#: commit-graph.c:1969

2329 msgid "Merging commit-graph"

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

2331

2300 -#: commit-graph.c:2096

2332 +#: commit-graph.c:2156

2333 #, c-format

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

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

2336

2305 -#: commit-graph.c:2107

2337 +#: commit-graph.c:2167

2338 msgid "too many commits to write graph"

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

2340

2309 -#: commit-graph.c:2200

2341 +#: commit-graph.c:2260

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

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

2344

2313 -#: commit-graph.c:2210

2345 +#: commit-graph.c:2270

2346 #, c-format

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

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

2349

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

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

2351 #, c-format

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

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

2354

2323 -#: commit-graph.c:2227

2355 +#: commit-graph.c:2287

2356 #, c-format

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

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

2359

2328 -#: commit-graph.c:2245

2360 +#: commit-graph.c:2305

2361 msgid "Verifying commits in commit graph"

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

2363

2332 -#: commit-graph.c:2259

2364 +#: commit-graph.c:2320

2365 #, c-format

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

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

2368

2337 -#: commit-graph.c:2266

2369 +#: commit-graph.c:2327

2370 #, c-format

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

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

2373

2342 -#: commit-graph.c:2276

2374 +#: commit-graph.c:2337

2375 #, c-format

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

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

2378

2347 -#: commit-graph.c:2285

2379 +#: commit-graph.c:2346

2380 #, c-format

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

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

2383

2352 -#: commit-graph.c:2298

2384 +#: commit-graph.c:2360

2385 #, c-format

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

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

2388

2357 -#: commit-graph.c:2303

2389 +#: commit-graph.c:2365

2390 #, c-format

2391 msgid ""

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

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

2394

2363 -#: commit-graph.c:2307

2395 +#: commit-graph.c:2369

2396 #, c-format

2397 msgid ""

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

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

2400

2369 -#: commit-graph.c:2322

2401 +#: commit-graph.c:2385

2402 #, c-format

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

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

2405

2374 -#: commit-graph.c:2328

2406 +#: commit-graph.c:2391

2407 #, c-format

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

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

@@ -2407,27 +2439,27 @@ msgstr ""

2439 "设置 \"git config advice.graftFileDeprecated false\"\n"

2440 "可关闭本消息"

2441

2410 -#: commit.c:1168

2442 +#: commit.c:1172

2443 #, c-format

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

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

2446

2415 -#: commit.c:1172

2447 +#: commit.c:1176

2448 #, c-format

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

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

2451

2420 -#: commit.c:1175

2452 +#: commit.c:1179

2453 #, c-format

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

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

2456

2425 -#: commit.c:1178

2457 +#: commit.c:1182

2458 #, c-format

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

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

2461

2430 -#: commit.c:1432

2462 +#: commit.c:1436

2463 msgid ""

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

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

@@ -2615,7 +2647,7 @@ msgstr "%s 的取值格式错误：%s"

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

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

2649

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

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

2651 #, c-format

2652 msgid "bad pack compression level %d"

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

@@ -2763,72 +2795,81 @@ msgstr ""

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

2796 msgstr "服务器不支持 '%s'"

2797

2766 -#: connect.c:103

2798 +#: connect.c:118

2799 #, c-format

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

2801 msgstr "服务器不支持特性 '%s'"

2802

2771 -#: connect.c:114

2803 +#: connect.c:129

2804 msgid "expected flush after capabilities"

2805 msgstr "在能力之后应为一个 flush 包"

2806

2775 -#: connect.c:233

2807 +#: connect.c:263

2808 #, c-format

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

2810 msgstr "忽略第一行 '%s' 之后的能力字段"

2811

2780 -#: connect.c:252

2812 +#: connect.c:284

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

2814 msgstr "协议错误：意外的 capabilities^{}"

2815

2784 -#: connect.c:273

2816 +#: connect.c:306

2817 #, c-format

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

2819 msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"

2820

2789 -#: connect.c:275

2821 +#: connect.c:308

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

2823 msgstr "另一端的仓库不能是浅克隆仓库"

2824

2793 -#: connect.c:313

2825 +#: connect.c:347

2826 msgid "invalid packet"

2827 msgstr "无效数据包"

2828

2797 -#: connect.c:333

2829 +#: connect.c:367

2830 #, c-format

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

2832 msgstr "协议错误：意外的 '%s'"

2833

2802 -#: connect.c:441

2834 +#: connect.c:473

2835 +#, c-format

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

2837 +msgstr "服务器给出未知的对象格式 '%s'"

2838 +

2839 +#: connect.c:500

2840 #, c-format

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

2842 msgstr "无效的 ls-refs 响应：%s"

2843

2807 -#: connect.c:445

2844 +#: connect.c:504

2845 msgid "expected flush after ref listing"

2846 msgstr "在引用列表之后应该有一个 flush 包"

2847

2811 -#: connect.c:544

2848 +#: connect.c:507

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

2850 +msgstr "在引用列表之后应该有响应结束包"

2851 +

2852 +#: connect.c:640

2853 #, c-format

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

2855 msgstr "不支持 '%s' 协议"

2856

2816 -#: connect.c:595

2857 +#: connect.c:691

2858 msgid "unable to set SO_KEEPALIVE on socket"

2859 msgstr "无法为 socket 设置 SO_KEEPALIVE"

2860

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

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

2862 #, c-format

2863 msgid "Looking up %s ... "

2864 msgstr "查找 %s ..."

2865

2825 -#: connect.c:639

2866 +#: connect.c:735

2867 #, c-format

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

2869 msgstr "无法查找 %s（端口 %s）（%s）"

2870

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

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

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

2873 #, c-format

2874 msgid ""

2875 "done.\n"

@@ -2837,7 +2878,7 @@ msgstr ""

2878 "完成。\n"

2879 "连接到 %s（端口 %s）... "

2880

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

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

2882 #, c-format

2883 msgid ""

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

@@ -2847,73 +2888,73 @@ msgstr ""

2888 "%s"

2889

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

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

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

2892 msgid "done."

2893 msgstr "完成。"

2894

2854 -#: connect.c:702

2895 +#: connect.c:798

2896 #, c-format

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

2898 msgstr "无法查找 %s（%s）"

2899

2859 -#: connect.c:708

2900 +#: connect.c:804

2901 #, c-format

2902 msgid "unknown port %s"

2903 msgstr "未知端口 %s"

2904

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

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

2906 #, c-format

2907 msgid "strange hostname '%s' blocked"

2908 msgstr "已阻止奇怪的主机名 '%s'"

2909

2869 -#: connect.c:847

2910 +#: connect.c:943

2911 #, c-format

2912 msgid "strange port '%s' blocked"

2913 msgstr "已阻止奇怪的端口号 '%s'"

2914

2874 -#: connect.c:857

2915 +#: connect.c:953

2916 #, c-format

2917 msgid "cannot start proxy %s"

2918 msgstr "不能启动代理 %s"

2919

2879 -#: connect.c:928

2920 +#: connect.c:1024

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

2922 msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"

2923

2883 -#: connect.c:1123

2924 +#: connect.c:1219

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

2926 msgstr "ssh 变体 'simple' 不支持 -4"

2927

2887 -#: connect.c:1135

2928 +#: connect.c:1231

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

2930 msgstr "ssh 变体 'simple' 不支持 -6"

2931

2891 -#: connect.c:1152

2932 +#: connect.c:1248

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

2934 msgstr "ssh 变体 'simple' 不支持设置端口"

2935

2895 -#: connect.c:1264

2936 +#: connect.c:1360

2937 #, c-format

2938 msgid "strange pathname '%s' blocked"

2939 msgstr "已阻止奇怪的路径名 '%s'"

2940

2900 -#: connect.c:1311

2941 +#: connect.c:1407

2942 msgid "unable to fork"

2943 msgstr "无法 fork"

2944

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

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

2946 msgid "Checking connectivity"

2947 msgstr "正在检查连通性"

2948

2908 -#: connected.c:119

2949 +#: connected.c:121

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

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

2952

2912 -#: connected.c:139

2953 +#: connected.c:141

2954 msgid "failed write to rev-list"

2955 msgstr "写入 rev-list 失败"

2956

2916 -#: connected.c:146

2957 +#: connected.c:148

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

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

2960

@@ -3172,18 +3213,18 @@ msgid ""

3213 msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"

3214

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

3175 -#: diff.c:155

3216 +#: diff.c:156

3217 #, c-format

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

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

3220

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

3181 -#: diff.c:160

3222 +#: diff.c:161

3223 #, c-format

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

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

3226

3186 -#: diff.c:296

3227 +#: diff.c:297

3228 msgid ""

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

3230 "'dimmed-zebra', 'plain'"

@@ -3191,7 +3232,7 @@ msgstr ""

3232 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "

3233 "'plain'"

3234

3194 -#: diff.c:324

3235 +#: diff.c:325

3236 #, c-format

3237 msgid ""

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

@@ -3200,18 +3241,18 @@ msgstr ""

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

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

3243

3203 -#: diff.c:332

3244 +#: diff.c:333

3245 msgid ""

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

3247 "whitespace modes"

3248 msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"

3249

3209 -#: diff.c:405

3250 +#: diff.c:410

3251 #, c-format

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

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

3254

3214 -#: diff.c:465

3255 +#: diff.c:470

3256 #, c-format

3257 msgid ""

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

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

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

3262 "%s"

3263

3223 -#: diff.c:4238

3264 +#: diff.c:4243

3265 #, c-format

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

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

3268

3228 -#: diff.c:4583

3269 +#: diff.c:4589

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

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

3272

3232 -#: diff.c:4586

3273 +#: diff.c:4592

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

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

3276

3236 -#: diff.c:4664

3277 +#: diff.c:4670

3278 msgid "--follow requires exactly one pathspec"

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

3280

3240 -#: diff.c:4712

3281 +#: diff.c:4718

3282 #, c-format

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

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

3285

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

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

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

3288 #, c-format

3289 msgid "%s expects a numerical value"

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

3291

3251 -#: diff.c:4749

3292 +#: diff.c:4755

3293 #, c-format

3294 msgid ""

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

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

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

3299 "%s"

3300

3260 -#: diff.c:4834

3301 +#: diff.c:4840

3302 #, c-format

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

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

3305

3265 -#: diff.c:4858

3306 +#: diff.c:4864

3307 #, c-format

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

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

3310

3270 -#: diff.c:4872

3311 +#: diff.c:4878

3312 #, c-format

3313 msgid "unable to resolve '%s'"

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

3315

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

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

3317 #, c-format

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

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

3320

3280 -#: diff.c:4940

3321 +#: diff.c:4946

3322 #, c-format

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

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

3325

3285 -#: diff.c:4961

3326 +#: diff.c:4967

3327 #, c-format

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

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

3330

3290 -#: diff.c:4980

3331 +#: diff.c:4986

3332 #, c-format

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

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

3335

3295 -#: diff.c:5020

3336 +#: diff.c:5026

3337 msgid ""

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

3339 "\"histogram\""

3340 msgstr ""

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

3342

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

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

3344 #, c-format

3345 msgid "invalid argument to %s"

3346 msgstr "%s 的参数无效"

3347

3307 -#: diff.c:5214

3348 +#: diff.c:5219

3349 #, c-format

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

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

3352

3312 -#: diff.c:5270

3353 +#: diff.c:5275

3354 #, c-format

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

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

3357

3317 -#: diff.c:5293

3358 +#: diff.c:5298

3359 msgid "Diff output format options"

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

3361

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

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

3363 msgid "generate patch"

3364 msgstr "生成补丁"

3365

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

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

3367 msgid "suppress diff output"

3368 msgstr "不显示差异输出"

3369

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

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

3371 msgid "<n>"

3372 msgstr "<n>"

3373

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

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

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

3376 msgstr "生成含 <n> 行上下文的差异"

3377

3337 -#: diff.c:5309

3378 +#: diff.c:5314

3379 msgid "generate the diff in raw format"

3380 msgstr "生成原始格式的差异"

3381

3341 -#: diff.c:5312

3382 +#: diff.c:5317

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

3384 msgstr "和 '-p --raw' 同义"

3385

3345 -#: diff.c:5316

3386 +#: diff.c:5321

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

3388 msgstr "和 '-p --stat' 同义"

3389

3349 -#: diff.c:5320

3390 +#: diff.c:5325

3391 msgid "machine friendly --stat"

3392 msgstr "机器友好的 --stat"

3393

3353 -#: diff.c:5323

3394 +#: diff.c:5328

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

3396 msgstr "只输出 --stat 的最后一行"

3397

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

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

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

3400 msgstr "<参数1,参数2>..."

3401

3361 -#: diff.c:5326

3402 +#: diff.c:5331

3403 msgid ""

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

3405 msgstr "输出每个子目录相对变更的分布"

3406

3366 -#: diff.c:5330

3407 +#: diff.c:5335

3408 msgid "synonym for --dirstat=cumulative"

3409 msgstr "和 --dirstat=cumulative 同义"

3410

3370 -#: diff.c:5334

3411 +#: diff.c:5339

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

3413 msgstr "是 --dirstat=files,param1,param2... 的同义词"

3414

3374 -#: diff.c:5338

3415 +#: diff.c:5343

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

3417 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"

3418

3378 -#: diff.c:5341

3419 +#: diff.c:5346

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

3421 msgstr "精简摘要，例如创建、重命名和模式变更"

3422

3382 -#: diff.c:5344

3423 +#: diff.c:5349

3424 msgid "show only names of changed files"

3425 msgstr "只显示变更文件的文件名"

3426

3386 -#: diff.c:5347

3427 +#: diff.c:5352

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

3429 msgstr "只显示变更文件的文件名和状态"

3430

3390 -#: diff.c:5349

3431 +#: diff.c:5354

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

3433 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"

3434

3394 -#: diff.c:5350

3435 +#: diff.c:5355

3436 msgid "generate diffstat"

3437 msgstr "生成差异统计（diffstat）"

3438

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

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

3440 msgid "<width>"

3441 msgstr "<宽度>"

3442

3402 -#: diff.c:5353

3443 +#: diff.c:5358

3444 msgid "generate diffstat with a given width"

3445 msgstr "使用给定的长度生成差异统计"

3446

3406 -#: diff.c:5356

3447 +#: diff.c:5361

3448 msgid "generate diffstat with a given name width"

3449 msgstr "使用给定的文件名长度生成差异统计"

3450

3410 -#: diff.c:5359

3451 +#: diff.c:5364

3452 msgid "generate diffstat with a given graph width"

3453 msgstr "使用给定的图形长度生成差异统计"

3454

3414 -#: diff.c:5361

3455 +#: diff.c:5366

3456 msgid "<count>"

3457 msgstr "<次数>"

3458

3418 -#: diff.c:5362

3459 +#: diff.c:5367

3460 msgid "generate diffstat with limited lines"

3461 msgstr "生成有限行数的差异统计"

3462

3422 -#: diff.c:5365

3463 +#: diff.c:5370

3464 msgid "generate compact summary in diffstat"

3465 msgstr "生成差异统计的简洁摘要"

3466

3426 -#: diff.c:5368

3467 +#: diff.c:5373

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

3469 msgstr "输出一个可以应用的二进制差异"

3470

3430 -#: diff.c:5371

3471 +#: diff.c:5376

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

3473 msgstr "在 \"index\" 行显示完整的前后对象名称"

3474

3434 -#: diff.c:5373

3475 +#: diff.c:5378

3476 msgid "show colored diff"

3477 msgstr "显示带颜色的差异"

3478

3438 -#: diff.c:5374

3479 +#: diff.c:5379

3480 msgid "<kind>"

3481 msgstr "<类型>"

3482

3442 -#: diff.c:5375

3483 +#: diff.c:5380

3484 msgid ""

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

3486 "diff"

3487 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"

3488

3448 -#: diff.c:5378

3489 +#: diff.c:5383

3490 msgid ""

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

3492 "--numstat"

@@ -3453,295 +3494,295 @@ msgstr ""

3494 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"

3495 "符"

3496

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

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

3498 msgid "<prefix>"

3499 msgstr "<前缀>"

3500

3460 -#: diff.c:5382

3501 +#: diff.c:5387

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

3503 msgstr "显示给定的源前缀取代 \"a/\""

3504

3464 -#: diff.c:5385

3505 +#: diff.c:5390

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

3507 msgstr "显示给定的目标前缀取代 \"b/\""

3508

3468 -#: diff.c:5388

3509 +#: diff.c:5393

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

3511 msgstr "输出的每一行附加前缀"

3512

3472 -#: diff.c:5391

3513 +#: diff.c:5396

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

3515 msgstr "不显示任何源和目标前缀"

3516

3476 -#: diff.c:5394

3517 +#: diff.c:5399

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

3519 msgstr "显示指定行数的差异块间的上下文"

3520

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

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

3522 msgid "<char>"

3523 msgstr "<字符>"

3524

3484 -#: diff.c:5399

3525 +#: diff.c:5404

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

3527 msgstr "指定一个字符取代 '+' 来表示新的一行"

3528

3488 -#: diff.c:5404

3529 +#: diff.c:5409

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

3531 msgstr "指定一个字符取代 '-' 来表示旧的一行"

3532

3492 -#: diff.c:5409

3533 +#: diff.c:5414

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

3535 msgstr "指定一个字符取代 ' ' 来表示一行上下文"

3536

3496 -#: diff.c:5412

3537 +#: diff.c:5417

3538 msgid "Diff rename options"

3539 msgstr "差异重命名选项"

3540

3500 -#: diff.c:5413

3541 +#: diff.c:5418

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

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

3544

3504 -#: diff.c:5414

3545 +#: diff.c:5419

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

3547 msgstr "将完全重写的变更打破为成对的删除和创建"

3548

3508 -#: diff.c:5418

3549 +#: diff.c:5423

3550 msgid "detect renames"

3551 msgstr "检测重命名"

3552

3512 -#: diff.c:5422

3553 +#: diff.c:5427

3554 msgid "omit the preimage for deletes"

3555 msgstr "省略删除操作的差异输出"

3556

3516 -#: diff.c:5425

3557 +#: diff.c:5430

3558 msgid "detect copies"

3559 msgstr "检测拷贝"

3560

3520 -#: diff.c:5429

3561 +#: diff.c:5434

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

3563 msgstr "使用未修改的文件做为发现拷贝的源"

3564

3524 -#: diff.c:5431

3565 +#: diff.c:5436

3566 msgid "disable rename detection"

3567 msgstr "禁用重命名探测"

3568

3528 -#: diff.c:5434

3569 +#: diff.c:5439

3570 msgid "use empty blobs as rename source"

3571 msgstr "使用空的数据对象做为重命名的源"

3572

3532 -#: diff.c:5436

3573 +#: diff.c:5441

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

3575 msgstr "继续列出文件重命名以外的历史记录"

3576

3536 -#: diff.c:5439

3577 +#: diff.c:5444

3578 msgid ""

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

3580 "given limit"

3581 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"

3582

3542 -#: diff.c:5441

3583 +#: diff.c:5446

3584 msgid "Diff algorithm options"

3585 msgstr "差异算法选项"

3586

3546 -#: diff.c:5443

3587 +#: diff.c:5448

3588 msgid "produce the smallest possible diff"

3589 msgstr "生成尽可能小的差异"

3590

3550 -#: diff.c:5446

3591 +#: diff.c:5451

3592 msgid "ignore whitespace when comparing lines"

3593 msgstr "行比较时忽略空白字符"

3594

3554 -#: diff.c:5449

3595 +#: diff.c:5454

3596 msgid "ignore changes in amount of whitespace"

3597 msgstr "忽略空白字符的变更"

3598

3558 -#: diff.c:5452

3599 +#: diff.c:5457

3600 msgid "ignore changes in whitespace at EOL"

3601 msgstr "忽略行尾的空白字符变更"

3602

3562 -#: diff.c:5455

3603 +#: diff.c:5460

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

3605 msgstr "忽略行尾的回车符（CR）"

3606

3566 -#: diff.c:5458

3607 +#: diff.c:5463

3608 msgid "ignore changes whose lines are all blank"

3609 msgstr "忽略整行都是空白的变更"

3610

3570 -#: diff.c:5461

3611 +#: diff.c:5466

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

3613 msgstr "启发式转换差异边界以便阅读"

3614

3574 -#: diff.c:5464

3615 +#: diff.c:5469

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

3617 msgstr "使用 \"patience diff\" 算法生成差异"

3618

3578 -#: diff.c:5468

3619 +#: diff.c:5473

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

3621 msgstr "使用 \"histogram diff\" 算法生成差异"

3622

3582 -#: diff.c:5470

3623 +#: diff.c:5475

3624 msgid "<algorithm>"

3625 msgstr "<算法>"

3626

3586 -#: diff.c:5471

3627 +#: diff.c:5476

3628 msgid "choose a diff algorithm"

3629 msgstr "选择一个差异算法"

3630

3590 -#: diff.c:5473

3631 +#: diff.c:5478

3632 msgid "<text>"

3633 msgstr "<文本>"

3634

3594 -#: diff.c:5474

3635 +#: diff.c:5479

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

3637 msgstr "使用 \"anchored diff\" 算法生成差异"

3638

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

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

3640 msgid "<mode>"

3641 msgstr "<模式>"

3642

3602 -#: diff.c:5477

3643 +#: diff.c:5482

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

3645 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"

3646

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

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

3648 msgid "<regex>"

3649 msgstr "<正则>"

3650

3610 -#: diff.c:5480

3651 +#: diff.c:5485

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

3653 msgstr "使用 <正则表达式> 确定何为一个词"

3654

3614 -#: diff.c:5483

3655 +#: diff.c:5488

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

3657 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"

3658

3618 -#: diff.c:5486

3659 +#: diff.c:5491

3660 msgid "moved lines of code are colored differently"

3661 msgstr "移动的代码行用不同方式着色"

3662

3622 -#: diff.c:5489

3663 +#: diff.c:5494

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

3665 msgstr "在 --color-moved 下如何忽略空白字符"

3666

3626 -#: diff.c:5492

3667 +#: diff.c:5497

3668 msgid "Other diff options"

3669 msgstr "其它差异选项"

3670

3630 -#: diff.c:5494

3671 +#: diff.c:5499

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

3673 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"

3674

3634 -#: diff.c:5498

3675 +#: diff.c:5503

3676 msgid "treat all files as text"

3677 msgstr "把所有文件当做文本处理"

3678

3638 -#: diff.c:5500

3679 +#: diff.c:5505

3680 msgid "swap two inputs, reverse the diff"

3681 msgstr "交换两个输入，反转差异"

3682

3642 -#: diff.c:5502

3683 +#: diff.c:5507

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

3685 msgstr "有差异时退出码为 1，否则为 0"

3686

3646 -#: diff.c:5504

3687 +#: diff.c:5509

3688 msgid "disable all output of the program"

3689 msgstr "禁用本程序的所有输出"

3690

3650 -#: diff.c:5506

3691 +#: diff.c:5511

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

3693 msgstr "允许执行一个外置的差异助手"

3694

3654 -#: diff.c:5508

3695 +#: diff.c:5513

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

3697 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"

3698

3658 -#: diff.c:5510

3699 +#: diff.c:5515

3700 msgid "<when>"

3701 msgstr "<何时>"

3702

3662 -#: diff.c:5511

3703 +#: diff.c:5516

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

3705 msgstr "在生成差异时，忽略子模组的更改"

3706

3666 -#: diff.c:5514

3707 +#: diff.c:5519

3708 msgid "<format>"

3709 msgstr "<格式>"

3710

3670 -#: diff.c:5515

3711 +#: diff.c:5520

3712 msgid "specify how differences in submodules are shown"

3713 msgstr "指定子模组的差异如何显示"

3714

3674 -#: diff.c:5519

3715 +#: diff.c:5524

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

3717 msgstr "隐藏索引中 'git add -N' 条目"

3718

3678 -#: diff.c:5522

3719 +#: diff.c:5527

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

3721 msgstr "将索引中 'git add -N' 条目当做真实的"

3722

3682 -#: diff.c:5524

3723 +#: diff.c:5529

3724 msgid "<string>"

3725 msgstr "<字符串>"

3726

3686 -#: diff.c:5525

3727 +#: diff.c:5530

3728 msgid ""

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

3730 "string"

3731 msgstr "查找改变了指定字符串出现次数的差异"

3732

3692 -#: diff.c:5528

3733 +#: diff.c:5533

3734 msgid ""

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

3736 "regex"

3737 msgstr "查找改变指定正则匹配出现次数的差异"

3738

3698 -#: diff.c:5531

3739 +#: diff.c:5536

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

3741 msgstr "显示使用 -S 或 -G 的变更集的所有变更"

3742

3702 -#: diff.c:5534

3743 +#: diff.c:5539

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

3745 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"

3746

3706 -#: diff.c:5537

3747 +#: diff.c:5542

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

3749 msgstr "控制输出中的文件显示顺序"

3750

3710 -#: diff.c:5538

3751 +#: diff.c:5543

3752 msgid "<object-id>"

3753 msgstr "<对象 ID>"

3754

3714 -#: diff.c:5539

3755 +#: diff.c:5544

3756 msgid ""

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

3758 "object"

3759 msgstr "查找改变指定对象出现次数的差异"

3760

3720 -#: diff.c:5541

3761 +#: diff.c:5546

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

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

3764

3724 -#: diff.c:5542

3765 +#: diff.c:5547

3766 msgid "select files by diff type"

3767 msgstr "通过差异类型选择文件"

3768

3728 -#: diff.c:5544

3769 +#: diff.c:5549

3770 msgid "<file>"

3771 msgstr "<文件>"

3772

3732 -#: diff.c:5545

3773 +#: diff.c:5550

3774 msgid "Output to a specific file"

3775 msgstr "输出到一个指定的文件"

3776

3736 -#: diff.c:6200

3777 +#: diff.c:6205

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

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

3780

3740 -#: diff.c:6203

3781 +#: diff.c:6208

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

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

3784

3744 -#: diff.c:6206

3785 +#: diff.c:6211

3786 #, c-format

3787 msgid ""

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

@@ -3756,59 +3797,59 @@ msgstr "读取排序文件 '%s' 失败"

3797 msgid "Performing inexact rename detection"

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

3799

3759 -#: dir.c:555

3800 +#: dir.c:573

3801 #, c-format

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

3803 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"

3804

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

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

3806 #, c-format

3807 msgid "unrecognized pattern: '%s'"

3808 msgstr "未识别的模式：'%s'"

3809

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

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

3811 #, c-format

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

3813 msgstr "未识别的反向模式：'%s'"

3814

3774 -#: dir.c:786

3815 +#: dir.c:804

3816 #, c-format

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

3818 msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"

3819

3779 -#: dir.c:796

3820 +#: dir.c:814

3821 msgid "disabling cone pattern matching"

3822 msgstr "禁止 cone 模式匹配"

3823

3783 -#: dir.c:1173

3824 +#: dir.c:1191

3825 #, c-format

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

3827 msgstr "不能将 %s 用作排除文件"

3828

3788 -#: dir.c:2275

3829 +#: dir.c:2296

3830 #, c-format

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

3832 msgstr "不能打开目录 '%s'"

3833

3793 -#: dir.c:2575

3834 +#: dir.c:2596

3835 msgid "failed to get kernel name and information"

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

3837

3797 -#: dir.c:2699

3838 +#: dir.c:2720

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

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

3841

3801 -#: dir.c:3481

3842 +#: dir.c:3502

3843 #, c-format

3844 msgid "index file corrupt in repo %s"

3845 msgstr "仓库 %s 中的索引文件损坏"

3846

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

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

3848 #, c-format

3849 msgid "could not create directories for %s"

3850 msgstr "不能为 %s 创建目录"

3851

3811 -#: dir.c:3560

3852 +#: dir.c:3581

3853 #, c-format

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

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

@@ -3818,11 +3859,11 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

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

3860 msgstr "提示：等待您的编辑器关闭文件...%c"

3861

3821 -#: entry.c:178

3862 +#: entry.c:177

3863 msgid "Filtering content"

3864 msgstr "过滤内容"

3865

3825 -#: entry.c:479

3866 +#: entry.c:478

3867 #, c-format

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

3869 msgstr "不能对文件 '%s' 调用 stat"

@@ -3842,227 +3883,245 @@ msgstr "不能设置 GIT_DIR 为 '%s'"

3883 msgid "too many args to run %s"

3884 msgstr "执行 %s 的参数太多"

3885

3845 -#: fetch-pack.c:151

3886 +#: fetch-pack.c:152

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

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

3889

3849 -#: fetch-pack.c:154

3890 +#: fetch-pack.c:155

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

3892 msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"

3893

3853 -#: fetch-pack.c:165

3894 +#: fetch-pack.c:166

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

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

3897

3857 -#: fetch-pack.c:185

3898 +#: fetch-pack.c:186

3899 #, c-format

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

3901 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

3902

3862 -#: fetch-pack.c:196

3903 +#: fetch-pack.c:197

3904 msgid "unable to write to remote"

3905 msgstr "无法写到远程"

3906

3866 -#: fetch-pack.c:258

3907 +#: fetch-pack.c:259

3908 msgid "--stateless-rpc requires multi_ack_detailed"

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

3910

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

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

3912 #, c-format

3913 msgid "invalid shallow line: %s"

3914 msgstr "无效的 shallow 信息：%s"

3915

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

3916 +#: fetch-pack.c:364 fetch-pack.c:1414

3917 #, c-format

3918 msgid "invalid unshallow line: %s"

3919 msgstr "无效的 unshallow 信息：%s"

3920

3880 -#: fetch-pack.c:365 fetch-pack.c:1372

3921 +#: fetch-pack.c:366 fetch-pack.c:1416

3922 #, c-format

3923 msgid "object not found: %s"

3924 msgstr "对象未找到：%s"

3925

3885 -#: fetch-pack.c:368 fetch-pack.c:1375

3926 +#: fetch-pack.c:369 fetch-pack.c:1419

3927 #, c-format

3928 msgid "error in object: %s"

3929 msgstr "对象中出错：%s"

3930

3890 -#: fetch-pack.c:370 fetch-pack.c:1377

3931 +#: fetch-pack.c:371 fetch-pack.c:1421

3932 #, c-format

3933 msgid "no shallow found: %s"

3934 msgstr "未发现 shallow：%s"

3935

3895 -#: fetch-pack.c:373 fetch-pack.c:1381

3936 +#: fetch-pack.c:374 fetch-pack.c:1425

3937 #, c-format

3938 msgid "expected shallow/unshallow, got %s"

3939 msgstr "应为 shallow/unshallow，却得到 %s"

3940

3900 -#: fetch-pack.c:415

3941 +#: fetch-pack.c:416

3942 #, c-format

3943 msgid "got %s %d %s"

3944 msgstr "得到 %s %d %s"

3945

3905 -#: fetch-pack.c:432

3946 +#: fetch-pack.c:433

3947 #, c-format

3948 msgid "invalid commit %s"

3949 msgstr "无效提交 %s"

3950

3910 -#: fetch-pack.c:463

3951 +#: fetch-pack.c:464

3952 msgid "giving up"

3953 msgstr "放弃"

3954

3914 -#: fetch-pack.c:476 progress.c:336

3955 +#: fetch-pack.c:477 progress.c:336

3956 msgid "done"

3957 msgstr "完成"

3958

3918 -#: fetch-pack.c:488

3959 +#: fetch-pack.c:489

3960 #, c-format

3961 msgid "got %s (%d) %s"

3962 msgstr "得到 %s (%d) %s"

3963

3923 -#: fetch-pack.c:534

3964 +#: fetch-pack.c:535

3965 #, c-format

3966 msgid "Marking %s as complete"

3967 msgstr "标记 %s 为完成"

3968

3928 -#: fetch-pack.c:755

3969 +#: fetch-pack.c:756

3970 #, c-format

3971 msgid "already have %s (%s)"

3972 msgstr "已经有 %s（%s）"

3973

3933 -#: fetch-pack.c:819

3974 +#: fetch-pack.c:821

3975 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3976 msgstr "fetch-pack：无法派生 sideband 多路输出"

3977

3937 -#: fetch-pack.c:827

3978 +#: fetch-pack.c:829

3979 msgid "protocol error: bad pack header"

3980 msgstr "协议错误：坏的包头"

3981

3941 -#: fetch-pack.c:901

3982 +#: fetch-pack.c:910

3983 #, c-format

3984 msgid "fetch-pack: unable to fork off %s"

3985 msgstr "fetch-pack：无法派生进程 %s"

3986

3946 -#: fetch-pack.c:917

3987 +#: fetch-pack.c:927

3988 #, c-format

3989 msgid "%s failed"

3990 msgstr "%s 失败"

3991

3951 -#: fetch-pack.c:919

3992 +#: fetch-pack.c:929

3993 msgid "error in sideband demultiplexer"

3994 msgstr "sideband 多路输出出错"

3995

3955 -#: fetch-pack.c:966

3996 +#: fetch-pack.c:976

3997 #, c-format

3998 msgid "Server version is %.*s"

3999 msgstr "服务器版本 %.*s"

4000

3960 -#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986

3961 -#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002

3962 -#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018

3963 -#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040

4001 +#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996

4002 +#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012

4003 +#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028

4004 +#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

4005 #, c-format

4006 msgid "Server supports %s"

4007 msgstr "服务器支持 %s"

4008

3968 -#: fetch-pack.c:973

4009 +#: fetch-pack.c:983

4010 msgid "Server does not support shallow clients"

4011 msgstr "服务器不支持 shalllow 客户端"

4012

3972 -#: fetch-pack.c:1033

4013 +#: fetch-pack.c:1043

4014 msgid "Server does not support --shallow-since"

4015 msgstr "服务器不支持 --shallow-since"

4016

3976 -#: fetch-pack.c:1038

4017 +#: fetch-pack.c:1048

4018 msgid "Server does not support --shallow-exclude"

4019 msgstr "服务器不支持 --shallow-exclude"

4020

3980 -#: fetch-pack.c:1042

4021 +#: fetch-pack.c:1052

4022 msgid "Server does not support --deepen"

4023 msgstr "服务器不支持 --deepen"

4024

3984 -#: fetch-pack.c:1059

4025 +#: fetch-pack.c:1054

4026 +msgid "Server does not support this repository's object format"

4027 +msgstr "服务器不支持这个仓库的对象格式"

4028 +

4029 +#: fetch-pack.c:1071

4030 msgid "no common commits"

4031 msgstr "没有共同的提交"

4032

3988 -#: fetch-pack.c:1071 fetch-pack.c:1563

4033 +#: fetch-pack.c:1083 fetch-pack.c:1639

4034 msgid "git fetch-pack: fetch failed."

4035 msgstr "git fetch-pack：获取失败。"

4036

4037 #: fetch-pack.c:1211

4038 +#, c-format

4039 +msgid "mismatched algorithms: client %s; server %s"

4040 +msgstr "不匹配的算法：客户端 %s，服务端 %s"

4041 +

4042 +#: fetch-pack.c:1215

4043 +#, c-format

4044 +msgid "the server does not support algorithm '%s'"

4045 +msgstr "服务器不支持算法 '%s'"

4046 +

4047 +#: fetch-pack.c:1235

4048 msgid "Server does not support shallow requests"

4049 msgstr "服务器不支持 shalllow 请求"

4050

3996 -#: fetch-pack.c:1218

4051 +#: fetch-pack.c:1242

4052 msgid "Server supports filter"

4053 msgstr "服务器支持 filter"

4054

4000 -#: fetch-pack.c:1242

4055 +#: fetch-pack.c:1286

4056 msgid "unable to write request to remote"

4057 msgstr "无法将请求写到远程"

4058

4004 -#: fetch-pack.c:1260

4059 +#: fetch-pack.c:1304

4060 #, c-format

4061 msgid "error reading section header '%s'"

4062 msgstr "读取节标题 '%s' 出错"

4063

4009 -#: fetch-pack.c:1266

4064 +#: fetch-pack.c:1310

4065 #, c-format

4066 msgid "expected '%s', received '%s'"

4067 msgstr "预期 '%s'，得到 '%s'"

4068

4014 -#: fetch-pack.c:1327

4069 +#: fetch-pack.c:1371

4070 #, c-format

4071 msgid "unexpected acknowledgment line: '%s'"

4072 msgstr "意外的确认行：'%s'"

4073

4019 -#: fetch-pack.c:1332

4074 +#: fetch-pack.c:1376

4075 #, c-format

4076 msgid "error processing acks: %d"

4077 msgstr "处理 ack 出错：%d"

4078

4024 -#: fetch-pack.c:1342

4079 +#: fetch-pack.c:1386

4080 msgid "expected packfile to be sent after 'ready'"

4081 msgstr "预期在 'ready' 之后发送 packfile"

4082

4028 -#: fetch-pack.c:1344

4083 +#: fetch-pack.c:1388

4084 msgid "expected no other sections to be sent after no 'ready'"

4085 msgstr "在没有 'ready' 不应该发送其它小节"

4086

4032 -#: fetch-pack.c:1386

4087 +#: fetch-pack.c:1430

4088 #, c-format

4089 msgid "error processing shallow info: %d"

4090 msgstr "处理浅克隆信息出错：%d"

4091

4037 -#: fetch-pack.c:1433

4092 +#: fetch-pack.c:1477

4093 #, c-format

4094 msgid "expected wanted-ref, got '%s'"

4095 msgstr "预期 wanted-ref，得到 '%s'"

4096

4042 -#: fetch-pack.c:1438

4097 +#: fetch-pack.c:1482

4098 #, c-format

4099 msgid "unexpected wanted-ref: '%s'"

4100 msgstr "意外的 wanted-ref：'%s'"

4101

4047 -#: fetch-pack.c:1443

4102 +#: fetch-pack.c:1487

4103 #, c-format

4104 msgid "error processing wanted refs: %d"

4105 msgstr "处理要获取的引用出错：%d"

4106

4052 -#: fetch-pack.c:1789

4107 +#: fetch-pack.c:1517

4108 +msgid "git fetch-pack: expected response end packet"

4109 +msgstr "git fetch-pack：预期响应结束包"

4110 +

4111 +#: fetch-pack.c:1921

4112 msgid "no matching remote head"

4113 msgstr "没有匹配的远程分支"

4114

4056 -#: fetch-pack.c:1812 builtin/clone.c:692

4115 +#: fetch-pack.c:1944 builtin/clone.c:692

4116 msgid "remote did not send all necessary objects"

4117 msgstr "远程没有发送所有必需的对象"

4118

4060 -#: fetch-pack.c:1839

4119 +#: fetch-pack.c:1971

4120 #, c-format

4121 msgid "no such remote ref %s"

4122 msgstr "没有这样的远程引用 %s"

4123

4065 -#: fetch-pack.c:1842

4124 +#: fetch-pack.c:1974

4125 #, c-format

4126 msgid "Server does not allow request for unadvertised object %s"

4127 msgstr "服务器不允许请求未公开的对象 %s"

@@ -4098,7 +4157,7 @@ msgstr ""

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

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

4159

4101 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4160 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

4161 #: builtin/rm.c:135

4162 #, c-format

4163 msgid "failed to stat '%s'"

@@ -4242,16 +4301,16 @@ msgstr[1] ""

4301 "\n"

4302 "最相似的命令是"

4303

4245 -#: help.c:653

4304 +#: help.c:654

4305 msgid "git version [<options>]"

4306 msgstr "git version [<选项>]"

4307

4249 -#: help.c:708

4308 +#: help.c:709

4309 #, c-format

4310 msgid "%s: %s - %s"

4311 msgstr "%s：%s - %s"

4312

4254 -#: help.c:712

4313 +#: help.c:713

4314 msgid ""

4315 "\n"

4316 "Did you mean this?"

@@ -4349,6 +4408,10 @@ msgstr "期望在组合后有一些东西："

4408 msgid "multiple filter-specs cannot be combined"

4409 msgstr "不能混用多种过滤规格"

4410

4411 +#: list-objects-filter-options.c:330

4412 +msgid "unable to upgrade repository format to support partial clone"

4413 +msgstr "无法升级仓库格式以支持部分克隆"

4414 +

4415 #: list-objects-filter.c:492

4416 #, c-format

4417 msgid "unable to access sparse blob in '%s'"

@@ -4702,7 +4765,7 @@ msgstr "添加/添加"

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

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

4767

4705 -#: merge-recursive.c:3101 git-submodule.sh:985

4768 +#: merge-recursive.c:3101 git-submodule.sh:959

4769 msgid "submodule"

4770 msgstr "子模组"

4771

@@ -4826,7 +4889,7 @@ msgid "failed to read the cache"

4889 msgstr "读取缓存失败"

4890

4891 #: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4829 -#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816

4892 +#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

4893 #: builtin/stash.c:265

4894 msgid "unable to write new index file"

4895 msgstr "无法写新的索引文件"

@@ -5071,21 +5134,21 @@ msgstr "不能解析对象：%s"

5134 msgid "hash mismatch %s"

5135 msgstr "哈希值与 %s 不匹配"

5136

5074 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5137 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

5138 #, c-format

5139 msgid "unable to get size of %s"

5140 msgstr "无法得到 %s 的大小"

5141

5079 -#: packfile.c:629

5142 +#: packfile.c:630

5143 msgid "offset before end of packfile (broken .idx?)"

5144 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

5145

5083 -#: packfile.c:1899

5146 +#: packfile.c:1900

5147 #, c-format

5148 msgid "offset before start of pack index for %s (corrupt index?)"

5149 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

5150

5088 -#: packfile.c:1903

5151 +#: packfile.c:1904

5152 #, c-format

5153 msgid "offset beyond end of pack index for %s (truncated index?)"

5154 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

@@ -5287,44 +5350,48 @@ msgid "unable to write delim packet"

5350 msgstr "无法写 delim 包"

5351

5352 #: pkt-line.c:106

5353 +msgid "unable to write stateless separator packet"

5354 +msgstr "无法写入无状态分隔符数据包"

5355 +

5356 +#: pkt-line.c:113

5357 msgid "flush packet write failed"

5358 msgstr "flush 包写错误"

5359

5293 -#: pkt-line.c:146 pkt-line.c:232

5360 +#: pkt-line.c:153 pkt-line.c:239

5361 msgid "protocol error: impossibly long line"

5362 msgstr "协议错误：不可能的长行"

5363

5297 -#: pkt-line.c:162 pkt-line.c:164

5364 +#: pkt-line.c:169 pkt-line.c:171

5365 msgid "packet write with format failed"

5366 msgstr "格式化包写入错误"

5367

5301 -#: pkt-line.c:196

5368 +#: pkt-line.c:203

5369 msgid "packet write failed - data exceeds max packet size"

5370 msgstr "写数据包失败：数据超过了包的最大长度"

5371

5305 -#: pkt-line.c:203 pkt-line.c:210

5372 +#: pkt-line.c:210 pkt-line.c:217

5373 msgid "packet write failed"

5374 msgstr "数据包写入失败"

5375

5309 -#: pkt-line.c:295

5376 +#: pkt-line.c:302

5377 msgid "read error"

5378 msgstr "读取错误"

5379

5313 -#: pkt-line.c:303

5380 +#: pkt-line.c:310

5381 msgid "the remote end hung up unexpectedly"

5382 msgstr "远端意外挂断了"

5383

5317 -#: pkt-line.c:331

5384 +#: pkt-line.c:338

5385 #, c-format

5386 msgid "protocol error: bad line length character: %.4s"

5387 msgstr "协议错误：错误的行长度字符串：%.4s"

5388

5322 -#: pkt-line.c:341 pkt-line.c:346

5389 +#: pkt-line.c:352 pkt-line.c:357

5390 #, c-format

5391 msgid "protocol error: bad line length %d"

5392 msgstr "协议错误：错误的行长度 %d"

5393

5327 -#: pkt-line.c:362

5394 +#: pkt-line.c:373

5395 #, c-format

5396 msgid "remote error: %s"

5397 msgstr "远程错误：%s"

@@ -5501,7 +5568,7 @@ msgstr "'%s' 的未排序暂存条目"

5568

5569 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5570 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5504 -#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5571 +#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5572 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5573 #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5574 #: builtin/submodule--helper.c:332

@@ -5558,7 +5625,7 @@ msgstr "无法刷新共享索引 '%s'"

5625 msgid "broken index, expect %s in %s, got %s"

5626 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5627

5561 -#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5628 +#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5629 #, c-format

5630 msgid "could not close '%s'"

5631 msgstr "不能关闭 '%s'"

@@ -5734,7 +5801,7 @@ msgstr ""

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

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

5803

5737 -#: ref-filter.c:42 wt-status.c:1936

5804 +#: ref-filter.c:42 wt-status.c:1977

5805 msgid "gone"

5806 msgstr "丢失"

5807

@@ -5958,7 +6025,7 @@ msgstr "格式错误的对象 '%s'"

6025 msgid "ignoring ref with broken name %s"

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

6027

5961 -#: ref-filter.c:2095 refs.c:625

6028 +#: ref-filter.c:2095 refs.c:657

6029 #, c-format

6030 msgid "ignoring broken ref %s"

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

@@ -5988,94 +6055,108 @@ msgstr "格式错误的对象名 %s"

6055 msgid "option `%s' must point to a commit"

6056 msgstr "选项 `%s' 必须指向一个提交"

6057

5991 -#: refs.c:262

6058 +#: refs.c:264

6059 #, c-format

6060 msgid "%s does not point to a valid object!"

6061 msgstr "%s 没有指向一个有效的对象！"

6062

5996 -#: refs.c:623

6063 +#: refs.c:572

6064 +#, c-format

6065 +msgid "could not retrieve `%s`"

6066 +msgstr "无法获取 `%s`"

6067 +

6068 +#: refs.c:579

6069 +#, c-format

6070 +msgid "invalid branch name: %s = %s"

6071 +msgstr "无效的分支名：%s = %s"

6072 +

6073 +#: refs.c:655

6074 #, c-format

6075 msgid "ignoring dangling symref %s"

6076 msgstr "忽略悬空符号引用 %s"

6077

6001 -#: refs.c:760

6078 +#: refs.c:792

6079 #, c-format

6080 msgid "could not open '%s' for writing: %s"

6081 msgstr "无法为写入打开 '%s'：%s"

6082

6006 -#: refs.c:770 refs.c:821

6083 +#: refs.c:802 refs.c:853

6084 #, c-format

6085 msgid "could not read ref '%s'"

6086 msgstr "无法读取引用 '%s'"

6087

6011 -#: refs.c:776

6088 +#: refs.c:808

6089 #, c-format

6090 msgid "ref '%s' already exists"

6091 msgstr "引用 '%s' 已经存在"

6092

6016 -#: refs.c:781

6093 +#: refs.c:813

6094 #, c-format

6095 msgid "unexpected object ID when writing '%s'"

6096 msgstr "写入 '%s' 时意外的对象 ID"

6097

6021 -#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6022 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173

6023 -#: wrapper.c:620

6098 +#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6099 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168

6100 +#: wrapper.c:628

6101 #, c-format

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

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

6104

6028 -#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6105 +#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

6106 #: builtin/rebase.c:852

6107 #, c-format

6108 msgid "could not open '%s' for writing"

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

6110

6034 -#: refs.c:823

6111 +#: refs.c:855

6112 #, c-format

6113 msgid "unexpected object ID when deleting '%s'"

6114 msgstr "删除 '%s' 时意外的对象 ID"

6115

6039 -#: refs.c:954

6116 +#: refs.c:986

6117 #, c-format

6118 msgid "log for ref %s has gap after %s"

6119 msgstr "引用 %s 的日志在 %s 之后有缺口"

6120

6044 -#: refs.c:960

6121 +#: refs.c:992

6122 #, c-format

6123 msgid "log for ref %s unexpectedly ended on %s"

6124 msgstr "引用 %s 的日志意外终止于 %s "

6125

6049 -#: refs.c:1019

6126 +#: refs.c:1051

6127 #, c-format

6128 msgid "log for %s is empty"

6129 msgstr "%s 的日志为空"

6130

6054 -#: refs.c:1111

6131 +#: refs.c:1143

6132 #, c-format

6133 msgid "refusing to update ref with bad name '%s'"

6134 msgstr "拒绝更新有错误名称 '%s' 的引用"

6135

6059 -#: refs.c:1187

6136 +#: refs.c:1219

6137 #, c-format

6138 msgid "update_ref failed for ref '%s': %s"

6139 msgstr "对引用 '%s' 执行 update_ref 失败：%s"

6140

6064 -#: refs.c:1979

6141 +#: refs.c:2011

6142 #, c-format

6143 msgid "multiple updates for ref '%s' not allowed"

6144 msgstr "不允许对引用 '%s' 多次更新"

6145

6069 -#: refs.c:2011

6146 +#: refs.c:2098

6147 msgid "ref updates forbidden inside quarantine environment"

6148 msgstr "在隔离环境中禁止更新引用"

6149

6073 -#: refs.c:2107 refs.c:2137

6150 +#: refs.c:2109

6151 +msgid "ref updates aborted by hook"

6152 +msgstr "引用更新被钩子中止"

6153 +

6154 +#: refs.c:2209 refs.c:2239

6155 #, c-format

6156 msgid "'%s' exists; cannot create '%s'"

6157 msgstr "'%s' 已存在，无法创建 '%s'"

6158

6078 -#: refs.c:2113 refs.c:2148

6159 +#: refs.c:2215 refs.c:2250

6160 #, c-format

6161 msgid "cannot process '%s' and '%s' at the same time"

6162 msgstr "无法同时处理 '%s' 和 '%s'"

@@ -6355,7 +6436,7 @@ msgstr[1] ""

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

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

6438

6358 -#: remote.c:2233

6439 +#: remote.c:2241

6440 #, c-format

6441 msgid "cannot parse expected object name '%s'"

6442 msgstr "无法解析期望的对象名 '%s'"

@@ -6482,20 +6563,20 @@ msgstr "不能确定 HEAD 版本"

6563 msgid "failed to find tree of %s"

6564 msgstr "无法找到 %s 指向的树。"

6565

6485 -#: revision.c:2655

6566 +#: revision.c:2661

6567 msgid "your current branch appears to be broken"

6568 msgstr "您的当前分支好像被损坏"

6569

6489 -#: revision.c:2658

6570 +#: revision.c:2664

6571 #, c-format

6572 msgid "your current branch '%s' does not have any commits yet"

6573 msgstr "您的当前分支 '%s' 尚无任何提交"

6574

6494 -#: revision.c:2866

6575 +#: revision.c:2873

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

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

6578

6498 -#: revision.c:2870

6579 +#: revision.c:2877

6580 msgid "-L does not yet support diff formats besides -p and -s"

6581 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

6582

@@ -6535,21 +6616,25 @@ msgstr "远程解包失败：%s"

6616 msgid "failed to sign the push certificate"

6617 msgstr "为推送证书签名失败"

6618

6538 -#: send-pack.c:399

6619 +#: send-pack.c:394

6620 +msgid "the receiving end does not support this repository's hash algorithm"

6621 +msgstr "接收端不支持这个仓库的哈希算法"

6622 +

6623 +#: send-pack.c:403

6624 msgid "the receiving end does not support --signed push"

6625 msgstr "接收端不支持签名推送"

6626

6542 -#: send-pack.c:401

6627 +#: send-pack.c:405

6628 msgid ""

6629 "not sending a push certificate since the receiving end does not support --"

6630 "signed push"

6631 msgstr "未发送推送证书，因为接收端不支持签名推送"

6632

6548 -#: send-pack.c:413

6633 +#: send-pack.c:417

6634 msgid "the receiving end does not support --atomic push"

6635 msgstr "接收端不支持原子推送"

6636

6552 -#: send-pack.c:418

6637 +#: send-pack.c:422

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

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

6640

@@ -6669,7 +6754,7 @@ msgstr "在 '%.*s' 中没有 key"

6754 msgid "unable to dequote value of '%s'"

6755 msgstr "无法为 '%s' 的值去引号"

6756

6672 -#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6757 +#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

6758 #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6759 #, c-format

6760 msgid "could not open '%s' for reading"

@@ -7498,84 +7583,84 @@ msgstr "无法使用无效配置来创建工作区"

7583 msgid "this operation must be run in a work tree"

7584 msgstr "该操作必须在一个工作区中运行"

7585

7501 -#: setup.c:569

7586 +#: setup.c:604

7587 #, c-format

7588 msgid "Expected git repo version <= %d, found %d"

7589 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

7590

7506 -#: setup.c:577

7591 +#: setup.c:612

7592 msgid "unknown repository extensions found:"

7593 msgstr "发现未知的仓库扩展："

7594

7510 -#: setup.c:596

7595 +#: setup.c:631

7596 #, c-format

7597 msgid "error opening '%s'"

7598 msgstr "打开 '%s' 出错"

7599

7515 -#: setup.c:598

7600 +#: setup.c:633

7601 #, c-format

7602 msgid "too large to be a .git file: '%s'"

7603 msgstr "文件太大，无法作为 .git 文件：'%s'"

7604

7520 -#: setup.c:600

7605 +#: setup.c:635

7606 #, c-format

7607 msgid "error reading %s"

7608 msgstr "读取 %s 出错"

7609

7525 -#: setup.c:602

7610 +#: setup.c:637

7611 #, c-format

7612 msgid "invalid gitfile format: %s"

7613 msgstr "无效的 gitfile 格式：%s"

7614

7530 -#: setup.c:604

7615 +#: setup.c:639

7616 #, c-format

7617 msgid "no path in gitfile: %s"

7618 msgstr "在 gitfile 中没有路径：%s"

7619

7535 -#: setup.c:606

7620 +#: setup.c:641

7621 #, c-format

7622 msgid "not a git repository: %s"

7623 msgstr "不是一个 git 仓库：%s"

7624

7540 -#: setup.c:708

7625 +#: setup.c:743

7626 #, c-format

7627 msgid "'$%s' too big"

7628 msgstr "'$%s' 太大"

7629

7545 -#: setup.c:722

7630 +#: setup.c:757

7631 #, c-format

7632 msgid "not a git repository: '%s'"

7633 msgstr "不是一个 git 仓库：'%s'"

7634

7550 -#: setup.c:751 setup.c:753 setup.c:784

7635 +#: setup.c:786 setup.c:788 setup.c:819

7636 #, c-format

7637 msgid "cannot chdir to '%s'"

7638 msgstr "不能切换目录到 '%s'"

7639

7555 -#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869

7640 +#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904

7641 msgid "cannot come back to cwd"

7642 msgstr "无法返回当前工作目录"

7643

7559 -#: setup.c:883

7644 +#: setup.c:918

7645 #, c-format

7646 msgid "failed to stat '%*s%s%s'"

7647 msgstr "获取 '%*s%s%s' 状态（stat）失败"

7648

7564 -#: setup.c:1121

7649 +#: setup.c:1156

7650 msgid "Unable to read current working directory"

7651 msgstr "不能读取当前工作目录"

7652

7568 -#: setup.c:1130 setup.c:1136

7653 +#: setup.c:1165 setup.c:1171

7654 #, c-format

7655 msgid "cannot change to '%s'"

7656 msgstr "不能切换到 '%s'"

7657

7573 -#: setup.c:1141

7658 +#: setup.c:1176

7659 #, c-format

7660 msgid "not a git repository (or any of the parent directories): %s"

7661 msgstr "不是一个 git 仓库（或者任何父目录）：%s"

7662

7578 -#: setup.c:1147

7663 +#: setup.c:1182

7664 #, c-format

7665 msgid ""

7666 "not a git repository (or any parent up to mount point %s)\n"

@@ -7584,7 +7669,7 @@ msgstr ""

7669 "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"

7670 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

7671

7587 -#: setup.c:1258

7672 +#: setup.c:1293

7673 #, c-format

7674 msgid ""

7675 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -7593,15 +7678,15 @@ msgstr ""

7678 "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"

7679 "文件属主必须始终拥有读写权限。"

7680

7596 -#: setup.c:1304

7681 +#: setup.c:1340

7682 msgid "open /dev/null or dup failed"

7683 msgstr "不能打开或者复制 /dev/null"

7684

7600 -#: setup.c:1319

7685 +#: setup.c:1355

7686 msgid "fork failed"

7687 msgstr "fork 失败"

7688

7604 -#: setup.c:1324

7689 +#: setup.c:1360

7690 msgid "setsid failed"

7691 msgstr "setsid 失败"

7692

@@ -7781,7 +7866,7 @@ msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"

7866 msgid "confused by unstable object source data for %s"

7867 msgstr "被 %s 的不稳定对象源数据搞糊涂了"

7868

7784 -#: sha1-file.c:1906 builtin/pack-objects.c:1055

7869 +#: sha1-file.c:1906 builtin/pack-objects.c:1085

7870 #, c-format

7871 msgid "failed utime() on %s"

7872 msgstr "在 %s 上调用 utime() 失败"

@@ -7956,43 +8041,43 @@ msgid "invalid object name '%.*s'."

8041 msgstr "无效的对象名 '%.*s'。"

8042

8043 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

7959 -#: strbuf.c:853

8044 +#: strbuf.c:848

8045 #, c-format

8046 msgid "%u.%2.2u GiB"

8047 msgstr "%u.%2.2u GiB"

8048

8049 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

7965 -#: strbuf.c:855

8050 +#: strbuf.c:850

8051 #, c-format

8052 msgid "%u.%2.2u GiB/s"

8053 msgstr "%u.%2.2u GiB/s"

8054

8055 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

7971 -#: strbuf.c:863

8056 +#: strbuf.c:858

8057 #, c-format

8058 msgid "%u.%2.2u MiB"

8059 msgstr "%u.%2.2u MiB"

8060

8061 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

7977 -#: strbuf.c:865

8062 +#: strbuf.c:860

8063 #, c-format

8064 msgid "%u.%2.2u MiB/s"

8065 msgstr "%u.%2.2u MiB/s"

8066

8067 #. TRANSLATORS: IEC 80000-13:2008 kibibyte

7983 -#: strbuf.c:872

8068 +#: strbuf.c:867

8069 #, c-format

8070 msgid "%u.%2.2u KiB"

8071 msgstr "%u.%2.2u KiB"

8072

8073 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second

7989 -#: strbuf.c:874

8074 +#: strbuf.c:869

8075 #, c-format

8076 msgid "%u.%2.2u KiB/s"

8077 msgstr "%u.%2.2u KiB/s"

8078

8079 #. TRANSLATORS: IEC 80000-13:2008 byte

7995 -#: strbuf.c:880

8080 +#: strbuf.c:875

8081 #, c-format

8082 msgid "%u byte"

8083 msgid_plural "%u bytes"

@@ -8000,14 +8085,14 @@ msgstr[0] "%u 字节"

8085 msgstr[1] "%u 字节"

8086

8087 #. TRANSLATORS: IEC 80000-13:2008 byte/second

8003 -#: strbuf.c:882

8088 +#: strbuf.c:877

8089 #, c-format

8090 msgid "%u byte/s"

8091 msgid_plural "%u bytes/s"

8092 msgstr[0] "%u 字节/秒"

8093 msgstr[1] "%u 字节/秒"

8094

8010 -#: strbuf.c:1180

8095 +#: strbuf.c:1175

8096 #, c-format

8097 msgid "could not edit '%s'"

8098 msgstr "不能编辑 '%s'"

@@ -8246,7 +8331,7 @@ msgstr "不能读取输入文件 '%s'"

8331 msgid "could not read from stdin"

8332 msgstr "不能自标准输入读取"

8333

8249 -#: trailer.c:1011 wrapper.c:665

8334 +#: trailer.c:1011 wrapper.c:673

8335 #, c-format

8336 msgid "could not stat %s"

8337 msgstr "不能对 %s 调用 stat"

@@ -8270,177 +8355,182 @@ msgstr "不能打开临时文件"

8355 msgid "could not rename temporary file to %s"

8356 msgstr "不能重命名临时文件为 %s"

8357

8273 -#: transport-helper.c:61 transport-helper.c:90

8358 +#: transport-helper.c:62 transport-helper.c:91

8359 msgid "full write to remote helper failed"

8360 msgstr "完整写入远程助手失败"

8361

8277 -#: transport-helper.c:144

8362 +#: transport-helper.c:145

8363 #, c-format

8364 msgid "unable to find remote helper for '%s'"

8365 msgstr "无法为 '%s' 找到远程助手"

8366

8282 -#: transport-helper.c:160 transport-helper.c:571

8367 +#: transport-helper.c:161 transport-helper.c:575

8368 msgid "can't dup helper output fd"

8369 msgstr "无法复制助手输出文件句柄"

8370

8286 -#: transport-helper.c:211

8371 +#: transport-helper.c:214

8372 #, c-format

8373 msgid ""

8374 "unknown mandatory capability %s; this remote helper probably needs newer "

8375 "version of Git"

8376 msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"

8377

8293 -#: transport-helper.c:217

8378 +#: transport-helper.c:220

8379 msgid "this remote helper should implement refspec capability"

8380 msgstr "远程助手需要实现 refspec 能力"

8381

8297 -#: transport-helper.c:284 transport-helper.c:425

8382 +#: transport-helper.c:287 transport-helper.c:429

8383 #, c-format

8384 msgid "%s unexpectedly said: '%s'"

8385 msgstr "%s 意外地说：'%s'"

8386

8302 -#: transport-helper.c:414

8387 +#: transport-helper.c:417

8388 #, c-format

8389 msgid "%s also locked %s"

8390 msgstr "%s 也锁定了 %s"

8391

8307 -#: transport-helper.c:493

8392 +#: transport-helper.c:497

8393 msgid "couldn't run fast-import"

8394 msgstr "不能执行 fast-import"

8395

8311 -#: transport-helper.c:516

8396 +#: transport-helper.c:520

8397 msgid "error while running fast-import"

8398 msgstr "执行 fast-import 出错"

8399

8315 -#: transport-helper.c:545 transport-helper.c:1135

8400 +#: transport-helper.c:549 transport-helper.c:1156

8401 #, c-format

8402 msgid "could not read ref %s"

8403 msgstr "无法读取引用 %s"

8404

8320 -#: transport-helper.c:590

8405 +#: transport-helper.c:594

8406 #, c-format

8407 msgid "unknown response to connect: %s"

8408 msgstr "连接时未知的响应：%s"

8409

8325 -#: transport-helper.c:612

8410 +#: transport-helper.c:616

8411 msgid "setting remote service path not supported by protocol"

8412 msgstr "协议不支持设置远程服务路径"

8413

8329 -#: transport-helper.c:614

8414 +#: transport-helper.c:618

8415 msgid "invalid remote service path"

8416 msgstr "无效的远程服务路径"

8417

8333 -#: transport-helper.c:657 transport.c:1339

8418 +#: transport-helper.c:661 transport.c:1347

8419 msgid "operation not supported by protocol"

8420 msgstr "协议不支持该操作"

8421

8337 -#: transport-helper.c:660

8422 +#: transport-helper.c:664

8423 #, c-format

8424 msgid "can't connect to subservice %s"

8425 msgstr "不能连接到子服务 %s"

8426

8342 -#: transport-helper.c:736

8427 +#: transport-helper.c:740

8428 #, c-format

8429 msgid "expected ok/error, helper said '%s'"

8430 msgstr "预期 ok/error，助手说 '%s'"

8431

8347 -#: transport-helper.c:789

8432 +#: transport-helper.c:793

8433 #, c-format

8434 msgid "helper reported unexpected status of %s"

8435 msgstr "助手报告 %s 的意外状态"

8436

8352 -#: transport-helper.c:850

8437 +#: transport-helper.c:854

8438 #, c-format

8439 msgid "helper %s does not support dry-run"

8440 msgstr "助手 %s 不支持 dry-run"

8441

8357 -#: transport-helper.c:853

8442 +#: transport-helper.c:857

8443 #, c-format

8444 msgid "helper %s does not support --signed"

8445 msgstr "助手 %s 不支持 --signed"

8446

8362 -#: transport-helper.c:856

8447 +#: transport-helper.c:860

8448 #, c-format

8449 msgid "helper %s does not support --signed=if-asked"

8450 msgstr "助手 %s 不支持 --signed=if-asked"

8451

8367 -#: transport-helper.c:861

8452 +#: transport-helper.c:865

8453 #, c-format

8454 msgid "helper %s does not support --atomic"

8455 msgstr "助手 %s 不支持 --atomic"

8456

8372 -#: transport-helper.c:867

8457 +#: transport-helper.c:871

8458 #, c-format

8459 msgid "helper %s does not support 'push-option'"

8460 msgstr "助手 %s 不支持 'push-option'"

8461

8377 -#: transport-helper.c:966

8462 +#: transport-helper.c:970

8463 msgid "remote-helper doesn't support push; refspec needed"

8464 msgstr "remote-heper 不支持 push，需要引用表达式"

8465

8381 -#: transport-helper.c:971

8466 +#: transport-helper.c:975

8467 #, c-format

8468 msgid "helper %s does not support 'force'"

8469 msgstr "助手 %s 不支持 'force'"

8470

8386 -#: transport-helper.c:1018

8471 +#: transport-helper.c:1022

8472 msgid "couldn't run fast-export"

8473 msgstr "无法执行 fast-export"

8474

8390 -#: transport-helper.c:1023

8475 +#: transport-helper.c:1027

8476 msgid "error while running fast-export"

8477 msgstr "执行 fast-export 时出错"

8478

8394 -#: transport-helper.c:1048

8479 +#: transport-helper.c:1052

8480 #, c-format

8481 msgid ""

8482 "No refs in common and none specified; doing nothing.\n"

8398 -"Perhaps you should specify a branch such as 'master'.\n"

8483 +"Perhaps you should specify a branch.\n"

8484 msgstr ""

8485 "没有共同的引用并且也没有指定，什么也不会做。\n"

8401 -"可能您应该指定一个分支如 'master'。\n"

8486 +"也许您应该指定一个分支。\n"

8487 +

8488 +#: transport-helper.c:1133

8489 +#, c-format

8490 +msgid "unsupported object format '%s'"

8491 +msgstr "不支持的对象格式 '%s'"

8492

8403 -#: transport-helper.c:1121

8493 +#: transport-helper.c:1142

8494 #, c-format

8495 msgid "malformed response in ref list: %s"

8496 msgstr "引用列表中格式错误的响应：%s"

8497

8408 -#: transport-helper.c:1273

8498 +#: transport-helper.c:1294

8499 #, c-format

8500 msgid "read(%s) failed"

8501 msgstr "读取（%s）失败"

8502

8413 -#: transport-helper.c:1300

8503 +#: transport-helper.c:1321

8504 #, c-format

8505 msgid "write(%s) failed"

8506 msgstr "写（%s）失败"

8507

8418 -#: transport-helper.c:1349

8508 +#: transport-helper.c:1370

8509 #, c-format

8510 msgid "%s thread failed"

8511 msgstr "%s 线程失败"

8512

8423 -#: transport-helper.c:1353

8513 +#: transport-helper.c:1374

8514 #, c-format

8515 msgid "%s thread failed to join: %s"

8516 msgstr "%s 线程等待失败：%s"

8517

8428 -#: transport-helper.c:1372 transport-helper.c:1376

8518 +#: transport-helper.c:1393 transport-helper.c:1397

8519 #, c-format

8520 msgid "can't start thread for copying data: %s"

8521 msgstr "不能启动线程来拷贝数据：%s"

8522

8433 -#: transport-helper.c:1413

8523 +#: transport-helper.c:1434

8524 #, c-format

8525 msgid "%s process failed to wait"

8526 msgstr "%s 进程等待失败"

8527

8438 -#: transport-helper.c:1417

8528 +#: transport-helper.c:1438

8529 #, c-format

8530 msgid "%s process failed"

8531 msgstr "%s 进程失败"

8532

8443 -#: transport-helper.c:1435 transport-helper.c:1444

8533 +#: transport-helper.c:1456 transport-helper.c:1465

8534 msgid "can't start thread for copying data"

8535 msgstr "不能启动线程来拷贝数据"

8536

@@ -8454,33 +8544,33 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

8544 msgid "could not read bundle '%s'"

8545 msgstr "无法读取 bundle '%s'"

8546

8457 -#: transport.c:214

8547 +#: transport.c:220

8548 #, c-format

8549 msgid "transport: invalid depth option '%s'"

8550 msgstr "传输：无效的深度选项 '%s'"

8551

8462 -#: transport.c:266

8552 +#: transport.c:272

8553 msgid "see protocol.version in 'git help config' for more details"

8554 msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"

8555

8466 -#: transport.c:267

8556 +#: transport.c:273

8557 msgid "server options require protocol version 2 or later"

8558 msgstr "服务端选项需要版本 2 协议或更高"

8559

8470 -#: transport.c:632

8560 +#: transport.c:631

8561 msgid "could not parse transport.color.* config"

8562 msgstr "不能解析 transport.color.* 配置"

8563

8474 -#: transport.c:705

8564 +#: transport.c:704

8565 msgid "support for protocol v2 not implemented yet"

8566 msgstr "协议 v2 的支持尚未实现"

8567

8478 -#: transport.c:839

8568 +#: transport.c:838

8569 #, c-format

8570 msgid "unknown value for config '%s': %s"

8571 msgstr "配置 '%s' 的取值未知：%s"

8572

8483 -#: transport.c:905

8573 +#: transport.c:904

8574 #, c-format

8575 msgid "transport '%s' not allowed"

8576 msgstr "传输 '%s' 不允许"

@@ -8489,14 +8579,14 @@ msgstr "传输 '%s' 不允许"

8579 msgid "git-over-rsync is no longer supported"

8580 msgstr "不再支持 git-over-rsync"

8581

8492 -#: transport.c:1052

8582 +#: transport.c:1059

8583 #, c-format

8584 msgid ""

8585 "The following submodule paths contain changes that can\n"

8586 "not be found on any remote:\n"

8587 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

8588

8499 -#: transport.c:1056

8589 +#: transport.c:1063

8590 #, c-format

8591 msgid ""

8592 "\n"

@@ -8523,11 +8613,11 @@ msgstr ""

8613 "以推送至远程。\n"

8614 "\n"

8615

8526 -#: transport.c:1064

8616 +#: transport.c:1071

8617 msgid "Aborting."

8618 msgstr "正在终止。"

8619

8530 -#: transport.c:1209

8620 +#: transport.c:1216

8621 msgid "failed to push all needed submodules"

8622 msgstr "不能推送全部需要的子模组"

8623

@@ -8792,7 +8882,7 @@ msgstr ""

8882 msgid "Updating index flags"

8883 msgstr "正在更新索引标志"

8884

8795 -#: upload-pack.c:1337

8885 +#: upload-pack.c:1415

8886 msgid "expected flush after fetch arguments"

8887 msgstr "在 fetch 参数之后应该有一个 flush 包"

8888

@@ -8829,47 +8919,47 @@ msgstr "无效的 '..' 路径片段"

8919 msgid "Fetching objects"

8920 msgstr "正在获取对象"

8921

8832 -#: worktree.c:262 builtin/am.c:2098

8922 +#: worktree.c:248 builtin/am.c:2098

8923 #, c-format

8924 msgid "failed to read '%s'"

8925 msgstr "读取 '%s' 失败"

8926

8837 -#: worktree.c:309

8927 +#: worktree.c:295

8928 #, c-format

8929 msgid "'%s' at main working tree is not the repository directory"

8930 msgstr "在主工作区的 '%s' 不是仓库目录"

8931

8842 -#: worktree.c:320

8932 +#: worktree.c:306

8933 #, c-format

8934 msgid "'%s' file does not contain absolute path to the working tree location"

8935 msgstr "文件 '%s' 不包含工作区的绝对路径"

8936

8847 -#: worktree.c:332

8937 +#: worktree.c:318

8938 #, c-format

8939 msgid "'%s' does not exist"

8940 msgstr "'%s' 不存在"

8941

8852 -#: worktree.c:338

8942 +#: worktree.c:324

8943 #, c-format

8944 msgid "'%s' is not a .git file, error code %d"

8945 msgstr "'%s' 不是一个 .git 文件，错误码 %d"

8946

8857 -#: worktree.c:347

8947 +#: worktree.c:333

8948 #, c-format

8949 msgid "'%s' does not point back to '%s'"

8950 msgstr "'%s' 没有指回到 '%s'"

8951

8862 -#: wrapper.c:186 wrapper.c:356

8952 +#: wrapper.c:194 wrapper.c:364

8953 #, c-format

8954 msgid "could not open '%s' for reading and writing"

8955 msgstr "无法打开 '%s' 进行读写"

8956

8867 -#: wrapper.c:387 wrapper.c:588

8957 +#: wrapper.c:395 wrapper.c:596

8958 #, c-format

8959 msgid "unable to access '%s'"

8960 msgstr "不能访问 '%s'"

8961

8872 -#: wrapper.c:596

8962 +#: wrapper.c:604

8963 msgid "unable to get current working directory"

8964 msgstr "不能获取当前工作目录"

8965

@@ -9280,39 +9370,44 @@ msgstr "您在执行二分查找操作。"

9370 msgid " (use \"git bisect reset\" to get back to the original branch)"

9371 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

9372

9283 -#: wt-status.c:1692

9373 +#: wt-status.c:1494

9374 +#, c-format

9375 +msgid "You are in a sparse checkout with %d%% of tracked files present."

9376 +msgstr "您处于稀疏签出状态，包含 %d%% 的跟踪文件"

9377 +

9378 +#: wt-status.c:1733

9379 msgid "On branch "

9380 msgstr "位于分支 "

9381

9287 -#: wt-status.c:1699

9382 +#: wt-status.c:1740

9383 msgid "interactive rebase in progress; onto "

9384 msgstr "交互式变基操作正在进行中；至 "

9385

9291 -#: wt-status.c:1701

9386 +#: wt-status.c:1742

9387 msgid "rebase in progress; onto "

9388 msgstr "变基操作正在进行中；至 "

9389

9295 -#: wt-status.c:1711

9390 +#: wt-status.c:1752

9391 msgid "Not currently on any branch."

9392 msgstr "当前不在任何分支上。"

9393

9299 -#: wt-status.c:1728

9394 +#: wt-status.c:1769

9395 msgid "Initial commit"

9396 msgstr "初始提交"

9397

9303 -#: wt-status.c:1729

9398 +#: wt-status.c:1770

9399 msgid "No commits yet"

9400 msgstr "尚无提交"

9401

9307 -#: wt-status.c:1743

9402 +#: wt-status.c:1784

9403 msgid "Untracked files"

9404 msgstr "未跟踪的文件"

9405

9311 -#: wt-status.c:1745

9406 +#: wt-status.c:1786

9407 msgid "Ignored files"

9408 msgstr "忽略的文件"

9409

9315 -#: wt-status.c:1749

9410 +#: wt-status.c:1790

9411 #, c-format

9412 msgid ""

9413 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -9322,97 +9417,97 @@ msgstr ""

9417 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"

9418 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"

9419

9325 -#: wt-status.c:1755

9420 +#: wt-status.c:1796

9421 #, c-format

9422 msgid "Untracked files not listed%s"

9423 msgstr "未跟踪的文件没有列出%s"

9424

9425 # 译者：中文字符串拼接，可删除前导空格

9331 -#: wt-status.c:1757

9426 +#: wt-status.c:1798

9427 msgid " (use -u option to show untracked files)"

9428 msgstr "（使用 -u 参数显示未跟踪的文件）"

9429

9335 -#: wt-status.c:1763

9430 +#: wt-status.c:1804

9431 msgid "No changes"

9432 msgstr "没有修改"

9433

9339 -#: wt-status.c:1768

9434 +#: wt-status.c:1809

9435 #, c-format

9436 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

9437 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

9438

9344 -#: wt-status.c:1771

9439 +#: wt-status.c:1812

9440 #, c-format

9441 msgid "no changes added to commit\n"

9442 msgstr "修改尚未加入提交\n"

9443

9349 -#: wt-status.c:1774

9444 +#: wt-status.c:1815

9445 #, c-format

9446 msgid ""

9447 "nothing added to commit but untracked files present (use \"git add\" to "

9448 "track)\n"

9449 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

9450

9356 -#: wt-status.c:1777

9451 +#: wt-status.c:1818

9452 #, c-format

9453 msgid "nothing added to commit but untracked files present\n"

9454 msgstr "提交为空，但是存在尚未跟踪的文件\n"

9455

9456 # 译者：中文字符串拼接，可删除前导空格

9362 -#: wt-status.c:1780

9457 +#: wt-status.c:1821

9458 #, c-format

9459 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

9460 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

9461

9367 -#: wt-status.c:1783 wt-status.c:1788

9462 +#: wt-status.c:1824 wt-status.c:1829

9463 #, c-format

9464 msgid "nothing to commit\n"

9465 msgstr "无文件要提交\n"

9466

9467 # 译者：中文字符串拼接，可删除前导空格

9373 -#: wt-status.c:1786

9468 +#: wt-status.c:1827

9469 #, c-format

9470 msgid "nothing to commit (use -u to show untracked files)\n"

9471 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

9472

9473 # 译者：中文字符串拼接，可删除前导空格

9379 -#: wt-status.c:1790

9474 +#: wt-status.c:1831

9475 #, c-format

9476 msgid "nothing to commit, working tree clean\n"

9477 msgstr "无文件要提交，干净的工作区\n"

9478

9384 -#: wt-status.c:1903

9479 +#: wt-status.c:1944

9480 msgid "No commits yet on "

9481 msgstr "尚无提交在 "

9482

9388 -#: wt-status.c:1907

9483 +#: wt-status.c:1948

9484 msgid "HEAD (no branch)"

9485 msgstr "HEAD（非分支）"

9486

9392 -#: wt-status.c:1938

9487 +#: wt-status.c:1979

9488 msgid "different"

9489 msgstr "不同"

9490

9491 # 译者：注意保持句尾空格

9397 -#: wt-status.c:1940 wt-status.c:1948

9492 +#: wt-status.c:1981 wt-status.c:1989

9493 msgid "behind "

9494 msgstr "落后 "

9495

9401 -#: wt-status.c:1943 wt-status.c:1946

9496 +#: wt-status.c:1984 wt-status.c:1987

9497 msgid "ahead "

9498 msgstr "领先 "

9499

9500 #. TRANSLATORS: the action is e.g. "pull with rebase"

9406 -#: wt-status.c:2468

9501 +#: wt-status.c:2509

9502 #, c-format

9503 msgid "cannot %s: You have unstaged changes."

9504 msgstr "不能%s：您有未暂存的变更。"

9505

9411 -#: wt-status.c:2474

9506 +#: wt-status.c:2515

9507 msgid "additionally, your index contains uncommitted changes."

9508 msgstr "另外，您的索引中包含未提交的变更。"

9509

9415 -#: wt-status.c:2476

9510 +#: wt-status.c:2517

9511 #, c-format

9512 msgid "cannot %s: Your index contains uncommitted changes."

9513 msgstr "不能%s：您的索引中包含未提交的变更。"

@@ -9489,7 +9584,7 @@ msgstr "演习"

9584 msgid "interactive picking"

9585 msgstr "交互式拣选"

9586

9492 -#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308

9587 +#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308

9588 msgid "select hunks interactively"

9589 msgstr "交互式挑选数据块"

9590

@@ -9613,12 +9708,12 @@ msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

9708 msgid "--chmod param '%s' must be either -x or +x"

9709 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"

9710

9616 -#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351

9711 +#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351

9712 #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506

9713 msgid "--pathspec-from-file is incompatible with pathspec arguments"

9714 msgstr "--pathspec-from-file 与路径表达式参数不兼容"

9715

9621 -#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357

9716 +#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357

9717 #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512

9718 msgid "--pathspec-file-nul requires --pathspec-from-file"

9719 msgstr "--pathspec-file-nul 需要 --pathspec-from-file"

@@ -9874,7 +9969,7 @@ msgstr "老的参数 —— 无作用"

9969 msgid "allow fall back on 3way merging if needed"

9970 msgstr "如果必要，允许使用三方合并。"

9971

9877 -#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16

9972 +#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16

9973 #: builtin/repack.c:306 builtin/stash.c:816

9974 msgid "be quiet"

9975 msgstr "静默模式"

@@ -9929,7 +10024,7 @@ msgstr "n"

10024

10025 #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38

10026 #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38

9932 -#: bugreport.c:131

10027 +#: bugreport.c:137

10028 msgid "format"

10029 msgstr "格式"

10030

@@ -10219,111 +10314,115 @@ msgstr ""

10314 "命令 'git bisect terms' 的参数 %s 无效。\n"

10315 "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"

10316

10222 -#: builtin/bisect--helper.c:478

10317 +#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473

10318 +msgid "'' is not a valid term"

10319 +msgstr "'' 不是一个有效的术语"

10320 +

10321 +#: builtin/bisect--helper.c:483

10322 #, c-format

10323 msgid "unrecognized option: '%s'"

10324 msgstr "未识别的选项：'%s'"

10325

10227 -#: builtin/bisect--helper.c:482

10326 +#: builtin/bisect--helper.c:487

10327 #, c-format

10328 msgid "'%s' does not appear to be a valid revision"

10329 msgstr "'%s' 看起来不是一个有效的版本"

10330

10232 -#: builtin/bisect--helper.c:514

10331 +#: builtin/bisect--helper.c:519

10332 msgid "bad HEAD - I need a HEAD"

10333 msgstr "坏的 HEAD - 我需要一个 HEAD"

10334

10236 -#: builtin/bisect--helper.c:529

10335 +#: builtin/bisect--helper.c:534

10336 #, c-format

10337 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

10338 msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"

10339

10241 -#: builtin/bisect--helper.c:550

10340 +#: builtin/bisect--helper.c:555

10341 msgid "won't bisect on cg-seek'ed tree"

10342 msgstr "不会在做了 cg-seek 的树上做二分查找"

10343

10245 -#: builtin/bisect--helper.c:553

10344 +#: builtin/bisect--helper.c:558

10345 msgid "bad HEAD - strange symbolic ref"

10346 msgstr "坏的 HEAD - 奇怪的符号引用"

10347

10249 -#: builtin/bisect--helper.c:577

10348 +#: builtin/bisect--helper.c:582

10349 #, c-format

10350 msgid "invalid ref: '%s'"

10351 msgstr "无效的引用：'%s'"

10352

10254 -#: builtin/bisect--helper.c:633

10353 +#: builtin/bisect--helper.c:638

10354 msgid "perform 'git bisect next'"

10355 msgstr "执行 'git bisect next'"

10356

10258 -#: builtin/bisect--helper.c:635

10357 +#: builtin/bisect--helper.c:640

10358 msgid "write the terms to .git/BISECT_TERMS"

10359 msgstr "将术语写入 .git/BISECT_TERMS"

10360

10262 -#: builtin/bisect--helper.c:637

10361 +#: builtin/bisect--helper.c:642

10362 msgid "cleanup the bisection state"

10363 msgstr "清除二分查找状态"

10364

10266 -#: builtin/bisect--helper.c:639

10365 +#: builtin/bisect--helper.c:644

10366 msgid "check for expected revs"

10367 msgstr "检查预期的版本"

10368

10270 -#: builtin/bisect--helper.c:641

10369 +#: builtin/bisect--helper.c:646

10370 msgid "reset the bisection state"

10371 msgstr "清除二分查找状态"

10372

10274 -#: builtin/bisect--helper.c:643

10373 +#: builtin/bisect--helper.c:648

10374 msgid "write out the bisection state in BISECT_LOG"

10375 msgstr "将二分查找的状态写入 BISECT_LOG"

10376

10278 -#: builtin/bisect--helper.c:645

10377 +#: builtin/bisect--helper.c:650

10378 msgid "check and set terms in a bisection state"

10379 msgstr "在一个二分查找状态中检查和设置术语"

10380

10282 -#: builtin/bisect--helper.c:647

10381 +#: builtin/bisect--helper.c:652

10382 msgid "check whether bad or good terms exist"

10383 msgstr "检查坏的或好的术语是否存在"

10384

10286 -#: builtin/bisect--helper.c:649

10385 +#: builtin/bisect--helper.c:654

10386 msgid "print out the bisect terms"

10387 msgstr "打印二分查找术语"

10388

10290 -#: builtin/bisect--helper.c:651

10389 +#: builtin/bisect--helper.c:656

10390 msgid "start the bisect session"

10391 msgstr "启动二分查找过程"

10392

10294 -#: builtin/bisect--helper.c:653

10393 +#: builtin/bisect--helper.c:658

10394 msgid "update BISECT_HEAD instead of checking out the current commit"

10395 msgstr "更新 BISECT_HEAD 而非检出当前提交"

10396

10298 -#: builtin/bisect--helper.c:655

10397 +#: builtin/bisect--helper.c:660

10398 msgid "no log for BISECT_WRITE"

10399 msgstr "BISECT_WRITE 无日志"

10400

10302 -#: builtin/bisect--helper.c:673

10401 +#: builtin/bisect--helper.c:678

10402 msgid "--write-terms requires two arguments"

10403 msgstr "--write-terms 需要两个参数"

10404

10306 -#: builtin/bisect--helper.c:677

10405 +#: builtin/bisect--helper.c:682

10406 msgid "--bisect-clean-state requires no arguments"

10407 msgstr "--bisect-clean-state 不带参数"

10408

10310 -#: builtin/bisect--helper.c:684

10409 +#: builtin/bisect--helper.c:689

10410 msgid "--bisect-reset requires either no argument or a commit"

10411 msgstr "--bisect-reset 无需参数或者需要一个提交"

10412

10314 -#: builtin/bisect--helper.c:688

10413 +#: builtin/bisect--helper.c:693

10414 msgid "--bisect-write requires either 4 or 5 arguments"

10415 msgstr "--bisect-write 需要 4 或 5 个参数"

10416

10318 -#: builtin/bisect--helper.c:694

10417 +#: builtin/bisect--helper.c:699

10418 msgid "--check-and-set-terms requires 3 arguments"

10419 msgstr "--check-and-set-terms 需要 3 个参数"

10420

10322 -#: builtin/bisect--helper.c:700

10421 +#: builtin/bisect--helper.c:705

10422 msgid "--bisect-next-check requires 2 or 3 arguments"

10423 msgstr "--bisect-next-check 需要 2 或 3 个参数"

10424

10326 -#: builtin/bisect--helper.c:706

10425 +#: builtin/bisect--helper.c:711

10426 msgid "--bisect-terms requires 0 or 1 argument"

10427 msgstr "--bisect-terms 需要 0 或 1 个参数"

10428

@@ -10921,19 +11020,19 @@ msgstr "git bundle list-heads <文件> [<引用名>...]"

11020 msgid "git bundle unbundle <file> [<refname>...]"

11021 msgstr "git bundle unbundle <文件> [<引用名>...]"

11022

10924 -#: builtin/bundle.c:66 builtin/pack-objects.c:3376

11023 +#: builtin/bundle.c:66 builtin/pack-objects.c:3448

11024 msgid "do not show progress meter"

11025 msgstr "不显示进度表"

11026

10928 -#: builtin/bundle.c:68 builtin/pack-objects.c:3378

11027 +#: builtin/bundle.c:68 builtin/pack-objects.c:3450

11028 msgid "show progress meter"

11029 msgstr "显示进度表"

11030

10932 -#: builtin/bundle.c:70 builtin/pack-objects.c:3380

11031 +#: builtin/bundle.c:70 builtin/pack-objects.c:3452

11032 msgid "show progress meter during object writing phase"

11033 msgstr "在对象写入阶段显示进度表"

11034

10936 -#: builtin/bundle.c:73 builtin/pack-objects.c:3383

11035 +#: builtin/bundle.c:73 builtin/pack-objects.c:3455

11036 msgid "similar to --all-progress when progress meter is shown"

11037 msgstr "当进度表显示时类似于 --all-progress"

11038

@@ -10973,11 +11072,9 @@ msgstr ""

11072

11073 #: builtin/cat-file.c:599

11074 msgid ""

10976 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

10977 -"filters]"

10978 -msgstr ""

10979 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

10980 -"filters]"

11075 +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"

11076 +"symlinks] [--textconv | --filters]"

11077 +msgstr "git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] [--textconv | --filters]"

11078

11079 #: builtin/cat-file.c:620

11080 msgid "only one batch option may be specified"

@@ -11011,7 +11108,7 @@ msgstr "对于数据对象，对其内容做文本转换"

11108 msgid "for blob objects, run filters on object's content"

11109 msgstr "对于数据对象，对其内容做过滤"

11110

11014 -#: builtin/cat-file.c:648 git-submodule.sh:984

11111 +#: builtin/cat-file.c:648 git-submodule.sh:958

11112 msgid "blob"

11113 msgstr "数据对象"

11114

@@ -11071,8 +11168,8 @@ msgstr "从标准输入读出文件名"

11168 msgid "terminate input and output records by a NUL character"

11169 msgstr "输入和输出的记录使用 NUL 字符终结"

11170

11074 -#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537

11075 -#: builtin/worktree.c:502

11171 +#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537

11172 +#: builtin/worktree.c:561

11173 msgid "suppress progress reporting"

11174 msgstr "不显示进度报告"

11175

@@ -11164,7 +11261,7 @@ msgstr "将内容写入临时文件"

11261 #: builtin/checkout-index.c:178 builtin/column.c:31

11262 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403

11263 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909

11167 -#: builtin/worktree.c:675

11264 +#: builtin/worktree.c:754

11265 msgid "string"

11266 msgstr "字符串"

11267

@@ -11279,11 +11376,11 @@ msgstr "'%s' 或 '%s' 不能和 %s 一起使用"

11376 msgid "path '%s' is unmerged"

11377 msgstr "路径 '%s' 未合并"

11378

11282 -#: builtin/checkout.c:704

11379 +#: builtin/checkout.c:702

11380 msgid "you need to resolve your current index first"

11381 msgstr "您需要先解决当前索引的冲突"

11382

11286 -#: builtin/checkout.c:758

11383 +#: builtin/checkout.c:756

11384 #, c-format

11385 msgid ""

11386 "cannot continue with staged changes in the following files:\n"

@@ -11292,51 +11389,51 @@ msgstr ""

11389 "不能继续，下列文件有暂存的修改：\n"

11390 "%s"

11391

11295 -#: builtin/checkout.c:861

11392 +#: builtin/checkout.c:859

11393 #, c-format

11394 msgid "Can not do reflog for '%s': %s\n"

11395 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

11396

11300 -#: builtin/checkout.c:903

11397 +#: builtin/checkout.c:901

11398 msgid "HEAD is now at"

11399 msgstr "HEAD 目前位于"

11400

11304 -#: builtin/checkout.c:907 builtin/clone.c:720

11401 +#: builtin/checkout.c:905 builtin/clone.c:720

11402 msgid "unable to update HEAD"

11403 msgstr "不能更新 HEAD"

11404

11308 -#: builtin/checkout.c:911

11405 +#: builtin/checkout.c:909

11406 #, c-format

11407 msgid "Reset branch '%s'\n"

11408 msgstr "重置分支 '%s'\n"

11409

11313 -#: builtin/checkout.c:914

11410 +#: builtin/checkout.c:912

11411 #, c-format

11412 msgid "Already on '%s'\n"

11413 msgstr "已经位于 '%s'\n"

11414

11318 -#: builtin/checkout.c:918

11415 +#: builtin/checkout.c:916

11416 #, c-format

11417 msgid "Switched to and reset branch '%s'\n"

11418 msgstr "切换并重置分支 '%s'\n"

11419

11323 -#: builtin/checkout.c:920 builtin/checkout.c:1344

11420 +#: builtin/checkout.c:918 builtin/checkout.c:1342

11421 #, c-format

11422 msgid "Switched to a new branch '%s'\n"

11423 msgstr "切换到一个新分支 '%s'\n"

11424

11328 -#: builtin/checkout.c:922

11425 +#: builtin/checkout.c:920

11426 #, c-format

11427 msgid "Switched to branch '%s'\n"

11428 msgstr "切换到分支 '%s'\n"

11429

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

11334 -#: builtin/checkout.c:973

11431 +#: builtin/checkout.c:971

11432 #, c-format

11433 msgid " ... and %d more.\n"

11434 msgstr " ... 及其它 %d 个。\n"

11435

11339 -#: builtin/checkout.c:979

11436 +#: builtin/checkout.c:977

11437 #, c-format

11438 msgid ""

11439 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -11357,7 +11454,7 @@ msgstr[1] ""

11454 "\n"

11455 "%s\n"

11456

11360 -#: builtin/checkout.c:998

11457 +#: builtin/checkout.c:996

11458 #, c-format

11459 msgid ""

11460 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -11384,19 +11481,19 @@ msgstr[1] ""

11481 " git branch <新分支名> %s\n"

11482 "\n"

11483

11387 -#: builtin/checkout.c:1033

11484 +#: builtin/checkout.c:1031

11485 msgid "internal error in revision walk"

11486 msgstr "在版本遍历时遇到内部错误"

11487

11391 -#: builtin/checkout.c:1037

11488 +#: builtin/checkout.c:1035

11489 msgid "Previous HEAD position was"

11490 msgstr "之前的 HEAD 位置是"

11491

11395 -#: builtin/checkout.c:1077 builtin/checkout.c:1339

11492 +#: builtin/checkout.c:1075 builtin/checkout.c:1337

11493 msgid "You are on a branch yet to be born"

11494 msgstr "您位于一个尚未初始化的分支"

11495

11399 -#: builtin/checkout.c:1152

11496 +#: builtin/checkout.c:1150

11497 #, c-format

11498 msgid ""

11499 "'%s' could be both a local file and a tracking branch.\n"

@@ -11405,7 +11502,7 @@ msgstr ""

11502 "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"

11503 "请使用 --（和可选的 --no-guess）来消除歧义"

11504

11408 -#: builtin/checkout.c:1159

11505 +#: builtin/checkout.c:1157

11506 msgid ""

11507 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"

11508 "you can do so by fully qualifying the name with the --track option:\n"

@@ -11424,51 +11521,51 @@ msgstr ""

11521 "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"

11522 "名称，可以在配置中设置 checkout.defaultRemote=origin。"

11523

11427 -#: builtin/checkout.c:1169

11524 +#: builtin/checkout.c:1167

11525 #, c-format

11526 msgid "'%s' matched multiple (%d) remote tracking branches"

11527 msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"

11528

11432 -#: builtin/checkout.c:1235

11529 +#: builtin/checkout.c:1233

11530 msgid "only one reference expected"

11531 msgstr "只期望一个引用"

11532

11436 -#: builtin/checkout.c:1252

11533 +#: builtin/checkout.c:1250

11534 #, c-format

11535 msgid "only one reference expected, %d given."

11536 msgstr "应只有一个引用，却给出了 %d 个"

11537

11441 -#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451

11538 +#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510

11539 #, c-format

11540 msgid "invalid reference: %s"

11541 msgstr "无效引用：%s"

11542

11446 -#: builtin/checkout.c:1311 builtin/checkout.c:1677

11543 +#: builtin/checkout.c:1309 builtin/checkout.c:1675

11544 #, c-format

11545 msgid "reference is not a tree: %s"

11546 msgstr "引用不是一个树：%s"

11547

11451 -#: builtin/checkout.c:1358

11548 +#: builtin/checkout.c:1356

11549 #, c-format

11550 msgid "a branch is expected, got tag '%s'"

11551 msgstr "期望一个分支，得到标签 '%s'"

11552

11456 -#: builtin/checkout.c:1360

11553 +#: builtin/checkout.c:1358

11554 #, c-format

11555 msgid "a branch is expected, got remote branch '%s'"

11556 msgstr "期望一个分支，得到远程分支 '%s'"

11557

11461 -#: builtin/checkout.c:1361 builtin/checkout.c:1369

11558 +#: builtin/checkout.c:1359 builtin/checkout.c:1367

11559 #, c-format

11560 msgid "a branch is expected, got '%s'"

11561 msgstr "期望一个分支，得到 '%s'"

11562

11466 -#: builtin/checkout.c:1364

11563 +#: builtin/checkout.c:1362

11564 #, c-format

11565 msgid "a branch is expected, got commit '%s'"

11566 msgstr "期望一个分支，得到提交 '%s'"

11567

11471 -#: builtin/checkout.c:1380

11568 +#: builtin/checkout.c:1378

11569 msgid ""

11570 "cannot switch branch while merging\n"

11571 "Consider \"git merge --quit\" or \"git worktree add\"."

@@ -11476,7 +11573,7 @@ msgstr ""

11573 "不能在合并时切换分支\n"

11574 "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"

11575

11479 -#: builtin/checkout.c:1384

11576 +#: builtin/checkout.c:1382

11577 msgid ""

11578 "cannot switch branch in the middle of an am session\n"

11579 "Consider \"git am --quit\" or \"git worktree add\"."

@@ -11484,7 +11581,7 @@ msgstr ""

11581 "不能在一个 am 会话期间切换分支\n"

11582 "考虑使用 \"git am --quit\" 或 \"git worktree add\"。"

11583

11487 -#: builtin/checkout.c:1388

11584 +#: builtin/checkout.c:1386

11585 msgid ""

11586 "cannot switch branch while rebasing\n"

11587 "Consider \"git rebase --quit\" or \"git worktree add\"."

@@ -11492,7 +11589,7 @@ msgstr ""

11589 "不能在变基时切换分支\n"

11590 "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"

11591

11495 -#: builtin/checkout.c:1392

11592 +#: builtin/checkout.c:1390

11593 msgid ""

11594 "cannot switch branch while cherry-picking\n"

11595 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."

@@ -11500,7 +11597,7 @@ msgstr ""

11597 "不能在拣选时切换分支\n"

11598 "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"

11599

11503 -#: builtin/checkout.c:1396

11600 +#: builtin/checkout.c:1394

11601 msgid ""

11602 "cannot switch branch while reverting\n"

11603 "Consider \"git revert --quit\" or \"git worktree add\"."

@@ -11508,213 +11605,214 @@ msgstr ""

11605 "不能在还原时切换分支\n"

11606 "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"

11607

11511 -#: builtin/checkout.c:1400

11608 +#: builtin/checkout.c:1398

11609 msgid "you are switching branch while bisecting"

11610 msgstr "您在执行二分查找时切换分支"

11611

11515 -#: builtin/checkout.c:1407

11612 +#: builtin/checkout.c:1405

11613 msgid "paths cannot be used with switching branches"

11614 msgstr "路径不能和切换分支同时使用"

11615

11519 -#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418

11616 +#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416

11617 #, c-format

11618 msgid "'%s' cannot be used with switching branches"

11619 msgstr "'%s' 不能和切换分支同时使用"

11620

11524 -#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428

11525 -#: builtin/checkout.c:1433 builtin/checkout.c:1438

11621 +#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426

11622 +#: builtin/checkout.c:1431 builtin/checkout.c:1436

11623 #, c-format

11624 msgid "'%s' cannot be used with '%s'"

11625 msgstr "'%s' 不能和 '%s' 同时使用"

11626

11530 -#: builtin/checkout.c:1435

11627 +#: builtin/checkout.c:1433

11628 #, c-format

11629 msgid "'%s' cannot take <start-point>"

11630 msgstr "'%s' 不带 <起始点>"

11631

11535 -#: builtin/checkout.c:1443

11632 +#: builtin/checkout.c:1441

11633 #, c-format

11634 msgid "Cannot switch branch to a non-commit '%s'"

11635 msgstr "不能切换分支到一个非提交 '%s'"

11636

11540 -#: builtin/checkout.c:1450

11637 +#: builtin/checkout.c:1448

11638 msgid "missing branch or commit argument"

11639 msgstr "缺少分支或提交参数"

11640

11544 -#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80

11545 -#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288

11641 +#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82

11642 +#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288

11643 #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561

11644 #: builtin/send-pack.c:173

11645 msgid "force progress reporting"

11646 msgstr "强制显示进度报告"

11647

11551 -#: builtin/checkout.c:1493

11648 +#: builtin/checkout.c:1491

11649 msgid "perform a 3-way merge with the new branch"

11650 msgstr "和新的分支执行三方合并"

11651

11555 -#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322

11652 +#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322

11653 msgid "style"

11654 msgstr "风格"

11655

11559 -#: builtin/checkout.c:1495

11656 +#: builtin/checkout.c:1493

11657 msgid "conflict style (merge or diff3)"

11658 msgstr "冲突输出风格（merge 或 diff3）"

11659

11563 -#: builtin/checkout.c:1507 builtin/worktree.c:499

11660 +#: builtin/checkout.c:1505 builtin/worktree.c:558

11661 msgid "detach HEAD at named commit"

11662 msgstr "HEAD 从指定的提交分离"

11663

11567 -#: builtin/checkout.c:1508

11664 +#: builtin/checkout.c:1506

11665 msgid "set upstream info for new branch"

11666 msgstr "为新的分支设置上游信息"

11667

11571 -#: builtin/checkout.c:1510

11668 +#: builtin/checkout.c:1508

11669 msgid "force checkout (throw away local modifications)"

11670 msgstr "强制检出（丢弃本地修改）"

11671

11575 -#: builtin/checkout.c:1512

11672 +#: builtin/checkout.c:1510

11673 msgid "new-branch"

11674 msgstr "新分支"

11675

11579 -#: builtin/checkout.c:1512

11676 +#: builtin/checkout.c:1510

11677 msgid "new unparented branch"

11678 msgstr "新的没有父提交的分支"

11679

11583 -#: builtin/checkout.c:1514 builtin/merge.c:292

11680 +#: builtin/checkout.c:1512 builtin/merge.c:292

11681 msgid "update ignored files (default)"

11682 msgstr "更新忽略的文件（默认）"

11683

11587 -#: builtin/checkout.c:1517

11684 +#: builtin/checkout.c:1515

11685 msgid "do not check if another worktree is holding the given ref"

11686 msgstr "不检查指定的引用是否被其他工作区所占用"

11687

11591 -#: builtin/checkout.c:1530

11688 +#: builtin/checkout.c:1528

11689 msgid "checkout our version for unmerged files"

11690 msgstr "对尚未合并的文件检出我们的版本"

11691

11595 -#: builtin/checkout.c:1533

11692 +#: builtin/checkout.c:1531

11693 msgid "checkout their version for unmerged files"

11694 msgstr "对尚未合并的文件检出他们的版本"

11695

11599 -#: builtin/checkout.c:1537

11696 +#: builtin/checkout.c:1535

11697 msgid "do not limit pathspecs to sparse entries only"

11698 msgstr "对路径不做稀疏检出的限制"

11699

11603 -#: builtin/checkout.c:1592

11700 +#: builtin/checkout.c:1590

11701 #, c-format

11702 msgid "-%c, -%c and --orphan are mutually exclusive"

11703 msgstr "-%c、-%c 和 --orphan 是互斥的"

11704

11608 -#: builtin/checkout.c:1596

11705 +#: builtin/checkout.c:1594

11706 msgid "-p and --overlay are mutually exclusive"

11707 msgstr "-p 和 --overlay 互斥"

11708

11612 -#: builtin/checkout.c:1633

11709 +#: builtin/checkout.c:1631

11710 msgid "--track needs a branch name"

11711 msgstr "--track 需要一个分支名"

11712

11616 -#: builtin/checkout.c:1638

11713 +#: builtin/checkout.c:1636

11714 #, c-format

11715 msgid "missing branch name; try -%c"

11716 msgstr "缺少分支名，尝试 -%c"

11717

11621 -#: builtin/checkout.c:1670

11718 +#: builtin/checkout.c:1668

11719 #, c-format

11720 msgid "could not resolve %s"

11721 msgstr "无法解析 %s"

11722

11626 -#: builtin/checkout.c:1686

11723 +#: builtin/checkout.c:1684

11724 msgid "invalid path specification"

11725 msgstr "无效的路径规格"

11726

11630 -#: builtin/checkout.c:1693

11727 +#: builtin/checkout.c:1691

11728 #, c-format

11729 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

11730 msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"

11731

11635 -#: builtin/checkout.c:1697

11732 +#: builtin/checkout.c:1695

11733 #, c-format

11734 msgid "git checkout: --detach does not take a path argument '%s'"

11735 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

11736

11640 -#: builtin/checkout.c:1706

11737 +#: builtin/checkout.c:1704

11738 msgid "--pathspec-from-file is incompatible with --detach"

11739 msgstr "--pathspec-from-file 与 --detach 不兼容"

11740

11644 -#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503

11741 +#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503

11742 msgid "--pathspec-from-file is incompatible with --patch"

11743 msgstr "--pathspec-from-file 与 --patch 不兼容"

11744

11648 -#: builtin/checkout.c:1720

11745 +#: builtin/checkout.c:1718

11746 msgid ""

11747 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

11748 "checking out of the index."

11749 msgstr ""

11750 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"

11751

11655 -#: builtin/checkout.c:1725

11752 +#: builtin/checkout.c:1723

11753 msgid "you must specify path(s) to restore"

11754 msgstr "您必须指定一个要恢复的路径"

11755

11659 -#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802

11660 -#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170

11661 -#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497

11756 +#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800

11757 +#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170

11758 +#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554

11759 +#: builtin/worktree.c:556

11760 msgid "branch"

11761 msgstr "分支"

11762

11665 -#: builtin/checkout.c:1752

11763 +#: builtin/checkout.c:1750

11764 msgid "create and checkout a new branch"

11765 msgstr "创建并检出一个新的分支"

11766

11669 -#: builtin/checkout.c:1754

11767 +#: builtin/checkout.c:1752

11768 msgid "create/reset and checkout a branch"

11769 msgstr "创建/重置并检出一个分支"

11770

11673 -#: builtin/checkout.c:1755

11771 +#: builtin/checkout.c:1753

11772 msgid "create reflog for new branch"

11773 msgstr "为新的分支创建引用日志"

11774

11677 -#: builtin/checkout.c:1757

11775 +#: builtin/checkout.c:1755

11776 msgid "second guess 'git checkout <no-such-branch>' (default)"

11777 msgstr "二次猜测 'git checkout <无此分支>'（默认）"

11778

11681 -#: builtin/checkout.c:1758

11779 +#: builtin/checkout.c:1756

11780 msgid "use overlay mode (default)"

11781 msgstr "使用叠加模式（默认）"

11782

11685 -#: builtin/checkout.c:1803

11783 +#: builtin/checkout.c:1801

11784 msgid "create and switch to a new branch"

11785 msgstr "创建并切换一个新分支"

11786

11689 -#: builtin/checkout.c:1805

11787 +#: builtin/checkout.c:1803

11788 msgid "create/reset and switch to a branch"

11789 msgstr "创建/重置并切换一个分支"

11790

11693 -#: builtin/checkout.c:1807

11791 +#: builtin/checkout.c:1805

11792 msgid "second guess 'git switch <no-such-branch>'"

11793 msgstr "二次猜测 'git switch <无此分支>'"

11794

11697 -#: builtin/checkout.c:1809

11795 +#: builtin/checkout.c:1807

11796 msgid "throw away local modifications"

11797 msgstr "丢弃本地修改"

11798

11701 -#: builtin/checkout.c:1843

11799 +#: builtin/checkout.c:1841

11800 msgid "which tree-ish to checkout from"

11801 msgstr "要检出哪一个树"

11802

11705 -#: builtin/checkout.c:1845

11803 +#: builtin/checkout.c:1843

11804 msgid "restore the index"

11805 msgstr "恢复索引"

11806

11709 -#: builtin/checkout.c:1847

11807 +#: builtin/checkout.c:1845

11808 msgid "restore the working tree (default)"

11809 msgstr "恢复工作区（默认）"

11810

11713 -#: builtin/checkout.c:1849

11811 +#: builtin/checkout.c:1847

11812 msgid "ignore unmerged entries"

11813 msgstr "忽略未合并条目"

11814

11717 -#: builtin/checkout.c:1850

11815 +#: builtin/checkout.c:1848

11816 msgid "use overlay mode"

11817 msgstr "使用叠加模式"

11818

@@ -11877,24 +11975,24 @@ msgstr "也删除忽略的文件"

11975 msgid "remove only ignored files"

11976 msgstr "只删除忽略的文件"

11977

11880 -#: builtin/clean.c:931

11881 -msgid "-x and -X cannot be used together"

11882 -msgstr "-x 和 -X 不能同时使用"

11883 -

11884 -#: builtin/clean.c:935

11978 +#: builtin/clean.c:929

11979 msgid ""

11980 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

11981 "clean"

11982 msgstr ""

11983 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

11984

11891 -#: builtin/clean.c:938

11985 +#: builtin/clean.c:932

11986 msgid ""

11987 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

11988 "refusing to clean"

11989 msgstr ""

11990 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

11991

11992 +#: builtin/clean.c:944

11993 +msgid "-x and -X cannot be used together"

11994 +msgstr "-x 和 -X 不能同时使用"

11995 +

11996 #: builtin/clone.c:45

11997 msgid "git clone [<options>] [--] <repo> [<dir>]"

11998 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

@@ -11903,7 +12001,7 @@ msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

12001 msgid "don't create a checkout"

12002 msgstr "不创建一个检出"

12003

11906 -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536

12004 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554

12005 msgid "create a bare repository"

12006 msgstr "创建一个纯仓库"

12007

@@ -11935,11 +12033,11 @@ msgstr "在克隆时初始化子模组"

12033 msgid "number of submodules cloned in parallel"

12034 msgstr "并发克隆的子模组的数量"

12035

11938 -#: builtin/clone.c:111 builtin/init-db.c:533

12036 +#: builtin/clone.c:111 builtin/init-db.c:551

12037 msgid "template-directory"

12038 msgstr "模板目录"

12039

11942 -#: builtin/clone.c:112 builtin/init-db.c:534

12040 +#: builtin/clone.c:112 builtin/init-db.c:552

12041 msgid "directory from which templates will be used"

12042 msgstr "模板目录将被使用"

12043

@@ -11953,8 +12051,8 @@ msgstr "参考仓库"

12051 msgid "use --reference only while cloning"

12052 msgstr "仅在克隆时参考 --reference 指向的本地仓库"

12053

11956 -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46

11957 -#: builtin/pack-objects.c:3442 builtin/repack.c:329

12054 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562

12055 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329

12056 msgid "name"

12057 msgstr "名称"

12058

@@ -11979,7 +12077,7 @@ msgstr "深度"

12077 msgid "create a shallow clone of that depth"

12078 msgstr "创建一个指定深度的浅克隆"

12079

11982 -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431

12080 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503

12081 #: builtin/pull.c:211

12082 msgid "time"

12083 msgstr "时间"

@@ -12010,11 +12108,11 @@ msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"

12108 msgid "any cloned submodules will be shallow"

12109 msgstr "子模组将以浅下载模式克隆"

12110

12013 -#: builtin/clone.c:137 builtin/init-db.c:542

12111 +#: builtin/clone.c:137 builtin/init-db.c:560

12112 msgid "gitdir"

12113 msgstr "git目录"

12114

12017 -#: builtin/clone.c:138 builtin/init-db.c:543

12115 +#: builtin/clone.c:138 builtin/init-db.c:561

12116 msgid "separate git dir from working tree"

12117 msgstr "git目录和工作区分离"

12118

@@ -12141,7 +12239,7 @@ msgstr "无法执行 repack 来清理"

12239 msgid "cannot unlink temporary alternates file"

12240 msgstr "无法删除临时的 alternates 文件"

12241

12144 -#: builtin/clone.c:971 builtin/receive-pack.c:1972

12242 +#: builtin/clone.c:971 builtin/receive-pack.c:1982

12243 msgid "Too many arguments."

12244 msgstr "太多参数。"

12245

@@ -12158,83 +12256,83 @@ msgstr "--bare 和 --origin %s 选项不兼容。"

12256 msgid "--bare and --separate-git-dir are incompatible."

12257 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

12258

12161 -#: builtin/clone.c:1004

12259 +#: builtin/clone.c:1007

12260 #, c-format

12261 msgid "repository '%s' does not exist"

12262 msgstr "仓库 '%s' 不存在"

12263

12166 -#: builtin/clone.c:1010 builtin/fetch.c:1789

12264 +#: builtin/clone.c:1011 builtin/fetch.c:1794

12265 #, c-format

12266 msgid "depth %s is not a positive number"

12267 msgstr "深度 %s 不是一个正数"

12268

12171 -#: builtin/clone.c:1020

12269 +#: builtin/clone.c:1021

12270 #, c-format

12271 msgid "destination path '%s' already exists and is not an empty directory."

12272 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

12273

12176 -#: builtin/clone.c:1030

12274 +#: builtin/clone.c:1033

12275 #, c-format

12276 msgid "working tree '%s' already exists."

12277 msgstr "工作区 '%s' 已经存在。"

12278

12181 -#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271

12182 -#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327

12279 +#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271

12280 +#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386

12281 #, c-format

12282 msgid "could not create leading directories of '%s'"

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

12284

12187 -#: builtin/clone.c:1050

12285 +#: builtin/clone.c:1053

12286 #, c-format

12287 msgid "could not create work tree dir '%s'"

12288 msgstr "不能创建工作区目录 '%s'"

12289

12192 -#: builtin/clone.c:1070

12290 +#: builtin/clone.c:1073

12291 #, c-format

12292 msgid "Cloning into bare repository '%s'...\n"

12293 msgstr "克隆到纯仓库 '%s'...\n"

12294

12197 -#: builtin/clone.c:1072

12295 +#: builtin/clone.c:1075

12296 #, c-format

12297 msgid "Cloning into '%s'...\n"

12298 msgstr "正克隆到 '%s'...\n"

12299

12202 -#: builtin/clone.c:1096

12300 +#: builtin/clone.c:1099

12301 msgid ""

12302 "clone --recursive is not compatible with both --reference and --reference-if-"

12303 "able"

12304 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"

12305

12208 -#: builtin/clone.c:1160

12306 +#: builtin/clone.c:1164

12307 msgid "--depth is ignored in local clones; use file:// instead."

12308 msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"

12309

12212 -#: builtin/clone.c:1162

12310 +#: builtin/clone.c:1166

12311 msgid "--shallow-since is ignored in local clones; use file:// instead."

12312 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"

12313

12216 -#: builtin/clone.c:1164

12314 +#: builtin/clone.c:1168

12315 msgid "--shallow-exclude is ignored in local clones; use file:// instead."

12316 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"

12317

12220 -#: builtin/clone.c:1166

12318 +#: builtin/clone.c:1170

12319 msgid "--filter is ignored in local clones; use file:// instead."

12320 msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"

12321

12224 -#: builtin/clone.c:1169

12322 +#: builtin/clone.c:1173

12323 msgid "source repository is shallow, ignoring --local"

12324 msgstr "源仓库是浅克隆，忽略 --local"

12325

12228 -#: builtin/clone.c:1174

12326 +#: builtin/clone.c:1178

12327 msgid "--local is ignored"

12328 msgstr "--local 被忽略"

12329

12232 -#: builtin/clone.c:1249 builtin/clone.c:1257

12330 +#: builtin/clone.c:1262 builtin/clone.c:1270

12331 #, c-format

12332 msgid "Remote branch %s not found in upstream %s"

12333 msgstr "远程分支 %s 在上游 %s 未发现"

12334

12237 -#: builtin/clone.c:1260

12335 +#: builtin/clone.c:1273

12336 msgid "You appear to have cloned an empty repository."

12337 msgstr "您似乎克隆了一个空仓库。"

12338

@@ -12270,14 +12368,14 @@ msgstr "两列之间的填充空间"

12368 msgid "--command must be the first argument"

12369 msgstr "--command 必须是第一个参数"

12370

12273 -#: builtin/commit-graph.c:11 builtin/commit-graph.c:19

12371 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:21

12372 msgid ""

12373 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"

12374 msgstr ""

12375 "git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"

12376 "[no-]progress]"

12377

12280 -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24

12378 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:26

12379 msgid ""

12380 "git commit-graph write [--object-dir <objdir>] [--append] [--"

12381 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

@@ -12287,79 +12385,88 @@ msgstr ""

12385 ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"

12386 "[no-]progress] <切分选项>"

12387

12290 -#: builtin/commit-graph.c:60

12388 +#: builtin/commit-graph.c:62

12389 #, c-format

12390 msgid "could not find object directory matching %s"

12391 msgstr "无法找到和 %s 匹配的对象目录"

12392

12295 -#: builtin/commit-graph.c:76 builtin/commit-graph.c:152

12296 -#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678

12393 +#: builtin/commit-graph.c:78 builtin/commit-graph.c:177

12394 +#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678

12395 msgid "dir"

12396 msgstr "目录"

12397

12300 -#: builtin/commit-graph.c:77 builtin/commit-graph.c:153

12301 -#: builtin/commit-graph.c:258

12398 +#: builtin/commit-graph.c:79 builtin/commit-graph.c:178

12399 +#: builtin/commit-graph.c:277

12400 msgid "The object directory to store the graph"

12401 msgstr "保存图形的对象目录"

12402

12305 -#: builtin/commit-graph.c:79

12403 +#: builtin/commit-graph.c:81

12404 msgid "if the commit-graph is split, only verify the tip file"

12405 msgstr "如果提交图形被拆分，只验证头一个文件"

12406

12309 -#: builtin/commit-graph.c:102

12407 +#: builtin/commit-graph.c:104

12408 #, c-format

12409 msgid "Could not open commit-graph '%s'"

12410 msgstr "无法打开提交图形 '%s'"

12411

12314 -#: builtin/commit-graph.c:136

12412 +#: builtin/commit-graph.c:138

12413 #, c-format

12414 msgid "unrecognized --split argument, %s"

12415 msgstr "未能识别的 --split 参数，%s"

12416

12319 -#: builtin/commit-graph.c:155

12417 +#: builtin/commit-graph.c:151

12418 +#, c-format

12419 +msgid "unexpected non-hex object ID: %s"

12420 +msgstr "意外的非十六进制对象 ID：%s"

12421 +

12422 +#: builtin/commit-graph.c:156

12423 +#, c-format

12424 +msgid "invalid object: %s"

12425 +msgstr "无效对象：%s"

12426 +

12427 +#: builtin/commit-graph.c:180

12428 msgid "start walk at all refs"

12429 msgstr "开始遍历所有引用"

12430

12323 -#: builtin/commit-graph.c:157

12431 +#: builtin/commit-graph.c:182

12432 msgid "scan pack-indexes listed by stdin for commits"

12433 msgstr "从标准输入中的包索引文件列表中扫描提交"

12434

12327 -#: builtin/commit-graph.c:159

12435 +#: builtin/commit-graph.c:184

12436 msgid "start walk at commits listed by stdin"

12437 msgstr "从标准输入中的提交开始扫描"

12438

12331 -#: builtin/commit-graph.c:161

12439 +#: builtin/commit-graph.c:186

12440 msgid "include all commits already in the commit-graph file"

12441 msgstr "包含 commit-graph 文件中已有所有提交"

12442

12335 -#: builtin/commit-graph.c:163

12443 +#: builtin/commit-graph.c:188

12444 msgid "enable computation for changed paths"

12445 msgstr "启用变更路径的计算"

12446

12339 -#: builtin/commit-graph.c:166

12447 +#: builtin/commit-graph.c:191

12448 msgid "allow writing an incremental commit-graph file"

12449 msgstr "允许写一个增量提交图形文件"

12450

12343 -#: builtin/commit-graph.c:170

12451 +#: builtin/commit-graph.c:195

12452 msgid "maximum number of commits in a non-base split commit-graph"

12453 msgstr "在非基本拆分提交图形中的最大提交数"

12454

12347 -#: builtin/commit-graph.c:172

12455 +#: builtin/commit-graph.c:197

12456 msgid "maximum ratio between two levels of a split commit-graph"

12457 msgstr "一个拆分提交图形的两个级别之间的最大比率"

12458

12351 -#: builtin/commit-graph.c:174

12459 +#: builtin/commit-graph.c:199

12460 msgid "only expire files older than a given date-time"

12461 msgstr "只让早于给定时间的文件过期"

12462

12355 -#: builtin/commit-graph.c:190

12463 +#: builtin/commit-graph.c:215

12464 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"

12465 msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"

12466

12359 -#: builtin/commit-graph.c:229

12360 -#, c-format

12361 -msgid "unexpected non-hex object ID: %s"

12362 -msgstr "意外的非十六进制对象 ID：%s"

12467 +#: builtin/commit-graph.c:245

12468 +msgid "Collecting commits from input"

12469 +msgstr "正从标准输入收集提交"

12470

12471 #: builtin/commit-tree.c:18

12472 msgid ""

@@ -12755,7 +12862,7 @@ msgid "version"

12862 msgstr "版本"

12863

12864 #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549

12758 -#: builtin/worktree.c:646

12865 +#: builtin/worktree.c:722

12866 msgid "machine-readable output"

12867 msgstr "机器可读的输出"

12868

@@ -12768,8 +12875,8 @@ msgid "terminate entries with NUL"

12875 msgstr "条目以 NUL 字符结尾"

12876

12877 #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543

12771 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156

12772 -#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336

12878 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202

12879 +#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336

12880 msgid "mode"

12881 msgstr "模式"

12882

@@ -13442,35 +13549,45 @@ msgstr "--dirty 与提交号不兼容"

13549 msgid "--broken is incompatible with commit-ishes"

13550 msgstr "--broken 与提交号不兼容"

13551

13445 -#: builtin/diff.c:84

13552 +#: builtin/diff.c:91

13553 #, c-format

13554 msgid "'%s': not a regular file or symlink"

13555 msgstr "'%s'：不是一个正规文件或符号链接"

13556

13450 -#: builtin/diff.c:235

13557 +#: builtin/diff.c:242

13558 #, c-format

13559 msgid "invalid option: %s"

13560 msgstr "无效选项：%s"

13561

13455 -#: builtin/diff.c:350

13562 +#: builtin/diff.c:359

13563 +#, c-format

13564 +msgid "%s...%s: no merge base"

13565 +msgstr "%s...%s：无合并基线"

13566 +

13567 +#: builtin/diff.c:469

13568 msgid "Not a git repository"

13569 msgstr "不是一个 git 仓库"

13570

13459 -#: builtin/diff.c:394

13571 +#: builtin/diff.c:514

13572 #, c-format

13573 msgid "invalid object '%s' given."

13574 msgstr "提供了无效对象 '%s'。"

13575

13464 -#: builtin/diff.c:403

13576 +#: builtin/diff.c:525

13577 #, c-format

13578 msgid "more than two blobs given: '%s'"

13579 msgstr "提供了超过两个数据对象：'%s'"

13580

13469 -#: builtin/diff.c:408

13581 +#: builtin/diff.c:530

13582 #, c-format

13583 msgid "unhandled object '%s' given."

13584 msgstr "无法处理的对象 '%s'。"

13585

13586 +#: builtin/diff.c:564

13587 +#, c-format

13588 +msgid "%s...%s: multiple merge bases, using %s"

13589 +msgstr "%s...%s：多条合并基线，使用 %s"

13590 +

13591 #: builtin/difftool.c:30

13592 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

13593 msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"

@@ -13615,82 +13732,103 @@ msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型，不

13732 msgid "git fast-export [rev-list-opts]"

13733 msgstr "git fast-export [rev-list-opts]"

13734

13618 -#: builtin/fast-export.c:853

13735 +#: builtin/fast-export.c:868

13736 msgid "Error: Cannot export nested tags unless --mark-tags is specified."

13737 msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"

13738

13622 -#: builtin/fast-export.c:1152

13739 +#: builtin/fast-export.c:1178

13740 +msgid "--anonymize-map token cannot be empty"

13741 +msgstr "--anonymize-map 取值不能为空"

13742 +

13743 +#: builtin/fast-export.c:1198

13744 msgid "show progress after <n> objects"

13745 msgstr "在 <n> 个对象之后显示进度"

13746

13626 -#: builtin/fast-export.c:1154

13747 +#: builtin/fast-export.c:1200

13748 msgid "select handling of signed tags"

13749 msgstr "选择如何处理签名标签"

13750

13630 -#: builtin/fast-export.c:1157

13751 +#: builtin/fast-export.c:1203

13752 msgid "select handling of tags that tag filtered objects"

13753 msgstr "选择当标签指向被过滤对象时该标签的处理方式"

13754

13634 -#: builtin/fast-export.c:1160

13755 +#: builtin/fast-export.c:1206

13756 msgid "select handling of commit messages in an alternate encoding"

13757 msgstr "选择使用备用编码处理提交说明"

13758

13638 -#: builtin/fast-export.c:1163

13759 +#: builtin/fast-export.c:1209

13760 msgid "Dump marks to this file"

13761 msgstr "把标记存储到这个文件"

13762

13642 -#: builtin/fast-export.c:1165

13763 +#: builtin/fast-export.c:1211

13764 msgid "Import marks from this file"

13765 msgstr "从这个文件导入标记"

13766

13646 -#: builtin/fast-export.c:1169

13767 +#: builtin/fast-export.c:1215

13768 msgid "Import marks from this file if it exists"

13769 msgstr "从该文件导入标记（如果存在的话）"

13770

13650 -#: builtin/fast-export.c:1171

13771 +#: builtin/fast-export.c:1217

13772 msgid "Fake a tagger when tags lack one"

13773 msgstr "当标签缺少标记者字段时，假装提供一个"

13774

13654 -#: builtin/fast-export.c:1173

13775 +#: builtin/fast-export.c:1219

13776 msgid "Output full tree for each commit"

13777 msgstr "每次提交都输出整个树"

13778

13658 -#: builtin/fast-export.c:1175

13779 +#: builtin/fast-export.c:1221

13780 msgid "Use the done feature to terminate the stream"

13781 msgstr "使用 done 功能来终止流"

13782

13662 -#: builtin/fast-export.c:1176

13783 +#: builtin/fast-export.c:1222

13784 msgid "Skip output of blob data"

13785 msgstr "跳过数据对象的输出"

13786

13666 -#: builtin/fast-export.c:1177 builtin/log.c:1724

13787 +#: builtin/fast-export.c:1223 builtin/log.c:1724

13788 msgid "refspec"

13789 msgstr "引用规格"

13790

13670 -#: builtin/fast-export.c:1178

13791 +#: builtin/fast-export.c:1224

13792 msgid "Apply refspec to exported refs"

13793 msgstr "对导出的引用应用引用规格"

13794

13674 -#: builtin/fast-export.c:1179

13795 +#: builtin/fast-export.c:1225

13796 msgid "anonymize output"

13797 msgstr "匿名输出"

13798

13678 -#: builtin/fast-export.c:1181

13799 +#: builtin/fast-export.c:1226

13800 +msgid "from:to"

13801 +msgstr "from:to"

13802 +

13803 +#: builtin/fast-export.c:1227

13804 +msgid "convert <from> to <to> in anonymized output"

13805 +msgstr "在匿名输出中将 <from> 转换为 <to>"

13806 +

13807 +#: builtin/fast-export.c:1230

13808 msgid "Reference parents which are not in fast-export stream by object id"

13809 msgstr "引用父对象 ID 不在 fast-export 流中"

13810

13682 -#: builtin/fast-export.c:1183

13811 +#: builtin/fast-export.c:1232

13812 msgid "Show original object ids of blobs/commits"

13813 msgstr "显示数据对象/提交的原始对象 ID"

13814

13686 -#: builtin/fast-export.c:1185

13815 +#: builtin/fast-export.c:1234

13816 msgid "Label tags with mark ids"

13817 msgstr "对带有标记 ID 的标签做标记"

13818

13690 -#: builtin/fast-export.c:1220

13819 +#: builtin/fast-export.c:1257

13820 +msgid "--anonymize-map without --anonymize does not make sense"

13821 +msgstr "--anonymize-map 而没有 --anonymize 没有意义"

13822 +

13823 +#: builtin/fast-export.c:1272

13824 msgid "Cannot pass both --import-marks and --import-marks-if-exists"

13825 msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"

13826

13827 +#: builtin/fetch-pack.c:245

13828 +#, c-format

13829 +msgid "Lockfile created but not reported: %s"

13830 +msgstr "Lockfile 已创建但未报告：%s"

13831 +

13832 #: builtin/fetch.c:35

13833 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

13834 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"

@@ -14011,40 +14149,40 @@ msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，

14149 msgid "You need to specify a tag name."

14150 msgstr "您需要指定一个标签名称。"

14151

14014 -#: builtin/fetch.c:1773

14152 +#: builtin/fetch.c:1778

14153 msgid "Negative depth in --deepen is not supported"

14154 msgstr "--deepen 不支持负数深度"

14155

14018 -#: builtin/fetch.c:1775

14156 +#: builtin/fetch.c:1780

14157 msgid "--deepen and --depth are mutually exclusive"

14158 msgstr "--deepen 和 --depth 是互斥的"

14159

14022 -#: builtin/fetch.c:1780

14160 +#: builtin/fetch.c:1785

14161 msgid "--depth and --unshallow cannot be used together"

14162 msgstr "--depth 和 --unshallow 不能同时使用"

14163

14026 -#: builtin/fetch.c:1782

14164 +#: builtin/fetch.c:1787

14165 msgid "--unshallow on a complete repository does not make sense"

14166 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"

14167

14030 -#: builtin/fetch.c:1798

14168 +#: builtin/fetch.c:1800

14169 msgid "fetch --all does not take a repository argument"

14170 msgstr "fetch --all 不能带一个仓库参数"

14171

14034 -#: builtin/fetch.c:1800

14172 +#: builtin/fetch.c:1802

14173 msgid "fetch --all does not make sense with refspecs"

14174 msgstr "fetch --all 带引用规格没有任何意义"

14175

14038 -#: builtin/fetch.c:1809

14176 +#: builtin/fetch.c:1811

14177 #, c-format

14178 msgid "No such remote or remote group: %s"

14179 msgstr "没有这样的远程或远程组：%s"

14180

14043 -#: builtin/fetch.c:1816

14181 +#: builtin/fetch.c:1818

14182 msgid "Fetching a group and specifying refspecs does not make sense"

14183 msgstr "获取组并指定引用规格没有意义"

14184

14047 -#: builtin/fetch.c:1834

14185 +#: builtin/fetch.c:1836

14186 msgid ""

14187 "--filter can only be used with the remote configured in extensions."

14188 "partialclone"

@@ -14491,8 +14629,8 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效"

14629 #. variable for tweaking threads, currently

14630 #. grep.threads

14631 #.

14494 -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730

14495 -#: builtin/pack-objects.c:2855

14632 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727

14633 +#: builtin/pack-objects.c:2904

14634 #, c-format

14635 msgid "no threads support, ignoring %s"

14636 msgstr "没有线程支持，忽略 %s"

@@ -14722,11 +14860,11 @@ msgstr "--untracked 不支持和 --recurse-submodules 共用"

14860 msgid "invalid option combination, ignoring --threads"

14861 msgstr "无效的选项组合，忽略 --threads"

14862

14725 -#: builtin/grep.c:1084 builtin/pack-objects.c:3548

14863 +#: builtin/grep.c:1084 builtin/pack-objects.c:3623

14864 msgid "no threads support, ignoring --threads"

14865 msgstr "没有线程支持，忽略 --threads"

14866

14729 -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852

14867 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901

14868 #, c-format

14869 msgid "invalid number of threads specified (%d)"

14870 msgstr "指定的线程数无效（%d）"

@@ -14927,7 +15065,7 @@ msgstr "输入上的读错误"

15065 msgid "used more bytes than were available"

15066 msgstr "用掉了超过可用的字节"

15067

14930 -#: builtin/index-pack.c:288 builtin/pack-objects.c:607

15068 +#: builtin/index-pack.c:288 builtin/pack-objects.c:618

15069 msgid "pack too large for current definition of off_t"

15070 msgstr "包太大超过了当前 off_t 的定义"

15071

@@ -14998,8 +15136,8 @@ msgstr "解压缩严重的不一致"

15136 msgid "SHA1 COLLISION FOUND WITH %s !"

15137 msgstr "发现 %s 出现 SHA1 冲突！"

15138

15001 -#: builtin/index-pack.c:738 builtin/pack-objects.c:159

15002 -#: builtin/pack-objects.c:219 builtin/pack-objects.c:314

15139 +#: builtin/index-pack.c:738 builtin/pack-objects.c:170

15140 +#: builtin/pack-objects.c:230 builtin/pack-objects.c:325

15141 #, c-format

15142 msgid "unable to read %s"

15143 msgstr "不能读 %s"

@@ -15060,7 +15198,7 @@ msgstr "parse_pack_objects() 中遇到不可理喻的问题"

15198 msgid "Resolving deltas"

15199 msgstr "处理 delta 中"

15200

15063 -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616

15201 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665

15202 #, c-format

15203 msgid "unable to create thread: %s"

15204 msgstr "不能创建线程：%s"

@@ -15125,58 +15263,67 @@ msgstr "无法存储包文件"

15263 msgid "cannot store index file"

15264 msgstr "无法存储索引文件"

15265

15128 -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863

15266 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912

15267 #, c-format

15268 msgid "bad pack.indexversion=%<PRIu32>"

15269 msgstr "坏的 pack.indexversion=%<PRIu32>"

15270

15133 -#: builtin/index-pack.c:1596

15271 +#: builtin/index-pack.c:1592

15272 #, c-format

15273 msgid "Cannot open existing pack file '%s'"

15274 msgstr "无法打开现存包文件 '%s'"

15275

15138 -#: builtin/index-pack.c:1598

15276 +#: builtin/index-pack.c:1594

15277 #, c-format

15278 msgid "Cannot open existing pack idx file for '%s'"

15279 msgstr "无法为 %s 打开包索引文件"

15280

15143 -#: builtin/index-pack.c:1646

15281 +#: builtin/index-pack.c:1642

15282 #, c-format

15283 msgid "non delta: %d object"

15284 msgid_plural "non delta: %d objects"

15285 msgstr[0] "非 delta：%d 个对象"

15286 msgstr[1] "非 delta：%d 个对象"

15287

15150 -#: builtin/index-pack.c:1653

15288 +#: builtin/index-pack.c:1649

15289 #, c-format

15290 msgid "chain length = %d: %lu object"

15291 msgid_plural "chain length = %d: %lu objects"

15292 msgstr[0] "链长 = %d: %lu 对象"

15293 msgstr[1] "链长 = %d: %lu 对象"

15294

15157 -#: builtin/index-pack.c:1692

15295 +#: builtin/index-pack.c:1689

15296 msgid "Cannot come back to cwd"

15297 msgstr "无法返回当前工作目录"

15298

15161 -#: builtin/index-pack.c:1741 builtin/index-pack.c:1744

15162 -#: builtin/index-pack.c:1760 builtin/index-pack.c:1764

15299 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741

15300 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761

15301 #, c-format

15302 msgid "bad %s"

15303 msgstr "错误选项 %s"

15304

15167 -#: builtin/index-pack.c:1780

15305 +#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621

15306 +#, c-format

15307 +msgid "unknown hash algorithm '%s'"

15308 +msgstr "未知的哈希算法 '%s'"

15309 +

15310 +#: builtin/index-pack.c:1782

15311 msgid "--fix-thin cannot be used without --stdin"

15312 msgstr "--fix-thin 不能和 --stdin 同时使用"

15313

15171 -#: builtin/index-pack.c:1782

15314 +#: builtin/index-pack.c:1784

15315 msgid "--stdin requires a git repository"

15316 msgstr "--stdin 需要一个 git 仓库"

15317

15175 -#: builtin/index-pack.c:1788

15318 +#: builtin/index-pack.c:1786

15319 +msgid "--object-format cannot be used with --stdin"

15320 +msgstr "--object-format 不能和 --stdin 同时使用"

15321 +

15322 +#: builtin/index-pack.c:1792

15323 msgid "--verify with no packfile name given"

15324 msgstr "--verify 没有提供包文件名参数"

15325

15179 -#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582

15326 +#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582

15327 msgid "fsck error in pack objects"

15328 msgstr "在打包对象中 fsck 检查出错"

15329

@@ -15220,51 +15367,56 @@ msgstr "没有在 %s 中找到模版"

15367 msgid "not copying templates from '%s': %s"

15368 msgstr "没有从 '%s' 复制模版：%s"

15369

15223 -#: builtin/init-db.c:356

15370 +#: builtin/init-db.c:276

15371 +#, c-format

15372 +msgid "invalid initial branch name: '%s'"

15373 +msgstr "无效的初始分支名：'%s'"

15374 +

15375 +#: builtin/init-db.c:368

15376 #, c-format

15377 msgid "unable to handle file type %d"

15378 msgstr "不能处理 %d 类型的文件"

15379

15228 -#: builtin/init-db.c:359

15380 +#: builtin/init-db.c:371

15381 #, c-format

15382 msgid "unable to move %s to %s"

15383 msgstr "不能移动 %s 至 %s"

15384

15233 -#: builtin/init-db.c:374

15385 +#: builtin/init-db.c:386

15386 msgid "attempt to reinitialize repository with different hash"

15387 msgstr "尝试用不同的哈希算法重新初始化仓库"

15388

15237 -#: builtin/init-db.c:380 builtin/init-db.c:601

15238 -#, c-format

15239 -msgid "unknown hash algorithm '%s'"

15240 -msgstr "未知的哈希算法 '%s'"

15241 -

15242 -#: builtin/init-db.c:397 builtin/init-db.c:400

15389 +#: builtin/init-db.c:410 builtin/init-db.c:413

15390 #, c-format

15391 msgid "%s already exists"

15392 msgstr "%s 已经存在"

15393

15247 -#: builtin/init-db.c:458

15394 +#: builtin/init-db.c:444

15395 +#, c-format

15396 +msgid "re-init: ignored --initial-branch=%s"

15397 +msgstr "re-init：已忽略 --initial-branch=%s"

15398 +

15399 +#: builtin/init-db.c:475

15400 #, c-format

15401 msgid "Reinitialized existing shared Git repository in %s%s\n"

15402 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"

15403

15252 -#: builtin/init-db.c:459

15404 +#: builtin/init-db.c:476

15405 #, c-format

15406 msgid "Reinitialized existing Git repository in %s%s\n"

15407 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"

15408

15257 -#: builtin/init-db.c:463

15409 +#: builtin/init-db.c:480

15410 #, c-format

15411 msgid "Initialized empty shared Git repository in %s%s\n"

15412 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"

15413

15262 -#: builtin/init-db.c:464

15414 +#: builtin/init-db.c:481

15415 #, c-format

15416 msgid "Initialized empty Git repository in %s%s\n"

15417 msgstr "已初始化空的 Git 仓库于 %s%s\n"

15418

15267 -#: builtin/init-db.c:513

15419 +#: builtin/init-db.c:530

15420 msgid ""

15421 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

15422 "shared[=<permissions>]] [<directory>]"

@@ -15272,40 +15424,44 @@ msgstr ""

15424 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "

15425 "[<目录>]"

15426

15275 -#: builtin/init-db.c:538

15427 +#: builtin/init-db.c:556

15428 msgid "permissions"

15429 msgstr "权限"

15430

l10n: zh_CN: for git v2.28.0 l10n round 1