7aea43ff4e · matheusbsbs/matheus-bagliano

@@ -12,10 +12,10 @@ 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: 2015-04-03 08:13+0800\n"

16 -"PO-Revision-Date: 2015-04-03 08:35+0800\n"

15 +"POT-Creation-Date: 2015-06-27 19:17+0800\n"

16 +"PO-Revision-Date: 2015-07-05 23:12+0800\n"

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

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

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

19 "Language: zh_CN\n"

20 "MIME-Version: 1.0\n"

21 "Content-Type: text/plain; charset=UTF-8\n"

@@ -53,7 +53,7 @@ msgstr ""

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

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

55

56 -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

56 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

57 #, c-format

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

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

@@ -76,9 +76,9 @@ msgstr "为归档中每个路径名加上前缀"

76

77 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

78 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

79 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

79 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99

80 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

81 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151

81 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150

82 msgid "file"

83 msgstr "文件"

84

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

110 msgid "list supported archive formats"

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

112

113 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86

113 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

114 msgid "repo"

115 msgstr "版本库"

116

@@ -126,7 +126,7 @@ msgstr "命令"

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

127 msgstr "远程 git-upload-archive 命令的路径"

128

129 -#: attr.c:264

129 +#: attr.c:265

130 msgid ""

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

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

@@ -261,8 +261,8 @@ msgid "Repository lacks these prerequisite commits:"

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

262

263 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

264 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330

265 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

264 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

265 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

266 #: builtin/shortlog.c:158

267 msgid "revision walk setup failed"

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

@@ -509,16 +509,16 @@ msgstr ""

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

510 "%s"

511

512 -#: diff.c:2956

512 +#: diff.c:2997

513 #, c-format

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

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

516

517 -#: diff.c:3351

517 +#: diff.c:3393

518 msgid "--follow requires exactly one pathspec"

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

520

521 -#: diff.c:3514

521 +#: diff.c:3556

522 #, c-format

523 msgid ""

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

@@ -527,11 +527,19 @@ msgstr ""

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

528 "%s"

529

530 -#: diff.c:3528

530 +#: diff.c:3570

531 #, c-format

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

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

534

535 +#: dir.c:1852

536 +msgid "failed to get kernel name and information"

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

538 +

539 +#: dir.c:1945

540 +msgid "Untracked cache is disabled on this system."

541 +msgstr "缓存未跟踪文件在本系统被禁用"

542 +

543 #: gpg-interface.c:129 gpg-interface.c:200

544 msgid "could not run gpg."

545 msgstr "不能执行 gpg。"

@@ -578,11 +586,11 @@ msgstr "在 '%s' 下可用的 git 命令"

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

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

588

581 -#: help.c:230

582 -msgid "The most commonly used git commands are:"

583 -msgstr "最常用的 git 命令有："

589 +#: help.c:246

590 +msgid "These are common Git commands used in various situations:"

591 +msgstr "这些是各种场合常见的 Git 命令："

592

585 -#: help.c:289

593 +#: help.c:311

594 #, c-format

595 msgid ""

596 "'%s' appears to be a git command, but we were not\n"

@@ -591,11 +599,11 @@ msgstr ""

599 "'%s' 像是一个 git 命令，但却无法运行。\n"

600 "可能是 git-%s 受损？"

601

594 -#: help.c:346

602 +#: help.c:368

603 msgid "Uh oh. Your system reports no Git commands at all."

604 msgstr "唉呀，您的系统中未发现 Git 命令。"

605

598 -#: help.c:368

606 +#: help.c:390

607 #, c-format

608 msgid ""

609 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -604,17 +612,17 @@ msgstr ""

612 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"

613 "是 '%s'"

614

607 -#: help.c:373

615 +#: help.c:395

616 #, c-format

617 msgid "in %0.1f seconds automatically..."

618 msgstr "在 %0.1f 秒钟后自动运行..."

619

612 -#: help.c:380

620 +#: help.c:402

621 #, c-format

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

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

624

617 -#: help.c:384 help.c:444

625 +#: help.c:406 help.c:466

626 msgid ""

627 "\n"

628 "Did you mean this?"

@@ -628,16 +636,16 @@ msgstr[1] ""

636 "\n"

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

638

631 -#: help.c:440

639 +#: help.c:462

640 #, c-format

641 msgid "%s: %s - %s"

642 msgstr "%s：%s - %s"

643

636 -#: lockfile.c:283

644 +#: lockfile.c:345

645 msgid "BUG: reopen a lockfile that is still open"

646 msgstr "BUG: 重新打开一个仍打开着的锁文件"

647

640 -#: lockfile.c:285

648 +#: lockfile.c:347

649 msgid "BUG: reopen a lockfile that has been committed"

650 msgstr "BUG: 重新打开一个已提交的锁文件"

651

@@ -645,8 +653,8 @@ msgstr "BUG: 重新打开一个已提交的锁文件"

653 msgid "failed to read the cache"

654 msgstr "无法读取缓存"

655

648 -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580

649 -#: builtin/clone.c:662

656 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594

657 +#: builtin/clone.c:654

658 msgid "unable to write new index file"

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

660

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

672 msgid "error building trees"

673 msgstr "无法创建树"

674

667 -#: merge-recursive.c:688

675 +#: merge-recursive.c:687

676 #, c-format

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

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

679

672 -#: merge-recursive.c:699

680 +#: merge-recursive.c:698

681 #, c-format

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

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

684

677 -#: merge-recursive.c:713 merge-recursive.c:734

685 +#: merge-recursive.c:712 merge-recursive.c:733

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

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

688

681 -#: merge-recursive.c:724

689 +#: merge-recursive.c:723

690 #, c-format

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

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

693

686 -#: merge-recursive.c:764

694 +#: merge-recursive.c:763

695 #, c-format

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

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

698

691 -#: merge-recursive.c:766

699 +#: merge-recursive.c:765

700 #, c-format

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

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

703

696 -#: merge-recursive.c:789 builtin/clone.c:321

704 +#: merge-recursive.c:788 builtin/clone.c:313

705 #, c-format

706 msgid "failed to open '%s'"

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

708

701 -#: merge-recursive.c:797

709 +#: merge-recursive.c:796

710 #, c-format

711 msgid "failed to symlink '%s'"

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

713

706 -#: merge-recursive.c:800

714 +#: merge-recursive.c:799

715 #, c-format

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

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

718

711 -#: merge-recursive.c:938

719 +#: merge-recursive.c:937

720 msgid "Failed to execute internal merge"

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

722

715 -#: merge-recursive.c:942

723 +#: merge-recursive.c:941

724 #, c-format

725 msgid "Unable to add %s to database"

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

727

720 -#: merge-recursive.c:958

728 +#: merge-recursive.c:957

729 msgid "unsupported object type in the tree"

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

731

724 -#: merge-recursive.c:1033 merge-recursive.c:1047

732 +#: merge-recursive.c:1032 merge-recursive.c:1046

733 #, c-format

734 msgid ""

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

@@ -730,7 +738,7 @@ msgstr ""

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

739 "的版本被保留。"

740

733 -#: merge-recursive.c:1039 merge-recursive.c:1052

741 +#: merge-recursive.c:1038 merge-recursive.c:1051

742 #, c-format

743 msgid ""

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

@@ -739,20 +747,20 @@ msgstr ""

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

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

749

742 -#: merge-recursive.c:1093

750 +#: merge-recursive.c:1092

751 msgid "rename"

752 msgstr "重命名"

753

746 -#: merge-recursive.c:1093

754 +#: merge-recursive.c:1092

755 msgid "renamed"

756 msgstr "重命名"

757

750 -#: merge-recursive.c:1149

758 +#: merge-recursive.c:1148

759 #, c-format

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

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

762

755 -#: merge-recursive.c:1171

763 +#: merge-recursive.c:1170

764 #, c-format

765 msgid ""

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

@@ -761,144 +769,144 @@ msgstr ""

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

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

771

764 -#: merge-recursive.c:1176

772 +#: merge-recursive.c:1175

773 msgid " (left unresolved)"

774 msgstr "（留下未解决）"

775

768 -#: merge-recursive.c:1230

776 +#: merge-recursive.c:1229

777 #, c-format

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

779 msgstr ""

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

781 "%5$s"

782

775 -#: merge-recursive.c:1260

783 +#: merge-recursive.c:1259

784 #, c-format

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

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

787

780 -#: merge-recursive.c:1459

788 +#: merge-recursive.c:1458

789 #, c-format

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

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

792

785 -#: merge-recursive.c:1469

793 +#: merge-recursive.c:1468

794 #, c-format

795 msgid "Adding merged %s"

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

797

790 -#: merge-recursive.c:1474 merge-recursive.c:1672

798 +#: merge-recursive.c:1473 merge-recursive.c:1671

799 #, c-format

800 msgid "Adding as %s instead"

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

802

795 -#: merge-recursive.c:1525

803 +#: merge-recursive.c:1524

804 #, c-format

805 msgid "cannot read object %s"

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

807

800 -#: merge-recursive.c:1528

808 +#: merge-recursive.c:1527

809 #, c-format

810 msgid "object %s is not a blob"

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

812

805 -#: merge-recursive.c:1576

813 +#: merge-recursive.c:1575

814 msgid "modify"

815 msgstr "修改"

816

809 -#: merge-recursive.c:1576

817 +#: merge-recursive.c:1575

818 msgid "modified"

819 msgstr "修改"

820

813 -#: merge-recursive.c:1586

821 +#: merge-recursive.c:1585

822 msgid "content"

823 msgstr "内容"

824

817 -#: merge-recursive.c:1593

825 +#: merge-recursive.c:1592

826 msgid "add/add"

827 msgstr "添加/添加"

828

821 -#: merge-recursive.c:1627

829 +#: merge-recursive.c:1626

830 #, c-format

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

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

833

826 -#: merge-recursive.c:1641

834 +#: merge-recursive.c:1640

835 #, c-format

836 msgid "Auto-merging %s"

837 msgstr "自动合并 %s"

838

831 -#: merge-recursive.c:1645 git-submodule.sh:1150

839 +#: merge-recursive.c:1644 git-submodule.sh:1150

840 msgid "submodule"

841 msgstr "子模组"

842

835 -#: merge-recursive.c:1646

843 +#: merge-recursive.c:1645

844 #, c-format

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

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

847

840 -#: merge-recursive.c:1732

848 +#: merge-recursive.c:1731

849 #, c-format

850 msgid "Removing %s"

851 msgstr "删除 %s"

852

845 -#: merge-recursive.c:1757

853 +#: merge-recursive.c:1756

854 msgid "file/directory"

855 msgstr "文件/目录"

856

849 -#: merge-recursive.c:1763

857 +#: merge-recursive.c:1762

858 msgid "directory/file"

859 msgstr "目录/文件"

860

853 -#: merge-recursive.c:1768

861 +#: merge-recursive.c:1767

862 #, c-format

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

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

865

858 -#: merge-recursive.c:1778

866 +#: merge-recursive.c:1777

867 #, c-format

868 msgid "Adding %s"

869 msgstr "添加 %s"

870

863 -#: merge-recursive.c:1795

871 +#: merge-recursive.c:1794

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

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

874

867 -#: merge-recursive.c:1814

875 +#: merge-recursive.c:1813

876 msgid "Already up-to-date!"

877 msgstr "已经是最新的！"

878

871 -#: merge-recursive.c:1823

879 +#: merge-recursive.c:1822

880 #, c-format

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

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

883

876 -#: merge-recursive.c:1853

884 +#: merge-recursive.c:1852

885 #, c-format

886 msgid "Unprocessed path??? %s"

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

888

881 -#: merge-recursive.c:1901

889 +#: merge-recursive.c:1900

890 msgid "Merging:"

891 msgstr "合并："

892

885 -#: merge-recursive.c:1914

893 +#: merge-recursive.c:1913

894 #, c-format

895 msgid "found %u common ancestor:"

896 msgid_plural "found %u common ancestors:"

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

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

899

892 -#: merge-recursive.c:1951

900 +#: merge-recursive.c:1950

901 msgid "merge returned no commit"

902 msgstr "合并未返回提交"

903

896 -#: merge-recursive.c:2008

904 +#: merge-recursive.c:2007

905 #, c-format

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

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

908

901 -#: merge-recursive.c:2019 builtin/merge.c:667

909 +#: merge-recursive.c:2018 builtin/merge.c:645

910 msgid "Unable to write index."

911 msgstr "不能写入索引。"

912

@@ -923,7 +931,7 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

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

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

933

926 -#: object.c:241

934 +#: object.c:242

935 #, c-format

936 msgid "unable to parse object: %s"

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

@@ -1020,11 +1028,11 @@ msgstr ""

1028 msgid "unable to parse --pretty format"

1029 msgstr "不能解析 --pretty 格式"

1030

1023 -#: progress.c:225

1031 +#: progress.c:236

1032 msgid "done"

1033 msgstr "完成"

1034

1027 -#: read-cache.c:1275

1035 +#: read-cache.c:1295

1036 #, c-format

1037 msgid ""

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

@@ -1033,7 +1041,7 @@ msgstr ""

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

1042 "使用版本 %i"

1043

1036 -#: read-cache.c:1285

1044 +#: read-cache.c:1305

1045 #, c-format

1046 msgid ""

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

@@ -1042,51 +1050,93 @@ msgstr ""

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

1051 "使用版本 %i"

1052

1045 -#: remote.c:782

1053 +#: remote.c:792

1054 #, c-format

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

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

1057

1050 -#: remote.c:786

1058 +#: remote.c:796

1059 #, c-format

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

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

1062

1055 -#: remote.c:790

1063 +#: remote.c:800

1064 #, c-format

1065 msgid "%s tracks both %s and %s"

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

1067

1060 -#: remote.c:798

1068 +#: remote.c:808

1069 msgid "Internal error"

1070 msgstr "内部错误"

1071

1064 -#: remote.c:1980

1072 +#: remote.c:1723 remote.c:1766

1073 +msgid "HEAD does not point to a branch"

1074 +msgstr "HEAD 没有指向一个分支"

1075 +

1076 +#: remote.c:1732

1077 +#, c-format

1078 +msgid "no such branch: '%s'"

1079 +msgstr "没有此分支：'%s'"

1080 +

1081 +#: remote.c:1735

1082 +#, c-format

1083 +msgid "no upstream configured for branch '%s'"

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

1085 +

1086 +#: remote.c:1741

1087 +#, c-format

1088 +msgid "upstream branch '%s' not stored as a remote-tracking branch"

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

1090 +

1091 +#: remote.c:1756

1092 +#, c-format

1093 +msgid "push destination '%s' on remote '%s' has no local tracking branch"

1094 +msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

1095 +

1096 +#: remote.c:1771

1097 +#, c-format

1098 +msgid "branch '%s' has no remote for pushing"

1099 +msgstr "分支 '%s' 没有设置要推送的远程服务器"

1100 +

1101 +#: remote.c:1782

1102 +#, c-format

1103 +msgid "push refspecs for '%s' do not include '%s'"

1104 +msgstr "向 '%s' 推送引用表达式未包含 '%s'"

1105 +

1106 +#: remote.c:1795

1107 +msgid "push has no destination (push.default is 'nothing')"

1108 +msgstr "推送无目标（push.default 是 'nothing'）"

1109 +

1110 +#: remote.c:1817

1111 +msgid "cannot resolve 'simple' push to a single destination"

1112 +msgstr "无法解析 'simple' 推送至一个单独的目标"

1113 +

1114 +#: remote.c:2124

1115 #, c-format

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

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

1118

1069 -#: remote.c:1984

1119 +#: remote.c:2128

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

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

1122

1073 -#: remote.c:1987

1123 +#: remote.c:2131

1124 #, c-format

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

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

1127

1078 -#: remote.c:1991

1128 +#: remote.c:2135

1129 #, c-format

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

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

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

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

1134

1085 -#: remote.c:1997

1135 +#: remote.c:2141

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

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

1138

1089 -#: remote.c:2000

1139 +#: remote.c:2144

1140 #, c-format

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

1142 msgid_plural ""

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

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

1146

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

1098 -#: remote.c:2008

1148 +#: remote.c:2152

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

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

1151

1102 -#: remote.c:2011

1152 +#: remote.c:2155

1153 #, c-format

1154 msgid ""

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

@@ -1115,11 +1165,11 @@ msgstr[1] ""

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

1166

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

1118 -#: remote.c:2021

1168 +#: remote.c:2165

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

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

1171

1122 -#: revision.c:2348

1172 +#: revision.c:2366

1173 msgid "--first-parent is incompatible with --bisect"

1174 msgstr "--first-parent 与 --bisect 不兼容"

1175

@@ -1136,22 +1186,22 @@ msgstr "不能调用 dup2(%d,%d)"

1186 msgid "failed to sign the push certificate"

1187 msgstr "无法为推送证书签名"

1188

1139 -#: send-pack.c:356

1189 +#: send-pack.c:378

1190 msgid "the receiving end does not support --signed push"

1191 msgstr "接收端不支持签名推送"

1192

1143 -#: send-pack.c:366

1193 +#: send-pack.c:389

1194 msgid "the receiving end does not support --atomic push"

1195 msgstr "接收端不支持原子推送"

1196

1147 -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1148 -#: builtin/merge.c:1005

1197 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1198 +#: builtin/merge.c:983

1199 #, c-format

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

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

1202

1153 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1154 -#: builtin/merge.c:1010

1203 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1204 +#: builtin/merge.c:988

1205 #, c-format

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

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

@@ -1348,7 +1398,7 @@ msgstr "不能解析 HEAD"

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

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

1400

1351 -#: sequencer.c:908 builtin/apply.c:4288

1401 +#: sequencer.c:908 builtin/apply.c:4291

1402 #, c-format

1403 msgid "cannot open %s: %s"

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

@@ -1390,7 +1440,12 @@ msgstr "不能作为初始提交还原"

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

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

1442

1393 -#: sha1_name.c:440

1443 +#: setup.c:243

1444 +#, c-format

1445 +msgid "failed to read %s"

1446 +msgstr "无法读取 %s"

1447 +

1448 +#: sha1_name.c:453

1449 msgid ""

1450 "Git normally never creates a ref that ends with 40 hex characters\n"

1451 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1411,25 +1466,6 @@ msgstr ""

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

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

1468

1414 -#: sha1_name.c:1068

1415 -msgid "HEAD does not point to a branch"

1416 -msgstr "HEAD 没有指向一个分支"

1417 -

1418 -#: sha1_name.c:1071

1419 -#, c-format

1420 -msgid "No such branch: '%s'"

1421 -msgstr "没有此分支：'%s'"

1422 -

1423 -#: sha1_name.c:1073

1424 -#, c-format

1425 -msgid "No upstream configured for branch '%s'"

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

1427 -

1428 -#: sha1_name.c:1077

1429 -#, c-format

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

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

1432 -

1469 #: submodule.c:64 submodule.c:98

1470 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1471 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"

@@ -1453,12 +1489,7 @@ msgstr "无法移除 %s 的 .gitmodules 条目"

1489 msgid "staging updated .gitmodules failed"

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

1491

1456 -#: submodule.c:1109 builtin/init-db.c:371

1457 -#, c-format

1458 -msgid "Could not create git link %s"

1459 -msgstr "不能创建 git link %s"

1460 -

1461 -#: submodule.c:1120

1492 +#: submodule.c:1115

1493 #, c-format

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

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

@@ -1488,7 +1519,7 @@ msgstr "不能读取输入文件 '%s'"

1519 msgid "could not read from stdin"

1520 msgstr "不能自标准输入读取"

1521

1491 -#: unpack-trees.c:202

1522 +#: unpack-trees.c:203

1523 msgid "Checking out files"

1524 msgstr "正在检出文件"

1525

@@ -1544,6 +1575,21 @@ msgstr "无此用户"

1575 msgid "unable to get current working directory"

1576 msgstr "不能获取当前工作目录"

1577

1578 +#: wrapper.c:575

1579 +#, c-format

1580 +msgid "could not open %s for writing"

1581 +msgstr "不能写入 %s"

