a5cd71ca4a · 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: 2019-08-10 20:12+0800\n"

143 -"PO-Revision-Date: 2019-08-13 21:16+0800\n"

142 +"POT-Creation-Date: 2019-10-28 13:19+0800\n"

143 +"PO-Revision-Date: 2019-10-30 14:58+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"

@@ -191,7 +191,7 @@ msgstr ""

191 msgid "Exiting because of an unresolved conflict."

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

193

194 -#: advice.c:193 builtin/merge.c:1327

194 +#: advice.c:193 builtin/merge.c:1332

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

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

197

@@ -325,17 +325,7 @@ msgstr "第 %d 行包含无效文件模式：%s"

325 msgid "inconsistent header lines %d and %d"

326 msgstr "不一致的文件头，%d 行和 %d 行"

327

328 -#: apply.c:1460

329 -#, c-format

330 -msgid "recount: unexpected line: %.*s"

331 -msgstr "recount：意外的行：%.*s"

332 -

333 -#: apply.c:1529

334 -#, c-format

335 -msgid "patch fragment without header at line %d: %.*s"

336 -msgstr "第 %d 行的补丁片段没有头信息：%.*s"

337 -

338 -#: apply.c:1551

328 +#: apply.c:1372

329 #, c-format

330 msgid ""

331 "git diff header lacks filename information when removing %d leading pathname "

@@ -346,82 +336,92 @@ msgid_plural ""

336 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

337 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

338

349 -#: apply.c:1564

339 +#: apply.c:1385

340 #, c-format

341 msgid "git diff header lacks filename information (line %d)"

342 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"

343

354 -#: apply.c:1752

344 +#: apply.c:1481

345 +#, c-format

346 +msgid "recount: unexpected line: %.*s"

347 +msgstr "recount：意外的行：%.*s"

348 +

349 +#: apply.c:1550

350 +#, c-format

351 +msgid "patch fragment without header at line %d: %.*s"

352 +msgstr "第 %d 行的补丁片段没有头信息：%.*s"

353 +

354 +#: apply.c:1753

355 msgid "new file depends on old contents"

356 msgstr "新文件依赖旧内容"

357

358 -#: apply.c:1754

358 +#: apply.c:1755

359 msgid "deleted file still has contents"

360 msgstr "删除的文件仍有内容"

361

362 -#: apply.c:1788

362 +#: apply.c:1789

363 #, c-format

364 msgid "corrupt patch at line %d"

365 msgstr "补丁在第 %d 行损坏"

366

367 -#: apply.c:1825

367 +#: apply.c:1826

368 #, c-format

369 msgid "new file %s depends on old contents"

370 msgstr "新文件 %s 依赖旧内容"

371

372 -#: apply.c:1827

372 +#: apply.c:1828

373 #, c-format

374 msgid "deleted file %s still has contents"

375 msgstr "删除的文件 %s 仍有内容"

376

377 -#: apply.c:1830

377 +#: apply.c:1831

378 #, c-format

379 msgid "** warning: file %s becomes empty but is not deleted"

380 msgstr "** 警告：文件 %s 成为空文件但并未删除"

381

382 -#: apply.c:1977

382 +#: apply.c:1978

383 #, c-format

384 msgid "corrupt binary patch at line %d: %.*s"

385 msgstr "二进制补丁在第 %d 行损坏：%.*s"

386

387 -#: apply.c:2014

387 +#: apply.c:2015

388 #, c-format

389 msgid "unrecognized binary patch at line %d"

390 msgstr "未能识别的二进制补丁位于第 %d 行"

391

392 -#: apply.c:2176

392 +#: apply.c:2177

393 #, c-format

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

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

396

397 -#: apply.c:2262

397 +#: apply.c:2263

398 #, c-format

399 msgid "unable to read symlink %s"

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

401

402 -#: apply.c:2266

402 +#: apply.c:2267

403 #, c-format

404 msgid "unable to open or read %s"

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

406

407 -#: apply.c:2925

407 +#: apply.c:2926

408 #, c-format

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

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

411

412 -#: apply.c:3046

412 +#: apply.c:3047

413 #, c-format

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

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

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

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

418

419 -#: apply.c:3058

419 +#: apply.c:3059

420 #, c-format

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

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

423

424 -#: apply.c:3064

424 +#: apply.c:3065

425 #, c-format

426 msgid ""

427 "while searching for:\n"

@@ -430,445 +430,445 @@ msgstr ""

430 "当查询：\n"

431 "%.*s"

432

433 -#: apply.c:3086

433 +#: apply.c:3087

434 #, c-format

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

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

437

438 -#: apply.c:3094

438 +#: apply.c:3095

439 #, c-format

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

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

442

443 -#: apply.c:3141

443 +#: apply.c:3142

444 #, c-format

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

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

447

448 -#: apply.c:3151

448 +#: apply.c:3152

449 #, c-format

450 msgid ""

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

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

453

454 -#: apply.c:3159

454 +#: apply.c:3160

455 #, c-format

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

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

458

459 -#: apply.c:3177

459 +#: apply.c:3178

460 #, c-format

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

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

463

464 -#: apply.c:3190

464 +#: apply.c:3191

465 #, c-format

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

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

468

469 -#: apply.c:3196

469 +#: apply.c:3197

470 #, c-format

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

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

473

474 -#: apply.c:3217

474 +#: apply.c:3218

475 #, c-format

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

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

478

479 -#: apply.c:3340

479 +#: apply.c:3341

480 #, c-format

481 msgid "cannot checkout %s"

482 msgstr "不能检出 %s"

483

484 -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279

484 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280

485 #, c-format

486 msgid "failed to read %s"

487 msgstr "无法读取 %s"

488

489 -#: apply.c:3400

489 +#: apply.c:3401

490 #, c-format

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

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

493

494 -#: apply.c:3429 apply.c:3672

494 +#: apply.c:3430 apply.c:3673

495 #, c-format

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

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

498

499 -#: apply.c:3515 apply.c:3687

499 +#: apply.c:3516 apply.c:3688

500 #, c-format

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

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

503

504 -#: apply.c:3524 apply.c:3695

504 +#: apply.c:3525 apply.c:3696

505 #, c-format

506 msgid "%s: does not match index"

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

508

509 -#: apply.c:3559

509 +#: apply.c:3560

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

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

512

513 -#: apply.c:3562

513 +#: apply.c:3563

514 #, c-format

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

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

517

518 -#: apply.c:3578 apply.c:3582

518 +#: apply.c:3579 apply.c:3583

519 #, c-format

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

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

522

523 -#: apply.c:3594

523 +#: apply.c:3595

524 #, c-format

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

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

527

528 -#: apply.c:3608

528 +#: apply.c:3609

529 #, c-format

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

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

532

533 -#: apply.c:3613

533 +#: apply.c:3614

534 #, c-format

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

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

537

538 -#: apply.c:3639

538 +#: apply.c:3640

539 msgid "removal patch leaves file contents"

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

541

542 -#: apply.c:3712

542 +#: apply.c:3713

543 #, c-format

544 msgid "%s: wrong type"

545 msgstr "%s：错误类型"

546

547 -#: apply.c:3714

547 +#: apply.c:3715

548 #, c-format

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

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

551

552 -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856

552 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856

553 #: read-cache.c:1309

554 #, c-format

555 msgid "invalid path '%s'"

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

557

558 -#: apply.c:3923

558 +#: apply.c:3924

559 #, c-format

560 msgid "%s: already exists in index"

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

562

563 -#: apply.c:3926

563 +#: apply.c:3927

564 #, c-format

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

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

567

568 -#: apply.c:3946

568 +#: apply.c:3947

569 #, c-format

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

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

572

573 -#: apply.c:3951

573 +#: apply.c:3952

574 #, c-format

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

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

577

578 -#: apply.c:3971

578 +#: apply.c:3972

579 #, c-format

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

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

582

583 -#: apply.c:3975

583 +#: apply.c:3976

584 #, c-format

585 msgid "%s: patch does not apply"

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

587

588 -#: apply.c:3990

588 +#: apply.c:3991

589 #, c-format

590 msgid "Checking patch %s..."

591 msgstr "正在检查补丁 %s..."

592

593 -#: apply.c:4082

593 +#: apply.c:4083

594 #, c-format

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

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

597

598 -#: apply.c:4089

598 +#: apply.c:4090

599 #, c-format

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

601 msgstr "%s 的模式变更，但它不在当前 HEAD 中"

602

603 -#: apply.c:4092

603 +#: apply.c:4093

604 #, c-format

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

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

607

608 -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143

608 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143

609 #, c-format

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

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

612

613 -#: apply.c:4101

613 +#: apply.c:4102

614 #, c-format

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

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

617

618 -#: apply.c:4111

618 +#: apply.c:4112

619 #, c-format

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

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

622

623 -#: apply.c:4249

623 +#: apply.c:4250

624 #, c-format

625 msgid "unable to remove %s from index"

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

627

628 -#: apply.c:4283

628 +#: apply.c:4284

629 #, c-format

630 msgid "corrupt patch for submodule %s"

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

632

633 -#: apply.c:4289

633 +#: apply.c:4290

634 #, c-format

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

636 msgstr "不能对新建文件 '%s' 调用 stat"

637

638 -#: apply.c:4297

638 +#: apply.c:4298

639 #, c-format

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

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

642

643 -#: apply.c:4303 apply.c:4448

643 +#: apply.c:4304 apply.c:4449

644 #, c-format

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

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

647

648 -#: apply.c:4346

648 +#: apply.c:4347

649 #, c-format

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

651 msgstr "写入 '%s' 失败"

652

653 -#: apply.c:4350

653 +#: apply.c:4351

654 #, c-format

655 msgid "closing file '%s'"

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

657

658 -#: apply.c:4420

658 +#: apply.c:4421

659 #, c-format

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

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

662

663 -#: apply.c:4518

663 +#: apply.c:4519

664 #, c-format

665 msgid "Applied patch %s cleanly."

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

667

668 -#: apply.c:4526

668 +#: apply.c:4527

669 msgid "internal error"

670 msgstr "内部错误"

671

672 -#: apply.c:4529

672 +#: apply.c:4530

673 #, c-format

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

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

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

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

678

679 -#: apply.c:4540

679 +#: apply.c:4541

680 #, c-format

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

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

683

684 -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168

684 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194

685 #, c-format

686 msgid "cannot open %s"

687 msgstr "不能打开 %s"

688

689 -#: apply.c:4562

689 +#: apply.c:4563

690 #, c-format

691 msgid "Hunk #%d applied cleanly."

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

693

694 -#: apply.c:4566

694 +#: apply.c:4567

695 #, c-format

696 msgid "Rejected hunk #%d."

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

698

699 -#: apply.c:4676

699 +#: apply.c:4686

700 #, c-format

701 msgid "Skipped patch '%s'."

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

703

704 -#: apply.c:4684

704 +#: apply.c:4694

705 msgid "unrecognized input"

706 msgstr "未能识别的输入"

707

708 -#: apply.c:4704

708 +#: apply.c:4714

709 msgid "unable to read index file"

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

711

712 -#: apply.c:4859

712 +#: apply.c:4871

713 #, c-format

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

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

716

717 -#: apply.c:4886

717 +#: apply.c:4898

718 #, c-format

719 msgid "squelched %d whitespace error"

720 msgid_plural "squelched %d whitespace errors"

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

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

723

724 -#: apply.c:4892 apply.c:4907

724 +#: apply.c:4904 apply.c:4919

725 #, c-format

726 msgid "%d line adds whitespace errors."

727 msgid_plural "%d lines add whitespace errors."

728 msgstr[0] "%d 行新增了空白字符误用。"

729 msgstr[1] "%d 行新增了空白字符误用。"

730

731 -#: apply.c:4900

731 +#: apply.c:4912

732 #, c-format

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

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

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

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

737

738 -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

738 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

739 msgid "Unable to write new index file"

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

741

742 -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211

743 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273

744 -#: builtin/pull.c:208 builtin/submodule--helper.c:407

742 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200

743 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273

744 +#: builtin/pull.c:209 builtin/submodule--helper.c:407

745 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

746 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

747 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

748 msgid "path"

749 msgstr "路径"

750

751 -#: apply.c:4944

751 +#: apply.c:4956

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

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

754

755 -#: apply.c:4947

755 +#: apply.c:4959

756 msgid "apply changes matching the given path"

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

758

759 -#: apply.c:4949 builtin/am.c:2217

759 +#: apply.c:4961 builtin/am.c:2206

760 msgid "num"

761 msgstr "数字"

762

763 -#: apply.c:4950

763 +#: apply.c:4962

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

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

766

767 -#: apply.c:4953

767 +#: apply.c:4965

768 msgid "ignore additions made by the patch"

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

770

771 -#: apply.c:4955

771 +#: apply.c:4967

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

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

774

775 -#: apply.c:4959

775 +#: apply.c:4971

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

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

778

779 -#: apply.c:4961

779 +#: apply.c:4973

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

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

782

783 -#: apply.c:4963

783 +#: apply.c:4975

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

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

786

787 -#: apply.c:4965

787 +#: apply.c:4977

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

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

790

791 -#: apply.c:4967

791 +#: apply.c:4979

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

793 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"

794

795 -#: apply.c:4969

795 +#: apply.c:4981

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

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

798

799 -#: apply.c:4971

799 +#: apply.c:4983

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

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

802

803 -#: apply.c:4974

803 +#: apply.c:4986

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

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

806

807 -#: apply.c:4976

807 +#: apply.c:4988

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

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

810

811 -#: apply.c:4978

811 +#: apply.c:4990

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

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

814

815 -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524

815 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524

816 msgid "paths are separated with NUL character"

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

818

819 -#: apply.c:4983

819 +#: apply.c:4995

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

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

822

823 -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98

823 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98

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

825 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421

825 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445

826 msgid "action"

827 msgstr "动作"

828

829 -#: apply.c:4985

829 +#: apply.c:4997

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

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

832

833 -#: apply.c:4988 apply.c:4991

833 +#: apply.c:5000 apply.c:5003

834 msgid "ignore changes in whitespace when finding context"

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

836

837 -#: apply.c:4994

837 +#: apply.c:5006

838 msgid "apply the patch in reverse"

839 msgstr "反向应用补丁"

840

841 -#: apply.c:4996

841 +#: apply.c:5008

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

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

844

845 -#: apply.c:4998

845 +#: apply.c:5010

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

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

848

849 -#: apply.c:5000

849 +#: apply.c:5012

850 msgid "allow overlapping hunks"

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

852

853 -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22

853 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22

854 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

855 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128

855 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128

856 msgid "be verbose"

857 msgstr "冗长输出"

858

859 -#: apply.c:5003

859 +#: apply.c:5015

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

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

862

863 -#: apply.c:5006

863 +#: apply.c:5018

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

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

866

867 -#: apply.c:5008 builtin/am.c:2205

867 +#: apply.c:5020 builtin/am.c:2194

868 msgid "root"

869 msgstr "根目录"

870

871 -#: apply.c:5009

871 +#: apply.c:5021

872 msgid "prepend <root> to all filenames"

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

874

@@ -922,7 +922,7 @@ msgstr "格式"

922 msgid "archive format"

923 msgstr "归档格式"

924

925 -#: archive.c:458 builtin/log.c:1580

925 +#: archive.c:458 builtin/log.c:1581

926 msgid "prefix"

927 msgstr "前缀"

928

@@ -930,11 +930,12 @@ msgstr "前缀"

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

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

932

933 -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875

934 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134

935 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105

936 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

937 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

933 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874

934 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

935 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

936 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

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

938 +#: parse-options.h:186

939 msgid "file"

940 msgstr "文件"

941

@@ -966,7 +967,7 @@ msgstr "压缩效果更好"

967 msgid "list supported archive formats"

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

969

969 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

970 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

971 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

972 msgid "repo"

973 msgstr "仓库"

@@ -975,7 +976,7 @@ msgstr "仓库"

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

977 msgstr "从远程仓库（<仓库>）提取归档文件"

978

978 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707

979 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

980 #: builtin/notes.c:498

981 msgid "command"

982 msgstr "命令"

@@ -1011,26 +1012,26 @@ msgstr "参数不支持此格式 '%s'：-%d"

1012 msgid "cannot stream blob %s"

1013 msgstr "不能打开数据对象 %s"

1014

1014 -#: archive-tar.c:260 archive-zip.c:363

1015 +#: archive-tar.c:266 archive-zip.c:363

1016 #, c-format

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

1018 msgstr "不支持的文件模式：0%o (SHA1: %s)"

1019

1019 -#: archive-tar.c:287 archive-zip.c:353

1020 +#: archive-tar.c:293 archive-zip.c:353

1021 #, c-format

1022 msgid "cannot read %s"

1023 msgstr "不能读取 %s"

1024

1024 -#: archive-tar.c:459

1025 +#: archive-tar.c:465

1026 #, c-format

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

1028 msgstr "无法启动 '%s' 过滤器"

1029

1029 -#: archive-tar.c:462

1030 +#: archive-tar.c:468

1031 msgid "unable to redirect descriptor"

1032 msgstr "无法重定向描述符"

1033

1033 -#: archive-tar.c:469

1034 +#: archive-tar.c:475

1035 #, c-format

1036 msgid "'%s' filter reported error"

1037 msgstr "'%s' 过滤器报告了错误"

@@ -1055,17 +1056,17 @@ msgstr "压缩错误 (%d)"

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

1057 msgstr "对于本系统时间戳太大：%<PRIuMAX>"

1058

1058 -#: attr.c:211

1059 +#: attr.c:213

1060 #, c-format

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

1062 msgstr "%.*s 不是一个有效的属性名"

1063

1063 -#: attr.c:368

1064 +#: attr.c:370

1065 #, c-format

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

1067 msgstr "不允许 %s：%s:%d"

1068

1068 -#: attr.c:408

1069 +#: attr.c:410

1070 msgid ""

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

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

