6acbf03300 · matheusbsbs/matheus-bagliano

@@ -12,8 +12,8 @@ msgid ""

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2014-04-23 12:50+0800\n"

16 -"PO-Revision-Date: 2014-04-23 12:53+0800\n"

15 +"POT-Creation-Date: 2014-08-04 14:48+0800\n"

16 +"PO-Revision-Date: 2014-08-04 16:16+0800\n"

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

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

19 "Language: zh_CN\n"

@@ -27,16 +27,14 @@ msgstr ""

27 msgid "hint: %.*s\n"

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

29

30 -#: advice.c:85

30 +#: advice.c:88

31 msgid ""

32 -"Fix them up in the work tree,\n"

33 -"and then use 'git add/rm <file>' as\n"

34 -"appropriate to mark resolution and make a commit,\n"

35 -"or use 'git commit -a'."

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

33 +"as appropriate to mark resolution and make a commit, or use\n"

34 +"'git commit -a'."

35 msgstr ""

37 -"请先在工作区改正文件，然后酌情使用\n"

38 -"'git add/rm <file>' 标记解决方案，\n"

39 -"或使用 'git commit -a'。"

36 +"请在工作区改正文件，然后酌情使用 'git add/rm <file>' 命令标记\n"

37 +"解决方案并提交，或者使用 'git commit -a'。"

38

39 #: archive.c:10

40 msgid "git archive [options] <tree-ish> [<path>...]"

@@ -56,7 +54,7 @@ msgstr ""

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

55 msgstr "git archive --remote <版本库> [--exec <命令>] --list"

56

59 -#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328

57 +#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

58 #, c-format

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

60 msgstr "路径规则 '%s' 未匹配任何文件"

@@ -69,7 +67,7 @@ msgstr "格式"

67 msgid "archive format"

68 msgstr "归档格式"

69

72 -#: archive.c:329 builtin/log.c:1193

70 +#: archive.c:329 builtin/log.c:1201

71 msgid "prefix"

72 msgstr "前缀"

73

@@ -77,9 +75,9 @@ msgstr "前缀"

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

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

77

80 -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2265

81 -#: builtin/blame.c:2266 builtin/config.c:57 builtin/fast-export.c:680

82 -#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77

78 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517

79 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709

80 +#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77

81 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

82 #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

83 msgid "file"

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

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

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

262

265 -#: bundle.c:86 builtin/commit.c:706

263 +#: bundle.c:86 builtin/commit.c:755

264 #, c-format

265 msgid "could not open '%s'"

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

@@ -271,8 +269,8 @@ msgstr "不能打开 '%s'"

269 msgid "Repository lacks these prerequisite commits:"

270 msgstr "版本库缺少这些必备的提交："

271

274 -#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332

275 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

272 +#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330

273 +#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

274 #: builtin/shortlog.c:158

275 msgid "revision walk setup failed"

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

@@ -295,47 +293,47 @@ msgid_plural "The bundle requires these %d refs:"

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

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

295

298 -#: bundle.c:293

296 +#: bundle.c:289

297 msgid "rev-list died"

298 msgstr "rev-list 终止"

299

302 -#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261

300 +#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

301 #, c-format

302 msgid "unrecognized argument: %s"

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

304

307 -#: bundle.c:334

305 +#: bundle.c:330

306 #, c-format

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

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

309

312 -#: bundle.c:379

310 +#: bundle.c:375

311 msgid "Refusing to create empty bundle."

312 msgstr "不能创建空包。"

313

316 -#: bundle.c:395

314 +#: bundle.c:390

315 msgid "Could not spawn pack-objects"

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

317

320 -#: bundle.c:413

318 +#: bundle.c:408

319 msgid "pack-objects died"

320 msgstr "pack-objects 终止"

321

324 -#: bundle.c:416

322 +#: bundle.c:411

323 #, c-format

324 msgid "cannot create '%s'"

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

326

329 -#: bundle.c:438

327 +#: bundle.c:433

328 msgid "index-pack died"

329 msgstr "index-pack 终止"

330

333 -#: commit.c:54

331 +#: commit.c:40

332 #, c-format

333 msgid "could not parse %s"

334 msgstr "不能解析 %s"

335

338 -#: commit.c:56

336 +#: commit.c:42

337 #, c-format

338 msgid "%s %s is not a commit!"

339 msgstr "%s %s 不是一个提交!"

@@ -431,28 +429,28 @@ msgstr[1] "%lu 年前"

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

430 msgstr "无法读取排序文件 '%s'"

431

434 -#: diffcore-rename.c:517

432 +#: diffcore-rename.c:514

433 msgid "Performing inexact rename detection"

434 msgstr "正在进行非精确的重命名检测"

435

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

439 -#: diff.c:113

437 +#: diff.c:114

438 #, c-format

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

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

441

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

445 -#: diff.c:118

443 +#: diff.c:119

444 #, c-format

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

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

447

450 -#: diff.c:213

448 +#: diff.c:214

449 #, c-format

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

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

452

455 -#: diff.c:263

453 +#: diff.c:267

454 #, c-format

455 msgid ""

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

@@ -461,7 +459,16 @@ msgstr ""

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

460 "%s"

461

464 -#: diff.c:3495

462 +#: diff.c:2934

463 +#, c-format

464 +msgid "external diff died, stopping at %s"

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

466 +

467 +#: diff.c:3329

468 +msgid "--follow requires exactly one pathspec"

469 +msgstr "--follow 参数后只跟一个 pathspec"

470 +

471 +#: diff.c:3492

472 #, c-format

473 msgid ""

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

@@ -470,58 +477,58 @@ msgstr ""

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

478 "%s"

479

473 -#: diff.c:3509

480 +#: diff.c:3506

481 #, c-format

482 msgid "Failed to parse --submodule option parameter: '%s'"

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

484

478 -#: gpg-interface.c:59 gpg-interface.c:131

485 +#: gpg-interface.c:73 gpg-interface.c:145

486 msgid "could not run gpg."

487 msgstr "不能执行 gpg。"

488

482 -#: gpg-interface.c:71

489 +#: gpg-interface.c:85

490 msgid "gpg did not accept the data"

491 msgstr "gpg 没有接受数据"

492

486 -#: gpg-interface.c:82

493 +#: gpg-interface.c:96

494 msgid "gpg failed to sign the data"

495 msgstr "gpg 无法为数据签名"

496

490 -#: gpg-interface.c:115

497 +#: gpg-interface.c:129

498 #, c-format

499 msgid "could not create temporary file '%s': %s"

500 msgstr "不能创建临时文件 '%s'：%s"

501

495 -#: gpg-interface.c:118

502 +#: gpg-interface.c:132

503 #, c-format

504 msgid "failed writing detached signature to '%s': %s"

505 msgstr "无法将分离式签名写入 '%s'：%s"

506

500 -#: grep.c:1698

507 +#: grep.c:1703

508 #, c-format

509 msgid "'%s': unable to read %s"

510 msgstr "'%s'：无法读取 %s"

511

505 -#: grep.c:1715

512 +#: grep.c:1720

513 #, c-format

514 msgid "'%s': %s"

515 msgstr "'%s'：%s"

516

510 -#: grep.c:1726

517 +#: grep.c:1731

518 #, c-format

519 msgid "'%s': short read %s"

520 msgstr "'%s'：读取不完整 %s"

521

515 -#: help.c:209

522 +#: help.c:207

523 #, c-format

524 msgid "available git commands in '%s'"

525 msgstr "在 '%s' 下可用的 git 命令"

526

520 -#: help.c:216

527 +#: help.c:214

528 msgid "git commands available from elsewhere on your $PATH"

529 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

530

524 -#: help.c:232

531 +#: help.c:230

532 msgid "The most commonly used git commands are:"

533 msgstr "最常用的 git 命令有："

534

@@ -557,7 +564,7 @@ msgstr "在 %0.1f 秒钟后自动运行..."

564 msgid "git: '%s' is not a git command. See 'git --help'."

565 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

566

560 -#: help.c:384 help.c:443

567 +#: help.c:384 help.c:444

568 msgid ""

569 "\n"

570 "Did you mean this?"

@@ -571,16 +578,16 @@ msgstr[1] ""

578 "\n"

579 "您指的是这其中的某一个么？"

580

574 -#: help.c:439

581 +#: help.c:440

582 #, c-format

583 msgid "%s: %s - %s"

584 msgstr "%s：%s - %s"

585

579 -#: merge.c:56

586 +#: merge.c:40

587 msgid "failed to read the cache"

588 msgstr "无法读取缓存"

589

583 -#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558

590 +#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

591 #: builtin/clone.c:661

592 msgid "unable to write new index file"

593 msgstr "无法写新的索引文件"

@@ -590,7 +597,7 @@ msgstr "无法写新的索引文件"

597 msgid "(bad commit)\n"

598 msgstr "（坏提交）\n"

599

593 -#: merge-recursive.c:208

600 +#: merge-recursive.c:210

601 #, c-format

602 msgid "addinfo_cache failed for path '%s'"

603 msgstr "为路径 '%s' addinfo_cache 失败"

@@ -599,64 +606,64 @@ msgstr "为路径 '%s' addinfo_cache 失败"

606 msgid "error building trees"

607 msgstr "无法创建树"

608

602 -#: merge-recursive.c:675

609 +#: merge-recursive.c:692

610 #, c-format

611 msgid "failed to create path '%s'%s"

612 msgstr "无法创建路径 '%s'%s"

613

607 -#: merge-recursive.c:686

614 +#: merge-recursive.c:703

615 #, c-format

616 msgid "Removing %s to make room for subdirectory\n"

617 msgstr "删除 %s 以便为子目录留出空间\n"

618

612 -#: merge-recursive.c:700 merge-recursive.c:721

619 +#: merge-recursive.c:717 merge-recursive.c:738

620 msgid ": perhaps a D/F conflict?"

621 msgstr "：可能是一个目录/文件冲突？"

622

616 -#: merge-recursive.c:711

623 +#: merge-recursive.c:728

624 #, c-format

625 msgid "refusing to lose untracked file at '%s'"

626 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

627

621 -#: merge-recursive.c:751

628 +#: merge-recursive.c:768

629 #, c-format

630 msgid "cannot read object %s '%s'"

631 msgstr "不能读取对象 %s '%s'"

632

626 -#: merge-recursive.c:753

633 +#: merge-recursive.c:770

634 #, c-format

635 msgid "blob expected for %s '%s'"

636 msgstr "%s '%s' 应为数据（blob）对象"

637

631 -#: merge-recursive.c:776 builtin/clone.c:317

638 +#: merge-recursive.c:793 builtin/clone.c:317

639 #, c-format

640 msgid "failed to open '%s'"

641 msgstr "无法打开 '%s'"

642

636 -#: merge-recursive.c:784

643 +#: merge-recursive.c:801

644 #, c-format

645 msgid "failed to symlink '%s'"

646 msgstr "无法创建符号链接 '%s'"

647

641 -#: merge-recursive.c:787

648 +#: merge-recursive.c:804

649 #, c-format

650 msgid "do not know what to do with %06o %s '%s'"

651 msgstr "不知道如何处理 %06o %s '%s'"

652

646 -#: merge-recursive.c:925

653 +#: merge-recursive.c:942

654 msgid "Failed to execute internal merge"

655 msgstr "无法执行内部合并"

656

650 -#: merge-recursive.c:929

657 +#: merge-recursive.c:946

658 #, c-format

659 msgid "Unable to add %s to database"

660 msgstr "不能添加 %s 至对象库"

661

655 -#: merge-recursive.c:945

662 +#: merge-recursive.c:962

663 msgid "unsupported object type in the tree"

664 msgstr "在树中有不支持的对象类型"

665

659 -#: merge-recursive.c:1024 merge-recursive.c:1038

666 +#: merge-recursive.c:1037 merge-recursive.c:1051

667 #, c-format

668 msgid ""

669 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -665,7 +672,7 @@ msgstr ""

672 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

673 "的版本被保留。"

674

668 -#: merge-recursive.c:1030 merge-recursive.c:1043

675 +#: merge-recursive.c:1043 merge-recursive.c:1056

676 #, c-format

677 msgid ""

678 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -674,20 +681,20 @@ msgstr ""

681 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

682 "的版本保留于 %8$s 中。"

683

677 -#: merge-recursive.c:1084

684 +#: merge-recursive.c:1097

685 msgid "rename"

686 msgstr "重命名"

687

681 -#: merge-recursive.c:1084

688 +#: merge-recursive.c:1097

689 msgid "renamed"

690 msgstr "重命名"

691

685 -#: merge-recursive.c:1140

692 +#: merge-recursive.c:1153

693 #, c-format

694 msgid "%s is a directory in %s adding as %s instead"

695 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

696

690 -#: merge-recursive.c:1162

697 +#: merge-recursive.c:1175

698 #, c-format

699 msgid ""

700 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -696,196 +703,196 @@ msgstr ""

703 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

704 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

705

699 -#: merge-recursive.c:1167

706 +#: merge-recursive.c:1180

707 msgid " (left unresolved)"

708 msgstr "（留下未解决）"

709

703 -#: merge-recursive.c:1221

710 +#: merge-recursive.c:1234

711 #, c-format

712 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

713 msgstr ""

714 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

715 "%5$s"

716

710 -#: merge-recursive.c:1251

717 +#: merge-recursive.c:1264

718 #, c-format

719 msgid "Renaming %s to %s and %s to %s instead"

720 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

721

715 -#: merge-recursive.c:1450

722 +#: merge-recursive.c:1463

723 #, c-format

724 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

725 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

726

720 -#: merge-recursive.c:1460

727 +#: merge-recursive.c:1473

728 #, c-format

729 msgid "Adding merged %s"

730 msgstr "添加合并后的 %s"

731

725 -#: merge-recursive.c:1465 merge-recursive.c:1663

732 +#: merge-recursive.c:1478 merge-recursive.c:1676

733 #, c-format

734 msgid "Adding as %s instead"

735 msgstr "而是以 %s 为名添加"

736

730 -#: merge-recursive.c:1516

737 +#: merge-recursive.c:1529

738 #, c-format

739 msgid "cannot read object %s"

740 msgstr "不能读取对象 %s"

741

735 -#: merge-recursive.c:1519

742 +#: merge-recursive.c:1532

743 #, c-format

744 msgid "object %s is not a blob"

745 msgstr "对象 %s 不是一个数据（blob）对象"

746

740 -#: merge-recursive.c:1567

747 +#: merge-recursive.c:1580

748 msgid "modify"

749 msgstr "修改"

750

744 -#: merge-recursive.c:1567

751 +#: merge-recursive.c:1580

752 msgid "modified"

753 msgstr "修改"

754

748 -#: merge-recursive.c:1577

755 +#: merge-recursive.c:1590

756 msgid "content"

757 msgstr "内容"

758

752 -#: merge-recursive.c:1584

759 +#: merge-recursive.c:1597

760 msgid "add/add"

761 msgstr "添加/添加"

762

756 -#: merge-recursive.c:1618

763 +#: merge-recursive.c:1631

764 #, c-format

765 msgid "Skipped %s (merged same as existing)"

766 msgstr "略过 %s（已经做过相同合并）"

767

761 -#: merge-recursive.c:1632

768 +#: merge-recursive.c:1645

769 #, c-format

770 msgid "Auto-merging %s"

771 msgstr "自动合并 %s"

772

766 -#: merge-recursive.c:1636 git-submodule.sh:1149

773 +#: merge-recursive.c:1649 git-submodule.sh:1150

774 msgid "submodule"

775 msgstr "子模组"

776

770 -#: merge-recursive.c:1637

777 +#: merge-recursive.c:1650

778 #, c-format

779 msgid "CONFLICT (%s): Merge conflict in %s"

780 msgstr "冲突（%s）：合并冲突于 %s"

781

775 -#: merge-recursive.c:1727

782 +#: merge-recursive.c:1740

783 #, c-format

784 msgid "Removing %s"

785 msgstr "删除 %s"

786

780 -#: merge-recursive.c:1752

787 +#: merge-recursive.c:1765

788 msgid "file/directory"

789 msgstr "文件/目录"

790

784 -#: merge-recursive.c:1758

791 +#: merge-recursive.c:1771

792 msgid "directory/file"

793 msgstr "目录/文件"

794

788 -#: merge-recursive.c:1763

795 +#: merge-recursive.c:1776

796 #, c-format

797 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

798 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

799

793 -#: merge-recursive.c:1773

800 +#: merge-recursive.c:1786

801 #, c-format

802 msgid "Adding %s"

803 msgstr "添加 %s"

804

798 -#: merge-recursive.c:1790

805 +#: merge-recursive.c:1803

806 msgid "Fatal merge failure, shouldn't happen."

807 msgstr "严重的合并错误，不应发生。"

808

802 -#: merge-recursive.c:1809

809 +#: merge-recursive.c:1822

810 msgid "Already up-to-date!"

811 msgstr "已经是最新的！"

812

806 -#: merge-recursive.c:1818

813 +#: merge-recursive.c:1831

814 #, c-format

815 msgid "merging of trees %s and %s failed"

816 msgstr "无法合并树 %s 和 %s"

817

811 -#: merge-recursive.c:1848

818 +#: merge-recursive.c:1861

819 #, c-format

820 msgid "Unprocessed path??? %s"

821 msgstr "未处理的路径??? %s"

822

816 -#: merge-recursive.c:1893

823 +#: merge-recursive.c:1906

824 msgid "Merging:"

825 msgstr "合并："

826

820 -#: merge-recursive.c:1906

827 +#: merge-recursive.c:1919

828 #, c-format

829 msgid "found %u common ancestor:"

830 msgid_plural "found %u common ancestors:"

831 msgstr[0] "发现 %u 个共同祖先："

832 msgstr[1] "发现 %u 个共同祖先："

833

827 -#: merge-recursive.c:1943

834 +#: merge-recursive.c:1956

835 msgid "merge returned no commit"

836 msgstr "合并未返回提交"

837

831 -#: merge-recursive.c:2000

838 +#: merge-recursive.c:2013

839 #, c-format

840 msgid "Could not parse object '%s'"

841 msgstr "不能解析对象 '%s'"

842

836 -#: merge-recursive.c:2012 builtin/merge.c:668

843 +#: merge-recursive.c:2024 builtin/merge.c:666

844 msgid "Unable to write index."

845 msgstr "不能写入索引。"

846

840 -#: notes-utils.c:40

847 +#: notes-utils.c:41

848 msgid "Cannot commit uninitialized/unreferenced notes tree"

849 msgstr "不能提交未初始化/未引用的注解树"

850

844 -#: notes-utils.c:81

851 +#: notes-utils.c:83

852 #, c-format

853 msgid "Bad notes.rewriteMode value: '%s'"

854 msgstr "坏的 notes.rewriteMode 值：'%s'"

855

849 -#: notes-utils.c:91

856 +#: notes-utils.c:93

857 #, c-format

858 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

859 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

860

861 #. TRANSLATORS: The first %s is the name of the

862 #. environment variable, the second %s is its value

856 -#: notes-utils.c:118

863 +#: notes-utils.c:120

864 #, c-format

865 msgid "Bad %s value: '%s'"

866 msgstr "坏的 %s 值：'%s'"

867

861 -#: object.c:229

868 +#: object.c:234

869 #, c-format

870 msgid "unable to parse object: %s"

871 msgstr "不能解析对象：%s"

872

866 -#: parse-options.c:532

873 +#: parse-options.c:534

874 msgid "..."

875 msgstr "..."

876

870 -#: parse-options.c:550

877 +#: parse-options.c:552

878 #, c-format

879 msgid "usage: %s"

880 msgstr "用法：%s"

881

882 #. TRANSLATORS: the colon here should align with the

883 #. one in "usage: %s" translation

877 -#: parse-options.c:554

884 +#: parse-options.c:556

885 #, c-format

886 msgid " or: %s"

887 msgstr " 或：%s"

888

889 # 译者：为保证在输出中对齐，注意调整句中空格！

883 -#: parse-options.c:557

890 +#: parse-options.c:559

891 #, c-format

892 msgid " %s"

893 msgstr " %s"

894

888 -#: parse-options.c:591

895 +#: parse-options.c:593

896 msgid "-NUM"

897 msgstr "-数字"

898

@@ -938,12 +945,12 @@ msgstr "路径规则 '%s' 在子模组 '%.*s' 中"

945 msgid "%s: pathspec magic not supported by this command: %s"

946 msgstr "%s：路径规则神奇前缀不被此命令支持：%s"

947

941 -#: pathspec.c:433

948 +#: pathspec.c:432

949 #, c-format

950 msgid "pathspec '%s' is beyond a symbolic link"

951 msgstr "路径规则 '%s' 位于符号链接中"

952

946 -#: pathspec.c:442

953 +#: pathspec.c:441

954 msgid ""

955 "There is nothing to exclude from by :(exclude) patterns.\n"

956 "Perhaps you forgot to add either ':/' or '.' ?"

@@ -951,11 +958,11 @@ msgstr ""

958 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"

959 "添加 ':/' 或 '.' ？"

960

954 -#: progress.c:224

961 +#: progress.c:225

962 msgid "done"

963 msgstr "完成"

964

958 -#: read-cache.c:1238

965 +#: read-cache.c:1260

966 #, c-format

967 msgid ""

968 "index.version set, but the value is invalid.\n"

@@ -964,7 +971,7 @@ msgstr ""

971 "设置了 index.version，但是取值无效。\n"

972 "使用版本 %i"

973

967 -#: read-cache.c:1248

974 +#: read-cache.c:1270

975 #, c-format

976 msgid ""

977 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -973,51 +980,51 @@ msgstr ""

980 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

981 "使用版本 %i"

982

976 -#: remote.c:758

983 +#: remote.c:753

984 #, c-format

985 msgid "Cannot fetch both %s and %s to %s"

986 msgstr "不能同时获取 %s 和 %s 至 %s"

987

981 -#: remote.c:762

988 +#: remote.c:757

989 #, c-format

990 msgid "%s usually tracks %s, not %s"

991 msgstr "%s 通常跟踪 %s，而非 %s"

992

986 -#: remote.c:766

993 +#: remote.c:761

994 #, c-format

995 msgid "%s tracks both %s and %s"

996 msgstr "%s 同时跟踪 %s 和 %s"

997

