ef317cd51e · matheusbsbs/matheus-bagliano

@@ -12,7 +12,7 @@ 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: 2012-09-05 06:20+0800\n"

15 +"POT-Creation-Date: 2012-09-15 10:21+0800\n"

16 "PO-Revision-Date: 2012-09-07 17:56+0800\n"

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

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

@@ -42,6 +42,95 @@ msgstr ""

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

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

44

45 +#: archive.c:10

46 +#, fuzzy

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

48 +msgstr "git apply [选项] [<补丁>...]"

49 +

50 +#: archive.c:11

51 +#, fuzzy

52 +msgid "git archive --list"

53 +msgstr "git archive：NACK %s"

54 +

55 +#: archive.c:12

56 +msgid ""

57 +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"

58 +msgstr ""

59 +

60 +#: archive.c:13

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

62 +msgstr ""

63 +

64 +#: archive.c:322

65 +msgid "fmt"

66 +msgstr ""

67 +

68 +#: archive.c:322

69 +msgid "archive format"

70 +msgstr ""

71 +

72 +#: archive.c:323 builtin/log.c:1079

73 +msgid "prefix"

74 +msgstr ""

75 +

76 +#: archive.c:324

77 +msgid "prepend prefix to each pathname in the archive"

78 +msgstr ""

79 +

80 +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332

81 +#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642

82 +#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77

83 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537

84 +#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149

85 +msgid "file"

86 +msgstr "文件"

87 +

88 +#: archive.c:326 builtin/archive.c:92

89 +msgid "write the archive to this file"

90 +msgstr ""

91 +

92 +#: archive.c:328

93 +#, fuzzy

94 +msgid "read .gitattributes in working directory"

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

96 +

97 +#: archive.c:329

98 +msgid "report archived files on stderr"

99 +msgstr ""

100 +

101 +#: archive.c:330

102 +msgid "store only"

103 +msgstr ""

104 +

105 +#: archive.c:331

106 +msgid "compress faster"

107 +msgstr ""

108 +

109 +#: archive.c:339

110 +msgid "compress better"

111 +msgstr ""

112 +

113 +#: archive.c:342

114 +msgid "list supported archive formats"

115 +msgstr ""

116 +

117 +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85

118 +msgid "repo"

119 +msgstr ""

120 +

121 +#: archive.c:345 builtin/archive.c:94

122 +msgid "retrieve the archive from remote repository <repo>"

123 +msgstr ""

124 +

125 +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616

126 +#, fuzzy

127 +msgid "command"

128 +msgstr "运行 $command"

129 +

130 +#: archive.c:347 builtin/archive.c:96

131 +msgid "path to the remote git-upload-archive command"

132 +msgstr ""

133 +

134 #: bundle.c:36

135 #, c-format

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

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

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

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

143

55 -#: bundle.c:89 builtin/commit.c:699

144 +#: bundle.c:89 builtin/commit.c:714

145 #, c-format

146 msgid "could not open '%s'"

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

@@ -61,7 +150,7 @@ msgstr "不能打开 '%s'"

150 msgid "Repository lacks these prerequisite commits:"

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

152

64 -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290

153 +#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290

154 #: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347

155 #: builtin/shortlog.c:181

156 msgid "revision walk setup failed"

@@ -412,20 +501,20 @@ msgstr "无法创建符号链接 '%s'"

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

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

503

415 -#: merge-recursive.c:921

504 +#: merge-recursive.c:922

505 msgid "Failed to execute internal merge"

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

507

419 -#: merge-recursive.c:925

508 +#: merge-recursive.c:926

509 #, c-format

510 msgid "Unable to add %s to database"

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

512

424 -#: merge-recursive.c:941

513 +#: merge-recursive.c:942

514 msgid "unsupported object type in the tree"

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

516

428 -#: merge-recursive.c:1020 merge-recursive.c:1034

517 +#: merge-recursive.c:1021 merge-recursive.c:1035

518 #, c-format

519 msgid ""

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

@@ -434,7 +523,7 @@ msgstr ""

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

524 "的版本被保留。"

525

437 -#: merge-recursive.c:1026 merge-recursive.c:1039

526 +#: merge-recursive.c:1027 merge-recursive.c:1040

527 #, c-format

528 msgid ""

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

@@ -443,20 +532,20 @@ msgstr ""

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

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

534

446 -#: merge-recursive.c:1080

535 +#: merge-recursive.c:1081

536 msgid "rename"

537 msgstr "重命名"

538

450 -#: merge-recursive.c:1080

539 +#: merge-recursive.c:1081

540 msgid "renamed"

541 msgstr "重命名"

542

454 -#: merge-recursive.c:1136

543 +#: merge-recursive.c:1137

544 #, c-format

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

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

547

459 -#: merge-recursive.c:1158

548 +#: merge-recursive.c:1159

549 #, c-format

550 msgid ""

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

@@ -465,144 +554,144 @@ msgstr ""

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

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

556

468 -#: merge-recursive.c:1163

557 +#: merge-recursive.c:1164

558 msgid " (left unresolved)"

559 msgstr "（留下未解决）"

560

472 -#: merge-recursive.c:1217

561 +#: merge-recursive.c:1218

562 #, c-format

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

564 msgstr ""

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

566 "%5$s"

567

479 -#: merge-recursive.c:1247

568 +#: merge-recursive.c:1248

569 #, c-format

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

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

572

484 -#: merge-recursive.c:1446

573 +#: merge-recursive.c:1447

574 #, c-format

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

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

577

489 -#: merge-recursive.c:1456

578 +#: merge-recursive.c:1457

579 #, c-format

580 msgid "Adding merged %s"

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

582

494 -#: merge-recursive.c:1461 merge-recursive.c:1659

583 +#: merge-recursive.c:1462 merge-recursive.c:1660

584 #, c-format

585 msgid "Adding as %s instead"

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

587

499 -#: merge-recursive.c:1512

588 +#: merge-recursive.c:1513

589 #, c-format

590 msgid "cannot read object %s"

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

592

504 -#: merge-recursive.c:1515

593 +#: merge-recursive.c:1516

594 #, c-format

595 msgid "object %s is not a blob"

596 msgstr "对象 %s 不是一个二进制对象（blob）"

597

509 -#: merge-recursive.c:1563

598 +#: merge-recursive.c:1564

599 msgid "modify"

600 msgstr "修改"

601

513 -#: merge-recursive.c:1563

602 +#: merge-recursive.c:1564

603 msgid "modified"

604 msgstr "修改"

605

517 -#: merge-recursive.c:1573

606 +#: merge-recursive.c:1574

607 msgid "content"

608 msgstr "内容"

609

521 -#: merge-recursive.c:1580

610 +#: merge-recursive.c:1581

611 msgid "add/add"

612 msgstr "添加/添加"

613

525 -#: merge-recursive.c:1614

614 +#: merge-recursive.c:1615

615 #, c-format

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

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

618

530 -#: merge-recursive.c:1628

619 +#: merge-recursive.c:1629

620 #, c-format

621 msgid "Auto-merging %s"

622 msgstr "自动合并 %s"

623

535 -#: merge-recursive.c:1632 git-submodule.sh:869

624 +#: merge-recursive.c:1633 git-submodule.sh:869

625 msgid "submodule"

626 msgstr "子模组"

627

539 -#: merge-recursive.c:1633

628 +#: merge-recursive.c:1634

629 #, c-format

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

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

632

544 -#: merge-recursive.c:1723

633 +#: merge-recursive.c:1724

634 #, c-format

635 msgid "Removing %s"

636 msgstr "删除 %s"

637

549 -#: merge-recursive.c:1748

638 +#: merge-recursive.c:1749

639 msgid "file/directory"

640 msgstr "文件/目录"

641

553 -#: merge-recursive.c:1754

642 +#: merge-recursive.c:1755

643 msgid "directory/file"

644 msgstr "目录/文件"

645

557 -#: merge-recursive.c:1759

646 +#: merge-recursive.c:1760

647 #, c-format

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

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

650

562 -#: merge-recursive.c:1769

651 +#: merge-recursive.c:1770

652 #, c-format

653 msgid "Adding %s"

654 msgstr "添加 %s"

655

567 -#: merge-recursive.c:1786

656 +#: merge-recursive.c:1787

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

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

659

571 -#: merge-recursive.c:1805

660 +#: merge-recursive.c:1806

661 msgid "Already up-to-date!"

662 msgstr "已经是最新的！"

663

575 -#: merge-recursive.c:1814

664 +#: merge-recursive.c:1815

665 #, c-format

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

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

668

580 -#: merge-recursive.c:1844

669 +#: merge-recursive.c:1845

670 #, c-format

671 msgid "Unprocessed path??? %s"

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

673

585 -#: merge-recursive.c:1889

674 +#: merge-recursive.c:1890

675 msgid "Merging:"

676 msgstr "合并："

677

589 -#: merge-recursive.c:1902

678 +#: merge-recursive.c:1903

679 #, c-format

680 msgid "found %u common ancestor:"

681 msgid_plural "found %u common ancestors:"

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

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

684

596 -#: merge-recursive.c:1939

685 +#: merge-recursive.c:1940

686 msgid "merge returned no commit"

687 msgstr "合并未返回提交"

688

600 -#: merge-recursive.c:1996

689 +#: merge-recursive.c:1997

690 #, c-format

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

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

693

605 -#: merge-recursive.c:2008 builtin/merge.c:696

694 +#: merge-recursive.c:2009 builtin/merge.c:696

695 msgid "Unable to write index."

696 msgstr "不能写入索引。"

697

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

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

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

778

690 -#: sequencer.c:160 sequencer.c:758 sequencer.c:841

779 +#: sequencer.c:160 sequencer.c:765 sequencer.c:848

780 #, c-format

781 msgid "Could not write to %s"

782 msgstr "不能写入 %s"

@@ -723,178 +812,178 @@ msgstr "不能解析 HEAD 提交\n"

812 msgid "Unable to update cache tree\n"

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

814

726 -#: sequencer.c:324

815 +#: sequencer.c:327

816 #, c-format

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

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

819

731 -#: sequencer.c:329

820 +#: sequencer.c:332

821 #, c-format

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

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

824

736 -#: sequencer.c:395

825 +#: sequencer.c:398

826 msgid "Your index file is unmerged."

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

828

740 -#: sequencer.c:398

829 +#: sequencer.c:401

830 msgid "You do not have a valid HEAD"

831 msgstr "您没有一个有效的 HEAD"

832

744 -#: sequencer.c:413

833 +#: sequencer.c:416

834 #, c-format

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

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

837

749 -#: sequencer.c:421

838 +#: sequencer.c:424

839 #, c-format

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

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

842

754 -#: sequencer.c:425

843 +#: sequencer.c:428

844 #, c-format

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

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

847

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

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

761 -#: sequencer.c:436

850 +#: sequencer.c:439

851 #, c-format

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

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

854

766 -#: sequencer.c:440

855 +#: sequencer.c:443

856 #, c-format

857 msgid "Cannot get commit message for %s"

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

859

771 -#: sequencer.c:524

860 +#: sequencer.c:527

861 #, c-format

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

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

864

776 -#: sequencer.c:525

865 +#: sequencer.c:528

866 #, c-format

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

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

869

781 -#: sequencer.c:553

870 +#: sequencer.c:560

871 msgid "empty commit set passed"

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

873

785 -#: sequencer.c:561

874 +#: sequencer.c:568

875 #, c-format

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

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

878

790 -#: sequencer.c:566

879 +#: sequencer.c:573

880 #, c-format

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

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

883

795 -#: sequencer.c:624

884 +#: sequencer.c:631

885 #, c-format

886 msgid "Cannot %s during a %s"

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

888

800 -#: sequencer.c:646

889 +#: sequencer.c:653

890 #, c-format

891 msgid "Could not parse line %d."

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

893

805 -#: sequencer.c:651

894 +#: sequencer.c:658

895 msgid "No commits parsed."

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

897

809 -#: sequencer.c:664

898 +#: sequencer.c:671

899 #, c-format

900 msgid "Could not open %s"

901 msgstr "不能打开 %s"

902

814 -#: sequencer.c:668

903 +#: sequencer.c:675

904 #, c-format

905 msgid "Could not read %s."

906 msgstr "不能读取 %s。"

907

819 -#: sequencer.c:675

908 +#: sequencer.c:682

909 #, c-format

910 msgid "Unusable instruction sheet: %s"

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

912

824 -#: sequencer.c:703

913 +#: sequencer.c:710

914 #, c-format

915 msgid "Invalid key: %s"

916 msgstr "无效键名：%s"

917

829 -#: sequencer.c:706

918 +#: sequencer.c:713

919 #, c-format

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

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

922

834 -#: sequencer.c:718

923 +#: sequencer.c:725

924 #, c-format

925 msgid "Malformed options sheet: %s"

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

927

839 -#: sequencer.c:739

928 +#: sequencer.c:746

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

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

931

843 -#: sequencer.c:740

932 +#: sequencer.c:747

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

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

935

847 -#: sequencer.c:744

936 +#: sequencer.c:751

937 #, c-format

938 msgid "Could not create sequencer directory %s"

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

940

852 -#: sequencer.c:760 sequencer.c:845

941 +#: sequencer.c:767 sequencer.c:852

942 #, c-format

943 msgid "Error wrapping up %s."

944 msgstr "错误收尾 %s。"

945

857 -#: sequencer.c:779 sequencer.c:913

946 +#: sequencer.c:786 sequencer.c:920

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

948 msgstr "没有拣选或还原操作在进行"

949

861 -#: sequencer.c:781

950 +#: sequencer.c:788

951 msgid "cannot resolve HEAD"

952 msgstr "不能解析 HEAD"

953

865 -#: sequencer.c:783

954 +#: sequencer.c:790

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

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

957

869 -#: sequencer.c:805 builtin/apply.c:3987

958 +#: sequencer.c:812 builtin/apply.c:4005

959 #, c-format

960 msgid "cannot open %s: %s"

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

962

874 -#: sequencer.c:808

963 +#: sequencer.c:815

964 #, c-format

965 msgid "cannot read %s: %s"

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

967

879 -#: sequencer.c:809

968 +#: sequencer.c:816

969 msgid "unexpected end of file"

970 msgstr "未预期的文件结束"

971

883 -#: sequencer.c:815

972 +#: sequencer.c:822

973 #, c-format

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

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

976

888 -#: sequencer.c:838

977 +#: sequencer.c:845

978 #, c-format

979 msgid "Could not format %s."

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

981

893 -#: sequencer.c:1000

982 +#: sequencer.c:1007

983 msgid "Can't revert as initial commit"

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

985

897 -#: sequencer.c:1001

986 +#: sequencer.c:1008

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

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

989

@@ -917,12 +1006,17 @@ msgstr "尚未给分支 '%s' 设置上游"

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

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

1008

920 -#: wrapper.c:413

1009 +#: wrapper.c:408

1010 +#, fuzzy, c-format

1011 +msgid "unable to access '%s': %s"

1012 +msgstr "不能创建 '%s'"

1013 +

1014 +#: wrapper.c:426

1015 #, c-format

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

1017 msgstr "无法在 passwd 文件中查询到当前用户：%s"

1018

925 -#: wrapper.c:414

1019 +#: wrapper.c:427

1020 msgid "no such user"

1021 msgstr "无此用户"

1022

@@ -985,11 +1079,6 @@ msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"

1079 msgid " (commit or discard the untracked or modified content in submodules)"

1080 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"

1081

988 -#: wt-status.c:224

989 -#, c-format

990 -msgid "%s files:"

991 -msgstr "%s文件："

992 -

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

1083 #: wt-status.c:227

1084 #, c-format

@@ -1216,11 +1305,13 @@ msgid "Initial commit"

1305 msgstr "初始提交"

1306

1307 #: wt-status.c:1011

1219 -msgid "Untracked"

1308 +#, fuzzy

1309 +msgid "Untracked files"

1310 msgstr "未跟踪的"

1311

1312 #: wt-status.c:1013

1223 -msgid "Ignored"

1313 +#, fuzzy

1314 +msgid "Ignored files"

1315 msgstr "忽略的"

1316

1317 #: wt-status.c:1015

@@ -1237,67 +1328,73 @@ msgstr "（使用 -u 参数显示未跟踪的文件）"

1328 msgid "No changes"

1329 msgstr "没有修改"

1330

1240 -#: wt-status.c:1027

1241 -#, c-format

1242 -msgid "no changes added to commit%s\n"

1243 -msgstr "修改尚未加入提交%s\n"

1244 -

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

1246 -#: wt-status.c:1029

1247 -msgid " (use \"git add\" and/or \"git commit -a\")"

1332 +#: wt-status.c:1028

1333 +#, fuzzy, c-format

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

1335 msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"

1336

1337 #: wt-status.c:1031

1251 -#, c-format

1252 -msgid "nothing added to commit but untracked files present%s\n"

1253 -msgstr "空提交但存在未跟踪文件%s\n"

1338 +#, fuzzy, c-format

1339 +msgid "no changes added to commit\n"

1340 +msgstr "修改尚未加入提交%s\n"

1341

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

1256 -#: wt-status.c:1033

1257 -msgid " (use \"git add\" to track)"

1258 -msgstr "（使用 \"git add\" 建立跟踪）"

1342 +#: wt-status.c:1034

1343 +#, fuzzy, c-format

1344 +msgid ""

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

1346 +"track)\n"

1347 +msgstr "空提交但存在未跟踪文件%s\n"

1348

1260 -#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041

1261 -#, c-format

1262 -msgid "nothing to commit%s\n"

1263 -msgstr "无须提交%s\n"

1349 +#: wt-status.c:1037

1350 +#, fuzzy, c-format

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

1352 +msgstr "空提交但存在未跟踪文件%s\n"

1353

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

1266 -#: wt-status.c:1036

1267 -msgid " (create/copy files and use \"git add\" to track)"

1355 +#: wt-status.c:1040

1356 +#, fuzzy, c-format

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

1358 msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"

1359

1360 +#: wt-status.c:1043 wt-status.c:1048

1361 +#, fuzzy, c-format

1362 +msgid "nothing to commit\n"

1363 +msgstr "无须提交%s\n"

1364 +

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

1271 -#: wt-status.c:1039

1272 -msgid " (use -u to show untracked files)"

1366 +#: wt-status.c:1046

1367 +#, fuzzy, c-format

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

1369 msgstr "（使用 -u 显示未跟踪文件）"

1370

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

1276 -#: wt-status.c:1042

1277 -msgid " (working directory clean)"

1372 +#: wt-status.c:1050

1373 +#, fuzzy, c-format

1374 +msgid "nothing to commit, working directory clean\n"

1375 msgstr "（干净的工作区）"

1376

1280 -#: wt-status.c:1150

1377 +#: wt-status.c:1158

1378 msgid "HEAD (no branch)"

1379 msgstr "HEAD（非分支）"

1380

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

1285 -#: wt-status.c:1156

1382 +#: wt-status.c:1164

1383 msgid "Initial commit on "

1384 msgstr "初始提交于 "

1385

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

1290 -#: wt-status.c:1171

1387 +#: wt-status.c:1179

1388 msgid "behind "

1389 msgstr "落后 "

1390

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

1295 -#: wt-status.c:1174 wt-status.c:1177

1392 +#: wt-status.c:1182 wt-status.c:1185

1393 msgid "ahead "

1394 msgstr "领先 "

1395

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

1300 -#: wt-status.c:1179

1397 +#: wt-status.c:1187

1398 msgid ", behind "

1399 msgstr "，落后 "

1400

@@ -1306,6 +1403,11 @@ msgstr "，落后 "

1403 msgid "failed to unlink '%s'"

1404 msgstr "无法删除 '%s'"

1405

1406 +#: builtin/add.c:19

1407 +#, fuzzy

1408 +msgid "git add [options] [--] <filepattern>..."

1409 +msgstr "git apply [选项] [<补丁>...]"

1410 +

1411 #: builtin/add.c:62

1412 #, c-format

1413 msgid "unexpected diff status %c"

@@ -1329,7 +1431,7 @@ msgstr "路径 '%s' 属于模组 '%.*s'"

1431 msgid "Unstaged changes after refreshing the index:"

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

1433

1332 -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186

1434 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186

1435 #, c-format

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

1437 msgstr "路径 '%s' 未匹配任何文件"

@@ -1366,47 +1468,102 @@ msgstr "空补丁。异常终止。"

1468 msgid "Could not apply '%s'"

1469 msgstr "不能应用 '%s'"

1470

1369 -#: builtin/add.c:312