1582 +

1583 +#: wrapper.c:587

1584 +#, c-format

1585 +msgid "could not write to %s"

1586 +msgstr "不能写入 %s"

1587 +

1588 +#: wrapper.c:593

1589 +#, c-format

1590 +msgid "could not close %s"

1591 +msgstr "不能关闭 %s"

1592 +

1593 #: wt-status.c:150

1594 msgid "Unmerged paths:"

1595 msgstr "未合并的路径："

@@ -1574,11 +1620,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"

1620 msgid " (use \"git rm <file>...\" to mark resolution)"

1621 msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"

1622

1577 -#: wt-status.c:198 wt-status.c:878

1623 +#: wt-status.c:198 wt-status.c:881

1624 msgid "Changes to be committed:"

1625 msgstr "要提交的变更："

1626

1581 -#: wt-status.c:216 wt-status.c:887

1627 +#: wt-status.c:216 wt-status.c:890

1628 msgid "Changes not staged for commit:"

1629 msgstr "尚未暂存以备提交的变更："

1630

@@ -1694,15 +1740,15 @@ msgstr "未跟踪的内容, "

1740 msgid "bug: unhandled diff status %c"

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

1742

1697 -#: wt-status.c:753

1743 +#: wt-status.c:755

1744 msgid "Submodules changed but not updated:"

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

1746

1701 -#: wt-status.c:755

1747 +#: wt-status.c:757

1748 msgid "Submodule changes to be committed:"

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

1750

1705 -#: wt-status.c:835

1751 +#: wt-status.c:838

1752 msgid ""

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

1754 "Everything below will be removed."

@@ -1710,198 +1756,198 @@ msgstr ""

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

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

1758

1713 -#: wt-status.c:946

1759 +#: wt-status.c:949

1760 msgid "You have unmerged paths."

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

1762

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

1718 -#: wt-status.c:949

1764 +#: wt-status.c:952

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

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

1767

1722 -#: wt-status.c:952

1768 +#: wt-status.c:955

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

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

1771

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

1727 -#: wt-status.c:955

1773 +#: wt-status.c:958

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

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

1776

1731 -#: wt-status.c:965

1777 +#: wt-status.c:968

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

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

1780

1735 -#: wt-status.c:968

1781 +#: wt-status.c:971

1782 msgid "The current patch is empty."

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

1784

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

1740 -#: wt-status.c:972

1786 +#: wt-status.c:975

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

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

1789

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

1745 -#: wt-status.c:974

1791 +#: wt-status.c:977

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

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

1794

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

1750 -#: wt-status.c:976

1796 +#: wt-status.c:979

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

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

1799

1754 -#: wt-status.c:1036 wt-status.c:1053

1800 +#: wt-status.c:1039 wt-status.c:1056

1801 #, c-format

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

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

1804

1759 -#: wt-status.c:1041 wt-status.c:1058

1805 +#: wt-status.c:1044 wt-status.c:1061

1806 msgid "You are currently rebasing."

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

1808

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

1764 -#: wt-status.c:1044

1810 +#: wt-status.c:1047

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

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

1813

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

1769 -#: wt-status.c:1046

1815 +#: wt-status.c:1049

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

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

1818

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

1774 -#: wt-status.c:1048

1820 +#: wt-status.c:1051

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

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

1823

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

1779 -#: wt-status.c:1061

1825 +#: wt-status.c:1064

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

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

1828

1783 -#: wt-status.c:1065

1829 +#: wt-status.c:1068

1830 #, c-format

1831 msgid ""

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

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

1834

1789 -#: wt-status.c:1070

1835 +#: wt-status.c:1073

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

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

1838

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

1794 -#: wt-status.c:1073

1840 +#: wt-status.c:1076

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

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

1843

1798 -#: wt-status.c:1077

1844 +#: wt-status.c:1080

1845 #, c-format

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

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

1848

1803 -#: wt-status.c:1082

1849 +#: wt-status.c:1085

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

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

1852

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

1808 -#: wt-status.c:1085

1854 +#: wt-status.c:1088

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

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

1857

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

1813 -#: wt-status.c:1087

1859 +#: wt-status.c:1090

1860 msgid ""

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

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

1863

1818 -#: wt-status.c:1097

1864 +#: wt-status.c:1100

1865 #, c-format

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

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

1868

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

1824 -#: wt-status.c:1102

1870 +#: wt-status.c:1105

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

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

1873

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

1829 -#: wt-status.c:1105

1875 +#: wt-status.c:1108

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

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

1878

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

1834 -#: wt-status.c:1107

1880 +#: wt-status.c:1110

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

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

1883

1838 -#: wt-status.c:1116

1884 +#: wt-status.c:1119

1885 #, c-format

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

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

1888

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

1844 -#: wt-status.c:1121

1890 +#: wt-status.c:1124

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

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

1893

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

1849 -#: wt-status.c:1124

1895 +#: wt-status.c:1127

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

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

1898

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

1854 -#: wt-status.c:1126

1900 +#: wt-status.c:1129

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

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

1903

1858 -#: wt-status.c:1137

1904 +#: wt-status.c:1140

1905 #, c-format

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

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

1908

1863 -#: wt-status.c:1141

1909 +#: wt-status.c:1144

1910 msgid "You are currently bisecting."

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

1912

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

1868 -#: wt-status.c:1144

1914 +#: wt-status.c:1147

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

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

1917

1872 -#: wt-status.c:1321

1918 +#: wt-status.c:1324

1919 msgid "On branch "

1920 msgstr "位于分支 "

1921

1876 -#: wt-status.c:1328

1922 +#: wt-status.c:1331

1923 msgid "rebase in progress; onto "

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

1925

1880 -#: wt-status.c:1333

1926 +#: wt-status.c:1336

1927 msgid "HEAD detached at "

1928 msgstr "头指针分离于 "

1929

1884 -#: wt-status.c:1335

1930 +#: wt-status.c:1338

1931 msgid "HEAD detached from "

1932 msgstr "头指针分离自 "

1933

1888 -#: wt-status.c:1338

1934 +#: wt-status.c:1341

1935 msgid "Not currently on any branch."

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

1937

1892 -#: wt-status.c:1355

1938 +#: wt-status.c:1358

1939 msgid "Initial commit"

1940 msgstr "初始提交"

1941

1896 -#: wt-status.c:1369

1942 +#: wt-status.c:1372

1943 msgid "Untracked files"

1944 msgstr "未跟踪的文件"

1945

1900 -#: wt-status.c:1371

1946 +#: wt-status.c:1374

1947 msgid "Ignored files"

1948 msgstr "忽略的文件"

1949

1904 -#: wt-status.c:1375

1950 +#: wt-status.c:1378

1951 #, c-format

1952 msgid ""

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

@@ -1911,84 +1957,84 @@ msgstr ""

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

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

1959

1914 -#: wt-status.c:1381

1960 +#: wt-status.c:1384

1961 #, c-format

1962 msgid "Untracked files not listed%s"

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

1964

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

1920 -#: wt-status.c:1383

1966 +#: wt-status.c:1386

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

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

1969

1924 -#: wt-status.c:1389

1970 +#: wt-status.c:1392

1971 msgid "No changes"

1972 msgstr "没有修改"

1973

1928 -#: wt-status.c:1394

1974 +#: wt-status.c:1397

1975 #, c-format

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

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

1978

1933 -#: wt-status.c:1397

1979 +#: wt-status.c:1400

1980 #, c-format

1981 msgid "no changes added to commit\n"

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

1983

1938 -#: wt-status.c:1400

1984 +#: wt-status.c:1403

1985 #, c-format

1986 msgid ""

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

1988 "track)\n"

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

1990

1945 -#: wt-status.c:1403

1991 +#: wt-status.c:1406

1992 #, c-format

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

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

1995

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

1951 -#: wt-status.c:1406

1997 +#: wt-status.c:1409

1998 #, c-format

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

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

2001

1956 -#: wt-status.c:1409 wt-status.c:1414

2002 +#: wt-status.c:1412 wt-status.c:1417

2003 #, c-format

2004 msgid "nothing to commit\n"

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

2006

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

1962 -#: wt-status.c:1412

2008 +#: wt-status.c:1415

2009 #, c-format

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

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

2012

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

1968 -#: wt-status.c:1416

2014 +#: wt-status.c:1419

2015 #, c-format

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

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

2018

1973 -#: wt-status.c:1525

2019 +#: wt-status.c:1528

2020 msgid "HEAD (no branch)"

2021 msgstr "HEAD（非分支）"

2022

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

1978 -#: wt-status.c:1531

2024 +#: wt-status.c:1534

2025 msgid "Initial commit on "

2026 msgstr "初始提交于 "

2027

1982 -#: wt-status.c:1563

2028 +#: wt-status.c:1561

2029 msgid "gone"

2030 msgstr "丢失"

2031

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

1987 -#: wt-status.c:1565 wt-status.c:1573

2033 +#: wt-status.c:1563 wt-status.c:1571

2034 msgid "behind "

2035 msgstr "落后 "

2036

1991 -#: compat/precompose_utf8.c:55 builtin/clone.c:360

2037 +#: compat/precompose_utf8.c:55 builtin/clone.c:352

2038 #, c-format

2039 msgid "failed to unlink '%s'"

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

@@ -2015,7 +2061,7 @@ msgstr "删除 '%s'\n"

2061 msgid "Unstaged changes after refreshing the index:"

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

2063

2018 -#: builtin/add.c:194 builtin/rev-parse.c:785

2064 +#: builtin/add.c:194 builtin/rev-parse.c:796

2065 msgid "Could not read the index"

2066 msgstr "不能读取索引"

2067

@@ -2028,113 +2074,117 @@ msgstr "不能打开 '%s' 以写入。"

2074 msgid "Could not write patch"

2075 msgstr "不能生成补丁"

2076

2031 -#: builtin/add.c:214

2077 +#: builtin/add.c:212

2078 +msgid "editing patch failed"

2079 +msgstr "编辑补丁失败"

2080 +

2081 +#: builtin/add.c:215

2082 #, c-format

2083 msgid "Could not stat '%s'"

2084 msgstr "不能查看文件状态 '%s'"

2085

2036 -#: builtin/add.c:216

2086 +#: builtin/add.c:217

2087 msgid "Empty patch. Aborted."

2088 msgstr "空补丁。异常终止。"

2089

2040 -#: builtin/add.c:221

2090 +#: builtin/add.c:222

2091 #, c-format

2092 msgid "Could not apply '%s'"

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

2094

2045 -#: builtin/add.c:231

2095 +#: builtin/add.c:232

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

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

2098

2049 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110

2050 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372

2051 -#: builtin/rm.c:269

2099 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

2100 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369

2101 +#: builtin/rm.c:268

2102 msgid "dry run"

2103 msgstr "演习"

2104

2055 -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19

2056 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608

2105 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2106 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616

2107 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2108 msgid "be verbose"

2109 msgstr "冗长输出"

2110

2061 -#: builtin/add.c:251

2111 +#: builtin/add.c:252

2112 msgid "interactive picking"

2113 msgstr "交互式拣选"

2114

2065 -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

2115 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286

2116 msgid "select hunks interactively"

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

2118

2069 -#: builtin/add.c:253

2119 +#: builtin/add.c:254

2120 msgid "edit current diff and apply"

2121 msgstr "编辑当前差异并应用"

2122

2073 -#: builtin/add.c:254

2123 +#: builtin/add.c:255

2124 msgid "allow adding otherwise ignored files"

2125 msgstr "允许添加忽略的文件"

2126

2077 -#: builtin/add.c:255

2127 +#: builtin/add.c:256

2128 msgid "update tracked files"

2129 msgstr "更新已跟踪的文件"

2130

2081 -#: builtin/add.c:256

2131 +#: builtin/add.c:257

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

2133 msgstr "只记录，该路径稍后再添加"

2134

2085 -#: builtin/add.c:257

2135 +#: builtin/add.c:258

2136 msgid "add changes from all tracked and untracked files"

2137 msgstr "添加所有改变的已跟踪文件和未跟踪文件"

2138

2089 -#: builtin/add.c:260

2139 +#: builtin/add.c:261

2140 msgid "ignore paths removed in the working tree (same as --no-all)"

2141 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"

2142

2093 -#: builtin/add.c:262

2143 +#: builtin/add.c:263

2144 msgid "don't add, only refresh the index"

2145 msgstr "不添加，只刷新索引"

2146

2097 -#: builtin/add.c:263

2147 +#: builtin/add.c:264

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

2149 msgstr "跳过因出错不能添加的文件"

2150

2101 -#: builtin/add.c:264

2151 +#: builtin/add.c:265

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

2153 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"

2154

2105 -#: builtin/add.c:286

2155 +#: builtin/add.c:287

2156 #, c-format

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

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

2159

2110 -#: builtin/add.c:293

2160 +#: builtin/add.c:294

2161 msgid "adding files failed"

2162 msgstr "添加文件失败"

2163

2114 -#: builtin/add.c:329

2164 +#: builtin/add.c:330

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

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

2167

2118 -#: builtin/add.c:336

2168 +#: builtin/add.c:337

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

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

2171

2122 -#: builtin/add.c:357

2172 +#: builtin/add.c:358

2173 #, c-format

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

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

2176

2127 -#: builtin/add.c:358

2177 +#: builtin/add.c:359

2178 #, c-format

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

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

2181

2132 -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920

2133 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2182 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918

2183 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2184 msgid "index file corrupt"

2185 msgstr "索引文件损坏"

2186

2137 -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431

2187 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2188 msgid "Unable to write new index file"

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

2190

@@ -2208,77 +2258,77 @@ msgid_plural ""

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

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

2260

2211 -#: builtin/apply.c:1656

2261 +#: builtin/apply.c:1659

2262 msgid "new file depends on old contents"

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

2264

2215 -#: builtin/apply.c:1658

2265 +#: builtin/apply.c:1661

2266 msgid "deleted file still has contents"

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

2268

2219 -#: builtin/apply.c:1684

2269 +#: builtin/apply.c:1687

2270 #, c-format

2271 msgid "corrupt patch at line %d"

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

2273

2224 -#: builtin/apply.c:1720

2274 +#: builtin/apply.c:1723

2275 #, c-format

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

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

2278

2229 -#: builtin/apply.c:1722

2279 +#: builtin/apply.c:1725

2280 #, c-format

2281 msgid "deleted file %s still has contents"

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

2283

2234 -#: builtin/apply.c:1725

2284 +#: builtin/apply.c:1728

2285 #, c-format

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

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

2288

2239 -#: builtin/apply.c:1871

2289 +#: builtin/apply.c:1874

2290 #, c-format

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

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

2293

2244 -#: builtin/apply.c:1900

2294 +#: builtin/apply.c:1903

2295 #, c-format

2296 msgid "unrecognized binary patch at line %d"

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

2298

2249 -#: builtin/apply.c:2051

2299 +#: builtin/apply.c:2054

2300 #, c-format

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

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

2303

2254 -#: builtin/apply.c:2141

2304 +#: builtin/apply.c:2144

2305 #, c-format

2306 msgid "unable to read symlink %s"

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

2308

2259 -#: builtin/apply.c:2145

2309 +#: builtin/apply.c:2148

2310 #, c-format

2311 msgid "unable to open or read %s"

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

2313

2264 -#: builtin/apply.c:2778

2314 +#: builtin/apply.c:2781

2315 #, c-format

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

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

2318

2269 -#: builtin/apply.c:2897

2319 +#: builtin/apply.c:2900

2320 #, c-format

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

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

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

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

2325

2276 -#: builtin/apply.c:2909

2326 +#: builtin/apply.c:2912

2327 #, c-format

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

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

2330

2281 -#: builtin/apply.c:2915

2331 +#: builtin/apply.c:2918

2332 #, c-format

2333 msgid ""

2334 "while searching for:\n"

@@ -2287,336 +2337,336 @@ msgstr ""

2337 "当查询：\n"

2338 "%.*s"

2339

2290 -#: builtin/apply.c:2935

2340 +#: builtin/apply.c:2938

2341 #, c-format

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

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

2344

2295 -#: builtin/apply.c:3036

2345 +#: builtin/apply.c:3039

2346 #, c-format

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

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

2349

2300 -#: builtin/apply.c:3042

2350 +#: builtin/apply.c:3045

2351 #, c-format

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

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

2354

2305 -#: builtin/apply.c:3063

2355 +#: builtin/apply.c:3066

2356 #, c-format

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

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

2359

2310 -#: builtin/apply.c:3187

2360 +#: builtin/apply.c:3190

2361 #, c-format

2362 msgid "cannot checkout %s"

2363 msgstr "不能检出 %s"

2364

2315 -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288

2365 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

2366 #, c-format

2367 msgid "read of %s failed"

2368 msgstr "读取 %s 失败"

2369

2320 -#: builtin/apply.c:3240

2370 +#: builtin/apply.c:3243

2371 #, c-format

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

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

2374

2325 -#: builtin/apply.c:3268 builtin/apply.c:3490

2375 +#: builtin/apply.c:3271 builtin/apply.c:3493

2376 #, c-format

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

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

2379

2330 -#: builtin/apply.c:3349 builtin/apply.c:3504

2380 +#: builtin/apply.c:3352 builtin/apply.c:3507

2381 #, c-format

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

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

2384

2335 -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518

2385 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

2386 #, c-format

2387 msgid "%s: %s"

2388 msgstr "%s：%s"

2389

2340 -#: builtin/apply.c:3358 builtin/apply.c:3512

2390 +#: builtin/apply.c:3361 builtin/apply.c:3515

2391 #, c-format

2392 msgid "%s: does not match index"

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

2394

2345 -#: builtin/apply.c:3460

2395 +#: builtin/apply.c:3463

2396 msgid "removal patch leaves file contents"

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

2398

2349 -#: builtin/apply.c:3529

2399 +#: builtin/apply.c:3532

2400 #, c-format

2401 msgid "%s: wrong type"

2402 msgstr "%s：错误类型"

2403

2354 -#: builtin/apply.c:3531

2404 +#: builtin/apply.c:3534

2405 #, c-format

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

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

2408

2359 -#: builtin/apply.c:3690 builtin/apply.c:3692

2409 +#: builtin/apply.c:3693 builtin/apply.c:3695

2410 #, c-format

2411 msgid "invalid path '%s'"

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

2413

2364 -#: builtin/apply.c:3747

2414 +#: builtin/apply.c:3750

2415 #, c-format

2416 msgid "%s: already exists in index"

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

2418

2369 -#: builtin/apply.c:3750

2419 +#: builtin/apply.c:3753

2420 #, c-format

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

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

2423

2374 -#: builtin/apply.c:3770

2424 +#: builtin/apply.c:3773

2425 #, c-format

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

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

2428

2379 -#: builtin/apply.c:3775

2429 +#: builtin/apply.c:3778

2430 #, c-format

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

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

2433

2384 -#: builtin/apply.c:3795

2434 +#: builtin/apply.c:3798

2435 #, c-format

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

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

2438

2389 -#: builtin/apply.c:3799

2439 +#: builtin/apply.c:3802

2440 #, c-format

2441 msgid "%s: patch does not apply"

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

2443

2394 -#: builtin/apply.c:3813

2444 +#: builtin/apply.c:3816

2445 #, c-format

2446 msgid "Checking patch %s..."

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

2448

2399 -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135

2449 +#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135

2450 #, c-format

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

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

2453

2404 -#: builtin/apply.c:4049

2454 +#: builtin/apply.c:4052

2455 #, c-format

2456 msgid "unable to remove %s from index"

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

2458

2409 -#: builtin/apply.c:4078

2459 +#: builtin/apply.c:4081

2460 #, c-format

2461 msgid "corrupt patch for submodule %s"

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

2463

2414 -#: builtin/apply.c:4082

2464 +#: builtin/apply.c:4085

2465 #, c-format

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

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

2468

2419 -#: builtin/apply.c:4087

2469 +#: builtin/apply.c:4090

2470 #, c-format

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

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

2473

2424 -#: builtin/apply.c:4090 builtin/apply.c:4198