991 -#: remote.c:774

998 +#: remote.c:769

999 msgid "Internal error"

1000 msgstr "内部错误"

1001

995 -#: remote.c:1948

1002 +#: remote.c:1943

1003 #, c-format

1004 msgid "Your branch is based on '%s', but the upstream is gone.\n"

1005 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

1006

1000 -#: remote.c:1952

1007 +#: remote.c:1947

1008 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1009 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

1010

1004 -#: remote.c:1955

1011 +#: remote.c:1950

1012 #, c-format

1013 msgid "Your branch is up-to-date with '%s'.\n"

1014 msgstr "您的分支与上游分支 '%s' 一致。\n"

1015

1009 -#: remote.c:1959

1016 +#: remote.c:1954

1017 #, c-format

1018 msgid "Your branch is ahead of '%s' by %d commit.\n"

1019 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

1020 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

1021 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

1022

1016 -#: remote.c:1965

1023 +#: remote.c:1960

1024 msgid " (use \"git push\" to publish your local commits)\n"

1025 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

1026

1020 -#: remote.c:1968

1027 +#: remote.c:1963

1028 #, c-format

1029 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

1030 msgid_plural ""

@@ -1026,11 +1033,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

1033 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

1034

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

1029 -#: remote.c:1976

1036 +#: remote.c:1971

1037 msgid " (use \"git pull\" to update your local branch)\n"

1038 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

1039

1033 -#: remote.c:1979

1040 +#: remote.c:1974

1041 #, c-format

1042 msgid ""

1043 "Your branch and '%s' have diverged,\n"

@@ -1046,7 +1053,7 @@ msgstr[1] ""

1053 "并且分别有 %d 和 %d 处不同的提交。\n"

1054

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

1049 -#: remote.c:1989

1056 +#: remote.c:1984

1057 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1058 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

1059

@@ -1059,19 +1066,19 @@ msgstr "不能打开 /dev/null"

1066 msgid "dup2(%d,%d) failed"

1067 msgstr "不能调用 dup2(%d,%d)"

1068

1062 -#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899

1063 -#: builtin/merge.c:1009 builtin/merge.c:1019

1069 +#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893

1070 +#: builtin/merge.c:1003 builtin/merge.c:1013

1071 #, c-format

1072 msgid "Could not open '%s' for writing"

1073 msgstr "不能为写入打开 '%s'"

1074

1068 -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789

1069 -#: builtin/merge.c:1011 builtin/merge.c:1024

1075 +#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785

1076 +#: builtin/merge.c:1005 builtin/merge.c:1018

1077 #, c-format

1078 msgid "Could not write to '%s'"

1079 msgstr "不能写入 '%s'"

1080

1074 -#: sequencer.c:229

1081 +#: sequencer.c:194

1082 msgid ""

1083 "after resolving the conflicts, mark the corrected paths\n"

1084 "with 'git add <paths>' or 'git rm <paths>'"

@@ -1079,7 +1086,7 @@ msgstr ""

1086 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

1087 "命令标记修正后的文件"

1088

1082 -#: sequencer.c:232

1089 +#: sequencer.c:197

1090 msgid ""

1091 "after resolving the conflicts, mark the corrected paths\n"

1092 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -1088,220 +1095,224 @@ msgstr ""

1095 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

1096 "对修正后的文件做标记，然后用 'git commit' 提交"

1097

1091 -#: sequencer.c:245 sequencer.c:879 sequencer.c:962

1098 +#: sequencer.c:210 sequencer.c:841 sequencer.c:924

1099 #, c-format

1100 msgid "Could not write to %s"

1101 msgstr "不能写入 %s"

1102

1096 -#: sequencer.c:248

1103 +#: sequencer.c:213

1104 #, c-format

1105 msgid "Error wrapping up %s"

1106 msgstr "错误收尾 %s"

1107

1101 -#: sequencer.c:263

1108 +#: sequencer.c:228

1109 msgid "Your local changes would be overwritten by cherry-pick."

1110 msgstr "您的本地修改将被拣选操作覆盖。"

1111

1105 -#: sequencer.c:265

1112 +#: sequencer.c:230

1113 msgid "Your local changes would be overwritten by revert."

1114 msgstr "您的本地修改将被还原操作覆盖。"

1115

1109 -#: sequencer.c:268

1116 +#: sequencer.c:233

1117 msgid "Commit your changes or stash them to proceed."

1118 msgstr "提交您的修改或保存进度后再继续。"

1119

1120 +#: sequencer.c:250

1121 +msgid "Failed to lock HEAD during fast_forward_to"

1122 +msgstr "在快进时无法为 HEAD 加锁"

1123 +

1124 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

1114 -#: sequencer.c:325

1125 +#: sequencer.c:293

1126 #, c-format

1127 msgid "%s: Unable to write new index file"

1128 msgstr "%s：无法写入新索引文件"

1129

1119 -#: sequencer.c:356

1130 +#: sequencer.c:324

1131 msgid "Could not resolve HEAD commit\n"

1132 msgstr "不能解析 HEAD 提交\n"

1133

1123 -#: sequencer.c:378

1134 +#: sequencer.c:344

1135 msgid "Unable to update cache tree\n"

1136 msgstr "不能更新缓存\n"

1137

1127 -#: sequencer.c:430

1138 +#: sequencer.c:391

1139 #, c-format

1140 msgid "Could not parse commit %s\n"

1141 msgstr "不能解析提交 %s\n"

1142

1132 -#: sequencer.c:435

1143 +#: sequencer.c:396

1144 #, c-format

1145 msgid "Could not parse parent commit %s\n"

1146 msgstr "不能解析父提交 %s\n"

1147

1137 -#: sequencer.c:501

1148 +#: sequencer.c:462

1149 msgid "Your index file is unmerged."

1150 msgstr "您的索引文件未完成合并。"

1151

1141 -#: sequencer.c:520

1152 +#: sequencer.c:481

1153 #, c-format

1154 msgid "Commit %s is a merge but no -m option was given."

1155 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

1156

1146 -#: sequencer.c:528

1157 +#: sequencer.c:489

1158 #, c-format

1159 msgid "Commit %s does not have parent %d"

1160 msgstr "提交 %s 没有父提交 %d"

1161

1151 -#: sequencer.c:532

1162 +#: sequencer.c:493

1163 #, c-format

1164 msgid "Mainline was specified but commit %s is not a merge."

1165 msgstr "指定了主线但提交 %s 不是一个合并。"

1166

1167 #. TRANSLATORS: The first %s will be "revert" or

1168 #. "cherry-pick", the second %s a SHA1

1158 -#: sequencer.c:545

1169 +#: sequencer.c:506

1170 #, c-format

1171 msgid "%s: cannot parse parent commit %s"

1172 msgstr "%s：不能解析父提交 %s"

1173

1163 -#: sequencer.c:549

1174 +#: sequencer.c:510

1175 #, c-format

1176 msgid "Cannot get commit message for %s"

1177 msgstr "不能得到 %s 的提交说明"

1178

1168 -#: sequencer.c:635

1179 +#: sequencer.c:596

1180 #, c-format

1181 msgid "could not revert %s... %s"

1182 msgstr "不能还原 %s... %s"

1183

1173 -#: sequencer.c:636

1184 +#: sequencer.c:597

1185 #, c-format

1186 msgid "could not apply %s... %s"

1187 msgstr "不能应用 %s... %s"

1188

1178 -#: sequencer.c:672

1189 +#: sequencer.c:633

1190 msgid "empty commit set passed"

1191 msgstr "提供了空的提交集"

1192

1182 -#: sequencer.c:680

1193 +#: sequencer.c:641

1194 #, c-format

1195 msgid "git %s: failed to read the index"

1196 msgstr "git %s：无法读取索引"

1197

1187 -#: sequencer.c:685

1198 +#: sequencer.c:645

1199 #, c-format

1200 msgid "git %s: failed to refresh the index"

1201 msgstr "git %s：无法刷新索引"

1202

1192 -#: sequencer.c:743

1203 +#: sequencer.c:705

1204 #, c-format

1205 msgid "Cannot %s during a %s"

1206 msgstr "无法 %s 在一个 %s 过程中"

1207

1197 -#: sequencer.c:765

1208 +#: sequencer.c:727

1209 #, c-format

1210 msgid "Could not parse line %d."

1211 msgstr "不能解析第 %d 行。"

1212

1202 -#: sequencer.c:770

1213 +#: sequencer.c:732

1214 msgid "No commits parsed."

1215 msgstr "没有提交被解析。"

1216

1206 -#: sequencer.c:783

1217 +#: sequencer.c:745

1218 #, c-format

1219 msgid "Could not open %s"

1220 msgstr "不能打开 %s"

1221

1211 -#: sequencer.c:787

1222 +#: sequencer.c:749

1223 #, c-format

1224 msgid "Could not read %s."

1225 msgstr "不能读取 %s。"

1226

1216 -#: sequencer.c:794

1227 +#: sequencer.c:756

1228 #, c-format

1229 msgid "Unusable instruction sheet: %s"

1230 msgstr "无用的指令表单：%s"

1231

1221 -#: sequencer.c:824

1232 +#: sequencer.c:786

1233 #, c-format

1234 msgid "Invalid key: %s"

1235 msgstr "无效键名：%s"

1236

1226 -#: sequencer.c:827

1237 +#: sequencer.c:789

1238 #, c-format

1239 msgid "Invalid value for %s: %s"

1240 msgstr "%s 的值无效：%s"

1241

1231 -#: sequencer.c:839

1242 +#: sequencer.c:801

1243 #, c-format

1244 msgid "Malformed options sheet: %s"

1245 msgstr "非法的选项表单：%s"

1246

1236 -#: sequencer.c:860

1247 +#: sequencer.c:822

1248 msgid "a cherry-pick or revert is already in progress"

1249 msgstr "一个拣选或还原操作已在进行"

1250

1240 -#: sequencer.c:861

1251 +#: sequencer.c:823

1252 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

1253 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

1254

1244 -#: sequencer.c:865

1255 +#: sequencer.c:827

1256 #, c-format

1257 msgid "Could not create sequencer directory %s"

1258 msgstr "不能创建序列目录 %s"

1259

1249 -#: sequencer.c:881 sequencer.c:966

1260 +#: sequencer.c:843 sequencer.c:928

1261 #, c-format

1262 msgid "Error wrapping up %s."

1263 msgstr "错误收尾 %s。"

1264

1254 -#: sequencer.c:900 sequencer.c:1036

1265 +#: sequencer.c:862 sequencer.c:998

1266 msgid "no cherry-pick or revert in progress"

1267 msgstr "拣选或还原操作并未进行"

1268

1258 -#: sequencer.c:902

1269 +#: sequencer.c:864

1270 msgid "cannot resolve HEAD"

1271 msgstr "不能解析 HEAD"

1272

1262 -#: sequencer.c:904

1273 +#: sequencer.c:866

1274 msgid "cannot abort from a branch yet to be born"

1275 msgstr "不能从尚未建立的分支终止"

1276

1266 -#: sequencer.c:926 builtin/apply.c:4061

1277 +#: sequencer.c:888 builtin/apply.c:4062

1278 #, c-format

1279 msgid "cannot open %s: %s"

1280 msgstr "不能打开 %s：%s"

1281

1271 -#: sequencer.c:929

1282 +#: sequencer.c:891

1283 #, c-format

1284 msgid "cannot read %s: %s"

1285 msgstr "不能读取 %s：%s"

1286

1276 -#: sequencer.c:930

1287 +#: sequencer.c:892

1288 msgid "unexpected end of file"

1289 msgstr "意外的文件结束"

1290

1280 -#: sequencer.c:936

1291 +#: sequencer.c:898

1292 #, c-format

1293 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

1294 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

1295

1285 -#: sequencer.c:959

1296 +#: sequencer.c:921

1297 #, c-format

1298 msgid "Could not format %s."

1299 msgstr "不能格式化 %s。"

1300

1290 -#: sequencer.c:1104

1301 +#: sequencer.c:1066

1302 #, c-format

1303 msgid "%s: can't cherry-pick a %s"

1304 msgstr "%s：不能拣选一个%s"

1305

1295 -#: sequencer.c:1107

1306 +#: sequencer.c:1069

1307 #, c-format

1308 msgid "%s: bad revision"

1309 msgstr "%s：错误的版本"

1310

1300 -#: sequencer.c:1141

1311 +#: sequencer.c:1103

1312 msgid "Can't revert as initial commit"

1313 msgstr "不能作为初始提交还原"

1314

1304 -#: sequencer.c:1142

1315 +#: sequencer.c:1104

1316 msgid "Can't cherry-pick into empty head"

1317 msgstr "不能拣选到空分支"

1318

@@ -1326,21 +1337,21 @@ msgstr ""

1337 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

1338 "命令关闭本消息通知。"

1339

1329 -#: sha1_name.c:1072

1340 +#: sha1_name.c:1060

1341 msgid "HEAD does not point to a branch"

1342 msgstr "HEAD 没有指向一个分支"

1343

1333 -#: sha1_name.c:1075

1344 +#: sha1_name.c:1063

1345 #, c-format

1346 msgid "No such branch: '%s'"

1347 msgstr "没有此分支：'%s'"

1348

1338 -#: sha1_name.c:1077

1349 +#: sha1_name.c:1065

1350 #, c-format

1351 msgid "No upstream configured for branch '%s'"

1352 msgstr "尚未给分支 '%s' 设置上游"

1353

1343 -#: sha1_name.c:1081

1354 +#: sha1_name.c:1069

1355 #, c-format

1356 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1357 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

@@ -1368,17 +1379,17 @@ msgstr "无法移除 %s 的 .gitmodules 条目"

1379 msgid "staging updated .gitmodules failed"

1380 msgstr "将更新后 .gitmodules 添加暂存区失败"

1381

1371 -#: submodule.c:1121 builtin/init-db.c:363

1382 +#: submodule.c:1118 builtin/init-db.c:363

1383 #, c-format

1384 msgid "Could not create git link %s"

1385 msgstr "不能创建 git link %s"

1386

1376 -#: submodule.c:1132

1387 +#: submodule.c:1129

1388 #, c-format

1389 msgid "Could not set core.worktree in %s"

1390 msgstr "不能在 %s 中设置 core.worktree"

1391

1381 -#: unpack-trees.c:206

1392 +#: unpack-trees.c:202

1393 msgid "Checking out files"

1394 msgstr "正在检出文件"

1395

@@ -1411,22 +1422,22 @@ msgstr "无效的端口号"

1422 msgid "invalid '..' path segment"

1423 msgstr "无效的 '..' 路径片段"

1424

1414 -#: wrapper.c:422

1425 +#: wrapper.c:460

1426 #, c-format

1427 msgid "unable to access '%s': %s"

1428 msgstr "不能访问 '%s'：%s"

1429

1419 -#: wrapper.c:443

1430 +#: wrapper.c:481

1431 #, c-format

1432 msgid "unable to access '%s'"

1433 msgstr "不能访问 '%s'"

1434

1424 -#: wrapper.c:454

1435 +#: wrapper.c:492

1436 #, c-format

1437 msgid "unable to look up current user in the passwd file: %s"

1438 msgstr "无法在口令文件中查询到当前用户：%s"

1439

1429 -#: wrapper.c:455

1440 +#: wrapper.c:493

1441 msgid "no such user"

1442 msgstr "无此用户"

1443

@@ -1580,15 +1591,15 @@ msgstr "未跟踪的内容, "

1591 msgid "bug: unhandled diff status %c"

1592 msgstr "bug：无法处理的差异状态 %c"

1593

1583 -#: wt-status.c:765

1594 +#: wt-status.c:764

1595 msgid "Submodules changed but not updated:"

1596 msgstr "子模组已修改但尚未更新："

1597

1587 -#: wt-status.c:767

1598 +#: wt-status.c:766

1599 msgid "Submodule changes to be committed:"

1600 msgstr "要提交的子模组变更："

1601

1591 -#: wt-status.c:846

1602 +#: wt-status.c:845

1603 msgid ""

1604 "Do not touch the line above.\n"

1605 "Everything below will be removed."

@@ -1596,198 +1607,198 @@ msgstr ""

1607 "不要改动上面的一行。\n"

1608 "下面的所有内容均将被删除。"

1609

1599 -#: wt-status.c:937

1610 +#: wt-status.c:936

1611 msgid "You have unmerged paths."

1612 msgstr "您有尚未合并的路径。"

1613

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

1604 -#: wt-status.c:940

1615 +#: wt-status.c:939

1616 msgid " (fix conflicts and run \"git commit\")"

1617 msgstr " （解决冲突并运行 \"git commit\"）"

1618

1608 -#: wt-status.c:943

1619 +#: wt-status.c:942

1620 msgid "All conflicts fixed but you are still merging."

1621 msgstr "所有冲突已解决但您仍处于合并中。"

1622

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

1613 -#: wt-status.c:946

1624 +#: wt-status.c:945

1625 msgid " (use \"git commit\" to conclude merge)"

1626 msgstr " （使用 \"git commit\" 结束合并）"

1627

1617 -#: wt-status.c:956

1628 +#: wt-status.c:955

1629 msgid "You are in the middle of an am session."

1630 msgstr "您正处于 am 操作过程中。"

1631

1621 -#: wt-status.c:959

1632 +#: wt-status.c:958

1633 msgid "The current patch is empty."

1634 msgstr "当前的补丁为空。"

1635

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

1626 -#: wt-status.c:963

1637 +#: wt-status.c:962

1638 msgid " (fix conflicts and then run \"git am --continue\")"

1639 msgstr " （解决冲突，然后运行 \"git am --continue\"）"

1640

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

1631 -#: wt-status.c:965

1642 +#: wt-status.c:964

1643 msgid " (use \"git am --skip\" to skip this patch)"

1644 msgstr " （使用 \"git am --skip\" 跳过此补丁）"

1645

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

1636 -#: wt-status.c:967

1647 +#: wt-status.c:966

1648 msgid " (use \"git am --abort\" to restore the original branch)"

1649 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

1650

1640 -#: wt-status.c:1027 wt-status.c:1044

1651 +#: wt-status.c:1026 wt-status.c:1043

1652 #, c-format

1653 msgid "You are currently rebasing branch '%s' on '%s'."

1654 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"

1655

1645 -#: wt-status.c:1032 wt-status.c:1049

1656 +#: wt-status.c:1031 wt-status.c:1048

1657 msgid "You are currently rebasing."

1658 msgstr "您在执行变基操作。"

1659

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

1650 -#: wt-status.c:1035

1661 +#: wt-status.c:1034

1662 msgid " (fix conflicts and then run \"git rebase --continue\")"

1663 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"

1664

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

1655 -#: wt-status.c:1037

1666 +#: wt-status.c:1036

1667 msgid " (use \"git rebase --skip\" to skip this patch)"

1668 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

1669

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

1660 -#: wt-status.c:1039

1671 +#: wt-status.c:1038

1672 msgid " (use \"git rebase --abort\" to check out the original branch)"

1673 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

1674

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

1665 -#: wt-status.c:1052

1676 +#: wt-status.c:1051

1677 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1678 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

1679

1669 -#: wt-status.c:1056

1680 +#: wt-status.c:1055

1681 #, c-format

1682 msgid ""

1683 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

1684 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"

1685

1675 -#: wt-status.c:1061

1686 +#: wt-status.c:1060

1687 msgid "You are currently splitting a commit during a rebase."

1688 msgstr "您在执行变基操作时拆分提交。"

1689

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

1680 -#: wt-status.c:1064

1691 +#: wt-status.c:1063

1692 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1693 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

1694

1684 -#: wt-status.c:1068

1695 +#: wt-status.c:1067

1696 #, c-format

1697 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1698 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"

1699

1689 -#: wt-status.c:1073

1700 +#: wt-status.c:1072

1701 msgid "You are currently editing a commit during a rebase."

1702 msgstr "您在执行变基操作时编辑提交。"

1703

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

1694 -#: wt-status.c:1076

1705 +#: wt-status.c:1075

1706 msgid " (use \"git commit --amend\" to amend the current commit)"

1707 msgstr " （使用 \"git commit --amend\" 修补当前提交）"

1708

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

1699 -#: wt-status.c:1078

1710 +#: wt-status.c:1077

1711 msgid ""

1712 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1713 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

1714

1704 -#: wt-status.c:1088

1715 +#: wt-status.c:1087

1716 #, c-format

1717 msgid "You are currently cherry-picking commit %s."

1718 msgstr "您在执行拣选提交 %s 的操作。"

1719

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

1710 -#: wt-status.c:1093

1721 +#: wt-status.c:1092

1722 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1723 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"

1724

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

1715 -#: wt-status.c:1096

1726 +#: wt-status.c:1095

1727 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1728 msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"

1729

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

1720 -#: wt-status.c:1098

1731 +#: wt-status.c:1097

1732 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1733 msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"

1734

1724 -#: wt-status.c:1107

1735 +#: wt-status.c:1106

1736 #, c-format

1737 msgid "You are currently reverting commit %s."

1738 msgstr "您在执行反转提交 %s 的操作。"

1739

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

1730 -#: wt-status.c:1112

1741 +#: wt-status.c:1111

1742 msgid " (fix conflicts and run \"git revert --continue\")"

1743 msgstr " （解决冲突并运行 \"git revert --continue\"）"

1744

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

1735 -#: wt-status.c:1115

1746 +#: wt-status.c:1114

1747 msgid " (all conflicts fixed: run \"git revert --continue\")"

1748 msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

1749

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

1740 -#: wt-status.c:1117

1751 +#: wt-status.c:1116

1752 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1753 msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"

1754

1744 -#: wt-status.c:1128

1755 +#: wt-status.c:1127

1756 #, c-format

1757 msgid "You are currently bisecting, started from branch '%s'."

1758 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"

1759

1749 -#: wt-status.c:1132

1760 +#: wt-status.c:1131

1761 msgid "You are currently bisecting."

1762 msgstr "您在执行二分查找操作。"

1763

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

1754 -#: wt-status.c:1135

1765 +#: wt-status.c:1134

1766 msgid " (use \"git bisect reset\" to get back to the original branch)"

1767 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

1768

1758 -#: wt-status.c:1310

1769 +#: wt-status.c:1309

1770 msgid "On branch "

1771 msgstr "位于分支 "

1772