@@ -1192,37 +1193,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1193 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1194 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1195

1195 -#: blame.c:2697

1196 +#: blame.c:2700

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

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

1199

1199 -#: blame.c:2711

1200 +#: blame.c:2714

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

1202 msgstr "不能将 --contents 和最终的提交对象名共用"

1203

1203 -#: blame.c:2732

1204 +#: blame.c:2735

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

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

1207

1207 -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033

1208 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963

1209 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411

1210 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163

1208 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971

1209 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964

1210 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1211 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1212 #: builtin/shortlog.c:192

1213 msgid "revision walk setup failed"

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

1215

1215 -#: blame.c:2759

1216 +#: blame.c:2762

1217 msgid ""

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

1219 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"

1220

1220 -#: blame.c:2770

1221 +#: blame.c:2773

1222 #, c-format

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

1224 msgstr "在 %2$s 中无此路径 %1$s"

1225

1225 -#: blame.c:2781

1226 +#: blame.c:2784

1227 #, c-format

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

1229 msgstr "不能为路径 %2$s 读取数据对象 %1$s"

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

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

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

1373

1373 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024

1374 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962

1375 #: builtin/commit.c:791

1376 #, c-format

1377 msgid "could not open '%s'"

@@ -1423,7 +1424,7 @@ msgstr "rev-list 终止"

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

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

1426

1426 -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306

1427 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306

1428 #, c-format

1429 msgid "unrecognized argument: %s"

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

@@ -1446,8 +1447,8 @@ msgstr "index-pack 终止"

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

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

1449

1449 -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399

1450 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455

1450 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398

1451 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1452 #, c-format

1453 msgid "could not parse %s"

1454 msgstr "不能解析 %s"

@@ -1477,27 +1478,27 @@ msgstr ""

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

1479 "可关闭本消息"

1480

1480 -#: commit.c:1127

1481 +#: commit.c:1128

1482 #, c-format

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

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

1485

1485 -#: commit.c:1130

1486 +#: commit.c:1131

1487 #, c-format

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

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

1490

1490 -#: commit.c:1133

1491 +#: commit.c:1134

1492 #, c-format

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

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

1495

1495 -#: commit.c:1136

1496 +#: commit.c:1137

1497 #, c-format

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

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

1500

1500 -#: commit.c:1390

1501 +#: commit.c:1391

1502 msgid ""

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

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

@@ -1557,193 +1558,208 @@ msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"

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

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

1560

1560 -#: commit-graph.c:554 commit-graph.c:614

1561 +#: commit-graph.c:561 commit-graph.c:621

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

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

1564

1564 -#: commit-graph.c:575

1565 +#: commit-graph.c:582

1566 #, c-format

1567 msgid "could not find commit %s"

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

1569

1569 -#: commit-graph.c:1002 builtin/pack-objects.c:2657

1570 +#: commit-graph.c:855 builtin/am.c:1287

1571 +#, c-format

1572 +msgid "unable to parse commit %s"

1573 +msgstr "不能解析提交 %s"

1574 +

1575 +#: commit-graph.c:859

1576 +#, c-format

1577 +msgid "unable to get tree for %s"

1578 +msgstr "无法得到 %s 的树对象"

1579 +

1580 +#: commit-graph.c:1017 builtin/pack-objects.c:2641

1581 #, c-format

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

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

1584

1574 -#: commit-graph.c:1034

1585 +#: commit-graph.c:1049

1586 msgid "Loading known commits in commit graph"

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

1588

1578 -#: commit-graph.c:1051

1589 +#: commit-graph.c:1066

1590 msgid "Expanding reachable commits in commit graph"

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

1592

1582 -#: commit-graph.c:1070

1593 +#: commit-graph.c:1085

1594 msgid "Clearing commit marks in commit graph"

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

1596

1586 -#: commit-graph.c:1089

1597 +#: commit-graph.c:1104

1598 msgid "Computing commit graph generation numbers"

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

1600

1590 -#: commit-graph.c:1163

1601 +#: commit-graph.c:1179

1602 #, c-format

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

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

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

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

1607

1597 -#: commit-graph.c:1176

1608 +#: commit-graph.c:1192

1609 #, c-format

1610 msgid "error adding pack %s"

1611 msgstr "添加包 %s 出错"

1612

1602 -#: commit-graph.c:1180

1613 +#: commit-graph.c:1196

1614 #, c-format

1615 msgid "error opening index for %s"

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

1617

1607 -#: commit-graph.c:1204

1618 +#: commit-graph.c:1220

1619 #, c-format

1620 msgid "Finding commits for commit graph from %d ref"

1621 msgid_plural "Finding commits for commit graph from %d refs"

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

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

1624

1614 -#: commit-graph.c:1238

1625 +#: commit-graph.c:1240

1626 +#, c-format

1627 +msgid "invalid commit object id: %s"

1628 +msgstr "无效的提交对象 ID：%s"

1629 +

1630 +#: commit-graph.c:1255

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

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

1633

1618 -#: commit-graph.c:1253

1634 +#: commit-graph.c:1270

1635 msgid "Counting distinct commits in commit graph"

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

1637

1622 -#: commit-graph.c:1284

1638 +#: commit-graph.c:1300

1639 msgid "Finding extra edges in commit graph"

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

1641

1626 -#: commit-graph.c:1332

1642 +#: commit-graph.c:1346

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

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

1645

1630 -#: commit-graph.c:1365 midx.c:811

1646 +#: commit-graph.c:1379 midx.c:810

1647 #, c-format

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

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

1650

1635 -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240

1651 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241

1652 #, c-format

1653 msgid "unable to create '%s'"

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

1655

1640 -#: commit-graph.c:1437

1656 +#: commit-graph.c:1451

1657 #, c-format

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

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

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

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

1662

1647 -#: commit-graph.c:1478

1663 +#: commit-graph.c:1492

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

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

1666

1651 -#: commit-graph.c:1490

1667 +#: commit-graph.c:1504

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

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

1670

1655 -#: commit-graph.c:1510

1671 +#: commit-graph.c:1524

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

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

1674

1659 -#: commit-graph.c:1621

1675 +#: commit-graph.c:1635

1676 msgid "Scanning merged commits"

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

1678

1663 -#: commit-graph.c:1632

1679 +#: commit-graph.c:1646

1680 #, c-format

1681 msgid "unexpected duplicate commit id %s"

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

1683

1668 -#: commit-graph.c:1657

1684 +#: commit-graph.c:1670

1685 msgid "Merging commit-graph"

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

1687

1672 -#: commit-graph.c:1844

1688 +#: commit-graph.c:1860

1689 #, c-format

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

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

1692

1677 -#: commit-graph.c:1855

1693 +#: commit-graph.c:1871

1694 msgid "too many commits to write graph"

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

1696

1681 -#: commit-graph.c:1945

1697 +#: commit-graph.c:1961

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

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

1700

1685 -#: commit-graph.c:1955

1701 +#: commit-graph.c:1971

1702 #, c-format

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

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

1705

1690 -#: commit-graph.c:1965 commit-graph.c:1980

1706 +#: commit-graph.c:1981 commit-graph.c:1996

1707 #, c-format

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

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

1710

1695 -#: commit-graph.c:1972

1711 +#: commit-graph.c:1988

1712 #, c-format

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

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

1715

1700 -#: commit-graph.c:1989

1716 +#: commit-graph.c:2006

1717 msgid "Verifying commits in commit graph"

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

1719

1704 -#: commit-graph.c:2002

1720 +#: commit-graph.c:2020

1721 #, c-format

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

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

1724

1709 -#: commit-graph.c:2009

1725 +#: commit-graph.c:2027

1726 #, c-format

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

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

1729

1714 -#: commit-graph.c:2019

1730 +#: commit-graph.c:2037

1731 #, c-format

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

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

1734

1719 -#: commit-graph.c:2028

1735 +#: commit-graph.c:2046

1736 #, c-format

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

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

1739

1724 -#: commit-graph.c:2041

1740 +#: commit-graph.c:2059

1741 #, c-format

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

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

1744

1729 -#: commit-graph.c:2046

1745 +#: commit-graph.c:2064

1746 #, c-format

1747 msgid ""

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

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

1750

1735 -#: commit-graph.c:2050

1751 +#: commit-graph.c:2068

1752 #, c-format

1753 msgid ""

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

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

1756

1741 -#: commit-graph.c:2065

1757 +#: commit-graph.c:2083

1758 #, c-format

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

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

1761

1746 -#: commit-graph.c:2071

1762 +#: commit-graph.c:2089

1763 #, c-format

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

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

@@ -1790,7 +1806,7 @@ msgstr "键名没有包含一个小节名称：%s"

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

1807 msgstr "键名没有包含变量名：%s"

1808

1793 -#: config.c:406 sequencer.c:2463

1809 +#: config.c:406 sequencer.c:2401

1810 #, c-format

1811 msgid "invalid key: %s"

1812 msgstr "无效键名：%s"

@@ -1912,149 +1928,144 @@ msgstr "core.commentChar 应该是一个字符"

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

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

1930

1915 -#: config.c:1430

1931 +#: config.c:1425

1932 #, c-format

1933 msgid "malformed value for %s"

1934 msgstr "%s 的取值格式错误"

1935

1920 -#: config.c:1456

1936 +#: config.c:1451

1937 #, c-format

1938 msgid "malformed value for %s: %s"

1939 msgstr "%s 的取值格式错误：%s"

1940

1925 -#: config.c:1457

1941 +#: config.c:1452

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

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

1944

1929 -#: config.c:1518 builtin/pack-objects.c:3410

1945 +#: config.c:1513 builtin/pack-objects.c:3394

1946 #, c-format

1947 msgid "bad pack compression level %d"

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

1949

1934 -#: config.c:1639

1950 +#: config.c:1634

1951 #, c-format

1952 msgid "unable to load config blob object '%s'"

1953 msgstr "无法从数据对象 '%s' 加载配置"

1954

1939 -#: config.c:1642

1955 +#: config.c:1637

1956 #, c-format

1957 msgid "reference '%s' does not point to a blob"

1958 msgstr "引用 '%s' 没有指向一个数据对象"

1959

1944 -#: config.c:1659

1960 +#: config.c:1654

1961 #, c-format

1962 msgid "unable to resolve config blob '%s'"

1963 msgstr "不能解析配置对象 '%s'"

1964

1949 -#: config.c:1689

1965 +#: config.c:1684

1966 #, c-format

1967 msgid "failed to parse %s"

1968 msgstr "解析 %s 失败"

1969

1954 -#: config.c:1745

1970 +#: config.c:1740

1971 msgid "unable to parse command-line config"

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

1973

1958 -#: config.c:2094

1974 +#: config.c:2091

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

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

1977

1962 -#: config.c:2264

1978 +#: config.c:2261

1979 #, c-format

1980 msgid "Invalid %s: '%s'"

1981 msgstr "无效 %s：'%s'"

1982

1967 -#: config.c:2307

1968 -#, c-format

1969 -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1970 -msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"

1971 -

1972 -#: config.c:2333

1983 +#: config.c:2306

1984 #, c-format

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

1986 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

1987

1977 -#: config.c:2379

1988 +#: config.c:2352

1989 #, c-format

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

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

1992

1982 -#: config.c:2381

1993 +#: config.c:2354

1994 #, c-format

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

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

1997

1987 -#: config.c:2462

1998 +#: config.c:2435

1999 #, c-format

2000 msgid "invalid section name '%s'"

2001 msgstr "无效的小节名称 '%s'"

2002

1992 -#: config.c:2494

2003 +#: config.c:2467

2004 #, c-format

2005 msgid "%s has multiple values"

2006 msgstr "%s 有多个取值"

2007

1997 -#: config.c:2523

2008 +#: config.c:2496

2009 #, c-format

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

2011 msgstr "写入新的配置文件 %s 失败"

2012

2002 -#: config.c:2775 config.c:3099

2013 +#: config.c:2748 config.c:3072

2014 #, c-format

2015 msgid "could not lock config file %s"

2016 msgstr "不能锁定配置文件 %s"

2017

2007 -#: config.c:2786

2018 +#: config.c:2759

2019 #, c-format

2020 msgid "opening %s"

2021 msgstr "打开 %s"

2022

2012 -#: config.c:2821 builtin/config.c:328

2023 +#: config.c:2794 builtin/config.c:328

2024 #, c-format

2025 msgid "invalid pattern: %s"

2026 msgstr "无效模式：%s"

2027

2017 -#: config.c:2846

2028 +#: config.c:2819

2029 #, c-format

2030 msgid "invalid config file %s"

2031 msgstr "无效的配置文件 %s"

2032

2022 -#: config.c:2859 config.c:3112

2033 +#: config.c:2832 config.c:3085

2034 #, c-format

2035 msgid "fstat on %s failed"

2036 msgstr "对 %s 调用 fstat 失败"

2037

2027 -#: config.c:2870

2038 +#: config.c:2843

2039 #, c-format

2040 msgid "unable to mmap '%s'"

2041 msgstr "不能 mmap '%s'"

2042

2032 -#: config.c:2879 config.c:3117

2043 +#: config.c:2852 config.c:3090

2044 #, c-format

2045 msgid "chmod on %s failed"

2046 msgstr "对 %s 调用 chmod 失败"

2047

2037 -#: config.c:2964 config.c:3214

2048 +#: config.c:2937 config.c:3187

2049 #, c-format

2050 msgid "could not write config file %s"

2051 msgstr "不能写入配置文件 %s"

2052

2042 -#: config.c:2998

2053 +#: config.c:2971

2054 #, c-format

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

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

2057

2047 -#: config.c:3000 builtin/remote.c:782

2058 +#: config.c:2973 builtin/remote.c:782

2059 #, c-format

2060 msgid "could not unset '%s'"

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

2062

2052 -#: config.c:3090

2063 +#: config.c:3063

2064 #, c-format

2065 msgid "invalid section name: %s"

2066 msgstr "无效的小节名称：%s"

2067

2057 -#: config.c:3257

2068 +#: config.c:3230

2069 #, c-format

2070 msgid "missing value for '%s'"

2071 msgstr "%s 的取值缺失"

@@ -2177,7 +2188,7 @@ msgstr "无法查找 %s（%s）"

2188 msgid "unknown port %s"

2189 msgstr "未知端口 %s"

2190

2180 -#: connect.c:845 connect.c:1171

2191 +#: connect.c:845 connect.c:1175

2192 #, c-format

2193 msgid "strange hostname '%s' blocked"

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

@@ -2192,58 +2203,58 @@ msgstr "已阻止奇怪的端口号 '%s'"

2203 msgid "cannot start proxy %s"

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

2205

2195 -#: connect.c:924

2206 +#: connect.c:928

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

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

2209

2199 -#: connect.c:1119

2210 +#: connect.c:1123

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

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

2213

2203 -#: connect.c:1131

2214 +#: connect.c:1135

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

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

2217

2207 -#: connect.c:1148

2218 +#: connect.c:1152

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

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

2221

2211 -#: connect.c:1260

2222 +#: connect.c:1264

2223 #, c-format

2224 msgid "strange pathname '%s' blocked"

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

2226

2216 -#: connect.c:1307

2227 +#: connect.c:1311

2228 msgid "unable to fork"

2229 msgstr "无法 fork"

2230

2220 -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43

2231 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43

2232 msgid "Checking connectivity"

2233 msgstr "正在检查连通性"

2234

2224 -#: connected.c:98

2235 +#: connected.c:100

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

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

2238

2228 -#: connected.c:118

2239 +#: connected.c:120

2240 msgid "failed write to rev-list"

2241 msgstr "写入 rev-list 失败"

2242

2232 -#: connected.c:125

2243 +#: connected.c:127

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

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

2246

2236 -#: convert.c:193

2247 +#: convert.c:194

2248 #, c-format

2249 msgid "illegal crlf_action %d"

2250 msgstr "非法的 crlf 动作 %d"

2251

2241 -#: convert.c:206

2252 +#: convert.c:207

2253 #, c-format

2254 msgid "CRLF would be replaced by LF in %s"

2255 msgstr "%s 中的 CRLF 将被 LF 替换"

2256

2246 -#: convert.c:208

2257 +#: convert.c:209

2258 #, c-format

2259 msgid ""

2260 "CRLF will be replaced by LF in %s.\n"

@@ -2252,12 +2263,12 @@ msgstr ""

2263 "%s 中的 CRLF 将被 LF 替换。<\n"

2264 "在工作区中该文件仍保持原有的换行符。"

2265

2255 -#: convert.c:216

2266 +#: convert.c:217

2267 #, c-format

2268 msgid "LF would be replaced by CRLF in %s"

2269 msgstr "文件 %s 中的 LF 将被 CRLF 替换"

2270

2260 -#: convert.c:218

2271 +#: convert.c:219

2272 #, c-format

2273 msgid ""

2274 "LF will be replaced by CRLF in %s.\n"

@@ -2266,24 +2277,24 @@ msgstr ""

2277 "%s 中的 LF 将被 CRLF 替换。\n"

2278 "在工作区中该文件仍保持原有的换行符"

2279

2269 -#: convert.c:279

2280 +#: convert.c:280

2281 #, c-format

2282 msgid "BOM is prohibited in '%s' if encoded as %s"

2283 msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"

2284

2274 -#: convert.c:286

2285 +#: convert.c:287

2286 #, c-format

2287 msgid ""

2288 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

2289 "tree-encoding."

2290 msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。"

2291

2281 -#: convert.c:304

2292 +#: convert.c:305

2293 #, c-format

2294 msgid "BOM is required in '%s' if encoded as %s"

2295 msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"

2296

2286 -#: convert.c:306

2297 +#: convert.c:307

2298 #, c-format

2299 msgid ""

2300 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

@@ -2292,117 +2303,117 @@ msgstr ""

2303 "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"

2304 "节序）作为工作区编码。"

2305