1471 +#: builtin/add.c:313

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

1473 msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"

1474

1373 -#: builtin/add.c:352

1475 +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63

1476 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253

1477 +#: builtin/rm.c:133

1478 +msgid "dry run"

1479 +msgstr ""

1480 +

1481 +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187

1482 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477

1483 +#: builtin/mv.c:62 builtin/read-tree.c:112

1484 +msgid "be verbose"

1485 +msgstr "冗长输出"

1486 +

1487 +#: builtin/add.c:322

1488 +#, fuzzy

1489 +msgid "interactive picking"

1490 +msgstr "交互式添加失败"

1491 +

1492 +#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248

1493 +msgid "select hunks interactively"

1494 +msgstr ""

1495 +

1496 +#: builtin/add.c:324

1497 +msgid "edit current diff and apply"

1498 +msgstr ""

1499 +

1500 +#: builtin/add.c:325

1501 +msgid "allow adding otherwise ignored files"

1502 +msgstr ""

1503 +

1504 +#: builtin/add.c:326

1505 +#, fuzzy

1506 +msgid "update tracked files"

1507 +msgstr "无法存储包文件"

1508 +

1509 +#: builtin/add.c:327

1510 +msgid "record only the fact that the path will be added later"

1511 +msgstr ""

1512 +

1513 +#: builtin/add.c:328

1514 +msgid "add changes from all tracked and untracked files"

1515 +msgstr ""

1516 +

1517 +#: builtin/add.c:329

1518 +#, fuzzy

1519 +msgid "don't add, only refresh the index"

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

1521 +

1522 +#: builtin/add.c:330

1523 +msgid "just skip files which cannot be added because of errors"

1524 +msgstr ""

1525 +

1526 +#: builtin/add.c:331

1527 +msgid "check if - even missing - files are ignored in dry run"

1528 +msgstr ""

1529 +

1530 +#: builtin/add.c:353

1531 #, c-format

1532 msgid "Use -f if you really want to add them.\n"

1533 msgstr "使用 -f 参数如果您确实要添加它们。\n"

1534

1378 -#: builtin/add.c:353

1535 +#: builtin/add.c:354

1536 msgid "no files added"

1537 msgstr "没有文件被添加"

1538

1382 -#: builtin/add.c:359

1539 +#: builtin/add.c:360

1540 msgid "adding files failed"

1541 msgstr "添加文件失败"

1542

1386 -#: builtin/add.c:391

1543 +#: builtin/add.c:392

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

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

1546

1390 -#: builtin/add.c:393

1547 +#: builtin/add.c:394

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

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

1550

1394 -#: builtin/add.c:413

1551 +#: builtin/add.c:414

1552 #, c-format

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

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

1555

1399 -#: builtin/add.c:414

1556 +#: builtin/add.c:415

1557 #, c-format

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

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

1560

1404 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82

1561 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82

1562 #: builtin/rm.c:162

1563 msgid "index file corrupt"

1564 msgstr "索引文件损坏"

1565

1409 -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260

1566 +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260

1567 msgid "Unable to write new index file"

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

1569

@@ -1459,17 +1616,17 @@ msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

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

1617 msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行"

1618

1462 -#: builtin/apply.c:1402

1619 +#: builtin/apply.c:1420

1620 #, c-format

1621 msgid "recount: unexpected line: %.*s"

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

1623

1467 -#: builtin/apply.c:1459

1624 +#: builtin/apply.c:1477

1625 #, c-format

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

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

1628

1472 -#: builtin/apply.c:1476

1629 +#: builtin/apply.c:1494

1630 #, c-format

1631 msgid ""

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

@@ -1480,82 +1637,82 @@ msgid_plural ""

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

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

1639

1483 -#: builtin/apply.c:1636

1640 +#: builtin/apply.c:1654

1641 msgid "new file depends on old contents"

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

1643

1487 -#: builtin/apply.c:1638

1644 +#: builtin/apply.c:1656

1645 msgid "deleted file still has contents"

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

1647

1491 -#: builtin/apply.c:1664

1648 +#: builtin/apply.c:1682

1649 #, c-format

1650 msgid "corrupt patch at line %d"

1651 msgstr "补丁损坏位于第 %d 行"

1652

1496 -#: builtin/apply.c:1700

1653 +#: builtin/apply.c:1718

1654 #, c-format

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

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

1657

1501 -#: builtin/apply.c:1702

1658 +#: builtin/apply.c:1720

1659 #, c-format

1660 msgid "deleted file %s still has contents"

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

1662

1506 -#: builtin/apply.c:1705

1663 +#: builtin/apply.c:1723

1664 #, c-format

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

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

1667

1511 -#: builtin/apply.c:1851

1668 +#: builtin/apply.c:1869

1669 #, c-format

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

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

1672

1673 #. there has to be one hunk (forward hunk)

1517 -#: builtin/apply.c:1880

1674 +#: builtin/apply.c:1898

1675 #, c-format

1676 msgid "unrecognized binary patch at line %d"

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

1678

1522 -#: builtin/apply.c:1966

1679 +#: builtin/apply.c:1984

1680 #, c-format

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

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

1683

1527 -#: builtin/apply.c:2056

1684 +#: builtin/apply.c:2074

1685 #, c-format

1686 msgid "unable to read symlink %s"

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

1688

1532 -#: builtin/apply.c:2060

1689 +#: builtin/apply.c:2078

1690 #, c-format

1691 msgid "unable to open or read %s"

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

1693

1537 -#: builtin/apply.c:2131

1694 +#: builtin/apply.c:2149

1695 msgid "oops"

1696 msgstr "哎哟"

1697

1541 -#: builtin/apply.c:2653

1698 +#: builtin/apply.c:2671

1699 #, c-format

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

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

1702

1546 -#: builtin/apply.c:2771

1703 +#: builtin/apply.c:2789

1704 #, c-format

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

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

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

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

1709

1553 -#: builtin/apply.c:2783

1710 +#: builtin/apply.c:2801

1711 #, c-format

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

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

1714

1558 -#: builtin/apply.c:2789

1715 +#: builtin/apply.c:2807

1716 #, c-format

1717 msgid ""

1718 "while searching for:\n"

@@ -1564,321 +1721,319 @@ msgstr ""

1721 "当查询：\n"

1722 "%.*s"

1723

1567 -#: builtin/apply.c:2808

1724 +#: builtin/apply.c:2826

1725 #, c-format

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

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

1728

1572 -#: builtin/apply.c:2911

1729 +#: builtin/apply.c:2929

1730 #, c-format

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

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

1733

1577 -#: builtin/apply.c:2917

1734 +#: builtin/apply.c:2935

1735 #, c-format

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

1737 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）"

1738

1582 -#: builtin/apply.c:2938

1739 +#: builtin/apply.c:2956

1740 #, c-format

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

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

1743

1587 -#: builtin/apply.c:3060

1744 +#: builtin/apply.c:3078

1745 #, c-format

1746 msgid "cannot checkout %s"

1747 msgstr "不能检出 %s"

1748

1592 -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158

1749 +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176

1750 #, c-format

1751 msgid "read of %s failed"

1752 msgstr "读取 %s 失败"

1753

1597 -#: builtin/apply.c:3138 builtin/apply.c:3360

1754 +#: builtin/apply.c:3156 builtin/apply.c:3378

1755 #, c-format

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

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

1758

1602 -#: builtin/apply.c:3219 builtin/apply.c:3374

1759 +#: builtin/apply.c:3237 builtin/apply.c:3392

1760 #, c-format

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

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

1763

1607 -#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388

1764 +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406

1765 #, c-format

1766 msgid "%s: %s"

1767 msgstr "%s：%s"

1768

1612 -#: builtin/apply.c:3228 builtin/apply.c:3382

1769 +#: builtin/apply.c:3246 builtin/apply.c:3400

1770 #, c-format

1771 msgid "%s: does not match index"

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

1773

1617 -#: builtin/apply.c:3330

1774 +#: builtin/apply.c:3348

1775 msgid "removal patch leaves file contents"

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

1777

1621 -#: builtin/apply.c:3399

1778 +#: builtin/apply.c:3417

1779 #, c-format

1780 msgid "%s: wrong type"

1781 msgstr "%s：错误类型"

1782

1626 -#: builtin/apply.c:3401

1783 +#: builtin/apply.c:3419

1784 #, c-format

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

1786 msgstr "%s 的类型是 %o，预期是 %o"

1787

1631 -#: builtin/apply.c:3502

1788 +#: builtin/apply.c:3520

1789 #, c-format

1790 msgid "%s: already exists in index"

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

1792

1636 -#: builtin/apply.c:3505

1793 +#: builtin/apply.c:3523

1794 #, c-format

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

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

1797

1641 -#: builtin/apply.c:3525

1798 +#: builtin/apply.c:3543

1799 #, c-format

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

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

1802

1646 -#: builtin/apply.c:3530

1803 +#: builtin/apply.c:3548

1804 #, c-format

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

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

1807

1651 -#: builtin/apply.c:3538

1808 +#: builtin/apply.c:3556

1809 #, c-format

1810 msgid "%s: patch does not apply"

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

1812

1656 -#: builtin/apply.c:3551

1813 +#: builtin/apply.c:3569

1814 #, c-format

1815 msgid "Checking patch %s..."

1816 msgstr "检查补丁 %s..."

1817

1661 -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158

1818 +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158

1819 #, c-format

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

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

1822

1666 -#: builtin/apply.c:3749

1823 +#: builtin/apply.c:3767

1824 #, c-format

1825 msgid "unable to remove %s from index"

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

1827

1671 -#: builtin/apply.c:3777

1828 +#: builtin/apply.c:3795

1829 #, c-format

1830 msgid "corrupt patch for subproject %s"

1831 msgstr "子项目 %s 损坏的补丁"

1832

1676 -#: builtin/apply.c:3781

1833 +#: builtin/apply.c:3799

1834 #, c-format

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

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

1837

1681 -#: builtin/apply.c:3786

1838 +#: builtin/apply.c:3804

1839 #, c-format

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

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

1842

1686 -#: builtin/apply.c:3789 builtin/apply.c:3897

1843 +#: builtin/apply.c:3807 builtin/apply.c:3915

1844 #, c-format

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

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

1847

1691 -#: builtin/apply.c:3822

1848 +#: builtin/apply.c:3840

1849 #, c-format

1850 msgid "closing file '%s'"

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

1852

1696 -#: builtin/apply.c:3871

1853 +#: builtin/apply.c:3889

1854 #, c-format

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

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

1857

1701 -#: builtin/apply.c:3958

1858 +#: builtin/apply.c:3976

1859 #, c-format

1860 msgid "Applied patch %s cleanly."

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

1862

1706 -#: builtin/apply.c:3966

1863 +#: builtin/apply.c:3984

1864 msgid "internal error"

1865 msgstr "内部错误"

1866

1867 #. Say this even without --verbose

1711 -#: builtin/apply.c:3969

1868 +#: builtin/apply.c:3987

1869 #, c-format

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

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

1872 msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."

1873 msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."

1874

1718 -#: builtin/apply.c:3979

1875 +#: builtin/apply.c:3997

1876 #, c-format

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

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

1879

1723 -#: builtin/apply.c:4000

1880 +#: builtin/apply.c:4018

1881 #, c-format

1882 msgid "Hunk #%d applied cleanly."

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

1884

1728 -#: builtin/apply.c:4003

1885 +#: builtin/apply.c:4021

1886 #, c-format

1887 msgid "Rejected hunk #%d."

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

1889

1733 -#: builtin/apply.c:4153

1890 +#: builtin/apply.c:4171

1891 msgid "unrecognized input"

1892 msgstr "未能识别的输入"

1893

1737 -#: builtin/apply.c:4164

1894 +#: builtin/apply.c:4182

1895 msgid "unable to read index file"

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

1897

1741 -#: builtin/apply.c:4283 builtin/apply.c:4286

1898 +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91

1899 +#: builtin/fetch.c:63

1900 msgid "path"

1901 msgstr "路径"

1902

1745 -#: builtin/apply.c:4284

1903 +#: builtin/apply.c:4302

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

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

1906

1749 -#: builtin/apply.c:4287

1907 +#: builtin/apply.c:4305

1908 msgid "apply changes matching the given path"

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

1910

1753 -#: builtin/apply.c:4289

1911 +#: builtin/apply.c:4307

1912 msgid "num"

1913 msgstr "数字"

1914

1757 -#: builtin/apply.c:4290

1915 +#: builtin/apply.c:4308

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

1917 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"

1918

1761 -#: builtin/apply.c:4293

1919 +#: builtin/apply.c:4311

1920 msgid "ignore additions made by the patch"

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

1922

1765 -#: builtin/apply.c:4295

1923 +#: builtin/apply.c:4313

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

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

1926

1769 -#: builtin/apply.c:4299

1770 -msgid "shows number of added and deleted lines in decimal notation"

1927 +#: builtin/apply.c:4317

1928 +#, fuzzy

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

1930 msgstr "以数字方式显示添加或删除行的数量"

1931

1773 -#: builtin/apply.c:4301

1932 +#: builtin/apply.c:4319

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

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

1935

1777 -#: builtin/apply.c:4303

1936 +#: builtin/apply.c:4321

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

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

1939

1781 -#: builtin/apply.c:4305

1940 +#: builtin/apply.c:4323

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

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

1943

1785 -#: builtin/apply.c:4307

1944 +#: builtin/apply.c:4325

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

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

1947

1789 -#: builtin/apply.c:4309

1948 +#: builtin/apply.c:4327

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

1950 msgstr "还应用此补丁（使用 --stat/--summary/--check 参数）"

1951

1793 -#: builtin/apply.c:4311

1952 +#: builtin/apply.c:4329

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

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

1955

1797 -#: builtin/apply.c:4313

1956 +#: builtin/apply.c:4331

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

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

1959

1801 -#: builtin/apply.c:4315

1960 +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460

1961 msgid "paths are separated with NUL character"

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

1963

1805 -#: builtin/apply.c:4318

1964 +#: builtin/apply.c:4336

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

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

1967

1809 -#: builtin/apply.c:4319

1968 +#: builtin/apply.c:4337

1969 msgid "action"

1970 msgstr "动作"

1971

1813 -#: builtin/apply.c:4320

1972 +#: builtin/apply.c:4338

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

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

1975

1817 -#: builtin/apply.c:4323 builtin/apply.c:4326

1976 +#: builtin/apply.c:4341 builtin/apply.c:4344

1977 msgid "ignore changes in whitespace when finding context"

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

1979

1821 -#: builtin/apply.c:4329

1980 +#: builtin/apply.c:4347

1981 msgid "apply the patch in reverse"

1982 msgstr "反向应用补丁"

1983

1825 -#: builtin/apply.c:4331

1984 +#: builtin/apply.c:4349

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

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

1987

1829 -#: builtin/apply.c:4333

1988 +#: builtin/apply.c:4351

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

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

1991

1833 -#: builtin/apply.c:4335

1992 +#: builtin/apply.c:4353

1993 msgid "allow overlapping hunks"

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

1995

1837 -#: builtin/apply.c:4336

1838 -msgid "be verbose"

1839 -msgstr "冗长输出"

1840 -

1841 -#: builtin/apply.c:4338

1996 +#: builtin/apply.c:4356

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

1998 msgstr "宽容不正确的文件末尾换行符"

1999

1845 -#: builtin/apply.c:4341

2000 +#: builtin/apply.c:4359

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

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

2003

1849 -#: builtin/apply.c:4343

2004 +#: builtin/apply.c:4361

2005 msgid "root"

2006 msgstr "根目录"

2007

1853 -#: builtin/apply.c:4344

2008 +#: builtin/apply.c:4362

2009 msgid "prepend <root> to all filenames"

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

2011

1857 -#: builtin/apply.c:4366

2012 +#: builtin/apply.c:4384

2013 msgid "--3way outside a repository"

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

2015

1861 -#: builtin/apply.c:4374

2016 +#: builtin/apply.c:4392

2017 msgid "--index outside a repository"

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

2019

1865 -#: builtin/apply.c:4377

2020 +#: builtin/apply.c:4395

2021 msgid "--cached outside a repository"

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

2023

1869 -#: builtin/apply.c:4393

2024 +#: builtin/apply.c:4411

2025 #, c-format

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

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

2028

1874 -#: builtin/apply.c:4407

2029 +#: builtin/apply.c:4425

2030 #, c-format

2031 msgid "squelched %d whitespace error"

2032 msgid_plural "squelched %d whitespace errors"

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

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

2035

1881 -#: builtin/apply.c:4413 builtin/apply.c:4423

2036 +#: builtin/apply.c:4431 builtin/apply.c:4441

2037 #, c-format

2038 msgid "%d line adds whitespace errors."

2039 msgid_plural "%d lines add whitespace errors."

@@ -1920,8 +2075,140 @@ msgstr "git archive：协议错误"

2075 msgid "git archive: expected a flush"

2076 msgstr "git archive：预期一个刷新"

2077

2078 +#: builtin/bisect--helper.c:7

2079 +msgid "git bisect--helper --next-all [--no-checkout]"

2080 +msgstr ""

2081 +

2082 +#: builtin/bisect--helper.c:17

2083 +msgid "perform 'git bisect next'"

2084 +msgstr ""

2085 +

2086 +#: builtin/bisect--helper.c:19

2087 +msgid "update BISECT_HEAD instead of checking out the current commit"

2088 +msgstr ""

2089 +

2090 +#: builtin/blame.c:25

2091 +msgid "git blame [options] [rev-opts] [rev] [--] file"

2092 +msgstr ""

2093 +

2094 +#: builtin/blame.c:30 builtin/shortlog.c:15

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

2096 +msgstr ""

2097 +

2098 +#: builtin/blame.c:2316

2099 +msgid "Show blame entries as we find them, incrementally"

2100 +msgstr ""

2101 +

2102 +#: builtin/blame.c:2317

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

2104 +msgstr ""

2105 +

2106 +#: builtin/blame.c:2318

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

2108 +msgstr ""

2109 +

2110 +#: builtin/blame.c:2319

2111 +#, fuzzy

2112 +msgid "Show work cost statistics"

2113 +msgstr "显示工作区状态"

2114 +

2115 +#: builtin/blame.c:2320

2116 +msgid "Show output score for blame entries"

2117 +msgstr ""

2118 +

2119 +#: builtin/blame.c:2321

2120 +msgid "Show original filename (Default: auto)"

2121 +msgstr ""

2122 +

2123 +#: builtin/blame.c:2322

2124 +msgid "Show original linenumber (Default: off)"

2125 +msgstr ""

2126 +

2127 +#: builtin/blame.c:2323

2128 +msgid "Show in a format designed for machine consumption"

2129 +msgstr ""

2130 +

2131 +#: builtin/blame.c:2324

2132 +msgid "Show porcelain format with per-line commit information"

2133 +msgstr ""

2134 +

2135 +#: builtin/blame.c:2325

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

2137 +msgstr ""

2138 +

2139 +#: builtin/blame.c:2326

2140 +msgid "Show raw timestamp (Default: off)"

2141 +msgstr ""

2142 +

2143 +#: builtin/blame.c:2327

2144 +msgid "Show long commit SHA1 (Default: off)"

2145 +msgstr ""

2146 +

2147 +#: builtin/blame.c:2328

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

2149 +msgstr ""

2150 +

2151 +#: builtin/blame.c:2329

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

2153 +msgstr ""

2154 +

2155 +#: builtin/blame.c:2330

2156 +msgid "Ignore whitespace differences"

2157 +msgstr ""

2158 +

2159 +#: builtin/blame.c:2331

2160 +msgid "Spend extra cycles to find better match"

2161 +msgstr ""

2162 +

2163 +#: builtin/blame.c:2332

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

2165 +msgstr ""

2166 +

2167 +#: builtin/blame.c:2333

2168 +#, fuzzy

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

2170 +msgstr "添加文件内容至索引"

2171 +

2172 +#: builtin/blame.c:2334 builtin/blame.c:2335

2173 +msgid "score"

2174 +msgstr ""

2175 +

2176 +#: builtin/blame.c:2334

2177 +msgid "Find line copies within and across files"

2178 +msgstr ""

2179 +

2180 +#: builtin/blame.c:2335

2181 +msgid "Find line movements within and across files"

2182 +msgstr ""

2183 +

2184 +#: builtin/blame.c:2336

2185 +#, fuzzy

2186 +msgid "n,m"

2187 +msgstr "数字"

2188 +

2189 +#: builtin/blame.c:2336

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

2191 +msgstr ""

2192 +