2474 +#: builtin/apply.c:4093 builtin/apply.c:4201

2475 #, c-format

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

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

2478

2429 -#: builtin/apply.c:4123

2479 +#: builtin/apply.c:4126

2480 #, c-format

2481 msgid "closing file '%s'"

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

2483

2434 -#: builtin/apply.c:4172

2484 +#: builtin/apply.c:4175

2485 #, c-format

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

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

2488

2439 -#: builtin/apply.c:4259

2489 +#: builtin/apply.c:4262

2490 #, c-format

2491 msgid "Applied patch %s cleanly."

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

2493

2444 -#: builtin/apply.c:4267

2494 +#: builtin/apply.c:4270

2495 msgid "internal error"

2496 msgstr "内部错误"

2497

2448 -#: builtin/apply.c:4270

2498 +#: builtin/apply.c:4273

2499 #, c-format

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

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

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

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

2504

2455 -#: builtin/apply.c:4280

2505 +#: builtin/apply.c:4283

2506 #, c-format

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

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

2509

2460 -#: builtin/apply.c:4301

2510 +#: builtin/apply.c:4304

2511 #, c-format

2512 msgid "Hunk #%d applied cleanly."

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

2514

2465 -#: builtin/apply.c:4304

2515 +#: builtin/apply.c:4307

2516 #, c-format

2517 msgid "Rejected hunk #%d."

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

2519

2470 -#: builtin/apply.c:4394

2520 +#: builtin/apply.c:4397

2521 msgid "unrecognized input"

2522 msgstr "未能识别的输入"

2523

2474 -#: builtin/apply.c:4405

2524 +#: builtin/apply.c:4408

2525 msgid "unable to read index file"

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

2527

2478 -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92

2528 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2529 #: builtin/fetch.c:92

2530 msgid "path"

2531 msgstr "路径"

2532

2483 -#: builtin/apply.c:4523

2533 +#: builtin/apply.c:4526

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

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

2536

2487 -#: builtin/apply.c:4526

2537 +#: builtin/apply.c:4529

2538 msgid "apply changes matching the given path"

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

2540

2491 -#: builtin/apply.c:4528

2541 +#: builtin/apply.c:4531

2542 msgid "num"

2543 msgstr "数字"

2544

2495 -#: builtin/apply.c:4529

2545 +#: builtin/apply.c:4532

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

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

2548

2499 -#: builtin/apply.c:4532

2549 +#: builtin/apply.c:4535

2550 msgid "ignore additions made by the patch"

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

2552

2503 -#: builtin/apply.c:4534

2553 +#: builtin/apply.c:4537

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

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

2556

2507 -#: builtin/apply.c:4538

2557 +#: builtin/apply.c:4541

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

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

2560

2511 -#: builtin/apply.c:4540

2561 +#: builtin/apply.c:4543

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

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

2564

2515 -#: builtin/apply.c:4542

2565 +#: builtin/apply.c:4545

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

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

2568

2519 -#: builtin/apply.c:4544

2569 +#: builtin/apply.c:4547

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

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

2572

2523 -#: builtin/apply.c:4546

2573 +#: builtin/apply.c:4549

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

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

2576

2527 -#: builtin/apply.c:4548

2577 +#: builtin/apply.c:4551

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

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

2580

2531 -#: builtin/apply.c:4550

2581 +#: builtin/apply.c:4553

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

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

2584

2535 -#: builtin/apply.c:4552

2585 +#: builtin/apply.c:4555

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

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

2588

2539 -#: builtin/apply.c:4554

2589 +#: builtin/apply.c:4557

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

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

2592

2543 -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412

2593 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

2594 msgid "paths are separated with NUL character"

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

2596

2547 -#: builtin/apply.c:4559

2597 +#: builtin/apply.c:4562

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

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

2600

2551 -#: builtin/apply.c:4560

2601 +#: builtin/apply.c:4563

2602 msgid "action"

2603 msgstr "动作"

2604

2555 -#: builtin/apply.c:4561

2605 +#: builtin/apply.c:4564

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

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

2608

2559 -#: builtin/apply.c:4564 builtin/apply.c:4567

2609 +#: builtin/apply.c:4567 builtin/apply.c:4570

2610 msgid "ignore changes in whitespace when finding context"

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

2612

2563 -#: builtin/apply.c:4570

2613 +#: builtin/apply.c:4573

2614 msgid "apply the patch in reverse"

2615 msgstr "反向应用补丁"

2616

2567 -#: builtin/apply.c:4572

2617 +#: builtin/apply.c:4575

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

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

2620

2571 -#: builtin/apply.c:4574

2621 +#: builtin/apply.c:4577

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

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

2624

2575 -#: builtin/apply.c:4576

2625 +#: builtin/apply.c:4579

2626 msgid "allow overlapping hunks"

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

2628

2579 -#: builtin/apply.c:4579

2629 +#: builtin/apply.c:4582

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

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

2632

2583 -#: builtin/apply.c:4582

2633 +#: builtin/apply.c:4585

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

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

2636

2587 -#: builtin/apply.c:4584

2637 +#: builtin/apply.c:4587

2638 msgid "root"

2639 msgstr "根目录"

2640

2591 -#: builtin/apply.c:4585

2641 +#: builtin/apply.c:4588

2642 msgid "prepend <root> to all filenames"

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

2644

2595 -#: builtin/apply.c:4607

2645 +#: builtin/apply.c:4610

2646 msgid "--3way outside a repository"

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

2648

2599 -#: builtin/apply.c:4615

2649 +#: builtin/apply.c:4618

2650 msgid "--index outside a repository"

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

2652

2603 -#: builtin/apply.c:4618

2653 +#: builtin/apply.c:4621

2654 msgid "--cached outside a repository"

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

2656

2607 -#: builtin/apply.c:4637

2657 +#: builtin/apply.c:4640

2658 #, c-format

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

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

2661

2612 -#: builtin/apply.c:4651

2662 +#: builtin/apply.c:4654

2663 #, c-format

2664 msgid "squelched %d whitespace error"

2665 msgid_plural "squelched %d whitespace errors"

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

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

2668

2619 -#: builtin/apply.c:4657 builtin/apply.c:4667

2669 +#: builtin/apply.c:4660 builtin/apply.c:4670

2670 #, c-format

2671 msgid "%d line adds whitespace errors."

2672 msgid_plural "%d lines add whitespace errors."

@@ -2670,11 +2720,11 @@ msgstr "执行 'git bisect next'"

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

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

2722

2673 -#: builtin/blame.c:30

2674 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"

2675 -msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] 文件"

2723 +#: builtin/blame.c:31

2724 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

2725 +msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"

2726

2677 -#: builtin/blame.c:35

2727 +#: builtin/blame.c:36

2728 msgid "<rev-opts> are documented in git-rev-list(1)"

2729 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"

2730

@@ -2797,7 +2847,7 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

2847 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"

2848

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

2800 -#: builtin/branch.c:152

2850 +#: builtin/branch.c:150

2851 #, c-format

2852 msgid ""

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

@@ -2807,7 +2857,7 @@ msgstr ""

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

2858

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

2810 -#: builtin/branch.c:156

2860 +#: builtin/branch.c:154

2861 #, c-format

2862 msgid ""

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

@@ -2816,12 +2866,12 @@ msgstr ""

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

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

2868

2819 -#: builtin/branch.c:170

2869 +#: builtin/branch.c:168

2870 #, c-format

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

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

2873

2824 -#: builtin/branch.c:174

2874 +#: builtin/branch.c:172

2875 #, c-format

2876 msgid ""

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

@@ -2830,343 +2880,343 @@ msgstr ""

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

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

2882

2833 -#: builtin/branch.c:187

2883 +#: builtin/branch.c:185

2884 msgid "Update of config-file failed"

2885 msgstr "无法更新 config 文件"

2886

2837 -#: builtin/branch.c:215

2887 +#: builtin/branch.c:213

2888 msgid "cannot use -a with -d"

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

2890

2841 -#: builtin/branch.c:221

2891 +#: builtin/branch.c:219

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

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

2894

2845 -#: builtin/branch.c:229

2895 +#: builtin/branch.c:227

2896 #, c-format

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

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

2899

2850 -#: builtin/branch.c:245

2900 +#: builtin/branch.c:243

2901 #, c-format

2852 -msgid "remote branch '%s' not found."

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

2902 +msgid "remote-tracking branch '%s' not found."

2903 +msgstr "未能找到远程跟踪分支 '%s'。"

2904

2855 -#: builtin/branch.c:246

2905 +#: builtin/branch.c:244

2906 #, c-format

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

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

2909

2860 -#: builtin/branch.c:260

2910 +#: builtin/branch.c:258

2911 #, c-format

2862 -msgid "Error deleting remote branch '%s'"

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

2912 +msgid "Error deleting remote-tracking branch '%s'"

2913 +msgstr "无法删除远程跟踪分支 '%s'"

2914

2865 -#: builtin/branch.c:261

2915 +#: builtin/branch.c:259

2916 #, c-format

2917 msgid "Error deleting branch '%s'"

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

2918 +msgstr "无法删除分支 '%s'"

2919

2870 -#: builtin/branch.c:268

2920 +#: builtin/branch.c:266

2921 #, c-format

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

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

2922 +msgid "Deleted remote-tracking branch %s (was %s).\n"

2923 +msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"

2924

2875 -#: builtin/branch.c:269

2925 +#: builtin/branch.c:267

2926 #, c-format

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

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

2929

2880 -#: builtin/branch.c:370

2930 +#: builtin/branch.c:368

2931 #, c-format

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

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

2934

2885 -#: builtin/branch.c:459

2935 +#: builtin/branch.c:451

2936 #, c-format

2937 msgid "[%s: gone]"

2938 msgstr "[%s: 丢失]"

2939

2890 -#: builtin/branch.c:464

2940 +#: builtin/branch.c:456

2941 #, c-format

2942 msgid "[%s]"

2943 msgstr "[%s]"

2944

2895 -#: builtin/branch.c:469

2945 +#: builtin/branch.c:461

2946 #, c-format

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

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

2949

2900 -#: builtin/branch.c:471

2950 +#: builtin/branch.c:463

2951 #, c-format

2952 msgid "[behind %d]"

2953 msgstr "[落后 %d]"

2954

2905 -#: builtin/branch.c:475

2955 +#: builtin/branch.c:467

2956 #, c-format

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

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

2959

2910 -#: builtin/branch.c:477

2960 +#: builtin/branch.c:469

2961 #, c-format

2962 msgid "[ahead %d]"

2963 msgstr "[领先 %d]"

2964

2915 -#: builtin/branch.c:480

2965 +#: builtin/branch.c:472

2966 #, c-format

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

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

2969

2920 -#: builtin/branch.c:483

2970 +#: builtin/branch.c:475

2971 #, c-format

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

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

2974

2925 -#: builtin/branch.c:496

2975 +#: builtin/branch.c:488

2976 msgid " **** invalid ref ****"

2977 msgstr " **** 无效引用 ****"

2978

2929 -#: builtin/branch.c:587

2979 +#: builtin/branch.c:579

2980 #, c-format

2981 msgid "(no branch, rebasing %s)"

2982 msgstr "（非分支，正变基 %s）"

2983

2934 -#: builtin/branch.c:590

2984 +#: builtin/branch.c:582

2985 #, c-format

2986 msgid "(no branch, bisect started on %s)"

2987 msgstr "（非分支，二分查找开始于 %s）"

2988

2939 -#: builtin/branch.c:596

2989 +#: builtin/branch.c:588

2990 #, c-format

2991 msgid "(HEAD detached at %s)"

2992 msgstr "（头指针分离于 %s）"

2993

2944 -#: builtin/branch.c:599

2994 +#: builtin/branch.c:591

2995 #, c-format

2996 msgid "(HEAD detached from %s)"

2997 msgstr "（头指针分离自 %s）"

2998

2949 -#: builtin/branch.c:603

2999 +#: builtin/branch.c:595

3000 msgid "(no branch)"

3001 msgstr "（非分支）"

3002

2953 -#: builtin/branch.c:650

3003 +#: builtin/branch.c:642

3004 #, c-format

3005 msgid "object '%s' does not point to a commit"

3006 msgstr "对象 '%s' 没有指向一个提交"

3007

2958 -#: builtin/branch.c:698

3008 +#: builtin/branch.c:690

3009 msgid "some refs could not be read"

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

3011

2962 -#: builtin/branch.c:711

3012 +#: builtin/branch.c:703

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

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

3015

2966 -#: builtin/branch.c:721

3016 +#: builtin/branch.c:713

3017 #, c-format

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

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

3020

2971 -#: builtin/branch.c:736

3021 +#: builtin/branch.c:728

3022 msgid "Branch rename failed"

3023 msgstr "分支重命名失败"

3024

2975 -#: builtin/branch.c:740

3025 +#: builtin/branch.c:732

3026 #, c-format

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

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

3029

2980 -#: builtin/branch.c:744

3030 +#: builtin/branch.c:736

3031 #, c-format

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

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

3034

2985 -#: builtin/branch.c:751

3035 +#: builtin/branch.c:743

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

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

3038

2989 -#: builtin/branch.c:766

3039 +#: builtin/branch.c:758

3040 #, c-format

3041 msgid "malformed object name %s"

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

3043

2994 -#: builtin/branch.c:790

3044 +#: builtin/branch.c:780

3045 #, c-format

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

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

3048

2999 -#: builtin/branch.c:820

3049 +#: builtin/branch.c:810

3050 msgid "Generic options"

3051 msgstr "通用选项"

3052

3003 -#: builtin/branch.c:822

3053 +#: builtin/branch.c:812

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

3055 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"

3056

3007 -#: builtin/branch.c:823

3057 +#: builtin/branch.c:813

3058 msgid "suppress informational messages"

3059 msgstr "不显示信息"

3060

3011 -#: builtin/branch.c:824

3061 +#: builtin/branch.c:814

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

3063 msgstr "设置跟踪模式（参见 git-pull(1)）"

3064

3015 -#: builtin/branch.c:826

3065 +#: builtin/branch.c:816

3066 msgid "change upstream info"

3067 msgstr "改变上游信息"

3068

3019 -#: builtin/branch.c:830

3069 +#: builtin/branch.c:820

3070 msgid "use colored output"

3071 msgstr "使用彩色输出"

3072

3023 -#: builtin/branch.c:831

3073 +#: builtin/branch.c:821

3074 msgid "act on remote-tracking branches"

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

3076

3027 -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861

3028 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583

3029 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616

3077 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

3078 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

3079 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

3080 #: builtin/tag.c:622

3081 msgid "commit"

3082 msgstr "提交"

3083

3034 -#: builtin/branch.c:835 builtin/branch.c:841

3084 +#: builtin/branch.c:825 builtin/branch.c:831

3085 msgid "print only branches that contain the commit"

3086 msgstr "只打印包含该提交的分支"

3087

3038 -#: builtin/branch.c:847

3088 +#: builtin/branch.c:837

3089 msgid "Specific git-branch actions:"

3090 msgstr "具体的 git-branch 动作："

3091

3042 -#: builtin/branch.c:848

3092 +#: builtin/branch.c:838

3093 msgid "list both remote-tracking and local branches"

3094 msgstr "列出远程跟踪及本地分支"

3095

3046 -#: builtin/branch.c:850

3096 +#: builtin/branch.c:840

3097 msgid "delete fully merged branch"

3098 msgstr "删除完全合并的分支"

3099

3050 -#: builtin/branch.c:851

3100 +#: builtin/branch.c:841

3101 msgid "delete branch (even if not merged)"

3102 msgstr "删除分支（即使没有合并）"

3103

3054 -#: builtin/branch.c:852

3104 +#: builtin/branch.c:842

3105 msgid "move/rename a branch and its reflog"

3106 msgstr "移动/重命名一个分支，以及它的引用日志"

3107

3058 -#: builtin/branch.c:853

3108 +#: builtin/branch.c:843

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

3110 msgstr "移动/重命名一个分支，即使目标已存在"

3111

3062 -#: builtin/branch.c:854

3112 +#: builtin/branch.c:844

3113 msgid "list branch names"

3114 msgstr "列出分支名"

3115

3066 -#: builtin/branch.c:855

3116 +#: builtin/branch.c:845

3117 msgid "create the branch's reflog"

3118 msgstr "创建分支的引用日志"

3119

3070 -#: builtin/branch.c:857

3120 +#: builtin/branch.c:847

3121 msgid "edit the description for the branch"

3122 msgstr "标记分支的描述"

3123

3074 -#: builtin/branch.c:858

3124 +#: builtin/branch.c:848

3125 msgid "force creation, move/rename, deletion"

3126 msgstr "强制创建、移动/重命名、删除"

3127

3078 -#: builtin/branch.c:861

3128 +#: builtin/branch.c:851

3129 msgid "print only not merged branches"

3130 msgstr "只打印没有合并的分支"

3131

3082 -#: builtin/branch.c:867

3132 +#: builtin/branch.c:857

3133 msgid "print only merged branches"

3134 msgstr "只打印合并的分支"

3135

3086 -#: builtin/branch.c:871

3136 +#: builtin/branch.c:861

3137 msgid "list branches in columns"

3138 msgstr "以列的方式显示分支"

3139

3090 -#: builtin/branch.c:884

3140 +#: builtin/branch.c:874

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

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

3143

3094 -#: builtin/branch.c:888 builtin/clone.c:637

3144 +#: builtin/branch.c:878 builtin/clone.c:629

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

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

3147

3098 -#: builtin/branch.c:910

3148 +#: builtin/branch.c:900

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

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

3151

3102 -#: builtin/branch.c:921 builtin/branch.c:960

3152 +#: builtin/branch.c:911 builtin/branch.c:950

3153 msgid "branch name required"

3154 msgstr "必须提供分支名"

3155

3106 -#: builtin/branch.c:936

3156 +#: builtin/branch.c:926

3157 msgid "Cannot give description to detached HEAD"

3158 msgstr "不能向分离头指针提供描述"

3159

3110 -#: builtin/branch.c:941

3160 +#: builtin/branch.c:931

3161 msgid "cannot edit description of more than one branch"

3162 msgstr "不能为一个以上的分支编辑描述"

3163

3114 -#: builtin/branch.c:948

3164 +#: builtin/branch.c:938

3165 #, c-format

3166 msgid "No commit on branch '%s' yet."

3167 msgstr "分支 '%s' 尚无提交。"

3168

3119 -#: builtin/branch.c:951

3169 +#: builtin/branch.c:941

3170 #, c-format

3171 msgid "No branch named '%s'."

3172 msgstr "没有分支 '%s'。"

3173

3124 -#: builtin/branch.c:966

3174 +#: builtin/branch.c:956

3175 msgid "too many branches for a rename operation"

3176 msgstr "为重命名操作提供了太多的分支名"

3177

3128 -#: builtin/branch.c:971

3178 +#: builtin/branch.c:961

3179 msgid "too many branches to set new upstream"

3180 msgstr "为设置新上游提供了太多的分支名"

3181

3132 -#: builtin/branch.c:975

3182 +#: builtin/branch.c:965

3183 #, c-format

3184 msgid ""

3185 "could not set upstream of HEAD to %s when it does not point to any branch."

3186 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"

3187

3138 -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021

3188 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3189 #, c-format

3190 msgid "no such branch '%s'"

3191 msgstr "没有此分支 '%s'"

3192

3143 -#: builtin/branch.c:982

3193 +#: builtin/branch.c:972

3194 #, c-format

3195 msgid "branch '%s' does not exist"

3196 msgstr "分支 '%s' 不存在"

3197

3148 -#: builtin/branch.c:994

3198 +#: builtin/branch.c:984

3199 msgid "too many branches to unset upstream"

3200 msgstr "为取消上游设置操作提供了太多的分支名"

3201

3152 -#: builtin/branch.c:998

3202 +#: builtin/branch.c:988

3203 msgid "could not unset upstream of HEAD when it does not point to any branch."

3204 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"

3205

3156 -#: builtin/branch.c:1004

3206 +#: builtin/branch.c:994