2295 -#: convert.c:424 convert.c:495

2306 +#: convert.c:425 convert.c:496

2307 #, c-format

2308 msgid "failed to encode '%s' from %s to %s"

2309 msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"

2310

2300 -#: convert.c:467

2311 +#: convert.c:468

2312 #, c-format

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

2314 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"

2315

2305 -#: convert.c:673

2316 +#: convert.c:674

2317 #, c-format

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

2319 msgstr "不能 fork 以执行外部过滤器 '%s'"

2320

2310 -#: convert.c:693

2321 +#: convert.c:694

2322 #, c-format

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

2324 msgstr "不能将输入传递给外部过滤器 '%s'"

2325

2315 -#: convert.c:700

2326 +#: convert.c:701

2327 #, c-format

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

2329 msgstr "外部过滤器 '%s' 失败码 %d"

2330

2320 -#: convert.c:735 convert.c:738

2331 +#: convert.c:736 convert.c:739

2332 #, c-format

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

2334 msgstr "从外部过滤器 '%s' 读取失败"

2335

2325 -#: convert.c:741 convert.c:796

2336 +#: convert.c:742 convert.c:797

2337 #, c-format

2338 msgid "external filter '%s' failed"

2339 msgstr "外部过滤器 '%s' 失败"

2340

2330 -#: convert.c:844

2341 +#: convert.c:845

2342 msgid "unexpected filter type"

2343 msgstr "意外的过滤类型"

2344

2334 -#: convert.c:855

2345 +#: convert.c:856

2346 msgid "path name too long for external filter"

2347 msgstr "外部过滤器的路径名太长"

2348

2338 -#: convert.c:929

2349 +#: convert.c:930

2350 #, c-format

2351 msgid ""

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

2353 "been filtered"

2354 msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"

2355

2345 -#: convert.c:1228

2356 +#: convert.c:1229

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

2358 msgstr "true/false 不是有效的工作区编码"

2359

2349 -#: convert.c:1398 convert.c:1432

2360 +#: convert.c:1417 convert.c:1451

2361 #, c-format

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

2363 msgstr "%s：clean 过滤器 '%s' 失败"

2364

2354 -#: convert.c:1476

2365 +#: convert.c:1495

2366 #, c-format

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

2368 msgstr "%s：smudge 过滤器 %s 失败"

2369

2359 -#: date.c:137

2370 +#: date.c:138

2371 msgid "in the future"

2372 msgstr "在将来"

2373

2363 -#: date.c:143

2374 +#: date.c:144

2375 #, c-format

2376 msgid "%<PRIuMAX> second ago"

2377 msgid_plural "%<PRIuMAX> seconds ago"

2378 msgstr[0] "%<PRIuMAX> 秒钟前"

2379 msgstr[1] "%<PRIuMAX> 秒钟前"

2380

2370 -#: date.c:150

2381 +#: date.c:151

2382 #, c-format

2383 msgid "%<PRIuMAX> minute ago"

2384 msgid_plural "%<PRIuMAX> minutes ago"

2385 msgstr[0] "%<PRIuMAX> 分钟前"

2386 msgstr[1] "%<PRIuMAX> 分钟前"

2387

2377 -#: date.c:157

2388 +#: date.c:158

2389 #, c-format

2390 msgid "%<PRIuMAX> hour ago"

2391 msgid_plural "%<PRIuMAX> hours ago"

2392 msgstr[0] "%<PRIuMAX> 小时前"

2393 msgstr[1] "%<PRIuMAX> 小时前"

2394

2384 -#: date.c:164

2395 +#: date.c:165

2396 #, c-format

2397 msgid "%<PRIuMAX> day ago"

2398 msgid_plural "%<PRIuMAX> days ago"

2399 msgstr[0] "%<PRIuMAX> 天前"

2400 msgstr[1] "%<PRIuMAX> 天前"

2401

2391 -#: date.c:170

2402 +#: date.c:171

2403 #, c-format

2404 msgid "%<PRIuMAX> week ago"

2405 msgid_plural "%<PRIuMAX> weeks ago"

2406 msgstr[0] "%<PRIuMAX> 周前"

2407 msgstr[1] "%<PRIuMAX> 周前"

2408

2398 -#: date.c:177

2409 +#: date.c:178

2410 #, c-format

2411 msgid "%<PRIuMAX> month ago"

2412 msgid_plural "%<PRIuMAX> months ago"

2413 msgstr[0] "%<PRIuMAX> 个月前"

2414 msgstr[1] "%<PRIuMAX> 个月前"

2415

2405 -#: date.c:188

2416 +#: date.c:189

2417 #, c-format

2418 msgid "%<PRIuMAX> year"

2419 msgid_plural "%<PRIuMAX> years"

@@ -2410,14 +2421,14 @@ msgstr[0] "%<PRIuMAX> 年"

2421 msgstr[1] "%<PRIuMAX> 年"

2422

2423 #. TRANSLATORS: "%s" is "<n> years"

2413 -#: date.c:191

2424 +#: date.c:192

2425 #, c-format

2426 msgid "%s, %<PRIuMAX> month ago"

2427 msgid_plural "%s, %<PRIuMAX> months ago"

2428 msgstr[0] "%s %<PRIuMAX> 个月前"

2429 msgstr[1] "%s %<PRIuMAX> 个月前"

2430

2420 -#: date.c:196 date.c:201

2431 +#: date.c:197 date.c:202

2432 #, c-format

2433 msgid "%<PRIuMAX> year ago"

2434 msgid_plural "%<PRIuMAX> years ago"

@@ -2453,7 +2464,7 @@ msgstr "已标记 %d 个数据岛，结束。\n"

2464 msgid "failed to read orderfile '%s'"

2465 msgstr "读取排序文件 '%s' 失败"

2466

2456 -#: diffcore-rename.c:544

2467 +#: diffcore-rename.c:543

2468 msgid "Performing inexact rename detection"

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

2470

@@ -2516,35 +2527,35 @@ msgstr ""

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

2528 "%s"

2529

2519 -#: diff.c:4215

2530 +#: diff.c:4218

2531 #, c-format

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

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

2534

2524 -#: diff.c:4560

2535 +#: diff.c:4563

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

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

2538

2528 -#: diff.c:4563

2539 +#: diff.c:4566

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

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

2542

2532 -#: diff.c:4641

2543 +#: diff.c:4644

2544 msgid "--follow requires exactly one pathspec"

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

2546

2536 -#: diff.c:4689

2547 +#: diff.c:4692

2548 #, c-format

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

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

2551

2541 -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222

2552 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225

2553 #: parse-options.c:199 parse-options.c:203

2554 #, c-format

2555 msgid "%s expects a numerical value"

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

2557

2547 -#: diff.c:4726

2558 +#: diff.c:4729

2559 #, c-format

2560 msgid ""

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

@@ -2553,195 +2564,195 @@ msgstr ""

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

2565 "%s"

2566

2556 -#: diff.c:4811

2567 +#: diff.c:4814

2568 #, c-format

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

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

2571

2561 -#: diff.c:4835

2572 +#: diff.c:4838

2573 #, c-format

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

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

2576

2566 -#: diff.c:4849

2577 +#: diff.c:4852

2578 #, c-format

2579 msgid "unable to resolve '%s'"

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

2581

2571 -#: diff.c:4899 diff.c:4905

2582 +#: diff.c:4902 diff.c:4908

2583 #, c-format

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

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

2586

2576 -#: diff.c:4917

2587 +#: diff.c:4920

2588 #, c-format

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

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

2591

2581 -#: diff.c:4938

2592 +#: diff.c:4941

2593 #, c-format

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

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

2596

2586 -#: diff.c:4957

2597 +#: diff.c:4960

2598 #, c-format

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

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

2601

2591 -#: diff.c:4997

2602 +#: diff.c:5000

2603 msgid ""

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

2605 "\"histogram\""

2606 msgstr ""

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

2608

2598 -#: diff.c:5033 diff.c:5053

2609 +#: diff.c:5036 diff.c:5056

2610 #, c-format

2611 msgid "invalid argument to %s"

2612 msgstr "%s 的参数无效"

2613

2603 -#: diff.c:5191

2614 +#: diff.c:5194

2615 #, c-format

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

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

2618

2608 -#: diff.c:5247

2619 +#: diff.c:5250

2620 #, c-format

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

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

2623

2613 -#: diff.c:5270

2624 +#: diff.c:5273

2625 msgid "Diff output format options"

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

2627

2617 -#: diff.c:5272 diff.c:5278

2628 +#: diff.c:5275 diff.c:5281

2629 msgid "generate patch"

2630 msgstr "生成补丁"

2631

2621 -#: diff.c:5275 builtin/log.c:172

2632 +#: diff.c:5278 builtin/log.c:172

2633 msgid "suppress diff output"

2634 msgstr "不显示差异输出"

2635

2625 -#: diff.c:5280 diff.c:5394 diff.c:5401

2636 +#: diff.c:5283 diff.c:5397 diff.c:5404

2637 msgid "<n>"

2638 msgstr "<n>"

2639

2629 -#: diff.c:5281 diff.c:5284

2640 +#: diff.c:5284 diff.c:5287

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

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

2643

2633 -#: diff.c:5286

2644 +#: diff.c:5289

2645 msgid "generate the diff in raw format"

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

2647

2637 -#: diff.c:5289

2648 +#: diff.c:5292

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

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

2651

2641 -#: diff.c:5293

2652 +#: diff.c:5296

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

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

2655

2645 -#: diff.c:5297

2656 +#: diff.c:5300

2657 msgid "machine friendly --stat"

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

2659

2649 -#: diff.c:5300

2660 +#: diff.c:5303

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

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

2663

2653 -#: diff.c:5302 diff.c:5310

2664 +#: diff.c:5305 diff.c:5313

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

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

2667

2657 -#: diff.c:5303

2668 +#: diff.c:5306

2669 msgid ""

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

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

2672

2662 -#: diff.c:5307

2673 +#: diff.c:5310

2674 msgid "synonym for --dirstat=cumulative"

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

2676

2666 -#: diff.c:5311

2677 +#: diff.c:5314

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

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

2680

2670 -#: diff.c:5315

2681 +#: diff.c:5318

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

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

2684

2674 -#: diff.c:5318

2685 +#: diff.c:5321

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

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

2688

2678 -#: diff.c:5321

2689 +#: diff.c:5324

2690 msgid "show only names of changed files"

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

2692

2682 -#: diff.c:5324

2693 +#: diff.c:5327

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

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

2696

2686 -#: diff.c:5326

2697 +#: diff.c:5329

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

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

2700

2690 -#: diff.c:5327

2701 +#: diff.c:5330

2702 msgid "generate diffstat"

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

2704

2694 -#: diff.c:5329 diff.c:5332 diff.c:5335

2705 +#: diff.c:5332 diff.c:5335 diff.c:5338

2706 msgid "<width>"

2707 msgstr "<宽度>"

2708

2698 -#: diff.c:5330

2709 +#: diff.c:5333

2710 msgid "generate diffstat with a given width"

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

2712

2702 -#: diff.c:5333

2713 +#: diff.c:5336

2714 msgid "generate diffstat with a given name width"

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

2716

2706 -#: diff.c:5336

2717 +#: diff.c:5339

2718 msgid "generate diffstat with a given graph width"

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

2720

2710 -#: diff.c:5338

2721 +#: diff.c:5341

2722 msgid "<count>"

2723 msgstr "<次数>"

2724

2714 -#: diff.c:5339

2725 +#: diff.c:5342

2726 msgid "generate diffstat with limited lines"

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

2728

2718 -#: diff.c:5342

2729 +#: diff.c:5345

2730 msgid "generate compact summary in diffstat"

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

2732

2722 -#: diff.c:5345

2733 +#: diff.c:5348

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

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

2736

2726 -#: diff.c:5348

2737 +#: diff.c:5351

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

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

2740

2730 -#: diff.c:5350

2741 +#: diff.c:5353

2742 msgid "show colored diff"

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

2744

2734 -#: diff.c:5351

2745 +#: diff.c:5354

2746 msgid "<kind>"

2747 msgstr "<类型>"

2748

2738 -#: diff.c:5352

2749 +#: diff.c:5355

2750 msgid ""

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

2752 "diff"

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

2754

2744 -#: diff.c:5355

2755 +#: diff.c:5358

2756 msgid ""

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

2758 "--numstat"

@@ -2749,334 +2760,334 @@ msgstr ""

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

2761 "符"

2762

2752 -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470

2763 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473

2764 msgid "<prefix>"

2765 msgstr "<前缀>"

2766

2756 -#: diff.c:5359

2767 +#: diff.c:5362

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

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

2770

2760 -#: diff.c:5362

2771 +#: diff.c:5365

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

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

2774

2764 -#: diff.c:5365

2775 +#: diff.c:5368

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

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

2778

2768 -#: diff.c:5368

2779 +#: diff.c:5371

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

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

2782

2772 -#: diff.c:5371

2783 +#: diff.c:5374

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

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

2786

2776 -#: diff.c:5375 diff.c:5380 diff.c:5385

2787 +#: diff.c:5378 diff.c:5383 diff.c:5388

2788 msgid "<char>"

2789 msgstr "<字符>"

2790

2780 -#: diff.c:5376

2791 +#: diff.c:5379

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

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

2794

2784 -#: diff.c:5381

2795 +#: diff.c:5384

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

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

2798

2788 -#: diff.c:5386

2799 +#: diff.c:5389

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

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

2802

2792 -#: diff.c:5389

2803 +#: diff.c:5392

2804 msgid "Diff rename options"

2805 msgstr "差异重命名选项"

2806

2796 -#: diff.c:5390

2807 +#: diff.c:5393

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

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

2810

2800 -#: diff.c:5391

2811 +#: diff.c:5394

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

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

2814

2804 -#: diff.c:5395

2815 +#: diff.c:5398

2816 msgid "detect renames"

2817 msgstr "检测重命名"

2818

2808 -#: diff.c:5399

2819 +#: diff.c:5402

2820 msgid "omit the preimage for deletes"

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

2822

2812 -#: diff.c:5402

2823 +#: diff.c:5405

2824 msgid "detect copies"

2825 msgstr "检测拷贝"

2826

2816 -#: diff.c:5406

2827 +#: diff.c:5409

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

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

2830

2820 -#: diff.c:5408

2831 +#: diff.c:5411

2832 msgid "disable rename detection"

2833 msgstr "禁用重命名探测"

2834

2824 -#: diff.c:5411

2835 +#: diff.c:5414

2836 msgid "use empty blobs as rename source"

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

2838

2828 -#: diff.c:5413

2839 +#: diff.c:5416

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

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

2842

2832 -#: diff.c:5416

2843 +#: diff.c:5419

2844 msgid ""

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

2846 "given limit"

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

2848

2838 -#: diff.c:5418

2849 +#: diff.c:5421

2850 msgid "Diff algorithm options"

2851 msgstr "差异算法选项"

2852

2842 -#: diff.c:5420

2853 +#: diff.c:5423

2854 msgid "produce the smallest possible diff"

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

2856

2846 -#: diff.c:5423

2857 +#: diff.c:5426

2858 msgid "ignore whitespace when comparing lines"

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

2860

2850 -#: diff.c:5426

2861 +#: diff.c:5429

2862 msgid "ignore changes in amount of whitespace"

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

2864

2854 -#: diff.c:5429

2865 +#: diff.c:5432

2866 msgid "ignore changes in whitespace at EOL"

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

2868

2858 -#: diff.c:5432

2869 +#: diff.c:5435

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

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

2872

2862 -#: diff.c:5435

2873 +#: diff.c:5438

2874 msgid "ignore changes whose lines are all blank"

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

2876

2866 -#: diff.c:5438

2877 +#: diff.c:5441

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

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

2880

2870 -#: diff.c:5441

2881 +#: diff.c:5444

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

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

2884

2874 -#: diff.c:5445

2885 +#: diff.c:5448

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

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

2888

2878 -#: diff.c:5447

2889 +#: diff.c:5450

2890 msgid "<algorithm>"

2891 msgstr "<算法>"

2892

2882 -#: diff.c:5448

2893 +#: diff.c:5451

2894 msgid "choose a diff algorithm"

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

2896

2886 -#: diff.c:5450

2897 +#: diff.c:5453

2898 msgid "<text>"

2899 msgstr "<文本>"

2900

2890 -#: diff.c:5451

2901 +#: diff.c:5454

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

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

2904

2894 -#: diff.c:5453 diff.c:5462 diff.c:5465

2905 +#: diff.c:5456 diff.c:5465 diff.c:5468

2906 msgid "<mode>"

2907 msgstr "<模式>"

2908

2898 -#: diff.c:5454

2909 +#: diff.c:5457

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

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

2912

2902 -#: diff.c:5456 diff.c:5459 diff.c:5504

2913 +#: diff.c:5459 diff.c:5462 diff.c:5507

2914 msgid "<regex>"

2915 msgstr "<正则>"

2916

2906 -#: diff.c:5457

2917 +#: diff.c:5460

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

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

2920

2910 -#: diff.c:5460

2921 +#: diff.c:5463

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

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

2924

2914 -#: diff.c:5463

2925 +#: diff.c:5466

2926 msgid "moved lines of code are colored differently"

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

2928

2918 -#: diff.c:5466

2929 +#: diff.c:5469

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

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

2932

2922 -#: diff.c:5469

2933 +#: diff.c:5472

2934 msgid "Other diff options"

2935 msgstr "其它差异选项"

2936

2926 -#: diff.c:5471

2937 +#: diff.c:5474

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

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

2940

2930 -#: diff.c:5475

2941 +#: diff.c:5478

2942 msgid "treat all files as text"

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

2944

2934 -#: diff.c:5477

2945 +#: diff.c:5480

2946 msgid "swap two inputs, reverse the diff"

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

2948

2938 -#: diff.c:5479

2949 +#: diff.c:5482

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

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

2952