1762 -#: wt-status.c:1317

1773 +#: wt-status.c:1316

1774 msgid "rebase in progress; onto "

1775 msgstr "变基操作正在进行中；至 "

1776

1766 -#: wt-status.c:1324

1777 +#: wt-status.c:1323

1778 msgid "HEAD detached at "

1779 msgstr "头指针分离于 "

1780

1770 -#: wt-status.c:1326

1781 +#: wt-status.c:1325

1782 msgid "HEAD detached from "

1783 msgstr "头指针分离自 "

1784

1774 -#: wt-status.c:1329

1785 +#: wt-status.c:1328

1786 msgid "Not currently on any branch."

1787 msgstr "当前不在任何分支上。"

1788

1778 -#: wt-status.c:1346

1789 +#: wt-status.c:1345

1790 msgid "Initial commit"

1791 msgstr "初始提交"

1792

1782 -#: wt-status.c:1360

1793 +#: wt-status.c:1359

1794 msgid "Untracked files"

1795 msgstr "未跟踪的文件"

1796

1786 -#: wt-status.c:1362

1797 +#: wt-status.c:1361

1798 msgid "Ignored files"

1799 msgstr "忽略的文件"

1800

1790 -#: wt-status.c:1366

1801 +#: wt-status.c:1365

1802 #, c-format

1803 msgid ""

1804 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1797,80 +1808,80 @@ msgstr ""

1808 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"

1809 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"

1810

1800 -#: wt-status.c:1372

1811 +#: wt-status.c:1371

1812 #, c-format

1813 msgid "Untracked files not listed%s"

1814 msgstr "未跟踪的文件没有列出%s"

1815

1816 # 译者：中文字符串拼接，可删除前导空格

1806 -#: wt-status.c:1374

1817 +#: wt-status.c:1373

1818 msgid " (use -u option to show untracked files)"

1819 msgstr "（使用 -u 参数显示未跟踪的文件）"

1820

1810 -#: wt-status.c:1380

1821 +#: wt-status.c:1379

1822 msgid "No changes"

1823 msgstr "没有修改"

1824

1814 -#: wt-status.c:1385

1825 +#: wt-status.c:1384

1826 #, c-format

1827 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1828 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

1829

1819 -#: wt-status.c:1388

1830 +#: wt-status.c:1387

1831 #, c-format

1832 msgid "no changes added to commit\n"

1833 msgstr "修改尚未加入提交\n"

1834

1824 -#: wt-status.c:1391

1835 +#: wt-status.c:1390

1836 #, c-format

1837 msgid ""

1838 "nothing added to commit but untracked files present (use \"git add\" to "

1839 "track)\n"

1840 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

1841

1831 -#: wt-status.c:1394

1842 +#: wt-status.c:1393

1843 #, c-format

1844 msgid "nothing added to commit but untracked files present\n"

1845 msgstr "提交为空，但是存在尚未跟踪的文件\n"

1846

1847 # 译者：中文字符串拼接，可删除前导空格

1837 -#: wt-status.c:1397

1848 +#: wt-status.c:1396

1849 #, c-format

1850 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1851 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

1852

1842 -#: wt-status.c:1400 wt-status.c:1405

1853 +#: wt-status.c:1399 wt-status.c:1404

1854 #, c-format

1855 msgid "nothing to commit\n"

1856 msgstr "无文件要提交\n"

1857

1858 # 译者：中文字符串拼接，可删除前导空格

1848 -#: wt-status.c:1403

1859 +#: wt-status.c:1402

1860 #, c-format

1861 msgid "nothing to commit (use -u to show untracked files)\n"

1862 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

1863

1864 # 译者：中文字符串拼接，可删除前导空格

1854 -#: wt-status.c:1407

1865 +#: wt-status.c:1406

1866 #, c-format

1867 msgid "nothing to commit, working directory clean\n"

1868 msgstr "无文件要提交，干净的工作区\n"

1869

1859 -#: wt-status.c:1516

1870 +#: wt-status.c:1515

1871 msgid "HEAD (no branch)"

1872 msgstr "HEAD（非分支）"

1873

1874 # 译者：注意保持句尾空格

1864 -#: wt-status.c:1522

1875 +#: wt-status.c:1521

1876 msgid "Initial commit on "

1877 msgstr "初始提交于 "

1878

1868 -#: wt-status.c:1554

1879 +#: wt-status.c:1553

1880 msgid "gone"

1881 msgstr "丢失"

1882

1883 # 译者：注意保持句尾空格

1873 -#: wt-status.c:1556 wt-status.c:1564

1884 +#: wt-status.c:1555 wt-status.c:1563

1885 msgid "behind "

1886 msgstr "落后 "

1887

@@ -1901,7 +1912,7 @@ msgstr "删除 '%s'\n"

1912 msgid "Unstaged changes after refreshing the index:"

1913 msgstr "刷新索引之后尚未被暂存的变更："

1914

1904 -#: builtin/add.c:193

1915 +#: builtin/add.c:193 builtin/rev-parse.c:781

1916 msgid "Could not read the index"

1917 msgstr "不能读取索引"

1918

@@ -1932,15 +1943,15 @@ msgstr "不能应用 '%s'"

1943 msgid "The following paths are ignored by one of your .gitignore files:\n"

1944 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

1945

1935 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70

1936 -#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344

1946 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70

1947 +#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367

1948 #: builtin/rm.c:269

1949 msgid "dry run"

1950 msgstr "演习"

1951

1941 -#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19

1942 -#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612

1943 -#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

1952 +#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19

1953 +#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606

1954 +#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113

1955 msgid "be verbose"

1956 msgstr "冗长输出"

1957

@@ -1948,7 +1959,7 @@ msgstr "冗长输出"

1959 msgid "interactive picking"

1960 msgstr "交互式拣选"

1961

1951 -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283

1962 +#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

1963 msgid "select hunks interactively"

1964 msgstr "交互式挑选数据块"

1965

@@ -2001,30 +2012,30 @@ msgstr "没有文件被添加"

2012 msgid "adding files failed"

2013 msgstr "添加文件失败"

2014

2004 -#: builtin/add.c:330

2015 +#: builtin/add.c:329

2016 msgid "-A and -u are mutually incompatible"

2017 msgstr "-A 和 -u 选项互斥"

2018

2008 -#: builtin/add.c:337

2019 +#: builtin/add.c:336

2020 msgid "Option --ignore-missing can only be used together with --dry-run"

2021 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

2022

2012 -#: builtin/add.c:358

2023 +#: builtin/add.c:357

2024 #, c-format

2025 msgid "Nothing specified, nothing added.\n"

2026 msgstr "没有指定文件，也没有文件被添加。\n"

2027

2017 -#: builtin/add.c:359

2028 +#: builtin/add.c:358

2029 #, c-format

2030 msgid "Maybe you wanted to say 'git add .'?\n"

2031 msgstr "也许您想要执行 'git add .'？\n"

2032

2022 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920

2023 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2033 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

2034 +#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2035 msgid "index file corrupt"

2036 msgstr "索引文件损坏"

2037

2027 -#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432

2038 +#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

2039 msgid "Unable to write new index file"

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

2041

@@ -2042,37 +2053,37 @@ msgstr "未能识别的空白字符选项 '%s'"

2053 msgid "unrecognized whitespace ignore option '%s'"

2054 msgstr "未能识别的空白字符忽略选项 '%s'"

2055

2045 -#: builtin/apply.c:823

2056 +#: builtin/apply.c:825

2057 #, c-format

2058 msgid "Cannot prepare timestamp regexp %s"

2059 msgstr "无法准备时间戳正则表达式 %s"

2060

2050 -#: builtin/apply.c:832

2061 +#: builtin/apply.c:834

2062 #, c-format

2063 msgid "regexec returned %d for input: %s"

2064 msgstr "regexec 返回 %d，输入为：%s"

2065

2055 -#: builtin/apply.c:913

2066 +#: builtin/apply.c:915

2067 #, c-format

2068 msgid "unable to find filename in patch at line %d"

2069 msgstr "不能在补丁的第 %d 行找到文件名"

2070

2060 -#: builtin/apply.c:945

2071 +#: builtin/apply.c:947

2072 #, c-format

2073 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

2074 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"

2075

2065 -#: builtin/apply.c:949

2076 +#: builtin/apply.c:951

2077 #, c-format

2078 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

2079 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

2080

2070 -#: builtin/apply.c:950

2081 +#: builtin/apply.c:952

2082 #, c-format

2083 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

2084 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

2085

2075 -#: builtin/apply.c:957

2086 +#: builtin/apply.c:959

2087 #, c-format

2088 msgid "git apply: bad git-diff - expected /dev/null on line %d"

2089 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

@@ -2182,17 +2193,17 @@ msgstr ""

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

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

2195

2185 -#: builtin/apply.c:2946

2196 +#: builtin/apply.c:2944

2197 #, c-format

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

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

2200

2190 -#: builtin/apply.c:2952

2201 +#: builtin/apply.c:2950

2202 #, c-format

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

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

2205

2195 -#: builtin/apply.c:2973

2206 +#: builtin/apply.c:2971

2207 #, c-format

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

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

@@ -2281,213 +2292,213 @@ msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

2292 msgid "unable to remove %s from index"

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

2294

2284 -#: builtin/apply.c:3851

2295 +#: builtin/apply.c:3852

2296 #, c-format

2297 msgid "corrupt patch for submodule %s"

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

2299

2289 -#: builtin/apply.c:3855

2300 +#: builtin/apply.c:3856

2301 #, c-format

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

2303 msgstr "不能枚举新建文件 '%s' 的状态"

2304

2294 -#: builtin/apply.c:3860

2305 +#: builtin/apply.c:3861

2306 #, c-format

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

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

2309

2299 -#: builtin/apply.c:3863 builtin/apply.c:3971

2310 +#: builtin/apply.c:3864 builtin/apply.c:3972

2311 #, c-format

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

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

2314

2304 -#: builtin/apply.c:3896

2315 +#: builtin/apply.c:3897

2316 #, c-format

2317 msgid "closing file '%s'"

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

2319

2309 -#: builtin/apply.c:3945

2320 +#: builtin/apply.c:3946

2321 #, c-format

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

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

2324

2314 -#: builtin/apply.c:4032

2325 +#: builtin/apply.c:4033

2326 #, c-format

2327 msgid "Applied patch %s cleanly."

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

2329

2319 -#: builtin/apply.c:4040

2330 +#: builtin/apply.c:4041

2331 msgid "internal error"

2332 msgstr "内部错误"

2333

2323 -#: builtin/apply.c:4043

2334 +#: builtin/apply.c:4044

2335 #, c-format

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

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

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

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

2340

2330 -#: builtin/apply.c:4053

2341 +#: builtin/apply.c:4054

2342 #, c-format

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

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

2345

2335 -#: builtin/apply.c:4074

2346 +#: builtin/apply.c:4075

2347 #, c-format

2348 msgid "Hunk #%d applied cleanly."

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

2350

2340 -#: builtin/apply.c:4077

2351 +#: builtin/apply.c:4078

2352 #, c-format

2353 msgid "Rejected hunk #%d."

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

2355

2345 -#: builtin/apply.c:4227

2356 +#: builtin/apply.c:4228

2357 msgid "unrecognized input"

2358 msgstr "未能识别的输入"

2359

2349 -#: builtin/apply.c:4238

2360 +#: builtin/apply.c:4239

2361 msgid "unable to read index file"

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

2363

2353 -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2354 -#: builtin/fetch.c:78

2364 +#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90

2365 +#: builtin/fetch.c:93

2366 msgid "path"

2367 msgstr "路径"

2368

2358 -#: builtin/apply.c:4358

2369 +#: builtin/apply.c:4359

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

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

2372

2362 -#: builtin/apply.c:4361

2373 +#: builtin/apply.c:4362

2374 msgid "apply changes matching the given path"

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

2376

2366 -#: builtin/apply.c:4363

2377 +#: builtin/apply.c:4364

2378 msgid "num"

2379 msgstr "数字"

2380

2370 -#: builtin/apply.c:4364

2381 +#: builtin/apply.c:4365

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

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

2384

2374 -#: builtin/apply.c:4367

2385 +#: builtin/apply.c:4368

2386 msgid "ignore additions made by the patch"

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

2388

2378 -#: builtin/apply.c:4369

2389 +#: builtin/apply.c:4370

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

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

2392

2382 -#: builtin/apply.c:4373

2393 +#: builtin/apply.c:4374

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

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

2396

2386 -#: builtin/apply.c:4375

2397 +#: builtin/apply.c:4376

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

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

2400

2390 -#: builtin/apply.c:4377

2401 +#: builtin/apply.c:4378

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

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

2404

2394 -#: builtin/apply.c:4379

2405 +#: builtin/apply.c:4380

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

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

2408

2398 -#: builtin/apply.c:4381

2409 +#: builtin/apply.c:4382

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

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

2412

2402 -#: builtin/apply.c:4383

2413 +#: builtin/apply.c:4384

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

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

2416

2406 -#: builtin/apply.c:4385

2417 +#: builtin/apply.c:4386

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

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

2420

2410 -#: builtin/apply.c:4387

2421 +#: builtin/apply.c:4388

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

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

2424

2414 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455

2425 +#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455

2426 msgid "paths are separated with NUL character"

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

2428

2418 -#: builtin/apply.c:4392

2429 +#: builtin/apply.c:4393

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

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

2432

2422 -#: builtin/apply.c:4393

2433 +#: builtin/apply.c:4394

2434 msgid "action"

2435 msgstr "动作"

2436

2426 -#: builtin/apply.c:4394

2437 +#: builtin/apply.c:4395

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

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

2440

2430 -#: builtin/apply.c:4397 builtin/apply.c:4400

2441 +#: builtin/apply.c:4398 builtin/apply.c:4401

2442 msgid "ignore changes in whitespace when finding context"

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

2444

2434 -#: builtin/apply.c:4403

2445 +#: builtin/apply.c:4404

2446 msgid "apply the patch in reverse"

2447 msgstr "反向应用补丁"

2448

2438 -#: builtin/apply.c:4405

2449 +#: builtin/apply.c:4406

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

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

2452

2442 -#: builtin/apply.c:4407

2453 +#: builtin/apply.c:4408

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

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

2456

2446 -#: builtin/apply.c:4409

2457 +#: builtin/apply.c:4410

2458 msgid "allow overlapping hunks"

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

2460

2450 -#: builtin/apply.c:4412

2461 +#: builtin/apply.c:4413

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

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

2464

2454 -#: builtin/apply.c:4415

2465 +#: builtin/apply.c:4416

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

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

2468

2458 -#: builtin/apply.c:4417

2469 +#: builtin/apply.c:4418

2470 msgid "root"

2471 msgstr "根目录"

2472

2462 -#: builtin/apply.c:4418

2473 +#: builtin/apply.c:4419

2474 msgid "prepend <root> to all filenames"

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

2476

2466 -#: builtin/apply.c:4440

2477 +#: builtin/apply.c:4441

2478 msgid "--3way outside a repository"

2479 msgstr "--3way 在一个版本库之外"

2480

2470 -#: builtin/apply.c:4448

2481 +#: builtin/apply.c:4449

2482 msgid "--index outside a repository"

2483 msgstr "--index 在一个版本库之外"

2484

2474 -#: builtin/apply.c:4451

2485 +#: builtin/apply.c:4452

2486 msgid "--cached outside a repository"

2487 msgstr "--cached 在一个版本库之外"

2488

2478 -#: builtin/apply.c:4467

2489 +#: builtin/apply.c:4468

2490 #, c-format

2491 msgid "can't open patch '%s'"

2492 msgstr "不能打开补丁 '%s'"

2493

2483 -#: builtin/apply.c:4481

2494 +#: builtin/apply.c:4482

2495 #, c-format

2496 msgid "squelched %d whitespace error"

2497 msgid_plural "squelched %d whitespace errors"

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

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

2500

2490 -#: builtin/apply.c:4487 builtin/apply.c:4497

2501 +#: builtin/apply.c:4488 builtin/apply.c:4498

2502 #, c-format

2503 msgid "%d line adds whitespace errors."

2504 msgid_plural "%d lines add whitespace errors."

@@ -2541,103 +2552,103 @@ msgstr "执行 'git bisect next'"

2552 msgid "update BISECT_HEAD instead of checking out the current commit"

2553 msgstr "更新 BISECT_HEAD 而非检出当前提交"

2554

2544 -#: builtin/blame.c:27

2555 +#: builtin/blame.c:30

2556 msgid "git blame [options] [rev-opts] [rev] [--] file"

2557 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"

2558

2548 -#: builtin/blame.c:32

2559 +#: builtin/blame.c:35

2560 msgid "[rev-opts] are documented in git-rev-list(1)"

2561 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"

2562

2552 -#: builtin/blame.c:2249

2563 +#: builtin/blame.c:2501

2564 msgid "Show blame entries as we find them, incrementally"

2565 msgstr "增量式地显示发现的 blame 条目"

2566

2556 -#: builtin/blame.c:2250

2567 +#: builtin/blame.c:2502

2568 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2569 msgstr "边界提交显示空的 SHA-1（默认：关闭）"

2570

2560 -#: builtin/blame.c:2251

2571 +#: builtin/blame.c:2503

2572 msgid "Do not treat root commits as boundaries (Default: off)"

2573 msgstr "不把根提交作为边界（默认：关闭）"

2574

2564 -#: builtin/blame.c:2252

2575 +#: builtin/blame.c:2504

2576 msgid "Show work cost statistics"

2577 msgstr "显示命令消耗统计"

2578

2568 -#: builtin/blame.c:2253

2579 +#: builtin/blame.c:2505

2580 msgid "Show output score for blame entries"

2581 msgstr "显示判断 blame 条目位移的得分诊断信息"

2582

2572 -#: builtin/blame.c:2254

2583 +#: builtin/blame.c:2506

2584 msgid "Show original filename (Default: auto)"

2585 msgstr "显示原始文件名（默认：自动）"

2586

2576 -#: builtin/blame.c:2255

2587 +#: builtin/blame.c:2507

2588 msgid "Show original linenumber (Default: off)"

2589 msgstr "显示原始的行号（默认：关闭）"

2590

2580 -#: builtin/blame.c:2256

2591 +#: builtin/blame.c:2508

2592 msgid "Show in a format designed for machine consumption"

2593 msgstr "显示为一个适合机器读取的格式"

2594

2584 -#: builtin/blame.c:2257

2595 +#: builtin/blame.c:2509

2596 msgid "Show porcelain format with per-line commit information"

2597 msgstr "为每一行显示机器适用的提交信息"

2598

2588 -#: builtin/blame.c:2258

2599 +#: builtin/blame.c:2510

2600 msgid "Use the same output mode as git-annotate (Default: off)"

2601 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"

2602

2592 -#: builtin/blame.c:2259

2603 +#: builtin/blame.c:2511

2604 msgid "Show raw timestamp (Default: off)"

2605 msgstr "显示原始时间戳（默认：关闭）"

2606

2596 -#: builtin/blame.c:2260

2607 +#: builtin/blame.c:2512

2608 msgid "Show long commit SHA1 (Default: off)"

2609 msgstr "显示长的SHA1提交号（默认：关闭）"

2610

2600 -#: builtin/blame.c:2261

2611 +#: builtin/blame.c:2513

2612 msgid "Suppress author name and timestamp (Default: off)"

2613 msgstr "隐藏作者名字和时间戳（默认：关闭）"

2614

2604 -#: builtin/blame.c:2262

2615 +#: builtin/blame.c:2514

2616 msgid "Show author email instead of name (Default: off)"

2617 msgstr "显示作者的邮箱而不是名字（默认：关闭）"

2618

2608 -#: builtin/blame.c:2263

2619 +#: builtin/blame.c:2515

2620 msgid "Ignore whitespace differences"

2621 msgstr "忽略空白差异"

2622

2612 -#: builtin/blame.c:2264

2623 +#: builtin/blame.c:2516

2624 msgid "Spend extra cycles to find better match"

2625 msgstr "花费额外的循环来找到更好的匹配"

2626

2616 -#: builtin/blame.c:2265

2627 +#: builtin/blame.c:2517

2628 msgid "Use revisions from <file> instead of calling git-rev-list"

2629 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"

2630

2620 -#: builtin/blame.c:2266

2631 +#: builtin/blame.c:2518

2632 msgid "Use <file>'s contents as the final image"

2633 msgstr "使用 <file> 的内容作为最终的图片"

2634

2624 -#: builtin/blame.c:2267 builtin/blame.c:2268

2635 +#: builtin/blame.c:2519 builtin/blame.c:2520

2636 msgid "score"

2637 msgstr "得分"

2638

2628 -#: builtin/blame.c:2267

2639 +#: builtin/blame.c:2519

2640 msgid "Find line copies within and across files"

2641 msgstr "找到文件内及跨文件的行拷贝"

2642

2632 -#: builtin/blame.c:2268

2643 +#: builtin/blame.c:2520

2644 msgid "Find line movements within and across files"

2645 msgstr "找到文件内及跨文件的行移动"

2646

2636 -#: builtin/blame.c:2269

2647 +#: builtin/blame.c:2521

2648 msgid "n,m"

2649 msgstr "n,m"

2650

2640 -#: builtin/blame.c:2269

2651 +#: builtin/blame.c:2521

2652 msgid "Process only line range n,m, counting from 1"

2653 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

2654

@@ -2647,7 +2658,7 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

2658 #. takes 22 places, is the longest among various forms of

2659 #. relative timestamps, but your language may need more or

2660 #. fewer display columns.

2650 -#: builtin/blame.c:2347

2661 +#: builtin/blame.c:2599

2662 msgid "4 years, 11 months ago"

2663 msgstr "4 年 11 个月前"

2664

@@ -2891,9 +2902,9 @@ msgid "act on remote-tracking branches"

2902 msgstr "作用于远程跟踪分支"

2903

2904 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2894 -#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495

2895 -#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527

2896 -#: builtin/tag.c:533

2905 +#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574

2906 +#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615

2907 +#: builtin/tag.c:621

2908 msgid "commit"

2909 msgstr "提交"

2910

@@ -2957,7 +2968,7 @@ msgstr "以列的方式显示分支"

2968 msgid "Failed to resolve HEAD as a valid ref."