2193 +#: builtin/branch.c:23

2194 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]"

2195 +msgstr ""

2196 +

2197 +#: builtin/branch.c:24

2198 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"

2199 +msgstr ""

2200 +

2201 +#: builtin/branch.c:25

2202 +#, fuzzy

2203 +msgid "git branch [options] [-r] (-d | -D) <branchname>..."

2204 +msgstr "git apply [选项] [<补丁>...]"

2205 +

2206 +#: builtin/branch.c:26

2207 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2208 +msgstr ""

2209 +

2210 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

1924 -#: builtin/branch.c:144

2211 +#: builtin/branch.c:145

2212 #, c-format

2213 msgid ""

2214 "deleting branch '%s' that has been merged to\n"

@@ -1931,7 +2218,7 @@ msgstr ""

2218 " '%s'，但未合并到 HEAD。"

2219

2220 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

1934 -#: builtin/branch.c:148

2221 +#: builtin/branch.c:149

2222 #, c-format

2223 msgid ""

2224 "not deleting branch '%s' that is not yet merged to\n"

@@ -1940,35 +2227,35 @@ msgstr ""

2227 "并未删除分支 '%s'，虽然它已经合并到 HEAD，\n"

2228 " 然而却尚未被合并到分支 '%s' 。"

2229

1943 -#: builtin/branch.c:180

2230 +#: builtin/branch.c:181

2231 msgid "cannot use -a with -d"

2232 msgstr "不能将 -a 和 -d 同时使用"

2233

1947 -#: builtin/branch.c:186

2234 +#: builtin/branch.c:187

2235 msgid "Couldn't look up commit object for HEAD"

2236 msgstr "无法查询 HEAD 指向的提交对象"

2237

1951 -#: builtin/branch.c:191

2238 +#: builtin/branch.c:192

2239 #, c-format

2240 msgid "Cannot delete the branch '%s' which you are currently on."

2241 msgstr "无法删除您当前所在的分支 '%s'。"

2242

1956 -#: builtin/branch.c:202

2243 +#: builtin/branch.c:203

2244 #, c-format

2245 msgid "remote branch '%s' not found."

2246 msgstr "远程分支 '%s' 未发现。"

2247

1961 -#: builtin/branch.c:203

2248 +#: builtin/branch.c:204

2249 #, c-format

2250 msgid "branch '%s' not found."

2251 msgstr "分支 '%s' 未发现。"

2252

1966 -#: builtin/branch.c:210

2253 +#: builtin/branch.c:211

2254 #, c-format

2255 msgid "Couldn't look up commit object for '%s'"

2256 msgstr "无法查询 '%s' 指向的提交对象"

2257

1971 -#: builtin/branch.c:216

2258 +#: builtin/branch.c:217

2259 #, c-format

2260 msgid ""

2261 "The branch '%s' is not fully merged.\n"

@@ -1977,229 +2264,503 @@ msgstr ""

2264 "分支 '%s' 没有完全合并。\n"

2265 "如果您确认要删除它，执行 'git branch -D %s'。"

2266

1980 -#: builtin/branch.c:225

2267 +#: builtin/branch.c:226

2268 #, c-format

2269 msgid "Error deleting remote branch '%s'"

2270 msgstr "删除远程分支 '%s' 时出错"

2271

1985 -#: builtin/branch.c:226

2272 +#: builtin/branch.c:227

2273 #, c-format

2274 msgid "Error deleting branch '%s'"

2275 msgstr "删除分支 '%s' 时出错"

2276

1990 -#: builtin/branch.c:233

2277 +#: builtin/branch.c:234

2278 #, c-format

2279 msgid "Deleted remote branch %s (was %s).\n"

2280 msgstr "已删除远程分支 %s（曾为 %s）。\n"

2281

1995 -#: builtin/branch.c:234

2282 +#: builtin/branch.c:235

2283 #, c-format

2284 msgid "Deleted branch %s (was %s).\n"

2285 msgstr "已删除分支 %s（曾为 %s）。\n"

2286

2000 -#: builtin/branch.c:239

2287 +#: builtin/branch.c:240

2288 msgid "Update of config-file failed"

2289 msgstr "无法更新 config 文件"

2290

2004 -#: builtin/branch.c:337

2291 +#: builtin/branch.c:338

2292 #, c-format

2293 msgid "branch '%s' does not point at a commit"

2294 msgstr "分支 '%s' 未指向一个提交"

2295

2009 -#: builtin/branch.c:409

2296 +#: builtin/branch.c:410

2297 #, c-format

2298 msgid "[%s: behind %d]"

2299 msgstr "[%s：落后 %d]"

2300

2014 -#: builtin/branch.c:411

2301 +#: builtin/branch.c:412

2302 #, c-format

2303 msgid "[behind %d]"

2304 msgstr "[落后 %d]"

2305

2019 -#: builtin/branch.c:415

2306 +#: builtin/branch.c:416

2307 #, c-format

2308 msgid "[%s: ahead %d]"

2309 msgstr "[%s：领先 %d]"

2310

2024 -#: builtin/branch.c:417

2311 +#: builtin/branch.c:418

2312 #, c-format

2313 msgid "[ahead %d]"

2314 msgstr "[领先 %d]"

2315

2029 -#: builtin/branch.c:420

2316 +#: builtin/branch.c:421

2317 #, c-format

2318 msgid "[%s: ahead %d, behind %d]"

2319 msgstr "[%s：领先 %d，落后 %d]"

2320

2034 -#: builtin/branch.c:423

2321 +#: builtin/branch.c:424

2322 #, c-format

2323 msgid "[ahead %d, behind %d]"

2324 msgstr "[领先 %d，落后 %d]"

2325

2039 -#: builtin/branch.c:535

2326 +#: builtin/branch.c:537

2327 msgid "(no branch)"

2328 msgstr "（非分支）"

2329

2043 -#: builtin/branch.c:600

2330 +#: builtin/branch.c:602

2331 msgid "some refs could not be read"

2332 msgstr "一些引用不能读取"

2333

2047 -#: builtin/branch.c:613

2334 +#: builtin/branch.c:615

2335 msgid "cannot rename the current branch while not on any."

2336 msgstr "无法重命名当前分支因为不处于任何分支上。"

2337

2051 -#: builtin/branch.c:623

2338 +#: builtin/branch.c:625

2339 #, c-format

2340 msgid "Invalid branch name: '%s'"

2341 msgstr "无效的分支名：'%s'"

2342

2056 -#: builtin/branch.c:638

2343 +#: builtin/branch.c:640

2344 msgid "Branch rename failed"

2345 msgstr "分支重命名失败"

2346

2060 -#: builtin/branch.c:642

2347 +#: builtin/branch.c:644

2348 #, c-format

2349 msgid "Renamed a misnamed branch '%s' away"

2350 msgstr "重命名掉一个错误命名的旧分支 '%s'"

2351

2065 -#: builtin/branch.c:646

2352 +#: builtin/branch.c:648

2353 #, c-format

2354 msgid "Branch renamed to %s, but HEAD is not updated!"

2355 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

2356

2070 -#: builtin/branch.c:653

2357 +#: builtin/branch.c:655

2358 msgid "Branch is renamed, but update of config-file failed"

2359 msgstr "分支被重命名，但更新 config 文件失败"

2360

2074 -#: builtin/branch.c:668

2361 +#: builtin/branch.c:670

2362 #, c-format

2363 msgid "malformed object name %s"

2364 msgstr "非法的对象名 %s"

2365

2079 -#: builtin/branch.c:692

2366 +#: builtin/branch.c:694

2367 #, c-format

2368 msgid "could not write branch description template: %s"

2369 msgstr "不能写分支描述模版：%s"

2370

2084 -#: builtin/branch.c:783

2085 -msgid "Failed to resolve HEAD as a valid ref."

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

2371 +#: builtin/branch.c:724

2372 +#, fuzzy

2373 +msgid "Generic options"

2374 +msgstr "无效选项：%s"

2375

2088 -#: builtin/branch.c:788 builtin/clone.c:561

2089 -msgid "HEAD not found below refs/heads!"

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

2376 +#: builtin/branch.c:726

2377 +msgid "show hash and subject, give twice for upstream branch"

2378 +msgstr ""

2379

2092 -#: builtin/branch.c:808

2093 -msgid "--column and --verbose are incompatible"

2094 -msgstr "--column 和 --verbose 不兼容"

2380 +#: builtin/branch.c:727

2381 +msgid "suppress informational messages"

2382 +msgstr ""

2383

2096 -#: builtin/branch.c:857

2097 -msgid "-a and -r options to 'git branch' do not make sense with a branch name"

2098 -msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

2384 +#: builtin/branch.c:728

2385 +msgid "set up tracking mode (see git-pull(1))"

2386 +msgstr ""

2387

2100 -#: builtin/bundle.c:47

2101 -#, c-format

2102 -msgid "%s is okay\n"

2103 -msgstr "%s 可以\n"

2388 +#: builtin/branch.c:730

2389 +msgid "change upstream info"

2390 +msgstr ""

2391

2105 -#: builtin/bundle.c:56

2106 -msgid "Need a repository to create a bundle."

2107 -msgstr "需要一个版本库来创建包。"

2392 +#: builtin/branch.c:734

2393 +#, fuzzy

2394 +msgid "use colored output"

2395 +msgstr "不能输出重定向"

2396

2109 -#: builtin/bundle.c:60

2110 -msgid "Need a repository to unbundle."

2111 -msgstr "需要一个版本库来解包。"

2397 +#: builtin/branch.c:735

2398 +#, fuzzy

2399 +msgid "act on remote-tracking branches"

2400 +msgstr "%s 没有来自 %s 的远程跟踪分支"

2401

2113 -#: builtin/checkout.c:114 builtin/checkout.c:147

2114 -#, c-format

2115 -msgid "path '%s' does not have our version"

2116 -msgstr "路径 '%s' 没有我们的版本"

2402 +#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765

2403 +#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396

2404 +#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470

2405 +#, fuzzy

2406 +msgid "commit"

2407 +msgstr "（坏提交）\n"

2408

2118 -#: builtin/checkout.c:116 builtin/checkout.c:149

2119 -#, c-format

2120 -msgid "path '%s' does not have their version"

2121 -msgstr "路径 '%s' 没有他们的版本"

2409 +#: builtin/branch.c:739 builtin/branch.c:745

2410 +msgid "print only branches that contain the commit"

2411 +msgstr ""

2412

2123 -#: builtin/checkout.c:132

2124 -#, c-format

2125 -msgid "path '%s' does not have all necessary versions"

2126 -msgstr "路径 '%s' 没有全部必须的版本"

2413 +#: builtin/branch.c:751

2414 +msgid "Specific git-branch actions:"

2415 +msgstr ""

2416

2128 -#: builtin/checkout.c:176

2129 -#, c-format

2130 -msgid "path '%s' does not have necessary versions"

2131 -msgstr "路径 '%s' 没有必须的版本"

2417 +#: builtin/branch.c:752

2418 +msgid "list both remote-tracking and local branches"

2419 +msgstr ""

2420

2133 -#: builtin/checkout.c:193

2134 -#, c-format

2135 -msgid "path '%s': cannot merge"

2136 -msgstr "path '%s'：无法合并"

2421 +#: builtin/branch.c:754

2422 +msgid "delete fully merged branch"

2423 +msgstr ""

2424

2138 -#: builtin/checkout.c:210

2139 -#, c-format

2140 -msgid "Unable to add merge result for '%s'"

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

2425 +#: builtin/branch.c:755

2426 +msgid "delete branch (even if not merged)"

2427 +msgstr ""

2428

2143 -#: builtin/checkout.c:235 builtin/checkout.c:392

2144 -msgid "corrupt index file"

2145 -msgstr "损坏的索引文件"

2429 +#: builtin/branch.c:756

2430 +msgid "move/rename a branch and its reflog"

2431 +msgstr ""

2432

2147 -#: builtin/checkout.c:265 builtin/checkout.c:272

2148 -#, c-format

2149 -msgid "path '%s' is unmerged"

2150 -msgstr "路径 '%s' 未合并"

2433 +#: builtin/branch.c:757

2434 +msgid "move/rename a branch, even if target exists"

2435 +msgstr ""

2436

2152 -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586

2153 -#: builtin/merge.c:811

2154 -msgid "unable to write new index file"

2155 -msgstr "无法写新的索引文件"

2437 +#: builtin/branch.c:758

2438 +#, fuzzy

2439 +msgid "list branch names"

2440 +msgstr "无效的分支名：'%s'"

2441

2157 -#: builtin/checkout.c:414

2158 -msgid "you need to resolve your current index first"

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

2442 +#: builtin/branch.c:759

2443 +msgid "create the branch's reflog"

2444 +msgstr ""

2445 +

2446 +#: builtin/branch.c:761

2447 +msgid "edit the description for the branch"

2448 +msgstr ""

2449 +

2450 +#: builtin/branch.c:762

2451 +#, fuzzy

2452 +msgid "force creation (when already exists)"

2453 +msgstr "远程 %s 已经存在。"

2454 +

2455 +#: builtin/branch.c:765

2456 +#, fuzzy

2457 +msgid "print only not merged branches"

2458 +msgstr "无法移除分支 %s"

2459 +

2460 +#: builtin/branch.c:771

2461 +msgid "print only merged branches"

2462 +msgstr ""

2463 +

2464 +#: builtin/branch.c:775

2465 +msgid "list branches in columns"

2466 +msgstr ""

2467 +

2468 +#: builtin/branch.c:788

2469 +msgid "Failed to resolve HEAD as a valid ref."

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

2471 +

2472 +#: builtin/branch.c:793 builtin/clone.c:561

2473 +msgid "HEAD not found below refs/heads!"

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

2475 +

2476 +#: builtin/branch.c:813

2477 +msgid "--column and --verbose are incompatible"

2478 +msgstr "--column 和 --verbose 不兼容"

2479 +

2480 +#: builtin/branch.c:864

2481 +#, fuzzy, c-format

2482 +msgid "branch '%s' does not exist"

2483 +msgstr "版本库 '%s' 不存在"

2484 +

2485 +#: builtin/branch.c:876

2486 +#, c-format

2487 +msgid "Branch '%s' has no upstream information"

2488 +msgstr ""

2489 +

2490 +#: builtin/branch.c:891

2491 +msgid "-a and -r options to 'git branch' do not make sense with a branch name"

2492 +msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

2493 +

2494 +#: builtin/branch.c:894

2495 +#, c-format

2496 +msgid ""

2497 +"The --set-upstream flag is deprecated and will be removed. Consider using --"

2498 +"track or --set-upstream-to\n"

2499 +msgstr ""

2500 +

2501 +#: builtin/branch.c:911

2502 +#, c-format

2503 +msgid ""

2504 +"\n"

2505 +"If you wanted to make '%s' track '%s', do this:\n"

2506 +"\n"

2507 +msgstr ""

2508 +

2509 +#: builtin/branch.c:912

2510 +#, fuzzy, c-format

2511 +msgid " git branch -d %s\n"

2512 +msgstr " HEAD分支：%s"

2513 +

2514 +#: builtin/branch.c:913

2515 +#, c-format

2516 +msgid " git branch --set-upstream-to %s\n"

2517 +msgstr ""

2518 +

2519 +#: builtin/bundle.c:47

2520 +#, c-format

2521 +msgid "%s is okay\n"

2522 +msgstr "%s 可以\n"

2523 +

2524 +#: builtin/bundle.c:56

2525 +msgid "Need a repository to create a bundle."

2526 +msgstr "需要一个版本库来创建包。"

2527 +

2528 +#: builtin/bundle.c:60

2529 +msgid "Need a repository to unbundle."

2530 +msgstr "需要一个版本库来解包。"

2531 +

2532 +#: builtin/cat-file.c:247

2533 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

2534 +msgstr ""

2535 +

2536 +#: builtin/cat-file.c:248

2537 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

2538 +msgstr ""

2539 +

2540 +#: builtin/cat-file.c:266

2541 +msgid "<type> can be one of: blob, tree, commit, tag"

2542 +msgstr ""

2543 +

2544 +#: builtin/cat-file.c:267

2545 +#, fuzzy

2546 +msgid "show object type"

2547 +msgstr "坏的对象类型。"

2548 +

2549 +#: builtin/cat-file.c:268

2550 +#, fuzzy

2551 +msgid "show object size"

2552 +msgstr "坏对象 %s"

2553 +

2554 +#: builtin/cat-file.c:270

2555 +msgid "exit with zero when there's no error"

2556 +msgstr ""

2557 +

2558 +#: builtin/cat-file.c:271

2559 +msgid "pretty-print object's content"

2560 +msgstr ""

2561 +

2562 +#: builtin/cat-file.c:273

2563 +msgid "for blob objects, run textconv on object's content"

2564 +msgstr ""

2565 +

2566 +#: builtin/cat-file.c:275

2567 +msgid "show info and content of objects fed from the standard input"

2568 +msgstr ""

2569 +

2570 +#: builtin/cat-file.c:278

2571 +#, fuzzy

2572 +msgid "show info about objects fed from the standard input"

2573 +msgstr "不能从标准输入中读取日志信息"

2574 +

2575 +#: builtin/check-attr.c:11

2576 +msgid "git check-attr [-a | --all | attr...] [--] pathname..."

2577 +msgstr ""

2578 +

2579 +#: builtin/check-attr.c:12

2580 +msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"

2581 +msgstr ""

2582 +

2583 +#: builtin/check-attr.c:19

2584 +msgid "report all attributes set on file"

2585 +msgstr ""

2586 +

2587 +#: builtin/check-attr.c:20

2588 +msgid "use .gitattributes only from the index"

2589 +msgstr ""

2590 +

2591 +#: builtin/check-attr.c:21 builtin/hash-object.c:75

2592 +#, fuzzy

2593 +msgid "read file names from stdin"

2594 +msgstr "（正从标准输入中读取日志信息）\n"

2595 +

2596 +#: builtin/check-attr.c:23

2597 +#, fuzzy

2598 +msgid "input paths are terminated by a null character"

2599 +msgstr "路径以 NUL 字符分隔"

2600 +

2601 +#: builtin/checkout-index.c:126

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

2603 +msgstr ""

2604 +

2605 +#: builtin/checkout-index.c:187

2606 +msgid "check out all files in the index"

2607 +msgstr ""

2608 +

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

2610 +msgid "force overwrite of existing files"

2611 +msgstr ""

2612 +

2613 +#: builtin/checkout-index.c:190

2614 +msgid "no warning for existing files and files not in index"

2615 +msgstr ""

2616 +

2617 +#: builtin/checkout-index.c:192

2618 +#, fuzzy

2619 +msgid "don't checkout new files"

2620 +msgstr "不能检出 %s"

2621 +

2622 +#: builtin/checkout-index.c:194

2623 +#, fuzzy

2624 +msgid "update stat information in the index file"

2625 +msgstr "无法写新的索引文件"

2626 +

2627 +#: builtin/checkout-index.c:200

2628 +#, fuzzy

2629 +msgid "read list of paths from the standard input"

2630 +msgstr "（正从标准输入中读取日志信息）\n"

2631 +

2632 +#: builtin/checkout-index.c:202

2633 +msgid "write the content to temporary files"

2634 +msgstr ""

2635 +

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

2637 +msgid "string"

2638 +msgstr ""

2639 +

2640 +#: builtin/checkout-index.c:204

2641 +msgid "when creating files, prepend <string>"

2642 +msgstr ""

2643 +

2644 +#: builtin/checkout-index.c:207

2645 +msgid "copy out the files from named stage"

2646 +msgstr ""

2647 +

2648 +#: builtin/checkout.c:25

2649 +#, fuzzy

2650 +msgid "git checkout [options] <branch>"

2651 +msgstr "git apply [选项] [<补丁>...]"

2652 +

2653 +#: builtin/checkout.c:26

2654 +#, fuzzy

2655 +msgid "git checkout [options] [<branch>] -- <file>..."

2656 +msgstr "git apply [选项] [<补丁>...]"

2657 +

2658 +#: builtin/checkout.c:116 builtin/checkout.c:149

2659 +#, c-format

2660 +msgid "path '%s' does not have our version"

2661 +msgstr "路径 '%s' 没有我们的版本"

2662

2161 -#: builtin/checkout.c:533

2663 +#: builtin/checkout.c:118 builtin/checkout.c:151

2664 +#, c-format

2665 +msgid "path '%s' does not have their version"

2666 +msgstr "路径 '%s' 没有他们的版本"

2667 +

2668 +#: builtin/checkout.c:134