2942 -#: diff.c:5481

2953 +#: diff.c:5484

2954 msgid "disable all output of the program"

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

2956

2946 -#: diff.c:5483

2957 +#: diff.c:5486

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

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

2960

2950 -#: diff.c:5485

2961 +#: diff.c:5488

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

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

2964

2954 -#: diff.c:5487

2965 +#: diff.c:5490

2966 msgid "<when>"

2967 msgstr "<何时>"

2968

2958 -#: diff.c:5488

2969 +#: diff.c:5491

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

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

2972

2962 -#: diff.c:5491

2973 +#: diff.c:5494

2974 msgid "<format>"

2975 msgstr "<格式>"

2976

2966 -#: diff.c:5492

2977 +#: diff.c:5495

2978 msgid "specify how differences in submodules are shown"

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

2980

2970 -#: diff.c:5496

2981 +#: diff.c:5499

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

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

2984

2974 -#: diff.c:5499

2985 +#: diff.c:5502

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

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

2988

2978 -#: diff.c:5501

2989 +#: diff.c:5504

2990 msgid "<string>"

2991 msgstr "<字符串>"

2992

2982 -#: diff.c:5502

2993 +#: diff.c:5505

2994 msgid ""

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

2996 "string"

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

2998

2988 -#: diff.c:5505

2999 +#: diff.c:5508

3000 msgid ""

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

3002 "regex"

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

3004

2994 -#: diff.c:5508

3005 +#: diff.c:5511

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

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

3008

2998 -#: diff.c:5511

3009 +#: diff.c:5514

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

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

3012

3002 -#: diff.c:5514

3013 +#: diff.c:5517

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

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

3016

3006 -#: diff.c:5515

3017 +#: diff.c:5518

3018 msgid "<object-id>"

3019 msgstr "<对象 ID>"

3020

3010 -#: diff.c:5516

3021 +#: diff.c:5519

3022 msgid ""

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

3024 "object"

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

3026

3016 -#: diff.c:5518

3027 +#: diff.c:5521

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

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

3030

3020 -#: diff.c:5519

3031 +#: diff.c:5522

3032 msgid "select files by diff type"

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

3034

3024 -#: diff.c:5521

3035 +#: diff.c:5524

3036 msgid "<file>"

3037 msgstr "<文件>"

3038

3028 -#: diff.c:5522

3039 +#: diff.c:5525

3040 msgid "Output to a specific file"

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

3042

3032 -#: diff.c:6177

3043 +#: diff.c:6180

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

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

3046

3036 -#: diff.c:6180

3047 +#: diff.c:6183

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

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

3050

3040 -#: diff.c:6183

3051 +#: diff.c:6186

3052 #, c-format

3053 msgid ""

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

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

3056

3046 -#: dir.c:537

3057 +#: dir.c:549

3058 #, c-format

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

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

3061

3051 -#: dir.c:926

3062 +#: dir.c:938

3063 #, c-format

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

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

3066

3056 -#: dir.c:1843

3067 +#: dir.c:1877

3068 #, c-format

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

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

3071

3061 -#: dir.c:2085

3072 +#: dir.c:2128

3073 msgid "failed to get kernel name and information"

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

3075

3065 -#: dir.c:2209

3076 +#: dir.c:2252

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

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

3079

3069 -#: dir.c:3013

3080 +#: dir.c:3056

3081 #, c-format

3082 msgid "index file corrupt in repo %s"

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

3084

3074 -#: dir.c:3058 dir.c:3063

3085 +#: dir.c:3101 dir.c:3106

3086 #, c-format

3087 msgid "could not create directories for %s"

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

3089

3079 -#: dir.c:3092

3090 +#: dir.c:3135

3091 #, c-format

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

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

@@ -3095,12 +3106,12 @@ msgstr "过滤内容"

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

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

3108

3098 -#: environment.c:150

3109 +#: environment.c:148

3110 #, c-format

3111 msgid "bad git namespace path \"%s\""

3112 msgstr "错误的 git 名字空间路径 \"%s\""

3113

3103 -#: environment.c:332

3114 +#: environment.c:330

3115 #, c-format

3116 msgid "could not set GIT_DIR to '%s'"

3117 msgstr "不能设置 GIT_DIR 为 '%s'"

@@ -3110,158 +3121,154 @@ msgstr "不能设置 GIT_DIR 为 '%s'"

3121 msgid "too many args to run %s"

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

3123

3113 -#: fetch-object.c:17

3114 -msgid "Remote with no URL"

3115 -msgstr "远程未设置 URL"

3116 -

3117 -#: fetch-pack.c:151

3124 +#: fetch-pack.c:150

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

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

3127

3121 -#: fetch-pack.c:154

3128 +#: fetch-pack.c:153

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

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

3131

3125 -#: fetch-pack.c:165

3132 +#: fetch-pack.c:164

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

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

3135

3129 -#: fetch-pack.c:185

3136 +#: fetch-pack.c:184

3137 #, c-format

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

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

3140

3134 -#: fetch-pack.c:196

3141 +#: fetch-pack.c:195

3142 msgid "unable to write to remote"

3143 msgstr "无法写到远程"

3144

3138 -#: fetch-pack.c:258

3145 +#: fetch-pack.c:257

3146 msgid "--stateless-rpc requires multi_ack_detailed"

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

3148

3142 -#: fetch-pack.c:360 fetch-pack.c:1284

3149 +#: fetch-pack.c:356 fetch-pack.c:1280

3150 #, c-format

3151 msgid "invalid shallow line: %s"

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

3153

3147 -#: fetch-pack.c:366 fetch-pack.c:1290

3154 +#: fetch-pack.c:362 fetch-pack.c:1286

3155 #, c-format

3156 msgid "invalid unshallow line: %s"

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

3158

3152 -#: fetch-pack.c:368 fetch-pack.c:1292

3159 +#: fetch-pack.c:364 fetch-pack.c:1288

3160 #, c-format

3161 msgid "object not found: %s"

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

3163

3157 -#: fetch-pack.c:371 fetch-pack.c:1295

3164 +#: fetch-pack.c:367 fetch-pack.c:1291

3165 #, c-format

3166 msgid "error in object: %s"

3167 msgstr "对象中出错：%s"

3168

3162 -#: fetch-pack.c:373 fetch-pack.c:1297

3169 +#: fetch-pack.c:369 fetch-pack.c:1293

3170 #, c-format

3171 msgid "no shallow found: %s"

3172 msgstr "未发现 shallow：%s"

3173

3167 -#: fetch-pack.c:376 fetch-pack.c:1301

3174 +#: fetch-pack.c:372 fetch-pack.c:1297

3175 #, c-format

3176 msgid "expected shallow/unshallow, got %s"

3177 msgstr "应为 shallow/unshallow，却得到 %s"

3178

3172 -#: fetch-pack.c:417

3179 +#: fetch-pack.c:414

3180 #, c-format

3181 msgid "got %s %d %s"

3182 msgstr "得到 %s %d %s"

3183

3177 -#: fetch-pack.c:434

3184 +#: fetch-pack.c:431

3185 #, c-format

3186 msgid "invalid commit %s"

3187 msgstr "无效提交 %s"

3188

3182 -#: fetch-pack.c:465

3189 +#: fetch-pack.c:462

3190 msgid "giving up"

3191 msgstr "放弃"

3192

3186 -#: fetch-pack.c:477 progress.c:277

3193 +#: fetch-pack.c:475 progress.c:312

3194 msgid "done"

3195 msgstr "完成"

3196

3190 -#: fetch-pack.c:489

3197 +#: fetch-pack.c:487

3198 #, c-format

3199 msgid "got %s (%d) %s"

3200 msgstr "得到 %s (%d) %s"

3201

3195 -#: fetch-pack.c:535

3202 +#: fetch-pack.c:533

3203 #, c-format

3204 msgid "Marking %s as complete"

3205 msgstr "标记 %s 为完成"

3206

3200 -#: fetch-pack.c:744

3207 +#: fetch-pack.c:742

3208 #, c-format

3209 msgid "already have %s (%s)"

3210 msgstr "已经有 %s（%s）"

3211

3205 -#: fetch-pack.c:783

3212 +#: fetch-pack.c:781

3213 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3214 msgstr "fetch-pack：无法派生 sideband 多路输出"

3215

3209 -#: fetch-pack.c:791

3216 +#: fetch-pack.c:789

3217 msgid "protocol error: bad pack header"

3218 msgstr "协议错误：坏的包头"

3219

3213 -#: fetch-pack.c:859

3220 +#: fetch-pack.c:857

3221 #, c-format

3222 msgid "fetch-pack: unable to fork off %s"

3223 msgstr "fetch-pack：无法派生进程 %s"

3224

3218 -#: fetch-pack.c:875

3225 +#: fetch-pack.c:873

3226 #, c-format

3227 msgid "%s failed"

3228 msgstr "%s 失败"

3229

3223 -#: fetch-pack.c:877

3230 +#: fetch-pack.c:875

3231 msgid "error in sideband demultiplexer"

3232 msgstr "sideband 多路输出出错"

3233

3227 -#: fetch-pack.c:908

3234 +#: fetch-pack.c:907

3235 #, c-format

3236 msgid "Server version is %.*s"

3237 msgstr "服务器版本 %.*s"

3238

3232 -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3233 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3234 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3235 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3239 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927

3240 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943

3241 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959

3242 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981

3243 #, c-format

3244 msgid "Server supports %s"

3245 msgstr "服务器支持 %s"

3246

3240 -#: fetch-pack.c:915

3247 +#: fetch-pack.c:914

3248 msgid "Server does not support shallow clients"

3249 msgstr "服务器不支持 shalllow 客户端"

3250

3244 -#: fetch-pack.c:975

3251 +#: fetch-pack.c:974

3252 msgid "Server does not support --shallow-since"

3253 msgstr "服务器不支持 --shallow-since"

3254

3248 -#: fetch-pack.c:980

3255 +#: fetch-pack.c:979

3256 msgid "Server does not support --shallow-exclude"

3257 msgstr "服务器不支持 --shallow-exclude"

3258

3252 -#: fetch-pack.c:984

3259 +#: fetch-pack.c:983

3260 msgid "Server does not support --deepen"

3261 msgstr "服务器不支持 --deepen"

3262

3256 -#: fetch-pack.c:1001

3263 +#: fetch-pack.c:1000

3264 msgid "no common commits"

3265 msgstr "没有共同的提交"

3266

3260 -#: fetch-pack.c:1013 fetch-pack.c:1462

3267 +#: fetch-pack.c:1012 fetch-pack.c:1468

3268 msgid "git fetch-pack: fetch failed."

3269 msgstr "git fetch-pack：获取失败。"

3270

3264 -#: fetch-pack.c:1151

3271 +#: fetch-pack.c:1150

3272 msgid "Server does not support shallow requests"

3273 msgstr "服务器不支持 shalllow 请求"

3274

@@ -3269,72 +3276,72 @@ msgstr "服务器不支持 shalllow 请求"

3276 msgid "Server supports filter"

3277 msgstr "服务器支持 filter"

3278

3272 -#: fetch-pack.c:1184

3279 +#: fetch-pack.c:1180

3280 msgid "unable to write request to remote"

3281 msgstr "无法将请求写到远程"

3282

3276 -#: fetch-pack.c:1202

3283 +#: fetch-pack.c:1198

3284 #, c-format

3285 msgid "error reading section header '%s'"

3286 msgstr "读取节标题 '%s' 出错"

3287

3281 -#: fetch-pack.c:1208

3288 +#: fetch-pack.c:1204

3289 #, c-format

3290 msgid "expected '%s', received '%s'"

3291 msgstr "预期 '%s'，得到 '%s'"

3292

3286 -#: fetch-pack.c:1247

3293 +#: fetch-pack.c:1243

3294 #, c-format

3295 msgid "unexpected acknowledgment line: '%s'"

3296 msgstr "意外的确认行：'%s'"

3297

3291 -#: fetch-pack.c:1252

3298 +#: fetch-pack.c:1248

3299 #, c-format

3300 msgid "error processing acks: %d"

3301 msgstr "处理 ack 出错：%d"

3302

3296 -#: fetch-pack.c:1262

3303 +#: fetch-pack.c:1258

3304 msgid "expected packfile to be sent after 'ready'"

3305 msgstr "预期在 'ready' 之后发送 packfile"

3306

3300 -#: fetch-pack.c:1264

3307 +#: fetch-pack.c:1260

3308 msgid "expected no other sections to be sent after no 'ready'"

3309 msgstr "在没有 'ready' 不应该发送其它小节"

3310

3304 -#: fetch-pack.c:1306

3311 +#: fetch-pack.c:1302

3312 #, c-format

3313 msgid "error processing shallow info: %d"

3314 msgstr "处理浅克隆信息出错：%d"

3315

3309 -#: fetch-pack.c:1353

3316 +#: fetch-pack.c:1349

3317 #, c-format

3318 msgid "expected wanted-ref, got '%s'"

3319 msgstr "预期 wanted-ref，得到 '%s'"

3320

3314 -#: fetch-pack.c:1358

3321 +#: fetch-pack.c:1354

3322 #, c-format

3323 msgid "unexpected wanted-ref: '%s'"

3324 msgstr "意外的 wanted-ref：'%s'"

3325

3319 -#: fetch-pack.c:1363

3326 +#: fetch-pack.c:1359

3327 #, c-format

3328 msgid "error processing wanted refs: %d"

3329 msgstr "处理要获取的引用出错：%d"

3330

3324 -#: fetch-pack.c:1689

3331 +#: fetch-pack.c:1693

3332 msgid "no matching remote head"

3333 msgstr "没有匹配的远程分支"

3334

3328 -#: fetch-pack.c:1712 builtin/clone.c:686

3335 +#: fetch-pack.c:1716 builtin/clone.c:685

3336 msgid "remote did not send all necessary objects"

3337 msgstr "远程没有发送所有必需的对象"

3338

3332 -#: fetch-pack.c:1739

3339 +#: fetch-pack.c:1743

3340 #, c-format

3341 msgid "no such remote ref %s"

3342 msgstr "没有这样的远程引用 %s"

3343

3337 -#: fetch-pack.c:1742

3344 +#: fetch-pack.c:1746

3345 #, c-format

3346 msgid "Server does not allow request for unadvertised object %s"

3347 msgstr "服务器不允许请求未公开的对象 %s"

@@ -3357,18 +3364,25 @@ msgstr "无法将分离式签名写入 '%s'"

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

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

3366

3360 -#: grep.c:2117

3367 +#: grep.c:668

3368 +msgid ""

3369 +"given pattern contains NULL byte (via -f <file>). This is only supported "

3370 +"with -P under PCRE v2"

3371 +msgstr ""

3372 +"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此功能"

3373 +

3374 +#: grep.c:2124

3375 #, c-format

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

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

3378

3365 -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3379 +#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82

3380 #: builtin/rm.c:135

3381 #, c-format

3382 msgid "failed to stat '%s'"

3383 msgstr "对 '%s' 调用 stat 失败"

3384

3371 -#: grep.c:2145

3385 +#: grep.c:2152

3386 #, c-format

3387 msgid "'%s': short read"

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

@@ -3510,12 +3524,12 @@ msgstr[1] ""

3524 msgid "git version [<options>]"

3525 msgstr "git version [<选项>]"

3526

3513 -#: help.c:782

3527 +#: help.c:783

3528 #, c-format

3529 msgid "%s: %s - %s"

3530 msgstr "%s：%s - %s"

3531

3518 -#: help.c:786

3532 +#: help.c:787

3533 msgid ""

3534 "\n"

3535 "Did you mean this?"

@@ -3587,41 +3601,56 @@ msgstr "姓名中仅包含禁用字符：%s"

3601 msgid "invalid date format: %s"

3602 msgstr "无效的日期格式：%s"

3603

3590 -#: list-objects.c:129

3604 +#: list-objects.c:127

3605 #, c-format

3606 msgid "entry '%s' in tree %s has tree mode, but is not a tree"

3607 msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象"

3608

3595 -#: list-objects.c:142

3609 +#: list-objects.c:140

3610 #, c-format

3611 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

3612 msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象"

3613

3600 -#: list-objects.c:378

3614 +#: list-objects.c:375

3615 #, c-format

3616 msgid "unable to load root tree for commit %s"

3617 msgstr "无法为提交 %s 加载根树"

3618

3605 -#: list-objects-filter-options.c:36

3606 -msgid "multiple filter-specs cannot be combined"

3607 -msgstr "不能混用多种过滤规格"

3619 +#: list-objects-filter.c:492

3620 +#, c-format

3621 +msgid "unable to access sparse blob in '%s'"

3622 +msgstr "不能访问 '%s' 中的稀疏数据对象"

3623 +

3624 +#: list-objects-filter.c:495

3625 +#, c-format

3626 +msgid "unable to parse sparse filter data in %s"

3627 +msgstr "无法解析 %s 中的稀疏过滤器数据"

3628

3629 #: list-objects-filter-options.c:58

3630 msgid "expected 'tree:<depth>'"

3631 msgstr "期望 'tree:<深度>'"

3632

3613 -#: list-objects-filter-options.c:84

3633 +#: list-objects-filter-options.c:73

3634 msgid "sparse:path filters support has been dropped"

3635 msgstr "sparse:path 过滤器支持已被删除"

3636

3617 -#: list-objects-filter-options.c:94

3637 +#: list-objects-filter-options.c:86

3638 #, c-format

3639 msgid "invalid filter-spec '%s'"

3640 msgstr "无效的过滤器表达式 '%s'"

3641

3622 -#: list-objects-filter-options.c:158

3623 -msgid "cannot change partial clone promisor remote"

3624 -msgstr "无法修改部分克隆的 promisor 远程仓库"

3642 +#: list-objects-filter-options.c:102

3643 +#, c-format

3644 +msgid "must escape char in sub-filter-spec: '%c'"

3645 +msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"