3207 #, c-format

3208 msgid "Branch '%s' has no upstream information"

3209 msgstr "分支 '%s' 没有上游信息"

3210

3161 -#: builtin/branch.c:1018

3211 +#: builtin/branch.c:1008

3212 msgid "it does not make sense to create 'HEAD' manually"

3213 msgstr "手工创建 'HEAD' 没有意义"

3214

3165 -#: builtin/branch.c:1024

3215 +#: builtin/branch.c:1014

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

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

3218

3169 -#: builtin/branch.c:1027

3219 +#: builtin/branch.c:1017

3220 #, c-format

3221 msgid ""

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

@@ -3174,7 +3224,7 @@ msgid ""

3224 msgstr ""

3225 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"

3226

3177 -#: builtin/branch.c:1044

3227 +#: builtin/branch.c:1034

3228 #, c-format

3229 msgid ""

3230 "\n"

@@ -3185,69 +3235,84 @@ msgstr ""

3235 "如果你想用 '%s' 跟踪 '%s', 这么做：\n"

3236 "\n"

3237

3188 -#: builtin/branch.c:1045

3238 +#: builtin/branch.c:1035

3239 #, c-format

3240 msgid " git branch -d %s\n"

3241 msgstr " git branch -d %s\n"

3242

3193 -#: builtin/branch.c:1046

3243 +#: builtin/branch.c:1036

3244 #, c-format

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

3246 msgstr " git branch --set-upstream-to %s\n"

3247

3198 -#: builtin/bundle.c:47

3248 +#: builtin/bundle.c:51

3249 #, c-format

3250 msgid "%s is okay\n"

3251 msgstr "%s 可以\n"

3252

3203 -#: builtin/bundle.c:56

3253 +#: builtin/bundle.c:64

3254 msgid "Need a repository to create a bundle."

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

3256

3207 -#: builtin/bundle.c:60

3257 +#: builtin/bundle.c:68

3258 msgid "Need a repository to unbundle."

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

3260

3211 -#: builtin/cat-file.c:326

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

3213 -msgstr "git cat-file (-t | -s | -e | -p | <类型> | --textconv) <对象>"

3261 +#: builtin/cat-file.c:369

3262 +msgid ""

3263 +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3264 +"<type>|--textconv) <object>"

3265 +msgstr ""

3266 +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"

3267 +">|--textconv) <对象>"

3268

3215 -#: builtin/cat-file.c:327

3216 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"

3217 -msgstr "git cat-file (--batch | --batch-check) < <对象列表>"

3269 +#: builtin/cat-file.c:370

3270 +msgid ""

3271 +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3272 +"objects>"

3273 +msgstr ""

3274 +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"

3275

3219 -#: builtin/cat-file.c:364

3276 +#: builtin/cat-file.c:407

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

3278 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"

3279

3223 -#: builtin/cat-file.c:365

3280 +#: builtin/cat-file.c:408

3281 msgid "show object type"

3282 msgstr "显示对象类型"

3283

3227 -#: builtin/cat-file.c:366

3284 +#: builtin/cat-file.c:409

3285 msgid "show object size"

3286 msgstr "显示对象大小"

3287

3231 -#: builtin/cat-file.c:368

3288 +#: builtin/cat-file.c:411

3289 msgid "exit with zero when there's no error"

3290 msgstr "当没有错误时退出并返回零"

3291

3235 -#: builtin/cat-file.c:369

3292 +#: builtin/cat-file.c:412

3293 msgid "pretty-print object's content"

3294 msgstr "美观地打印对象的内容"

3295

3239 -#: builtin/cat-file.c:371

3296 +#: builtin/cat-file.c:414

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

3298 msgstr "对于数据（blob）对象，对其内容执行 textconv"

3299

3243 -#: builtin/cat-file.c:373

3300 +#: builtin/cat-file.c:416

3301 +msgid "allow -s and -t to work with broken/corrupt objects"

3302 +msgstr "允许 -s 和 -t 对损坏的对象生效"

3303 +

3304 +#: builtin/cat-file.c:418

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

3306 msgstr "显示从标准输入提供的对象的信息和内容"

3307

3247 -#: builtin/cat-file.c:376

3308 +#: builtin/cat-file.c:421

3309 msgid "show info about objects fed from the standard input"

3310 msgstr "显示从标准输入提供的对象的信息"

3311

3312 +#: builtin/cat-file.c:424

3313 +msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3314 +msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"

3315 +

3316 #: builtin/check-attr.c:11

3317 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3318 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."

@@ -3264,7 +3329,7 @@ msgstr "报告设置在文件上的所有属性"

3329 msgid "use .gitattributes only from the index"

3330 msgstr "只使用索引中的 .gitattributes"

3331

3267 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

3332 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

3333 msgid "read file names from stdin"

3334 msgstr "从标准输入读出文件名"

3335

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

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

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

3339

3275 -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274

3340 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279

3341 msgid "suppress progress reporting"

3342 msgstr "不显示进度报告"

3343

@@ -3369,114 +3434,114 @@ msgstr "在创建文件时，在前面加上<字符串>"

3434 msgid "copy out the files from named stage"

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

3436

3372 -#: builtin/checkout.c:25

3437 +#: builtin/checkout.c:26

3438 msgid "git checkout [<options>] <branch>"

3439 msgstr "git checkout [<选项>] <分支>"

3440

3376 -#: builtin/checkout.c:26

3441 +#: builtin/checkout.c:27

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

3443 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."

3444

3380 -#: builtin/checkout.c:132 builtin/checkout.c:165

3445 +#: builtin/checkout.c:138 builtin/checkout.c:171

3446 #, c-format

3447 msgid "path '%s' does not have our version"

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

3449

3385 -#: builtin/checkout.c:134 builtin/checkout.c:167

3450 +#: builtin/checkout.c:140 builtin/checkout.c:173

3451 #, c-format

3452 msgid "path '%s' does not have their version"

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

3454

3390 -#: builtin/checkout.c:150

3455 +#: builtin/checkout.c:156

3456 #, c-format

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

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

3459

3395 -#: builtin/checkout.c:194

3460 +#: builtin/checkout.c:200

3461 #, c-format

3462 msgid "path '%s' does not have necessary versions"

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

3464

3400 -#: builtin/checkout.c:211

3465 +#: builtin/checkout.c:217

3466 #, c-format

3467 msgid "path '%s': cannot merge"

3468 msgstr "path '%s'：无法合并"

3469

3405 -#: builtin/checkout.c:228

3470 +#: builtin/checkout.c:234

3471 #, c-format

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

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

3474

3410 -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3411 -#: builtin/checkout.c:258

3475 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261

3476 +#: builtin/checkout.c:264 builtin/checkout.c:277

3477 #, c-format

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

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

3480

3416 -#: builtin/checkout.c:261 builtin/checkout.c:264

3481 +#: builtin/checkout.c:267 builtin/checkout.c:270

3482 #, c-format

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

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

3485

3421 -#: builtin/checkout.c:267

3486 +#: builtin/checkout.c:273

3487 #, c-format

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

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

3490

3426 -#: builtin/checkout.c:278 builtin/checkout.c:467

3491 +#: builtin/checkout.c:287 builtin/checkout.c:481

3492 msgid "corrupt index file"

3493 msgstr "损坏的索引文件"

3494

3430 -#: builtin/checkout.c:338 builtin/checkout.c:345

3495 +#: builtin/checkout.c:347 builtin/checkout.c:354

3496 #, c-format

3497 msgid "path '%s' is unmerged"

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

3499

3435 -#: builtin/checkout.c:489

3500 +#: builtin/checkout.c:503

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

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

3503

3439 -#: builtin/checkout.c:615

3504 +#: builtin/checkout.c:634

3505 #, c-format

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

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

3508

3444 -#: builtin/checkout.c:653

3509 +#: builtin/checkout.c:670

3510 msgid "HEAD is now at"

3511 msgstr "HEAD 目前位于"

3512

3448 -#: builtin/checkout.c:660

3513 +#: builtin/checkout.c:677

3514 #, c-format

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

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

3517

3453 -#: builtin/checkout.c:663

3518 +#: builtin/checkout.c:680

3519 #, c-format

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

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

3522

3458 -#: builtin/checkout.c:667

3523 +#: builtin/checkout.c:684

3524 #, c-format

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

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

3527

3463 -#: builtin/checkout.c:669 builtin/checkout.c:1050

3528 +#: builtin/checkout.c:686 builtin/checkout.c:1285

3529 #, c-format

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

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

3532

3468 -#: builtin/checkout.c:671

3533 +#: builtin/checkout.c:688

3534 #, c-format

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

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

3537

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

3474 -#: builtin/checkout.c:723

3539 +#: builtin/checkout.c:740

3540 #, c-format

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

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

3543

3479 -#: builtin/checkout.c:729

3544 +#: builtin/checkout.c:746

3545 #, c-format

3546 msgid ""

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

@@ -3497,154 +3562,204 @@ msgstr[1] ""

3562 "\n"

3563 "%s\n"

3564

3500 -#: builtin/checkout.c:747

3565 +#: builtin/checkout.c:765

3566 #, c-format

3567 msgid ""

3568 +"If you want to keep it by creating a new branch, this may be a good time\n"

3569 +"to do so with:\n"

3570 +"\n"

3571 +" git branch <new-branch-name> %s\n"

3572 +"\n"

3573 +msgid_plural ""

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

3575 "to do so with:\n"

3576 "\n"

3577 " git branch <new-branch-name> %s\n"

3578 "\n"

3508 -msgstr ""

3509 -"如果您想要通过创建新分支保存他们，这可能是一个好时候。\n"

3579 +msgstr[0] ""

3580 +"如果您想要通过创建新分支保存它，这可能是一个好时候。\n"

3581 +"如下操作：\n"

3582 +"\n"

3583 +" git branch <新分支名> %s\n"

3584 +"\n"

3585 +msgstr[1] ""

3586 +"如果您想要通过创建新分支保存它们，这可能是一个好时候。\n"

3587 "如下操作：\n"

3588 "\n"

3589 " git branch <新分支名> %s\n"

3590 "\n"

3591

3515 -#: builtin/checkout.c:777

3592 +#: builtin/checkout.c:801

3593 msgid "internal error in revision walk"

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

3595

3519 -#: builtin/checkout.c:781

3596 +#: builtin/checkout.c:805

3597 msgid "Previous HEAD position was"

3598 msgstr "之前的 HEAD 位置是"

3599

3523 -#: builtin/checkout.c:808 builtin/checkout.c:1045

3600 +#: builtin/checkout.c:832 builtin/checkout.c:1280

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

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

3603

3527 -#: builtin/checkout.c:952

3604 +#: builtin/checkout.c:893

3605 +msgid "no branch specified"

3606 +msgstr "未指定分支名"

3607 +

3608 +#: builtin/checkout.c:895

3609 +#, c-format

3610 +msgid "'%s' already exists"

3611 +msgstr "'%s' 已经存在"

3612 +

3613 +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842

3614 +#: builtin/clone.c:853

3615 +#, c-format

3616 +msgid "could not create leading directories of '%s'"

3617 +msgstr "不能为 '%s' 创建先导目录"

3618 +

3619 +#: builtin/checkout.c:924

3620 +#, c-format

3621 +msgid "could not create directory of '%s'"

3622 +msgstr "不能创建目录 '%s'"

3623 +

3624 +#: builtin/checkout.c:960

3625 +#, c-format

3626 +msgid "Enter %s (identifier %s)"

3627 +msgstr "输入 %s （标识符 %s）"

3628 +

3629 +#: builtin/checkout.c:1070

3630 +#, c-format

3631 +msgid "'%s' is already checked out at '%s'"

3632 +msgstr "'%s' 已经检出到 '%s'"

3633 +

3634 +#: builtin/checkout.c:1176

3635 #, c-format

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

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

3638

3532 -#: builtin/checkout.c:991

3639 +#: builtin/checkout.c:1215

3640 #, c-format

3641 msgid "invalid reference: %s"

3642 msgstr "无效引用：%s"

3643

3537 -#: builtin/checkout.c:1020

3644 +#: builtin/checkout.c:1255

3645 #, c-format

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

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

3648

3542 -#: builtin/checkout.c:1059

3649 +#: builtin/checkout.c:1294

3650 msgid "paths cannot be used with switching branches"

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

3652

3546 -#: builtin/checkout.c:1062 builtin/checkout.c:1066

3653 +#: builtin/checkout.c:1297 builtin/checkout.c:1301

3654 #, c-format

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

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

3657

3551 -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3552 -#: builtin/checkout.c:1081

3658 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313

3659 +#: builtin/checkout.c:1316

3660 #, c-format

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

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

3663

3557 -#: builtin/checkout.c:1086

3664 +#: builtin/checkout.c:1321

3665 #, c-format

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

3667 msgstr "不能切换分支到一个非提交 '%s'"

3668

3562 -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

3669 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83

3670 #: builtin/remote.c:159 builtin/remote.c:161

3671 msgid "branch"

3672 msgstr "分支"

3673

3567 -#: builtin/checkout.c:1109

3674 +#: builtin/checkout.c:1347

3675 msgid "create and checkout a new branch"

3676 msgstr "创建并检出一个新的分支"

3677

3571 -#: builtin/checkout.c:1111

3678 +#: builtin/checkout.c:1349

3679 msgid "create/reset and checkout a branch"

3680 msgstr "创建/重置并检出一个分支"

3681

3575 -#: builtin/checkout.c:1112

3682 +#: builtin/checkout.c:1350

3683 msgid "create reflog for new branch"

3684 msgstr "为新的分支创建引用日志"

3685

3579 -#: builtin/checkout.c:1113

3686 +#: builtin/checkout.c:1351

3687 msgid "detach the HEAD at named commit"

3688 msgstr "成为指向该提交的分离头指针"

3689

3583 -#: builtin/checkout.c:1114

3690 +#: builtin/checkout.c:1352

3691 msgid "set upstream info for new branch"

3692 msgstr "为新的分支设置上游信息"

3693

3587 -#: builtin/checkout.c:1116

3694 +#: builtin/checkout.c:1354

3695 msgid "new-branch"

3696 msgstr "新分支"

3697

3591 -#: builtin/checkout.c:1116

3698 +#: builtin/checkout.c:1354

3699 msgid "new unparented branch"

3700 msgstr "新的没有父提交的分支"

3701

3595 -#: builtin/checkout.c:1117

3702 +#: builtin/checkout.c:1355

3703 msgid "checkout our version for unmerged files"

3704 msgstr "对尚未合并的文件检出我们的版本"

3705

3599 -#: builtin/checkout.c:1119

3706 +#: builtin/checkout.c:1357

3707 msgid "checkout their version for unmerged files"

3708 msgstr "对尚未合并的文件检出他们的版本"

3709

3603 -#: builtin/checkout.c:1121

3710 +#: builtin/checkout.c:1359

3711 msgid "force checkout (throw away local modifications)"

3712 msgstr "强制检出（丢弃本地修改）"

3713

3607 -#: builtin/checkout.c:1122

3714 +#: builtin/checkout.c:1360

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

3716 msgstr "和新的分支执行三路合并"

3717

3611 -#: builtin/checkout.c:1123 builtin/merge.c:227

3718 +#: builtin/checkout.c:1361 builtin/merge.c:227

3719 msgid "update ignored files (default)"

3720 msgstr "更新忽略的文件（默认）"

3721

3615 -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245

3722 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244

3723 msgid "style"

3724 msgstr "风格"

3725

3619 -#: builtin/checkout.c:1125

3726 +#: builtin/checkout.c:1363

3727 msgid "conflict style (merge or diff3)"

3728 msgstr "冲突输出风格（merge 或 diff3）"

3729

3623 -#: builtin/checkout.c:1128

3730 +#: builtin/checkout.c:1366

3731 msgid "do not limit pathspecs to sparse entries only"

3732 msgstr "对路径不做稀疏检出的限制"

3733

3627 -#: builtin/checkout.c:1130

3734 +#: builtin/checkout.c:1368

3735 msgid "second guess 'git checkout <no-such-branch>'"

3736 msgstr "二次猜测'git checkout <无此分支>'"

3737

3631 -#: builtin/checkout.c:1153

3738 +#: builtin/checkout.c:1370

3739 +msgid "check a branch out in a separate working directory"

3740 +msgstr "检出一个分支到单独的工作目录"

3741 +

3742 +#: builtin/checkout.c:1372

3743 +msgid "do not check if another worktree is holding the given ref"

3744 +msgstr "不检查指定的引用是否被其他工作区所占用"

3745 +

3746 +#: builtin/checkout.c:1406

3747 msgid "-b, -B and --orphan are mutually exclusive"

3748 msgstr "-b、-B 和 --orphan 是互斥的"

3749

3635 -#: builtin/checkout.c:1170

3750 +#: builtin/checkout.c:1423

3751 msgid "--track needs a branch name"

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

3753

3639 -#: builtin/checkout.c:1175

3754 +#: builtin/checkout.c:1428

3755 msgid "Missing branch name; try -b"

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

3757

3643 -#: builtin/checkout.c:1212

3758 +#: builtin/checkout.c:1464

3759 msgid "invalid path specification"

3760 msgstr "无效的路径规格"

3761

3647 -#: builtin/checkout.c:1219

3762 +#: builtin/checkout.c:1471

3763 #, c-format

3764 msgid ""

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

@@ -3653,12 +3768,12 @@ msgstr ""

3768 "不能同时更新路径并切换到分支'%s'。\n"

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

3770

3656 -#: builtin/checkout.c:1224

3771 +#: builtin/checkout.c:1476

3772 #, c-format

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

3774 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

3775

3661 -#: builtin/checkout.c:1228

3776 +#: builtin/checkout.c:1480

3777 msgid ""

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

3779 "checking out of the index."

@@ -3728,36 +3843,36 @@ msgstr ""

3843 "* - 选择所有选项\n"

3844 " - （空）结束选择"

3845

3731 -#: builtin/clean.c:517

3846 +#: builtin/clean.c:515

3847 #, c-format

3848 msgid "Huh (%s)?"

3849 msgstr "嗯（%s）？"

3850

3736 -#: builtin/clean.c:659

3851 +#: builtin/clean.c:657

3852 #, c-format

3853 msgid "Input ignore patterns>> "

3854 msgstr "输入模版以排除条目>> "

3855

3741 -#: builtin/clean.c:696

3856 +#: builtin/clean.c:694

3857 #, c-format

3858 msgid "WARNING: Cannot find items matched by: %s"

3859 msgstr "警告：无法找到和 %s 匹配的条目"

3860

3746 -#: builtin/clean.c:717

3861 +#: builtin/clean.c:715

3862 msgid "Select items to delete"

3863 msgstr "选择要删除的条目"

3864

3865 #. TRANSLATORS: Make sure to keep [y/N] as is

3751 -#: builtin/clean.c:758

3866 +#: builtin/clean.c:756

3867 #, c-format

3868 msgid "Remove %s [y/N]? "

3869 msgstr "删除 %s [y/N]？"

3870

3756 -#: builtin/clean.c:783

3871 +#: builtin/clean.c:781

3872 msgid "Bye."

3873 msgstr "再见。"

3874

3760 -#: builtin/clean.c:791

3875 +#: builtin/clean.c:789

3876 msgid ""

3877 "clean - start cleaning\n"

3878 "filter by pattern - exclude items from deletion\n"

@@ -3775,69 +3890,69 @@ msgstr ""

3890 "help - 显示本帮助\n"

3891 "? - 显示如何在提示符下选择的帮助"

3892

3778 -#: builtin/clean.c:818

3893 +#: builtin/clean.c:816

3894 msgid "*** Commands ***"

3895 msgstr "*** 命令 ***"

3896

3782 -#: builtin/clean.c:819

3897 +#: builtin/clean.c:817

3898 msgid "What now"

3899 msgstr "请选择"

3900

3786 -#: builtin/clean.c:827

3901 +#: builtin/clean.c:825

3902 msgid "Would remove the following item:"

3903 msgid_plural "Would remove the following items:"