2969 msgstr "无法将 HEAD 解析为有效引用。"

2970

2960 -#: builtin/branch.c:872 builtin/clone.c:635

2971 +#: builtin/branch.c:872 builtin/clone.c:636

2972 msgid "HEAD not found below refs/heads!"

2973 msgstr "HEAD 没有位于 /refs/heads 之下！"

2974

@@ -3138,7 +3149,7 @@ msgstr "从标准输入读出文件名"

3149 msgid "terminate input and output records by a NUL character"

3150 msgstr "输入和输出的记录使用 NUL 字符终结"

3151

3141 -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271

3152 +#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285

3153 msgid "suppress progress reporting"

3154 msgstr "不显示进度报告"

3155

@@ -3195,43 +3206,43 @@ msgstr "未指定联系地址"

3206 msgid "git checkout-index [options] [--] [<file>...]"

3207 msgstr "git checkout-index [选项] [--] [<文件>...]"

3208

3198 -#: builtin/checkout-index.c:187

3209 +#: builtin/checkout-index.c:188

3210 msgid "check out all files in the index"

3211 msgstr "检出索引区的所有文件"

3212

3202 -#: builtin/checkout-index.c:188

3213 +#: builtin/checkout-index.c:189

3214 msgid "force overwrite of existing files"

3215 msgstr "强制覆盖现有的文件"

3216

3206 -#: builtin/checkout-index.c:190

3217 +#: builtin/checkout-index.c:191

3218 msgid "no warning for existing files and files not in index"

3219 msgstr "存在或不在索引中的文件都没有警告"

3220

3210 -#: builtin/checkout-index.c:192

3221 +#: builtin/checkout-index.c:193

3222 msgid "don't checkout new files"

3223 msgstr "不检出新文件"

3224

3214 -#: builtin/checkout-index.c:194

3225 +#: builtin/checkout-index.c:195

3226 msgid "update stat information in the index file"

3227 msgstr "更新索引中文件的状态信息"

3228

3218 -#: builtin/checkout-index.c:200

3229 +#: builtin/checkout-index.c:201

3230 msgid "read list of paths from the standard input"

3231 msgstr "从标准输入读取路径列表"

3232

3222 -#: builtin/checkout-index.c:202

3233 +#: builtin/checkout-index.c:203

3234 msgid "write the content to temporary files"

3235 msgstr "将内容写入临时文件"

3236

3226 -#: builtin/checkout-index.c:203 builtin/column.c:30

3237 +#: builtin/checkout-index.c:204 builtin/column.c:30

3238 msgid "string"

3239 msgstr "字符串"

3240

3230 -#: builtin/checkout-index.c:204

3241 +#: builtin/checkout-index.c:205

3242 msgid "when creating files, prepend <string>"

3243 msgstr "在创建文件时，在前面加上<字符串>"

3244

3234 -#: builtin/checkout-index.c:207

3245 +#: builtin/checkout-index.c:208

3246 msgid "copy out the files from named stage"

3247 msgstr "从指定暂存区中拷出文件"

3248

@@ -3273,76 +3284,76 @@ msgstr "path '%s'：无法合并"

3284 msgid "Unable to add merge result for '%s'"

3285 msgstr "无法为 '%s' 添加合并结果"

3286

3276 -#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238

3277 -#: builtin/checkout.c:241

3287 +#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237

3288 +#: builtin/checkout.c:240

3289 #, c-format

3290 msgid "'%s' cannot be used with updating paths"

3291 msgstr "'%s' 不能在更新路径时使用"

3292

3282 -#: builtin/checkout.c:244 builtin/checkout.c:247

3293 +#: builtin/checkout.c:243 builtin/checkout.c:246

3294 #, c-format

3295 msgid "'%s' cannot be used with %s"

3296 msgstr "'%s' 不能和 %s 同时使用"

3297

3287 -#: builtin/checkout.c:250

3298 +#: builtin/checkout.c:249

3299 #, c-format

3300 msgid "Cannot update paths and switch to branch '%s' at the same time."

3301 msgstr "不能同时更新路径并切换到分支'%s'。"

3302

3292 -#: builtin/checkout.c:261 builtin/checkout.c:450

3303 +#: builtin/checkout.c:260 builtin/checkout.c:449

3304 msgid "corrupt index file"

3305 msgstr "损坏的索引文件"

3306

3296 -#: builtin/checkout.c:321 builtin/checkout.c:328

3307 +#: builtin/checkout.c:320 builtin/checkout.c:327

3308 #, c-format

3309 msgid "path '%s' is unmerged"

3310 msgstr "路径 '%s' 未合并"

3311

3301 -#: builtin/checkout.c:472

3312 +#: builtin/checkout.c:471

3313 msgid "you need to resolve your current index first"

3314 msgstr "您需要先解决当前索引的冲突"

3315

3305 -#: builtin/checkout.c:593

3316 +#: builtin/checkout.c:591

3317 #, c-format

3318 msgid "Can not do reflog for '%s'\n"

3319 msgstr "不能对 '%s' 执行 reflog 操作\n"

3320

3310 -#: builtin/checkout.c:631

3321 +#: builtin/checkout.c:629

3322 msgid "HEAD is now at"

3323 msgstr "HEAD 目前位于"

3324

3314 -#: builtin/checkout.c:638

3325 +#: builtin/checkout.c:636

3326 #, c-format

3327 msgid "Reset branch '%s'\n"

3328 msgstr "重置分支 '%s'\n"

3329

3319 -#: builtin/checkout.c:641

3330 +#: builtin/checkout.c:639

3331 #, c-format

3332 msgid "Already on '%s'\n"

3333 msgstr "已经位于 '%s'\n"

3334

3324 -#: builtin/checkout.c:645

3335 +#: builtin/checkout.c:643

3336 #, c-format

3337 msgid "Switched to and reset branch '%s'\n"

3338 msgstr "切换并重置分支 '%s'\n"

3339

3329 -#: builtin/checkout.c:647 builtin/checkout.c:1032

3340 +#: builtin/checkout.c:645 builtin/checkout.c:1026

3341 #, c-format

3342 msgid "Switched to a new branch '%s'\n"

3343 msgstr "切换到一个新分支 '%s'\n"

3344

3334 -#: builtin/checkout.c:649

3345 +#: builtin/checkout.c:647

3346 #, c-format

3347 msgid "Switched to branch '%s'\n"

3348 msgstr "切换到分支 '%s'\n"

3349

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

3340 -#: builtin/checkout.c:705

3351 +#: builtin/checkout.c:699

3352 #, c-format

3353 msgid " ... and %d more.\n"

3354 msgstr " ... 及其它 %d 个。\n"

3355

3345 -#: builtin/checkout.c:711

3356 +#: builtin/checkout.c:705

3357 #, c-format

3358 msgid ""

3359 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3363,7 +3374,7 @@ msgstr[1] ""

3374 "\n"

3375 "%s\n"

3376

3366 -#: builtin/checkout.c:729

3377 +#: builtin/checkout.c:723

3378 #, c-format

3379 msgid ""

3380 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3378,139 +3389,139 @@ msgstr ""

3389 " git branch new_branch_name %s\n"

3390 "\n"

3391

3381 -#: builtin/checkout.c:759

3392 +#: builtin/checkout.c:753

3393 msgid "internal error in revision walk"

3394 msgstr "在版本遍历时遇到内部错误"

3395

3385 -#: builtin/checkout.c:763

3396 +#: builtin/checkout.c:757

3397 msgid "Previous HEAD position was"

3398 msgstr "之前的 HEAD 位置是"

3399

3389 -#: builtin/checkout.c:790 builtin/checkout.c:1027

3400 +#: builtin/checkout.c:784 builtin/checkout.c:1021

3401 msgid "You are on a branch yet to be born"

3402 msgstr "您位于一个尚未初始化的分支"

3403

3393 -#: builtin/checkout.c:934

3404 +#: builtin/checkout.c:928

3405 #, c-format

3406 msgid "only one reference expected, %d given."

3407 msgstr "只要一个引用，却给出了 %d 个"

3408

3398 -#: builtin/checkout.c:973

3409 +#: builtin/checkout.c:967

3410 #, c-format

3411 msgid "invalid reference: %s"

3412 msgstr "无效引用：%s"

3413

3403 -#: builtin/checkout.c:1002

3414 +#: builtin/checkout.c:996

3415 #, c-format

3416 msgid "reference is not a tree: %s"

3417 msgstr "引用不是一个树：%s"

3418

3408 -#: builtin/checkout.c:1041

3419 +#: builtin/checkout.c:1035

3420 msgid "paths cannot be used with switching branches"

3421 msgstr "路径不能和切换分支同时使用"

3422

3412 -#: builtin/checkout.c:1044 builtin/checkout.c:1048

3423 +#: builtin/checkout.c:1038 builtin/checkout.c:1042

3424 #, c-format

3425 msgid "'%s' cannot be used with switching branches"

3426 msgstr "'%s' 不能和切换分支同时使用"

3427

3417 -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3418 -#: builtin/checkout.c:1063

3428 +#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054

3429 +#: builtin/checkout.c:1057

3430 #, c-format

3431 msgid "'%s' cannot be used with '%s'"

3432 msgstr "'%s' 不能和 '%s' 同时使用"

3433

3423 -#: builtin/checkout.c:1068

3434 +#: builtin/checkout.c:1062

3435 #, c-format

3436 msgid "Cannot switch branch to a non-commit '%s'"

3437 msgstr "不能切换分支到一个非提交 '%s'"

3438

3428 -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88

3439 +#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

3440 #: builtin/remote.c:159 builtin/remote.c:161

3441 msgid "branch"

3442 msgstr "分支"

3443

3433 -#: builtin/checkout.c:1091

3444 +#: builtin/checkout.c:1085

3445 msgid "create and checkout a new branch"

3446 msgstr "创建并检出一个新的分支"

3447

3437 -#: builtin/checkout.c:1093

3448 +#: builtin/checkout.c:1087

3449 msgid "create/reset and checkout a branch"

3450 msgstr "创建/重置并检出一个分支"

3451

3441 -#: builtin/checkout.c:1094

3452 +#: builtin/checkout.c:1088

3453 msgid "create reflog for new branch"

3454 msgstr "为新的分支创建引用日志"

3455

3445 -#: builtin/checkout.c:1095

3456 +#: builtin/checkout.c:1089

3457 msgid "detach the HEAD at named commit"

3458 msgstr "成为指向该提交的分离头指针"

3459

3449 -#: builtin/checkout.c:1096

3460 +#: builtin/checkout.c:1090

3461 msgid "set upstream info for new branch"

3462 msgstr "为新的分支设置上游信息"

3463

3453 -#: builtin/checkout.c:1098

3464 +#: builtin/checkout.c:1092

3465 msgid "new-branch"

3466 msgstr "新分支"

3467

3457 -#: builtin/checkout.c:1098

3468 +#: builtin/checkout.c:1092

3469 msgid "new unparented branch"

3470 msgstr "新的没有父提交的分支"

3471

3461 -#: builtin/checkout.c:1099

3472 +#: builtin/checkout.c:1093

3473 msgid "checkout our version for unmerged files"

3474 msgstr "对尚未合并的文件检出我们的版本"

3475

3465 -#: builtin/checkout.c:1101

3476 +#: builtin/checkout.c:1095

3477 msgid "checkout their version for unmerged files"

3478 msgstr "对尚未合并的文件检出他们的版本"

3479

3469 -#: builtin/checkout.c:1103

3480 +#: builtin/checkout.c:1097

3481 msgid "force checkout (throw away local modifications)"

3482 msgstr "强制检出（丢弃本地修改）"

3483

3473 -#: builtin/checkout.c:1104

3484 +#: builtin/checkout.c:1098

3485 msgid "perform a 3-way merge with the new branch"

3486 msgstr "和新的分支执行三路合并"

3487

3477 -#: builtin/checkout.c:1105 builtin/merge.c:225

3488 +#: builtin/checkout.c:1099 builtin/merge.c:225

3489 msgid "update ignored files (default)"

3490 msgstr "更新忽略的文件（默认）"

3491

3481 -#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245

3492 +#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245

3493 msgid "style"

3494 msgstr "风格"

3495

3485 -#: builtin/checkout.c:1107

3496 +#: builtin/checkout.c:1101

3497 msgid "conflict style (merge or diff3)"

3498 msgstr "冲突输出风格（merge 或 diff3）"

3499

3489 -#: builtin/checkout.c:1110

3500 +#: builtin/checkout.c:1104

3501 msgid "do not limit pathspecs to sparse entries only"

3502 msgstr "对路径不做稀疏检出的限制"

3503

3493 -#: builtin/checkout.c:1112

3504 +#: builtin/checkout.c:1106

3505 msgid "second guess 'git checkout no-such-branch'"

3506 msgstr "再者猜测'git checkout no-such-branch'"

3507

3497 -#: builtin/checkout.c:1135

3508 +#: builtin/checkout.c:1129

3509 msgid "-b, -B and --orphan are mutually exclusive"

3510 msgstr "-b、-B 和 --orphan 是互斥的"

3511

3501 -#: builtin/checkout.c:1152

3512 +#: builtin/checkout.c:1146

3513 msgid "--track needs a branch name"

3514 msgstr "--track 需要一个分支名"

3515

3505 -#: builtin/checkout.c:1159

3516 +#: builtin/checkout.c:1153

3517 msgid "Missing branch name; try -b"

3518 msgstr "缺少分支名；尝试 -b"

3519

3509 -#: builtin/checkout.c:1196

3520 +#: builtin/checkout.c:1190

3521 msgid "invalid path specification"

3522 msgstr "无效的路径规格"

3523

3513 -#: builtin/checkout.c:1203

3524 +#: builtin/checkout.c:1197

3525 #, c-format

3526 msgid ""

3527 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3519,12 +3530,12 @@ msgstr ""

3530 "不能同时更新路径并切换到分支'%s'。\n"

3531 "您是想要检出 '%s' 但其未能解析为提交么？"

3532

3522 -#: builtin/checkout.c:1208

3533 +#: builtin/checkout.c:1202

3534 #, c-format

3535 msgid "git checkout: --detach does not take a path argument '%s'"

3536 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

3537

3527 -#: builtin/checkout.c:1212

3538 +#: builtin/checkout.c:1206

3539 msgid ""

3540 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3541 "checking out of the index."

@@ -3599,30 +3610,30 @@ msgstr ""

3610 msgid "Huh (%s)?"

3611 msgstr "嗯（%s）？"

3612

3602 -#: builtin/clean.c:660

3613 +#: builtin/clean.c:659

3614 #, c-format

3615 msgid "Input ignore patterns>> "

3616 msgstr "输入模版以排除条目>> "

3617

3607 -#: builtin/clean.c:697

3618 +#: builtin/clean.c:696

3619 #, c-format

3620 msgid "WARNING: Cannot find items matched by: %s"

3621 msgstr "警告：无法找到和 %s 匹配的条目"

3622

3612 -#: builtin/clean.c:718

3623 +#: builtin/clean.c:717

3624 msgid "Select items to delete"

3625 msgstr "选择要删除的条目"

3626

3616 -#: builtin/clean.c:758

3627 +#: builtin/clean.c:757

3628 #, c-format

3629 msgid "remove %s? "

3630 msgstr "删除 %s？"

3631

3621 -#: builtin/clean.c:783

3632 +#: builtin/clean.c:782

3633 msgid "Bye."

3634 msgstr "再见。"

3635

3625 -#: builtin/clean.c:791

3636 +#: builtin/clean.c:790

3637 msgid ""

3638 "clean - start cleaning\n"

3639 "filter by pattern - exclude items from deletion\n"

@@ -3640,69 +3651,69 @@ msgstr ""

3651 "help - 显示本帮助\n"

3652 "? - 显示如何在提示符下选择的帮助"

3653

3643 -#: builtin/clean.c:818

3654 +#: builtin/clean.c:817

3655 msgid "*** Commands ***"

3656 msgstr "*** 命令 ***"

3657

3647 -#: builtin/clean.c:819

3658 +#: builtin/clean.c:818

3659 msgid "What now"

3660 msgstr "请选择"

3661

3651 -#: builtin/clean.c:827

3662 +#: builtin/clean.c:826

3663 msgid "Would remove the following item:"

3664 msgid_plural "Would remove the following items:"

3665 msgstr[0] "将删除如下条目："

3666 msgstr[1] "将删除如下条目："

3667

3657 -#: builtin/clean.c:844

3668 +#: builtin/clean.c:843

3669 msgid "No more files to clean, exiting."

3670 msgstr "没有要清理的文件，退出。"

3671

3661 -#: builtin/clean.c:875

3672 +#: builtin/clean.c:874

3673 msgid "do not print names of files removed"

3674 msgstr "不打印删除文件的名称"

3675

3665 -#: builtin/clean.c:877

3676 +#: builtin/clean.c:876

3677 msgid "force"

3678 msgstr "强制"

3679

3669 -#: builtin/clean.c:878

3680 +#: builtin/clean.c:877

3681 msgid "interactive cleaning"

3682 msgstr "交互式清除"

3683

3673 -#: builtin/clean.c:880

3684 +#: builtin/clean.c:879

3685 msgid "remove whole directories"

3686 msgstr "删除整个目录"

3687

3677 -#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716

3678 -#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185

3688 +#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714

3689 +#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3690 msgid "pattern"

3691 msgstr "模式"

3692

3682 -#: builtin/clean.c:882

3693 +#: builtin/clean.c:881

3694 msgid "add <pattern> to ignore rules"

3695 msgstr "添加<模式>到忽略规则"

3696

3686 -#: builtin/clean.c:883

3697 +#: builtin/clean.c:882

3698 msgid "remove ignored files, too"

3699 msgstr "也删除忽略的文件"

3700

3690 -#: builtin/clean.c:885

3701 +#: builtin/clean.c:884

3702 msgid "remove only ignored files"

3703 msgstr "只删除忽略的文件"

3704

3694 -#: builtin/clean.c:903

3705 +#: builtin/clean.c:902

3706 msgid "-x and -X cannot be used together"

3707 msgstr "-x 和 -X 不能同时使用"

3708

3698 -#: builtin/clean.c:907

3709 +#: builtin/clean.c:906

3710 msgid ""

3711 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3712 "clean"

3713 msgstr ""

3714 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

3715

3705 -#: builtin/clean.c:910

3716 +#: builtin/clean.c:909

3717 msgid ""

3718 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3719 "refusing to clean"

@@ -3713,8 +3724,8 @@ msgstr ""

3724 msgid "git clone [options] [--] <repo> [<dir>]"

3725 msgstr "git clone [选项] [--] <版本库> [<路径>]"

3726

3716 -#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3717 -#: builtin/push.c:504

3727 +#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222

3728 +#: builtin/push.c:503

3729 msgid "force progress reporting"

3730 msgstr "强制显示进度报告"

3731

@@ -3774,7 +3785,7 @@ msgstr "检出<分支>而不是远程HEAD"

3785 msgid "path to git-upload-pack on the remote"

3786 msgstr "远程 git-upload-pack 路径"

3787

3777 -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661

3788 +#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

3789 msgid "depth"

3790 msgstr "深度"

3791

@@ -3876,94 +3887,94 @@ msgstr "检查连接... "

3887 msgid "remote did not send all necessary objects"

3888 msgstr "远程没有发送所有必须的对象"

3889

3879 -#: builtin/clone.c:626

3890 +#: builtin/clone.c:627

3891 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3892 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

3893

3883 -#: builtin/clone.c:657

3894 +#: builtin/clone.c:658

3895 msgid "unable to checkout working tree"

3896 msgstr "不能检出工作区"

3897

3887 -#: builtin/clone.c:765

3898 +#: builtin/clone.c:768

3899 msgid "Too many arguments."

3900 msgstr "太多参数。"

3901

3891 -#: builtin/clone.c:769

3902 +#: builtin/clone.c:772

3903 msgid "You must specify a repository to clone."

3904 msgstr "您必须指定一个版本库来克隆。"

3905

3895 -#: builtin/clone.c:780

3906 +#: builtin/clone.c:783

3907 #, c-format

3908 msgid "--bare and --origin %s options are incompatible."

3909 msgstr "--bare 和 --origin %s 选项不兼容。"

3910

3900 -#: builtin/clone.c:783

3911 +#: builtin/clone.c:786

3912 msgid "--bare and --separate-git-dir are incompatible."

3913 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

3914

3904 -#: builtin/clone.c:796

3915 +#: builtin/clone.c:799

3916 #, c-format

3917 msgid "repository '%s' does not exist"

3918 msgstr "版本库 '%s' 不存在"

3919

3909 -#: builtin/clone.c:802

3910 -msgid "--depth is ignored in local clones; use file:// instead."

3911 -msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

3912 -

3913 -#: builtin/clone.c:805

3914 -msgid "source repository is shallow, ignoring --local"

3915 -msgstr "源版本库是浅克隆，忽略 --local"

3916 -

3917 -#: builtin/clone.c:810

3918 -msgid "--local is ignored"

3919 -msgstr "--local 被忽略"

3920 -

3921 -#: builtin/clone.c:814 builtin/fetch.c:1119

3920 +#: builtin/clone.c:805 builtin/fetch.c:1143

3921 #, c-format

3922 msgid "depth %s is not a positive number"

3923 msgstr "深度 %s 不是一个正数"

3924

3926 -#: builtin/clone.c:824

3925 +#: builtin/clone.c:815

3926 #, c-format

3927 msgid "destination path '%s' already exists and is not an empty directory."

3928 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

3929

3931 -#: builtin/clone.c:834

3930 +#: builtin/clone.c:825

3931 #, c-format

3932 msgid "working tree '%s' already exists."

3933 msgstr "工作区 '%s' 已经存在。"

3934

3936 -#: builtin/clone.c:847 builtin/clone.c:859

3935 +#: builtin/clone.c:838 builtin/clone.c:850

3936 #, c-format

3937 msgid "could not create leading directories of '%s'"

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

3939

3941 -#: builtin/clone.c:850

3940 +#: builtin/clone.c:841

3941 #, c-format

3942 msgid "could not create work tree dir '%s'."

3943 msgstr "不能为 '%s' 创建工作区目录。"

3944

3946 -#: builtin/clone.c:869

3945 +#: builtin/clone.c:860

3946 #, c-format