2669 +#, c-format

2670 +msgid "path '%s' does not have all necessary versions"

2671 +msgstr "路径 '%s' 没有全部必须的版本"

2672 +

2673 +#: builtin/checkout.c:178

2674 +#, c-format

2675 +msgid "path '%s' does not have necessary versions"

2676 +msgstr "路径 '%s' 没有必须的版本"

2677 +

2678 +#: builtin/checkout.c:195

2679 +#, c-format

2680 +msgid "path '%s': cannot merge"

2681 +msgstr "path '%s'：无法合并"

2682 +

2683 +#: builtin/checkout.c:212

2684 +#, c-format

2685 +msgid "Unable to add merge result for '%s'"

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

2687 +

2688 +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242

2689 +#: builtin/checkout.c:245

2690 +#, fuzzy, c-format

2691 +msgid "'%s' cannot be used with updating paths"

2692 +msgstr "%s：%s 不能和 %s 同时使用"

2693 +

2694 +#: builtin/checkout.c:248 builtin/checkout.c:251

2695 +#, fuzzy, c-format

2696 +msgid "'%s' cannot be used with %s"

2697 +msgstr "%s：%s 不能和 %s 同时使用"

2698 +

2699 +#: builtin/checkout.c:254

2700 +#, c-format

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

2702 +msgstr ""

2703 +

2704 +#: builtin/checkout.c:265 builtin/checkout.c:426

2705 +msgid "corrupt index file"

2706 +msgstr "损坏的索引文件"

2707 +

2708 +#: builtin/checkout.c:295 builtin/checkout.c:302

2709 +#, c-format

2710 +msgid "path '%s' is unmerged"

2711 +msgstr "路径 '%s' 未合并"

2712 +

2713 +#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586

2714 +#: builtin/merge.c:811

2715 +msgid "unable to write new index file"

2716 +msgstr "无法写新的索引文件"

2717 +

2718 +#: builtin/checkout.c:448

2719 +msgid "you need to resolve your current index first"

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

2721 +

2722 +#: builtin/checkout.c:569

2723 #, c-format

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

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

2726

2166 -#: builtin/checkout.c:566

2727 +#: builtin/checkout.c:602

2728 msgid "HEAD is now at"

2729 msgstr "HEAD 目前位于"

2730

2170 -#: builtin/checkout.c:573

2731 +#: builtin/checkout.c:609

2732 #, c-format

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

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

2735

2175 -#: builtin/checkout.c:576

2736 +#: builtin/checkout.c:612

2737 #, c-format

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

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

2740

2180 -#: builtin/checkout.c:580

2741 +#: builtin/checkout.c:616

2742 #, c-format

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

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

2745

2185 -#: builtin/checkout.c:582

2746 +#: builtin/checkout.c:618

2747 #, c-format

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

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

2750

2190 -#: builtin/checkout.c:584

2751 +#: builtin/checkout.c:620

2752 #, c-format

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

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

2755

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

2196 -#: builtin/checkout.c:640

2757 +#: builtin/checkout.c:676

2758 #, c-format

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

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

2761

2762 #. The singular version

2202 -#: builtin/checkout.c:646

2763 +#: builtin/checkout.c:682

2764 #, c-format

2765 msgid ""

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

@@ -2220,7 +2781,7 @@ msgstr[1] ""

2781 "\n"

2782 "%s\n"

2783

2223 -#: builtin/checkout.c:664

2784 +#: builtin/checkout.c:700

2785 #, c-format

2786 msgid ""

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

@@ -2235,101 +2796,197 @@ msgstr ""

2796 " git branch new_branch_name %s\n"

2797 "\n"

2798

2238 -#: builtin/checkout.c:694

2799 +#: builtin/checkout.c:730

2800 msgid "internal error in revision walk"

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

2802

2242 -#: builtin/checkout.c:698

2803 +#: builtin/checkout.c:734

2804 msgid "Previous HEAD position was"

2805 msgstr "之前的 HEAD 位置是"

2806

2246 -#: builtin/checkout.c:724 builtin/checkout.c:919

2807 +#: builtin/checkout.c:761 builtin/checkout.c:950

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

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

2810

2811 #. case (1)

2251 -#: builtin/checkout.c:855

2812 +#: builtin/checkout.c:886

2813 #, c-format

2814 msgid "invalid reference: %s"

2815 msgstr "无效引用：%s"

2816

2817 #. case (1): want a tree

2257 -#: builtin/checkout.c:894

2818 +#: builtin/checkout.c:925

2819 #, c-format

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

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

2822

2262 -#: builtin/checkout.c:976

2263 -msgid "-B cannot be used with -b"

2264 -msgstr "-B 不能和 -b 同时使用"

2823 +#: builtin/checkout.c:961

2824 +#, fuzzy

2825 +msgid "paths cannot be used with switching branches"

2826 +msgstr "--ours/--theirs 和切换分支不兼容。"

2827

2266 -#: builtin/checkout.c:985

2267 -msgid "--patch is incompatible with all other options"

2268 -msgstr "--patch 选项和其他选项不兼容"

2828 +#: builtin/checkout.c:964 builtin/checkout.c:968

2829 +#, fuzzy, c-format

2830 +msgid "'%s' cannot be used with switching branches"

2831 +msgstr "%s：%s 不能和 %s 同时使用"

2832 +

2833 +#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980

2834 +#: builtin/checkout.c:983

2835 +#, fuzzy, c-format

2836 +msgid "'%s' cannot be used with '%s'"

2837 +msgstr "%s：%s 不能和 %s 同时使用"

2838

2839 #: builtin/checkout.c:988

2271 -msgid "--detach cannot be used with -b/-B/--orphan"

2272 -msgstr "--detach 不能和 -b/-B/--orphan 同时使用"

2840 +#, fuzzy, c-format

2841 +msgid "Cannot switch branch to a non-commit '%s'"

2842 +msgstr "无法切换分支到一个非提交。"

2843

2274 -#: builtin/checkout.c:990

2275 -msgid "--detach cannot be used with -t"

2276 -msgstr "--detach 不能和 -t 同时使用"

2844 +#: builtin/checkout.c:1009 builtin/gc.c:177

2845 +msgid "suppress progress reporting"

2846 +msgstr ""

2847

2278 -#: builtin/checkout.c:996

2279 -msgid "--track needs a branch name"

2280 -msgstr "--track 需要一个分支名"

2848 +#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89

2849 +#: builtin/remote.c:169 builtin/remote.c:171

2850 +#, fuzzy

2851 +msgid "branch"

2852 +msgstr "位于分支 "

2853

2282 -#: builtin/checkout.c:1003

2283 -msgid "Missing branch name; try -b"

2284 -msgstr "缺少分支名；尝试 -b"

2854 +#: builtin/checkout.c:1011

2855 +msgid "create and checkout a new branch"

2856 +msgstr ""

2857

2286 -#: builtin/checkout.c:1009

2287 -msgid "--orphan and -b|-B are mutually exclusive"

2288 -msgstr "--orphan 和 -b|-B 互斥"

2858 +#: builtin/checkout.c:1013

2859 +msgid "create/reset and checkout a branch"

2860 +msgstr ""

2861

2290 -#: builtin/checkout.c:1011

2291 -msgid "--orphan cannot be used with -t"

2292 -msgstr "--orphan 不能和 -t 同时使用"

2862 +#: builtin/checkout.c:1014

2863 +#, fuzzy

2864 +msgid "create reflog for new branch"

2865 +msgstr "列出、创建或删除分支"

2866 +

2867 +#: builtin/checkout.c:1015

2868 +msgid "detach the HEAD at named commit"

2869 +msgstr ""

2870 +

2871 +#: builtin/checkout.c:1016

2872 +#, fuzzy

2873 +msgid "set upstream info for new branch"

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

2875 +

2876 +#: builtin/checkout.c:1018

2877 +#, fuzzy

2878 +msgid "new branch"

2879 +msgstr "[新分支]"

2880 +

2881 +#: builtin/checkout.c:1018

2882 +#, fuzzy

2883 +msgid "new unparented branch"

2884 +msgstr "没有当前分支。"

2885 +

2886 +#: builtin/checkout.c:1019

2887 +msgid "checkout our version for unmerged files"

2888 +msgstr ""

2889

2890 #: builtin/checkout.c:1021

2295 -msgid "git checkout: -f and -m are incompatible"

2296 -msgstr "git checkout：-f 和 -m 不兼容"

2891 +msgid "checkout their version for unmerged files"

2892 +msgstr ""

2893 +

2894 +#: builtin/checkout.c:1023

2895 +msgid "force checkout (throw away local modifications)"

2896 +msgstr ""

2897 +

2898 +#: builtin/checkout.c:1024

2899 +msgid "perform a 3-way merge with the new branch"

2900 +msgstr ""

2901 +

2902 +#: builtin/checkout.c:1025 builtin/merge.c:215

2903 +#, fuzzy

2904 +msgid "update ignored files (default)"

2905 +msgstr "更新文件失败"

2906

2298 -#: builtin/checkout.c:1055

2907 +#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241

2908 +msgid "style"

2909 +msgstr ""

2910 +

2911 +#: builtin/checkout.c:1027

2912 +msgid "conflict style (merge or diff3)"

2913 +msgstr ""

2914 +

2915 +#: builtin/checkout.c:1030

2916 +msgid "second guess 'git checkout no-such-branch'"

2917 +msgstr ""

2918 +

2919 +#: builtin/checkout.c:1054

2920 +#, fuzzy

2921 +msgid "-b, -B and --orphan are mutually exclusive"

2922 +msgstr "-n 和 -k 互斥。"

2923 +

2924 +#: builtin/checkout.c:1071

2925 +msgid "--track needs a branch name"

2926 +msgstr "--track 需要一个分支名"

2927 +

2928 +#: builtin/checkout.c:1078

2929 +msgid "Missing branch name; try -b"

2930 +msgstr "缺少分支名；尝试 -b"

2931 +

2932 +#: builtin/checkout.c:1113

2933 msgid "invalid path specification"

2934 msgstr "无效的路径规格"

2935

2302 -#: builtin/checkout.c:1063

2303 -#, c-format

2936 +#: builtin/checkout.c:1120

2937 +#, fuzzy, c-format

2938 msgid ""

2305 -"git checkout: updating paths is incompatible with switching branches.\n"

2939 +"Cannot update paths and switch to branch '%s' at the same time.\n"

2940 "Did you intend to checkout '%s' which can not be resolved as commit?"

2941 msgstr ""

2942 "git checkout：更新路径和切换分支不兼容。\n"

2943 "您是想要检出 '%s' 但未能将其解析为提交么？"

2944

2311 -#: builtin/checkout.c:1065

2312 -msgid "git checkout: updating paths is incompatible with switching branches."

2313 -msgstr "git checkout：更新路径和切换分支不兼容。"

2314 -

2315 -#: builtin/checkout.c:1070

2316 -msgid "git checkout: --detach does not take a path argument"

2945 +#: builtin/checkout.c:1125

2946 +#, fuzzy, c-format

2947 +msgid "git checkout: --detach does not take a path argument '%s'"

2948 msgstr "git checkout：--detach 不跟路径参数"

2949

2319 -#: builtin/checkout.c:1073

2950 +#: builtin/checkout.c:1129

2951 msgid ""

2952 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

2953 "checking out of the index."

2954 msgstr ""

2955 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"

2956

2326 -#: builtin/checkout.c:1092

2327 -msgid "Cannot switch branch to a non-commit."

2328 -msgstr "无法切换分支到一个非提交。"

2957 +#: builtin/clean.c:19

2958 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

2959 +msgstr ""

2960

2330 -#: builtin/checkout.c:1095

2331 -msgid "--ours/--theirs is incompatible with switching branches."

2332 -msgstr "--ours/--theirs 和切换分支不兼容。"

2961 +#: builtin/clean.c:51

2962 +msgid "do not print names of files removed"

2963 +msgstr ""

2964 +

2965 +#: builtin/clean.c:53

2966 +msgid "force"

2967 +msgstr ""

2968 +

2969 +#: builtin/clean.c:55

2970 +#, fuzzy

2971 +msgid "remove whole directories"

2972 +msgstr "两个输出目录？"

2973 +

2974 +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802

2975 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199

2976 +msgid "pattern"

2977 +msgstr ""

2978 +

2979 +#: builtin/clean.c:57

2980 +msgid "add <pattern> to ignore rules"

2981 +msgstr ""

2982 +

2983 +#: builtin/clean.c:58

2984 +msgid "remove ignored files, too"

2985 +msgstr ""

2986 +

2987 +#: builtin/clean.c:60

2988 +msgid "remove only ignored files"

2989 +msgstr ""

2990

2991 #: builtin/clean.c:78

2992 msgid "-x and -X cannot be used together"

@@ -2373,6 +3030,104 @@ msgstr "不会删除 %s\n"

3030 msgid "Not removing %s\n"

3031 msgstr "未删除 %s\n"

3032

3033 +#: builtin/clone.c:36

3034 +msgid "git clone [options] [--] <repo> [<dir>]"

3035 +msgstr ""

3036 +

3037 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

3038 +#: builtin/push.c:399

3039 +msgid "force progress reporting"

3040 +msgstr ""

3041 +

3042 +#: builtin/clone.c:66

3043 +msgid "don't create a checkout"

3044 +msgstr ""

3045 +

3046 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488

3047 +#, fuzzy

3048 +msgid "create a bare repository"

3049 +msgstr "不是一个 git 版本库"

3050 +

3051 +#: builtin/clone.c:72

3052 +msgid "create a mirror repository (implies bare)"

3053 +msgstr ""

3054 +

3055 +#: builtin/clone.c:74

3056 +msgid "to clone from a local repository"

3057 +msgstr ""

3058 +

3059 +#: builtin/clone.c:76

3060 +msgid "don't use local hardlinks, always copy"

3061 +msgstr ""

3062 +

3063 +#: builtin/clone.c:78

3064 +#, fuzzy

3065 +msgid "setup as shared repository"

3066 +msgstr "不是一个 git 版本库"

3067 +

3068 +#: builtin/clone.c:80 builtin/clone.c:82

3069 +msgid "initialize submodules in the clone"

3070 +msgstr ""

3071 +

3072 +#: builtin/clone.c:83 builtin/init-db.c:485

3073 +#, fuzzy

3074 +msgid "template-directory"

3075 +msgstr "文件/目录"

3076 +

3077 +#: builtin/clone.c:84 builtin/init-db.c:486

3078 +msgid "directory from which templates will be used"

3079 +msgstr ""

3080 +

3081 +#: builtin/clone.c:86

3082 +msgid "reference repository"

3083 +msgstr ""

3084 +

3085 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3086 +#, fuzzy

3087 +msgid "name"

3088 +msgstr "重命名"

3089 +

3090 +#: builtin/clone.c:88

3091 +msgid "use <name> instead of 'origin' to track upstream"

3092 +msgstr ""

3093 +

3094 +#: builtin/clone.c:90

3095 +msgid "checkout <branch> instead of the remote's HEAD"

3096 +msgstr ""

3097 +

3098 +#: builtin/clone.c:92

3099 +msgid "path to git-upload-pack on the remote"

3100 +msgstr ""

3101 +

3102 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747

3103 +msgid "depth"

3104 +msgstr ""

3105 +

3106 +#: builtin/clone.c:94

3107 +msgid "create a shallow clone of that depth"

3108 +msgstr ""

3109 +

3110 +#: builtin/clone.c:96

3111 +msgid "clone only one branch, HEAD or --branch"

3112 +msgstr ""

3113 +

3114 +#: builtin/clone.c:97 builtin/init-db.c:494

3115 +msgid "gitdir"

3116 +msgstr ""

3117 +

3118 +#: builtin/clone.c:98 builtin/init-db.c:495

3119 +msgid "separate git dir from working tree"

3120 +msgstr ""

3121 +

3122 +#: builtin/clone.c:99

3123 +msgid "key=value"

3124 +msgstr ""

3125 +

3126 +#: builtin/clone.c:100

3127 +#, fuzzy

3128 +msgid "set config inside the new repository"

3129 +msgstr "记录变更到版本库"

3130 +

3131 #: builtin/clone.c:243

3132 #, c-format

3133 msgid "reference repository '%s' is not a local directory."

@@ -2488,10 +3243,49 @@ msgstr "远程分支 %s 在上游 %s 未发现"

3243 msgid "You appear to have cloned an empty repository."

3244 msgstr "您似乎克隆了一个空版本库。"

3245

3246 +#: builtin/column.c:9

3247 +msgid "git column [options]"

3248 +msgstr ""

3249 +

3250 +#: builtin/column.c:26

3251 +msgid "lookup config vars"

3252 +msgstr ""

3253 +

3254 +#: builtin/column.c:27 builtin/column.c:28

3255 +#, fuzzy

3256 +msgid "layout to use"

3257 +msgstr "本地已过时"

3258 +

3259 +#: builtin/column.c:29

3260 +msgid "Maximum width"

3261 +msgstr ""

3262 +

3263 +#: builtin/column.c:30

3264 +msgid "Padding space on left border"

3265 +msgstr ""

3266 +

3267 +#: builtin/column.c:31

3268 +msgid "Padding space on right border"

3269 +msgstr ""

3270 +

3271 +#: builtin/column.c:32

3272 +msgid "Padding space between columns"

3273 +msgstr ""

3274 +

3275 #: builtin/column.c:51

3276 msgid "--command must be the first argument"

3277 msgstr "--command 必须是第一个参数"

3278

3279 +#: builtin/commit.c:33

3280 +#, fuzzy

3281 +msgid "git commit [options] [--] <filepattern>..."

3282 +msgstr "git apply [选项] [<补丁>...]"

3283 +

3284 +#: builtin/commit.c:38

3285 +#, fuzzy

3286 +msgid "git status [options] [--] <filepattern>..."

3287 +msgstr "git apply [选项] [<补丁>...]"

3288 +

3289 #: builtin/commit.c:43

3290 msgid ""

3291 "Your name and email address were configured automatically based\n"

@@ -2572,61 +3366,61 @@ msgstr "无法读取索引"

3366 msgid "unable to write temporary index file"

3367 msgstr "无法写临时索引文件"

3368

2575 -#: builtin/commit.c:496 builtin/commit.c:502

3369 +#: builtin/commit.c:510 builtin/commit.c:516

3370 #, c-format

3371 msgid "invalid commit: %s"

3372 msgstr "无效的提交：%s"

3373

2580 -#: builtin/commit.c:525

3374 +#: builtin/commit.c:539

3375 msgid "malformed --author parameter"

3376 msgstr "非法的 --author 参数"

3377

2584 -#: builtin/commit.c:585

3378 +#: builtin/commit.c:600

3379 #, c-format

3380 msgid "Malformed ident string: '%s'"

3381 msgstr "非法的身份字符串：'%s'"

3382

2589 -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970

3383 +#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985

3384 #, c-format

3385 msgid "could not lookup commit %s"

3386 msgstr "不能查询提交 %s"

3387

2594 -#: builtin/commit.c:635 builtin/shortlog.c:296

3388 +#: builtin/commit.c:650 builtin/shortlog.c:296

3389 #, c-format

3390 msgid "(reading log message from standard input)\n"

3391 msgstr "（正从标准输入中读取日志信息）\n"

3392

2599 -#: builtin/commit.c:637

3393 +#: builtin/commit.c:652

3394 msgid "could not read log from standard input"

3395 msgstr "不能从标准输入中读取日志信息"

3396

2603 -#: builtin/commit.c:641

3397 +#: builtin/commit.c:656

3398 #, c-format

3399 msgid "could not read log file '%s'"

3400 msgstr "不能读取日志文件 '%s'"

3401

2608 -#: builtin/commit.c:647

3402 +#: builtin/commit.c:662

3403 msgid "commit has empty message"

3404 msgstr "提交说明为空"

3405

2612 -#: builtin/commit.c:663

3406 +#: builtin/commit.c:678

3407 msgid "could not read MERGE_MSG"

3408 msgstr "不能读取 MERGE_MSG"

3409

2616 -#: builtin/commit.c:667

3410 +#: builtin/commit.c:682

3411 msgid "could not read SQUASH_MSG"

3412 msgstr "不能读取 SQUASH_MSG"

3413

2620 -#: builtin/commit.c:671

3414 +#: builtin/commit.c:686

3415 #, c-format

3416 msgid "could not read '%s'"

3417 msgstr "不能读取 '%s'"

3418

2625 -#: builtin/commit.c:723

3419 +#: builtin/commit.c:738

3420 msgid "could not write commit template"