3904 msgstr[0] "将删除如下条目："

3905 msgstr[1] "将删除如下条目："

3906

3792 -#: builtin/clean.c:844

3907 +#: builtin/clean.c:842

3908 msgid "No more files to clean, exiting."

3909 msgstr "没有要清理的文件，退出。"

3910

3796 -#: builtin/clean.c:875

3911 +#: builtin/clean.c:873

3912 msgid "do not print names of files removed"

3913 msgstr "不打印删除文件的名称"

3914

3800 -#: builtin/clean.c:877

3915 +#: builtin/clean.c:875

3916 msgid "force"

3917 msgstr "强制"

3918

3804 -#: builtin/clean.c:878

3919 +#: builtin/clean.c:876

3920 msgid "interactive cleaning"

3921 msgstr "交互式清除"

3922

3808 -#: builtin/clean.c:880

3923 +#: builtin/clean.c:878

3924 msgid "remove whole directories"

3925 msgstr "删除整个目录"

3926

3812 -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714

3813 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185

3927 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

3928 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

3929 msgid "pattern"

3930 msgstr "模式"

3931

3817 -#: builtin/clean.c:882

3932 +#: builtin/clean.c:880

3933 msgid "add <pattern> to ignore rules"

3934 msgstr "添加<模式>到忽略规则"

3935

3821 -#: builtin/clean.c:883

3936 +#: builtin/clean.c:881

3937 msgid "remove ignored files, too"

3938 msgstr "也删除忽略的文件"

3939

3825 -#: builtin/clean.c:885

3940 +#: builtin/clean.c:883

3941 msgid "remove only ignored files"

3942 msgstr "只删除忽略的文件"

3943

3829 -#: builtin/clean.c:903

3944 +#: builtin/clean.c:901

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

3946 msgstr "-x 和 -X 不能同时使用"

3947

3833 -#: builtin/clean.c:907

3948 +#: builtin/clean.c:905

3949 msgid ""

3950 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3951 "clean"

3952 msgstr ""

3953 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

3954

3840 -#: builtin/clean.c:910

3955 +#: builtin/clean.c:908

3956 msgid ""

3957 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3958 "refusing to clean"

@@ -3848,150 +3963,150 @@ msgstr ""

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

3964 msgstr "git clone [<选项>] [--] <版本库> [<路径>]"

3965

3851 -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224

3966 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

3967 #: builtin/push.c:523

3968 msgid "force progress reporting"

3969 msgstr "强制显示进度报告"

3970

3856 -#: builtin/clone.c:68

3971 +#: builtin/clone.c:59

3972 msgid "don't create a checkout"

3973 msgstr "不创建一个检出"

3974

3860 -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496

3975 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

3976 msgid "create a bare repository"

3977 msgstr "创建一个纯版本库"

3978

3864 -#: builtin/clone.c:73

3979 +#: builtin/clone.c:64

3980 msgid "create a mirror repository (implies bare)"

3981 msgstr "创建一个镜像版本库（也是纯版本库）"

3982

3868 -#: builtin/clone.c:75

3983 +#: builtin/clone.c:66

3984 msgid "to clone from a local repository"

3985 msgstr "从本地版本库克隆"

3986

3872 -#: builtin/clone.c:77

3987 +#: builtin/clone.c:68

3988 msgid "don't use local hardlinks, always copy"

3989 msgstr "不使用本地硬链接，始终复制"

3990

3876 -#: builtin/clone.c:79

3991 +#: builtin/clone.c:70

3992 msgid "setup as shared repository"

3993 msgstr "设置为共享版本库"

3994

3880 -#: builtin/clone.c:81 builtin/clone.c:83

3995 +#: builtin/clone.c:72 builtin/clone.c:74

3996 msgid "initialize submodules in the clone"

3997 msgstr "在克隆时初始化子模组"

3998

3884 -#: builtin/clone.c:84 builtin/init-db.c:493

3999 +#: builtin/clone.c:75 builtin/init-db.c:500

4000 msgid "template-directory"

4001 msgstr "模板目录"

4002

3888 -#: builtin/clone.c:85 builtin/init-db.c:494

4003 +#: builtin/clone.c:76 builtin/init-db.c:501

4004 msgid "directory from which templates will be used"

4005 msgstr "模板目录将被使用"

4006

3892 -#: builtin/clone.c:87

4007 +#: builtin/clone.c:78

4008 msgid "reference repository"

4009 msgstr "参考版本库"

4010

3896 -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

4011 +#: builtin/clone.c:80

4012 +msgid "use --reference only while cloning"

4013 +msgstr "仅在克隆时参考 --reference 指向的本地版本库"

4014 +

4015 +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

4016 msgid "name"

4017 msgstr "名称"

4018

3900 -#: builtin/clone.c:89

4019 +#: builtin/clone.c:82

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

4021 msgstr "使用<名称>而不是 'origin' 去跟踪上游"

4022

3904 -#: builtin/clone.c:91

4023 +#: builtin/clone.c:84

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

4025 msgstr "检出<分支>而不是远程HEAD"

4026

3908 -#: builtin/clone.c:93

4027 +#: builtin/clone.c:86

4028 msgid "path to git-upload-pack on the remote"

4029 msgstr "远程 git-upload-pack 路径"

4030

3912 -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659

4031 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

4032 msgid "depth"

4033 msgstr "深度"

4034

3916 -#: builtin/clone.c:95

4035 +#: builtin/clone.c:88

4036 msgid "create a shallow clone of that depth"

4037 msgstr "创建一个指定深度的浅克隆"

4038

3920 -#: builtin/clone.c:97

4039 +#: builtin/clone.c:90

4040 msgid "clone only one branch, HEAD or --branch"

4041 msgstr "只克隆一个分支、HEAD 或 --branch"

4042

3924 -#: builtin/clone.c:99

3925 -msgid "use --reference only while cloning"

3926 -msgstr "仅在克隆时参考 --reference 指向的本地版本库"

3927 -

3928 -#: builtin/clone.c:100 builtin/init-db.c:502

4043 +#: builtin/clone.c:91 builtin/init-db.c:509

4044 msgid "gitdir"

4045 msgstr "git目录"

4046

3932 -#: builtin/clone.c:101 builtin/init-db.c:503

4047 +#: builtin/clone.c:92 builtin/init-db.c:510

4048 msgid "separate git dir from working tree"

4049 msgstr "git目录和工作区分离"

4050

3936 -#: builtin/clone.c:102

4051 +#: builtin/clone.c:93

4052 msgid "key=value"

4053 msgstr "key=value"

4054

3940 -#: builtin/clone.c:103

4055 +#: builtin/clone.c:94

4056 msgid "set config inside the new repository"

4057 msgstr "在新版本库中设置配置信息"

4058

3944 -#: builtin/clone.c:256

4059 +#: builtin/clone.c:247

4060 #, c-format

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

4062 msgstr "参考版本库 '%s' 不是一个本地版本库。"

4063

3949 -#: builtin/clone.c:260

4064 +#: builtin/clone.c:251

4065 #, c-format

4066 msgid "reference repository '%s' is shallow"

4067 msgstr "参考版本库 '%s' 是一个浅克隆"

4068

3954 -#: builtin/clone.c:263

4069 +#: builtin/clone.c:254

4070 #, c-format

4071 msgid "reference repository '%s' is grafted"

4072 msgstr "参考版本库 '%s' 已被嫁接"

4073

3959 -#: builtin/clone.c:325

4074 +#: builtin/clone.c:317

4075 #, c-format

4076 msgid "failed to create directory '%s'"

4077 msgstr "无法创建目录 '%s'"

4078

3964 -#: builtin/clone.c:327 builtin/diff.c:84

4079 +#: builtin/clone.c:319 builtin/diff.c:84

4080 #, c-format

4081 msgid "failed to stat '%s'"

4082 msgstr "无法枚举 '%s' 状态"

4083

3969 -#: builtin/clone.c:329

4084 +#: builtin/clone.c:321

4085 #, c-format

4086 msgid "%s exists and is not a directory"

4087 msgstr "%s 存在且不是一个目录"

4088

3974 -#: builtin/clone.c:343

4089 +#: builtin/clone.c:335

4090 #, c-format

4091 msgid "failed to stat %s\n"

4092 msgstr "无法枚举 %s 状态\n"

4093

3979 -#: builtin/clone.c:365

4094 +#: builtin/clone.c:357

4095 #, c-format

4096 msgid "failed to create link '%s'"

4097 msgstr "无法创建链接 '%s'"

4098

3984 -#: builtin/clone.c:369

4099 +#: builtin/clone.c:361

4100 #, c-format

4101 msgid "failed to copy file to '%s'"

4102 msgstr "无法拷贝文件至 '%s'"

4103

3989 -#: builtin/clone.c:392 builtin/clone.c:566

4104 +#: builtin/clone.c:384 builtin/clone.c:558

4105 #, c-format

4106 msgid "done.\n"

4107 msgstr "完成。\n"

4108

3994 -#: builtin/clone.c:404

4109 +#: builtin/clone.c:396

4110 msgid ""

4111 "Clone succeeded, but checkout failed.\n"

4112 "You can inspect what was checked out with 'git status'\n"

@@ -4001,120 +4116,115 @@ msgstr ""

4116 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

4117 "'git checkout -f HEAD' 重试\n"

4118

4004 -#: builtin/clone.c:481

4119 +#: builtin/clone.c:473

4120 #, c-format

4121 msgid "Could not find remote branch %s to clone."

4122 msgstr "不能发现要克隆的远程分支 %s。"

4123

4009 -#: builtin/clone.c:561

4124 +#: builtin/clone.c:553

4125 #, c-format

4126 msgid "Checking connectivity... "

4127 msgstr "检查连接... "

4128

4014 -#: builtin/clone.c:564

4129 +#: builtin/clone.c:556

4130 msgid "remote did not send all necessary objects"

4131 msgstr "远程没有发送所有必须的对象"

4132

4018 -#: builtin/clone.c:628

4133 +#: builtin/clone.c:620

4134 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4135 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

4136

4022 -#: builtin/clone.c:659

4137 +#: builtin/clone.c:651

4138 msgid "unable to checkout working tree"

4139 msgstr "不能检出工作区"

4140

4026 -#: builtin/clone.c:746

4141 +#: builtin/clone.c:738

4142 msgid "cannot repack to clean up"

4143 msgstr "无法执行 repack 来清理"

4144

4030 -#: builtin/clone.c:748

4145 +#: builtin/clone.c:740

4146 msgid "cannot unlink temporary alternates file"

4147 msgstr "无法删除临时的 alternates 文件"

4148

4034 -#: builtin/clone.c:778

4149 +#: builtin/clone.c:770

4150 msgid "Too many arguments."

4151 msgstr "太多参数。"

4152

4038 -#: builtin/clone.c:782

4153 +#: builtin/clone.c:774

4154 msgid "You must specify a repository to clone."

4155 msgstr "您必须指定一个版本库来克隆。"

4156

4042 -#: builtin/clone.c:793

4157 +#: builtin/clone.c:785

4158 #, c-format

4159 msgid "--bare and --origin %s options are incompatible."

4160 msgstr "--bare 和 --origin %s 选项不兼容。"

4161

4047 -#: builtin/clone.c:796

4162 +#: builtin/clone.c:788

4163 msgid "--bare and --separate-git-dir are incompatible."

4164 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

4165

4051 -#: builtin/clone.c:809

4166 +#: builtin/clone.c:801

4167 #, c-format

4168 msgid "repository '%s' does not exist"

4169 msgstr "版本库 '%s' 不存在"

4170

4056 -#: builtin/clone.c:815 builtin/fetch.c:1156

4171 +#: builtin/clone.c:807 builtin/fetch.c:1160

4172 #, c-format

4173 msgid "depth %s is not a positive number"

4174 msgstr "深度 %s 不是一个正数"

4175

4061 -#: builtin/clone.c:825

4176 +#: builtin/clone.c:817

4177 #, c-format

4178 msgid "destination path '%s' already exists and is not an empty directory."

4179 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

4180

4066 -#: builtin/clone.c:835

4181 +#: builtin/clone.c:827

4182 #, c-format

4183 msgid "working tree '%s' already exists."

4184 msgstr "工作区 '%s' 已经存在。"

4185

4071 -#: builtin/clone.c:850 builtin/clone.c:861

4072 -#, c-format

4073 -msgid "could not create leading directories of '%s'"

4074 -msgstr "不能为 '%s' 创建先导目录"

4075 -

4076 -#: builtin/clone.c:853

4186 +#: builtin/clone.c:845

4187 #, c-format

4188 msgid "could not create work tree dir '%s'"

4189 msgstr "不能创建工作区目录 '%s'"

4190

4081 -#: builtin/clone.c:871

4191 +#: builtin/clone.c:863

4192 #, c-format

4193 msgid "Cloning into bare repository '%s'...\n"

4194 msgstr "克隆到纯版本库 '%s'...\n"

4195

4086 -#: builtin/clone.c:873

4196 +#: builtin/clone.c:865

4197 #, c-format

4198 msgid "Cloning into '%s'...\n"

4199 msgstr "正克隆到 '%s'...\n"

4200

4091 -#: builtin/clone.c:898

4201 +#: builtin/clone.c:890

4202 msgid "--dissociate given, but there is no --reference"

4203 msgstr "提供了参数 --dissociate，但未提供 --reference"

4204

4095 -#: builtin/clone.c:913

4205 +#: builtin/clone.c:907

4206 msgid "--depth is ignored in local clones; use file:// instead."

4207 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

4208

4099 -#: builtin/clone.c:916

4209 +#: builtin/clone.c:910

4210 msgid "source repository is shallow, ignoring --local"

4211 msgstr "源版本库是浅克隆，忽略 --local"

4212

4103 -#: builtin/clone.c:921

4213 +#: builtin/clone.c:915

4214 msgid "--local is ignored"

4215 msgstr "--local 被忽略"

4216

4107 -#: builtin/clone.c:925

4217 +#: builtin/clone.c:919

4218 #, c-format

4219 msgid "Don't know how to clone %s"

4220 msgstr "不知道如何克隆 %s"

4221

4112 -#: builtin/clone.c:976 builtin/clone.c:984

4222 +#: builtin/clone.c:968 builtin/clone.c:976

4223 #, c-format

4224 msgid "Remote branch %s not found in upstream %s"

4225 msgstr "远程分支 %s 在上游 %s 未发现"

4226

4117 -#: builtin/clone.c:987

4227 +#: builtin/clone.c:979

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

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

4230

@@ -4344,7 +4454,7 @@ msgstr "不能读取 MERGE_MSG"

4454 msgid "could not read SQUASH_MSG"

4455 msgstr "不能读取 SQUASH_MSG"

4456

4347 -#: builtin/commit.c:738

4457 +#: builtin/commit.c:738 builtin/merge.c:1079

4458 #, c-format

4459 msgid "could not read '%s'"

4460 msgstr "不能读取 '%s'"

@@ -4502,32 +4612,32 @@ msgstr "无效的清理模式 %s"

4612 msgid "Paths with -a does not make sense."

4613 msgstr "路径和 -a 选项同时使用没有意义。"

4614

4505 -#: builtin/commit.c:1324 builtin/commit.c:1604

4615 +#: builtin/commit.c:1324 builtin/commit.c:1603

4616 msgid "show status concisely"

4617 msgstr "以简洁的格式显示状态"

4618

4509 -#: builtin/commit.c:1326 builtin/commit.c:1606

4619 +#: builtin/commit.c:1326 builtin/commit.c:1605

4620 msgid "show branch information"

4621 msgstr "显示分支信息"

4622

4513 -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509

4623 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

4624 msgid "machine-readable output"

4625 msgstr "机器可读的输出"

4626

4517 -#: builtin/commit.c:1331 builtin/commit.c:1610

4627 +#: builtin/commit.c:1331 builtin/commit.c:1609

4628 msgid "show status in long format (default)"

4629 msgstr "以长格式显示状态（默认）"

4630

4521 -#: builtin/commit.c:1334 builtin/commit.c:1613

4631 +#: builtin/commit.c:1334 builtin/commit.c:1612

4632 msgid "terminate entries with NUL"

4633 msgstr "条目以NUL字符结尾"

4634

4525 -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980

4635 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

4636 #: builtin/fast-export.c:983 builtin/tag.c:603

4637 msgid "mode"

4638 msgstr "模式"

4639

4530 -#: builtin/commit.c:1337 builtin/commit.c:1616

4640 +#: builtin/commit.c:1337 builtin/commit.c:1615

4641 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4642 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

4643

@@ -4535,7 +4645,7 @@ msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、

4645 msgid "show ignored files"

4646 msgstr "显示忽略的文件"

4647

4538 -#: builtin/commit.c:1341 parse-options.h:153

4648 +#: builtin/commit.c:1341 parse-options.h:152

4649 msgid "when"

4650 msgstr "何时"

4651

@@ -4550,204 +4660,204 @@ msgstr ""

4660 msgid "list untracked files in columns"

4661 msgstr "以列的方式显示未跟踪的文件"

4662

4553 -#: builtin/commit.c:1431

4663 +#: builtin/commit.c:1430

4664 msgid "couldn't look up newly created commit"

4665 msgstr "无法找到新创建的提交"

4666

4557 -#: builtin/commit.c:1433

4667 +#: builtin/commit.c:1432

4668 msgid "could not parse newly created commit"

4669 msgstr "不能解析新创建的提交"

4670

4561 -#: builtin/commit.c:1478

4671 +#: builtin/commit.c:1477

4672 msgid "detached HEAD"

4673 msgstr "分离头指针"

4674

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

4566 -#: builtin/commit.c:1481

4676 +#: builtin/commit.c:1480

4677 msgid " (root-commit)"

4678 msgstr "（根提交）"

4679

4570 -#: builtin/commit.c:1574

4680 +#: builtin/commit.c:1573

4681 msgid "suppress summary after successful commit"

4682 msgstr "提交成功后不显示概述信息"

4683

4574 -#: builtin/commit.c:1575

4684 +#: builtin/commit.c:1574

4685 msgid "show diff in commit message template"

4686 msgstr "在提交说明模板里显示差异"

4687

4578 -#: builtin/commit.c:1577

4688 +#: builtin/commit.c:1576

4689 msgid "Commit message options"

4690 msgstr "提交说明选项"

4691

4582 -#: builtin/commit.c:1578 builtin/tag.c:601

4692 +#: builtin/commit.c:1577 builtin/tag.c:601

4693 msgid "read message from file"

4694 msgstr "从文件中读取提交说明"

4695

4586 -#: builtin/commit.c:1579

4696 +#: builtin/commit.c:1578

4697 msgid "author"

4698 msgstr "作者"

4699

4590 -#: builtin/commit.c:1579

4700 +#: builtin/commit.c:1578

4701 msgid "override author for commit"

4702 msgstr "提交时覆盖作者"

4703

4594 -#: builtin/commit.c:1580 builtin/gc.c:275

4704 +#: builtin/commit.c:1579 builtin/gc.c:280

4705 msgid "date"

4706 msgstr "日期"

4707

4598 -#: builtin/commit.c:1580

4708 +#: builtin/commit.c:1579

4709 msgid "override date for commit"

4710 msgstr "提交时覆盖日期"

4711

4602 -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391

4712 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

4713 #: builtin/notes.c:554 builtin/tag.c:599

4714 msgid "message"

4715 msgstr "说明"

4716

4607 -#: builtin/commit.c:1581

4717 +#: builtin/commit.c:1580

4718 msgid "commit message"

4719 msgstr "提交说明"

4720

4611 -#: builtin/commit.c:1582

4721 +#: builtin/commit.c:1581

4722 msgid "reuse and edit message from specified commit"

4723 msgstr "重用并编辑指定提交的提交说明"

4724

4615 -#: builtin/commit.c:1583

4725 +#: builtin/commit.c:1582

4726 msgid "reuse message from specified commit"

4727 msgstr "重用指定提交的提交说明"

4728

4619 -#: builtin/commit.c:1584

4729 +#: builtin/commit.c:1583