3947 msgid "Cloning into bare repository '%s'...\n"

3948 msgstr "克隆到裸版本库 '%s'...\n"

3949

3951 -#: builtin/clone.c:871

3950 +#: builtin/clone.c:862

3951 #, c-format

3952 msgid "Cloning into '%s'...\n"

3953 msgstr "正克隆到 '%s'...\n"

3954

3955 +#: builtin/clone.c:898

3956 +msgid "--depth is ignored in local clones; use file:// instead."

3957 +msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

3958 +

3959 +#: builtin/clone.c:901

3960 +msgid "source repository is shallow, ignoring --local"

3961 +msgstr "源版本库是浅克隆，忽略 --local"

3962 +

3963 #: builtin/clone.c:906

3964 +msgid "--local is ignored"

3965 +msgstr "--local 被忽略"

3966 +

3967 +#: builtin/clone.c:910

3968 #, c-format

3969 msgid "Don't know how to clone %s"

3970 msgstr "不知道如何克隆 %s"

3971

3961 -#: builtin/clone.c:957 builtin/clone.c:965

3972 +#: builtin/clone.c:961 builtin/clone.c:969

3973 #, c-format

3974 msgid "Remote branch %s not found in upstream %s"

3975 msgstr "远程分支 %s 在上游 %s 未发现"

3976

3966 -#: builtin/clone.c:968

3977 +#: builtin/clone.c:972

3978 msgid "You appear to have cloned an empty repository."

3979 msgstr "您似乎克隆了一个空版本库。"

3980

@@ -4077,89 +4088,96 @@ msgstr ""

4088 msgid "failed to unpack HEAD tree object"

4089 msgstr "无法解包 HEAD 树对象"

4090

4080 -#: builtin/commit.c:330

4091 +#: builtin/commit.c:328

4092 msgid "unable to create temporary index"

4093 msgstr "不能创建临时索引"

4094

4084 -#: builtin/commit.c:336

4095 +#: builtin/commit.c:334

4096 msgid "interactive add failed"

4097 msgstr "交互式添加失败"

4098

4088 -#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440

4099 +#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

4100 msgid "unable to write new_index file"

4101 msgstr "无法写 new_index 文件"

4102

4092 -#: builtin/commit.c:421

4103 +#: builtin/commit.c:418

4104 msgid "cannot do a partial commit during a merge."

4105 msgstr "在合并过程中不能做部分提交。"

4106

4096 -#: builtin/commit.c:423

4107 +#: builtin/commit.c:420

4108 msgid "cannot do a partial commit during a cherry-pick."

4109 msgstr "在拣选过程中不能做部分提交。"

4110

4100 -#: builtin/commit.c:433

4111 +#: builtin/commit.c:429

4112 msgid "cannot read the index"

4113 msgstr "无法读取索引"

4114

4104 -#: builtin/commit.c:453

4115 +#: builtin/commit.c:447

4116 msgid "unable to write temporary index file"

4117 msgstr "无法写临时索引文件"

4118

4108 -#: builtin/commit.c:544 builtin/commit.c:550

4119 +#: builtin/commit.c:557 builtin/commit.c:563

4120 #, c-format

4121 msgid "invalid commit: %s"

4122 msgstr "无效的提交：%s"

4123

4113 -#: builtin/commit.c:572

4124 +#: builtin/commit.c:585

4125 msgid "malformed --author parameter"

4126 msgstr "非法的 --author 参数"

4127

4128 #: builtin/commit.c:592

4129 #, c-format

4130 +msgid "invalid date format: %s"

4131 +msgstr "无效的日期格式：%s"

4132 +

4133 +#: builtin/commit.c:609

4134 +#, c-format

4135 msgid "Malformed ident string: '%s'"

4136 msgstr "非法的身份字符串：'%s'"

4137

4122 -#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014

4138 +#: builtin/commit.c:642

4139 +msgid ""

4140 +"unable to select a comment character that is not used\n"

4141 +"in the current commit message"

4142 +msgstr "无法选择一个未被当前提交说明使用的注释字符"

4143 +

4144 +#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

4145 #, c-format

4146 msgid "could not lookup commit %s"

4147 msgstr "不能查询提交 %s"

4148

4127 -#: builtin/commit.c:641 builtin/shortlog.c:273

4149 +#: builtin/commit.c:691 builtin/shortlog.c:273

4150 #, c-format

4151 msgid "(reading log message from standard input)\n"

4152 msgstr "（正从标准输入中读取日志信息）\n"

4153

4132 -#: builtin/commit.c:643

4154 +#: builtin/commit.c:693

4155 msgid "could not read log from standard input"

4156 msgstr "不能从标准输入中读取日志信息"

4157

4136 -#: builtin/commit.c:647

4158 +#: builtin/commit.c:697

4159 #, c-format

4160 msgid "could not read log file '%s'"

4161 msgstr "不能读取日志文件 '%s'"

4162

4141 -#: builtin/commit.c:654

4142 -msgid "commit has empty message"

4143 -msgstr "提交说明为空"

4144 -

4145 -#: builtin/commit.c:670

4163 +#: builtin/commit.c:719

4164 msgid "could not read MERGE_MSG"

4165 msgstr "不能读取 MERGE_MSG"

4166

4149 -#: builtin/commit.c:674

4167 +#: builtin/commit.c:723

4168 msgid "could not read SQUASH_MSG"

4169 msgstr "不能读取 SQUASH_MSG"

4170

4153 -#: builtin/commit.c:678

4171 +#: builtin/commit.c:727

4172 #, c-format

4173 msgid "could not read '%s'"

4174 msgstr "不能读取 '%s'"

4175

4158 -#: builtin/commit.c:749

4176 +#: builtin/commit.c:798

4177 msgid "could not write commit template"

4178 msgstr "不能写提交模版"

4179

4162 -#: builtin/commit.c:764

4180 +#: builtin/commit.c:816

4181 #, c-format

4182 msgid ""

4183 "\n"

@@ -4173,7 +4191,7 @@ msgstr ""

4191 "\t%s\n"

4192 "然后重试。\n"

4193

4176 -#: builtin/commit.c:769

4194 +#: builtin/commit.c:821

4195 #, c-format

4196 msgid ""

4197 "\n"

@@ -4187,7 +4205,7 @@ msgstr ""

4205 "\t%s\n"

4206 "然后重试。\n"

4207

4190 -#: builtin/commit.c:782

4208 +#: builtin/commit.c:834

4209 #, c-format

4210 msgid ""

4211 "Please enter the commit message for your changes. Lines starting\n"

@@ -4196,7 +4214,7 @@ msgstr ""

4214 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

4215 "说明将会终止提交。\n"

4216

4199 -#: builtin/commit.c:789

4217 +#: builtin/commit.c:841

4218 #, c-format

4219 msgid ""

4220 "Please enter the commit message for your changes. Lines starting\n"

@@ -4207,355 +4225,361 @@ msgstr ""

4225 "也可以删除它们。一个空的提交说明将会终止提交。\n"

4226

4227 # 译者：为保证在输出中对齐，注意调整句中空格！

4210 -#: builtin/commit.c:802

4228 +#: builtin/commit.c:855

4229 +#, c-format

4230 +msgid "%sAuthor: %.*s <%.*s>"

4231 +msgstr "%s作者： %.*s <%.*s>"

4232 +

4233 +# 译者：为保证在输出中对齐，注意调整句中空格！

4234 +#: builtin/commit.c:863

4235 #, c-format

4212 -msgid "%sAuthor: %s"

4213 -msgstr "%s作者： %s"

4236 +msgid "%sDate: %s"

4237 +msgstr "%s日期： %s"

4238

4239 # 译者：为保证在输出中对齐，注意调整句中空格！

4216 -#: builtin/commit.c:809

4240 +#: builtin/commit.c:870

4241 #, c-format

4218 -msgid "%sCommitter: %s"

4219 -msgstr "%s提交者： %s"

4242 +msgid "%sCommitter: %.*s <%.*s>"

4243 +msgstr "%s提交者：%.*s <%.*s>"

4244

4221 -#: builtin/commit.c:829

4245 +#: builtin/commit.c:888

4246 msgid "Cannot read index"

4247 msgstr "无法读取索引"

4248

4225 -#: builtin/commit.c:872

4249 +#: builtin/commit.c:945

4250 msgid "Error building trees"

4251 msgstr "无法创建树对象"

4252

4229 -#: builtin/commit.c:887 builtin/tag.c:391

4253 +#: builtin/commit.c:960 builtin/tag.c:495

4254 #, c-format

4255 msgid "Please supply the message using either -m or -F option.\n"

4256 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

4257

4234 -#: builtin/commit.c:989

4258 +#: builtin/commit.c:1061

4259 #, c-format

4260 msgid "No existing author found with '%s'"

4261 msgstr "没有找到匹配 '%s' 的作者"

4262

4239 -#: builtin/commit.c:1004 builtin/commit.c:1244

4263 +#: builtin/commit.c:1076 builtin/commit.c:1316

4264 #, c-format

4265 msgid "Invalid untracked files mode '%s'"

4266 msgstr "无效的未追踪文件参数 '%s'"

4267

4244 -#: builtin/commit.c:1041

4268 +#: builtin/commit.c:1113

4269 msgid "--long and -z are incompatible"

4270 msgstr "--long 和 -z 选项不兼容"

4271

4248 -#: builtin/commit.c:1071

4272 +#: builtin/commit.c:1143

4273 msgid "Using both --reset-author and --author does not make sense"

4274 msgstr "同时使用 --reset-author 和 --author 没有意义"

4275

4252 -#: builtin/commit.c:1080

4276 +#: builtin/commit.c:1152

4277 msgid "You have nothing to amend."

4278 msgstr "您没有可修补的提交。"

4279

4256 -#: builtin/commit.c:1083

4280 +#: builtin/commit.c:1155

4281 msgid "You are in the middle of a merge -- cannot amend."

4282 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

4283

4260 -#: builtin/commit.c:1085

4284 +#: builtin/commit.c:1157

4285 msgid "You are in the middle of a cherry-pick -- cannot amend."

4286 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

4287

4264 -#: builtin/commit.c:1088

4288 +#: builtin/commit.c:1160

4289 msgid "Options --squash and --fixup cannot be used together"

4290 msgstr "选项 --squash 和 --fixup 不能同时使用"

4291

4268 -#: builtin/commit.c:1098

4292 +#: builtin/commit.c:1170

4293 msgid "Only one of -c/-C/-F/--fixup can be used."

4294 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

4295

4272 -#: builtin/commit.c:1100

4296 +#: builtin/commit.c:1172

4297 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4298 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

4299

4276 -#: builtin/commit.c:1108

4300 +#: builtin/commit.c:1180

4301 msgid "--reset-author can be used only with -C, -c or --amend."

4302 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

4303

4280 -#: builtin/commit.c:1125

4304 +#: builtin/commit.c:1197

4305 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4306 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

4307

4284 -#: builtin/commit.c:1127

4308 +#: builtin/commit.c:1199

4309 msgid "No paths with --include/--only does not make sense."

4310 msgstr "参数 --include/--only 不跟路径没有意义。"

4311

4288 -#: builtin/commit.c:1129

4312 +#: builtin/commit.c:1201

4313 msgid "Clever... amending the last one with dirty index."

4314 msgstr "聪明... 在索引不干净下修补最后的提交。"

4315

4292 -#: builtin/commit.c:1131

4316 +#: builtin/commit.c:1203

4317 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4318 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."

4319

4296 -#: builtin/commit.c:1143 builtin/tag.c:639

4320 +#: builtin/commit.c:1215 builtin/tag.c:727

4321 #, c-format

4322 msgid "Invalid cleanup mode %s"

4323 msgstr "无效的清理模式 %s"

4324

4301 -#: builtin/commit.c:1148

4325 +#: builtin/commit.c:1220

4326 msgid "Paths with -a does not make sense."

4327 msgstr "路径和 -a 选项同时使用没有意义。"

4328

4305 -#: builtin/commit.c:1258 builtin/commit.c:1516

4329 +#: builtin/commit.c:1330 builtin/commit.c:1595

4330 msgid "show status concisely"

4331 msgstr "以简洁的格式显示状态"

4332

4309 -#: builtin/commit.c:1260 builtin/commit.c:1518

4333 +#: builtin/commit.c:1332 builtin/commit.c:1597

4334 msgid "show branch information"

4335 msgstr "显示分支信息"

4336

4313 -#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490

4337 +#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

4338 msgid "machine-readable output"

4339 msgstr "机器可读的输出"

4340

4317 -#: builtin/commit.c:1265 builtin/commit.c:1522

4341 +#: builtin/commit.c:1337 builtin/commit.c:1601

4342 msgid "show status in long format (default)"

4343 msgstr "以长格式显示状态（默认）"

4344

4321 -#: builtin/commit.c:1268 builtin/commit.c:1525

4345 +#: builtin/commit.c:1340 builtin/commit.c:1604

4346 msgid "terminate entries with NUL"

4347 msgstr "条目以NUL字符结尾"

4348

4325 -#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674

4326 -#: builtin/fast-export.c:677 builtin/tag.c:514

4349 +#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703

4350 +#: builtin/fast-export.c:706 builtin/tag.c:602

4351 msgid "mode"

4352 msgstr "模式"

4353

4330 -#: builtin/commit.c:1271 builtin/commit.c:1528

4354 +#: builtin/commit.c:1343 builtin/commit.c:1607

4355 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4356 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

4357

4334 -#: builtin/commit.c:1274

4358 +#: builtin/commit.c:1346

4359 msgid "show ignored files"

4360 msgstr "显示忽略的文件"

4361

4338 -#: builtin/commit.c:1275 parse-options.h:153

4362 +#: builtin/commit.c:1347 parse-options.h:153

4363 msgid "when"

4364 msgstr "何时"

4365

4342 -#: builtin/commit.c:1276

4366 +#: builtin/commit.c:1348

4367 msgid ""

4368 "ignore changes to submodules, optional when: all, dirty, untracked. "

4369 "(Default: all)"

4370 msgstr ""

4371 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

4372

4349 -#: builtin/commit.c:1278

4373 +#: builtin/commit.c:1350

4374 msgid "list untracked files in columns"

4375 msgstr "以列的方式显示未跟踪的文件"

4376

4353 -#: builtin/commit.c:1347

4377 +#: builtin/commit.c:1419

4378 msgid "couldn't look up newly created commit"

4379 msgstr "无法找到新创建的提交"

4380

4357 -#: builtin/commit.c:1349

4381 +#: builtin/commit.c:1421

4382 msgid "could not parse newly created commit"

4383 msgstr "不能解析新创建的提交"

4384

4361 -#: builtin/commit.c:1390

4385 +#: builtin/commit.c:1469

4386 msgid "detached HEAD"

4387 msgstr "分离头指针"

4388

4389 # 译者：中文字符串拼接，可删除前导空格

4366 -#: builtin/commit.c:1392

4390 +#: builtin/commit.c:1471

4391 msgid " (root-commit)"

4392 msgstr "（根提交）"

4393

4370 -#: builtin/commit.c:1486

4394 +#: builtin/commit.c:1565

4395 msgid "suppress summary after successful commit"

4396 msgstr "提交成功后不显示概述信息"

4397

4374 -#: builtin/commit.c:1487

4398 +#: builtin/commit.c:1566

4399 msgid "show diff in commit message template"

4400 msgstr "在提交说明模板里显示差异"

4401

4378 -#: builtin/commit.c:1489

4402 +#: builtin/commit.c:1568

4403 msgid "Commit message options"

4404 msgstr "提交说明选项"

4405

4382 -#: builtin/commit.c:1490 builtin/tag.c:512

4406 +#: builtin/commit.c:1569 builtin/tag.c:600

4407 msgid "read message from file"

4408 msgstr "从文件中读取提交说明"

4409

4386 -#: builtin/commit.c:1491

4410 +#: builtin/commit.c:1570

4411 msgid "author"

4412 msgstr "作者"

4413

4390 -#: builtin/commit.c:1491

4414 +#: builtin/commit.c:1570

4415 msgid "override author for commit"

4416 msgstr "提交时覆盖作者"

4417

4394 -#: builtin/commit.c:1492 builtin/gc.c:272

4418 +#: builtin/commit.c:1571 builtin/gc.c:286

4419 msgid "date"

4420 msgstr "日期"

4421

4398 -#: builtin/commit.c:1492

4422 +#: builtin/commit.c:1571

4423 msgid "override date for commit"

4424 msgstr "提交时覆盖日期"

4425

4402 -#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409

4403 -#: builtin/notes.c:566 builtin/tag.c:510

4426 +#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409

4427 +#: builtin/notes.c:566 builtin/tag.c:598

4428 msgid "message"

4429 msgstr "说明"

4430

4407 -#: builtin/commit.c:1493

4431 +#: builtin/commit.c:1572

4432 msgid "commit message"

4433 msgstr "提交说明"

4434

4411 -#: builtin/commit.c:1494

4435 +#: builtin/commit.c:1573

4436 msgid "reuse and edit message from specified commit"

4437 msgstr "重用并编辑指定提交的提交说明"

4438

4415 -#: builtin/commit.c:1495

4439 +#: builtin/commit.c:1574

4440 msgid "reuse message from specified commit"

4441 msgstr "重用指定提交的提交说明"

4442

4419 -#: builtin/commit.c:1496

4443 +#: builtin/commit.c:1575

4444 msgid "use autosquash formatted message to fixup specified commit"

4445 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

4446

4423 -#: builtin/commit.c:1497

4447 +#: builtin/commit.c:1576

4448 msgid "use autosquash formatted message to squash specified commit"

4449 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

4450

4427 -#: builtin/commit.c:1498

4451 +#: builtin/commit.c:1577

4452 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4453 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

4454

4431 -#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86

4455 +#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

4456 msgid "add Signed-off-by:"

4457 msgstr "添加 Signed-off-by: 签名"

4458

4435 -#: builtin/commit.c:1500

4459 +#: builtin/commit.c:1579

4460 msgid "use specified template file"

4461 msgstr "使用指定的模板文件"

4462

4439 -#: builtin/commit.c:1501

4463 +#: builtin/commit.c:1580

4464 msgid "force edit of commit"

4465 msgstr "强制编辑提交"

4466

4467 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

4444 -#: builtin/commit.c:1502

4468 +#: builtin/commit.c:1581

4469 msgid "default"

4470 msgstr "default"

4471

4448 -#: builtin/commit.c:1502 builtin/tag.c:515

4472 +#: builtin/commit.c:1581 builtin/tag.c:603

4473 msgid "how to strip spaces and #comments from message"

4474 msgstr "设置如何删除提交说明里的空格和#注释"

4475

4452 -#: builtin/commit.c:1503

4476 +#: builtin/commit.c:1582

4477 msgid "include status in commit message template"

4478 msgstr "在提交说明模板里包含状态信息"

4479

4456 -#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92

4457 -#: builtin/tag.c:516

4480 +#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92

4481 +#: builtin/tag.c:604

4482 msgid "key-id"

4483 msgstr "key-id"

4484

4461 -#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93

4485 +#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

4486 msgid "GPG sign commit"

4487 msgstr "GPG 提交签名"

4488

4465 -#: builtin/commit.c:1508

4489 +#: builtin/commit.c:1587

4490 msgid "Commit contents options"

4491 msgstr "提交内容选项"

4492

4469 -#: builtin/commit.c:1509

4493 +#: builtin/commit.c:1588

4494 msgid "commit all changed files"

4495 msgstr "提交所有改动的文件"

4496

4473 -#: builtin/commit.c:1510

4497 +#: builtin/commit.c:1589

4498 msgid "add specified files to index for commit"

4499 msgstr "添加指定的文件到索引区等待提交"

4500

4477 -#: builtin/commit.c:1511

4501 +#: builtin/commit.c:1590

4502 msgid "interactively add files"

4503 msgstr "交互式添加文件"

4504

4481 -#: builtin/commit.c:1512

4505 +#: builtin/commit.c:1591

4506 msgid "interactively add changes"

4507 msgstr "交互式添加变更"

4508

4485 -#: builtin/commit.c:1513

4509 +#: builtin/commit.c:1592

4510 msgid "commit only specified files"

4511 msgstr "只提交指定的文件"

4512

4489 -#: builtin/commit.c:1514

4513 +#: builtin/commit.c:1593

4514 msgid "bypass pre-commit hook"

4515 msgstr "绕过 pre-commit 钩子"

4516

4493 -#: builtin/commit.c:1515

4517 +#: builtin/commit.c:1594

4518 msgid "show what would be committed"

4519 msgstr "显示将要提交的内容"

4520

4497 -#: builtin/commit.c:1526

4521 +#: builtin/commit.c:1605

4522 msgid "amend previous commit"

4523 msgstr "修改先前的提交"

4524

4501 -#: builtin/commit.c:1527

4525 +#: builtin/commit.c:1606

4526 msgid "bypass post-rewrite hook"

4527 msgstr "绕过 post-rewrite 钩子"

4528

4505 -#: builtin/commit.c:1532

4529 +#: builtin/commit.c:1611

4530 msgid "ok to record an empty change"

4531 msgstr "允许一个空提交"

4532

4509 -#: builtin/commit.c:1534

4533 +#: builtin/commit.c:1613

4534 msgid "ok to record a change with an empty message"

4535 msgstr "允许空的提交说明"

4536

4513 -#: builtin/commit.c:1562

4537 +#: builtin/commit.c:1641

4538 msgid "could not parse HEAD commit"

4539 msgstr "不能解析 HEAD 提交"

4540

4517 -#: builtin/commit.c:1601 builtin/merge.c:518

4541 +#: builtin/commit.c:1680 builtin/merge.c:518

4542 #, c-format

4543 msgid "could not open '%s' for reading"

4544 msgstr "不能为读入打开 '%s'"

4545

4522 -#: builtin/commit.c:1608

4546 +#: builtin/commit.c:1687

4547 #, c-format

4548 msgid "Corrupt MERGE_HEAD file (%s)"

4549 msgstr "损坏的 MERGE_HEAD 文件（%s）"

4550

4527 -#: builtin/commit.c:1615

4551 +#: builtin/commit.c:1694

4552 msgid "could not read MERGE_MODE"

4553 msgstr "不能读取 MERGE_MODE"

4554

4531 -#: builtin/commit.c:1634