3421 msgstr "不能写提交模版"

3422

2629 -#: builtin/commit.c:734

3423 +#: builtin/commit.c:749

3424 #, c-format

3425 msgid ""

3426 "\n"

@@ -2640,7 +3434,7 @@ msgstr ""

3434 "\t%s\n"

3435 "然后重试。\n"

3436

2643 -#: builtin/commit.c:739

3437 +#: builtin/commit.c:754

3438 #, c-format

3439 msgid ""

3440 "\n"

@@ -2654,7 +3448,7 @@ msgstr ""

3448 "\t%s\n"

3449 "然后重试。\n"

3450

2657 -#: builtin/commit.c:751

3451 +#: builtin/commit.c:766

3452 msgid ""

3453 "Please enter the commit message for your changes. Lines starting\n"

3454 "with '#' will be ignored, and an empty message aborts the commit.\n"

@@ -2662,7 +3456,7 @@ msgstr ""

3456 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n"

3457 "说明将会终止提交。\n"

3458

2665 -#: builtin/commit.c:756

3459 +#: builtin/commit.c:771

3460 msgid ""

3461 "Please enter the commit message for your changes. Lines starting\n"

3462 "with '#' will be kept; you may remove them yourself if you want to.\n"

@@ -2672,160 +3466,357 @@ msgstr ""

3466 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"

3467

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

2675 -#: builtin/commit.c:769

3469 +#: builtin/commit.c:784

3470 #, c-format

3471 msgid "%sAuthor: %s"

3472 msgstr "%s作者： %s"

3473

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

2681 -#: builtin/commit.c:776

3475 +#: builtin/commit.c:791

3476 #, c-format

3477 msgid "%sCommitter: %s"

3478 msgstr "%s提交者： %s"

3479

2686 -#: builtin/commit.c:796

3480 +#: builtin/commit.c:811

3481 msgid "Cannot read index"

3482 msgstr "无法读取索引"

3483

2690 -#: builtin/commit.c:833

3484 +#: builtin/commit.c:848

3485 msgid "Error building trees"

3486 msgstr "无法创建树对象"

3487

2694 -#: builtin/commit.c:848 builtin/tag.c:361

3488 +#: builtin/commit.c:863 builtin/tag.c:361

3489 #, c-format

3490 msgid "Please supply the message using either -m or -F option.\n"

3491 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"

3492

2699 -#: builtin/commit.c:945

3493 +#: builtin/commit.c:960

3494 #, c-format

3495 msgid "No existing author found with '%s'"

3496 msgstr "没有找到匹配 '%s' 的作者"

3497

2704 -#: builtin/commit.c:960 builtin/commit.c:1160

3498 +#: builtin/commit.c:975 builtin/commit.c:1175

3499 #, c-format

3500 msgid "Invalid untracked files mode '%s'"

3501 msgstr "无效的未追踪文件参数 '%s'"

3502

2709 -#: builtin/commit.c:1000

3503 +#: builtin/commit.c:1015

3504 msgid "Using both --reset-author and --author does not make sense"

3505 msgstr "同时使用 --reset-author 和 --author 没有意义"

3506

2713 -#: builtin/commit.c:1011

3507 +#: builtin/commit.c:1026

3508 msgid "You have nothing to amend."

3509 msgstr "您没有可修补的提交。"

3510

2717 -#: builtin/commit.c:1014

3511 +#: builtin/commit.c:1029

3512 msgid "You are in the middle of a merge -- cannot amend."

3513 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

3514

2721 -#: builtin/commit.c:1016

3515 +#: builtin/commit.c:1031

3516 msgid "You are in the middle of a cherry-pick -- cannot amend."

3517 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

3518

2725 -#: builtin/commit.c:1019

3519 +#: builtin/commit.c:1034

3520 msgid "Options --squash and --fixup cannot be used together"

3521 msgstr "选项 --squash 和 --fixup 不能同时使用"

3522

2729 -#: builtin/commit.c:1029

3523 +#: builtin/commit.c:1044

3524 msgid "Only one of -c/-C/-F/--fixup can be used."

3525 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

3526

2733 -#: builtin/commit.c:1031

3527 +#: builtin/commit.c:1046

3528 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

3529 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

3530

2737 -#: builtin/commit.c:1039

3531 +#: builtin/commit.c:1054

3532 msgid "--reset-author can be used only with -C, -c or --amend."

3533 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

3534

2741 -#: builtin/commit.c:1056

3535 +#: builtin/commit.c:1071

3536 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

3537 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

3538

2745 -#: builtin/commit.c:1058

3539 +#: builtin/commit.c:1073

3540 msgid "No paths with --include/--only does not make sense."

3541 msgstr "参数 --include/--only 不跟路径没有意义。"

3542

2749 -#: builtin/commit.c:1060

3543 +#: builtin/commit.c:1075

3544 msgid "Clever... amending the last one with dirty index."

3545 msgstr "聪明... 在索引不干净下修补最后的提交。"

3546

2753 -#: builtin/commit.c:1062

3547 +#: builtin/commit.c:1077

3548 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

3549 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

3550

2757 -#: builtin/commit.c:1072 builtin/tag.c:577

3551 +#: builtin/commit.c:1087 builtin/tag.c:577

3552 #, c-format

3553 msgid "Invalid cleanup mode %s"

3554 msgstr "无效的清理模式 %s"

3555

2762 -#: builtin/commit.c:1077

3556 +#: builtin/commit.c:1092

3557 msgid "Paths with -a does not make sense."

3558 msgstr "路径和 -a 选项同时使用没有意义。"

3559

2766 -#: builtin/commit.c:1260

3560 +#: builtin/commit.c:1189 builtin/commit.c:1417

3561 +msgid "show status concisely"

3562 +msgstr ""

3563 +

3564 +#: builtin/commit.c:1191 builtin/commit.c:1419

3565 +msgid "show branch information"

3566 +msgstr ""

3567 +

3568 +#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389

3569 +msgid "machine-readable output"

3570 +msgstr ""

3571 +

3572 +#: builtin/commit.c:1196 builtin/commit.c:1423

3573 +msgid "terminate entries with NUL"

3574 +msgstr ""

3575 +

3576 +#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636

3577 +#: builtin/fast-export.c:639 builtin/tag.c:461

3578 +msgid "mode"

3579 +msgstr ""

3580 +

3581 +#: builtin/commit.c:1199 builtin/commit.c:1426

3582 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3583 +msgstr ""

3584 +

3585 +#: builtin/commit.c:1202

3586 +msgid "show ignored files"

3587 +msgstr ""

3588 +

3589 +#: builtin/commit.c:1203 parse-options.h:151

3590 +msgid "when"

3591 +msgstr "何时"

3592 +

3593 +#: builtin/commit.c:1204

3594 +msgid ""

3595 +"ignore changes to submodules, optional when: all, dirty, untracked. "

3596 +"(Default: all)"

3597 +msgstr ""

3598 +

3599 +#: builtin/commit.c:1206

3600 +#, fuzzy

3601 +msgid "list untracked files in columns"

3602 +msgstr "无效的未追踪文件参数 '%s'"

3603 +

3604 +#: builtin/commit.c:1275

3605 msgid "couldn't look up newly created commit"

3606 msgstr "无法找到新创建的提交"

3607

2770 -#: builtin/commit.c:1262

3608 +#: builtin/commit.c:1277

3609 msgid "could not parse newly created commit"

3610 msgstr "不能解析新创建的提交"

3611

2774 -#: builtin/commit.c:1303

3612 +#: builtin/commit.c:1318

3613 msgid "detached HEAD"

3614 msgstr "分离头指针"

3615

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

2779 -#: builtin/commit.c:1305

3617 +#: builtin/commit.c:1320

3618 msgid " (root-commit)"

3619 msgstr "（根提交）"

3620

2783 -#: builtin/commit.c:1449

3621 +#: builtin/commit.c:1387

3622 +msgid "suppress summary after successful commit"

3623 +msgstr ""

3624 +

3625 +#: builtin/commit.c:1388

3626 +msgid "show diff in commit message template"

3627 +msgstr ""

3628 +

3629 +#: builtin/commit.c:1390

3630 +#, fuzzy

3631 +msgid "Commit message options"

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

3633 +

3634 +#: builtin/commit.c:1391 builtin/tag.c:459

3635 +msgid "read message from file"

3636 +msgstr ""

3637 +

3638 +#: builtin/commit.c:1392

3639 +msgid "author"

3640 +msgstr ""

3641 +

3642 +#: builtin/commit.c:1392

3643 +#, fuzzy

3644 +msgid "override author for commit"

3645 +msgstr "合并未返回提交"

3646 +

3647 +#: builtin/commit.c:1393 builtin/gc.c:178

3648 +msgid "date"

3649 +msgstr ""

3650 +

3651 +#: builtin/commit.c:1393

3652 +#, fuzzy

3653 +msgid "override date for commit"

3654 +msgstr "合并未返回提交"

3655 +

3656 +#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534

3657 +#: builtin/notes.c:691 builtin/tag.c:457

3658 +#, fuzzy

3659 +msgid "message"

3660 +msgstr "无 tag 说明？"

3661 +

3662 +#: builtin/commit.c:1394

3663 +#, fuzzy

3664 +msgid "commit message"

3665 +msgstr "空提交信息。"

3666 +

3667 +#: builtin/commit.c:1395

3668 +msgid "reuse and edit message from specified commit"

3669 +msgstr ""

3670 +

3671 +#: builtin/commit.c:1396

3672 +msgid "reuse message from specified commit"

3673 +msgstr ""

3674 +

3675 +#: builtin/commit.c:1397

3676 +msgid "use autosquash formatted message to fixup specified commit"

3677 +msgstr ""

3678 +

3679 +#: builtin/commit.c:1398

3680 +msgid "use autosquash formatted message to squash specified commit"

3681 +msgstr ""

3682 +

3683 +#: builtin/commit.c:1399

3684 +msgid "the commit is authored by me now (used with -C/-c/--amend)"

3685 +msgstr ""

3686 +

3687 +#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109

3688 +msgid "add Signed-off-by:"

3689 +msgstr ""

3690 +

3691 +#: builtin/commit.c:1401

3692 +msgid "use specified template file"

3693 +msgstr ""

3694 +

3695 +#: builtin/commit.c:1402

3696 +#, fuzzy

3697 +msgid "force edit of commit"

3698 +msgstr "合并未返回提交"

3699 +

3700 +#: builtin/commit.c:1403

3701 +msgid "default"

3702 +msgstr ""

3703 +

3704 +#: builtin/commit.c:1403 builtin/tag.c:462

3705 +msgid "how to strip spaces and #comments from message"

3706 +msgstr ""

3707 +

3708 +#: builtin/commit.c:1404

3709 +#, fuzzy

3710 +msgid "include status in commit message template"

3711 +msgstr "不能写提交模版"

3712 +

3713 +#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463

3714 +msgid "key id"

3715 +msgstr ""

3716 +

3717 +#: builtin/commit.c:1406 builtin/merge.c:214

3718 +msgid "GPG sign commit"

3719 +msgstr ""

3720 +

3721 +#. end commit message options

3722 +#: builtin/commit.c:1409

3723 +msgid "Commit contents options"

3724 +msgstr ""

3725 +

3726 +#: builtin/commit.c:1410

3727 +msgid "commit all changed files"

3728 +msgstr ""

3729 +

3730 +#: builtin/commit.c:1411

3731 +msgid "add specified files to index for commit"

3732 +msgstr ""

3733 +

3734 +#: builtin/commit.c:1412

3735 +#, fuzzy

3736 +msgid "interactively add files"

3737 +msgstr "交互式添加失败"

3738 +

3739 +#: builtin/commit.c:1413

3740 +#, fuzzy

3741 +msgid "interactively add changes"

3742 +msgstr "交互式添加失败"

3743 +

3744 +#: builtin/commit.c:1414

3745 +#, fuzzy

3746 +msgid "commit only specified files"

3747 +msgstr "无法还原修改的文件"

3748 +

3749 +#: builtin/commit.c:1415

3750 +msgid "bypass pre-commit hook"

3751 +msgstr ""

3752 +

3753 +#: builtin/commit.c:1416

3754 +#, fuzzy

3755 +msgid "show what would be committed"

3756 +msgstr "要提交的变更："

3757 +

3758 +#: builtin/commit.c:1424

3759 +msgid "amend previous commit"

3760 +msgstr ""

3761 +

3762 +#: builtin/commit.c:1425

3763 +msgid "bypass post-rewrite hook"

3764 +msgstr ""

3765 +

3766 +#: builtin/commit.c:1430

3767 +msgid "ok to record an empty change"

3768 +msgstr ""

3769 +

3770 +#: builtin/commit.c:1433

3771 +msgid "ok to record a change with an empty message"

3772 +msgstr ""

3773 +

3774 +#: builtin/commit.c:1464

3775 msgid "could not parse HEAD commit"

3776 msgstr "不能解析 HEAD 提交"

3777

2787 -#: builtin/commit.c:1487 builtin/merge.c:508

3778 +#: builtin/commit.c:1502 builtin/merge.c:508

3779 #, c-format

3780 msgid "could not open '%s' for reading"

3781 msgstr "不能为读入打开 '%s'"

3782

2792 -#: builtin/commit.c:1494

3783 +#: builtin/commit.c:1509

3784 #, c-format

3785 msgid "Corrupt MERGE_HEAD file (%s)"

3786 msgstr "损坏的 MERGE_HEAD 文件（%s）"

3787

2797 -#: builtin/commit.c:1501

3788 +#: builtin/commit.c:1516

3789 msgid "could not read MERGE_MODE"

3790 msgstr "不能读取 MERGE_MODE"

3791

2801 -#: builtin/commit.c:1520

3792 +#: builtin/commit.c:1535

3793 #, c-format

3794 msgid "could not read commit message: %s"

3795 msgstr "不能读取提交说明：%s"

3796

2806 -#: builtin/commit.c:1534

3797 +#: builtin/commit.c:1549

3798 #, c-format

3799 msgid "Aborting commit; you did not edit the message.\n"

3800 msgstr "终止提交；您未更改来自模版的提交说明。\n"

3801

2811 -#: builtin/commit.c:1539

3802 +#: builtin/commit.c:1554

3803 #, c-format

3804 msgid "Aborting commit due to empty commit message.\n"

3805 msgstr "终止提交因为提交说明为空。\n"

3806

2816 -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960

3807 +#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960

3808 msgid "failed to write commit object"

3809 msgstr "无法写提交对象"

3810

2820 -#: builtin/commit.c:1575

3811 +#: builtin/commit.c:1590

3812 msgid "cannot lock HEAD ref"

3813 msgstr "无法锁定 HEAD 引用"

3814

2824 -#: builtin/commit.c:1579

3815 +#: builtin/commit.c:1594

3816 msgid "cannot update HEAD ref"

3817 msgstr "无法更新 HEAD 引用"

3818

2828 -#: builtin/commit.c:1590

3819 +#: builtin/commit.c:1605

3820 msgid ""

3821 "Repository has been updated, but unable to write\n"

3822 "new_index file. Check that disk is not full or quota is\n"

@@ -2834,6 +3825,138 @@ msgstr ""

3825 "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"

3826 "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"

3827

3828 +#: builtin/config.c:7

3829 +msgid "git config [options]"

3830 +msgstr ""

3831 +

3832 +#: builtin/config.c:52

3833 +msgid "Config file location"

3834 +msgstr ""

3835 +

3836 +#: builtin/config.c:53

3837 +#, fuzzy

3838 +msgid "use global config file"

3839 +msgstr "无法更新 config 文件"

3840 +

3841 +#: builtin/config.c:54

3842 +msgid "use system config file"

3843 +msgstr ""

3844 +

3845 +#: builtin/config.c:55

3846 +#, fuzzy

3847 +msgid "use repository config file"

3848 +msgstr "需要一个版本库来解包。"

3849 +

3850 +#: builtin/config.c:56

3851 +#, fuzzy

3852 +msgid "use given config file"

3853 +msgstr "未预期的文件结束"

3854 +

3855 +#: builtin/config.c:57

3856 +#, fuzzy

3857 +msgid "Action"

3858 +msgstr "动作"

3859 +

3860 +#: builtin/config.c:58

3861 +msgid "get value: name [value-regex]"

3862 +msgstr ""

3863 +

3864 +#: builtin/config.c:59

3865 +msgid "get all values: key [value-regex]"

3866 +msgstr ""

3867 +

3868 +#: builtin/config.c:60

3869 +msgid "get values for regexp: name-regex [value-regex]"

3870 +msgstr ""

3871 +

3872 +#: builtin/config.c:61

3873 +msgid "replace all matching variables: name value [value_regex]"

3874 +msgstr ""

3875 +

3876 +#: builtin/config.c:62

3877 +msgid "add a new variable: name value"

3878 +msgstr ""

3879 +

3880 +#: builtin/config.c:63

3881 +msgid "remove a variable: name [value-regex]"

3882 +msgstr ""

3883 +

3884 +#: builtin/config.c:64

3885 +msgid "remove all matches: name [value-regex]"

3886 +msgstr ""

3887 +

3888 +#: builtin/config.c:65

3889 +msgid "rename section: old-name new-name"

3890 +msgstr ""

3891 +

3892 +#: builtin/config.c:66

3893 +msgid "remove a section: name"

3894 +msgstr ""

3895 +

3896 +#: builtin/config.c:67

3897 +msgid "list all"

3898 +msgstr ""

3899 +

3900 +#: builtin/config.c:68

3901 +msgid "open an editor"

3902 +msgstr ""

3903 +

3904 +#: builtin/config.c:69 builtin/config.c:70

3905 +msgid "slot"

3906 +msgstr ""

3907 +

3908 +#: builtin/config.c:69

3909 +msgid "find the color configured: [default]"

3910 +msgstr ""

3911 +

3912 +#: builtin/config.c:70

3913 +msgid "find the color setting: [stdout-is-tty]"

3914 +msgstr ""

3915 +

3916 +#: builtin/config.c:71

3917 +msgid "Type"

3918 +msgstr ""

3919 +

3920 +#: builtin/config.c:72

3921 +msgid "value is \"true\" or \"false\""

3922 +msgstr ""

3923 +

3924 +#: builtin/config.c:73

3925 +msgid "value is decimal number"

3926 +msgstr ""

3927 +

3928 +#: builtin/config.c:74

3929 +msgid "value is --bool or --int"

3930 +msgstr ""

3931 +

3932 +#: builtin/config.c:75

3933 +msgid "value is a path (file or directory name)"

3934 +msgstr ""

3935 +

3936 +#: builtin/config.c:76

3937 +msgid "Other"

3938 +msgstr ""

3939 +

3940 +#: builtin/config.c:77

3941 +msgid "terminate values with NUL byte"

3942 +msgstr ""

3943 +

3944 +#: builtin/config.c:78

3945 +msgid "respect include directives on lookup"

3946 +msgstr ""

3947 +

3948 +#: builtin/count-objects.c:69

3949 +msgid "git count-objects [-v]"

3950 +msgstr ""

3951 +

3952 +#: builtin/describe.c:15

3953 +msgid "git describe [options] <committish>*"

3954 +msgstr ""

3955 +

3956 +#: builtin/describe.c:16

3957 +msgid "git describe [options] --dirty"

3958 +msgstr ""

3959 +

3960 #: builtin/describe.c:234

3961 #, c-format

3962 msgid "annotated tag %s not available"

@@ -2906,6 +4029,52 @@ msgstr ""

4029 "发现多于 %i 个 tag，列出最近的 %i 个\n"

4030 "在 %s 放弃搜索\n"

4031

4032 +#: builtin/describe.c:403

4033 +msgid "find the tag that comes after the commit"

4034 +msgstr ""

4035 +

4036 +#: builtin/describe.c:404

4037 +msgid "debug search strategy on stderr"

4038 +msgstr ""

4039 +

4040 +#: builtin/describe.c:405

4041 +msgid "use any ref in .git/refs"

4042 +msgstr ""

4043 +

4044 +#: builtin/describe.c:406

4045 +msgid "use any tag in .git/refs/tags"

4046 +msgstr ""

4047 +

4048 +#: builtin/describe.c:407

4049 +msgid "always use long format"

4050 +msgstr ""

4051 +

4052 +#: builtin/describe.c:410

4053 +#, fuzzy

4054 +msgid "only output exact matches"

4055 +msgstr "没有 tag 准确匹配 '%s'"

4056 +

4057 +#: builtin/describe.c:412

4058 +msgid "consider <n> most recent tags (default: 10)"