3646 +

3647 +#: list-objects-filter-options.c:144

3648 +msgid "expected something after combine:"

3649 +msgstr "期望在组合后有一些东西："

3650 +

3651 +#: list-objects-filter-options.c:226

3652 +msgid "multiple filter-specs cannot be combined"

3653 +msgstr "不能混用多种过滤规格"

3654

3655 #: lockfile.c:151

3656 #, c-format

@@ -3650,114 +3679,110 @@ msgstr "不能创建 '%s.lock'：%s"

3679 msgid "failed to read the cache"

3680 msgstr "读取缓存失败"

3681

3653 -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3654 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3682 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

3683 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785

3684 #: builtin/stash.c:264

3685 msgid "unable to write new index file"

3686 msgstr "无法写新的索引文件"

3687

3659 -#: merge-recursive.c:322

3688 +#: merge-recursive.c:367

3689 msgid "(bad commit)\n"

3690 msgstr "（坏提交）\n"

3691

3663 -#: merge-recursive.c:345

3692 +#: merge-recursive.c:390

3693 #, c-format

3694 msgid "add_cacheinfo failed for path '%s'; merge aborting."

3695 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"

3696

3668 -#: merge-recursive.c:354

3697 +#: merge-recursive.c:399

3698 #, c-format

3699 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

3700 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

3701

3673 -#: merge-recursive.c:437

3674 -msgid "error building trees"

3675 -msgstr "创建树出错"

3676 -

3677 -#: merge-recursive.c:863

3702 +#: merge-recursive.c:885

3703 #, c-format

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

3705 msgstr "创建路径 '%s'%s 失败"

3706

3682 -#: merge-recursive.c:874

3707 +#: merge-recursive.c:896

3708 #, c-format

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

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

3711

3687 -#: merge-recursive.c:888 merge-recursive.c:907

3712 +#: merge-recursive.c:910 merge-recursive.c:929

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

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

3715

3691 -#: merge-recursive.c:897

3716 +#: merge-recursive.c:919

3717 #, c-format

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

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

3720

3696 -#: merge-recursive.c:938 builtin/cat-file.c:40

3721 +#: merge-recursive.c:960 builtin/cat-file.c:41

3722 #, c-format

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

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

3725

3701 -#: merge-recursive.c:941

3726 +#: merge-recursive.c:965

3727 #, c-format

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

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

3730

3706 -#: merge-recursive.c:965

3731 +#: merge-recursive.c:990

3732 #, c-format

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

3734 msgstr "打开 '%s' 失败：%s"

3735

3711 -#: merge-recursive.c:976

3736 +#: merge-recursive.c:1001

3737 #, c-format

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

3739 msgstr "创建符号链接 '%s' 失败：%s"

3740

3716 -#: merge-recursive.c:981

3741 +#: merge-recursive.c:1006

3742 #, c-format

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

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

3745

3721 -#: merge-recursive.c:1177

3746 +#: merge-recursive.c:1199

3747 #, c-format

3748 msgid "Failed to merge submodule %s (not checked out)"

3749 msgstr "无法合并子模组 %s （没有检出）"

3750

3726 -#: merge-recursive.c:1184

3751 +#: merge-recursive.c:1206

3752 #, c-format

3753 msgid "Failed to merge submodule %s (commits not present)"

3754 msgstr "无法合并子模组 %s（提交不存在）"

3755

3731 -#: merge-recursive.c:1191

3756 +#: merge-recursive.c:1213

3757 #, c-format

3758 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3759 msgstr "无法合并子模组 %s （提交未跟随合并基线）"

3760

3736 -#: merge-recursive.c:1199 merge-recursive.c:1211

3761 +#: merge-recursive.c:1221 merge-recursive.c:1233

3762 #, c-format

3763 msgid "Fast-forwarding submodule %s to the following commit:"

3764 msgstr "子模组 %s 快进到如下提交："

3765

3741 -#: merge-recursive.c:1202 merge-recursive.c:1214

3766 +#: merge-recursive.c:1224 merge-recursive.c:1236

3767 #, c-format

3768 msgid "Fast-forwarding submodule %s"

3769 msgstr "快进子模组 %s"

3770

3746 -#: merge-recursive.c:1237

3771 +#: merge-recursive.c:1259

3772 #, c-format

3773 msgid "Failed to merge submodule %s (merge following commits not found)"

3774 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"

3775

3751 -#: merge-recursive.c:1241

3776 +#: merge-recursive.c:1263

3777 #, c-format

3778 msgid "Failed to merge submodule %s (not fast-forward)"

3779 msgstr "无法合并子模组 %s（非快进）"

3780

3756 -#: merge-recursive.c:1242

3781 +#: merge-recursive.c:1264

3782 msgid "Found a possible merge resolution for the submodule:\n"

3783 msgstr "找到子模组的一个可能的合并方案：\n"

3784

3760 -#: merge-recursive.c:1245

3785 +#: merge-recursive.c:1267

3786 #, c-format

3787 msgid ""

3788 "If this is correct simply add it to the index for example\n"

@@ -3773,31 +3798,31 @@ msgstr ""

3798 "\n"

3799 "以接受此建议。\n"

3800

3776 -#: merge-recursive.c:1254

3801 +#: merge-recursive.c:1276

3802 #, c-format

3803 msgid "Failed to merge submodule %s (multiple merges found)"

3804 msgstr "无法合并子模组 %s （发现多个合并）"

3805

3781 -#: merge-recursive.c:1327

3806 +#: merge-recursive.c:1349

3807 msgid "Failed to execute internal merge"

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

3809

3785 -#: merge-recursive.c:1332

3810 +#: merge-recursive.c:1354

3811 #, c-format

3812 msgid "Unable to add %s to database"

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

3814

3790 -#: merge-recursive.c:1364

3815 +#: merge-recursive.c:1386

3816 #, c-format

3817 msgid "Auto-merging %s"

3818 msgstr "自动合并 %s"

3819

3795 -#: merge-recursive.c:1387

3820 +#: merge-recursive.c:1410

3821 #, c-format

3822 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3823 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

3824

3800 -#: merge-recursive.c:1459

3825 +#: merge-recursive.c:1482

3826 #, c-format

3827 msgid ""

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

@@ -3806,7 +3831,7 @@ msgstr ""

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

3832 "本被保留。"

3833

3809 -#: merge-recursive.c:1464

3834 +#: merge-recursive.c:1487

3835 #, c-format

3836 msgid ""

3837 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3815,7 +3840,7 @@ msgstr ""

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

3841 "%7$s 版本被保留。"

3842

3818 -#: merge-recursive.c:1471

3843 +#: merge-recursive.c:1494

3844 #, c-format

3845 msgid ""

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

@@ -3824,7 +3849,7 @@ msgstr ""

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

3850 "本保留在 %8$s 中。"

3851

3827 -#: merge-recursive.c:1476

3852 +#: merge-recursive.c:1499

3853 #, c-format

3854 msgid ""

3855 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3833,40 +3858,40 @@ msgstr ""

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

3859 "%7$s 版本保留在 %9$s 中。"

3860

3836 -#: merge-recursive.c:1511

3861 +#: merge-recursive.c:1534

3862 msgid "rename"

3863 msgstr "重命名"

3864

3840 -#: merge-recursive.c:1511

3865 +#: merge-recursive.c:1534

3866 msgid "renamed"

3867 msgstr "重命名"

3868

3844 -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094

3869 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117

3870 #, c-format

3871 msgid "Refusing to lose dirty file at %s"

3872 msgstr "拒绝丢失脏文件 '%s'"

3873

3849 -#: merge-recursive.c:1601

3874 +#: merge-recursive.c:1624

3875 #, c-format

3876 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3877 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

3878

3854 -#: merge-recursive.c:1659

3879 +#: merge-recursive.c:1682

3880 #, c-format

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

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

3883

3859 -#: merge-recursive.c:1690

3884 +#: merge-recursive.c:1713

3885 #, c-format

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

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

3888

3864 -#: merge-recursive.c:1695

3889 +#: merge-recursive.c:1718

3890 #, c-format

3891 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3892 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

3893

3869 -#: merge-recursive.c:1714

3894 +#: merge-recursive.c:1737

3895 #, c-format

3896 msgid ""

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

@@ -3875,18 +3900,18 @@ msgstr ""

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

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

3902

3878 -#: merge-recursive.c:1719

3903 +#: merge-recursive.c:1742

3904 msgid " (left unresolved)"

3905 msgstr "（留下未解决）"

3906

3882 -#: merge-recursive.c:1828

3907 +#: merge-recursive.c:1851

3908 #, c-format

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

3910 msgstr ""

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

3912 "%5$s"

3913

3889 -#: merge-recursive.c:2035

3914 +#: merge-recursive.c:2056

3915 #, c-format

3916 msgid ""

3917 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3896,7 +3921,7 @@ msgstr ""

3921 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

3922 "其它目录，没有目录包含大部分文件。"

3923

3899 -#: merge-recursive.c:2067

3924 +#: merge-recursive.c:2088

3925 #, c-format

3926 msgid ""

3927 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3905,7 +3930,7 @@ msgstr ""

3930 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

3931 "在：%s。"

3932

3908 -#: merge-recursive.c:2077

3933 +#: merge-recursive.c:2098

3934 #, c-format

3935 msgid ""

3936 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3914,7 +3939,7 @@ msgstr ""

3939 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

3940 "径放置于此：%s"

3941

3917 -#: merge-recursive.c:2169

3942 +#: merge-recursive.c:2190

3943 #, c-format

3944 msgid ""

3945 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3923,59 +3948,59 @@ msgstr ""

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

3949 "%4$s->%5$s"

3950

3926 -#: merge-recursive.c:2413

3951 +#: merge-recursive.c:2435

3952 #, c-format

3953 msgid ""

3954 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

3955 "renamed."

3956 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

3957

3933 -#: merge-recursive.c:2938

3958 +#: merge-recursive.c:2961

3959 #, c-format

3960 msgid "cannot read object %s"

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

3962

3938 -#: merge-recursive.c:2941

3963 +#: merge-recursive.c:2964

3964 #, c-format

3965 msgid "object %s is not a blob"

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

3967

3943 -#: merge-recursive.c:3005

3968 +#: merge-recursive.c:3028

3969 msgid "modify"

3970 msgstr "修改"

3971

3947 -#: merge-recursive.c:3005

3972 +#: merge-recursive.c:3028

3973 msgid "modified"

3974 msgstr "修改"

3975

3951 -#: merge-recursive.c:3017

3976 +#: merge-recursive.c:3040

3977 msgid "content"

3978 msgstr "内容"

3979

3955 -#: merge-recursive.c:3021

3980 +#: merge-recursive.c:3044

3981 msgid "add/add"

3982 msgstr "添加/添加"

3983

3959 -#: merge-recursive.c:3044

3984 +#: merge-recursive.c:3067

3985 #, c-format

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

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

3988

3964 -#: merge-recursive.c:3066 git-submodule.sh:937

3989 +#: merge-recursive.c:3089 git-submodule.sh:937

3990 msgid "submodule"

3991 msgstr "子模组"

3992

3968 -#: merge-recursive.c:3067

3993 +#: merge-recursive.c:3090

3994 #, c-format

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

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

3997

3973 -#: merge-recursive.c:3097

3998 +#: merge-recursive.c:3120

3999 #, c-format

4000 msgid "Adding as %s instead"

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

4002

3978 -#: merge-recursive.c:3179

4003 +#: merge-recursive.c:3203

4004 #, c-format

4005 msgid ""

4006 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -3983,7 +4008,7 @@ msgid ""

4008 msgstr ""

4009 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

4010

3986 -#: merge-recursive.c:3182

4011 +#: merge-recursive.c:3206

4012 #, c-format

4013 msgid ""

4014 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -3992,7 +4017,7 @@ msgstr ""

4017 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"

4018 "到 %s。"

4019

3995 -#: merge-recursive.c:3186

4020 +#: merge-recursive.c:3210

4021 #, c-format

4022 msgid ""

4023 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4001,7 +4026,7 @@ msgstr ""

4026 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"

4027 "动到 %5$s。"

4028

4004 -#: merge-recursive.c:3189

4029 +#: merge-recursive.c:3213

4030 #, c-format

4031 msgid ""

4032 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4010,224 +4035,224 @@ msgstr ""

4035 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

4036 "建议将其移动到 %5$s。"

4037

4013 -#: merge-recursive.c:3303

4038 +#: merge-recursive.c:3327

4039 #, c-format

4040 msgid "Removing %s"

4041 msgstr "删除 %s"

4042

4018 -#: merge-recursive.c:3326

4043 +#: merge-recursive.c:3350

4044 msgid "file/directory"

4045 msgstr "文件/目录"

4046

4022 -#: merge-recursive.c:3331

4047 +#: merge-recursive.c:3355

4048 msgid "directory/file"

4049 msgstr "目录/文件"

4050

4026 -#: merge-recursive.c:3338

4051 +#: merge-recursive.c:3362

4052 #, c-format

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

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

4055

4031 -#: merge-recursive.c:3347

4056 +#: merge-recursive.c:3371

4057 #, c-format

4058 msgid "Adding %s"

4059 msgstr "添加 %s"

4060

4036 -#: merge-recursive.c:3356

4061 +#: merge-recursive.c:3380

4062 #, c-format

4063 msgid "CONFLICT (add/add): Merge conflict in %s"

4064 msgstr "冲突（add/add）：合并冲突于 %s"

4065

4041 -#: merge-recursive.c:3394

4042 -#, c-format

4043 -msgid ""

4044 -"Your local changes to the following files would be overwritten by merge:\n"

4045 -" %s"

4046 -msgstr ""

4047 -"您对下列文件的本地修改将被合并操作覆盖：\n"

4048 -" %s"

4049 -

4050 -#: merge-recursive.c:3405

4066 +#: merge-recursive.c:3424

4067 msgid "Already up to date!"

4068 msgstr "已经是最新的！"

4069

4054 -#: merge-recursive.c:3414

4070 +#: merge-recursive.c:3433

4071 #, c-format

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

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

4074

4059 -#: merge-recursive.c:3513

4075 +#: merge-recursive.c:3537

4076 msgid "Merging:"

4077 msgstr "合并："

4078

4063 -#: merge-recursive.c:3526

4079 +#: merge-recursive.c:3550

4080 #, c-format

4081 msgid "found %u common ancestor:"

4082 msgid_plural "found %u common ancestors:"

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

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

4085

4070 -#: merge-recursive.c:3565

4086 +#: merge-recursive.c:3600

4087 msgid "merge returned no commit"

4088 msgstr "合并未返回提交"

4089

4074 -#: merge-recursive.c:3631

4090 +#: merge-recursive.c:3659

4091 +#, c-format

4092 +msgid ""

4093 +"Your local changes to the following files would be overwritten by merge:\n"

4094 +" %s"

4095 +msgstr ""

4096 +"您对下列文件的本地修改将被合并操作覆盖：\n"

4097 +" %s"

4098 +

4099 +#: merge-recursive.c:3756

4100 #, c-format

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

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

4103

4079 -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869

4104 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874

4105 msgid "Unable to write index."

4106 msgstr "不能写入索引。"

4107

4083 -#: midx.c:69

4108 +#: midx.c:68

4109 #, c-format

4110 msgid "multi-pack-index file %s is too small"

4111 msgstr "多包索引文件 %s 太小"

4112

4088 -#: midx.c:85

4113 +#: midx.c:84

4114 #, c-format

4115 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4116 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"

4117

4093 -#: midx.c:90

4118 +#: midx.c:89

4119 #, c-format

4120 msgid "multi-pack-index version %d not recognized"

4121 msgstr "multi-pack-index 版本 %d 不能被识别"

4122

4098 -#: midx.c:95

4123 +#: midx.c:94

4124 #, c-format

4125 msgid "hash version %u does not match"

4126 msgstr "散列版本 %u 不匹配"

4127

4103 -#: midx.c:109

4128 +#: midx.c:108

4129 msgid "invalid chunk offset (too large)"

4130 msgstr "无效的块偏移（太大）"

4131

4107 -#: midx.c:133

4132 +#: midx.c:132

4133 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4134 msgstr "终止多包索引块 id 出现时间早于预期"

4135

4111 -#: midx.c:146

4136 +#: midx.c:145

4137 msgid "multi-pack-index missing required pack-name chunk"

4138 msgstr "多包索引缺少必需的包名块"

4139

4115 -#: midx.c:148

4140 +#: midx.c:147

4141 msgid "multi-pack-index missing required OID fanout chunk"

4142 msgstr "多包索引缺少必需的对象 ID 扇出块"

4143

4119 -#: midx.c:150

4144 +#: midx.c:149

4145 msgid "multi-pack-index missing required OID lookup chunk"

4146 msgstr "多包索引缺少必需的对象 ID 查询块"

4147

4123 -#: midx.c:152

4148 +#: midx.c:151

4149 msgid "multi-pack-index missing required object offsets chunk"

4150 msgstr "多包索引缺少必需的对象偏移块"

4151

4127 -#: midx.c:166

4152 +#: midx.c:165

4153 #, c-format

4154 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4155 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

4156

4132 -#: midx.c:211

4157 +#: midx.c:210

4158 #, c-format

4159 msgid "bad pack-int-id: %u (%u total packs)"

4160 msgstr "错的 pack-int-id：%u（共有 %u 个包）"

4161

4137 -#: midx.c:261

4162 +#: midx.c:260

4163 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4164 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

4165

4141 -#: midx.c:289

4166 +#: midx.c:288

4167 msgid "error preparing packfile from multi-pack-index"

4168 msgstr "从多包索引准备 packfile 出错"

4169

4145 -#: midx.c:470

4170 +#: midx.c:469

4171 #, c-format

4172 msgid "failed to add packfile '%s'"

4173 msgstr "添加包文件 '%s' 失败"

4174

4150 -#: midx.c:476