4730 msgid "use autosquash formatted message to fixup specified commit"

4731 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

4732

4623 -#: builtin/commit.c:1585

4733 +#: builtin/commit.c:1584

4734 msgid "use autosquash formatted message to squash specified commit"

4735 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

4736

4627 -#: builtin/commit.c:1586

4737 +#: builtin/commit.c:1585

4738 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4739 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

4740

4631 -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86

4741 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

4742 msgid "add Signed-off-by:"

4743 msgstr "添加 Signed-off-by: 签名"

4744

4635 -#: builtin/commit.c:1588

4745 +#: builtin/commit.c:1587

4746 msgid "use specified template file"

4747 msgstr "使用指定的模板文件"

4748

4639 -#: builtin/commit.c:1589

4749 +#: builtin/commit.c:1588

4750 msgid "force edit of commit"

4751 msgstr "强制编辑提交"

4752

4753 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

4644 -#: builtin/commit.c:1590

4754 +#: builtin/commit.c:1589

4755 msgid "default"

4756 msgstr "default"

4757

4648 -#: builtin/commit.c:1590 builtin/tag.c:604

4758 +#: builtin/commit.c:1589 builtin/tag.c:604

4759 msgid "how to strip spaces and #comments from message"

4760 msgstr "设置如何删除提交说明里的空格和#注释"

4761

4652 -#: builtin/commit.c:1591

4762 +#: builtin/commit.c:1590

4763 msgid "include status in commit message template"

4764 msgstr "在提交说明模板里包含状态信息"

4765

4656 -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92

4766 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4767 #: builtin/tag.c:605

4768 msgid "key-id"

4769 msgstr "key-id"

4770

4661 -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93

4771 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

4772 msgid "GPG sign commit"

4773 msgstr "GPG 提交签名"

4774

4665 -#: builtin/commit.c:1596

4775 +#: builtin/commit.c:1595

4776 msgid "Commit contents options"

4777 msgstr "提交内容选项"

4778

4669 -#: builtin/commit.c:1597

4779 +#: builtin/commit.c:1596

4780 msgid "commit all changed files"

4781 msgstr "提交所有改动的文件"

4782

4673 -#: builtin/commit.c:1598

4783 +#: builtin/commit.c:1597

4784 msgid "add specified files to index for commit"

4785 msgstr "添加指定的文件到索引区等待提交"

4786

4677 -#: builtin/commit.c:1599

4787 +#: builtin/commit.c:1598

4788 msgid "interactively add files"

4789 msgstr "交互式添加文件"

4790

4681 -#: builtin/commit.c:1600

4791 +#: builtin/commit.c:1599

4792 msgid "interactively add changes"

4793 msgstr "交互式添加变更"

4794

4685 -#: builtin/commit.c:1601

4795 +#: builtin/commit.c:1600

4796 msgid "commit only specified files"

4797 msgstr "只提交指定的文件"

4798

4689 -#: builtin/commit.c:1602

4799 +#: builtin/commit.c:1601

4800 msgid "bypass pre-commit hook"

4801 msgstr "绕过 pre-commit 钩子"

4802

4693 -#: builtin/commit.c:1603

4803 +#: builtin/commit.c:1602

4804 msgid "show what would be committed"

4805 msgstr "显示将要提交的内容"

4806

4697 -#: builtin/commit.c:1614

4807 +#: builtin/commit.c:1613

4808 msgid "amend previous commit"

4809 msgstr "修改先前的提交"

4810

4701 -#: builtin/commit.c:1615

4811 +#: builtin/commit.c:1614

4812 msgid "bypass post-rewrite hook"

4813 msgstr "绕过 post-rewrite 钩子"

4814

4705 -#: builtin/commit.c:1620

4815 +#: builtin/commit.c:1619

4816 msgid "ok to record an empty change"

4817 msgstr "允许一个空提交"

4818

4709 -#: builtin/commit.c:1622

4819 +#: builtin/commit.c:1621

4820 msgid "ok to record a change with an empty message"

4821 msgstr "允许空的提交说明"

4822

4713 -#: builtin/commit.c:1651

4823 +#: builtin/commit.c:1650

4824 msgid "could not parse HEAD commit"

4825 msgstr "不能解析 HEAD 提交"

4826

4717 -#: builtin/commit.c:1690 builtin/merge.c:519

4827 +#: builtin/commit.c:1689 builtin/merge.c:1076

4828 #, c-format

4829 msgid "could not open '%s' for reading"

4830 msgstr "不能为读入打开 '%s'"

4831

4722 -#: builtin/commit.c:1697

4832 +#: builtin/commit.c:1696

4833 #, c-format

4834 msgid "Corrupt MERGE_HEAD file (%s)"

4835 msgstr "损坏的 MERGE_HEAD 文件（%s）"

4836

4727 -#: builtin/commit.c:1704

4837 +#: builtin/commit.c:1703

4838 msgid "could not read MERGE_MODE"

4839 msgstr "不能读取 MERGE_MODE"

4840

4731 -#: builtin/commit.c:1723

4841 +#: builtin/commit.c:1722

4842 #, c-format

4843 msgid "could not read commit message: %s"

4844 msgstr "不能读取提交说明：%s"

4845

4736 -#: builtin/commit.c:1734

4846 +#: builtin/commit.c:1733

4847 #, c-format

4848 msgid "Aborting commit; you did not edit the message.\n"

4849 msgstr "终止提交；您未更改来自模版的提交说明。\n"

4850

4741 -#: builtin/commit.c:1739

4851 +#: builtin/commit.c:1738

4852 #, c-format

4853 msgid "Aborting commit due to empty commit message.\n"

4854 msgstr "终止提交因为提交说明为空。\n"

4855

4746 -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876

4856 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

4857 msgid "failed to write commit object"

4858 msgstr "无法写提交对象"

4859

4750 -#: builtin/commit.c:1787

4860 +#: builtin/commit.c:1786

4861 msgid ""

4862 "Repository has been updated, but unable to write\n"

4863 "new_index file. Check that disk is not full and quota is\n"

@@ -4888,18 +4998,18 @@ msgstr "不能解析缺省的颜色值"

4998 #, c-format

4999 msgid ""

5000 "# This is Git's per-user configuration file.\n"

4891 -"[core]\n"

5001 +"[user]\n"

5002 "# Please adapt and uncomment the following lines:\n"

4893 -"#\tuser = %s\n"

5003 +"#\tname = %s\n"

5004 "#\temail = %s\n"

5005 msgstr ""

5006 "# This is Git's per-user configuration file.\n"

4897 -"[core]\n"

5007 +"[user]\n"

5008 "# Please adapt and uncomment the following lines:\n"

4899 -"#\tuser = %s\n"

5009 +"#\tname = %s\n"

5010 "#\temail = %s\n"

5011

4902 -#: builtin/config.c:589

5012 +#: builtin/config.c:587

5013 #, c-format

5014 msgid "cannot create configuration file %s"

5015 msgstr "不能创建配置文件 %s"

@@ -5230,82 +5340,82 @@ msgstr "引用映射"

5340 msgid "specify fetch refmap"

5341 msgstr "指定获取操作的引用映射"

5342

5233 -#: builtin/fetch.c:375

5343 +#: builtin/fetch.c:377

5344 msgid "Couldn't find remote ref HEAD"

5345 msgstr "无法发现远程 HEAD 引用"

5346

5237 -#: builtin/fetch.c:455

5347 +#: builtin/fetch.c:457

5348 #, c-format

5349 msgid "object %s not found"

5350 msgstr "对象 %s 未发现"

5351

5242 -#: builtin/fetch.c:460

5352 +#: builtin/fetch.c:462

5353 msgid "[up to date]"

5354 msgstr "[最新]"

5355

5246 -#: builtin/fetch.c:474

5356 +#: builtin/fetch.c:476

5357 #, c-format

5358 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5359 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

5360

5251 -#: builtin/fetch.c:475 builtin/fetch.c:561

5361 +#: builtin/fetch.c:477 builtin/fetch.c:563

5362 msgid "[rejected]"

5363 msgstr "[已拒绝]"

5364

5255 -#: builtin/fetch.c:486

5365 +#: builtin/fetch.c:488

5366 msgid "[tag update]"

5367 msgstr "[tag更新]"

5368

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

5260 -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541

5370 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5371 msgid " (unable to update local ref)"

5372 msgstr " （不能更新本地引用）"

5373

5264 -#: builtin/fetch.c:506

5374 +#: builtin/fetch.c:508

5375 msgid "[new tag]"

5376 msgstr "[新tag]"

5377

5268 -#: builtin/fetch.c:509

5378 +#: builtin/fetch.c:511

5379 msgid "[new branch]"

5380 msgstr "[新分支]"

5381

5272 -#: builtin/fetch.c:512

5382 +#: builtin/fetch.c:514

5383 msgid "[new ref]"

5384 msgstr "[新引用]"

5385

5276 -#: builtin/fetch.c:557

5386 +#: builtin/fetch.c:559

5387 msgid "unable to update local ref"

5388 msgstr "不能更新本地引用"

5389

5280 -#: builtin/fetch.c:557

5390 +#: builtin/fetch.c:559

5391 msgid "forced update"

5392 msgstr "强制更新"

5393

5284 -#: builtin/fetch.c:563

5394 +#: builtin/fetch.c:565

5395 msgid "(non-fast-forward)"

5396 msgstr "（非快进式）"

5397

5288 -#: builtin/fetch.c:596 builtin/fetch.c:829

5398 +#: builtin/fetch.c:599 builtin/fetch.c:832

5399 #, c-format

5400 msgid "cannot open %s: %s\n"

5401 msgstr "无法打开 %s：%s\n"

5402

5293 -#: builtin/fetch.c:605

5403 +#: builtin/fetch.c:608

5404 #, c-format

5405 msgid "%s did not send all necessary objects\n"

5406 msgstr "%s 未发送所有必须的对象\n"

5407

5298 -#: builtin/fetch.c:623

5408 +#: builtin/fetch.c:626

5409 #, c-format

5410 msgid "reject %s because shallow roots are not allowed to be updated"

5411 msgstr "拒绝 %s 因为浅克隆不允许被更新"

5412

5303 -#: builtin/fetch.c:711 builtin/fetch.c:794

5413 +#: builtin/fetch.c:714 builtin/fetch.c:797

5414 #, c-format

5415 msgid "From %.*s\n"

5416 msgstr "来自 %.*s\n"

5417

5308 -#: builtin/fetch.c:722

5418 +#: builtin/fetch.c:725

5419 #, c-format

5420 msgid ""

5421 "some local refs could not be updated; try running\n"

@@ -5315,87 +5425,87 @@ msgstr ""

5425 " 'git remote prune %s' 来删除旧的、有冲突的分支"

5426

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

5318 -#: builtin/fetch.c:774

5428 +#: builtin/fetch.c:777

5429 #, c-format

5430 msgid " (%s will become dangling)"

5431 msgstr " （%s 将成为摇摆状态）"

5432

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

5324 -#: builtin/fetch.c:775

5434 +#: builtin/fetch.c:778

5435 #, c-format

5436 msgid " (%s has become dangling)"

5437 msgstr " （%s 已成为摇摆状态）"

5438

5329 -#: builtin/fetch.c:799

5439 +#: builtin/fetch.c:802

5440 msgid "[deleted]"

5441 msgstr "[已删除]"

5442

5333 -#: builtin/fetch.c:800 builtin/remote.c:1060

5443 +#: builtin/fetch.c:803 builtin/remote.c:1057

5444 msgid "(none)"

5445 msgstr "（无）"

5446

5337 -#: builtin/fetch.c:819

5447 +#: builtin/fetch.c:822

5448 #, c-format

5449 msgid "Refusing to fetch into current branch %s of non-bare repository"

5450 msgstr "拒绝获取到非纯版本库的当前分支 %s"

5451

5342 -#: builtin/fetch.c:838

5452 +#: builtin/fetch.c:841

5453 #, c-format

5454 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5455 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

5456

5347 -#: builtin/fetch.c:841

5457 +#: builtin/fetch.c:844

5458 #, c-format

5459 msgid "Option \"%s\" is ignored for %s\n"

5460 msgstr "选项 \"%s\" 为 %s 所忽略\n"

5461

5352 -#: builtin/fetch.c:897

5462 +#: builtin/fetch.c:900

5463 #, c-format

5464 msgid "Don't know how to fetch from %s"

5465 msgstr "不知道如何从 %s 获取"

5466

5357 -#: builtin/fetch.c:1059

5467 +#: builtin/fetch.c:1063

5468 #, c-format

5469 msgid "Fetching %s\n"

5470 msgstr "正在获取 %s\n"

5471

5362 -#: builtin/fetch.c:1061 builtin/remote.c:90

5472 +#: builtin/fetch.c:1065 builtin/remote.c:90

5473 #, c-format

5474 msgid "Could not fetch %s"

5475 msgstr "不能获取 %s"

5476

5367 -#: builtin/fetch.c:1079

5477 +#: builtin/fetch.c:1083

5478 msgid ""

5479 "No remote repository specified. Please, specify either a URL or a\n"

5480 "remote name from which new revisions should be fetched."

5481 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

5482

5373 -#: builtin/fetch.c:1102

5483 +#: builtin/fetch.c:1106

5484 msgid "You need to specify a tag name."

5485 msgstr "您需要指定一个 tag 名称。"

5486

5377 -#: builtin/fetch.c:1144

5487 +#: builtin/fetch.c:1148

5488 msgid "--depth and --unshallow cannot be used together"

5489 msgstr "--depth 和 --unshallow 不能同时使用"

5490

5381 -#: builtin/fetch.c:1146

5491 +#: builtin/fetch.c:1150

5492 msgid "--unshallow on a complete repository does not make sense"

5493 msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"

5494

5385 -#: builtin/fetch.c:1169

5495 +#: builtin/fetch.c:1173

5496 msgid "fetch --all does not take a repository argument"

5497 msgstr "fetch --all 不能带一个版本库参数"

5498

5389 -#: builtin/fetch.c:1171

5499 +#: builtin/fetch.c:1175

5500 msgid "fetch --all does not make sense with refspecs"

5501 msgstr "fetch --all 带引用规则没有任何意义"

5502

5393 -#: builtin/fetch.c:1182

5503 +#: builtin/fetch.c:1186

5504 #, c-format

5505 msgid "No such remote or remote group: %s"

5506 msgstr "没有这样的远程或远程组：%s"

5507

5398 -#: builtin/fetch.c:1190

5508 +#: builtin/fetch.c:1194

5509 msgid "Fetching a group and specifying refspecs does not make sense"

5510 msgstr "获取组并指定引用规则没有意义"

5511

@@ -5404,130 +5514,130 @@ msgid ""

5514 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"

5515 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"

5516

5407 -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5517 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

5518 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5409 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590

5410 -#: parse-options.h:132 parse-options.h:239

5519 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5520 +#: parse-options.h:131 parse-options.h:238

5521 msgid "n"

5522 msgstr "n"

5523

5414 -#: builtin/fmt-merge-msg.c:663

5524 +#: builtin/fmt-merge-msg.c:669

5525 msgid "populate log with at most <n> entries from shortlog"

5526 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"

5527

5418 -#: builtin/fmt-merge-msg.c:666

5528 +#: builtin/fmt-merge-msg.c:672

5529 msgid "alias for --log (deprecated)"

5530 msgstr "参数 --log 的别名（已弃用）"

5531

5422 -#: builtin/fmt-merge-msg.c:669

5532 +#: builtin/fmt-merge-msg.c:675

5533 msgid "text"

5534 msgstr "文本"

5535

5426 -#: builtin/fmt-merge-msg.c:670

5536 +#: builtin/fmt-merge-msg.c:676

5537 msgid "use <text> as start of message"

5538 msgstr "使用 <文本> 作为提交说明的开始"

5539

5430 -#: builtin/fmt-merge-msg.c:671

5540 +#: builtin/fmt-merge-msg.c:677

5541 msgid "file to read from"

5542 msgstr "从文件中读取"

5543

5434 -#: builtin/for-each-ref.c:675

5544 +#: builtin/for-each-ref.c:687

5545 msgid "unable to parse format"

5546 msgstr "不能解析格式"

5547

5438 -#: builtin/for-each-ref.c:1063

5548 +#: builtin/for-each-ref.c:1083

5549 msgid "git for-each-ref [<options>] [<pattern>]"

5550 msgstr "git for-each-ref [<选项>] [<模式>]"

5551

5442 -#: builtin/for-each-ref.c:1078

5552 +#: builtin/for-each-ref.c:1098

5553 msgid "quote placeholders suitably for shells"

5554 msgstr "引用占位符适用于 shells"

5555

5446 -#: builtin/for-each-ref.c:1080

5556 +#: builtin/for-each-ref.c:1100

5557 msgid "quote placeholders suitably for perl"

5558 msgstr "引用占位符适用于 perl"

5559

5450 -#: builtin/for-each-ref.c:1082

5560 +#: builtin/for-each-ref.c:1102

5561 msgid "quote placeholders suitably for python"

5562 msgstr "引用占位符适用于 python"

5563

5454 -#: builtin/for-each-ref.c:1084

5564 +#: builtin/for-each-ref.c:1104

5565 msgid "quote placeholders suitably for Tcl"

5566 msgstr "引用占位符适用于 Tcl"

5567

5458 -#: builtin/for-each-ref.c:1087

5568 +#: builtin/for-each-ref.c:1107

5569 msgid "show only <n> matched refs"

5570 msgstr "只显示 <n> 个匹配的引用"

5571

5462 -#: builtin/for-each-ref.c:1088 builtin/replace.c:438

5572 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5573 msgid "format"

5574 msgstr "格式"

5575

5466 -#: builtin/for-each-ref.c:1088

5576 +#: builtin/for-each-ref.c:1108

5577 msgid "format to use for the output"

5578 msgstr "输出格式"

5579

5470 -#: builtin/for-each-ref.c:1089

5580 +#: builtin/for-each-ref.c:1109

5581 msgid "key"

5582 msgstr "key"

5583

5474 -#: builtin/for-each-ref.c:1090

5584 +#: builtin/for-each-ref.c:1110

5585 msgid "field name to sort on"

5586 msgstr "排序的字段名"

5587

5478 -#: builtin/fsck.c:147 builtin/prune.c:137

5588 +#: builtin/fsck.c:147 builtin/prune.c:236

5589 msgid "Checking connectivity"

5590 msgstr "检查连接中"

5591

5482 -#: builtin/fsck.c:540

5592 +#: builtin/fsck.c:548

5593 msgid "Checking object directories"

5594 msgstr "检查对象目录中"

5595

5486 -#: builtin/fsck.c:603

5596 +#: builtin/fsck.c:611

5597 msgid "git fsck [<options>] [<object>...]"

5598 msgstr "git fsck [<选项>] [<对象>...]"

5599

5490 -#: builtin/fsck.c:609

5600 +#: builtin/fsck.c:617

5601 msgid "show unreachable objects"

5602 msgstr "显示不可达的对象"

5603

5494 -#: builtin/fsck.c:610

5604 +#: builtin/fsck.c:618

5605 msgid "show dangling objects"

5606 msgstr "显示摇摆的对象"

5607

5498 -#: builtin/fsck.c:611

5608 +#: builtin/fsck.c:619

5609 msgid "report tags"

5610 msgstr "报告 tags"

5611

5502 -#: builtin/fsck.c:612

5612 +#: builtin/fsck.c:620

5613 msgid "report root nodes"

5614 msgstr "报告根节点"

5615

5506 -#: builtin/fsck.c:613

5616 +#: builtin/fsck.c:621

5617 msgid "make index objects head nodes"

5618 msgstr "将索引亦作为检查的头节点"

5619

5510 -#: builtin/fsck.c:614

5620 +#: builtin/fsck.c:622

5621 msgid "make reflogs head nodes (default)"

5622 msgstr "将引用日志作为检查的头节点（默认）"

5623

5514 -#: builtin/fsck.c:615

5624 +#: builtin/fsck.c:623

5625 msgid "also consider packs and alternate objects"