4059 +msgstr ""

4060 +

4061 +#: builtin/describe.c:414

4062 +#, fuzzy

4063 +msgid "only consider tags matching <pattern>"

4064 +msgstr "输出和模式匹配的行"

4065 +

4066 +#: builtin/describe.c:416 builtin/name-rev.c:238

4067 +msgid "show abbreviated commit object as fallback"

4068 +msgstr ""

4069 +

4070 +#: builtin/describe.c:417

4071 +msgid "mark"

4072 +msgstr ""

4073 +

4074 +#: builtin/describe.c:418

4075 +msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4076 +msgstr ""

4077 +

4078 #: builtin/describe.c:436

4079 msgid "--long is incompatible with --abbrev=0"

4080 msgstr "--long 与 --abbrev=0 不兼容"

@@ -2952,77 +4121,203 @@ msgstr "提供了超过两个二进制对象（blob）：'%s'"

4121 msgid "unhandled object '%s' given."

4122 msgstr "提供了无法处理的对象 '%s'。"

4123

2955 -#: builtin/fetch.c:200

4124 +#: builtin/fast-export.c:22

4125 +msgid "git fast-export [rev-list-opts]"

4126 +msgstr ""

4127 +

4128 +#: builtin/fast-export.c:635

4129 +#, fuzzy

4130 +msgid "show progress after <n> objects"

4131 +msgstr "显示各种类型的对象"

4132 +

4133 +#: builtin/fast-export.c:637

4134 +msgid "select handling of signed tags"

4135 +msgstr ""

4136 +

4137 +#: builtin/fast-export.c:640

4138 +msgid "select handling of tags that tag filtered objects"

4139 +msgstr ""

4140 +

4141 +#: builtin/fast-export.c:643

4142 +msgid "Dump marks to this file"

4143 +msgstr ""

4144 +

4145 +#: builtin/fast-export.c:645

4146 +msgid "Import marks from this file"

4147 +msgstr ""

4148 +

4149 +#: builtin/fast-export.c:647

4150 +msgid "Fake a tagger when tags lack one"

4151 +msgstr ""

4152 +

4153 +#: builtin/fast-export.c:649

4154 +msgid "Output full tree for each commit"

4155 +msgstr ""

4156 +

4157 +#: builtin/fast-export.c:651

4158 +msgid "Use the done feature to terminate the stream"

4159 +msgstr ""

4160 +

4161 +#: builtin/fast-export.c:652

4162 +msgid "Skip output of blob data"

4163 +msgstr ""

4164 +

4165 +#: builtin/fetch.c:20

4166 +#, fuzzy

4167 +msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4168 +msgstr "git apply [选项] [<补丁>...]"

4169 +

4170 +#: builtin/fetch.c:21

4171 +msgid "git fetch [<options>] <group>"

4172 +msgstr ""

4173 +

4174 +#: builtin/fetch.c:22

4175 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

4176 +msgstr ""

4177 +

4178 +#: builtin/fetch.c:23

4179 +msgid "git fetch --all [<options>]"

4180 +msgstr ""

4181 +

4182 +#: builtin/fetch.c:60

4183 +msgid "fetch from all remotes"

4184 +msgstr ""

4185 +

4186 +#: builtin/fetch.c:62

4187 +msgid "append to .git/FETCH_HEAD instead of overwriting"

4188 +msgstr ""

4189 +

4190 +#: builtin/fetch.c:64

4191 +msgid "path to upload pack on remote end"

4192 +msgstr ""

4193 +

4194 +#: builtin/fetch.c:65

4195 +msgid "force overwrite of local branch"

4196 +msgstr ""

4197 +

4198 +#: builtin/fetch.c:67

4199 +msgid "fetch from multiple remotes"

4200 +msgstr ""

4201 +

4202 +#: builtin/fetch.c:69

4203 +#, fuzzy

4204 +msgid "fetch all tags and associated objects"

4205 +msgstr "更新远程引用和相关的对象"

4206 +

4207 +#: builtin/fetch.c:71

4208 +msgid "do not fetch all tags (--no-tags)"

4209 +msgstr ""

4210 +

4211 +#: builtin/fetch.c:73

4212 +#, fuzzy

4213 +msgid "prune remote-tracking branches no longer on remote"

4214 +msgstr "%s 没有来自 %s 的远程跟踪分支"

4215 +

4216 +#: builtin/fetch.c:74

4217 +msgid "on-demand"

4218 +msgstr ""

4219 +

4220 +#: builtin/fetch.c:75

4221 +msgid "control recursive fetching of submodules"

4222 +msgstr ""

4223 +

4224 +#: builtin/fetch.c:79

4225 +msgid "keep downloaded pack"

4226 +msgstr ""

4227 +

4228 +#: builtin/fetch.c:81

4229 +#, fuzzy

4230 +msgid "allow updating of HEAD ref"

4231 +msgstr "无法更新 HEAD 引用"

4232 +

4233 +#: builtin/fetch.c:84

4234 +msgid "deepen history of shallow clone"

4235 +msgstr ""

4236 +

4237 +#: builtin/fetch.c:85 builtin/log.c:1083

4238 +msgid "dir"

4239 +msgstr ""

4240 +

4241 +#: builtin/fetch.c:86

4242 +#, fuzzy

4243 +msgid "prepend this to submodule path output"

4244 +msgstr "无法递归进子模组路径 '$sm_path'"

4245 +

4246 +#: builtin/fetch.c:89

4247 +msgid "default mode for recursion"

4248 +msgstr ""

4249 +

4250 +#: builtin/fetch.c:201

4251 msgid "Couldn't find remote ref HEAD"

4252 msgstr "无法发现远程 HEAD 引用"

4253

2959 -#: builtin/fetch.c:253

4254 +#: builtin/fetch.c:254

4255 #, c-format

4256 msgid "object %s not found"

4257 msgstr "对象 %s 未发现"

4258

2964 -#: builtin/fetch.c:259

4259 +#: builtin/fetch.c:260

4260 msgid "[up to date]"

4261 msgstr "[最新]"

4262

2968 -#: builtin/fetch.c:273

4263 +#: builtin/fetch.c:274

4264 #, c-format

4265 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

4266 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

4267

2973 -#: builtin/fetch.c:274 builtin/fetch.c:360

4268 +#: builtin/fetch.c:275 builtin/fetch.c:361

4269 msgid "[rejected]"

4270 msgstr "[已拒绝]"

4271

2977 -#: builtin/fetch.c:285

4272 +#: builtin/fetch.c:286

4273 msgid "[tag update]"

4274 msgstr "[tag更新]"

4275

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

2982 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

4277 +#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341

4278 msgid " (unable to update local ref)"

4279 msgstr " （不能更新本地引用）"

4280

2986 -#: builtin/fetch.c:305

4281 +#: builtin/fetch.c:306

4282 msgid "[new tag]"

4283 msgstr "[新tag]"

4284

2990 -#: builtin/fetch.c:308

4285 +#: builtin/fetch.c:309

4286 msgid "[new branch]"

4287 msgstr "[新分支]"

4288

2994 -#: builtin/fetch.c:311

4289 +#: builtin/fetch.c:312

4290 msgid "[new ref]"

4291 msgstr "[新引用]"

4292

2998 -#: builtin/fetch.c:356

4293 +#: builtin/fetch.c:357

4294 msgid "unable to update local ref"

4295 msgstr "不能更新本地引用"

4296

3002 -#: builtin/fetch.c:356

4297 +#: builtin/fetch.c:357

4298 msgid "forced update"

4299 msgstr "强制更新"

4300

3006 -#: builtin/fetch.c:362

4301 +#: builtin/fetch.c:363

4302 msgid "(non-fast-forward)"

4303 msgstr "（非快进式）"

4304

3010 -#: builtin/fetch.c:393 builtin/fetch.c:685

4305 +#: builtin/fetch.c:394 builtin/fetch.c:686

4306 #, c-format

4307 msgid "cannot open %s: %s\n"

4308 msgstr "无法打开 %s：%s\n"

4309

3015 -#: builtin/fetch.c:402

4310 +#: builtin/fetch.c:403

4311 #, c-format

4312 msgid "%s did not send all necessary objects\n"

4313 msgstr "%s 未发送所有必须的对象\n"

4314

3020 -#: builtin/fetch.c:488

4315 +#: builtin/fetch.c:489

4316 #, c-format

4317 msgid "From %.*s\n"

4318 msgstr "来自 %.*s\n"

4319

3025 -#: builtin/fetch.c:499

4320 +#: builtin/fetch.c:500

4321 #, c-format

4322 msgid ""

4323 "some local refs could not be updated; try running\n"

@@ -3032,82 +4327,204 @@ msgstr ""

4327 " 'git remote prune %s' 来删除旧的、有冲突的分支"

4328

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

3035 -#: builtin/fetch.c:549

4330 +#: builtin/fetch.c:550

4331 #, c-format

4332 msgid " (%s will become dangling)"

4333 msgstr " （%s 将成为悬空状态）"

4334

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

3041 -#: builtin/fetch.c:550

4336 +#: builtin/fetch.c:551

4337 #, c-format

4338 msgid " (%s has become dangling)"

4339 msgstr " （%s 已成为悬空状态）"

4340

3046 -#: builtin/fetch.c:557

4341 +#: builtin/fetch.c:558

4342 msgid "[deleted]"

4343 msgstr "[已删除]"

4344

3050 -#: builtin/fetch.c:558 builtin/remote.c:1055

4345 +#: builtin/fetch.c:559 builtin/remote.c:1055

4346 msgid "(none)"

4347 msgstr "（无）"

4348

3054 -#: builtin/fetch.c:675

4349 +#: builtin/fetch.c:676

4350 #, c-format

4351 msgid "Refusing to fetch into current branch %s of non-bare repository"

4352 msgstr "拒绝获取到非裸版本库的当前分支 %s"

4353

3059 -#: builtin/fetch.c:709

4354 +#: builtin/fetch.c:710

4355 #, c-format

4356 msgid "Don't know how to fetch from %s"

4357 msgstr "不知道如何从 %s 获取"

4358

3064 -#: builtin/fetch.c:786

4359 +#: builtin/fetch.c:787

4360 #, c-format

4361 msgid "Option \"%s\" value \"%s\" is not valid for %s"

4362 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

4363

3069 -#: builtin/fetch.c:789

4364 +#: builtin/fetch.c:790

4365 #, c-format

4366 msgid "Option \"%s\" is ignored for %s\n"

4367 msgstr "选项 \"%s\" 为 %s 所忽略\n"

4368

3074 -#: builtin/fetch.c:888

4369 +#: builtin/fetch.c:892

4370 #, c-format

4371 msgid "Fetching %s\n"

4372 msgstr "正在获取 %s\n"

4373

3079 -#: builtin/fetch.c:890 builtin/remote.c:100

4374 +#: builtin/fetch.c:894 builtin/remote.c:100

4375 #, c-format

4376 msgid "Could not fetch %s"

4377 msgstr "不能获取 %s"

4378

3084 -#: builtin/fetch.c:907

4379 +#: builtin/fetch.c:913

4380 msgid ""

4381 "No remote repository specified. Please, specify either a URL or a\n"

4382 "remote name from which new revisions should be fetched."

4383 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

4384

3090 -#: builtin/fetch.c:927

4385 +#: builtin/fetch.c:933

4386 msgid "You need to specify a tag name."

4387 msgstr "您需要指定一个 tag 名称。"

4388

3094 -#: builtin/fetch.c:979

4389 +#: builtin/fetch.c:985

4390 msgid "fetch --all does not take a repository argument"

4391 msgstr "fetch --all 不能带一个版本库参数"

4392

3098 -#: builtin/fetch.c:981

4393 +#: builtin/fetch.c:987

4394 msgid "fetch --all does not make sense with refspecs"

4395 msgstr "fetch --all 带引用表达式没有任何意义"

4396

3102 -#: builtin/fetch.c:992

4397 +#: builtin/fetch.c:998

4398 #, c-format

4399 msgid "No such remote or remote group: %s"

4400 msgstr "没有这样的远程或远程组：%s"

4401

3107 -#: builtin/fetch.c:1000

4402 +#: builtin/fetch.c:1006

4403 msgid "Fetching a group and specifying refspecs does not make sense"

4404 msgstr "获取组并指定引用表达式没有意义"

4405

4406 +#: builtin/fmt-merge-msg.c:13

4407 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4408 +msgstr ""

4409 +

4410 +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786

4411 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192

4412 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235

4413 +msgid "n"

4414 +msgstr "数字"

4415 +

4416 +#: builtin/fmt-merge-msg.c:654

4417 +msgid "populate log with at most <n> entries from shortlog"

4418 +msgstr ""

4419 +

4420 +#: builtin/fmt-merge-msg.c:657

4421 +msgid "alias for --log (deprecated)"

4422 +msgstr ""

4423 +

4424 +#: builtin/fmt-merge-msg.c:660

4425 +msgid "text"

4426 +msgstr ""

4427 +

4428 +#: builtin/fmt-merge-msg.c:661

4429 +msgid "use <text> as start of message"

4430 +msgstr ""

4431 +

4432 +#: builtin/fmt-merge-msg.c:662

4433 +#, fuzzy

4434 +msgid "file to read from"

4435 +msgstr "不能读 %s"

4436 +

4437 +#: builtin/for-each-ref.c:979

4438 +#, fuzzy

4439 +msgid "git for-each-ref [options] [<pattern>]"

4440 +msgstr "git apply [选项] [<补丁>...]"

4441 +

4442 +#: builtin/for-each-ref.c:994

4443 +msgid "quote placeholders suitably for shells"

4444 +msgstr ""

4445 +

4446 +#: builtin/for-each-ref.c:996

4447 +msgid "quote placeholders suitably for perl"

4448 +msgstr ""

4449 +

4450 +#: builtin/for-each-ref.c:998

4451 +msgid "quote placeholders suitably for python"

4452 +msgstr ""

4453 +

4454 +#: builtin/for-each-ref.c:1000

4455 +msgid "quote placeholders suitably for tcl"

4456 +msgstr ""

4457 +

4458 +#: builtin/for-each-ref.c:1003

4459 +msgid "show only <n> matched refs"

4460 +msgstr ""

4461 +

4462 +#: builtin/for-each-ref.c:1004

4463 +msgid "format"

4464 +msgstr ""

4465 +

4466 +#: builtin/for-each-ref.c:1004

4467 +msgid "format to use for the output"

4468 +msgstr ""

4469 +

4470 +#: builtin/for-each-ref.c:1005

4471 +msgid "key"

4472 +msgstr ""

4473 +

4474 +#: builtin/for-each-ref.c:1006

4475 +msgid "field name to sort on"

4476 +msgstr ""

4477 +

4478 +#: builtin/fsck.c:608

4479 +#, fuzzy

4480 +msgid "git fsck [options] [<object>...]"

4481 +msgstr "git apply [选项] [<补丁>...]"

4482 +

4483 +#: builtin/fsck.c:614

4484 +msgid "show unreachable objects"

4485 +msgstr ""

4486 +

4487 +#: builtin/fsck.c:615

4488 +#, fuzzy

4489 +msgid "show dangling objects"

4490 +msgstr "索引对象中"

4491 +

4492 +#: builtin/fsck.c:616

4493 +msgid "report tags"

4494 +msgstr ""

4495 +

4496 +#: builtin/fsck.c:617

4497 +msgid "report root nodes"

4498 +msgstr ""

4499 +

4500 +#: builtin/fsck.c:618

4501 +msgid "make index objects head nodes"

4502 +msgstr ""

4503 +

4504 +#: builtin/fsck.c:619

4505 +msgid "make reflogs head nodes (default)"

4506 +msgstr ""

4507 +

4508 +#: builtin/fsck.c:620

4509 +msgid "also consider packs and alternate objects"

4510 +msgstr ""

4511 +

4512 +#: builtin/fsck.c:621

4513 +msgid "enable more strict checking"

4514 +msgstr ""

4515 +

4516 +#: builtin/fsck.c:623

4517 +msgid "write dangling objects in .git/lost-found"

4518 +msgstr ""

4519 +

4520 +#: builtin/fsck.c:624 builtin/prune.c:134

4521 +msgid "show progress"

4522 +msgstr ""

4523 +

4524 +#: builtin/gc.c:22

4525 +msgid "git gc [options]"

4526 +msgstr ""

4527 +

4528 #: builtin/gc.c:63

4529 #, c-format

4530 msgid "Invalid %s: '%s'"

@@ -3118,6 +4535,18 @@ msgstr "无效的 %s：'%s'"

4535 msgid "insanely long object directory %.*s"

4536 msgstr "不正常的长对象目录 %.*s"

4537

4538 +#: builtin/gc.c:179

4539 +msgid "prune unreferenced objects"

4540 +msgstr ""

4541 +

4542 +#: builtin/gc.c:181

4543 +msgid "be more thorough (increased runtime)"

4544 +msgstr ""

4545 +

4546 +#: builtin/gc.c:182

4547 +msgid "enable auto-gc mode"

4548 +msgstr ""

4549 +

4550 #: builtin/gc.c:221

4551 #, c-format

4552 msgid "Auto packing the repository for optimum performance.\n"

@@ -3137,6 +4566,10 @@ msgid ""

4566 "There are too many unreachable loose objects; run 'git prune' to remove them."

4567 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

4568

4569 +#: builtin/grep.c:22

4570 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

4571 +msgstr ""

4572 +

4573 #: builtin/grep.c:216

4574 #, c-format

4575 msgid "grep: failed to create thread: %s"

@@ -3167,6 +4600,174 @@ msgstr "开关 `%c' 期望一个数字值"

4600 msgid "cannot open '%s'"

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

4602

4603 +#: builtin/grep.c:728

4604 +msgid "search in index instead of in the work tree"

4605 +msgstr ""

4606 +

4607 +#: builtin/grep.c:730

4608 +msgid "find in contents not managed by git"

4609 +msgstr ""

4610 +

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

4612 +#: builtin/grep.c:732

4613 +#, fuzzy

4614 +msgid "search in both tracked and untracked files"

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

4616 +

4617 +#: builtin/grep.c:734

4618 +msgid "search also in ignored files"

4619 +msgstr ""

4620 +

4621 +#: builtin/grep.c:737

4622 +msgid "show non-matching lines"

4623 +msgstr ""

4624 +

4625 +#: builtin/grep.c:739

4626 +msgid "case insensitive matching"

4627 +msgstr ""

4628 +

4629 +#: builtin/grep.c:741

4630 +msgid "match patterns only at word boundaries"

4631 +msgstr ""

4632 +

4633 +#: builtin/grep.c:743

4634 +msgid "process binary files as text"

4635 +msgstr ""

4636 +

4637 +#: builtin/grep.c:745

4638 +msgid "don't match patterns in binary files"

4639 +msgstr ""

4640 +

4641 +#: builtin/grep.c:748

4642 +msgid "descend at most <depth> levels"

4643 +msgstr ""

4644 +

4645 +#: builtin/grep.c:752

4646 +msgid "use extended POSIX regular expressions"

4647 +msgstr ""

4648 +

4649 +#: builtin/grep.c:755

4650 +msgid "use basic POSIX regular expressions (default)"

4651 +msgstr ""

4652 +

4653 +#: builtin/grep.c:758

4654 +msgid "interpret patterns as fixed strings"

4655 +msgstr ""

4656 +

4657 +#: builtin/grep.c:761

4658 +msgid "use Perl-compatible regular expressions"

4659 +msgstr ""

4660 +

4661 +#: builtin/grep.c:764

4662 +msgid "show line numbers"

4663 +msgstr ""

4664 +

4665 +#: builtin/grep.c:765

4666 +msgid "don't show filenames"

4667 +msgstr ""

4668 +

4669 +#: builtin/grep.c:766

4670 +#, fuzzy

4671 +msgid "show filenames"

4672 +msgstr "%s文件："

4673 +

4674 +#: builtin/grep.c:768

4675 +msgid "show filenames relative to top directory"

4676 +msgstr ""

4677 +

4678 +#: builtin/grep.c:770

4679 +msgid "show only filenames instead of matching lines"

4680 +msgstr ""

4681 +

4682 +#: builtin/grep.c:772

4683 +msgid "synonym for --files-with-matches"

4684 +msgstr ""

4685 +

4686 +#: builtin/grep.c:775

4687 +msgid "show only the names of files without match"

4688 +msgstr ""

4689 +

4690 +#: builtin/grep.c:777

4691 +#, fuzzy

4692 +msgid "print NUL after filenames"

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

4694 +

4695 +#: builtin/grep.c:779