4175 +#: midx.c:475

4176 #, c-format

4177 msgid "failed to open pack-index '%s'"

4178 msgstr "打开包索引 '%s' 失败"

4179

4155 -#: midx.c:536

4180 +#: midx.c:535

4181 #, c-format

4182 msgid "failed to locate object %d in packfile"

4183 msgstr "在包文件中定位对象 %d 失败"

4184

4160 -#: midx.c:865

4185 +#: midx.c:864

4186 #, c-format

4187 msgid "did not see pack-file %s to drop"

4188 msgstr "没有看到要丢弃的包文件 %s"

4189

4165 -#: midx.c:1036

4190 +#: midx.c:1035

4191 #, c-format

4192 msgid "failed to clear multi-pack-index at %s"

4193 msgstr "清理位于 %s 的多包索引失败"

4194

4170 -#: midx.c:1091

4195 +#: midx.c:1090

4196 msgid "Looking for referenced packfiles"

4197 msgstr "正在查找引用的包文件"

4198

4174 -#: midx.c:1106

4199 +#: midx.c:1105

4200 #, c-format

4201 msgid ""

4202 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4203 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4204

4180 -#: midx.c:1110

4205 +#: midx.c:1109

4206 msgid "Verifying OID order in MIDX"

4207 msgstr "正在校验 MIDX 中的对象 ID 顺序"

4208

4184 -#: midx.c:1119

4209 +#: midx.c:1118

4210 #, c-format

4211 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4212 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"

4213

4189 -#: midx.c:1138

4214 +#: midx.c:1137

4215 msgid "Sorting objects by packfile"

4216 msgstr "通过包文件为对象排序"

4217

4193 -#: midx.c:1144

4218 +#: midx.c:1143

4219 msgid "Verifying object offsets"

4220 msgstr "校验对象偏移"

4221

4197 -#: midx.c:1160

4222 +#: midx.c:1159

4223 #, c-format

4224 msgid "failed to load pack entry for oid[%d] = %s"

4225 msgstr "为 oid[%d] = %s 加载包条目失败"

4226

4202 -#: midx.c:1166

4227 +#: midx.c:1165

4228 #, c-format

4229 msgid "failed to load pack-index for packfile %s"

4230 msgstr "为包文件 %s 加载包索引失败"

4231

4207 -#: midx.c:1175

4232 +#: midx.c:1174

4233 #, c-format

4234 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4235 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

4236

4212 -#: midx.c:1350

4237 +#: midx.c:1349

4238 msgid "could not start pack-objects"

4239 msgstr "不能开始 pack-objects"

4240

4216 -#: midx.c:1369

4241 +#: midx.c:1368

4242 msgid "could not finish pack-objects"

4243 msgstr "不能结束 pack-objects"

4244

4220 -#: name-hash.c:532

4245 +#: name-hash.c:537

4246 #, c-format

4247 msgid "unable to create lazy_dir thread: %s"

4248 msgstr "不能创建 lazy_dir 线程：%s"

4249

4225 -#: name-hash.c:554

4250 +#: name-hash.c:559

4251 #, c-format

4252 msgid "unable to create lazy_name thread: %s"

4253 msgstr "不能创建 lazy_name 线程：%s"

4254

4230 -#: name-hash.c:560

4255 +#: name-hash.c:565

4256 #, c-format

4257 msgid "unable to join lazy_name thread: %s"

4258 msgstr "不能加入 lasy_name 线程：%s"

@@ -4271,41 +4296,41 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

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

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

4298

4274 -#: object.c:54

4299 +#: object.c:53

4300 #, c-format

4301 msgid "invalid object type \"%s\""

4302 msgstr "无效的对象类型 \"%s\""

4303

4279 -#: object.c:174

4304 +#: object.c:173

4305 #, c-format

4306 msgid "object %s is a %s, not a %s"

4307 msgstr "对象 %s 是一个 %s，不是一个 %s"

4308

4284 -#: object.c:234

4309 +#: object.c:233

4310 #, c-format

4311 msgid "object %s has unknown type id %d"

4312 msgstr "对象 %s 有未知的类型 id %d"

4313

4289 -#: object.c:247

4314 +#: object.c:246

4315 #, c-format

4316 msgid "unable to parse object: %s"

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

4318

4294 -#: object.c:267 object.c:278

4319 +#: object.c:266 object.c:277

4320 #, c-format

4321 msgid "hash mismatch %s"

4322 msgstr "哈希值与 %s 不匹配"

4323

4299 -#: packfile.c:648

4324 +#: packfile.c:641

4325 msgid "offset before end of packfile (broken .idx?)"

4326 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

4327

4303 -#: packfile.c:1899

4328 +#: packfile.c:1887

4329 #, c-format

4330 msgid "offset before start of pack index for %s (corrupt index?)"

4331 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

4332

4308 -#: packfile.c:1903

4333 +#: packfile.c:1891

4334 #, c-format

4335 msgid "offset beyond end of pack index for %s (truncated index?)"

4336 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

@@ -4350,26 +4375,26 @@ msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

4375 msgid "did you mean `--%s` (with two dashes ?)"

4376 msgstr "你的意思是 `--%s`（有两个短线？）"

4377

4353 -#: parse-options.c:859

4378 +#: parse-options.c:860

4379 #, c-format

4380 msgid "unknown option `%s'"

4381 msgstr "未知选项 `%s'"

4382

4358 -#: parse-options.c:861

4383 +#: parse-options.c:862

4384 #, c-format

4385 msgid "unknown switch `%c'"

4386 msgstr "未知开关 `%c'"

4387

4363 -#: parse-options.c:863

4388 +#: parse-options.c:864

4389 #, c-format

4390 msgid "unknown non-ascii option in string: `%s'"

4391 msgstr "字符串中未知的非 ascii 字符选项：`%s'"

4392

4368 -#: parse-options.c:887

4393 +#: parse-options.c:888

4394 msgid "..."

4395 msgstr "..."

4396

4372 -#: parse-options.c:906

4397 +#: parse-options.c:907

4398 #, c-format

4399 msgid "usage: %s"

4400 msgstr "用法：%s"

@@ -4377,22 +4402,22 @@ msgstr "用法：%s"

4402 #. TRANSLATORS: the colon here should align with the

4403 #. one in "usage: %s" translation.

4404 #.

4380 -#: parse-options.c:912

4405 +#: parse-options.c:913

4406 #, c-format

4407 msgid " or: %s"

4408 msgstr " 或：%s"

4409

4410 # 译者：为保证在输出中对齐，注意调整句中空格！

4386 -#: parse-options.c:915

4411 +#: parse-options.c:916

4412 #, c-format

4413 msgid " %s"

4414 msgstr " %s"

4415

4391 -#: parse-options.c:954

4416 +#: parse-options.c:955

4417 msgid "-NUM"

4418 msgstr "-数字"

4419

4395 -#: parse-options.c:968

4420 +#: parse-options.c:969

4421 #, c-format

4422 msgid "alias of --%s"

4423 msgstr "--%s 的别名"

@@ -4557,29 +4582,38 @@ msgstr "无法创建线程 lstat：%s"

4582 msgid "unable to parse --pretty format"

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

4584

4560 -#: range-diff.c:70

4585 +#: promisor-remote.c:25

4586 +msgid "Remote with no URL"

4587 +msgstr "远程未设置 URL"

4588 +

4589 +#: promisor-remote.c:61

4590 +#, c-format

4591 +msgid "promisor remote name cannot begin with '/': %s"

4592 +msgstr "promisor 远程名称不能以 '/' 开始：%s"

4593 +

4594 +#: range-diff.c:71

4595 msgid "could not start `log`"

4596 msgstr "不能启动 `log`"

4597

4564 -#: range-diff.c:72

4598 +#: range-diff.c:73

4599 msgid "could not read `log` output"

4600 msgstr "不能读取 `log` 的输出"

4601

4568 -#: range-diff.c:91 sequencer.c:5021

4602 +#: range-diff.c:92 sequencer.c:4985

4603 #, c-format

4604 msgid "could not parse commit '%s'"

4605 msgstr "不能解析提交 '%s'"

4606

4573 -#: range-diff.c:117

4607 +#: range-diff.c:118

4608 #, c-format

4609 msgid "could not parse git header '%.*s'"

4610 msgstr "无法解析 git 头 '%.*s'"

4611

4578 -#: range-diff.c:274

4612 +#: range-diff.c:275

4613 msgid "failed to generate diff"

4614 msgstr "生成 diff 失败"

4615

4582 -#: range-diff.c:506 range-diff.c:508

4616 +#: range-diff.c:507 range-diff.c:509

4617 #, c-format

4618 msgid "could not parse log for '%s'"

4619 msgstr "不能解析 '%s' 的日志"

@@ -4623,11 +4657,11 @@ msgstr "无法对 %s 执行 stat"

4657 msgid "'%s' appears as both a file and as a directory"

4658 msgstr "'%s' 看起来既是文件又是目录"

4659

4626 -#: read-cache.c:1499

4660 +#: read-cache.c:1520

4661 msgid "Refresh index"

4662 msgstr "刷新索引"

4663

4630 -#: read-cache.c:1613

4664 +#: read-cache.c:1635

4665 #, c-format

4666 msgid ""

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

@@ -4636,7 +4670,7 @@ msgstr ""

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

4671 "使用版本 %i"

4672

4639 -#: read-cache.c:1623

4673 +#: read-cache.c:1645

4674 #, c-format

4675 msgid ""

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

@@ -4645,139 +4679,139 @@ msgstr ""

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

4680 "使用版本 %i"

4681

4648 -#: read-cache.c:1679

4682 +#: read-cache.c:1701

4683 #, c-format

4684 msgid "bad signature 0x%08x"

4685 msgstr "坏的签名 0x%08x"

4686

4653 -#: read-cache.c:1682

4687 +#: read-cache.c:1704

4688 #, c-format

4689 msgid "bad index version %d"

4690 msgstr "坏的索引版本 %d"

4691

4658 -#: read-cache.c:1691

4692 +#: read-cache.c:1713

4693 msgid "bad index file sha1 signature"

4694 msgstr "坏的索引文件 sha1 签名"

4695

4662 -#: read-cache.c:1721

4696 +#: read-cache.c:1743

4697 #, c-format

4698 msgid "index uses %.4s extension, which we do not understand"

4699 msgstr "索引使用不被支持的 %.4s 扩展"

4700

4701 #

4668 -#: read-cache.c:1723

4702 +#: read-cache.c:1745

4703 #, c-format

4704 msgid "ignoring %.4s extension"

4705 msgstr "忽略 %.4s 扩展"

4706

4673 -#: read-cache.c:1760

4707 +#: read-cache.c:1782

4708 #, c-format

4709 msgid "unknown index entry format 0x%08x"

4710 msgstr "未知的索引条目格式 0x%08x"

4711

4678 -#: read-cache.c:1776

4712 +#: read-cache.c:1798

4713 #, c-format

4714 msgid "malformed name field in the index, near path '%s'"

4715 msgstr "索引中靠近路径 '%s' 有错误的名称字段"

4716

4683 -#: read-cache.c:1833

4717 +#: read-cache.c:1855

4718 msgid "unordered stage entries in index"

4719 msgstr "索引中有未排序的暂存条目"

4720

4687 -#: read-cache.c:1836

4721 +#: read-cache.c:1858

4722 #, c-format

4723 msgid "multiple stage entries for merged file '%s'"

4724 msgstr "合并文件 '%s' 有多个暂存条目"

4725

4692 -#: read-cache.c:1839

4726 +#: read-cache.c:1861

4727 #, c-format

4728 msgid "unordered stage entries for '%s'"

4729 msgstr "'%s' 的未排序暂存条目"

4730

4697 -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4698 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4699 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

4731 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111

4732 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468

4733 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347

4734 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4735 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4736 msgid "index file corrupt"

4737 msgstr "索引文件损坏"

4738

4705 -#: read-cache.c:2087

4739 +#: read-cache.c:2108

4740 #, c-format

4741 msgid "unable to create load_cache_entries thread: %s"

4742 msgstr "无法创建 load_cache_entries 线程：%s"

4743

4710 -#: read-cache.c:2100

4744 +#: read-cache.c:2121

4745 #, c-format

4746 msgid "unable to join load_cache_entries thread: %s"

4747 msgstr "无法加入 load_cache_entries 线程：%s"

4748

4715 -#: read-cache.c:2133

4749 +#: read-cache.c:2154

4750 #, c-format

4751 msgid "%s: index file open failed"

4752 msgstr "%s：打开索引文件失败"

4753

4720 -#: read-cache.c:2137

4754 +#: read-cache.c:2158

4755 #, c-format

4756 msgid "%s: cannot stat the open index"

4757 msgstr "%s：不能对打开的索引执行 stat 操作"

4758

4725 -#: read-cache.c:2141

4759 +#: read-cache.c:2162

4760 #, c-format

4761 msgid "%s: index file smaller than expected"

4762 msgstr "%s：索引文件比预期的小"

4763

4730 -#: read-cache.c:2145

4764 +#: read-cache.c:2166

4765 #, c-format

4766 msgid "%s: unable to map index file"

4767 msgstr "%s：无法对索引文件执行 map 操作"

4768

4735 -#: read-cache.c:2187

4769 +#: read-cache.c:2208

4770 #, c-format

4771 msgid "unable to create load_index_extensions thread: %s"

4772 msgstr "无法创建 load_index_extensions 线程：%s"

4773

4740 -#: read-cache.c:2214

4774 +#: read-cache.c:2235

4775 #, c-format

4776 msgid "unable to join load_index_extensions thread: %s"

4777 msgstr "无法加入 load_index_extensions 线程：%s"

4778

4745 -#: read-cache.c:2246

4779 +#: read-cache.c:2267

4780 #, c-format

4781 msgid "could not freshen shared index '%s'"

4782 msgstr "无法刷新共享索引 '%s'"

4783

4750 -#: read-cache.c:2293

4784 +#: read-cache.c:2314

4785 #, c-format

4786 msgid "broken index, expect %s in %s, got %s"

4787 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

4788

4755 -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4789 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119

4790 #, c-format

4791 msgid "could not close '%s'"

4792 msgstr "不能关闭 '%s'"

4793

4760 -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4794 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917

4795 #, c-format

4796 msgid "could not stat '%s'"

4797 msgstr "不能对 '%s' 调用 stat"

4798

4765 -#: read-cache.c:3105

4799 +#: read-cache.c:3126

4800 #, c-format

4801 msgid "unable to open git dir: %s"

4802 msgstr "不能打开 git 目录：%s"

4803

4770 -#: read-cache.c:3117

4804 +#: read-cache.c:3138

4805 #, c-format

4806 msgid "unable to unlink: %s"

4807 msgstr "无法删除：%s"

4808

4775 -#: read-cache.c:3142

4809 +#: read-cache.c:3163

4810 #, c-format

4811 msgid "cannot fix permission bits on '%s'"

4812 msgstr "不能修复 '%s' 的权限位"

4813

4780 -#: read-cache.c:3291

4814 +#: read-cache.c:3312

4815 #, c-format

4816 msgid "%s: cannot drop to stage #0"

4817 msgstr "%s：不能落到暂存区 #0"

@@ -4879,8 +4913,8 @@ msgstr ""

4913 msgid "Note that empty commits are commented out"

4914 msgstr "注意空提交已被注释掉"

4915

4882 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

4883 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

4916 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388

4917 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235

4918 #, c-format

4919 msgid "could not write '%s'"

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

@@ -4925,7 +4959,7 @@ msgstr "%s 没有指向一个有效的对象！"

4959 msgid "ignoring dangling symref %s"

4960 msgstr "忽略悬空符号引用 %s"

4961

4928 -#: refs.c:669 ref-filter.c:2092

4962 +#: refs.c:669 ref-filter.c:2098

4963 #, c-format

4964 msgid "ignoring broken ref %s"

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

@@ -4950,14 +4984,14 @@ msgstr "引用 '%s' 已经存在"

4984 msgid "unexpected object ID when writing '%s'"

4985 msgstr "写入 '%s' 时意外的对象 ID"

4986

4953 -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

4954 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

4987 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851

4988 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620

4989 #, c-format

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

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

4992

4959 -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

4960 -#: builtin/rebase.c:1003

4993 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714

4994 +#: builtin/rebase.c:1004

4995 #, c-format

4996 msgid "could not open '%s' for writing"

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

@@ -4992,21 +5026,21 @@ msgstr "拒绝更新有错误名称 '%s' 的引用"

5026 msgid "update_ref failed for ref '%s': %s"

5027 msgstr "对引用 '%s' 执行 update_ref 失败：%s"

5028

4995 -#: refs.c:2012

5029 +#: refs.c:2023

5030 #, c-format

5031 msgid "multiple updates for ref '%s' not allowed"

5032 msgstr "不允许对引用 '%s' 多次更新"

5033

5000 -#: refs.c:2044

5034 +#: refs.c:2055

5035 msgid "ref updates forbidden inside quarantine environment"

5036 msgstr "在隔离环境中禁止更新引用"

5037

5004 -#: refs.c:2140 refs.c:2170

5038 +#: refs.c:2151 refs.c:2181

5039 #, c-format

5040 msgid "'%s' exists; cannot create '%s'"

5041 msgstr "'%s' 已存在，无法创建 '%s'"

5042

5009 -#: refs.c:2146 refs.c:2181

5043 +#: refs.c:2157 refs.c:2192

5044 #, c-format

5045 msgid "cannot process '%s' and '%s' at the same time"

5046 msgstr "无法同时处理 '%s' 和 '%s'"

@@ -5016,13 +5050,13 @@ msgstr "无法同时处理 '%s' 和 '%s'"

5050 msgid "could not remove reference %s"

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

5052

5019 -#: refs/files-backend.c:1248 refs/packed-backend.c:1532

5020 -#: refs/packed-backend.c:1542

5053 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541