4555 +#: builtin/commit.c:1713

4556 #, c-format

4557 msgid "could not read commit message: %s"

4558 msgstr "不能读取提交说明：%s"

4559

4536 -#: builtin/commit.c:1645

4560 +#: builtin/commit.c:1724

4561 #, c-format

4562 msgid "Aborting commit; you did not edit the message.\n"

4563 msgstr "终止提交；您未更改来自模版的提交说明。\n"

4564

4541 -#: builtin/commit.c:1650

4565 +#: builtin/commit.c:1729

4566 #, c-format

4567 msgid "Aborting commit due to empty commit message.\n"

4568 msgstr "终止提交因为提交说明为空。\n"

4569

4546 -#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882

4570 +#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

4571 msgid "failed to write commit object"

4572 msgstr "无法写提交对象"

4573

4550 -#: builtin/commit.c:1686

4574 +#: builtin/commit.c:1756

4575 msgid "cannot lock HEAD ref"

4576 msgstr "无法锁定 HEAD 引用"

4577

4554 -#: builtin/commit.c:1690

4578 +#: builtin/commit.c:1769

4579 msgid "cannot update HEAD ref"

4580 msgstr "无法更新 HEAD 引用"

4581

4558 -#: builtin/commit.c:1701

4582 +#: builtin/commit.c:1780

4583 msgid ""

4584 "Repository has been updated, but unable to write\n"

4585 "new_index file. Check that disk is not full or quota is\n"

@@ -4708,47 +4732,47 @@ msgstr "git describe [选项] <提交号>*"

4732 msgid "git describe [options] --dirty"

4733 msgstr "git describe [选项] --dirty"

4734

4711 -#: builtin/describe.c:225

4735 +#: builtin/describe.c:216

4736 #, c-format

4737 msgid "annotated tag %s not available"

4738 msgstr "注释 tag %s 无效"

4739

4716 -#: builtin/describe.c:229

4740 +#: builtin/describe.c:220

4741 #, c-format

4742 msgid "annotated tag %s has no embedded name"

4743 msgstr "注释 tag %s 没有嵌入名称"

4744

4721 -#: builtin/describe.c:231

4745 +#: builtin/describe.c:222

4746 #, c-format

4747 msgid "tag '%s' is really '%s' here"

4748 msgstr "tag '%s' 的确是在 '%s'"

4749

4726 -#: builtin/describe.c:258

4750 +#: builtin/describe.c:249

4751 #, c-format

4752 msgid "Not a valid object name %s"

4753 msgstr "不是一个有效的对象名 %s"

4754

4731 -#: builtin/describe.c:261

4755 +#: builtin/describe.c:252

4756 #, c-format

4757 msgid "%s is not a valid '%s' object"

4758 msgstr "%s 不是一个有效的 '%s' 对象"

4759

4736 -#: builtin/describe.c:278

4760 +#: builtin/describe.c:269

4761 #, c-format

4762 msgid "no tag exactly matches '%s'"

4763 msgstr "没有 tag 准确匹配 '%s'"

4764

4741 -#: builtin/describe.c:280

4765 +#: builtin/describe.c:271

4766 #, c-format

4767 msgid "searching to describe %s\n"

4768 msgstr "搜索描述 %s\n"

4769

4746 -#: builtin/describe.c:327

4770 +#: builtin/describe.c:318

4771 #, c-format

4772 msgid "finished search at %s\n"

4773 msgstr "完成搜索 %s\n"

4774

4751 -#: builtin/describe.c:354

4775 +#: builtin/describe.c:345

4776 #, c-format

4777 msgid ""

4778 "No annotated tags can describe '%s'.\n"

@@ -4757,7 +4781,7 @@ msgstr ""

4781 "没有注释 tag 能描述 '%s'。\n"

4782 "然而，有非注释 tag：尝试 --tags。"

4783

4760 -#: builtin/describe.c:358

4784 +#: builtin/describe.c:349

4785 #, c-format

4786 msgid ""

4787 "No tags can describe '%s'.\n"

@@ -4766,12 +4790,12 @@ msgstr ""

4790 "没有注释 tag 能描述 '%s'。\n"

4791 "尝试 --always，或者创建一些 tag。"

4792

4769 -#: builtin/describe.c:379

4793 +#: builtin/describe.c:370

4794 #, c-format

4795 msgid "traversed %lu commits\n"

4796 msgstr "已遍历 %lu 个提交\n"

4797

4774 -#: builtin/describe.c:382

4798 +#: builtin/describe.c:373

4799 #, c-format

4800 msgid ""

4801 "more than %i tags found; listed %i most recent\n"

@@ -4780,63 +4804,63 @@ msgstr ""

4804 "发现多于 %i 个 tag，列出最近的 %i 个\n"

4805 "在 %s 放弃搜索\n"

4806

4783 -#: builtin/describe.c:404

4807 +#: builtin/describe.c:395

4808 msgid "find the tag that comes after the commit"

4809 msgstr "寻找提交之后的 tag（用于描述提交）"

4810

4787 -#: builtin/describe.c:405

4811 +#: builtin/describe.c:396

4812 msgid "debug search strategy on stderr"

4813 msgstr "在标准错误上调试搜索策略"

4814

4791 -#: builtin/describe.c:406

4815 +#: builtin/describe.c:397

4816 msgid "use any ref"

4817 msgstr "使用任意引用"

4818

4795 -#: builtin/describe.c:407

4819 +#: builtin/describe.c:398

4820 msgid "use any tag, even unannotated"

4821 msgstr "使用任意 tag，即使未带注解"

4822

4799 -#: builtin/describe.c:408

4823 +#: builtin/describe.c:399

4824 msgid "always use long format"

4825 msgstr "始终使用长提交号格式"

4826

4803 -#: builtin/describe.c:409

4827 +#: builtin/describe.c:400

4828 msgid "only follow first parent"

4829 msgstr "只跟随第一个父提交"

4830

4807 -#: builtin/describe.c:412

4831 +#: builtin/describe.c:403

4832 msgid "only output exact matches"

4833 msgstr "只输出精确匹配"

4834

4811 -#: builtin/describe.c:414

4835 +#: builtin/describe.c:405

4836 msgid "consider <n> most recent tags (default: 10)"

4837 msgstr "考虑最近 <n> 个 tags（默认：10）"

4838

4815 -#: builtin/describe.c:416

4839 +#: builtin/describe.c:407

4840 msgid "only consider tags matching <pattern>"

4841 msgstr "只考虑匹配 <模式> 的 tags"

4842

4819 -#: builtin/describe.c:418 builtin/name-rev.c:321

4843 +#: builtin/describe.c:409 builtin/name-rev.c:318

4844 msgid "show abbreviated commit object as fallback"

4845 msgstr "显示简写的提交号作为后备"

4846

4823 -#: builtin/describe.c:419

4847 +#: builtin/describe.c:410

4848 msgid "mark"

4849 msgstr "标记"

4850

4827 -#: builtin/describe.c:420

4851 +#: builtin/describe.c:411

4852 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4853 msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"

4854

4831 -#: builtin/describe.c:438

4855 +#: builtin/describe.c:429

4856 msgid "--long is incompatible with --abbrev=0"

4857 msgstr "--long 与 --abbrev=0 不兼容"

4858

4835 -#: builtin/describe.c:464

4859 +#: builtin/describe.c:455

4860 msgid "No names found, cannot describe anything."

4861 msgstr "没有发现名称，无法描述任何东西。"

4862

4839 -#: builtin/describe.c:484

4863 +#: builtin/describe.c:475

4864 msgid "--dirty is incompatible with commit-ishes"

4865 msgstr "--dirty 不能与提交同时使用"

4866

@@ -4869,46 +4893,54 @@ msgstr "提供了超过两个数据（blob）对象：'%s'"

4893 msgid "unhandled object '%s' given."

4894 msgstr "无法处理的对象 '%s'。"

4895

4872 -#: builtin/fast-export.c:22

4896 +#: builtin/fast-export.c:23

4897 msgid "git fast-export [rev-list-opts]"

4898 msgstr "git fast-export [rev-list-opts]"

4899

4876 -#: builtin/fast-export.c:673

4900 +#: builtin/fast-export.c:702

4901 msgid "show progress after <n> objects"

4902 msgstr "在 <n> 个对象之后显示进度"

4903

4880 -#: builtin/fast-export.c:675

4904 +#: builtin/fast-export.c:704

4905 msgid "select handling of signed tags"

4906 msgstr "选择如何处理签名 tags"

4907

4884 -#: builtin/fast-export.c:678

4908 +#: builtin/fast-export.c:707

4909 msgid "select handling of tags that tag filtered objects"

4910 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"

4911

4888 -#: builtin/fast-export.c:681

4912 +#: builtin/fast-export.c:710

4913 msgid "Dump marks to this file"

4914 msgstr "把标记存储到这个文件"

4915

4892 -#: builtin/fast-export.c:683

4916 +#: builtin/fast-export.c:712

4917 msgid "Import marks from this file"

4918 msgstr "从这个文件导入标记"

4919

4896 -#: builtin/fast-export.c:685

4920 +#: builtin/fast-export.c:714

4921 msgid "Fake a tagger when tags lack one"

4922 msgstr "当 tags 缺少标记者字段时，假装提供一个"

4923

4900 -#: builtin/fast-export.c:687

4924 +#: builtin/fast-export.c:716

4925 msgid "Output full tree for each commit"

4926 msgstr "每次提交都输出整个树"

4927

4904 -#: builtin/fast-export.c:689

4928 +#: builtin/fast-export.c:718

4929 msgid "Use the done feature to terminate the stream"

4930 msgstr "使用 done 功能来终止流"

4931

4908 -#: builtin/fast-export.c:690

4932 +#: builtin/fast-export.c:719

4933 msgid "Skip output of blob data"

4934 msgstr "跳过数据对象的输出"

4935

4936 +#: builtin/fast-export.c:720

4937 +msgid "refspec"

4938 +msgstr "引用表达式"

4939 +

4940 +#: builtin/fast-export.c:721

4941 +msgid "Apply refspec to exported refs"

4942 +msgstr "对导出的引用应用引用表达式"

4943 +

4944 #: builtin/fetch.c:20

4945 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4946 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"

@@ -4925,155 +4957,163 @@ msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"

4957 msgid "git fetch --all [<options>]"

4958 msgstr "git fetch --all [<选项>]"

4959

4928 -#: builtin/fetch.c:75

4960 +#: builtin/fetch.c:90

4961 msgid "fetch from all remotes"

4962 msgstr "从所有的远程抓取"

4963

4932 -#: builtin/fetch.c:77

4964 +#: builtin/fetch.c:92

4965 msgid "append to .git/FETCH_HEAD instead of overwriting"

4966 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

4967

4936 -#: builtin/fetch.c:79

4968 +#: builtin/fetch.c:94

4969 msgid "path to upload pack on remote end"

4970 msgstr "上传包到远程的路径"

4971

4940 -#: builtin/fetch.c:80

4972 +#: builtin/fetch.c:95

4973 msgid "force overwrite of local branch"

4974 msgstr "强制覆盖本地分支"

4975

4944 -#: builtin/fetch.c:82

4976 +#: builtin/fetch.c:97

4977 msgid "fetch from multiple remotes"

4978 msgstr "从多个远程抓取"

4979

4948 -#: builtin/fetch.c:84

4980 +#: builtin/fetch.c:99

4981 msgid "fetch all tags and associated objects"

4982 msgstr "抓取所有的 tags 和关联对象"

4983

4952 -#: builtin/fetch.c:86

4984 +#: builtin/fetch.c:101

4985 msgid "do not fetch all tags (--no-tags)"

4986 msgstr "不抓取任何 tags (--no-tags)"

4987

4956 -#: builtin/fetch.c:88

4988 +#: builtin/fetch.c:103

4989 msgid "prune remote-tracking branches no longer on remote"

4990 msgstr "清除远程已经不存在的分支的跟踪分支"

4991

4992 # 译者：可选值，不能翻译

4961 -#: builtin/fetch.c:89

4993 +#: builtin/fetch.c:104

4994 msgid "on-demand"

4995 msgstr "on-demand"

4996

4965 -#: builtin/fetch.c:90

4997 +#: builtin/fetch.c:105

4998 msgid "control recursive fetching of submodules"

4999 msgstr "控制子模组的递归抓取"

5000

4969 -#: builtin/fetch.c:94

5001 +#: builtin/fetch.c:109

5002 msgid "keep downloaded pack"

5003 msgstr "保持下载包"

5004

4973 -#: builtin/fetch.c:96

5005 +#: builtin/fetch.c:111

5006 msgid "allow updating of HEAD ref"

5007 msgstr "允许更新 HEAD 引用"

5008

4977 -#: builtin/fetch.c:99

5009 +#: builtin/fetch.c:114

5010 msgid "deepen history of shallow clone"

5011 msgstr "深化浅克隆的历史"

5012

4981 -#: builtin/fetch.c:101

5013 +#: builtin/fetch.c:116

5014 msgid "convert to a complete repository"

5015 msgstr "转换为一个完整的版本库"

5016

4985 -#: builtin/fetch.c:103 builtin/log.c:1197

5017 +#: builtin/fetch.c:118 builtin/log.c:1205

5018 msgid "dir"

5019 msgstr "目录"

5020

4989 -#: builtin/fetch.c:104

5021 +#: builtin/fetch.c:119

5022 msgid "prepend this to submodule path output"

5023 msgstr "在子模组路径输出的前面加上此目录"

5024

4993 -#: builtin/fetch.c:107

5025 +#: builtin/fetch.c:122

5026 msgid "default mode for recursion"

5027 msgstr "递归的默认模式"

5028

4997 -#: builtin/fetch.c:109

5029 +#: builtin/fetch.c:124

5030 msgid "accept refs that update .git/shallow"

5031 msgstr "接受更新 .git/shallow 的引用"

5032

5001 -#: builtin/fetch.c:347

5033 +#: builtin/fetch.c:125

5034 +msgid "refmap"

5035 +msgstr "引用映射"

5036 +

5037 +#: builtin/fetch.c:126

5038 +msgid "specify fetch refmap"

5039 +msgstr "指定获取操作的引用映射"

5040 +

5041 +#: builtin/fetch.c:376

5042 msgid "Couldn't find remote ref HEAD"

5043 msgstr "无法发现远程 HEAD 引用"

5044

5005 -#: builtin/fetch.c:411

5045 +#: builtin/fetch.c:440

5046 #, c-format

5047 msgid "object %s not found"

5048 msgstr "对象 %s 未发现"

5049

5010 -#: builtin/fetch.c:416

5050 +#: builtin/fetch.c:445

5051 msgid "[up to date]"

5052 msgstr "[最新]"

5053

5014 -#: builtin/fetch.c:430

5054 +#: builtin/fetch.c:459

5055 #, c-format

5056 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5057 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

5058

5019 -#: builtin/fetch.c:431 builtin/fetch.c:517

5059 +#: builtin/fetch.c:460 builtin/fetch.c:546

5060 msgid "[rejected]"

5061 msgstr "[已拒绝]"

5062

5023 -#: builtin/fetch.c:442

5063 +#: builtin/fetch.c:471

5064 msgid "[tag update]"

5065 msgstr "[tag更新]"

5066

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

5028 -#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497

5068 +#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

5069 msgid " (unable to update local ref)"

5070 msgstr " （不能更新本地引用）"

5071

5032 -#: builtin/fetch.c:462

5072 +#: builtin/fetch.c:491

5073 msgid "[new tag]"

5074 msgstr "[新tag]"

5075

5036 -#: builtin/fetch.c:465

5076 +#: builtin/fetch.c:494

5077 msgid "[new branch]"

5078 msgstr "[新分支]"

5079

5040 -#: builtin/fetch.c:468

5080 +#: builtin/fetch.c:497

5081 msgid "[new ref]"

5082 msgstr "[新引用]"

5083

5044 -#: builtin/fetch.c:513

5084 +#: builtin/fetch.c:542

5085 msgid "unable to update local ref"

5086 msgstr "不能更新本地引用"

5087

5048 -#: builtin/fetch.c:513

5088 +#: builtin/fetch.c:542

5089 msgid "forced update"

5090 msgstr "强制更新"

5091

5052 -#: builtin/fetch.c:519

5092 +#: builtin/fetch.c:548

5093 msgid "(non-fast-forward)"

5094 msgstr "（非快进式）"

5095

5056 -#: builtin/fetch.c:552 builtin/fetch.c:785

5096 +#: builtin/fetch.c:581 builtin/fetch.c:814

5097 #, c-format

5098 msgid "cannot open %s: %s\n"

5099 msgstr "无法打开 %s：%s\n"

5100

5061 -#: builtin/fetch.c:561

5101 +#: builtin/fetch.c:590

5102 #, c-format

5103 msgid "%s did not send all necessary objects\n"

5104 msgstr "%s 未发送所有必须的对象\n"

5105

5066 -#: builtin/fetch.c:579

5106 +#: builtin/fetch.c:608

5107 #, c-format

5108 msgid "reject %s because shallow roots are not allowed to be updated"

5109 msgstr "拒绝 %s 因为浅克隆不允许被更新"

5110

5071 -#: builtin/fetch.c:667 builtin/fetch.c:750

5111 +#: builtin/fetch.c:696 builtin/fetch.c:779

5112 #, c-format

5113 msgid "From %.*s\n"

5114 msgstr "来自 %.*s\n"

5115

5076 -#: builtin/fetch.c:678

5116 +#: builtin/fetch.c:707

5117 #, c-format

5118 msgid ""

5119 "some local refs could not be updated; try running\n"

@@ -5083,87 +5123,87 @@ msgstr ""

5123 " 'git remote prune %s' 来删除旧的、有冲突的分支"

5124

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

5086 -#: builtin/fetch.c:730

5126 +#: builtin/fetch.c:759

5127 #, c-format

5128 msgid " (%s will become dangling)"

5129 msgstr " （%s 将成为摇摆状态）"

5130

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

5092 -#: builtin/fetch.c:731

5132 +#: builtin/fetch.c:760

5133 #, c-format

5134 msgid " (%s has become dangling)"

5135 msgstr " （%s 已成为摇摆状态）"

5136

5097 -#: builtin/fetch.c:755

5137 +#: builtin/fetch.c:784

5138 msgid "[deleted]"

5139 msgstr "[已删除]"

5140

5101 -#: builtin/fetch.c:756 builtin/remote.c:1050

5141 +#: builtin/fetch.c:785 builtin/remote.c:1059

5142 msgid "(none)"

5143 msgstr "（无）"

5144

5105 -#: builtin/fetch.c:775

5145 +#: builtin/fetch.c:804

5146 #, c-format

5147 msgid "Refusing to fetch into current branch %s of non-bare repository"

5148 msgstr "拒绝获取到非裸版本库的当前分支 %s"

5149

5110 -#: builtin/fetch.c:794

5150 +#: builtin/fetch.c:823

5151 #, c-format

5152 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5153 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

5154

5115 -#: builtin/fetch.c:797

5155 +#: builtin/fetch.c:826

5156 #, c-format

5157 msgid "Option \"%s\" is ignored for %s\n"

5158 msgstr "选项 \"%s\" 为 %s 所忽略\n"

5159

5120 -#: builtin/fetch.c:853

5160 +#: builtin/fetch.c:882

5161 #, c-format

5162 msgid "Don't know how to fetch from %s"

5163 msgstr "不知道如何从 %s 获取"

5164

5125 -#: builtin/fetch.c:1015

5165 +#: builtin/fetch.c:1044

5166 #, c-format

5167 msgid "Fetching %s\n"

5168 msgstr "正在获取 %s\n"

5169

5130 -#: builtin/fetch.c:1017 builtin/remote.c:90

5170 +#: builtin/fetch.c:1046 builtin/remote.c:90

5171 #, c-format

5172 msgid "Could not fetch %s"

5173 msgstr "不能获取 %s"

5174

5135 -#: builtin/fetch.c:1035

5175 +#: builtin/fetch.c:1064

5176 msgid ""

5177 "No remote repository specified. Please, specify either a URL or a\n"

5178 "remote name from which new revisions should be fetched."

5179 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

5180

5141 -#: builtin/fetch.c:1059

5181 +#: builtin/fetch.c:1087

5182 msgid "You need to specify a tag name."

5183 msgstr "您需要指定一个 tag 名称。"

5184

5145 -#: builtin/fetch.c:1107

5185 +#: builtin/fetch.c:1131

5186 msgid "--depth and --unshallow cannot be used together"

5187 msgstr "--depth 和 --unshallow 不能同时使用"

5188

5149 -#: builtin/fetch.c:1109

5189 +#: builtin/fetch.c:1133

5190 msgid "--unshallow on a complete repository does not make sense"

5191 msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"

5192

5153 -#: builtin/fetch.c:1132

5193 +#: builtin/fetch.c:1156

5194 msgid "fetch --all does not take a repository argument"

5195 msgstr "fetch --all 不能带一个版本库参数"

5196

5157 -#: builtin/fetch.c:1134

5197 +#: builtin/fetch.c:1158

5198 msgid "fetch --all does not make sense with refspecs"

5199 msgstr "fetch --all 带引用规则没有任何意义"

5200

5161 -#: builtin/fetch.c:1145

5201 +#: builtin/fetch.c:1169

5202 #, c-format

5203 msgid "No such remote or remote group: %s"

5204 msgstr "没有这样的远程或远程组：%s"

5205

5166 -#: builtin/fetch.c:1153

5206 +#: builtin/fetch.c:1177

5207 msgid "Fetching a group and specifying refspecs does not make sense"

5208 msgstr "获取组并指定引用规则没有意义"

5209

@@ -5172,9 +5212,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5212 msgstr ""

5213 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5214

5175 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5176 -#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179

5177 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501

5215 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5216 +#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183

5217 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

5218 #: parse-options.h:132 parse-options.h:239

5219 msgid "n"

5220 msgstr "n"

@@ -5199,43 +5239,43 @@ msgstr "使用 <文本> 作为提交说明的开始"

5239 msgid "file to read from"

5240 msgstr "从文件中读取"

5241

5202 -#: builtin/for-each-ref.c:1063

5242 +#: builtin/for-each-ref.c:1051

5243 msgid "git for-each-ref [options] [<pattern>]"