4696 +msgid "show the number of matches instead of matching lines"

4697 +msgstr ""

4698 +

4699 +#: builtin/grep.c:780

4700 +msgid "highlight matches"

4701 +msgstr ""

4702 +

4703 +#: builtin/grep.c:782

4704 +msgid "print empty line between matches from different files"

4705 +msgstr ""

4706 +

4707 +#: builtin/grep.c:784

4708 +msgid "show filename only once above matches from same file"

4709 +msgstr ""

4710 +

4711 +#: builtin/grep.c:787

4712 +msgid "show <n> context lines before and after matches"

4713 +msgstr ""

4714 +

4715 +#: builtin/grep.c:790

4716 +msgid "show <n> context lines before matches"

4717 +msgstr ""

4718 +

4719 +#: builtin/grep.c:792

4720 +msgid "show <n> context lines after matches"

4721 +msgstr ""

4722 +

4723 +#: builtin/grep.c:793

4724 +msgid "shortcut for -C NUM"

4725 +msgstr ""

4726 +

4727 +#: builtin/grep.c:796

4728 +msgid "show a line with the function name before matches"

4729 +msgstr ""

4730 +

4731 +#: builtin/grep.c:798

4732 +msgid "show the surrounding function"

4733 +msgstr ""

4734 +

4735 +#: builtin/grep.c:801

4736 +msgid "read patterns from file"

4737 +msgstr ""

4738 +

4739 +#: builtin/grep.c:803

4740 +msgid "match <pattern>"

4741 +msgstr ""

4742 +

4743 +#: builtin/grep.c:805

4744 +msgid "combine patterns specified with -e"

4745 +msgstr ""

4746 +

4747 +#: builtin/grep.c:817

4748 +msgid "indicate hit with exit status without output"

4749 +msgstr ""

4750 +

4751 +#: builtin/grep.c:819

4752 +msgid "show only matches from files that match all patterns"

4753 +msgstr ""

4754 +

4755 +#: builtin/grep.c:822

4756 +msgid "pager"

4757 +msgstr ""

4758 +

4759 +#: builtin/grep.c:822

4760 +msgid "show matching files in the pager"

4761 +msgstr ""

4762 +

4763 +#: builtin/grep.c:825

4764 +msgid "allow calling of grep(1) (ignored by this build)"

4765 +msgstr ""

4766 +

4767 +#: builtin/grep.c:826 builtin/show-ref.c:201

4768 +msgid "show usage"

4769 +msgstr ""

4770 +

4771 #: builtin/grep.c:917

4772 msgid "no pattern given."

4773 msgstr "未提供模式匹配。"

@@ -3196,6 +4797,62 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

4797 msgid "both --cached and trees are given."

4798 msgstr "同时给出了 --cached 和树对象。"

4799

4800 +#: builtin/hash-object.c:60

4801 +msgid ""

4802 +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "

4803 +"<file>..."

4804 +msgstr ""

4805 +

4806 +#: builtin/hash-object.c:61

4807 +msgid "git hash-object --stdin-paths < <list-of-paths>"

4808 +msgstr ""

4809 +

4810 +#: builtin/hash-object.c:72

4811 +msgid "type"

4812 +msgstr ""

4813 +

4814 +#: builtin/hash-object.c:72

4815 +#, fuzzy

4816 +msgid "object type"

4817 +msgstr "坏的对象类型。"

4818 +

4819 +#: builtin/hash-object.c:73

4820 +msgid "write the object into the object database"

4821 +msgstr ""

4822 +

4823 +#: builtin/hash-object.c:74

4824 +msgid "read the object from stdin"

4825 +msgstr ""

4826 +

4827 +#: builtin/hash-object.c:76

4828 +msgid "store file as is without filters"

4829 +msgstr ""

4830 +

4831 +#: builtin/hash-object.c:77

4832 +msgid "process file as it were from this path"

4833 +msgstr ""

4834 +

4835 +#: builtin/help.c:43

4836 +#, fuzzy

4837 +msgid "print all available commands"

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

4839 +

4840 +#: builtin/help.c:44

4841 +msgid "show man page"

4842 +msgstr ""

4843 +

4844 +#: builtin/help.c:45

4845 +msgid "show manual in web browser"

4846 +msgstr ""

4847 +

4848 +#: builtin/help.c:47

4849 +msgid "show info page"

4850 +msgstr ""

4851 +

4852 +#: builtin/help.c:53

4853 +msgid "git help [--all] [--man|--web|--info] [command]"

4854 +msgstr ""

4855 +

4856 #: builtin/help.c:65

4857 #, c-format

4858 msgid "unrecognized help format '%s'"

@@ -3310,6 +4967,11 @@ msgstr "无法打开包文件 '%s'"

4967 msgid "pack signature mismatch"

4968 msgstr "包签名不匹配"

4969

4970 +#: builtin/index-pack.c:294

4971 +#, c-format

4972 +msgid "pack version %<PRIu32> unsupported"

4973 +msgstr ""

4974 +

4975 #: builtin/index-pack.c:312

4976 #, c-format

4977 msgid "pack has bad object at offset %lu: %s"

@@ -3416,93 +5078,123 @@ msgstr "parse_pack_objects() 中遇到不可理喻的问题"

5078 msgid "Resolving deltas"

5079 msgstr "处理 delta 中"

5080

3419 -#: builtin/index-pack.c:1105

5081 +#: builtin/index-pack.c:1064

5082 +#, fuzzy, c-format

5083 +msgid "unable to create thread: %s"

5084 +msgstr "grep：无法创建线程：%s"

5085 +

5086 +#: builtin/index-pack.c:1106

5087 msgid "confusion beyond insanity"

5088 msgstr "不可理喻"

5089

3423 -#: builtin/index-pack.c:1124

5090 +#: builtin/index-pack.c:1112

5091 +#, c-format

5092 +msgid "completed with %d local objects"

5093 +msgstr ""

5094 +

5095 +#: builtin/index-pack.c:1121

5096 +#, c-format

5097 +msgid "Unexpected tail checksum for %s (disk corruption?)"

5098 +msgstr ""

5099 +

5100 +#: builtin/index-pack.c:1125

5101 #, c-format

5102 msgid "pack has %d unresolved delta"

5103 msgid_plural "pack has %d unresolved deltas"

5104 msgstr[0] "包有 %d 个未解决的 delta"

5105 msgstr[1] "包有 %d 个未解决的 delta"

5106

3430 -#: builtin/index-pack.c:1149

5107 +#: builtin/index-pack.c:1150

5108 #, c-format

5109 msgid "unable to deflate appended object (%d)"

5110 msgstr "不能缩小附加对象（%d）"

5111

3435 -#: builtin/index-pack.c:1228

5112 +#: builtin/index-pack.c:1229

5113 #, c-format

5114 msgid "local object %s is corrupt"

5115 msgstr "本地对象 %s 已损坏"

5116

3440 -#: builtin/index-pack.c:1252

5117 +#: builtin/index-pack.c:1253

5118 msgid "error while closing pack file"

5119 msgstr "关闭包文件时出错"

5120

3444 -#: builtin/index-pack.c:1265

5121 +#: builtin/index-pack.c:1266

5122 #, c-format

5123 msgid "cannot write keep file '%s'"

5124 msgstr "无法写保留文件 '%s'"

5125

3449 -#: builtin/index-pack.c:1273

5126 +#: builtin/index-pack.c:1274

5127 #, c-format

5128 msgid "cannot close written keep file '%s'"

5129 msgstr "无法关闭保留文件 '%s'"

5130

3454 -#: builtin/index-pack.c:1286

5131 +#: builtin/index-pack.c:1287

5132 msgid "cannot store pack file"

5133 msgstr "无法存储包文件"

5134

3458 -#: builtin/index-pack.c:1297

5135 +#: builtin/index-pack.c:1298

5136 msgid "cannot store index file"

5137 msgstr "无法存储索引文件"

5138

3462 -#: builtin/index-pack.c:1398

5139 +#: builtin/index-pack.c:1331

5140 +#, fuzzy, c-format

5141 +msgid "bad pack.indexversion=%<PRIu32>"

5142 +msgstr "坏的索引版本 '%s'"

5143 +

5144 +#: builtin/index-pack.c:1337

5145 +#, c-format

5146 +msgid "invalid number of threads specified (%d)"

5147 +msgstr ""

5148 +

5149 +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514

5150 +#, c-format

5151 +msgid "no threads support, ignoring %s"

5152 +msgstr ""

5153 +

5154 +#: builtin/index-pack.c:1399

5155 #, c-format

5156 msgid "Cannot open existing pack file '%s'"

5157 msgstr "无法打开现存包文件 '%s'"

5158

3467 -#: builtin/index-pack.c:1400

5159 +#: builtin/index-pack.c:1401

5160 #, c-format

5161 msgid "Cannot open existing pack idx file for '%s'"

5162 msgstr "无法为 %s 打开包索引文件"

5163

3472 -#: builtin/index-pack.c:1447

5164 +#: builtin/index-pack.c:1448

5165 #, c-format

5166 msgid "non delta: %d object"

5167 msgid_plural "non delta: %d objects"

5168 msgstr[0] "非 delta：%d 个对象"

5169 msgstr[1] "非 delta：%d 个对象"

5170

3479 -#: builtin/index-pack.c:1454

5171 +#: builtin/index-pack.c:1455

5172 #, c-format

5173 msgid "chain length = %d: %lu object"

5174 msgid_plural "chain length = %d: %lu objects"

5175 msgstr[0] "链长 = %d: %lu 对象"

5176 msgstr[1] "链长 = %d: %lu 对象"

5177

3486 -#: builtin/index-pack.c:1481

5178 +#: builtin/index-pack.c:1482

5179 msgid "Cannot come back to cwd"

5180 msgstr "无法返回当前工作目录"

5181

3490 -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528

3491 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544

5182 +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529

5183 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545

5184 #, c-format

5185 msgid "bad %s"

5186 msgstr "错误选项 %s"

5187

3496 -#: builtin/index-pack.c:1558

5188 +#: builtin/index-pack.c:1559

5189 msgid "--fix-thin cannot be used without --stdin"

5190 msgstr "--fix-thin 不能和 --stdin 同时使用"

5191

3500 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572

5192 +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573

5193 #, c-format

5194 msgid "packfile name '%s' does not end with '.pack'"

5195 msgstr "包名 '%s' 没有以 '.pack' 结尾"

5196

3505 -#: builtin/index-pack.c:1581

5197 +#: builtin/index-pack.c:1582

5198 msgid "--verify with no packfile name given"

5199 msgstr "--verify 没有提供包名参数"

5200

@@ -3623,6 +5315,25 @@ msgstr "共享"

5315 msgid "cannot tell cwd"

5316 msgstr "无法获知当前路径"

5317

5318 +#: builtin/init-db.c:467

5319 +msgid ""

5320 +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"

5321 +"[=<permissions>]] [directory]"

5322 +msgstr ""

5323 +

5324 +#: builtin/init-db.c:490

5325 +msgid "permissions"

5326 +msgstr ""

5327 +

5328 +#: builtin/init-db.c:491

5329 +msgid "specify that the git repository is to be shared amongst several users"

5330 +msgstr ""

5331 +

5332 +#: builtin/init-db.c:493 builtin/prune-packed.c:77

5333 +#, fuzzy

5334 +msgid "be quiet"

5335 +msgstr "更加安静"

5336 +

5337 #: builtin/init-db.c:522 builtin/init-db.c:529

5338 #, c-format

5339 msgid "cannot mkdir %s"

@@ -3651,6 +5362,29 @@ msgstr "不能访问当前工作目录"

5362 msgid "Cannot access work tree '%s'"

5363 msgstr "不能访问工作区 '%s'"

5364

5365 +#: builtin/log.c:37

5366 +#, fuzzy

5367 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5368 +msgstr "git apply [选项] [<补丁>...]"

5369 +

5370 +#: builtin/log.c:38

5371 +#, fuzzy

5372 +msgid " or: git show [options] <object>..."

5373 +msgstr "git apply [选项] [<补丁>...]"

5374 +

5375 +#: builtin/log.c:100

5376 +msgid "suppress diff output"

5377 +msgstr ""

5378 +

5379 +#: builtin/log.c:101

5380 +#, fuzzy

5381 +msgid "show source"

5382 +msgstr "坏的源"

5383 +

5384 +#: builtin/log.c:102

5385 +msgid "decorate options"

5386 +msgstr ""

5387 +

5388 #: builtin/log.c:189

5389 #, c-format

5390 msgid "Final output: %d %s\n"

@@ -3696,10 +5430,135 @@ msgstr "信封需要邮件地址格式"

5430 msgid "insane in-reply-to: %s"

5431 msgstr "不正常的 in-reply-to：%s"

5432

5433 +#: builtin/log.c:890

5434 +msgid "git format-patch [options] [<since> | <revision range>]"

5435 +msgstr ""

5436 +

5437 #: builtin/log.c:935

5438 msgid "Two output directories?"

5439 msgstr "两个输出目录？"

5440

5441 +#: builtin/log.c:1063

5442 +msgid "use [PATCH n/m] even with a single patch"

5443 +msgstr ""

5444 +

5445 +#: builtin/log.c:1066

5446 +msgid "use [PATCH] even with multiple patches"

5447 +msgstr ""

5448 +

5449 +#: builtin/log.c:1070

5450 +msgid "print patches to standard out"

5451 +msgstr ""

5452 +

5453 +#: builtin/log.c:1072

5454 +msgid "generate a cover letter"

5455 +msgstr ""

5456 +

5457 +#: builtin/log.c:1074

5458 +msgid "use simple number sequence for output file names"

5459 +msgstr ""

5460 +

5461 +#: builtin/log.c:1075

5462 +msgid "sfx"

5463 +msgstr ""

5464 +

5465 +#: builtin/log.c:1076

5466 +msgid "use <sfx> instead of '.patch'"

5467 +msgstr ""

5468 +

5469 +#: builtin/log.c:1078

5470 +msgid "start numbering patches at <n> instead of 1"

5471 +msgstr ""

5472 +

5473 +#: builtin/log.c:1080

5474 +msgid "Use [<prefix>] instead of [PATCH]"

5475 +msgstr ""

5476 +

5477 +#: builtin/log.c:1083

5478 +msgid "store resulting files in <dir>"

5479 +msgstr ""

5480 +

5481 +#: builtin/log.c:1086

5482 +msgid "don't strip/add [PATCH]"

5483 +msgstr ""

5484 +

5485 +#: builtin/log.c:1089

5486 +msgid "don't output binary diffs"

5487 +msgstr ""

5488 +

5489 +#: builtin/log.c:1091

5490 +msgid "don't include a patch matching a commit upstream"

5491 +msgstr ""

5492 +

5493 +#: builtin/log.c:1093

5494 +msgid "show patch format instead of default (patch + stat)"

5495 +msgstr ""

5496 +

5497 +#: builtin/log.c:1095

5498 +#, fuzzy

5499 +msgid "Messaging"

5500 +msgstr "合并："

5501 +

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

5503 +#: builtin/log.c:1096

5504 +#, fuzzy

5505 +msgid "header"

5506 +msgstr "领先 "

5507 +

5508 +#: builtin/log.c:1097

5509 +msgid "add email header"

5510 +msgstr ""

5511 +

5512 +#: builtin/log.c:1098 builtin/log.c:1100

5513 +msgid "email"

5514 +msgstr ""

5515 +

5516 +#: builtin/log.c:1098

5517 +msgid "add To: header"

5518 +msgstr ""

5519 +

5520 +#: builtin/log.c:1100

5521 +msgid "add Cc: header"

5522 +msgstr ""

5523 +

5524 +#: builtin/log.c:1102

5525 +msgid "message-id"

5526 +msgstr ""

5527 +

5528 +#: builtin/log.c:1103

5529 +msgid "make first mail a reply to <message-id>"

5530 +msgstr ""

5531 +

5532 +#: builtin/log.c:1104 builtin/log.c:1107

5533 +msgid "boundary"

5534 +msgstr ""

5535 +

5536 +#: builtin/log.c:1105

5537 +msgid "attach the patch"

5538 +msgstr ""

5539 +

5540 +#: builtin/log.c:1108

5541 +#, fuzzy

5542 +msgid "inline the patch"

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

5544 +

5545 +#: builtin/log.c:1112

5546 +msgid "enable message threading, styles: shallow, deep"

5547 +msgstr ""

5548 +

5549 +#: builtin/log.c:1114

5550 +msgid "signature"

5551 +msgstr ""

5552 +

5553 +#: builtin/log.c:1115

5554 +msgid "add a signature"

5555 +msgstr ""

5556 +

5557 +#: builtin/log.c:1117

5558 +#, fuzzy

5559 +msgid "don't print the patch filenames"

5560 +msgstr "无法打开补丁文件 %s"

5561 +

5562 #: builtin/log.c:1157

5563 #, c-format

5564 msgid "bogus committer info %s"

@@ -3738,6 +5597,10 @@ msgstr "不能创建目录 '%s'"

5597 msgid "Failed to create output files"

5598 msgstr "无法创建输出文件"

5599

5600 +#: builtin/log.c:1443

5601 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5602 +msgstr ""

5603 +

5604 #: builtin/log.c:1498

5605 #, c-format

5606 msgid ""

@@ -3749,6 +5612,154 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"

5612 msgid "Unknown commit %s"

5613 msgstr "未知提交 %s"

5614

5615 +#: builtin/ls-files.c:408

5616 +#, fuzzy

5617 +msgid "git ls-files [options] [<file>...]"

5618 +msgstr "git apply [选项] [<补丁>...]"

5619 +

5620 +#: builtin/ls-files.c:463

5621 +msgid "identify the file status with tags"

5622 +msgstr ""

5623 +

5624 +#: builtin/ls-files.c:465

5625 +msgid "use lowercase letters for 'assume unchanged' files"

5626 +msgstr ""

5627 +

5628 +#: builtin/ls-files.c:467

5629 +msgid "show cached files in the output (default)"

5630 +msgstr ""

5631 +

5632 +#: builtin/ls-files.c:469

5633 +#, fuzzy

5634 +msgid "show deleted files in the output"

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

5636 +

5637 +#: builtin/ls-files.c:471

5638 +msgid "show modified files in the output"

5639 +msgstr ""

5640 +

5641 +#: builtin/ls-files.c:473

5642 +msgid "show other files in the output"

5643 +msgstr ""

5644 +

5645 +#: builtin/ls-files.c:475

5646 +msgid "show ignored files in the output"

5647 +msgstr ""

5648 +

5649 +#: builtin/ls-files.c:478

5650 +msgid "show staged contents' object name in the output"

5651 +msgstr ""

5652 +

5653 +#: builtin/ls-files.c:480

5654 +msgid "show files on the filesystem that need to be removed"

5655 +msgstr ""

5656 +

5657 +#: builtin/ls-files.c:482

5658 +msgid "show 'other' directories' name only"

5659 +msgstr ""

5660 +

5661 +#: builtin/ls-files.c:485

5662 +#, fuzzy

5663 +msgid "don't show empty directories"

5664 +msgstr "两个输出目录？"

5665 +

5666 +#: builtin/ls-files.c:488

5667 +msgid "show unmerged files in the output"

5668 +msgstr ""

5669 +

5670 +#: builtin/ls-files.c:490

5671 +msgid "show resolve-undo information"

5672 +msgstr ""

5673 +

5674 +#: builtin/ls-files.c:492

5675 +#, fuzzy

5676 +msgid "skip files matching pattern"

5677 +msgstr "输出和模式匹配的行"

5678 +

5679 +#: builtin/ls-files.c:495

5680 +msgid "exclude patterns are read from <file>"

5681 +msgstr ""

5682 +

5683 +#: builtin/ls-files.c:498

5684 +msgid "read additional per-directory exclude patterns in <file>"

5685 +msgstr ""

5686 +

5687 +#: builtin/ls-files.c:500

5688 +msgid "add the standard git exclusions"

5689 +msgstr ""

5690 +

5691 +#: builtin/ls-files.c:503

5692 +msgid "make the output relative to the project top directory"

5693 +msgstr ""

5694 +

5695 +#: builtin/ls-files.c:506

5696 +msgid "if any <file> is not in the index, treat this as an error"

5697 +msgstr ""

5698 +

5699 +#: builtin/ls-files.c:507

5700 +msgid "tree-ish"

5701 +msgstr ""

5702 +

5703 +#: builtin/ls-files.c:508

5704 +msgid "pretend that paths removed since <tree-ish> are still present"

5705 +msgstr ""