5054 +#: refs/packed-backend.c:1551

5055 #, c-format

5056 msgid "could not delete reference %s: %s"

5057 msgstr "无法删除引用 %s：%s"

5058

5025 -#: refs/files-backend.c:1251 refs/packed-backend.c:1545

5059 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554

5060 #, c-format

5061 msgid "could not delete references: %s"

5062 msgstr "无法删除引用：%s"

@@ -5032,7 +5066,7 @@ msgstr "无法删除引用：%s"

5066 msgid "invalid refspec '%s'"

5067 msgstr "无效的引用表达式：'%s'"

5068

5035 -#: ref-filter.c:42 wt-status.c:1934

5069 +#: ref-filter.c:42 wt-status.c:1938

5070 msgid "gone"

5071 msgstr "丢失"

5072

@@ -5051,280 +5085,280 @@ msgstr "落后 %d"

5085 msgid "ahead %d, behind %d"

5086 msgstr "领先 %d，落后 %d"

5087

5054 -#: ref-filter.c:162

5088 +#: ref-filter.c:165

5089 #, c-format

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

5091 msgstr "期望的格式：%%(color:<颜色>)"

5092

5059 -#: ref-filter.c:164

5093 +#: ref-filter.c:167

5094 #, c-format

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

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

5097

5064 -#: ref-filter.c:186

5098 +#: ref-filter.c:189

5099 #, c-format

5100 msgid "Integer value expected refname:lstrip=%s"

5101 msgstr "期望整数值 refname:lstrip=%s"

5102

5069 -#: ref-filter.c:190

5103 +#: ref-filter.c:193

5104 #, c-format

5105 msgid "Integer value expected refname:rstrip=%s"

5106 msgstr "期望整数值 refname:rstrip=%s"

5107

5074 -#: ref-filter.c:192

5108 +#: ref-filter.c:195

5109 #, c-format

5110 msgid "unrecognized %%(%s) argument: %s"

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

5112

5079 -#: ref-filter.c:247

5113 +#: ref-filter.c:250

5114 #, c-format

5115 msgid "%%(objecttype) does not take arguments"

5116 msgstr "%%(objecttype) 不带参数"

5117

5084 -#: ref-filter.c:269

5118 +#: ref-filter.c:272

5119 #, c-format

5120 msgid "unrecognized %%(objectsize) argument: %s"

5121 msgstr "未能识别的 %%(objectsize) 参数：%s"

5122

5089 -#: ref-filter.c:277

5123 +#: ref-filter.c:280

5124 #, c-format

5125 msgid "%%(deltabase) does not take arguments"

5126 msgstr "%%(deltabase) 不带参数"

5127

5094 -#: ref-filter.c:289

5128 +#: ref-filter.c:292

5129 #, c-format

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

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

5132

5099 -#: ref-filter.c:298

5133 +#: ref-filter.c:301

5134 #, c-format

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

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

5137

5104 -#: ref-filter.c:320

5138 +#: ref-filter.c:323

5139 #, c-format

5140 msgid "unknown %%(trailers) argument: %s"

5141 msgstr "未知的 %%(trailers) 参数：%s"

5142

5109 -#: ref-filter.c:349

5143 +#: ref-filter.c:352

5144 #, c-format

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

5146 msgstr "期望一个正数 contents:lines=%s"

5147

5114 -#: ref-filter.c:351

5148 +#: ref-filter.c:354

5149 #, c-format

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

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

5152

5119 -#: ref-filter.c:366

5153 +#: ref-filter.c:369

5154 #, c-format

5155 msgid "positive value expected objectname:short=%s"

5156 msgstr "期望一个正数 objectname:short=%s"

5157

5124 -#: ref-filter.c:370

5158 +#: ref-filter.c:373

5159 #, c-format

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

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

5162

5129 -#: ref-filter.c:400

5163 +#: ref-filter.c:403

5164 #, c-format

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

5166 msgstr "期望的格式：%%(align:<宽度>,<位置>)"

5167

5134 -#: ref-filter.c:412

5168 +#: ref-filter.c:415

5169 #, c-format

5170 msgid "unrecognized position:%s"

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

5172

5139 -#: ref-filter.c:419

5173 +#: ref-filter.c:422

5174 #, c-format

5175 msgid "unrecognized width:%s"

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

5177

5144 -#: ref-filter.c:428

5178 +#: ref-filter.c:431

5179 #, c-format

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

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

5182

5149 -#: ref-filter.c:436

5183 +#: ref-filter.c:439

5184 #, c-format

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

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

5187

5154 -#: ref-filter.c:454

5188 +#: ref-filter.c:457

5189 #, c-format

5190 msgid "unrecognized %%(if) argument: %s"

5191 msgstr "未能识别的 %%(if) 参数：%s"

5192

5159 -#: ref-filter.c:556

5193 +#: ref-filter.c:559

5194 #, c-format

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

5196 msgstr "格式错误的字段名：%.*s"

5197

5164 -#: ref-filter.c:583

5198 +#: ref-filter.c:586

5199 #, c-format

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

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

5202

5169 -#: ref-filter.c:587

5203 +#: ref-filter.c:590

5204 #, c-format

5205 msgid ""

5206 "not a git repository, but the field '%.*s' requires access to object data"

5207 msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"

5208

5175 -#: ref-filter.c:711

5209 +#: ref-filter.c:714

5210 #, c-format

5211 msgid "format: %%(if) atom used without a %%(then) atom"

5212 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

5213

5180 -#: ref-filter.c:774

5214 +#: ref-filter.c:777

5215 #, c-format

5216 msgid "format: %%(then) atom used without an %%(if) atom"

5217 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

5218

5185 -#: ref-filter.c:776

5219 +#: ref-filter.c:779

5220 #, c-format

5221 msgid "format: %%(then) atom used more than once"

5222 msgstr "格式：%%(then) 元素用了多次"

5223

5190 -#: ref-filter.c:778

5224 +#: ref-filter.c:781

5225 #, c-format

5226 msgid "format: %%(then) atom used after %%(else)"

5227 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

5228

5195 -#: ref-filter.c:806

5229 +#: ref-filter.c:809

5230 #, c-format

5231 msgid "format: %%(else) atom used without an %%(if) atom"

5232 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

5233

5200 -#: ref-filter.c:808

5234 +#: ref-filter.c:811

5235 #, c-format

5236 msgid "format: %%(else) atom used without a %%(then) atom"

5237 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

5238

5205 -#: ref-filter.c:810

5239 +#: ref-filter.c:813

5240 #, c-format

5241 msgid "format: %%(else) atom used more than once"

5242 msgstr "格式：%%(else) 元素用了多次"

5243

5210 -#: ref-filter.c:825

5244 +#: ref-filter.c:828

5245 #, c-format

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

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

5248

5215 -#: ref-filter.c:882

5249 +#: ref-filter.c:885

5250 #, c-format

5251 msgid "malformed format string %s"

5252 msgstr "错误的格式化字符串 %s"

5253

5220 -#: ref-filter.c:1485

5254 +#: ref-filter.c:1488

5255 #, c-format

5256 msgid "no branch, rebasing %s"

5257 msgstr "非分支，正变基 %s"

5258

5225 -#: ref-filter.c:1488

5259 +#: ref-filter.c:1491

5260 #, c-format

5261 msgid "no branch, rebasing detached HEAD %s"

5262 msgstr "非分支，正变基分离头指针 %s"

5263

5230 -#: ref-filter.c:1491

5264 +#: ref-filter.c:1494

5265 #, c-format

5266 msgid "no branch, bisect started on %s"

5267 msgstr "非分支，二分查找开始于 %s"

5268

5235 -#: ref-filter.c:1501

5269 +#: ref-filter.c:1504

5270 msgid "no branch"

5271 msgstr "非分支"

5272

5239 -#: ref-filter.c:1537 ref-filter.c:1743

5273 +#: ref-filter.c:1540 ref-filter.c:1749

5274 #, c-format

5275 msgid "missing object %s for %s"

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

5277

5244 -#: ref-filter.c:1547

5278 +#: ref-filter.c:1550

5279 #, c-format

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

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

5282

5249 -#: ref-filter.c:1998

5283 +#: ref-filter.c:2004

5284 #, c-format

5285 msgid "malformed object at '%s'"

5286 msgstr "格式错误的对象 '%s'"

5287

5254 -#: ref-filter.c:2087

5288 +#: ref-filter.c:2093

5289 #, c-format

5290 msgid "ignoring ref with broken name %s"

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

5292

5259 -#: ref-filter.c:2382

5293 +#: ref-filter.c:2389

5294 #, c-format

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

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

5297

5264 -#: ref-filter.c:2482

5298 +#: ref-filter.c:2489

5299 #, c-format

5300 msgid "option `%s' is incompatible with --merged"

5301 msgstr "选项 `%s' 和 --merged 不兼容"

5302

5269 -#: ref-filter.c:2485

5303 +#: ref-filter.c:2492

5304 #, c-format

5305 msgid "option `%s' is incompatible with --no-merged"

5306 msgstr "选项 `%s' 和 --no-merged 不兼容"

5307

5274 -#: ref-filter.c:2495

5308 +#: ref-filter.c:2502

5309 #, c-format

5310 msgid "malformed object name %s"

5311 msgstr "格式错误的对象名 %s"

5312

5279 -#: ref-filter.c:2500

5313 +#: ref-filter.c:2507

5314 #, c-format

5315 msgid "option `%s' must point to a commit"

5316 msgstr "选项 `%s' 必须指向一个提交"

5317

5284 -#: remote.c:363

5318 +#: remote.c:366

5319 #, c-format

5320 msgid "config remote shorthand cannot begin with '/': %s"

5321 msgstr "配置的远程短名称不能以 '/' 开始：%s"

5322

5289 -#: remote.c:410

5323 +#: remote.c:413

5324 msgid "more than one receivepack given, using the first"

5325 msgstr "提供了一个以上的 receivepack，使用第一个"

5326

5293 -#: remote.c:418

5327 +#: remote.c:421

5328 msgid "more than one uploadpack given, using the first"

5329 msgstr "提供了一个以上的 uploadpack，使用第一个"

5330

5297 -#: remote.c:608

5331 +#: remote.c:611

5332 #, c-format

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

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

5335

5302 -#: remote.c:612

5336 +#: remote.c:615

5337 #, c-format

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

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

5340

5307 -#: remote.c:616

5341 +#: remote.c:619

5342 #, c-format

5343 msgid "%s tracks both %s and %s"

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

5345

5312 -#: remote.c:684

5346 +#: remote.c:687

5347 #, c-format

5348 msgid "key '%s' of pattern had no '*'"

5349 msgstr "模式的键 '%s' 没有 '*'"

5350

5317 -#: remote.c:694

5351 +#: remote.c:697

5352 #, c-format

5353 msgid "value '%s' of pattern has no '*'"

5354 msgstr "模式的值 '%s' 没有 '*'"

5355

5322 -#: remote.c:1000

5356 +#: remote.c:1003

5357 #, c-format

5358 msgid "src refspec %s does not match any"

5359 msgstr "源引用表达式 %s 没有匹配"

5360

5327 -#: remote.c:1005

5361 +#: remote.c:1008

5362 #, c-format

5363 msgid "src refspec %s matches more than one"

5364 msgstr "源引用表达式 %s 匹配超过一个"

@@ -5333,7 +5367,7 @@ msgstr "源引用表达式 %s 匹配超过一个"

5367 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

5368 #. the <src>.

5369 #.

5336 -#: remote.c:1020

5370 +#: remote.c:1023

5371 #, c-format

5372 msgid ""

5373 "The destination you provided is not a full refname (i.e.,\n"

@@ -5355,7 +5389,7 @@ msgstr ""

5389 "\n"

5390 "都不行，所以我们已放弃。您必须给出完整的引用。"

5391

5358 -#: remote.c:1040

5392 +#: remote.c:1043

5393 #, c-format

5394 msgid ""

5395 "The <src> part of the refspec is a commit object.\n"

@@ -5365,7 +5399,7 @@ msgstr ""

5399 "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"

5400 "'%s:refs/heads/%s' 推送么？"

5401

5368 -#: remote.c:1045

5402 +#: remote.c:1048

5403 #, c-format

5404 msgid ""

5405 "The <src> part of the refspec is a tag object.\n"

@@ -5375,7 +5409,7 @@ msgstr ""

5409 "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"

5410 "'%s:refs/tags/%s' 推送么？"

5411

5378 -#: remote.c:1050

5412 +#: remote.c:1053

5413 #, c-format

5414 msgid ""

5415 "The <src> part of the refspec is a tree object.\n"

@@ -5385,7 +5419,7 @@ msgstr ""

5419 "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"

5420 "'%s:refs/tags/%s' 推送么？"

5421

5388 -#: remote.c:1055

5422 +#: remote.c:1058

5423 #, c-format

5424 msgid ""

5425 "The <src> part of the refspec is a blob object.\n"

@@ -5395,114 +5429,114 @@ msgstr ""

5429 "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"

5430 "'%s:refs/tags/%s' 推送么？"

5431

5398 -#: remote.c:1091

5432 +#: remote.c:1094

5433 #, c-format

5434 msgid "%s cannot be resolved to branch"

5435 msgstr "%s 无法被解析为分支"

5436

5403 -#: remote.c:1102

5437 +#: remote.c:1105

5438 #, c-format

5439 msgid "unable to delete '%s': remote ref does not exist"

5440 msgstr "无法删除 '%s'：远程引用不存在"

5441

5408 -#: remote.c:1114

5442 +#: remote.c:1117

5443 #, c-format

5444 msgid "dst refspec %s matches more than one"

5445 msgstr "目标引用表达式 %s 匹配超过一个"

5446

5413 -#: remote.c:1121

5447 +#: remote.c:1124

5448 #, c-format

5449 msgid "dst ref %s receives from more than one src"

5450 msgstr "目标引用 %s 接收超过一个源"

5451

5418 -#: remote.c:1624 remote.c:1725

5452 +#: remote.c:1627 remote.c:1728

5453 msgid "HEAD does not point to a branch"

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

5455

5422 -#: remote.c:1633

5456 +#: remote.c:1636

5457 #, c-format

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

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

5460

5427 -#: remote.c:1636

5461 +#: remote.c:1639

5462 #, c-format

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

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

5465

5432 -#: remote.c:1642

5466 +#: remote.c:1645

5467 #, c-format

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

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

5470

5437 -#: remote.c:1657

5471 +#: remote.c:1660

5472 #, c-format

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

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

5475

5442 -#: remote.c:1669

5476 +#: remote.c:1672

5477 #, c-format

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

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

5480

5447 -#: remote.c:1679

5481 +#: remote.c:1682

5482 #, c-format

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

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

5485

5452 -#: remote.c:1692

5486 +#: remote.c:1695

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

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

5489

5456 -#: remote.c:1714

5490 +#: remote.c:1717

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

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

5493

5460 -#: remote.c:1840

5494 +#: remote.c:1843

5495 #, c-format

5496 msgid "couldn't find remote ref %s"

5497 msgstr "无法找到远程引用 %s"

5498

5465 -#: remote.c:1853

5499 +#: remote.c:1856

5500 #, c-format

5501 msgid "* Ignoring funny ref '%s' locally"

5502 msgstr "* 在本地忽略可笑的引用 '%s'"

5503

5470 -#: remote.c:2016

5504 +#: remote.c:2019

5505 #, c-format

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

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

5508

5475 -#: remote.c:2020

5509 +#: remote.c:2023

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

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

5512

5479 -#: remote.c:2023

5513 +#: remote.c:2026

5514 #, c-format

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

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

5517

5484 -#: remote.c:2027

5518 +#: remote.c:2030

5519 #, c-format

5520 msgid "Your branch and '%s' refer to different commits.\n"

5521 msgstr "您的分支和 '%s' 指向不同的提交。\n"

5522

5489 -#: remote.c:2030

5523 +#: remote.c:2033

5524 #, c-format

5525 msgid " (use \"%s\" for details)\n"

5526 msgstr " （使用 \"%s\" 查看详情）\n"

5527

5494 -#: remote.c:2034

5528 +#: remote.c:2037

5529 #, c-format

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

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

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

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

5534

5501 -#: remote.c:2040

5535 +#: remote.c:2043

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

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

5538

5505 -#: remote.c:2043

5539 +#: remote.c:2046

5540 #, c-format

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

5542 msgid_plural ""

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

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

5546

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

5514 -#: remote.c:2051

5548 +#: remote.c:2054

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

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

5551

5518 -#: remote.c:2054

5552 +#: remote.c:2057

5553 #, c-format

5554 msgid ""

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

@@ -5531,11 +5565,11 @@ msgstr[1] ""

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

5566

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

5534 -#: remote.c:2064

5568 +#: remote.c:2067

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

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

5571

5538 -#: remote.c:2247

5572 +#: remote.c:2250

5573 #, c-format

5574 msgid "cannot parse expected object name '%s'"

5575 msgstr "无法解析期望的对象名 '%s'"

@@ -5613,7 +5647,7 @@ msgstr "不能删除 stray '%s'"

5647 msgid "Recorded preimage for '%s'"

5648 msgstr "为 '%s' 记录 preimage"

5649

5616 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773

5650 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5651 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5652 #, c-format

5653 msgid "could not create directory '%s'"

@@ -5648,20 +5682,20 @@ msgstr "忘记 '%s' 的解决方案\n"

5682 msgid "unable to open rr-cache directory"

5683 msgstr "不能打开 rr-cache 目录"

5684

5651 -#: revision.c:2507

5685 +#: revision.c:2509

5686 msgid "your current branch appears to be broken"

5687 msgstr "您的当前分支好像被损坏"

5688

5655 -#: revision.c:2510

5689 +#: revision.c:2512

5690 #, c-format

5691 msgid "your current branch '%s' does not have any commits yet"

5692 msgstr "您的当前分支 '%s' 尚无任何提交"

5693