5244 msgstr "git for-each-ref [选项] [<模式>]"

5245

5206 -#: builtin/for-each-ref.c:1078

5246 +#: builtin/for-each-ref.c:1066

5247 msgid "quote placeholders suitably for shells"

5248 msgstr "引用占位符适用于 shells"

5249

5210 -#: builtin/for-each-ref.c:1080

5250 +#: builtin/for-each-ref.c:1068

5251 msgid "quote placeholders suitably for perl"

5252 msgstr "引用占位符适用于 perl"

5253

5214 -#: builtin/for-each-ref.c:1082

5254 +#: builtin/for-each-ref.c:1070

5255 msgid "quote placeholders suitably for python"

5256 msgstr "引用占位符适用于 python"

5257

5218 -#: builtin/for-each-ref.c:1084

5258 +#: builtin/for-each-ref.c:1072

5259 msgid "quote placeholders suitably for tcl"

5260 msgstr "引用占位符适用于 tcl"

5261

5222 -#: builtin/for-each-ref.c:1087

5262 +#: builtin/for-each-ref.c:1075

5263 msgid "show only <n> matched refs"

5264 msgstr "只显示 <n> 个匹配的引用"

5265

5226 -#: builtin/for-each-ref.c:1088 builtin/replace.c:177

5266 +#: builtin/for-each-ref.c:1076 builtin/replace.c:435

5267 msgid "format"

5268 msgstr "格式"

5269

5230 -#: builtin/for-each-ref.c:1088

5270 +#: builtin/for-each-ref.c:1076

5271 msgid "format to use for the output"

5272 msgstr "输出格式"

5273

5234 -#: builtin/for-each-ref.c:1089

5274 +#: builtin/for-each-ref.c:1077

5275 msgid "key"

5276 msgstr "key"

5277

5238 -#: builtin/for-each-ref.c:1090

5278 +#: builtin/for-each-ref.c:1078

5279 msgid "field name to sort on"

5280 msgstr "排序的字段名"

5281

@@ -5243,55 +5283,55 @@ msgstr "排序的字段名"

5283 msgid "Checking connectivity"

5284 msgstr "检查连接中"

5285

5246 -#: builtin/fsck.c:544

5286 +#: builtin/fsck.c:538

5287 msgid "Checking object directories"

5288 msgstr "检查对象目录中"

5289

5250 -#: builtin/fsck.c:607

5290 +#: builtin/fsck.c:601

5291 msgid "git fsck [options] [<object>...]"

5292 msgstr "git fsck [选项] [<对象>...]"

5293

5254 -#: builtin/fsck.c:613

5294 +#: builtin/fsck.c:607

5295 msgid "show unreachable objects"

5296 msgstr "显示不可达的对象"

5297

5258 -#: builtin/fsck.c:614

5298 +#: builtin/fsck.c:608

5299 msgid "show dangling objects"

5300 msgstr "显示摇摆的对象"

5301

5262 -#: builtin/fsck.c:615

5302 +#: builtin/fsck.c:609

5303 msgid "report tags"

5304 msgstr "报告 tags"

5305

5266 -#: builtin/fsck.c:616

5306 +#: builtin/fsck.c:610

5307 msgid "report root nodes"

5308 msgstr "报告根节点"

5309

5270 -#: builtin/fsck.c:617

5310 +#: builtin/fsck.c:611

5311 msgid "make index objects head nodes"

5312 msgstr "将索引亦作为检查的头节点"

5313

5274 -#: builtin/fsck.c:618

5314 +#: builtin/fsck.c:612

5315 msgid "make reflogs head nodes (default)"

5316 msgstr "将引用日志作为检查的头节点（默认）"

5317

5278 -#: builtin/fsck.c:619

5318 +#: builtin/fsck.c:613

5319 msgid "also consider packs and alternate objects"

5320 msgstr "也考虑包和备用对象"

5321

5282 -#: builtin/fsck.c:620

5322 +#: builtin/fsck.c:614

5323 msgid "enable more strict checking"

5324 msgstr "启用更严格的检查"

5325

5286 -#: builtin/fsck.c:622

5326 +#: builtin/fsck.c:616

5327 msgid "write dangling objects in .git/lost-found"

5328 msgstr "将摇摆对象写入 .git/lost-found 中"

5329

5290 -#: builtin/fsck.c:623 builtin/prune.c:144

5330 +#: builtin/fsck.c:617 builtin/prune.c:144

5331 msgid "show progress"

5332 msgstr "显示进度"

5333

5294 -#: builtin/fsck.c:673

5334 +#: builtin/fsck.c:667

5335 msgid "Checking objects"

5336 msgstr "检查对象中"

5337

@@ -5299,55 +5339,55 @@ msgstr "检查对象中"

5339 msgid "git gc [options]"

5340 msgstr "git gc [选项]"

5341

5302 -#: builtin/gc.c:90

5342 +#: builtin/gc.c:91

5343 #, c-format

5344 msgid "Invalid %s: '%s'"

5345 msgstr "无效的 %s：'%s'"

5346

5307 -#: builtin/gc.c:117

5347 +#: builtin/gc.c:118

5348 #, c-format

5349 msgid "insanely long object directory %.*s"

5350 msgstr "不正常的长对象目录 %.*s"

5351

5312 -#: builtin/gc.c:273

5352 +#: builtin/gc.c:287

5353 msgid "prune unreferenced objects"

5354 msgstr "清除未引用的对象"

5355

5316 -#: builtin/gc.c:275

5356 +#: builtin/gc.c:289

5357 msgid "be more thorough (increased runtime)"

5358 msgstr "更彻底（增加运行时间）"

5359

5320 -#: builtin/gc.c:276

5360 +#: builtin/gc.c:290

5361 msgid "enable auto-gc mode"

5362 msgstr "启用自动垃圾回收模式"

5363

5324 -#: builtin/gc.c:277

5364 +#: builtin/gc.c:291

5365 msgid "force running gc even if there may be another gc running"

5366 msgstr "强制执行 gc 即使另外一个 gc 正在执行"

5367

5328 -#: builtin/gc.c:318

5368 +#: builtin/gc.c:332

5369 #, c-format

5370 msgid "Auto packing the repository in background for optimum performance.\n"

5371 msgstr "自动在后台执行版本库打包以求最佳性能。\n"

5372

5333 -#: builtin/gc.c:320

5373 +#: builtin/gc.c:334

5374 #, c-format

5375 msgid "Auto packing the repository for optimum performance.\n"

5376 msgstr "自动打包版本库以求最佳性能。\n"

5377

5338 -#: builtin/gc.c:321

5378 +#: builtin/gc.c:335

5379 #, c-format

5380 msgid "See \"git help gc\" for manual housekeeping.\n"

5381 msgstr "手工维护参见 \"git help gc\"。\n"

5382

5343 -#: builtin/gc.c:336

5383 +#: builtin/gc.c:353

5384 #, c-format

5385 msgid ""

5386 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5387 msgstr ""

5388 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"

5389

5350 -#: builtin/gc.c:361

5390 +#: builtin/gc.c:375

5391 msgid ""

5392 "There are too many unreachable loose objects; run 'git prune' to remove them."

5393 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

@@ -5361,225 +5401,220 @@ msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"

5401 msgid "grep: failed to create thread: %s"

5402 msgstr "grep：无法创建线程：%s"

5403

5364 -#: builtin/grep.c:365

5365 -#, c-format

5366 -msgid "Failed to chdir: %s"

5367 -msgstr "无法切换目录：%s"

5368 -

5369 -#: builtin/grep.c:443 builtin/grep.c:478

5404 +#: builtin/grep.c:441 builtin/grep.c:476

5405 #, c-format

5406 msgid "unable to read tree (%s)"

5407 msgstr "无法读取树（%s）"

5408

5374 -#: builtin/grep.c:493

5409 +#: builtin/grep.c:491

5410 #, c-format

5411 msgid "unable to grep from object of type %s"

5412 msgstr "无法抓取来自于 %s 类型的对象"

5413

5379 -#: builtin/grep.c:549

5414 +#: builtin/grep.c:547

5415 #, c-format

5416 msgid "switch `%c' expects a numerical value"

5417 msgstr "开关 `%c' 期望一个数字值"

5418

5384 -#: builtin/grep.c:566

5419 +#: builtin/grep.c:564

5420 #, c-format

5421 msgid "cannot open '%s'"

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

5423

5389 -#: builtin/grep.c:640

5424 +#: builtin/grep.c:638

5425 msgid "search in index instead of in the work tree"

5426 msgstr "在索引区搜索而不是在工作区"

5427

5393 -#: builtin/grep.c:642

5428 +#: builtin/grep.c:640

5429 msgid "find in contents not managed by git"

5430 msgstr "在未被 git 管理的内容中查找"

5431

5432 # 译者：中文字符串拼接，可删除前导空格

5398 -#: builtin/grep.c:644

5433 +#: builtin/grep.c:642

5434 msgid "search in both tracked and untracked files"

5435 msgstr "在跟踪和未跟踪的文件中搜索"

5436

5402 -#: builtin/grep.c:646

5437 +#: builtin/grep.c:644

5438 msgid "search also in ignored files"

5439 msgstr "也在忽略的文件中搜索"

5440

5406 -#: builtin/grep.c:649

5441 +#: builtin/grep.c:647

5442 msgid "show non-matching lines"

5443 msgstr "显示未匹配的行"

5444

5410 -#: builtin/grep.c:651

5445 +#: builtin/grep.c:649

5446 msgid "case insensitive matching"

5447 msgstr "不区分大小写匹配"

5448

5414 -#: builtin/grep.c:653

5449 +#: builtin/grep.c:651

5450 msgid "match patterns only at word boundaries"

5451 msgstr "只在单词边界匹配模式"

5452

5418 -#: builtin/grep.c:655

5453 +#: builtin/grep.c:653

5454 msgid "process binary files as text"

5455 msgstr "把二进制文件当做文本处理"

5456

5422 -#: builtin/grep.c:657

5457 +#: builtin/grep.c:655

5458 msgid "don't match patterns in binary files"

5459 msgstr "不在二进制文件中匹配模式"

5460

5426 -#: builtin/grep.c:660

5461 +#: builtin/grep.c:658

5462 msgid "process binary files with textconv filters"

5463 msgstr "用 textconv 过滤器处理二进制文件"

5464

5430 -#: builtin/grep.c:662

5465 +#: builtin/grep.c:660

5466 msgid "descend at most <depth> levels"

5467 msgstr "最多以指定的深度向下寻找"

5468

5434 -#: builtin/grep.c:666

5469 +#: builtin/grep.c:664

5470 msgid "use extended POSIX regular expressions"

5471 msgstr "使用扩展的 POSIX 正则表达式"

5472

5438 -#: builtin/grep.c:669

5473 +#: builtin/grep.c:667

5474 msgid "use basic POSIX regular expressions (default)"

5475 msgstr "使用基本的 POSIX 正则表达式（默认）"

5476

5442 -#: builtin/grep.c:672

5477 +#: builtin/grep.c:670

5478 msgid "interpret patterns as fixed strings"

5479 msgstr "把模式解析为固定的字符串"

5480

5446 -#: builtin/grep.c:675

5481 +#: builtin/grep.c:673

5482 msgid "use Perl-compatible regular expressions"

5483 msgstr "使用 Perl 兼容的正则表达式"

5484

5450 -#: builtin/grep.c:678

5485 +#: builtin/grep.c:676

5486 msgid "show line numbers"

5487 msgstr "显示行号"

5488

5454 -#: builtin/grep.c:679

5489 +#: builtin/grep.c:677

5490 msgid "don't show filenames"

5491 msgstr "不显示文件名"

5492

5458 -#: builtin/grep.c:680

5493 +#: builtin/grep.c:678

5494 msgid "show filenames"

5495 msgstr "显示文件名"

5496

5462 -#: builtin/grep.c:682

5497 +#: builtin/grep.c:680

5498 msgid "show filenames relative to top directory"

5499 msgstr "显示相对于顶级目录的文件名"

5500

5466 -#: builtin/grep.c:684

5501 +#: builtin/grep.c:682

5502 msgid "show only filenames instead of matching lines"

5503 msgstr "只显示文件名而不显示匹配的行"

5504

5470 -#: builtin/grep.c:686

5505 +#: builtin/grep.c:684

5506 msgid "synonym for --files-with-matches"

5507 msgstr "和 --files-with-matches 同义"

5508

5474 -#: builtin/grep.c:689

5509 +#: builtin/grep.c:687

5510 msgid "show only the names of files without match"

5511 msgstr "只显示未匹配的文件名"

5512

5478 -#: builtin/grep.c:691

5513 +#: builtin/grep.c:689

5514 msgid "print NUL after filenames"

5515 msgstr "在文件名后输出 NUL 字符"

5516

5482 -#: builtin/grep.c:693

5517 +#: builtin/grep.c:691

5518 msgid "show the number of matches instead of matching lines"

5519 msgstr "显示总匹配行数，而不显示匹配的行"

5520

5486 -#: builtin/grep.c:694

5521 +#: builtin/grep.c:692

5522 msgid "highlight matches"

5523 msgstr "高亮显示匹配项"

5524

5490 -#: builtin/grep.c:696

5525 +#: builtin/grep.c:694

5526 msgid "print empty line between matches from different files"

5527 msgstr "在不同文件的匹配项之间打印空行"

5528

5494 -#: builtin/grep.c:698

5529 +#: builtin/grep.c:696

5530 msgid "show filename only once above matches from same file"

5531 msgstr "只在同一文件的匹配项的上面显示一次文件名"

5532

5498 -#: builtin/grep.c:701

5533 +#: builtin/grep.c:699

5534 msgid "show <n> context lines before and after matches"

5535 msgstr "显示匹配项前后的 <n> 行上下文"

5536

5502 -#: builtin/grep.c:704

5537 +#: builtin/grep.c:702

5538 msgid "show <n> context lines before matches"

5539 msgstr "显示匹配项前 <n> 行上下文"

5540

5506 -#: builtin/grep.c:706

5541 +#: builtin/grep.c:704

5542 msgid "show <n> context lines after matches"

5543 msgstr "显示匹配项后 <n> 行上下文"

5544

5510 -#: builtin/grep.c:707

5545 +#: builtin/grep.c:705

5546 msgid "shortcut for -C NUM"

5547 msgstr "快捷键 -C 数字"

5548

5514 -#: builtin/grep.c:710

5549 +#: builtin/grep.c:708

5550 msgid "show a line with the function name before matches"

5551 msgstr "在匹配的前面显示一行函数名"

5552

5518 -#: builtin/grep.c:712

5553 +#: builtin/grep.c:710

5554 msgid "show the surrounding function"

5555 msgstr "显示所在函数的前后内容"

5556

5522 -#: builtin/grep.c:715

5557 +#: builtin/grep.c:713

5558 msgid "read patterns from file"

5559 msgstr "从文件读取模式"

5560

5526 -#: builtin/grep.c:717

5561 +#: builtin/grep.c:715

5562 msgid "match <pattern>"

5563 msgstr "匹配 <模式>"

5564

5530 -#: builtin/grep.c:719

5565 +#: builtin/grep.c:717

5566 msgid "combine patterns specified with -e"

5567 msgstr "组合用 -e 参数设定的模式"

5568

5534 -#: builtin/grep.c:731

5569 +#: builtin/grep.c:729

5570 msgid "indicate hit with exit status without output"

5571 msgstr "不输出，而用退出码标识命中状态"

5572

5538 -#: builtin/grep.c:733

5573 +#: builtin/grep.c:731

5574 msgid "show only matches from files that match all patterns"

5575 msgstr "只显示匹配所有模式的文件中的匹配"

5576

5542 -#: builtin/grep.c:735

5577 +#: builtin/grep.c:733

5578 msgid "show parse tree for grep expression"

5579 msgstr "显示 grep 表达式的解析树"

5580

5546 -#: builtin/grep.c:739

5581 +#: builtin/grep.c:737

5582 msgid "pager"

5583 msgstr "分页"

5584

5550 -#: builtin/grep.c:739

5585 +#: builtin/grep.c:737

5586 msgid "show matching files in the pager"

5587 msgstr "分页显示匹配的文件"

5588

5554 -#: builtin/grep.c:742

5589 +#: builtin/grep.c:740

5590 msgid "allow calling of grep(1) (ignored by this build)"

5591 msgstr "允许调用 grep(1)（本次构建忽略）"

5592

5558 -#: builtin/grep.c:743 builtin/show-ref.c:187

5593 +#: builtin/grep.c:741 builtin/show-ref.c:187

5594 msgid "show usage"

5595 msgstr "显示用法"

5596

5562 -#: builtin/grep.c:810

5597 +#: builtin/grep.c:808

5598 msgid "no pattern given."

5599 msgstr "未提供模式匹配。"

5600

5566 -#: builtin/grep.c:868

5601 +#: builtin/grep.c:866

5602 msgid "--open-files-in-pager only works on the worktree"

5603 msgstr "--open-files-in-pager 仅用于工作区"

5604

5570 -#: builtin/grep.c:891

5605 +#: builtin/grep.c:892

5606 msgid "--cached or --untracked cannot be used with --no-index."

5607 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

5608

5574 -#: builtin/grep.c:896

5609 +#: builtin/grep.c:897

5610 msgid "--no-index or --untracked cannot be used with revs."

5611 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

5612

5578 -#: builtin/grep.c:899

5613 +#: builtin/grep.c:900

5614 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5615 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

5616

5582 -#: builtin/grep.c:907

5617 +#: builtin/grep.c:908

5618 msgid "both --cached and trees are given."

5619 msgstr "同时给出了 --cached 和树对象。"

5620

@@ -5595,7 +5630,7 @@ msgstr ""

5630 msgid "git hash-object --stdin-paths < <list-of-paths>"

5631 msgstr "git hash-object --stdin-paths < <路径列表>"

5632

5598 -#: builtin/hash-object.c:72 builtin/tag.c:521

5633 +#: builtin/hash-object.c:72 builtin/tag.c:609

5634 msgid "type"

5635 msgstr "类型"

5636

@@ -5739,280 +5774,291 @@ msgstr "用法：%s%s"

5774 msgid "`git %s' is aliased to `%s'"

5775 msgstr "`git %s' 是 `%s' 的别名"

5776

5742 -#: builtin/index-pack.c:184

5777 +#: builtin/index-pack.c:145

5778 +#, c-format

5779 +msgid "unable to open %s"

5780 +msgstr "不能打开 %s"

5781 +

5782 +#: builtin/index-pack.c:191

5783 #, c-format

5784 msgid "object type mismatch at %s"

5785 msgstr "%s 的对象类型不匹配"

5786

5747 -#: builtin/index-pack.c:204

5748 -msgid "object of unexpected type"

5749 -msgstr "意外的类型的对象"

5787 +#: builtin/index-pack.c:211

5788 +#, c-format

5789 +msgid "did not receive expected object %s"

5790 +msgstr "未能获取期望的对象 %s"

5791

5751 -#: builtin/index-pack.c:244

5792 +#: builtin/index-pack.c:214

5793 +#, c-format

5794 +msgid "object %s: expected type %s, found %s"

5795 +msgstr "对象 %s：期待类型 %s，却是 %s"

5796 +

5797 +#: builtin/index-pack.c:256

5798 #, c-format

5799 msgid "cannot fill %d byte"

5800 msgid_plural "cannot fill %d bytes"

5801 msgstr[0] "无法填充 %d 字节"

5802 msgstr[1] "无法填充 %d 字节"

5803

5758 -#: builtin/index-pack.c:254

5804 +#: builtin/index-pack.c:266

5805 msgid "early EOF"

5806 msgstr "过早的文件结束符（EOF）"

5807

5762 -#: builtin/index-pack.c:255

5808 +#: builtin/index-pack.c:267

5809 msgid "read error on input"

5810 msgstr "输入上的读错误"

5811

5766 -#: builtin/index-pack.c:267

5812 +#: builtin/index-pack.c:279

5813 msgid "used more bytes than were available"

5814 msgstr "用掉了超过可用的字节"

5815

5770 -#: builtin/index-pack.c:274

5816 +#: builtin/index-pack.c:286

5817 msgid "pack too large for current definition of off_t"

5818 msgstr "包太大超过了当前 off_t 的定义"

5819

5774 -#: builtin/index-pack.c:290

5820 +#: builtin/index-pack.c:302

5821 #, c-format

5822 msgid "unable to create '%s'"

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

5824

5779 -#: builtin/index-pack.c:295

5825 +#: builtin/index-pack.c:307

5826 #, c-format

5827 msgid "cannot open packfile '%s'"

5828 msgstr "无法打开包文件 '%s'"

5829

5784 -#: builtin/index-pack.c:309

5830 +#: builtin/index-pack.c:321

5831 msgid "pack signature mismatch"

5832 msgstr "包签名不匹配"

5833

5788 -#: builtin/index-pack.c:311

5834 +#: builtin/index-pack.c:323

5835 #, c-format

5836 msgid "pack version %<PRIu32> unsupported"

5837 msgstr "不支持包版本 %<PRIu32>"

5838

5793 -#: builtin/index-pack.c:329

5839 +#: builtin/index-pack.c:341

5840 #, c-format

5841 msgid "pack has bad object at offset %lu: %s"

5842 msgstr "包中有错误的对象位于 %lu：%s"

5843

5798 -#: builtin/index-pack.c:451

5844 +#: builtin/index-pack.c:462

5845 #, c-format

5846 msgid "inflate returned %d"

5847 msgstr "解压缩返回 %d"

5848

5803 -#: builtin/index-pack.c:500

5849 +#: builtin/index-pack.c:511

5850 msgid "offset value overflow for delta base object"

5851 msgstr "偏移值覆盖了 delta 基准对象"

5852

5807 -#: builtin/index-pack.c:508

5853 +#: builtin/index-pack.c:519

5854 msgid "delta base offset is out of bound"

5855 msgstr "delta 基准偏移越界"

5856

5811 -#: builtin/index-pack.c:516

5857 +#: builtin/index-pack.c:527

5858 #, c-format

5859 msgid "unknown object type %d"

5860 msgstr "未知对象类型 %d"

5861

5816 -#: builtin/index-pack.c:547

5862 +#: builtin/index-pack.c:558

5863 msgid "cannot pread pack file"