5626 msgstr "也考虑包和备用对象"

5627

5518 -#: builtin/fsck.c:616

5628 +#: builtin/fsck.c:624

5629 msgid "enable more strict checking"

5630 msgstr "启用更严格的检查"

5631

5522 -#: builtin/fsck.c:618

5632 +#: builtin/fsck.c:626

5633 msgid "write dangling objects in .git/lost-found"

5634 msgstr "将摇摆对象写入 .git/lost-found 中"

5635

5526 -#: builtin/fsck.c:619 builtin/prune.c:108

5636 +#: builtin/fsck.c:627 builtin/prune.c:198

5637 msgid "show progress"

5638 msgstr "显示进度"

5639

5530 -#: builtin/fsck.c:669

5640 +#: builtin/fsck.c:677

5641 msgid "Checking objects"

5642 msgstr "检查对象中"

5643

@@ -5535,55 +5645,55 @@ msgstr "检查对象中"

5645 msgid "git gc [<options>]"

5646 msgstr "git gc [<选项>]"

5647

5538 -#: builtin/gc.c:79

5648 +#: builtin/gc.c:67

5649 #, c-format

5540 -msgid "Invalid gc.pruneexpire: '%s'"

5541 -msgstr "无效的 gc.pruneexpire：'%s'"

5650 +msgid "Invalid %s: '%s'"

5651 +msgstr "无效 %s：'%s'"

5652

5543 -#: builtin/gc.c:107

5653 +#: builtin/gc.c:112

5654 #, c-format

5655 msgid "insanely long object directory %.*s"

5656 msgstr "不正常的长对象目录 %.*s"

5657

5548 -#: builtin/gc.c:276

5658 +#: builtin/gc.c:281

5659 msgid "prune unreferenced objects"

5660 msgstr "清除未引用的对象"

5661

5552 -#: builtin/gc.c:278

5662 +#: builtin/gc.c:283

5663 msgid "be more thorough (increased runtime)"

5664 msgstr "更彻底（增加运行时间）"

5665

5556 -#: builtin/gc.c:279

5666 +#: builtin/gc.c:284

5667 msgid "enable auto-gc mode"

5668 msgstr "启用自动垃圾回收模式"

5669

5560 -#: builtin/gc.c:280

5670 +#: builtin/gc.c:285

5671 msgid "force running gc even if there may be another gc running"

5672 msgstr "强制执行 gc 即使另外一个 gc 正在执行"

5673

5564 -#: builtin/gc.c:321

5674 +#: builtin/gc.c:327

5675 #, c-format

5676 msgid "Auto packing the repository in background for optimum performance.\n"

5677 msgstr "自动在后台执行版本库打包以求最佳性能。\n"

5678

5569 -#: builtin/gc.c:323

5679 +#: builtin/gc.c:329

5680 #, c-format

5681 msgid "Auto packing the repository for optimum performance.\n"

5682 msgstr "自动打包版本库以求最佳性能。\n"

5683

5574 -#: builtin/gc.c:324

5684 +#: builtin/gc.c:330

5685 #, c-format

5686 msgid "See \"git help gc\" for manual housekeeping.\n"

5687 msgstr "手工维护参见 \"git help gc\"。\n"

5688

5579 -#: builtin/gc.c:342

5689 +#: builtin/gc.c:348

5690 #, c-format

5691 msgid ""

5692 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5693 msgstr ""

5694 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"

5695

5586 -#: builtin/gc.c:364

5696 +#: builtin/gc.c:376

5697 msgid ""

5698 "There are too many unreachable loose objects; run 'git prune' to remove them."

5699 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

@@ -5786,7 +5896,7 @@ msgstr "分页显示匹配的文件"

5896 msgid "allow calling of grep(1) (ignored by this build)"

5897 msgstr "允许调用 grep(1)（本次构建忽略）"

5898

5789 -#: builtin/grep.c:741 builtin/show-ref.c:187

5899 +#: builtin/grep.c:741 builtin/show-ref.c:189

5900 msgid "show usage"

5901 msgstr "显示用法"

5902

@@ -5814,7 +5924,7 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

5924 msgid "both --cached and trees are given."

5925 msgstr "同时给出了 --cached 和树对象。"

5926

5817 -#: builtin/hash-object.c:82

5927 +#: builtin/hash-object.c:80

5928 msgid ""

5929 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

5930 "[--] <file>..."

@@ -5822,36 +5932,36 @@ msgstr ""

5932 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "

5933 "[--] <文件>..."

5934

5825 -#: builtin/hash-object.c:83

5935 +#: builtin/hash-object.c:81

5936 msgid "git hash-object --stdin-paths < <list-of-paths>"

5937 msgstr "git hash-object --stdin-paths < <路径列表>"

5938

5829 -#: builtin/hash-object.c:94 builtin/tag.c:612

5939 +#: builtin/hash-object.c:92 builtin/tag.c:612

5940 msgid "type"

5941 msgstr "类型"

5942

5833 -#: builtin/hash-object.c:94

5943 +#: builtin/hash-object.c:92

5944 msgid "object type"

5945 msgstr "对象类型"

5946

5837 -#: builtin/hash-object.c:95

5947 +#: builtin/hash-object.c:93

5948 msgid "write the object into the object database"

5949 msgstr "将对象写入对象数据库"

5950

5841 -#: builtin/hash-object.c:97

5951 +#: builtin/hash-object.c:95

5952 msgid "read the object from stdin"

5953 msgstr "从标准输入读取对象"

5954

5845 -#: builtin/hash-object.c:99

5955 +#: builtin/hash-object.c:97

5956 msgid "store file as is without filters"

5957 msgstr "原样存储文件不使用过滤器"

5958

5849 -#: builtin/hash-object.c:100

5959 +#: builtin/hash-object.c:98

5960 msgid ""

5961 "just hash any random garbage to create corrupt objects for debugging Git"

5962 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"

5963

5854 -#: builtin/hash-object.c:101

5964 +#: builtin/hash-object.c:99

5965 msgid "process file as it were from this path"

5966 msgstr "处理文件并假设其来自于此路径"

5967

@@ -5979,291 +6089,291 @@ msgstr "用法：%s%s"

6089 msgid "`git %s' is aliased to `%s'"

6090 msgstr "`git %s' 是 `%s' 的别名"

6091

5982 -#: builtin/index-pack.c:150

6092 +#: builtin/index-pack.c:151

6093 #, c-format

6094 msgid "unable to open %s"

6095 msgstr "不能打开 %s"

6096

5987 -#: builtin/index-pack.c:200

6097 +#: builtin/index-pack.c:201

6098 #, c-format

6099 msgid "object type mismatch at %s"

6100 msgstr "%s 的对象类型不匹配"

6101

5992 -#: builtin/index-pack.c:220

6102 +#: builtin/index-pack.c:221

6103 #, c-format

6104 msgid "did not receive expected object %s"

6105 msgstr "未能获取期望的对象 %s"

6106

5997 -#: builtin/index-pack.c:223

6107 +#: builtin/index-pack.c:224

6108 #, c-format

6109 msgid "object %s: expected type %s, found %s"

6110 msgstr "对象 %s：期待类型 %s，却是 %s"

6111

6002 -#: builtin/index-pack.c:265

6112 +#: builtin/index-pack.c:266

6113 #, c-format

6114 msgid "cannot fill %d byte"

6115 msgid_plural "cannot fill %d bytes"

6116 msgstr[0] "无法填充 %d 字节"

6117 msgstr[1] "无法填充 %d 字节"

6118

6009 -#: builtin/index-pack.c:275

6119 +#: builtin/index-pack.c:276

6120 msgid "early EOF"

6121 msgstr "过早的文件结束符（EOF）"

6122

6013 -#: builtin/index-pack.c:276

6123 +#: builtin/index-pack.c:277

6124 msgid "read error on input"

6125 msgstr "输入上的读错误"

6126

6017 -#: builtin/index-pack.c:288

6127 +#: builtin/index-pack.c:289

6128 msgid "used more bytes than were available"

6129 msgstr "用掉了超过可用的字节"

6130

6021 -#: builtin/index-pack.c:295

6131 +#: builtin/index-pack.c:296

6132 msgid "pack too large for current definition of off_t"

6133 msgstr "包太大超过了当前 off_t 的定义"

6134

6025 -#: builtin/index-pack.c:311

6135 +#: builtin/index-pack.c:312

6136 #, c-format

6137 msgid "unable to create '%s'"

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

6139

6030 -#: builtin/index-pack.c:316

6140 +#: builtin/index-pack.c:317

6141 #, c-format

6142 msgid "cannot open packfile '%s'"

6143 msgstr "无法打开包文件 '%s'"

6144

6035 -#: builtin/index-pack.c:330

6145 +#: builtin/index-pack.c:331

6146 msgid "pack signature mismatch"

6147 msgstr "包签名不匹配"

6148

6039 -#: builtin/index-pack.c:332

6149 +#: builtin/index-pack.c:333

6150 #, c-format

6151 msgid "pack version %<PRIu32> unsupported"

6152 msgstr "不支持包版本 %<PRIu32>"

6153

6044 -#: builtin/index-pack.c:350

6154 +#: builtin/index-pack.c:351

6155 #, c-format

6156 msgid "pack has bad object at offset %lu: %s"

6157 msgstr "包中有错误的对象位于 %lu：%s"

6158

6049 -#: builtin/index-pack.c:471

6159 +#: builtin/index-pack.c:472

6160 #, c-format

6161 msgid "inflate returned %d"

6162 msgstr "解压缩返回 %d"

6163

6054 -#: builtin/index-pack.c:520

6164 +#: builtin/index-pack.c:521

6165 msgid "offset value overflow for delta base object"

6166 msgstr "偏移值覆盖了 delta 基准对象"

6167

6058 -#: builtin/index-pack.c:528

6168 +#: builtin/index-pack.c:529

6169 msgid "delta base offset is out of bound"

6170 msgstr "delta 基准偏移越界"

6171

6062 -#: builtin/index-pack.c:536

6172 +#: builtin/index-pack.c:537

6173 #, c-format

6174 msgid "unknown object type %d"

6175 msgstr "未知对象类型 %d"

6176

6067 -#: builtin/index-pack.c:567

6177 +#: builtin/index-pack.c:568

6178 msgid "cannot pread pack file"

6179 msgstr "无法读取包文件"

6180

6071 -#: builtin/index-pack.c:569

6181 +#: builtin/index-pack.c:570

6182 #, c-format

6183 msgid "premature end of pack file, %lu byte missing"

6184 msgid_plural "premature end of pack file, %lu bytes missing"

6185 msgstr[0] "包文件过早结束，缺少 %lu 字节"

6186 msgstr[1] "包文件过早结束，缺少 %lu 字节"

6187

6078 -#: builtin/index-pack.c:595

6188 +#: builtin/index-pack.c:596

6189 msgid "serious inflate inconsistency"

6190 msgstr "解压缩严重的不一致"

6191

6082 -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715

6083 -#: builtin/index-pack.c:749 builtin/index-pack.c:758

6192 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

6193 +#: builtin/index-pack.c:805 builtin/index-pack.c:814

6194 #, c-format

6195 msgid "SHA1 COLLISION FOUND WITH %s !"

6196 msgstr "发现 %s 出现 SHA1 冲突！"

6197

6088 -#: builtin/index-pack.c:689 builtin/pack-objects.c:162

6198 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162

6199 #: builtin/pack-objects.c:254

6200 #, c-format

6201 msgid "unable to read %s"

6202 msgstr "不能读 %s"

6203

6094 -#: builtin/index-pack.c:755

6204 +#: builtin/index-pack.c:811

6205 #, c-format

6206 msgid "cannot read existing object %s"

6207 msgstr "不能读取现存对象 %s"

6208

6099 -#: builtin/index-pack.c:769

6209 +#: builtin/index-pack.c:825

6210 #, c-format

6211 msgid "invalid blob object %s"

6212 msgstr "无效的数据（blob）对象 %s"

6213

6104 -#: builtin/index-pack.c:783

6214 +#: builtin/index-pack.c:839

6215 #, c-format

6216 msgid "invalid %s"

6217 msgstr "无效的 %s"

6218

6109 -#: builtin/index-pack.c:787

6219 +#: builtin/index-pack.c:843

6220 msgid "Error in object"

6221 msgstr "对象中出错"

6222

6113 -#: builtin/index-pack.c:789

6223 +#: builtin/index-pack.c:845

6224 #, c-format

6225 msgid "Not all child objects of %s are reachable"

6226 msgstr "%s 的所有子对象并非都可达"

6227

6118 -#: builtin/index-pack.c:861 builtin/index-pack.c:890

6228 +#: builtin/index-pack.c:917 builtin/index-pack.c:948

6229 msgid "failed to apply delta"

6230 msgstr "无法应用 delta"

6231

6122 -#: builtin/index-pack.c:1055

6232 +#: builtin/index-pack.c:1118

6233 msgid "Receiving objects"

6234 msgstr "接收对象中"

6235

6126 -#: builtin/index-pack.c:1055

6236 +#: builtin/index-pack.c:1118

6237 msgid "Indexing objects"

6238 msgstr "索引对象中"

6239

6130 -#: builtin/index-pack.c:1081

6240 +#: builtin/index-pack.c:1150

6241 msgid "pack is corrupted (SHA1 mismatch)"

6242 msgstr "包冲突（SHA1 不匹配）"

6243

6134 -#: builtin/index-pack.c:1086

6244 +#: builtin/index-pack.c:1155

6245 msgid "cannot fstat packfile"

6246 msgstr "不能枚举包文件状态"

6247

6138 -#: builtin/index-pack.c:1089

6248 +#: builtin/index-pack.c:1158

6249 msgid "pack has junk at the end"

6250 msgstr "包的结尾有垃圾数据"

6251

6142 -#: builtin/index-pack.c:1100

6252 +#: builtin/index-pack.c:1169

6253 msgid "confusion beyond insanity in parse_pack_objects()"

6254 msgstr "parse_pack_objects() 中遇到不可理喻的问题"

6255

6146 -#: builtin/index-pack.c:1123

6256 +#: builtin/index-pack.c:1194

6257 msgid "Resolving deltas"

6258 msgstr "处理 delta 中"

6259

6150 -#: builtin/index-pack.c:1133

6260 +#: builtin/index-pack.c:1205

6261 #, c-format

6262 msgid "unable to create thread: %s"

6263 msgstr "不能创建线程：%s"

6264

6155 -#: builtin/index-pack.c:1175

6265 +#: builtin/index-pack.c:1247

6266 msgid "confusion beyond insanity"

6267 msgstr "不可理喻"

6268

6159 -#: builtin/index-pack.c:1181

6269 +#: builtin/index-pack.c:1253

6270 #, c-format

6271 msgid "completed with %d local objects"

6272 msgstr "完成 %d 个本地对象"

6273

6164 -#: builtin/index-pack.c:1191

6274 +#: builtin/index-pack.c:1263

6275 #, c-format

6276 msgid "Unexpected tail checksum for %s (disk corruption?)"

6277 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"

6278

6169 -#: builtin/index-pack.c:1195

6279 +#: builtin/index-pack.c:1267

6280 #, c-format

6281 msgid "pack has %d unresolved delta"

6282 msgid_plural "pack has %d unresolved deltas"

6283 msgstr[0] "包有 %d 个未解决的 delta"

6284 msgstr[1] "包有 %d 个未解决的 delta"

6285

6176 -#: builtin/index-pack.c:1219

6286 +#: builtin/index-pack.c:1291

6287 #, c-format

6288 msgid "unable to deflate appended object (%d)"

6289 msgstr "不能压缩附加对象（%d）"

6290

6181 -#: builtin/index-pack.c:1298

6291 +#: builtin/index-pack.c:1367

6292 #, c-format

6293 msgid "local object %s is corrupt"

6294 msgstr "本地对象 %s 已损坏"

6295

6186 -#: builtin/index-pack.c:1322

6296 +#: builtin/index-pack.c:1391

6297 msgid "error while closing pack file"

6298 msgstr "关闭包文件时出错"

6299

6190 -#: builtin/index-pack.c:1335

6300 +#: builtin/index-pack.c:1404

6301 #, c-format

6302 msgid "cannot write keep file '%s'"

6303 msgstr "无法写保留文件 '%s'"

6304

6195 -#: builtin/index-pack.c:1343

6305 +#: builtin/index-pack.c:1412

6306 #, c-format

6307 msgid "cannot close written keep file '%s'"

6308 msgstr "无法关闭保留文件 '%s'"

6309

6200 -#: builtin/index-pack.c:1356

6310 +#: builtin/index-pack.c:1425

6311 msgid "cannot store pack file"

6312 msgstr "无法存储包文件"

6313

6204 -#: builtin/index-pack.c:1367

6314 +#: builtin/index-pack.c:1436

6315 msgid "cannot store index file"

6316 msgstr "无法存储索引文件"

6317

6208 -#: builtin/index-pack.c:1400

6318 +#: builtin/index-pack.c:1469

6319 #, c-format

6320 msgid "bad pack.indexversion=%<PRIu32>"

6321 msgstr "坏的 pack.indexversion=%<PRIu32>"

6322

6213 -#: builtin/index-pack.c:1406

6323 +#: builtin/index-pack.c:1475

6324 #, c-format

6325 msgid "invalid number of threads specified (%d)"

6326 msgstr "指定的线程数无效（%d）"

6327

6218 -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589

6328 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6329 #, c-format

6330 msgid "no threads support, ignoring %s"

6331 msgstr "没有线程支持，忽略 %s"

6332

6223 -#: builtin/index-pack.c:1468

6333 +#: builtin/index-pack.c:1537

6334 #, c-format

6335 msgid "Cannot open existing pack file '%s'"

6336 msgstr "无法打开现存包文件 '%s'"

6337

6228 -#: builtin/index-pack.c:1470

6338 +#: builtin/index-pack.c:1539

6339 #, c-format

6340 msgid "Cannot open existing pack idx file for '%s'"

6341 msgstr "无法为 %s 打开包索引文件"

6342

6233 -#: builtin/index-pack.c:1517

6343 +#: builtin/index-pack.c:1586

6344 #, c-format

6345 msgid "non delta: %d object"

6346 msgid_plural "non delta: %d objects"

6347 msgstr[0] "非 delta：%d 个对象"

6348 msgstr[1] "非 delta：%d 个对象"

6349

6240 -#: builtin/index-pack.c:1524

6350 +#: builtin/index-pack.c:1593

6351 #, c-format

6352 msgid "chain length = %d: %lu object"

6353 msgid_plural "chain length = %d: %lu objects"

6354 msgstr[0] "链长 = %d: %lu 对象"

6355 msgstr[1] "链长 = %d: %lu 对象"

6356

6247 -#: builtin/index-pack.c:1553

6357 +#: builtin/index-pack.c:1622

6358 msgid "Cannot come back to cwd"

6359 msgstr "无法返回当前工作目录"

6360

6251 -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604

6252 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620

6361 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6362 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

6363 #, c-format

6364 msgid "bad %s"

6365 msgstr "错误选项 %s"

6366

6257 -#: builtin/index-pack.c:1634

6367 +#: builtin/index-pack.c:1703

6368 msgid "--fix-thin cannot be used without --stdin"

6369 msgstr "--fix-thin 不能和 --stdin 同时使用"

6370

6261 -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647

6371 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716

6372 #, c-format

6373 msgid "packfile name '%s' does not end with '.pack'"

6374 msgstr "包名 '%s' 没有以 '.pack' 结尾"

6375

6266 -#: builtin/index-pack.c:1655

6376 +#: builtin/index-pack.c:1724

6377 msgid "--verify with no packfile name given"

6378 msgstr "--verify 没有提供包名参数"

6379

@@ -6332,22 +6442,22 @@ msgstr "模版未找到 %s"

6442 msgid "not copying templates of a wrong format version %d from '%s'"

6443 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"

6444

6335 -#: builtin/init-db.c:197

6445 +#: builtin/init-db.c:211

6446 #, c-format

6447 msgid "insane git directory %s"