5660 -#: revision.c:2710

5694 +#: revision.c:2720

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

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

5697

5664 -#: revision.c:2714

5698 +#: revision.c:2724

5699 msgid "-L does not yet support diff formats besides -p and -s"

5700 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

5701

@@ -5683,39 +5717,39 @@ msgstr ""

5717 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"

5718 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"

5719

5686 -#: send-pack.c:141

5720 +#: send-pack.c:142

5721 msgid "unexpected flush packet while reading remote unpack status"

5722 msgstr "读取远程解包状态时收到意外的 flush 包"

5723

5690 -#: send-pack.c:143

5724 +#: send-pack.c:144

5725 #, c-format

5726 msgid "unable to parse remote unpack status: %s"

5727 msgstr "不能解析远程解包状态：%s"

5728

5695 -#: send-pack.c:145

5729 +#: send-pack.c:146

5730 #, c-format

5731 msgid "remote unpack failed: %s"

5732 msgstr "远程解包失败：%s"

5733

5700 -#: send-pack.c:306

5734 +#: send-pack.c:307

5735 msgid "failed to sign the push certificate"

5736 msgstr "为推送证书签名失败"

5737

5704 -#: send-pack.c:420

5738 +#: send-pack.c:421

5739 msgid "the receiving end does not support --signed push"

5740 msgstr "接收端不支持签名推送"

5741

5708 -#: send-pack.c:422

5742 +#: send-pack.c:423

5743 msgid ""

5744 "not sending a push certificate since the receiving end does not support --"

5745 "signed push"

5746 msgstr "未发送推送证书，因为接收端不支持签名推送"

5747

5714 -#: send-pack.c:434

5748 +#: send-pack.c:435

5749 msgid "the receiving end does not support --atomic push"

5750 msgstr "接收端不支持原子推送"

5751

5718 -#: send-pack.c:439

5752 +#: send-pack.c:440

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

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

5755

@@ -5729,7 +5763,7 @@ msgstr "无效的提交信息清理模式 '%s'"

5763 msgid "could not delete '%s'"

5764 msgstr "无法删除 '%s'"

5765

5732 -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5766 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

5767 #, c-format

5768 msgid "could not remove '%s'"

5769 msgstr "无法删除 '%s'"

@@ -5768,7 +5802,7 @@ msgstr ""

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

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

5804

5771 -#: sequencer.c:401 sequencer.c:2909

5805 +#: sequencer.c:401 sequencer.c:2847

5806 #, c-format

5807 msgid "could not lock '%s'"

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

@@ -5778,15 +5812,15 @@ msgstr "不能锁定 '%s'"

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

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

5814

5781 -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5782 -#: sequencer.c:3192

5815 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5816 +#: sequencer.c:3130

5817 #, c-format

5818 msgid "failed to finalize '%s'"

5819 msgstr "无法完成 '%s'"

5820

5787 -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5788 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5789 -#: builtin/merge.c:1112 builtin/rebase.c:567

5821 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

5822 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

5823 +#: builtin/rebase.c:568

5824 #, c-format

5825 msgid "could not read '%s'"

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

@@ -5813,70 +5847,65 @@ msgstr "无效的清理模式 %s"

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

5848 #. "rebase -i".

5849 #.

5816 -#: sequencer.c:632

5850 +#: sequencer.c:631

5851 #, c-format

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

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

5854

5821 -#: sequencer.c:649

5855 +#: sequencer.c:648

5856 msgid "unable to update cache tree"

5857 msgstr "不能更新缓存树"

5858

5825 -#: sequencer.c:663

5859 +#: sequencer.c:662

5860 msgid "could not resolve HEAD commit"

5861 msgstr "不能解析 HEAD 提交"

5862

5829 -#: sequencer.c:743

5863 +#: sequencer.c:742

5864 #, c-format

5865 msgid "no key present in '%.*s'"

5866 msgstr "在 '%.*s' 中没有 key"

5867

5834 -#: sequencer.c:754

5868 +#: sequencer.c:753

5869 #, c-format

5870 msgid "unable to dequote value of '%s'"

5871 msgstr "无法为 '%s' 的值去引号"

5872

5839 -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5840 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

5873 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

5874 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

5875 #, c-format

5876 msgid "could not open '%s' for reading"

5877 msgstr "无法打开 '%s' 进行读取"

5878

5845 -#: sequencer.c:801

5879 +#: sequencer.c:800

5880 msgid "'GIT_AUTHOR_NAME' already given"

5881 msgstr "已经给出 'GIT_AUTHOR_NAME'"

5882

5849 -#: sequencer.c:806

5883 +#: sequencer.c:805

5884 msgid "'GIT_AUTHOR_EMAIL' already given"

5885 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"

5886

5853 -#: sequencer.c:811

5887 +#: sequencer.c:810

5888 msgid "'GIT_AUTHOR_DATE' already given"

5889 msgstr "已经给出 'GIT_AUTHOR_DATE'"

5890

5857 -#: sequencer.c:815

5891 +#: sequencer.c:814

5892 #, c-format

5893 msgid "unknown variable '%s'"

5894 msgstr "未知变量 '%s'"

5895

5862 -#: sequencer.c:820

5896 +#: sequencer.c:819

5897 msgid "missing 'GIT_AUTHOR_NAME'"

5898 msgstr "缺少 'GIT_AUTHOR_NAME'"

5899

5866 -#: sequencer.c:822

5900 +#: sequencer.c:821

5901 msgid "missing 'GIT_AUTHOR_EMAIL'"

5902 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

5903

5870 -#: sequencer.c:824

5904 +#: sequencer.c:823

5905 msgid "missing 'GIT_AUTHOR_DATE'"

5906 msgstr "缺少 'GIT_AUTHOR_DATE'"

5907

5874 -#: sequencer.c:884

5875 -#, c-format

5876 -msgid "invalid date format '%s' in '%s'"

5877 -msgstr "'%2$s' 中无效的日期格式 '%1$s'"

5878 -

5879 -#: sequencer.c:901

5908 +#: sequencer.c:872

5909 #, c-format

5910 msgid ""

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

@@ -5905,15 +5934,11 @@ msgstr ""

5934 "\n"

5935 " git rebase --continue\n"

5936

5908 -#: sequencer.c:995

5909 -msgid "writing root commit"

5910 -msgstr "写根提交"

5911 -

5912 -#: sequencer.c:1216

5937 +#: sequencer.c:1146

5938 msgid "'prepare-commit-msg' hook failed"

5939 msgstr "'prepare-commit-msg' 钩子失败"

5940

5916 -#: sequencer.c:1223

5941 +#: sequencer.c:1153

5942 msgid ""

5943 "Your name and email address were configured automatically based\n"

5944 "on your username and hostname. Please check that they are accurate.\n"

@@ -5937,7 +5962,7 @@ msgstr ""

5962 "\n"

5963 " git commit --amend --reset-author\n"

5964

5940 -#: sequencer.c:1236

5965 +#: sequencer.c:1166

5966 msgid ""

5967 "Your name and email address were configured automatically based\n"

5968 "on your username and hostname. Please check that they are accurate.\n"

@@ -5960,326 +5985,326 @@ msgstr ""

5985 "\n"

5986 " git commit --amend --reset-author\n"

5987

5963 -#: sequencer.c:1278

5988 +#: sequencer.c:1208

5989 msgid "couldn't look up newly created commit"

5990 msgstr "无法找到新创建的提交"

5991

5967 -#: sequencer.c:1280

5992 +#: sequencer.c:1210

5993 msgid "could not parse newly created commit"

5994 msgstr "不能解析新创建的提交"

5995

5971 -#: sequencer.c:1326

5996 +#: sequencer.c:1256

5997 msgid "unable to resolve HEAD after creating commit"

5998 msgstr "创建提交后，不能解析 HEAD"

5999

5975 -#: sequencer.c:1328

6000 +#: sequencer.c:1258

6001 msgid "detached HEAD"

6002 msgstr "分离头指针"

6003

6004 # 译者：中文字符串拼接，可删除前导空格

5980 -#: sequencer.c:1332

6005 +#: sequencer.c:1262

6006 msgid " (root-commit)"

6007 msgstr "（根提交）"

6008

5984 -#: sequencer.c:1353

6009 +#: sequencer.c:1283

6010 msgid "could not parse HEAD"

6011 msgstr "不能解析 HEAD"

6012

5988 -#: sequencer.c:1355

6013 +#: sequencer.c:1285

6014 #, c-format

6015 msgid "HEAD %s is not a commit!"

6016 msgstr "HEAD %s 不是一个提交！"

6017

5993 -#: sequencer.c:1359 builtin/commit.c:1571

6018 +#: sequencer.c:1289 builtin/commit.c:1571

6019 msgid "could not parse HEAD commit"

6020 msgstr "不能解析 HEAD 提交"

6021

5997 -#: sequencer.c:1411 sequencer.c:2004

6022 +#: sequencer.c:1341 sequencer.c:1933

6023 msgid "unable to parse commit author"

6024 msgstr "不能解析提交作者"

6025

6001 -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

6026 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

6027 msgid "git write-tree failed to write a tree"

6028 msgstr "git write-tree 无法写入树对象"

6029

6005 -#: sequencer.c:1438 sequencer.c:1499

6030 +#: sequencer.c:1369 sequencer.c:1429

6031 #, c-format

6032 msgid "unable to read commit message from '%s'"

6033 msgstr "不能从 '%s' 读取提交说明"

6034

6010 -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

6011 -#: builtin/merge.c:903

6035 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

6036 +#: builtin/merge.c:908

6037 msgid "failed to write commit object"

6038 msgstr "写提交对象失败"

6039

6015 -#: sequencer.c:1526

6040 +#: sequencer.c:1456

6041 #, c-format

6042 msgid "could not parse commit %s"

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

6044

6020 -#: sequencer.c:1531

6045 +#: sequencer.c:1461

6046 #, c-format

6047 msgid "could not parse parent commit %s"

6048 msgstr "不能解析父提交 %s"

6049

6025 -#: sequencer.c:1605 sequencer.c:1715

6050 +#: sequencer.c:1535 sequencer.c:1645

6051 #, c-format

6052 msgid "unknown command: %d"

6053 msgstr "未知命令：%d"

6054

6030 -#: sequencer.c:1662 sequencer.c:1687

6055 +#: sequencer.c:1592 sequencer.c:1617

6056 #, c-format

6057 msgid "This is a combination of %d commits."

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

6059

6035 -#: sequencer.c:1672

6060 +#: sequencer.c:1602

6061 msgid "need a HEAD to fixup"

6062 msgstr "需要一个 HEAD 来修复"

6063

6039 -#: sequencer.c:1674 sequencer.c:3219

6064 +#: sequencer.c:1604 sequencer.c:3157

6065 msgid "could not read HEAD"

6066 msgstr "不能读取 HEAD"

6067

6043 -#: sequencer.c:1676

6068 +#: sequencer.c:1606

6069 msgid "could not read HEAD's commit message"

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

6071

6047 -#: sequencer.c:1682

6072 +#: sequencer.c:1612

6073 #, c-format

6074 msgid "cannot write '%s'"

6075 msgstr "不能写 '%s'"

6076

6052 -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

6077 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

6078 msgid "This is the 1st commit message:"

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

6080

6056 -#: sequencer.c:1697

6081 +#: sequencer.c:1627

6082 #, c-format

6083 msgid "could not read commit message of %s"

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

6085

6061 -#: sequencer.c:1704

6086 +#: sequencer.c:1634

6087 #, c-format

6088 msgid "This is the commit message #%d:"

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

6090

6066 -#: sequencer.c:1710

6091 +#: sequencer.c:1640

6092 #, c-format

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

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

6095

6071 -#: sequencer.c:1798

6096 +#: sequencer.c:1728

6097 msgid "your index file is unmerged."

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

6099

6075 -#: sequencer.c:1805

6100 +#: sequencer.c:1735

6101 msgid "cannot fixup root commit"

6102 msgstr "不能修复根提交"

6103

6079 -#: sequencer.c:1824

6104 +#: sequencer.c:1754

6105 #, c-format

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

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

6108

6084 -#: sequencer.c:1832 sequencer.c:1840

6109 +#: sequencer.c:1762 sequencer.c:1770

6110 #, c-format

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

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

6113

6089 -#: sequencer.c:1846

6114 +#: sequencer.c:1776

6115 #, c-format

6116 msgid "cannot get commit message for %s"

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

6118

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

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

6096 -#: sequencer.c:1865

6121 +#: sequencer.c:1795

6122 #, c-format

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

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

6125

6101 -#: sequencer.c:1930

6126 +#: sequencer.c:1860

6127 #, c-format

6128 msgid "could not rename '%s' to '%s'"

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

6130

6106 -#: sequencer.c:1985

6131 +#: sequencer.c:1915

6132 #, c-format

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

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

6135

6111 -#: sequencer.c:1986

6136 +#: sequencer.c:1916

6137 #, c-format

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

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

6140

6116 -#: sequencer.c:2045

6141 +#: sequencer.c:1983

6142 #, c-format

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

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

6145

6121 -#: sequencer.c:2052

6146 +#: sequencer.c:1990

6147 #, c-format

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

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

6150

6126 -#: sequencer.c:2128

6151 +#: sequencer.c:2066

6152 #, c-format

6153 msgid "%s does not accept arguments: '%s'"

6154 msgstr "%s 不接受参数：'%s'"

6155

6131 -#: sequencer.c:2137

6156 +#: sequencer.c:2075

6157 #, c-format

6158 msgid "missing arguments for %s"

6159 msgstr "缺少 %s 的参数"

6160

6136 -#: sequencer.c:2174

6161 +#: sequencer.c:2112

6162 #, c-format

6163 msgid "could not parse '%.*s'"

6164 msgstr "无法解析 '%.*s'"

6165

6141 -#: sequencer.c:2228

6166 +#: sequencer.c:2166

6167 #, c-format

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

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

6170

6146 -#: sequencer.c:2239

6171 +#: sequencer.c:2177

6172 #, c-format

6173 msgid "cannot '%s' without a previous commit"

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

6175

6151 -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

6176 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

6177 #: builtin/rebase.c:204 builtin/rebase.c:229

6178 #, c-format

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

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

6181

6157 -#: sequencer.c:2323

6182 +#: sequencer.c:2261

6183 msgid "cancelling a cherry picking in progress"

6184 msgstr "正在取消一个进行中的拣选"

6185

6161 -#: sequencer.c:2330

6186 +#: sequencer.c:2268

6187 msgid "cancelling a revert in progress"

6188 msgstr "正在取消一个进行中的还原"

6189

6165 -#: sequencer.c:2364

6190 +#: sequencer.c:2302

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

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

6193

6169 -#: sequencer.c:2366

6194 +#: sequencer.c:2304

6195 #, c-format

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

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

6198

6174 -#: sequencer.c:2371

6199 +#: sequencer.c:2309

6200 msgid "no commits parsed."

6201 msgstr "没有解析提交。"

6202

6178 -#: sequencer.c:2382

6203 +#: sequencer.c:2320

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

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

6206

6182 -#: sequencer.c:2384

6207 +#: sequencer.c:2322

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

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

6210

6186 -#: sequencer.c:2466

6211 +#: sequencer.c:2404

6212 #, c-format

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

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

6215

6191 -#: sequencer.c:2553

6216 +#: sequencer.c:2491

6217 msgid "unusable squash-onto"

6218 msgstr "不可用的 squash-onto"

6219

6195 -#: sequencer.c:2569

6220 +#: sequencer.c:2507

6221 #, c-format

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

6223 msgstr "格式错误的选项清单：'%s'"

6224

6200 -#: sequencer.c:2652 sequencer.c:4351

6225 +#: sequencer.c:2590 sequencer.c:4308

6226 msgid "empty commit set passed"

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

6228

6204 -#: sequencer.c:2668

6229 +#: sequencer.c:2606

6230 msgid "revert is already in progress"

6231 msgstr "一个还原操作已在进行"

6232

6208 -#: sequencer.c:2670

6233 +#: sequencer.c:2608

6234 #, c-format

6235 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6236 msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""

6237

6213 -#: sequencer.c:2673

6238 +#: sequencer.c:2611

6239 msgid "cherry-pick is already in progress"

6240 msgstr "拣选操作已在进行"

6241

6217 -#: sequencer.c:2675

6242 +#: sequencer.c:2613

6243 #, c-format

6244 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6245 msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""

6246

6222 -#: sequencer.c:2689

6247 +#: sequencer.c:2627

6248 #, c-format

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

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

6251

6227 -#: sequencer.c:2704

6252 +#: sequencer.c:2642

6253 msgid "could not lock HEAD"

6254 msgstr "不能锁定 HEAD"

6255

6231 -#: sequencer.c:2764 sequencer.c:4103

6256 +#: sequencer.c:2702 sequencer.c:4057

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

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

6259

6235 -#: sequencer.c:2766 sequencer.c:2777

6260 +#: sequencer.c:2704 sequencer.c:2715

6261 msgid "cannot resolve HEAD"

6262 msgstr "不能解析 HEAD"

6263

6239 -#: sequencer.c:2768 sequencer.c:2812

6264 +#: sequencer.c:2706 sequencer.c:2750

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

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

6267

6243 -#: sequencer.c:2798 builtin/grep.c:734

6268 +#: sequencer.c:2736 builtin/grep.c:736

6269 #, c-format

6270 msgid "cannot open '%s'"

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

6272

6248 -#: sequencer.c:2800

6273 +#: sequencer.c:2738

6274 #, c-format

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

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

6277

6253 -#: sequencer.c:2801

6278 +#: sequencer.c:2739

6279 msgid "unexpected end of file"

6280 msgstr "意外的文件结束"

6281

6257 -#: sequencer.c:2807

6282 +#: sequencer.c:2745

6283 #, c-format

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

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

6286

l10n: zh_CN: for git v2.24.0 l10n round 1~2