5864 msgstr "无法读取包文件"

5865

5820 -#: builtin/index-pack.c:549

5866 +#: builtin/index-pack.c:560

5867 #, c-format

5868 msgid "premature end of pack file, %lu byte missing"

5869 msgid_plural "premature end of pack file, %lu bytes missing"

5870 msgstr[0] "包文件过早结束，缺少 %lu 字节"

5871 msgstr[1] "包文件过早结束，缺少 %lu 字节"

5872

5827 -#: builtin/index-pack.c:575

5873 +#: builtin/index-pack.c:586

5874 msgid "serious inflate inconsistency"

5875 msgstr "解压缩严重的不一致"

5876

5831 -#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695

5832 -#: builtin/index-pack.c:729 builtin/index-pack.c:738

5877 +#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706

5878 +#: builtin/index-pack.c:740 builtin/index-pack.c:749

5879 #, c-format

5880 msgid "SHA1 COLLISION FOUND WITH %s !"

5881 msgstr "发现 %s 出现 SHA1 冲突！"

5882

5837 -#: builtin/index-pack.c:669 builtin/pack-objects.c:162

5883 +#: builtin/index-pack.c:680 builtin/pack-objects.c:162

5884 #: builtin/pack-objects.c:254

5885 #, c-format

5886 msgid "unable to read %s"

5887 msgstr "不能读 %s"

5888

5843 -#: builtin/index-pack.c:735

5889 +#: builtin/index-pack.c:746

5890 #, c-format

5891 msgid "cannot read existing object %s"

5892 msgstr "不能读取现存对象 %s"

5893

5848 -#: builtin/index-pack.c:749

5894 +#: builtin/index-pack.c:760

5895 #, c-format

5896 msgid "invalid blob object %s"

5897 msgstr "无效的数据（blob）对象 %s"

5898

5853 -#: builtin/index-pack.c:763

5899 +#: builtin/index-pack.c:774

5900 #, c-format

5901 msgid "invalid %s"

5902 msgstr "无效的 %s"

5903

5858 -#: builtin/index-pack.c:766

5904 +#: builtin/index-pack.c:777

5905 msgid "Error in object"

5906 msgstr "对象中出错"

5907

5862 -#: builtin/index-pack.c:768

5908 +#: builtin/index-pack.c:779

5909 #, c-format

5910 msgid "Not all child objects of %s are reachable"

5911 msgstr "%s 的所有子对象并非都可达"

5912

5867 -#: builtin/index-pack.c:839 builtin/index-pack.c:869

5913 +#: builtin/index-pack.c:851 builtin/index-pack.c:881

5914 msgid "failed to apply delta"

5915 msgstr "无法应用 delta"

5916

5871 -#: builtin/index-pack.c:1010

5917 +#: builtin/index-pack.c:1022

5918 msgid "Receiving objects"

5919 msgstr "接收对象中"

5920

5875 -#: builtin/index-pack.c:1010

5921 +#: builtin/index-pack.c:1022

5922 msgid "Indexing objects"

5923 msgstr "索引对象中"

5924

5879 -#: builtin/index-pack.c:1036

5925 +#: builtin/index-pack.c:1048

5926 msgid "pack is corrupted (SHA1 mismatch)"

5927 msgstr "包冲突（SHA1 不匹配）"

5928

5883 -#: builtin/index-pack.c:1041

5929 +#: builtin/index-pack.c:1053

5930 msgid "cannot fstat packfile"

5931 msgstr "不能枚举包文件状态"

5932

5887 -#: builtin/index-pack.c:1044

5933 +#: builtin/index-pack.c:1056

5934 msgid "pack has junk at the end"

5935 msgstr "包的结尾有垃圾数据"

5936

5891 -#: builtin/index-pack.c:1055

5937 +#: builtin/index-pack.c:1067

5938 msgid "confusion beyond insanity in parse_pack_objects()"

5939 msgstr "parse_pack_objects() 中遇到不可理喻的问题"

5940

5895 -#: builtin/index-pack.c:1078

5941 +#: builtin/index-pack.c:1090

5942 msgid "Resolving deltas"

5943 msgstr "处理 delta 中"

5944

5899 -#: builtin/index-pack.c:1088

5945 +#: builtin/index-pack.c:1100

5946 #, c-format

5947 msgid "unable to create thread: %s"

5948 msgstr "不能创建线程：%s"

5949

5904 -#: builtin/index-pack.c:1130

5950 +#: builtin/index-pack.c:1142

5951 msgid "confusion beyond insanity"

5952 msgstr "不可理喻"

5953

5908 -#: builtin/index-pack.c:1138

5954 +#: builtin/index-pack.c:1150

5955 #, c-format

5956 msgid "completed with %d local objects"

5957 msgstr "完成 %d 个本地对象"

5958

5913 -#: builtin/index-pack.c:1148

5959 +#: builtin/index-pack.c:1160

5960 #, c-format

5961 msgid "Unexpected tail checksum for %s (disk corruption?)"

5962 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"

5963

5918 -#: builtin/index-pack.c:1152

5964 +#: builtin/index-pack.c:1164

5965 #, c-format

5966 msgid "pack has %d unresolved delta"

5967 msgid_plural "pack has %d unresolved deltas"

5968 msgstr[0] "包有 %d 个未解决的 delta"

5969 msgstr[1] "包有 %d 个未解决的 delta"

5970

5925 -#: builtin/index-pack.c:1177

5971 +#: builtin/index-pack.c:1189

5972 #, c-format

5973 msgid "unable to deflate appended object (%d)"

5974 msgstr "不能压缩附加对象（%d）"

5975

5930 -#: builtin/index-pack.c:1256

5976 +#: builtin/index-pack.c:1268

5977 #, c-format

5978 msgid "local object %s is corrupt"

5979 msgstr "本地对象 %s 已损坏"

5980

5935 -#: builtin/index-pack.c:1280

5981 +#: builtin/index-pack.c:1292

5982 msgid "error while closing pack file"

5983 msgstr "关闭包文件时出错"

5984

5939 -#: builtin/index-pack.c:1293

5985 +#: builtin/index-pack.c:1305

5986 #, c-format

5987 msgid "cannot write keep file '%s'"

5988 msgstr "无法写保留文件 '%s'"

5989

5944 -#: builtin/index-pack.c:1301

5990 +#: builtin/index-pack.c:1313

5991 #, c-format

5992 msgid "cannot close written keep file '%s'"

5993 msgstr "无法关闭保留文件 '%s'"

5994

5949 -#: builtin/index-pack.c:1314

5995 +#: builtin/index-pack.c:1326

5996 msgid "cannot store pack file"

5997 msgstr "无法存储包文件"

5998

5953 -#: builtin/index-pack.c:1325

5999 +#: builtin/index-pack.c:1337

6000 msgid "cannot store index file"

6001 msgstr "无法存储索引文件"

6002

5957 -#: builtin/index-pack.c:1358

6003 +#: builtin/index-pack.c:1370

6004 #, c-format

6005 msgid "bad pack.indexversion=%<PRIu32>"

6006 msgstr "坏的 pack.indexversion=%<PRIu32>"

6007

5962 -#: builtin/index-pack.c:1364

6008 +#: builtin/index-pack.c:1376

6009 #, c-format

6010 msgid "invalid number of threads specified (%d)"

6011 msgstr "指定的线程数无效（%d）"

6012

5967 -#: builtin/index-pack.c:1368 builtin/index-pack.c:1546

6013 +#: builtin/index-pack.c:1380 builtin/index-pack.c:1559

6014 #, c-format

6015 msgid "no threads support, ignoring %s"

6016 msgstr "没有线程支持，忽略 %s"

6017

5972 -#: builtin/index-pack.c:1426

6018 +#: builtin/index-pack.c:1438

6019 #, c-format

6020 msgid "Cannot open existing pack file '%s'"

6021 msgstr "无法打开现存包文件 '%s'"

6022

5977 -#: builtin/index-pack.c:1428

6023 +#: builtin/index-pack.c:1440

6024 #, c-format

6025 msgid "Cannot open existing pack idx file for '%s'"

6026 msgstr "无法为 %s 打开包索引文件"

6027

5982 -#: builtin/index-pack.c:1475

6028 +#: builtin/index-pack.c:1487

6029 #, c-format

6030 msgid "non delta: %d object"

6031 msgid_plural "non delta: %d objects"

6032 msgstr[0] "非 delta：%d 个对象"

6033 msgstr[1] "非 delta：%d 个对象"

6034

5989 -#: builtin/index-pack.c:1482

6035 +#: builtin/index-pack.c:1494

6036 #, c-format

6037 msgid "chain length = %d: %lu object"

6038 msgid_plural "chain length = %d: %lu objects"

6039 msgstr[0] "链长 = %d: %lu 对象"

6040 msgstr[1] "链长 = %d: %lu 对象"

6041

5996 -#: builtin/index-pack.c:1510

6042 +#: builtin/index-pack.c:1523

6043 msgid "Cannot come back to cwd"

6044 msgstr "无法返回当前工作目录"

6045

6000 -#: builtin/index-pack.c:1558 builtin/index-pack.c:1561

6001 -#: builtin/index-pack.c:1573 builtin/index-pack.c:1577

6046 +#: builtin/index-pack.c:1571 builtin/index-pack.c:1574

6047 +#: builtin/index-pack.c:1586 builtin/index-pack.c:1590

6048 #, c-format

6049 msgid "bad %s"

6050 msgstr "错误选项 %s"

6051

6006 -#: builtin/index-pack.c:1591

6052 +#: builtin/index-pack.c:1604

6053 msgid "--fix-thin cannot be used without --stdin"

6054 msgstr "--fix-thin 不能和 --stdin 同时使用"

6055

6010 -#: builtin/index-pack.c:1595 builtin/index-pack.c:1605

6056 +#: builtin/index-pack.c:1608 builtin/index-pack.c:1617

6057 #, c-format

6058 msgid "packfile name '%s' does not end with '.pack'"

6059 msgstr "包名 '%s' 没有以 '.pack' 结尾"

6060

6015 -#: builtin/index-pack.c:1614

6061 +#: builtin/index-pack.c:1625

6062 msgid "--verify with no packfile name given"

6063 msgstr "--verify 没有提供包名参数"

6064

@@ -6142,7 +6188,7 @@ msgstr "权限"

6188 msgid "specify that the git repository is to be shared amongst several users"

6189 msgstr "指定 git 版本库是多个用户之间共享的"

6190

6145 -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168

6191 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172

6192 msgid "be quiet"

6193 msgstr "保持安静"

6194

@@ -6182,38 +6228,38 @@ msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"

6228 msgid " or: git show [options] <object>..."

6229 msgstr " 或者：git show [选项] <对象>..."

6230

6185 -#: builtin/log.c:125

6231 +#: builtin/log.c:127

6232 msgid "suppress diff output"

6233 msgstr "不显示差异输出"

6234

6189 -#: builtin/log.c:126

6235 +#: builtin/log.c:128

6236 msgid "show source"

6237 msgstr "显示源"

6238

6193 -#: builtin/log.c:127

6239 +#: builtin/log.c:129

6240 msgid "Use mail map file"

6241 msgstr "使用邮件映射文件"

6242

6197 -#: builtin/log.c:128

6243 +#: builtin/log.c:130

6244 msgid "decorate options"

6245 msgstr "修饰选项"

6246

6201 -#: builtin/log.c:231

6247 +#: builtin/log.c:229

6248 #, c-format

6249 msgid "Final output: %d %s\n"

6250 msgstr "最终输出：%d %s\n"

6251

6206 -#: builtin/log.c:473 builtin/log.c:565

6252 +#: builtin/log.c:470 builtin/log.c:562

6253 #, c-format

6254 msgid "Could not read object %s"

6255 msgstr "不能读取对象 %s"

6256

6211 -#: builtin/log.c:589

6257 +#: builtin/log.c:586

6258 #, c-format

6259 msgid "Unknown type: %d"

6260 msgstr "未知类型：%d"

6261

6216 -#: builtin/log.c:689

6262 +#: builtin/log.c:687

6263 msgid "format.headers without value"

6264 msgstr "format.headers 没有值"

6265

@@ -6234,200 +6280,209 @@ msgstr "只需要一个范围。"

6280 msgid "Not a range."

6281 msgstr "不是一个范围。"

6282

6237 -#: builtin/log.c:911

6283 +#: builtin/log.c:916

6284 msgid "Cover letter needs email format"

6285 msgstr "信封需要邮件地址格式"

6286

6241 -#: builtin/log.c:987

6287 +#: builtin/log.c:995

6288 #, c-format

6289 msgid "insane in-reply-to: %s"

6290 msgstr "不正常的 in-reply-to：%s"

6291

6246 -#: builtin/log.c:1015

6292 +#: builtin/log.c:1023

6293 msgid "git format-patch [options] [<since> | <revision range>]"

6294 msgstr "git format-patch [选项] [<从> | <修订集范围>]"

6295

6250 -#: builtin/log.c:1060

6296 +#: builtin/log.c:1068

6297 msgid "Two output directories?"

6298 msgstr "两个输出目录？"

6299

6254 -#: builtin/log.c:1175

6300 +#: builtin/log.c:1183

6301 msgid "use [PATCH n/m] even with a single patch"

6302 msgstr "使用 [PATCH n/m]，即使只有一个补丁"

6303

6258 -#: builtin/log.c:1178

6304 +#: builtin/log.c:1186

6305 msgid "use [PATCH] even with multiple patches"

6306 msgstr "使用 [PATCH]，即使有多个补丁"

6307

6262 -#: builtin/log.c:1182

6308 +#: builtin/log.c:1190

6309 msgid "print patches to standard out"

6310 msgstr "打印补丁到标准输出"

6311

6266 -#: builtin/log.c:1184

6312 +#: builtin/log.c:1192

6313 msgid "generate a cover letter"

6314 msgstr "生成一封附信"

6315

6270 -#: builtin/log.c:1186

6316 +#: builtin/log.c:1194

6317 msgid "use simple number sequence for output file names"

6318 msgstr "使用简单的数字序列作为输出文件名"

6319

6274 -#: builtin/log.c:1187

6320 +#: builtin/log.c:1195

6321 msgid "sfx"

6322 msgstr "后缀"

6323

6278 -#: builtin/log.c:1188

6324 +#: builtin/log.c:1196

6325 msgid "use <sfx> instead of '.patch'"

6326 msgstr "使用 <后缀> 代替 '.patch'"

6327

6282 -#: builtin/log.c:1190

6328 +#: builtin/log.c:1198

6329 msgid "start numbering patches at <n> instead of 1"

6330 msgstr "补丁以 <n> 开始编号，而不是1"

6331

6286 -#: builtin/log.c:1192

6332 +#: builtin/log.c:1200

6333 msgid "mark the series as Nth re-roll"

6334 msgstr "标记补丁系列是第几次重制"

6335

6290 -#: builtin/log.c:1194

6336 +#: builtin/log.c:1202

6337 msgid "Use [<prefix>] instead of [PATCH]"

6338 msgstr "使用 [<前缀>] 代替 [PATCH]"

6339

6294 -#: builtin/log.c:1197

6340 +#: builtin/log.c:1205

6341 msgid "store resulting files in <dir>"

6342 msgstr "把结果文件存储在 <dir>"

6343

6298 -#: builtin/log.c:1200

6344 +#: builtin/log.c:1208

6345 msgid "don't strip/add [PATCH]"

6346 msgstr "不删除/添加 [PATCH]"

6347

6302 -#: builtin/log.c:1203

6348 +#: builtin/log.c:1211

6349 msgid "don't output binary diffs"

6350 msgstr "不输出二进制差异"

6351

6306 -#: builtin/log.c:1205

6352 +#: builtin/log.c:1213

6353 msgid "don't include a patch matching a commit upstream"

6354 msgstr "不包含已在上游提交中的补丁"

6355

6310 -#: builtin/log.c:1207

6356 +#: builtin/log.c:1215

6357 msgid "show patch format instead of default (patch + stat)"

6358 msgstr "显示纯补丁格式而非默认的（补丁+状态）"

6359

6314 -#: builtin/log.c:1209

6360 +#: builtin/log.c:1217

6361 msgid "Messaging"

6362 msgstr "邮件发送"

6363

6318 -#: builtin/log.c:1210

6364 +#: builtin/log.c:1218

6365 msgid "header"

6366 msgstr "header"

6367

6322 -#: builtin/log.c:1211

6368 +#: builtin/log.c:1219

6369 msgid "add email header"

6370 msgstr "添加邮件头"

6371

6326 -#: builtin/log.c:1212 builtin/log.c:1214

6372 +#: builtin/log.c:1220 builtin/log.c:1222

6373 msgid "email"

6374 msgstr "邮件地址"

6375

6330 -#: builtin/log.c:1212

6376 +#: builtin/log.c:1220

6377 msgid "add To: header"

6378 msgstr "添加收件人"

6379

6334 -#: builtin/log.c:1214

6380 +#: builtin/log.c:1222

6381 msgid "add Cc: header"

6382 msgstr "添加抄送"

6383

6338 -#: builtin/log.c:1216

6384 +#: builtin/log.c:1224

6385 msgid "ident"

6386 msgstr "ident"

6387

6342 -#: builtin/log.c:1217

6388 +#: builtin/log.c:1225

6389 msgid "set From address to <ident> (or committer ident if absent)"

6390 msgstr "设置 From 地址为 <ident>（如若不提供，用提交者ID做为地址）"

6391

6346 -#: builtin/log.c:1219

6392 +#: builtin/log.c:1227

6393 msgid "message-id"

6394 msgstr "message-id"

6395

6350 -#: builtin/log.c:1220

6396 +#: builtin/log.c:1228

6397 msgid "make first mail a reply to <message-id>"

6398 msgstr "使第一封邮件作为对 <message-id> 的回复"

6399

6354 -#: builtin/log.c:1221 builtin/log.c:1224

6400 +#: builtin/log.c:1229 builtin/log.c:1232

6401 msgid "boundary"

6402 msgstr "边界"

6403

6358 -#: builtin/log.c:1222

6404 +#: builtin/log.c:1230

6405 msgid "attach the patch"

6406 msgstr "附件方式添加补丁"

6407

6362 -#: builtin/log.c:1225

6408 +#: builtin/log.c:1233

6409 msgid "inline the patch"

6410 msgstr "内联显示补丁"

6411

6366 -#: builtin/log.c:1229

6412 +#: builtin/log.c:1237

6413 msgid "enable message threading, styles: shallow, deep"

6414 msgstr "启用邮件线索，风格：浅，深"

6415

6370 -#: builtin/log.c:1231

6416 +#: builtin/log.c:1239

6417 msgid "signature"

6418 msgstr "签名"

6419

6374 -#: builtin/log.c:1232

6420 +#: builtin/log.c:1240

6421 msgid "add a signature"

6422 msgstr "添加一个签名"

6423

6378 -#: builtin/log.c:1233

6424 +#: builtin/log.c:1242

6425 +msgid "add a signature from a file"

6426 +msgstr "从文件添加一个签名"

6427 +

6428 +#: builtin/log.c:1243

6429 msgid "don't print the patch filenames"

6430 msgstr "不要打印补丁文件名"

6431

6382 -#: builtin/log.c:1307

6432 +#: builtin/log.c:1317

6433 #, c-format

6434 msgid "invalid ident line: %s"

6435 msgstr "包含无效的身份标识：%s"

6436

6387 -#: builtin/log.c:1322

6437 +#: builtin/log.c:1332

6438 msgid "-n and -k are mutually exclusive."

6439 msgstr "-n 和 -k 互斥。"

6440

6391 -#: builtin/log.c:1324

6441 +#: builtin/log.c:1334

6442 msgid "--subject-prefix and -k are mutually exclusive."

6443 msgstr "--subject-prefix 和 -k 互斥。"

6444

6395 -#: builtin/log.c:1332

6445 +#: builtin/log.c:1342

6446 msgid "--name-only does not make sense"

6447 msgstr "--name-only 无意义"

6448

6399 -#: builtin/log.c:1334

6449 +#: builtin/log.c:1344

6450 msgid "--name-status does not make sense"

6451 msgstr "--name-status 无意义"

6452

6403 -#: builtin/log.c:1336

6453 +#: builtin/log.c:1346

6454 msgid "--check does not make sense"

6455 msgstr "--check 无意义"

6456

6407 -#: builtin/log.c:1359

6457 +#: builtin/log.c:1369

6458 msgid "standard output, or directory, which one?"

6459 msgstr "标准输出或目录，哪一个？"

6460

6411 -#: builtin/log.c:1361

6461 +#: builtin/log.c:1371

6462 #, c-format

6463 msgid "Could not create directory '%s'"

6464 msgstr "不能创建目录 '%s'"

6465

6416 -#: builtin/log.c:1509

6466 +#: builtin/log.c:1468

6467 +#, c-format

6468 +msgid "unable to read signature file '%s'"

6469 +msgstr "无法读取签名文件 '%s'"

6470 +

6471 +#: builtin/log.c:1531

6472 msgid "Failed to create output files"

6473 msgstr "无法创建输出文件"

6474

6420 -#: builtin/log.c:1558

6475 +#: builtin/log.c:1579

6476 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

6477 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"

6478

6424 -#: builtin/log.c:1613

6479 +#: builtin/log.c:1634

6480 #, c-format

6481 msgid ""

6482 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

6483 msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"

6484

6430 -#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640

6485 +#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661

6486 #, c-format

6487 msgid "Unknown commit %s"

6488 msgstr "未知提交 %s"

@@ -6709,31 +6764,31 @@ msgstr "坏的 branch.%s.mergeoptions 字符串：%s"

6764 msgid "git write-tree failed to write a tree"

6765 msgstr "git write-tree 无法写入一树对象"

6766

6712 -#: builtin/merge.c:681

6767 +#: builtin/merge.c:678

6768 msgid "Not handling anything other than two heads merge."

6769 msgstr "不能处理两个头合并之外的任何操作。"

6770

6716 -#: builtin/merge.c:695

6771 +#: builtin/merge.c:692

6772 #, c-format

6773 msgid "Unknown option for merge-recursive: -X%s"

6774 msgstr "merge-recursive 的未知选项：-X%s"

6775

6721 -#: builtin/merge.c:709

l10n: zh_CN: translations for git v2.1.0-rc0