6448 msgstr "不正常的 git 目录 %s"

6449

6340 -#: builtin/init-db.c:331 builtin/init-db.c:334

6450 +#: builtin/init-db.c:343 builtin/init-db.c:346

6451 #, c-format

6452 msgid "%s already exists"

6453 msgstr "%s 已经存在"

6454

6345 -#: builtin/init-db.c:363

6455 +#: builtin/init-db.c:374

6456 #, c-format

6457 msgid "unable to handle file type %d"

6458 msgstr "不能处理 %d 类型的文件"

6459

6350 -#: builtin/init-db.c:366

6460 +#: builtin/init-db.c:377

6461 #, c-format

6462 msgid "unable to move %s to %s"

6463 msgstr "不能移动 %s 至 %s"

@@ -6355,25 +6465,25 @@ msgstr "不能移动 %s 至 %s"

6465 #. TRANSLATORS: The first '%s' is either "Reinitialized

6466 #. existing" or "Initialized empty", the second " shared" or

6467 #. "", and the last '%s%s' is the verbatim directory name.

6358 -#: builtin/init-db.c:426

6468 +#: builtin/init-db.c:433

6469 #, c-format

6470 msgid "%s%s Git repository in %s%s\n"

6471 msgstr "%s%s Git 版本库于 %s%s\n"

6472

6363 -#: builtin/init-db.c:427

6473 +#: builtin/init-db.c:434

6474 msgid "Reinitialized existing"

6475 msgstr "重新初始化现存的"

6476

6367 -#: builtin/init-db.c:427

6477 +#: builtin/init-db.c:434

6478 msgid "Initialized empty"

6479 msgstr "初始化空的"

6480

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

6372 -#: builtin/init-db.c:428

6482 +#: builtin/init-db.c:435

6483 msgid " shared"

6484 msgstr "共享"

6485

6376 -#: builtin/init-db.c:475

6486 +#: builtin/init-db.c:482

6487 msgid ""

6488 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6489 "shared[=<permissions>]] [<directory>]"

@@ -6381,36 +6491,36 @@ msgstr ""

6491 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "

6492 "[<目录>]"

6493

6384 -#: builtin/init-db.c:498

6494 +#: builtin/init-db.c:505

6495 msgid "permissions"

6496 msgstr "权限"

6497

6388 -#: builtin/init-db.c:499

6498 +#: builtin/init-db.c:506

6499 msgid "specify that the git repository is to be shared amongst several users"

6500 msgstr "指定 git 版本库是多个用户之间共享的"

6501

6392 -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6502 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171

6503 msgid "be quiet"

6504 msgstr "保持安静"

6505

6396 -#: builtin/init-db.c:533 builtin/init-db.c:538

6506 +#: builtin/init-db.c:540 builtin/init-db.c:545

6507 #, c-format

6508 msgid "cannot mkdir %s"

6509 msgstr "不能创建目录 %s"

6510

6401 -#: builtin/init-db.c:542

6511 +#: builtin/init-db.c:549

6512 #, c-format

6513 msgid "cannot chdir to %s"

6514 msgstr "不能切换目录到 %s"

6515

6406 -#: builtin/init-db.c:563

6516 +#: builtin/init-db.c:570

6517 #, c-format

6518 msgid ""

6519 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

6520 "dir=<directory>)"

6521 msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"

6522

6413 -#: builtin/init-db.c:591

6523 +#: builtin/init-db.c:598

6524 #, c-format

6525 msgid "Cannot access work tree '%s'"

6526 msgstr "不能访问工作区 '%s'"

@@ -6436,7 +6546,7 @@ msgid "trailer(s) to add"

6546 msgstr "要添加的签名"

6547

6548 #: builtin/log.c:41

6439 -msgid "git log [<options>] [<revision range>] [[--] <path>...]"

6549 +msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

6550 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"

6551

6552 #: builtin/log.c:42

@@ -6505,7 +6615,7 @@ msgstr "无法打开补丁文件 %s"

6615 msgid "Need exactly one range."

6616 msgstr "只需要一个范围。"

6617

6508 -#: builtin/log.c:811

6618 +#: builtin/log.c:813

6619 msgid "Not a range."

6620 msgstr "不是一个范围。"

6621

@@ -6705,13 +6815,13 @@ msgstr "无法创建输出文件"

6815 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

6816 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"

6817

6708 -#: builtin/log.c:1638

6818 +#: builtin/log.c:1637

6819 #, c-format

6820 msgid ""

6821 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

6822 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"

6823

6714 -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665

6824 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662

6825 #, c-format

6826 msgid "Unknown commit %s"

6827 msgstr "未知提交 %s"

@@ -6984,40 +7094,40 @@ msgstr "无合并信息 -- 未更新 HEAD\n"

7094 msgid "'%s' does not point to a commit"

7095 msgstr "'%s' 没有指向一个提交"

7096

6987 -#: builtin/merge.c:559

7097 +#: builtin/merge.c:537

7098 #, c-format

7099 msgid "Bad branch.%s.mergeoptions string: %s"

7100 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"

7101

6992 -#: builtin/merge.c:654

7102 +#: builtin/merge.c:632

7103 msgid "git write-tree failed to write a tree"

7104 msgstr "git write-tree 无法写入一树对象"

7105

6996 -#: builtin/merge.c:678

7106 +#: builtin/merge.c:656

7107 msgid "Not handling anything other than two heads merge."

7108 msgstr "不能处理两个头合并之外的任何操作。"

7109

7000 -#: builtin/merge.c:692

7110 +#: builtin/merge.c:670

7111 #, c-format

7112 msgid "Unknown option for merge-recursive: -X%s"

7113 msgstr "merge-recursive 的未知选项：-X%s"

7114

7005 -#: builtin/merge.c:705

7115 +#: builtin/merge.c:683

7116 #, c-format

7117 msgid "unable to write %s"

7118 msgstr "不能写 %s"

7119

7010 -#: builtin/merge.c:794

7120 +#: builtin/merge.c:772

7121 #, c-format

7122 msgid "Could not read from '%s'"

7123 msgstr "不能从 '%s' 读取"

7124

7015 -#: builtin/merge.c:803

7125 +#: builtin/merge.c:781

7126 #, c-format

7127 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

7128 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

7129

7020 -#: builtin/merge.c:809

7130 +#: builtin/merge.c:787

7131 #, c-format

7132 msgid ""

7133 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -7031,47 +7141,52 @@ msgstr ""

7141 "\n"

7142 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

7143

7034 -#: builtin/merge.c:833

7144 +#: builtin/merge.c:811

7145 msgid "Empty commit message."

7146 msgstr "空提交信息。"

7147

7038 -#: builtin/merge.c:845

7148 +#: builtin/merge.c:823

7149 #, c-format

7150 msgid "Wonderful.\n"

7151 msgstr "太棒了。\n"

7152

7043 -#: builtin/merge.c:900

7153 +#: builtin/merge.c:878

7154 #, c-format

7155 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

7156 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

7157

7048 -#: builtin/merge.c:916

7158 +#: builtin/merge.c:894

7159 #, c-format

7160 msgid "'%s' is not a commit"

7161 msgstr "'%s' 不是一个提交"

7162

7053 -#: builtin/merge.c:957

7163 +#: builtin/merge.c:935

7164 msgid "No current branch."

7165 msgstr "没有当前分支。"

7166

7057 -#: builtin/merge.c:959

7167 +#: builtin/merge.c:937

7168 msgid "No remote for the current branch."

7169 msgstr "当前分支没有对应的远程版本库。"

7170

7061 -#: builtin/merge.c:961

7171 +#: builtin/merge.c:939

7172 msgid "No default upstream defined for the current branch."

7173 msgstr "当前分支没有定义默认的上游分支。"

7174

7065 -#: builtin/merge.c:966

7175 +#: builtin/merge.c:944

7176 #, c-format

7177 msgid "No remote-tracking branch for %s from %s"

7178 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"

7179

7070 -#: builtin/merge.c:1122

7180 +#: builtin/merge.c:1081

7181 +#, c-format

7182 +msgid "could not close '%s'"

7183 +msgstr "不能关闭 '%s'"

7184 +

7185 +#: builtin/merge.c:1208

7186 msgid "There is no merge to abort (MERGE_HEAD missing)."

7187 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"

7188

7074 -#: builtin/merge.c:1138

7189 +#: builtin/merge.c:1224

7190 msgid ""

7191 "You have not concluded your merge (MERGE_HEAD exists).\n"

7192 "Please, commit your changes before you merge."

@@ -7079,11 +7194,11 @@ msgstr ""

7194 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"

7195 "请在合并前先提交您的修改。"

7196

7082 -#: builtin/merge.c:1141 git-pull.sh:34

7197 +#: builtin/merge.c:1227 git-pull.sh:74

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

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

7200

7086 -#: builtin/merge.c:1145

7201 +#: builtin/merge.c:1231

7202 msgid ""

7203 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

7204 "Please, commit your changes before you merge."

@@ -7091,100 +7206,100 @@ msgstr ""

7206 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

7207 "请在合并前先提交您的修改。"

7208

7094 -#: builtin/merge.c:1148

7209 +#: builtin/merge.c:1234

7210 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

7211 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

7212

7098 -#: builtin/merge.c:1157

7213 +#: builtin/merge.c:1243

7214 msgid "You cannot combine --squash with --no-ff."

7215 msgstr "您不能将 --squash 与 --no-ff 同时使用。"

7216

7102 -#: builtin/merge.c:1166

7217 +#: builtin/merge.c:1251

7218 msgid "No commit specified and merge.defaultToUpstream not set."

7219 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"

7220

7106 -#: builtin/merge.c:1198

7107 -msgid "Can merge only exactly one commit into empty head"

7108 -msgstr "只能将一个提交合并到空分支上"

7109 -

7110 -#: builtin/merge.c:1201

7221 +#: builtin/merge.c:1268

7222 msgid "Squash commit into empty head not supported yet"

7223 msgstr "尚不支持到空分支的压缩提交"

7224

7114 -#: builtin/merge.c:1203

7225 +#: builtin/merge.c:1270

7226 msgid "Non-fast-forward commit does not make sense into an empty head"

7227 msgstr "到空分支的非快进式提交没有意义"

7228

7118 -#: builtin/merge.c:1208

7229 +#: builtin/merge.c:1276

7230 #, c-format

7231 msgid "%s - not something we can merge"

7232 msgstr "%s - 不能被合并"

7233

7123 -#: builtin/merge.c:1259

7234 +#: builtin/merge.c:1278

7235 +msgid "Can merge only exactly one commit into empty head"

7236 +msgstr "只能将一个提交合并到空分支上"

7237 +

7238 +#: builtin/merge.c:1333

7239 #, c-format

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

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

7242

7128 -#: builtin/merge.c:1262

7243 +#: builtin/merge.c:1336

7244 #, c-format

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

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

7247

7133 -#: builtin/merge.c:1265

7248 +#: builtin/merge.c:1339

7249 #, c-format

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

7251 msgstr "提交 %s 没有一个 GPG 签名。"

7252

7138 -#: builtin/merge.c:1268

7253 +#: builtin/merge.c:1342

7254 #, c-format

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

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

7257

7143 -#: builtin/merge.c:1349

7258 +#: builtin/merge.c:1423

7259 #, c-format

7260 msgid "Updating %s..%s\n"

7261 msgstr "更新 %s..%s\n"

7262

7148 -#: builtin/merge.c:1388

7263 +#: builtin/merge.c:1462

7264 #, c-format

7265 msgid "Trying really trivial in-index merge...\n"

7266 msgstr "尝试非常小的索引内合并...\n"

7267

7153 -#: builtin/merge.c:1395

7268 +#: builtin/merge.c:1469

7269 #, c-format

7270 msgid "Nope.\n"

7271 msgstr "无。\n"

7272

7158 -#: builtin/merge.c:1427

7273 +#: builtin/merge.c:1501

7274 msgid "Not possible to fast-forward, aborting."

7275 msgstr "无法快进，终止。"

7276

7162 -#: builtin/merge.c:1450 builtin/merge.c:1529

7277 +#: builtin/merge.c:1524 builtin/merge.c:1603

7278 #, c-format

7279 msgid "Rewinding the tree to pristine...\n"

7280 msgstr "将树回滚至原始状态...\n"

7281

7167 -#: builtin/merge.c:1454

7282 +#: builtin/merge.c:1528

7283 #, c-format

7284 msgid "Trying merge strategy %s...\n"

7285 msgstr "尝试合并策略 %s...\n"

7286

7172 -#: builtin/merge.c:1520

7287 +#: builtin/merge.c:1594

7288 #, c-format

7289 msgid "No merge strategy handled the merge.\n"

7290 msgstr "没有合并策略处理此合并。\n"

7291

7177 -#: builtin/merge.c:1522

7292 +#: builtin/merge.c:1596

7293 #, c-format

7294 msgid "Merge with strategy %s failed.\n"

7295 msgstr "使用策略 %s 合并失败。\n"

7296

7182 -#: builtin/merge.c:1531

7297 +#: builtin/merge.c:1605

7298 #, c-format

7299 msgid "Using the %s to prepare resolving by hand.\n"

7300 msgstr "使用 %s 以准备手工解决。\n"

7301

7187 -#: builtin/merge.c:1543

7302 +#: builtin/merge.c:1617

7303 #, c-format

7304 msgid "Automatic merge went well; stopped before committing as requested\n"

7305 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -7372,7 +7487,7 @@ msgstr "%s，源=%s，目标=%s"

7487 msgid "Renaming %s to %s\n"

7488 msgstr "重命名 %s 至 %s\n"

7489

7375 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359

7490 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361

7491 #, c-format

7492 msgid "renaming '%s' failed"

7493 msgstr "重命名 '%s' 失败"

@@ -7737,7 +7852,7 @@ msgstr "注解引用"

7852 msgid "use notes from <notes-ref>"

7853 msgstr "从 <注解引用> 使用注解"

7854

7740 -#: builtin/notes.c:989 builtin/remote.c:1621

7855 +#: builtin/notes.c:989 builtin/remote.c:1618

7856 #, c-format

7857 msgid "Unknown subcommand: %s"

7858 msgstr "未知子命令：%s"

@@ -7759,171 +7874,171 @@ msgstr "压缩错误 (%d)"

7874 msgid "Writing objects"

7875 msgstr "写入对象中"

7876

7762 -#: builtin/pack-objects.c:1013

7877 +#: builtin/pack-objects.c:1011

7878 msgid "disabling bitmap writing, as some objects are not being packed"

7879 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"

7880

7766 -#: builtin/pack-objects.c:2173

7881 +#: builtin/pack-objects.c:2171

7882 msgid "Compressing objects"

7883 msgstr "压缩对象中"

7884

7770 -#: builtin/pack-objects.c:2570

7885 +#: builtin/pack-objects.c:2568

7886 #, c-format

7887 msgid "unsupported index version %s"

7888 msgstr "不支持的索引版本 %s"

7889

7775 -#: builtin/pack-objects.c:2574

7890 +#: builtin/pack-objects.c:2572

7891 #, c-format

7892 msgid "bad index version '%s'"

7893 msgstr "坏的索引版本 '%s'"

7894

7780 -#: builtin/pack-objects.c:2597

7895 +#: builtin/pack-objects.c:2595

7896 #, c-format

7897 msgid "option %s does not accept negative form"

7898 msgstr "选项 %s 不接受否定格式"

7899

7785 -#: builtin/pack-objects.c:2601

7900 +#: builtin/pack-objects.c:2599

7901 #, c-format

7902 msgid "unable to parse value '%s' for option %s"

7903 msgstr "不能解析选项 %1$s 的值 '%2$s'"

7904

7790 -#: builtin/pack-objects.c:2621

7905 +#: builtin/pack-objects.c:2619

7906 msgid "do not show progress meter"

7907 msgstr "不显示进度表"

7908

7794 -#: builtin/pack-objects.c:2623

7909 +#: builtin/pack-objects.c:2621

7910 msgid "show progress meter"

7911 msgstr "显示进度表"

7912

7798 -#: builtin/pack-objects.c:2625

7913 +#: builtin/pack-objects.c:2623

7914 msgid "show progress meter during object writing phase"

7915 msgstr "在对象写入阶段显示进度表"

7916

7802 -#: builtin/pack-objects.c:2628

7917 +#: builtin/pack-objects.c:2626

7918 msgid "similar to --all-progress when progress meter is shown"

7919 msgstr "当进度表显示时类似于 --all-progress"

7920

7806 -#: builtin/pack-objects.c:2629

7921 +#: builtin/pack-objects.c:2627

7922 msgid "version[,offset]"

7923 msgstr "版本[,偏移]"

7924

7810 -#: builtin/pack-objects.c:2630

7925 +#: builtin/pack-objects.c:2628

7926 msgid "write the pack index file in the specified idx format version"

7927 msgstr "用指定的 idx 格式版本来写包索引文件"

7928

7814 -#: builtin/pack-objects.c:2633

7929 +#: builtin/pack-objects.c:2631

7930 msgid "maximum size of each output pack file"

7931 msgstr "每个输出包的最大尺寸"

7932

7818 -#: builtin/pack-objects.c:2635

7933 +#: builtin/pack-objects.c:2633

7934 msgid "ignore borrowed objects from alternate object store"

7935 msgstr "忽略从替代对象存储里借用对象"

7936

7822 -#: builtin/pack-objects.c:2637

7937 +#: builtin/pack-objects.c:2635

7938 msgid "ignore packed objects"

7939 msgstr "忽略包对象"

7940

7826 -#: builtin/pack-objects.c:2639

7941 +#: builtin/pack-objects.c:2637

7942 msgid "limit pack window by objects"

7943 msgstr "限制打包窗口的对象数"

7944

7830 -#: builtin/pack-objects.c:2641

7945 +#: builtin/pack-objects.c:2639

7946 msgid "limit pack window by memory in addition to object limit"

7947 msgstr "除对象数量限制外设置打包窗口的内存限制"

7948

7834 -#: builtin/pack-objects.c:2643

7949 +#: builtin/pack-objects.c:2641

7950 msgid "maximum length of delta chain allowed in the resulting pack"

7951 msgstr "打包允许的 delta 链的最大长度"

7952

7838 -#: builtin/pack-objects.c:2645

7953 +#: builtin/pack-objects.c:2643

7954 msgid "reuse existing deltas"

7955 msgstr "重用已存在的 deltas"

7956

7842 -#: builtin/pack-objects.c:2647

7957 +#: builtin/pack-objects.c:2645

7958 msgid "reuse existing objects"

7959 msgstr "重用已存在的对象"

7960

7846 -#: builtin/pack-objects.c:2649

7961 +#: builtin/pack-objects.c:2647

7962 msgid "use OFS_DELTA objects"

7963 msgstr "使用 OFS_DELTA 对象"

7964

7850 -#: builtin/pack-objects.c:2651

7965 +#: builtin/pack-objects.c:2649

7966 msgid "use threads when searching for best delta matches"

7967 msgstr "使用线程查询最佳 delta 匹配"

7968

7854 -#: builtin/pack-objects.c:2653

7969 +#: builtin/pack-objects.c:2651

7970 msgid "do not create an empty pack output"

7971 msgstr "不创建空的包输出"

7972

7858 -#: builtin/pack-objects.c:2655

7973 +#: builtin/pack-objects.c:2653

7974 msgid "read revision arguments from standard input"

7975 msgstr "从标准输入读取版本号参数"

7976

7862 -#: builtin/pack-objects.c:2657

7977 +#: builtin/pack-objects.c:2655

7978 msgid "limit the objects to those that are not yet packed"

7979 msgstr "限制那些尚未打包的对象"

7980

7866 -#: builtin/pack-objects.c:2660

7981 +#: builtin/pack-objects.c:2658

7982 msgid "include objects reachable from any reference"

7983 msgstr "包括可以从任何引用访问到的对象"

7984

7870 -#: builtin/pack-objects.c:2663

7985 +#: builtin/pack-objects.c:2661

l10n: zh_CN: for git v2.5.0 l10n round 1