5706 +

5707 +#: builtin/ls-files.c:510

5708 +msgid "show debugging data"

5709 +msgstr ""

5710 +

5711 +#: builtin/ls-tree.c:27

5712 +#, fuzzy

5713 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

5714 +msgstr "git apply [选项] [<补丁>...]"

5715 +

5716 +#: builtin/ls-tree.c:125

5717 +msgid "only show trees"

5718 +msgstr ""

5719 +

5720 +#: builtin/ls-tree.c:127

5721 +#, fuzzy

5722 +msgid "recurse into subtrees"

5723 +msgstr "变基到远程 %s"

5724 +

5725 +#: builtin/ls-tree.c:129

5726 +msgid "show trees when recursing"

5727 +msgstr ""

5728 +

5729 +#: builtin/ls-tree.c:132

5730 +msgid "terminate entries with NUL byte"

5731 +msgstr ""

5732 +

5733 +#: builtin/ls-tree.c:133

5734 +#, fuzzy

5735 +msgid "include object size"

5736 +msgstr "提供了无效对象 '%s'。"

5737 +

5738 +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137

5739 +msgid "list only filenames"

5740 +msgstr ""

5741 +

5742 +#: builtin/ls-tree.c:140

5743 +msgid "use full path names"

5744 +msgstr ""

5745 +

5746 +#: builtin/ls-tree.c:142

5747 +msgid "list entire tree; not just current directory (implies --full-name)"

5748 +msgstr ""

5749 +

5750 +#: builtin/merge.c:43

5751 +#, fuzzy

5752 +msgid "git merge [options] [<commit>...]"

5753 +msgstr "git apply [选项] [<补丁>...]"

5754 +

5755 +#: builtin/merge.c:44

5756 +msgid "git merge [options] <msg> HEAD <commit>"

5757 +msgstr ""

5758 +

5759 +#: builtin/merge.c:45

5760 +msgid "git merge --abort"

5761 +msgstr ""

5762 +

5763 #: builtin/merge.c:90

5764 msgid "switch `m' requires a value"

5765 msgstr "开关 `m' 需要一个值"

@@ -3768,6 +5779,71 @@ msgstr "可用的策略有："

5779 msgid "Available custom strategies are:"

5780 msgstr "可用的自定义策略有："

5781

5782 +#: builtin/merge.c:183

5783 +msgid "do not show a diffstat at the end of the merge"

5784 +msgstr ""

5785 +

5786 +#: builtin/merge.c:186

5787 +msgid "show a diffstat at the end of the merge"

5788 +msgstr ""

5789 +

5790 +#: builtin/merge.c:187

5791 +msgid "(synonym to --stat)"

5792 +msgstr ""

5793 +

5794 +#: builtin/merge.c:189

5795 +msgid "add (at most <n>) entries from shortlog to merge commit message"

5796 +msgstr ""

5797 +

5798 +#: builtin/merge.c:192

5799 +#, fuzzy

5800 +msgid "create a single commit instead of doing a merge"

5801 +msgstr "在合并过程中不能做部分提交。"

5802 +

5803 +#: builtin/merge.c:194

5804 +msgid "perform a commit if the merge succeeds (default)"

5805 +msgstr ""

5806 +

5807 +#: builtin/merge.c:196

5808 +#, fuzzy

5809 +msgid "edit message before committing"

5810 +msgstr "尚未暂存以备提交的变更："

5811 +

5812 +#: builtin/merge.c:198

5813 +#, fuzzy

5814 +msgid "allow fast-forward (default)"

5815 +msgstr "可快进"

5816 +

5817 +#: builtin/merge.c:200

5818 +msgid "abort if fast-forward is not possible"

5819 +msgstr ""

5820 +

5821 +#: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112

5822 +msgid "strategy"

5823 +msgstr ""

5824 +

5825 +#: builtin/merge.c:203

5826 +#, fuzzy

5827 +msgid "merge strategy to use"

5828 +msgstr "尝试合并策略 %s...\n"

5829 +

5830 +#: builtin/merge.c:204

5831 +msgid "option=value"

5832 +msgstr ""

5833 +

5834 +#: builtin/merge.c:205

5835 +msgid "option for selected merge strategy"

5836 +msgstr ""

5837 +

5838 +#: builtin/merge.c:207

5839 +msgid "merge commit message (for a non-fast-forward merge)"

5840 +msgstr ""

5841 +

5842 +#: builtin/merge.c:211

5843 +#, fuzzy

5844 +msgid "abort the current in-progress merge"

5845 +msgstr "无法保存当前索引状态"

5846 +

5847 #: builtin/merge.c:240

5848 msgid "could not run stash."

5849 msgstr "不能进行进度保存。"

@@ -3966,44 +6042,145 @@ msgstr "更新 %s..%s\n"

6042 msgid "Trying really trivial in-index merge...\n"

6043 msgstr "尝试非常小的索引内合并...\n"

6044

3969 -#: builtin/merge.c:1457

3970 -#, c-format

3971 -msgid "Nope.\n"

3972 -msgstr "无。\n"

6045 +#: builtin/merge.c:1457

6046 +#, c-format

6047 +msgid "Nope.\n"

6048 +msgstr "无。\n"

6049 +

6050 +#: builtin/merge.c:1489

6051 +msgid "Not possible to fast-forward, aborting."

6052 +msgstr "无法快进，终止。"

6053 +

6054 +#: builtin/merge.c:1512 builtin/merge.c:1591

6055 +#, c-format

6056 +msgid "Rewinding the tree to pristine...\n"

6057 +msgstr "将树回滚至原始状态...\n"

6058 +

6059 +#: builtin/merge.c:1516

6060 +#, c-format

6061 +msgid "Trying merge strategy %s...\n"

6062 +msgstr "尝试合并策略 %s...\n"

6063 +

6064 +#: builtin/merge.c:1582

6065 +#, c-format

6066 +msgid "No merge strategy handled the merge.\n"

6067 +msgstr "没有合并策略处理此合并。\n"

6068 +

6069 +#: builtin/merge.c:1584

6070 +#, c-format

6071 +msgid "Merge with strategy %s failed.\n"

6072 +msgstr "使用策略 %s 合并失败。\n"

6073 +

6074 +#: builtin/merge.c:1593

6075 +#, c-format

6076 +msgid "Using the %s to prepare resolving by hand.\n"

6077 +msgstr "使用 %s 以准备手工解决。\n"

6078 +

6079 +#: builtin/merge.c:1605

6080 +#, c-format

6081 +msgid "Automatic merge went well; stopped before committing as requested\n"

6082 +msgstr "自动合并进展顺利，按要求在提交前停止\n"

6083 +

6084 +#: builtin/merge-base.c:26

6085 +msgid "git merge-base [-a|--all] <commit> <commit>..."

6086 +msgstr ""

6087 +

6088 +#: builtin/merge-base.c:27

6089 +msgid "git merge-base [-a|--all] --octopus <commit>..."

6090 +msgstr ""

6091 +

6092 +#: builtin/merge-base.c:28

6093 +msgid "git merge-base --independent <commit>..."

6094 +msgstr ""

6095 +

6096 +#: builtin/merge-base.c:29

6097 +msgid "git merge-base --is-ancestor <commit> <commit>"

6098 +msgstr ""

6099 +

6100 +#: builtin/merge-base.c:98

6101 +#, fuzzy

6102 +msgid "output all common ancestors"

6103 +msgstr "发现 %u 个共同祖先："

6104 +

6105 +#: builtin/merge-base.c:99

6106 +msgid "find ancestors for a single n-way merge"

6107 +msgstr ""

6108 +

6109 +#: builtin/merge-base.c:100

6110 +msgid "list revs not reachable from others"

6111 +msgstr ""

6112 +

6113 +#: builtin/merge-base.c:102

6114 +msgid "is the first one ancestor of the other?"

6115 +msgstr ""

6116 +

6117 +#: builtin/merge-file.c:8

6118 +msgid ""

6119 +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "

6120 +"file2"

6121 +msgstr ""

6122 +

6123 +#: builtin/merge-file.c:33

6124 +msgid "send results to standard output"

6125 +msgstr ""

6126 +

6127 +#: builtin/merge-file.c:34

6128 +msgid "use a diff3 based merge"

6129 +msgstr ""

6130 +

6131 +#: builtin/merge-file.c:35

6132 +msgid "for conflicts, use our version"

6133 +msgstr ""

6134 +

6135 +#: builtin/merge-file.c:37

6136 +msgid "for conflicts, use their version"

6137 +msgstr ""

6138 +

6139 +#: builtin/merge-file.c:39

6140 +msgid "for conflicts, use a union version"

6141 +msgstr ""

6142 +

6143 +#: builtin/merge-file.c:42

6144 +msgid "for conflicts, use this marker size"

6145 +msgstr ""

6146 +

6147 +#: builtin/merge-file.c:43

6148 +msgid "do not warn about conflicts"

6149 +msgstr ""

6150 +

6151 +#: builtin/merge-file.c:45

6152 +msgid "set labels for file1/orig_file/file2"

6153 +msgstr ""

6154

3974 -#: builtin/merge.c:1489

3975 -msgid "Not possible to fast-forward, aborting."

3976 -msgstr "无法快进，终止。"

6155 +#: builtin/mktree.c:67

6156 +msgid "git mktree [-z] [--missing] [--batch]"

6157 +msgstr ""

6158

3978 -#: builtin/merge.c:1512 builtin/merge.c:1591

3979 -#, c-format

3980 -msgid "Rewinding the tree to pristine...\n"

3981 -msgstr "将树回滚至原始状态...\n"

6159 +#: builtin/mktree.c:153

6160 +msgid "input is NUL terminated"

6161 +msgstr ""

6162

3983 -#: builtin/merge.c:1516

3984 -#, c-format

3985 -msgid "Trying merge strategy %s...\n"

3986 -msgstr "尝试合并策略 %s...\n"

6163 +#: builtin/mktree.c:154 builtin/write-tree.c:24

6164 +#, fuzzy

6165 +msgid "allow missing objects"

6166 +msgstr "接收对象中"

6167

3988 -#: builtin/merge.c:1582

3989 -#, c-format

3990 -msgid "No merge strategy handled the merge.\n"

3991 -msgstr "没有合并策略处理此合并。\n"

6168 +#: builtin/mktree.c:155

6169 +msgid "allow creation of more than one tree"

6170 +msgstr ""

6171

3993 -#: builtin/merge.c:1584

3994 -#, c-format

3995 -msgid "Merge with strategy %s failed.\n"

3996 -msgstr "使用策略 %s 合并失败。\n"

6172 +#: builtin/mv.c:14

6173 +msgid "git mv [options] <source>... <destination>"

6174 +msgstr ""

6175

3998 -#: builtin/merge.c:1593

3999 -#, c-format

4000 -msgid "Using the %s to prepare resolving by hand.\n"

4001 -msgstr "使用 %s 以准备手工解决。\n"

6176 +#: builtin/mv.c:64

6177 +msgid "force move/rename even if target exists"

6178 +msgstr ""

6179

4003 -#: builtin/merge.c:1605

4004 -#, c-format

4005 -msgid "Automatic merge went well; stopped before committing as requested\n"

4006 -msgstr "自动合并进展顺利，按要求在提交前停止\n"

6180 +#: builtin/mv.c:65

6181 +#, fuzzy

6182 +msgid "skip move/rename errors"

6183 +msgstr "程序错误"

6184

6185 #: builtin/mv.c:108

6186 #, c-format

@@ -4067,6 +6244,151 @@ msgstr "重命名 %s 至 %s\n"

6244 msgid "renaming '%s' failed"

6245 msgstr "重命名 '%s' 失败"

6246

6247 +#: builtin/name-rev.c:175

6248 +#, fuzzy

6249 +msgid "git name-rev [options] <commit>..."

6250 +msgstr "git apply [选项] [<补丁>...]"

6251 +

6252 +#: builtin/name-rev.c:176

6253 +msgid "git name-rev [options] --all"

6254 +msgstr ""

6255 +

6256 +#: builtin/name-rev.c:177

6257 +msgid "git name-rev [options] --stdin"

6258 +msgstr ""

6259 +

6260 +#: builtin/name-rev.c:229

6261 +msgid "print only names (no SHA-1)"

6262 +msgstr ""

6263 +

6264 +#: builtin/name-rev.c:230

6265 +msgid "only use tags to name the commits"

6266 +msgstr ""

6267 +

6268 +#: builtin/name-rev.c:232

6269 +#, fuzzy

6270 +msgid "only use refs matching <pattern>"

6271 +msgstr "输出和模式匹配的行"

6272 +

6273 +#: builtin/name-rev.c:234

6274 +msgid "list all commits reachable from all refs"

6275 +msgstr ""

6276 +

6277 +#: builtin/name-rev.c:235

6278 +msgid "read from stdin"

6279 +msgstr ""

6280 +

6281 +#: builtin/name-rev.c:236

6282 +msgid "allow to print `undefined` names"

6283 +msgstr ""

6284 +

6285 +#: builtin/notes.c:23

6286 +msgid "git notes [--ref <notes_ref>] [list [<object>]]"

6287 +msgstr ""

6288 +

6289 +#: builtin/notes.c:24

6290 +msgid ""

6291 +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "

6292 +"<object>] [<object>]"

6293 +msgstr ""

6294 +

6295 +#: builtin/notes.c:25

6296 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

6297 +msgstr ""

6298 +

6299 +#: builtin/notes.c:26

6300 +msgid ""

6301 +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "

6302 +"<object>] [<object>]"

6303 +msgstr ""

6304 +

6305 +#: builtin/notes.c:27

6306 +msgid "git notes [--ref <notes_ref>] edit [<object>]"

6307 +msgstr ""

6308 +

6309 +#: builtin/notes.c:28

6310 +msgid "git notes [--ref <notes_ref>] show [<object>]"

6311 +msgstr ""

6312 +

6313 +#: builtin/notes.c:29

6314 +msgid ""

6315 +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"

6316 +msgstr ""

6317 +

6318 +#: builtin/notes.c:30

6319 +msgid "git notes merge --commit [-v | -q]"

6320 +msgstr ""

6321 +

6322 +#: builtin/notes.c:31

6323 +msgid "git notes merge --abort [-v | -q]"

6324 +msgstr ""

6325 +

6326 +#: builtin/notes.c:32

6327 +msgid "git notes [--ref <notes_ref>] remove [<object>...]"

6328 +msgstr ""

6329 +

6330 +#: builtin/notes.c:33

6331 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]"

6332 +msgstr ""

6333 +

6334 +#: builtin/notes.c:34

6335 +msgid "git notes [--ref <notes_ref>] get-ref"

6336 +msgstr ""

6337 +

6338 +#: builtin/notes.c:39

6339 +msgid "git notes [list [<object>]]"

6340 +msgstr ""

6341 +

6342 +#: builtin/notes.c:44

6343 +#, fuzzy

6344 +msgid "git notes add [<options>] [<object>]"

6345 +msgstr "git apply [选项] [<补丁>...]"

6346 +

6347 +#: builtin/notes.c:49

6348 +msgid "git notes copy [<options>] <from-object> <to-object>"

6349 +msgstr ""

6350 +

6351 +#: builtin/notes.c:50

6352 +msgid "git notes copy --stdin [<from-object> <to-object>]..."

6353 +msgstr ""

6354 +

6355 +#: builtin/notes.c:55

6356 +#, fuzzy

6357 +msgid "git notes append [<options>] [<object>]"

6358 +msgstr "git apply [选项] [<补丁>...]"

6359 +

6360 +#: builtin/notes.c:60

6361 +msgid "git notes edit [<object>]"

6362 +msgstr ""

6363 +

6364 +#: builtin/notes.c:65

6365 +msgid "git notes show [<object>]"

6366 +msgstr ""

6367 +

6368 +#: builtin/notes.c:70

6369 +msgid "git notes merge [<options>] <notes_ref>"

6370 +msgstr ""

6371 +

6372 +#: builtin/notes.c:71

6373 +msgid "git notes merge --commit [<options>]"

6374 +msgstr ""

6375 +

6376 +#: builtin/notes.c:72

6377 +msgid "git notes merge --abort [<options>]"

6378 +msgstr ""

6379 +

6380 +#: builtin/notes.c:77

6381 +msgid "git notes remove [<object>]"

6382 +msgstr ""

6383 +

6384 +#: builtin/notes.c:82

6385 +msgid "git notes prune [<options>]"

6386 +msgstr ""

6387 +

6388 +#: builtin/notes.c:87

6389 +msgid "git notes get-ref"

6390 +msgstr ""

6391 +

6392 #: builtin/notes.c:139

6393 #, c-format

6394 msgid "unable to start 'show' for object '%s'"

@@ -4174,6 +6496,37 @@ msgstr "参数太多"

6496 msgid "No note found for object %s."

6497 msgstr "未发现对象 %s 的注解。"

6498

6499 +#: builtin/notes.c:535 builtin/notes.c:692

6500 +#, fuzzy

6501 +msgid "note contents as a string"

6502 +msgstr "注解内容被留在文件 %s 中"

6503 +

6504 +#: builtin/notes.c:538 builtin/notes.c:695

6505 +#, fuzzy

6506 +msgid "note contents in a file"

6507 +msgstr "无法存储索引文件"

6508 +

6509 +#: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697

6510 +#: builtin/notes.c:700 builtin/tag.c:476

6511 +#, fuzzy

6512 +msgid "object"

6513 +msgstr "坏对象 %s"

6514 +

6515 +#: builtin/notes.c:541 builtin/notes.c:698

6516 +#, fuzzy

6517 +msgid "reuse and edit specified note object"

6518 +msgstr "不能写注解对象"

6519 +

6520 +#: builtin/notes.c:544 builtin/notes.c:701

6521 +#, fuzzy

6522 +msgid "reuse specified note object"

6523 +msgstr "不能写注解对象"

6524 +

6525 +#: builtin/notes.c:546 builtin/notes.c:614

6526 +#, fuzzy

6527 +msgid "replace existing notes"

6528 +msgstr "不能读取现存对象 %s"

6529 +

6530 #: builtin/notes.c:580

6531 #, c-format

6532 msgid ""

@@ -4186,6 +6539,15 @@ msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆

6539 msgid "Overwriting existing notes for object %s\n"

6540 msgstr "覆盖对象 %s 现存注解\n"

6541

6542 +#: builtin/notes.c:615

6543 +#, fuzzy

6544 +msgid "read objects from stdin"

6545 +msgstr "坏对象 %s"

6546 +

6547 +#: builtin/notes.c:617

6548 +msgid "load rewriting config for <command> (implies --stdin)"

6549 +msgstr ""

6550 +

6551 #: builtin/notes.c:635

6552 msgid "too few parameters"

6553 msgstr "参数太少"

@@ -4202,49 +6564,271 @@ msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆

6564 msgid "Missing notes on source object %s. Cannot copy."

6565 msgstr "源对象 %s 缺少注解。不能拷贝。"

6566

4205 -#: builtin/notes.c:717

4206 -#, c-format

4207 -msgid ""

4208 -"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

4209 -"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"

6567 +#: builtin/notes.c:717

6568 +#, c-format

6569 +msgid ""

6570 +"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

6571 +"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"

6572 +msgstr ""

6573 +"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"

6574 +"请换用 'git notes add -f -m/-F/-c/-C'。\n"

6575 +

6576 +#: builtin/notes.c:864

6577 +#, fuzzy

6578 +msgid "General options"

6579 +msgstr "无效选项：%s"

6580 +

6581 +#: builtin/notes.c:866

6582 +msgid "Merge options"

6583 +msgstr ""

6584 +

6585 +#: builtin/notes.c:868

6586 +msgid ""

6587 +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

6588 +"cat_sort_uniq)"

6589 +msgstr ""

6590 +

6591 +#: builtin/notes.c:870

6592 +msgid "Committing unmerged notes"

6593 +msgstr ""

6594 +

6595 +#: builtin/notes.c:872

6596 +msgid "finalize notes merge by committing unmerged notes"

6597 +msgstr ""

6598 +

6599 +#: builtin/notes.c:874

6600 +msgid "Aborting notes merge resolution"

6601 +msgstr ""

6602 +

6603 +#: builtin/notes.c:876

6604 +#, fuzzy

6605 +msgid "abort notes merge"

6606 +msgstr "path '%s'：无法合并"

6607 +

6608 +#: builtin/notes.c:971

6609 +#, c-format

6610 +msgid "Object %s has no note\n"

6611 +msgstr "对象 %s 没有注解\n"

6612 +

l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)