87cb7997f7 · matheusbsbs/matheus-bagliano

@@ -135,8 +135,8 @@ msgid ""

135 msgstr ""

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

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

138 -"POT-Creation-Date: 2017-02-18 01:00+0800\n"

139 -"PO-Revision-Date: 2017-02-25 00:10+0800\n"

138 +"POT-Creation-Date: 2017-04-23 09:54+0800\n"

139 +"PO-Revision-Date: 2017-05-02 22:07+0800\n"

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

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

142 "Language: zh_CN\n"

@@ -187,7 +187,7 @@ msgstr ""

187 msgid "Exiting because of an unresolved conflict."

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

189

190 -#: advice.c:114 builtin/merge.c:1206

190 +#: advice.c:114 builtin/merge.c:1185

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

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

193

@@ -447,7 +447,7 @@ msgstr "打补丁失败：%s:%ld"

447 msgid "cannot checkout %s"

448 msgstr "不能检出 %s"

449

450 -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248

450 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253

451 #, c-format

452 msgid "failed to read %s"

453 msgstr "无法读取 %s"

@@ -570,7 +570,7 @@ msgstr "%s 的模式被改变，但它不在当前 HEAD 中"

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

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

572

573 -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135

573 +#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135

574 #, c-format

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

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

@@ -646,7 +646,7 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

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

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

648

649 -#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986

649 +#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988

650 #, c-format

651 msgid "cannot open %s"

652 msgstr "不能打开 %s"

@@ -674,160 +674,160 @@ msgstr "未能识别的输入"

674 msgid "unable to read index file"

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

676

677 -#: apply.c:4824

677 +#: apply.c:4823

678 #, c-format

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

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

681

682 -#: apply.c:4849

682 +#: apply.c:4850

683 #, c-format

684 msgid "squelched %d whitespace error"

685 msgid_plural "squelched %d whitespace errors"

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

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

688

689 -#: apply.c:4855 apply.c:4870

689 +#: apply.c:4856 apply.c:4871

690 #, c-format

691 msgid "%d line adds whitespace errors."

692 msgid_plural "%d lines add whitespace errors."

693 msgstr[0] "%d 行有空白字符误用。"

694 msgstr[1] "%d 行有空白字符误用。"

695

696 -#: apply.c:4863

696 +#: apply.c:4864

697 #, c-format

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

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

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

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

702

703 -#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

703 +#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

704 msgid "Unable to write new index file"

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

706

707 -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280

708 -#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

709 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

710 -#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

711 -#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104

707 +#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280

708 +#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180

709 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

710 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

711 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

712 #: git-add--interactive.perl:239

713 msgid "path"

714 msgstr "路径"

715

716 -#: apply.c:4911

716 +#: apply.c:4912

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

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

719

720 -#: apply.c:4914

720 +#: apply.c:4915

721 msgid "apply changes matching the given path"

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

723

724 -#: apply.c:4916 builtin/am.c:2286

724 +#: apply.c:4917 builtin/am.c:2286

725 msgid "num"

726 msgstr "数字"

727

728 -#: apply.c:4917

728 +#: apply.c:4918

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

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

731

732 -#: apply.c:4920

732 +#: apply.c:4921

733 msgid "ignore additions made by the patch"

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

735

736 -#: apply.c:4922

736 +#: apply.c:4923

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

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

739

740 -#: apply.c:4926

740 +#: apply.c:4927

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

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

743

744 -#: apply.c:4928

744 +#: apply.c:4929

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

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

747

748 -#: apply.c:4930

748 +#: apply.c:4931

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

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

751

752 -#: apply.c:4932

752 +#: apply.c:4933

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

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

755

756 -#: apply.c:4934

756 +#: apply.c:4935

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

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

759

760 -#: apply.c:4936

760 +#: apply.c:4937

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

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

763

764 -#: apply.c:4938

764 +#: apply.c:4939

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

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

767

768 -#: apply.c:4940

768 +#: apply.c:4941

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

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

771

772 -#: apply.c:4942

772 +#: apply.c:4943

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

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

775

776 -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507

776 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508

777 msgid "paths are separated with NUL character"

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

779

780 -#: apply.c:4947

780 +#: apply.c:4948

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

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

783

784 -#: apply.c:4948 builtin/am.c:2265

784 +#: apply.c:4949 builtin/am.c:2265

785 msgid "action"

786 msgstr "动作"

787

788 -#: apply.c:4949

788 +#: apply.c:4950

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

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

791

792 -#: apply.c:4952 apply.c:4955

792 +#: apply.c:4953 apply.c:4956

793 msgid "ignore changes in whitespace when finding context"

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

795

796 -#: apply.c:4958

796 +#: apply.c:4959

797 msgid "apply the patch in reverse"

798 msgstr "反向应用补丁"

799

800 -#: apply.c:4960

800 +#: apply.c:4961

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

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

803

804 -#: apply.c:4962

804 +#: apply.c:4963

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

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

807

808 -#: apply.c:4964

808 +#: apply.c:4965

809 msgid "allow overlapping hunks"

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

811

812 -#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19

812 +#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19

813 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

814 -#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

814 +#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134

815 msgid "be verbose"

816 msgstr "冗长输出"

817

818 -#: apply.c:4967

818 +#: apply.c:4968

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

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

821

822 -#: apply.c:4970

822 +#: apply.c:4971

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

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

825

826 -#: apply.c:4972 builtin/am.c:2274

826 +#: apply.c:4973 builtin/am.c:2274

827 msgid "root"

828 msgstr "根目录"

829

830 -#: apply.c:4973

830 +#: apply.c:4974

831 msgid "prepend <root> to all filenames"

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

833

@@ -849,103 +849,108 @@ msgstr ""

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

850 msgstr "git archive --remote <仓库> [--exec <命令>] --list"

851

852 -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

852 +#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

853 #, c-format

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

855 msgstr "路径规格 '%s' 未匹配任何文件"

856

857 -#: archive.c:429

857 +#: archive.c:417

858 msgid "fmt"

859 msgstr "格式"

860

861 -#: archive.c:429

861 +#: archive.c:417

862 msgid "archive format"

863 msgstr "归档格式"

864

865 -#: archive.c:430 builtin/log.c:1429

865 +#: archive.c:418 builtin/log.c:1436

866 msgid "prefix"

867 msgstr "前缀"

868

869 -#: archive.c:431

869 +#: archive.c:419

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

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

872

873 -#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

874 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

875 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544

876 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109

873 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59

874 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061

875 +#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545

876 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129

877 #: parse-options.h:153

878 msgid "file"

879 msgstr "文件"

880

881 -#: archive.c:433 builtin/archive.c:89

881 +#: archive.c:421 builtin/archive.c:89

882 msgid "write the archive to this file"

883 msgstr "归档写入此文件"

884

885 -#: archive.c:435

885 +#: archive.c:423

886 msgid "read .gitattributes in working directory"

887 msgstr "读取工作区中的 .gitattributes"

888

889 -#: archive.c:436

889 +#: archive.c:424

890 msgid "report archived files on stderr"

891 msgstr "在标准错误上报告归档文件"

892

893 -#: archive.c:437

893 +#: archive.c:425

894 msgid "store only"

895 msgstr "只存储"

896

897 -#: archive.c:438

897 +#: archive.c:426

898 msgid "compress faster"

899 msgstr "压缩速度更快"

900

901 -#: archive.c:446

901 +#: archive.c:434

902 msgid "compress better"

903 msgstr "压缩效果更好"

904

905 -#: archive.c:449

905 +#: archive.c:437

906 msgid "list supported archive formats"

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

908

909 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

910 -#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969

909 +#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106

910 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

911 msgid "repo"

912 msgstr "仓库"

913

914 -#: archive.c:452 builtin/archive.c:91

914 +#: archive.c:440 builtin/archive.c:91

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

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

917

918 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485

918 +#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485

919 msgid "command"

920 msgstr "命令"

921

922 -#: archive.c:454 builtin/archive.c:93

922 +#: archive.c:442 builtin/archive.c:93

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

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

925

926 -#: archive.c:461

926 +#: archive.c:449

927 msgid "Unexpected option --remote"

928 msgstr "未知参数 --remote"

929

930 -#: archive.c:463

930 +#: archive.c:451

931 msgid "Option --exec can only be used together with --remote"

932 msgstr "选项 --exec 只能和 --remote 同时使用"

933

934 -#: archive.c:465

934 +#: archive.c:453

935 msgid "Unexpected option --output"

936 msgstr "未知参数 --output"

937

938 -#: archive.c:487

938 +#: archive.c:475

939 #, c-format

940 msgid "Unknown archive format '%s'"

941 msgstr "未知归档格式 '%s'"

942

943 -#: archive.c:494

943 +#: archive.c:482

944 #, c-format

945 msgid "Argument not supported for format '%s': -%d"

946 msgstr "参数不支持此格式 '%s'：-%d"

947

948 -#: attr.c:263

948 +#: attr.c:212

949 +#, c-format

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

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

952 +

953 +#: attr.c:408

954 msgid ""

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

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

@@ -953,27 +958,27 @@ msgstr ""

958 "负值模版在 git attributes 中被忽略\n"

959 "当字符串确实要以感叹号开始时，使用 '\\!'。"

960

956 -#: bisect.c:441

961 +#: bisect.c:443

962 #, c-format

963 msgid "Could not open file '%s'"

964 msgstr "不能打开文件 '%s'"

965

961 -#: bisect.c:446

966 +#: bisect.c:448

967 #, c-format

968 msgid "Badly quoted content in file '%s': %s"

969 msgstr "文件 '%s' 包含错误的引用格式：%s"

970

966 -#: bisect.c:655

971 +#: bisect.c:656

972 #, c-format

973 msgid "We cannot bisect more!\n"

974 msgstr "我们无法进行更多的二分查找！\n"

975

971 -#: bisect.c:708

976 +#: bisect.c:709

977 #, c-format

978 msgid "Not a valid commit name %s"

979 msgstr "不是一个有效的提交名 %s"

980

976 -#: bisect.c:732

981 +#: bisect.c:733

982 #, c-format

983 msgid ""

984 "The merge base %s is bad.\n"

@@ -982,7 +987,7 @@ msgstr ""

987 "合并基线 %s 是坏的。\n"

988 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

989

985 -#: bisect.c:737

990 +#: bisect.c:738

991 #, c-format

992 msgid ""

993 "The merge base %s is new.\n"

@@ -991,7 +996,7 @@ msgstr ""

996 "合并基线 %s 是新的。\n"

997 "介于 %s 和 [%s] 之间的属性已经被修改。\n"

998

994 -#: bisect.c:742

999 +#: bisect.c:743

1000 #, c-format

1001 msgid ""

1002 "The merge base %s is %s.\n"

@@ -1000,7 +1005,7 @@ msgstr ""

1005 "合并基线 %s 是 %s。\n"

1006 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

1007

1003 -#: bisect.c:750

1008 +#: bisect.c:751

1009 #, c-format

1010 msgid ""

1011 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1011,7 +1016,7 @@ msgstr ""

1016 "这种情况下 git 二分查找无法正常工作。\n"

1017 "您可能弄错了 %s 和 %s 版本？\n"

1018

1014 -#: bisect.c:763

1019 +#: bisect.c:764

1020 #, c-format

1021 msgid ""

1022 "the merge base between %s and [%s] must be skipped.\n"

@@ -1022,36 +1027,36 @@ msgstr ""

1027 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"

1028 "我们仍旧继续。"

1029

1025 -#: bisect.c:798

1030 +#: bisect.c:799

1031 #, c-format

1032 msgid "Bisecting: a merge base must be tested\n"

1033 msgstr "二分查找中：合并基线必须是经过测试的\n"

1034

1030 -#: bisect.c:849

1035 +#: bisect.c:850

1036 #, c-format

1037 msgid "a %s revision is needed"

1038 msgstr "需要一个 %s 版本"

1039

1035 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262

1040 +#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255

1041 #, c-format

1042 msgid "could not create file '%s'"

1043 msgstr "不能创建文件 '%s'"

1044

1040 -#: bisect.c:917

1045 +#: bisect.c:918

1046 #, c-format

1047 msgid "could not read file '%s'"

1048 msgstr "不能读取文件 '%s'"

1049

1045 -#: bisect.c:947

1050 +#: bisect.c:948

1051 msgid "reading bisect refs failed"

1052 msgstr "读取二分查找引用失败"

1053

1049 -#: bisect.c:967

1054 +#: bisect.c:968

1055 #, c-format

1056 msgid "%s was both %s and %s\n"

1057 msgstr "%s 同时为 %s 和 %s\n"

1058

1054 -#: bisect.c:975

1059 +#: bisect.c:976

1060 #, c-format

1061 msgid ""

1062 "No testable commit found.\n"

@@ -1060,7 +1065,7 @@ msgstr ""

1065 "没有发现可测试的提交。\n"

1066 "可能您在运行时使用了错误的路径参数？\n"

1067

1063 -#: bisect.c:994

1068 +#: bisect.c:995

1069 #, c-format

1070 msgid "(roughly %d step)"

1071 msgid_plural "(roughly %d steps)"

@@ -1069,7 +1074,7 @@ msgstr[1] "（大概 %d 步）"

1074

1075 #. TRANSLATORS: the last %s will be replaced with

1076 #. "(roughly %d steps)" translation

1072 -#: bisect.c:998

1077 +#: bisect.c:999

1078 #, c-format

1079 msgid "Bisecting: %d revision left to test after this %s\n"

1080 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

@@ -1204,7 +1209,7 @@ msgstr "无效的分支点：'%s'。"

1209 msgid "'%s' is already checked out at '%s'"

1210 msgstr "'%s' 已经检出到 '%s'"

1211

1207 -#: branch.c:363

1212 +#: branch.c:364

1213 #, c-format

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

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

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

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

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

1226

1222 -#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777

1227 +#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777

1228 #, c-format

1229 msgid "could not open '%s'"

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

@@ -1228,10 +1233,10 @@ msgstr "不能打开 '%s'"

1233 msgid "Repository lacks these prerequisite commits:"

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

1235

1231 -#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290

1232 -#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348

1233 -#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1234 -#: builtin/merge.c:360 builtin/shortlog.c:177

1236 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299

1237 +#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353

1238 +#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916

1239 +#: builtin/merge.c:359 builtin/shortlog.c:176

1240 msgid "revision walk setup failed"

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

1242

@@ -1270,7 +1275,7 @@ msgstr "rev-list 终止"

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

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

1277

1273 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282

1278 +#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281

1279 #, c-format

1280 msgid "unrecognized argument: %s"

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

@@ -1293,7 +1298,7 @@ msgstr "index-pack 终止"

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

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

1300

1296 -#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457

1301 +#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457

1302 #: builtin/am.c:1493 builtin/am.c:2127

1303 #, c-format

1304 msgid "could not parse %s"

@@ -1304,7 +1309,7 @@ msgstr "不能解析 %s"

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

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

1311

1307 -#: commit.c:1514

1312 +#: commit.c:1511

1313 msgid ""

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

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

@@ -1318,133 +1323,152 @@ msgstr ""

1323 msgid "memory exhausted"

1324 msgstr "内存耗尽"

1325

1321 -#: config.c:518

1326 +#: config.c:191

1327 +msgid "relative config include conditionals must come from files"

1328 +msgstr "包含相对路径的条件引用必须来自于文件"

1329 +

1330 +#: config.c:701

1331 #, c-format

1332 msgid "bad config line %d in blob %s"

1333 msgstr "数据对象 %2$s 中错误的配置行 %1$d"

1334

1326 -#: config.c:522

1335 +#: config.c:705

1336 #, c-format

1337 msgid "bad config line %d in file %s"

1338 msgstr "文件 %2$s 中错误的配置行 %1$d"

1339

1331 -#: config.c:526

1340 +#: config.c:709

1341 #, c-format

1342 msgid "bad config line %d in standard input"

1343 msgstr "标准输入中错误的配置行 %d"

1344

1336 -#: config.c:530

1345 +#: config.c:713

1346 #, c-format

1347 msgid "bad config line %d in submodule-blob %s"

1348 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"

1349

1341 -#: config.c:534

1350 +#: config.c:717

1351 #, c-format

1352 msgid "bad config line %d in command line %s"

1353 msgstr "命令行 %2$s 中错误的配置行 %1$d"

1354

1346 -#: config.c:538

1355 +#: config.c:721

1356 #, c-format

1357 msgid "bad config line %d in %s"

1358 msgstr "在 %2$s 中错误的配置行 %1$d"

1359

1351 -#: config.c:657

1360 +#: config.c:840

1361 msgid "out of range"

1362 msgstr "超出范围"

1363

1355 -#: config.c:657

1364 +#: config.c:840

1365 msgid "invalid unit"

1366 msgstr "无效的单位"

1367

1359 -#: config.c:663

1368 +#: config.c:846

1369 #, c-format

1370 msgid "bad numeric config value '%s' for '%s': %s"

1371 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"

1372

1364 -#: config.c:668

1373 +#: config.c:851

1374 #, c-format

1375 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1376 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1377

1369 -#: config.c:671

1378 +#: config.c:854

1379 #, c-format

1380 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1381 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1382

1374 -#: config.c:674

1383 +#: config.c:857

1384 #, c-format

1385 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1386 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"

1387

1379 -#: config.c:677

1388 +#: config.c:860

1389 #, c-format

1390 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1391 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1392

1384 -#: config.c:680

1393 +#: config.c:863

1394 #, c-format

1395 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1396 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1397

1389 -#: config.c:683

1398 +#: config.c:866

1399 #, c-format

1400 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1401 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1402

1394 -#: config.c:770

1403 +#: config.c:953

1404 #, c-format

1405 msgid "failed to expand user dir in: '%s'"

1406 msgstr "无法扩展 '%s' 中的用户目录"

1407

1399 -#: config.c:865 config.c:876

1408 +#: config.c:1048 config.c:1059

1409 #, c-format

1410 msgid "bad zlib compression level %d"

1411 msgstr "错误的 zlib 压缩级别 %d"

1412

1404 -#: config.c:993

1413 +#: config.c:1176

1414 #, c-format

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

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

1417

1409 -#: config.c:1149

1418 +#: config.c:1332

1419 #, c-format

1420 msgid "bad pack compression level %d"

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

1422

1414 -#: config.c:1339

1423 +#: config.c:1522

1424 msgid "unable to parse command-line config"

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

1426

1418 -#: config.c:1389

1427 +#: config.c:1572

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

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

1430

1422 -#: config.c:1743

1431 +#: config.c:1931

1432 +#, c-format

1433 +msgid "Invalid %s: '%s'"

1434 +msgstr "无效 %s：'%s'"

1435 +

1436 +#: config.c:1952

1437 +#, c-format

1438 +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

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

1440 +

1441 +#: config.c:1978

1442 +#, c-format

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

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

1445 +

1446 +#: config.c:1989

1447 #, c-format

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

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

1450

1427 -#: config.c:1745

1451 +#: config.c:1991

1452 #, c-format

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

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

1455

1432 -#: config.c:1804

1456 +#: config.c:2050

1457 #, c-format

1458 msgid "%s has multiple values"

1459 msgstr "%s 有多个取值"

1460

1437 -#: config.c:2225 config.c:2450

1461 +#: config.c:2384 config.c:2609

1462 #, c-format

1463 msgid "fstat on %s failed"

1464 msgstr "在 %s 上执行 fstat 失败"

1465

1442 -#: config.c:2343

1466 +#: config.c:2502

1467 #, c-format

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

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

1470

1447 -#: config.c:2345

1471 +#: config.c:2504 builtin/remote.c:774

1472 #, c-format

1473 msgid "could not unset '%s'"

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

@@ -1583,7 +1607,7 @@ msgstr "无法读取排序文件 '%s'"

1607

1608 #: diffcore-rename.c:536

1609 msgid "Performing inexact rename detection"

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

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

1611

1612 #: diff.c:62

1613 #, c-format

@@ -1616,20 +1640,20 @@ msgstr ""

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

1641 "%s"

1642

1619 -#: diff.c:3085

1643 +#: diff.c:3102

1644 #, c-format

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

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

1647

1624 -#: diff.c:3411

1648 +#: diff.c:3428

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

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

1651

1628 -#: diff.c:3501

1652 +#: diff.c:3518

1653 msgid "--follow requires exactly one pathspec"

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

1655

1632 -#: diff.c:3664

1656 +#: diff.c:3681

1657 #, c-format

1658 msgid ""

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

@@ -1638,205 +1662,225 @@ msgstr ""

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

1663 "%s"

1664

1641 -#: diff.c:3678

1665 +#: diff.c:3695

1666 #, c-format

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

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

1669

1646 -#: diff.c:4696

1670 +#: diff.c:4719

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

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

1673

1650 -#: diff.c:4699

1674 +#: diff.c:4722

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

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

1677

1654 -#: diff.c:4702

1678 +#: diff.c:4725

1679 #, c-format

1680 msgid ""

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

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

1683

1660 -#: dir.c:1862

1684 +#: dir.c:1899

1685 msgid "failed to get kernel name and information"

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

1687

1664 -#: dir.c:1981

1688 +#: dir.c:2018

1689 msgid "Untracked cache is disabled on this system or location."

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

1691

1668 -#: dir.c:2759

1692 +#: dir.c:2776 dir.c:2781

1693 +#, c-format

1694 +msgid "could not create directories for %s"

1695 +msgstr "不能为 %s 创建目录"

1696 +

1697 +#: dir.c:2806

1698 #, c-format

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

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

1701

1673 -#: fetch-pack.c:213

1702 +#: entry.c:280

1703 +#, c-format

1704 +msgid "could not stat file '%s'"

1705 +msgstr "不能获取文件 %s 的状态"

1706 +

1707 +#: fetch-pack.c:249

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

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

1710

1677 -#: fetch-pack.c:225

1711 +#: fetch-pack.c:261

1712 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1713 msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"

1714

1681 -#: fetch-pack.c:243

1715 +#: fetch-pack.c:279

1716 #, c-format

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

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

1719

1686 -#: fetch-pack.c:295

1720 +#: fetch-pack.c:331

1721 msgid "--stateless-rpc requires multi_ack_detailed"

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

1723

1690 -#: fetch-pack.c:381

1724 +#: fetch-pack.c:417

1725 #, c-format

1726 msgid "invalid shallow line: %s"

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

1728

1695 -#: fetch-pack.c:387

1729 +#: fetch-pack.c:423

1730 #, c-format

1731 msgid "invalid unshallow line: %s"

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

1733

1700 -#: fetch-pack.c:389

1734 +#: fetch-pack.c:425

1735 #, c-format

1736 msgid "object not found: %s"

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

1738

1705 -#: fetch-pack.c:392

1739 +#: fetch-pack.c:428

1740 #, c-format

1741 msgid "error in object: %s"

1742 msgstr "对象中出错：%s"

1743

1710 -#: fetch-pack.c:394

1744 +#: fetch-pack.c:430

1745 #, c-format

1746 msgid "no shallow found: %s"

1747 msgstr "未发现 shallow：%s"

1748

1715 -#: fetch-pack.c:397

1749 +#: fetch-pack.c:433

1750 #, c-format

1751 msgid "expected shallow/unshallow, got %s"

1752 msgstr "应为 shallow/unshallow，却得到 %s"

1753

1720 -#: fetch-pack.c:436

1754 +#: fetch-pack.c:472

1755 #, c-format

1756 msgid "got %s %d %s"

1757 msgstr "得到 %s %d %s"

1758

1725 -#: fetch-pack.c:450

1759 +#: fetch-pack.c:486

1760 #, c-format

1761 msgid "invalid commit %s"

1762 msgstr "无效提交 %s"

1763

1730 -#: fetch-pack.c:483

1764 +#: fetch-pack.c:519

1765 msgid "giving up"

1766 msgstr "放弃"

1767

1734 -#: fetch-pack.c:493 progress.c:235

1768 +#: fetch-pack.c:529 progress.c:235

1769 msgid "done"

1770 msgstr "完成"

1771

1738 -#: fetch-pack.c:505

1772 +#: fetch-pack.c:541

1773 #, c-format

1774 msgid "got %s (%d) %s"

1775 msgstr "得到 %s (%d) %s"

1776

1743 -#: fetch-pack.c:551

1777 +#: fetch-pack.c:587

1778 #, c-format

1779 msgid "Marking %s as complete"

1780 msgstr "标记 %s 为完成"

1781

1748 -#: fetch-pack.c:697

1782 +#: fetch-pack.c:735

1783 #, c-format

1784 msgid "already have %s (%s)"

1785 msgstr "已经有 %s（%s）"

1786

1753 -#: fetch-pack.c:735

1787 +#: fetch-pack.c:773

1788 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1789 msgstr "fetch-pack：无法派生 sideband 多路输出"

1790

1757 -#: fetch-pack.c:743

1791 +#: fetch-pack.c:781

1792 msgid "protocol error: bad pack header"

1793 msgstr "协议错误：坏的包头"

1794

1761 -#: fetch-pack.c:799

1795 +#: fetch-pack.c:837

1796 #, c-format

1797 msgid "fetch-pack: unable to fork off %s"

1798 msgstr "fetch-pack：无法派生进程 %s"

1799

1766 -#: fetch-pack.c:815

1800 +#: fetch-pack.c:853

1801 #, c-format

1802 msgid "%s failed"

1803 msgstr "%s 失败"

1804

1771 -#: fetch-pack.c:817

1805 +#: fetch-pack.c:855

1806 msgid "error in sideband demultiplexer"

1807 msgstr "sideband 多路输出出错"

1808

1775 -#: fetch-pack.c:844

1809 +#: fetch-pack.c:882

1810 msgid "Server does not support shallow clients"

1811 msgstr "服务器不支持 shalllow 客户端"

1812

1779 -#: fetch-pack.c:848

1813 +#: fetch-pack.c:886

1814 msgid "Server supports multi_ack_detailed"

1815 msgstr "服务器支持 multi_ack_detailed"

1816

1783 -#: fetch-pack.c:851

1817 +#: fetch-pack.c:889

1818 msgid "Server supports no-done"

1819 msgstr "服务器支持 no-done"

1820

1787 -#: fetch-pack.c:857

1821 +#: fetch-pack.c:895

1822 msgid "Server supports multi_ack"

1823 msgstr "服务器支持 multi_ack"

1824

1791 -#: fetch-pack.c:861

1825 +#: fetch-pack.c:899

1826 msgid "Server supports side-band-64k"

1827 msgstr "服务器支持 side-band-64k"

1828

1795 -#: fetch-pack.c:865

1829 +#: fetch-pack.c:903

1830 msgid "Server supports side-band"

1831 msgstr "服务器支持 side-band"

1832

1799 -#: fetch-pack.c:869

1833 +#: fetch-pack.c:907

1834 msgid "Server supports allow-tip-sha1-in-want"

1835 msgstr "服务器支持 allow-tip-sha1-in-want"

1836

1803 -#: fetch-pack.c:873

1837 +#: fetch-pack.c:911

1838 msgid "Server supports allow-reachable-sha1-in-want"

1839 msgstr "服务器支持 allow-reachable-sha1-in-want"

1840

1807 -#: fetch-pack.c:883

1841 +#: fetch-pack.c:921

1842 msgid "Server supports ofs-delta"

1843 msgstr "服务器支持 ofs-delta"

1844

1811 -#: fetch-pack.c:890

1845 +#: fetch-pack.c:928

1846 #, c-format

1847 msgid "Server version is %.*s"

1848 msgstr "服务器版本 %.*s"

1849

1816 -#: fetch-pack.c:896

1850 +#: fetch-pack.c:934

1851 msgid "Server does not support --shallow-since"

1852 msgstr "服务器不支持 --shallow-since"

1853

1820 -#: fetch-pack.c:900

1854 +#: fetch-pack.c:938

1855 msgid "Server does not support --shallow-exclude"

1856 msgstr "服务器不支持 --shallow-exclude"

1857

1824 -#: fetch-pack.c:902

1858 +#: fetch-pack.c:940

1859 msgid "Server does not support --deepen"

1860 msgstr "服务器不支持 --deepen"

1861

1828 -#: fetch-pack.c:913

1862 +#: fetch-pack.c:951

1863 msgid "no common commits"

1864 msgstr "没有共同的提交"

1865

1832 -#: fetch-pack.c:925

1866 +#: fetch-pack.c:963

1867 msgid "git fetch-pack: fetch failed."

1868 msgstr "git fetch-pack：获取失败。"

1869

1836 -#: fetch-pack.c:1087

1870 +#: fetch-pack.c:1125

1871 msgid "no matching remote head"

1872 msgstr "没有匹配的远程分支"

1873

1874 +#: fetch-pack.c:1147

1875 +#, c-format

1876 +msgid "no such remote ref %s"

1877 +msgstr "没有这样的远程引用 %s"

1878 +

1879 +#: fetch-pack.c:1150

1880 +#, c-format

1881 +msgid "Server does not allow request for unadvertised object %s"

1882 +msgstr "服务器不允许请求未公开的对象 %s"

1883 +

1884 #: gpg-interface.c:185

1885 msgid "gpg failed to sign the data"

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

@@ -1855,17 +1899,17 @@ msgstr "无法将分离式签名写入 '%s'"

1899 msgid "ignore invalid color '%.*s' in log.graphColors"

1900 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

1901

1858 -#: grep.c:1794

1902 +#: grep.c:1796

1903 #, c-format

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

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

1906

1863 -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133

1907 +#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133

1908 #, c-format

1909 msgid "failed to stat '%s'"

1910 msgstr "无法枚举 '%s' 状态"

1911

1868 -#: grep.c:1822

1912 +#: grep.c:1824

1913 #, c-format

1914 msgid "'%s': short read"

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

@@ -1934,7 +1978,7 @@ msgstr[1] ""

1978 msgid "%s: %s - %s"

1979 msgstr "%s：%s - %s"

1980

1937 -#: ident.c:334

1981 +#: ident.c:343

1982 msgid ""

1983 "\n"

1984 "*** Please tell me who you are.\n"

@@ -1959,6 +2003,39 @@ msgstr ""

2003 "来设置您账号的缺省身份标识。\n"

2004 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"

2005

2006 +#: ident.c:367

2007 +msgid "no email was given and auto-detection is disabled"

2008 +msgstr "未提供邮件地址且自动探测引用被禁用"

2009 +

2010 +#: ident.c:372

2011 +#, c-format

2012 +msgid "unable to auto-detect email address (got '%s')"

2013 +msgstr "无法自动探测邮件地址（得到 '%s'）"

2014 +

2015 +#: ident.c:382

2016 +msgid "no name was given and auto-detection is disabled"

2017 +msgstr "未提供姓名且自动探测被禁用"

2018 +

2019 +#: ident.c:388

2020 +#, c-format

2021 +msgid "unable to auto-detect name (got '%s')"

2022 +msgstr "无法自动探测姓名（得到 '%s'）"

2023 +

2024 +#: ident.c:396

2025 +#, c-format

2026 +msgid "empty ident name (for <%s>) not allowed"

2027 +msgstr "不允许空的姓名（对于 <%s>）"

2028 +

2029 +#: ident.c:402

2030 +#, c-format

2031 +msgid "name consists only of disallowed characters: %s"

2032 +msgstr "姓名中仅包含禁用字符：%s"

2033 +

2034 +#: ident.c:417 builtin/commit.c:611

2035 +#, c-format

2036 +msgid "invalid date format: %s"

2037 +msgstr "无效的日期格式：%s"

2038 +

2039 #: lockfile.c:152

2040 #, c-format

2041 msgid ""

@@ -1986,8 +2063,8 @@ msgstr "不能创建 '%s.lock'：%s"

2063 msgid "failed to read the cache"

2064 msgstr "无法读取缓存"

2065

1989 -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374

1990 -#: builtin/checkout.c:588 builtin/clone.c:731

2066 +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393

2067 +#: builtin/checkout.c:607 builtin/clone.c:749

2068 msgid "unable to write new index file"

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

2070

@@ -2057,38 +2134,56 @@ msgstr "无法执行内部合并"

2134 msgid "Unable to add %s to database"

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

2136

2060 -#: merge-recursive.c:1088 merge-recursive.c:1102

2137 +#: merge-recursive.c:1092

2138 #, c-format

2139 msgid ""

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

2141 "in tree."

2142 msgstr ""

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

2067 -"的版本被保留。"

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

2144 +"本被保留。"

2145 +

2146 +#: merge-recursive.c:1097

2147 +#, c-format

2148 +msgid ""

2149 +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2150 +"left in tree."

2151 +msgstr ""

2152 +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

2153 +"%7$s 版本被保留。"

2154

2069 -#: merge-recursive.c:1094 merge-recursive.c:1107

2155 +#: merge-recursive.c:1104

2156 #, c-format

2157 msgid ""

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

2159 "in tree at %s."

2160 msgstr ""

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

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

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

2162 +"本保留在 %8$s 中。"

2163

2078 -#: merge-recursive.c:1150

2164 +#: merge-recursive.c:1109

2165 +#, c-format

2166 +msgid ""

2167 +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2168 +"left in tree at %s."

2169 +msgstr ""

2170 +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

2171 +"%7$s 版本保留在 %9$s 中。"

2172 +

2173 +#: merge-recursive.c:1143

2174 msgid "rename"

2175 msgstr "重命名"

2176

2082 -#: merge-recursive.c:1150

2177 +#: merge-recursive.c:1143

2178 msgid "renamed"

2179 msgstr "重命名"

2180

2086 -#: merge-recursive.c:1207

2181 +#: merge-recursive.c:1200

2182 #, c-format

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

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

2185

2091 -#: merge-recursive.c:1232

2186 +#: merge-recursive.c:1225

2187 #, c-format

2188 msgid ""

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

@@ -2097,135 +2192,135 @@ msgstr ""

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

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

2194

2100 -#: merge-recursive.c:1237

2195 +#: merge-recursive.c:1230

2196 msgid " (left unresolved)"

2197 msgstr "（留下未解决）"

2198

2104 -#: merge-recursive.c:1299

2199 +#: merge-recursive.c:1292

2200 #, c-format

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

2202 msgstr ""

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

2204 "%5$s"

2205

2111 -#: merge-recursive.c:1332

2206 +#: merge-recursive.c:1325

2207 #, c-format

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

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

2210

2116 -#: merge-recursive.c:1535

2211 +#: merge-recursive.c:1528

2212 #, c-format

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

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

2215

2121 -#: merge-recursive.c:1550

2216 +#: merge-recursive.c:1543

2217 #, c-format

2218 msgid "Adding merged %s"

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

2220

2126 -#: merge-recursive.c:1557 merge-recursive.c:1771

2221 +#: merge-recursive.c:1550 merge-recursive.c:1780

2222 #, c-format

2223 msgid "Adding as %s instead"

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

2225

2131 -#: merge-recursive.c:1614

2226 +#: merge-recursive.c:1607

2227 #, c-format

2228 msgid "cannot read object %s"

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

2230

2136 -#: merge-recursive.c:1617

2231 +#: merge-recursive.c:1610

2232 #, c-format

2233 msgid "object %s is not a blob"

2234 msgstr "对象 %s 不是一个数据对象"

2235

2141 -#: merge-recursive.c:1670

2236 +#: merge-recursive.c:1679

2237 msgid "modify"

2238 msgstr "修改"

2239

2145 -#: merge-recursive.c:1670

2240 +#: merge-recursive.c:1679

2241 msgid "modified"

2242 msgstr "修改"

2243

2149 -#: merge-recursive.c:1680

2244 +#: merge-recursive.c:1689

2245 msgid "content"

2246 msgstr "内容"

2247

2153 -#: merge-recursive.c:1687

2248 +#: merge-recursive.c:1696

2249 msgid "add/add"

2250 msgstr "添加/添加"

2251

2157 -#: merge-recursive.c:1723

2252 +#: merge-recursive.c:1732

2253 #, c-format

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

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

2256

2162 -#: merge-recursive.c:1737

2257 +#: merge-recursive.c:1746

2258 #, c-format

2259 msgid "Auto-merging %s"

2260 msgstr "自动合并 %s"

2261

2167 -#: merge-recursive.c:1741 git-submodule.sh:930

2262 +#: merge-recursive.c:1750 git-submodule.sh:944

2263 msgid "submodule"

2264 msgstr "子模组"

2265

2171 -#: merge-recursive.c:1742

2266 +#: merge-recursive.c:1751

2267 #, c-format

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

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

2270

2176 -#: merge-recursive.c:1836

2271 +#: merge-recursive.c:1845

2272 #, c-format

2273 msgid "Removing %s"

2274 msgstr "删除 %s"

2275

2181 -#: merge-recursive.c:1862

2276 +#: merge-recursive.c:1871

2277 msgid "file/directory"

2278 msgstr "文件/目录"

2279

2185 -#: merge-recursive.c:1868

2280 +#: merge-recursive.c:1877

2281 msgid "directory/file"

2282 msgstr "目录/文件"

2283

2189 -#: merge-recursive.c:1874

2284 +#: merge-recursive.c:1883

2285 #, c-format

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

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

2288

2194 -#: merge-recursive.c:1883

2289 +#: merge-recursive.c:1892

2290 #, c-format

2291 msgid "Adding %s"

2292 msgstr "添加 %s"

2293

2199 -#: merge-recursive.c:1920

2294 +#: merge-recursive.c:1929

2295 msgid "Already up-to-date!"

2296 msgstr "已经是最新的！"

2297

2203 -#: merge-recursive.c:1929

2298 +#: merge-recursive.c:1938

2299 #, c-format

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

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

2302

2208 -#: merge-recursive.c:2012

2303 +#: merge-recursive.c:2021

2304 msgid "Merging:"

2305 msgstr "合并："

2306

2212 -#: merge-recursive.c:2025

2307 +#: merge-recursive.c:2034

2308 #, c-format

2309 msgid "found %u common ancestor:"

2310 msgid_plural "found %u common ancestors:"

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

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

2313

2219 -#: merge-recursive.c:2064

2314 +#: merge-recursive.c:2073

2315 msgid "merge returned no commit"

2316 msgstr "合并未返回提交"

2317

2223 -#: merge-recursive.c:2127

2318 +#: merge-recursive.c:2136

2319 #, c-format

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

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

2322

2228 -#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792

2323 +#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792

2324 msgid "Unable to write index."

2325 msgstr "不能写入索引。"

2326

@@ -2302,66 +2397,83 @@ msgstr "-数字"

2397 msgid "malformed object name '%s'"

2398 msgstr "非法的对象名 '%s'"

2399

2305 -#: path.c:826

2400 +#: path.c:805

2401 #, c-format

2402 msgid "Could not make %s writable by group"

2403 msgstr "不能设置 %s 为组可写"

2404

2310 -#: pathspec.c:142

2405 +#: pathspec.c:125

2406 +msgid "Escape character '\\' not allowed as last character in attr value"

2407 +msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"

2408 +

2409 +#: pathspec.c:143

2410 +msgid "Only one 'attr:' specification is allowed."

2411 +msgstr "只允许一个 'attr:' 规格。"

2412 +

2413 +#: pathspec.c:146

2414 +msgid "attr spec must not be empty"

2415 +msgstr "属性规格不能为空"

2416 +

2417 +#: pathspec.c:189

2418 +#, c-format

2419 +msgid "invalid attribute name %s"

2420 +msgstr "无效的属性名 %s"

2421 +

2422 +#: pathspec.c:254

2423 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2424 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

2425

2314 -#: pathspec.c:149

2426 +#: pathspec.c:261

2427 msgid ""

2428 "global 'literal' pathspec setting is incompatible with all other global "

2429 "pathspec settings"

2430 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

2431

2320 -#: pathspec.c:188

2432 +#: pathspec.c:301

2433 msgid "invalid parameter for pathspec magic 'prefix'"

2434 msgstr "路径规格包含无效的神奇前缀"

2435

2324 -#: pathspec.c:201

2436 +#: pathspec.c:322

2437 #, c-format

2438 msgid "Invalid pathspec magic '%.*s' in '%s'"

2439 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

2440

2329 -#: pathspec.c:206

2441 +#: pathspec.c:327

2442 #, c-format

2443 msgid "Missing ')' at the end of pathspec magic in '%s'"

2444 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

2445

2334 -#: pathspec.c:238

2446 +#: pathspec.c:365

2447 #, c-format

2448 msgid "Unimplemented pathspec magic '%c' in '%s'"

2449 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

2450

2339 -#: pathspec.c:293 pathspec.c:315

2451 +#: pathspec.c:421 pathspec.c:443

2452 #, c-format

2453 msgid "Pathspec '%s' is in submodule '%.*s'"

2454 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

2455

2344 -#: pathspec.c:350

2456 +#: pathspec.c:483

2457 #, c-format

2458 msgid "%s: 'literal' and 'glob' are incompatible"

2459 msgstr "%s：'literal' 和 'glob' 不兼容"

2460

2349 -#: pathspec.c:363

2461 +#: pathspec.c:496

2462 #, c-format

2463 msgid "%s: '%s' is outside repository"

2464 msgstr "%s：'%s' 在仓库之外"

2465

2354 -#: pathspec.c:451

2466 +#: pathspec.c:584

2467 #, c-format

2468 msgid "'%s' (mnemonic: '%c')"

2469 msgstr "'%s'（助记符：'%c'）"

2470

2359 -#: pathspec.c:461

2471 +#: pathspec.c:594

2472 #, c-format

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

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

2475

2364 -#: pathspec.c:511

2476 +#: pathspec.c:644

2477 msgid ""

2478 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2479 "use . instead if you meant to match all paths"

@@ -2369,19 +2481,11 @@ msgstr ""

2481 "在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"

2482 "请代之以 ."

2483

2372 -#: pathspec.c:535

2484 +#: pathspec.c:668

2485 #, c-format

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

2487 msgstr "路径规格 '%s' 位于符号链接中"

2488

2377 -#: pathspec.c:544

2378 -msgid ""

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

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

2381 -msgstr ""

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

2383 -"添加 ':/' 或 '.' ？"

2384 -

2489 #: pretty.c:982

2490 msgid "unable to parse --pretty format"

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

@@ -2404,161 +2508,264 @@ msgstr ""

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

2509 "使用版本 %i"

2510

2407 -#: refs.c:576 builtin/merge.c:844

2511 +#: read-cache.c:2232

2512 +#, c-format

2513 +msgid "could not stat '%s"

2514 +msgstr "不能获取 '%s' 的文件状态"

2515 +

2516 +#: read-cache.c:2245

2517 +#, c-format

2518 +msgid "unable to open git dir: %s"

2519 +msgstr "不能打开 git 目录：%s"

2520 +

2521 +#: read-cache.c:2257

2522 +#, c-format

2523 +msgid "unable to unlink: %s"

2524 +msgstr "无法删除：%s"

2525 +

2526 +#: refs.c:619 builtin/merge.c:844

2527 #, c-format

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

2529 msgstr "无法打开 '%s' 进行写入"

2530

2412 -#: refs/files-backend.c:2481

2531 +#: refs/files-backend.c:2531

2532 #, c-format

2533 msgid "could not delete reference %s: %s"

2534 msgstr "无法删除引用 %s：%s"

2535

2417 -#: refs/files-backend.c:2484

2536 +#: refs/files-backend.c:2534

2537 #, c-format

2538 msgid "could not delete references: %s"

2539 msgstr "无法删除引用：%s"

2540

2422 -#: refs/files-backend.c:2493

2541 +#: refs/files-backend.c:2543

2542 #, c-format

2543 msgid "could not remove reference %s"

2544 msgstr "无法删除引用 %s"

2545

2427 -#: ref-filter.c:56

2546 +#: ref-filter.c:35 wt-status.c:1780

2547 +msgid "gone"

2548 +msgstr "丢失"

2549 +

2550 +#: ref-filter.c:36

2551 +#, c-format

2552 +msgid "ahead %d"

2553 +msgstr "领先 %d"

2554 +

2555 +#: ref-filter.c:37

2556 +#, c-format

2557 +msgid "behind %d"

2558 +msgstr "落后 %d"

2559 +

2560 +#: ref-filter.c:38

2561 +#, c-format

2562 +msgid "ahead %d, behind %d"

2563 +msgstr "领先 %d，落后 %d"

2564 +

2565 +#: ref-filter.c:104

2566 #, c-format

2567 msgid "expected format: %%(color:<color>)"

2568 msgstr "期望的格式：%%(color:<color>)"

2569

2432 -#: ref-filter.c:58

2570 +#: ref-filter.c:106

2571 #, c-format

2572 msgid "unrecognized color: %%(color:%s)"

2573 msgstr "未能识别的颜色：%%(color:%s)"

2574

2437 -#: ref-filter.c:72

2575 +#: ref-filter.c:120

2576 #, c-format

2439 -msgid "unrecognized format: %%(%s)"

2440 -msgstr "未能识别的格式：%%(%s)"

2577 +msgid "Integer value expected refname:lstrip=%s"

2578 +msgstr "期望整数值 refname:lstrip=%s"

2579

2442 -#: ref-filter.c:78

2580 +#: ref-filter.c:124

2581 +#, c-format

2582 +msgid "Integer value expected refname:rstrip=%s"

2583 +msgstr "期望整数值 refname:rstrip=%s"

2584 +

2585 +#: ref-filter.c:126

2586 +#, c-format

2587 +msgid "unrecognized %%(%s) argument: %s"

2588 +msgstr "未能识别的 %%(%s) 参数：%s"

2589 +

2590 +#: ref-filter.c:166

2591 #, c-format

2592 msgid "%%(body) does not take arguments"

2593 msgstr "%%(body) 不带参数"

2594

2447 -#: ref-filter.c:85

2595 +#: ref-filter.c:173

2596 #, c-format

2597 msgid "%%(subject) does not take arguments"

2598 msgstr "%%(subject) 不带参数"

2599

2452 -#: ref-filter.c:92

2600 +#: ref-filter.c:180

2601 #, c-format

2602 msgid "%%(trailers) does not take arguments"

2603 msgstr "%%(trailers) 不带参数"

2604

2457 -#: ref-filter.c:111

2605 +#: ref-filter.c:199

2606 #, c-format

2607 msgid "positive value expected contents:lines=%s"

2460 -msgstr "要为 contents:lines=%s 提供一个正数"

2608 +msgstr "期望一个正数 contents:lines=%s"

2609

2462 -#: ref-filter.c:113

2610 +#: ref-filter.c:201

2611 #, c-format

2612 msgid "unrecognized %%(contents) argument: %s"

2613 msgstr "未能识别的 %%(contents) 参数：%s"

2614

2467 -#: ref-filter.c:123

2615 +#: ref-filter.c:214

2616 +#, c-format

2617 +msgid "positive value expected objectname:short=%s"

2618 +msgstr "期望一个正数 objectname:short=%s"

2619 +

2620 +#: ref-filter.c:218

2621 #, c-format

2622 msgid "unrecognized %%(objectname) argument: %s"

2623 msgstr "未能识别的 %%(objectname) 参数：%s"

2624

2472 -#: ref-filter.c:145

2625 +#: ref-filter.c:245

2626 #, c-format

2627 msgid "expected format: %%(align:<width>,<position>)"

2628 msgstr "期望的格式：%%(align:<width>,<position>)"

2629

2477 -#: ref-filter.c:157

2630 +#: ref-filter.c:257

2631 #, c-format

2632 msgid "unrecognized position:%s"

2633 msgstr "未能识别的位置：%s"

2634

2482 -#: ref-filter.c:161

2635 +#: ref-filter.c:261

2636 #, c-format

2637 msgid "unrecognized width:%s"

2638 msgstr "未能识别的宽度：%s"

2639

2487 -#: ref-filter.c:167

2640 +#: ref-filter.c:267

2641 #, c-format

2642 msgid "unrecognized %%(align) argument: %s"

2643 msgstr "未能识别的 %%(align) 参数：%s"

2644

2492 -#: ref-filter.c:171

2645 +#: ref-filter.c:271

2646 #, c-format

2647 msgid "positive width expected with the %%(align) atom"

2648 msgstr "元素 %%(align) 需要一个正数的宽度"

2649

2497 -#: ref-filter.c:255

2650 +#: ref-filter.c:286

2651 +#, c-format

2652 +msgid "unrecognized %%(if) argument: %s"

2653 +msgstr "未能识别的 %%(if) 参数：%s"

2654 +

2655 +#: ref-filter.c:371

2656 #, c-format

2657 msgid "malformed field name: %.*s"

2658 msgstr "非法的字段名：%.*s"

2659

2502 -#: ref-filter.c:281

2660 +#: ref-filter.c:397

2661 #, c-format

2662 msgid "unknown field name: %.*s"

2663 msgstr "未知的字段名：%.*s"

2664

2507 -#: ref-filter.c:383

2665 +#: ref-filter.c:501

2666 +#, c-format

2667 +msgid "format: %%(if) atom used without a %%(then) atom"

2668 +msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

2669 +

2670 +#: ref-filter.c:561

2671 +#, c-format

2672 +msgid "format: %%(then) atom used without an %%(if) atom"

2673 +msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

2674 +

2675 +#: ref-filter.c:563

2676 +#, c-format

2677 +msgid "format: %%(then) atom used more than once"

2678 +msgstr "格式：%%(then) 元素用了多次"

2679 +

2680 +#: ref-filter.c:565

2681 +#, c-format

2682 +msgid "format: %%(then) atom used after %%(else)"

2683 +msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

2684 +

2685 +#: ref-filter.c:591

2686 +#, c-format

2687 +msgid "format: %%(else) atom used without an %%(if) atom"

2688 +msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

2689 +

2690 +#: ref-filter.c:593

2691 +#, c-format

2692 +msgid "format: %%(else) atom used without a %%(then) atom"

2693 +msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

2694 +

2695 +#: ref-filter.c:595

2696 +#, c-format

2697 +msgid "format: %%(else) atom used more than once"

2698 +msgstr "格式：%%(else) 元素用了多次"

2699 +

2700 +#: ref-filter.c:608

2701 #, c-format

2702 msgid "format: %%(end) atom used without corresponding atom"

2703 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

2704

2512 -#: ref-filter.c:435

2705 +#: ref-filter.c:663

2706 #, c-format

2707 msgid "malformed format string %s"

2708 msgstr "非法的格式化字符串 %s"

2709

2517 -#: ref-filter.c:898

2518 -msgid ":strip= requires a positive integer argument"

2519 -msgstr ":strip= 需要一个正整型参数"

2710 +#: ref-filter.c:1247

2711 +#, c-format

2712 +msgid "(no branch, rebasing %s)"

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

2714 +

2715 +#: ref-filter.c:1250

2716 +#, c-format

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

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

2719

2521 -#: ref-filter.c:903

2720 +#. TRANSLATORS: make sure this matches

2721 +#. "HEAD detached at " in wt-status.c

2722 +#: ref-filter.c:1256

2723 #, c-format

2523 -msgid "ref '%s' does not have %ld components to :strip"

2524 -msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"

2724 +msgid "(HEAD detached at %s)"

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

2726

2526 -#: ref-filter.c:1066

2727 +#. TRANSLATORS: make sure this matches

2728 +#. "HEAD detached from " in wt-status.c

2729 +#: ref-filter.c:1261

2730 #, c-format

2528 -msgid "unknown %.*s format %s"

2529 -msgstr "未知的 %.*s 格式 %s"

2731 +msgid "(HEAD detached from %s)"

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

2733

2531 -#: ref-filter.c:1086 ref-filter.c:1117

2734 +#: ref-filter.c:1265

2735 +msgid "(no branch)"

2736 +msgstr "（非分支）"

2737 +

2738 +#: ref-filter.c:1420 ref-filter.c:1451

2739 #, c-format

2740 msgid "missing object %s for %s"

2741 msgstr "缺失 %2$s 的对象 %1$s"

2742

2536 -#: ref-filter.c:1089 ref-filter.c:1120

2743 +#: ref-filter.c:1423 ref-filter.c:1454

2744 #, c-format

2745 msgid "parse_object_buffer failed on %s for %s"

2746 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

2747

2541 -#: ref-filter.c:1343

2748 +#: ref-filter.c:1692

2749 #, c-format

2750 msgid "malformed object at '%s'"

2751 msgstr "非法的对象于 '%s'"

2752

2546 -#: ref-filter.c:1410

2753 +#: ref-filter.c:1759

2754 #, c-format

2755 msgid "ignoring ref with broken name %s"

2756 msgstr "忽略带有错误名称 %s 的引用"

2757

2551 -#: ref-filter.c:1415

2758 +#: ref-filter.c:1764

2759 #, c-format

2760 msgid "ignoring broken ref %s"

2761 msgstr "忽略损坏的引用 %s"

2762

2556 -#: ref-filter.c:1670

2763 +#: ref-filter.c:2028

2764 #, c-format

2765 msgid "format: %%(end) atom missing"

2766 msgstr "格式：缺少 %%(end) 元素"

2767

2561 -#: ref-filter.c:1734

2768 +#: ref-filter.c:2109

2769 #, c-format

2770 msgid "malformed object name %s"

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

@@ -2704,25 +2911,35 @@ msgstr "不能打开 /dev/null"

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

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

2913

2707 -#: send-pack.c:297

2914 +#: send-pack.c:150

2915 +#, c-format

2916 +msgid "unable to parse remote unpack status: %s"

2917 +msgstr "不能解析远程解包状态：%s"

2918 +

2919 +#: send-pack.c:152

2920 +#, c-format

2921 +msgid "remote unpack failed: %s"

2922 +msgstr "远程解包失败：%s"

2923 +

2924 +#: send-pack.c:315

2925 msgid "failed to sign the push certificate"

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

2927

2711 -#: send-pack.c:410

2928 +#: send-pack.c:428

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

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

2931

2715 -#: send-pack.c:412

2932 +#: send-pack.c:430

2933 msgid ""

2934 "not sending a push certificate since the receiving end does not support --"

2935 "signed push"

2936 msgstr "未发送推送证书，因为接收端不支持签名推送"

2937

2721 -#: send-pack.c:424

2938 +#: send-pack.c:442

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

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

2941

2725 -#: send-pack.c:429

2942 +#: send-pack.c:447

2943 msgid "the receiving end does not support push options"

2944 msgstr "接收端不支持推送选项"

2945

@@ -2760,12 +2977,12 @@ msgstr ""

2977 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

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

2979

2763 -#: sequencer.c:294 sequencer.c:1667

2980 +#: sequencer.c:294 sequencer.c:1675

2981 #, c-format

2982 msgid "could not lock '%s'"

2983 msgstr "不能锁定 '%s'"

2984

2768 -#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686

2985 +#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694

2986 #, c-format

2987 msgid "could not write to '%s'"

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

@@ -2775,13 +2992,13 @@ msgstr "不能写入 '%s'"

2992 msgid "could not write eol to '%s'"

2993 msgstr "不能将换行符写入 '%s'"

2994

2778 -#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674

2995 +#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682

2996 #, c-format

2997 msgid "failed to finalize '%s'."

2998 msgstr "无法完成 '%s'。"

2999

2783 -#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259

2784 -#: builtin/commit.c:749 builtin/merge.c:1036

3000 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259

3001 +#: builtin/commit.c:749 builtin/merge.c:1018

3002 #, c-format

3003 msgid "could not read '%s'"

3004 msgstr "不能读取 '%s'"

@@ -2845,17 +3062,17 @@ msgstr ""

3062 "\n"

3063 " git rebase --continue\n"

3064

2848 -#: sequencer.c:688

3065 +#: sequencer.c:694

3066 #, c-format

3067 msgid "could not parse commit %s\n"

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

3069

2853 -#: sequencer.c:693

3070 +#: sequencer.c:699

3071 #, c-format

3072 msgid "could not parse parent commit %s\n"

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

3074

2858 -#: sequencer.c:815

3075 +#: sequencer.c:821

3076 #, c-format

3077 msgid ""

3078 "unexpected 1st line of squash message:\n"

@@ -2866,7 +3083,7 @@ msgstr ""

3083 "\n"

3084 "\t%.*s"

3085

2869 -#: sequencer.c:821

3086 +#: sequencer.c:827

3087 #, c-format

3088 msgid ""

3089 "invalid 1st line of squash message:\n"

@@ -2877,230 +3094,230 @@ msgstr ""

3094 "\n"

3095 "\t%.*s"

3096

2880 -#: sequencer.c:827 sequencer.c:852

3097 +#: sequencer.c:833 sequencer.c:858

3098 #, c-format

3099 msgid "This is a combination of %d commits."

3100 msgstr "这是一个 %d 个提交的组合。"

3101

2885 -#: sequencer.c:836

3102 +#: sequencer.c:842

3103 msgid "need a HEAD to fixup"

3104 msgstr "需要一个 HEAD 来修复"

3105

2889 -#: sequencer.c:838

3106 +#: sequencer.c:844

3107 msgid "could not read HEAD"

3108 msgstr "不能读取 HEAD"

3109

2893 -#: sequencer.c:840

3110 +#: sequencer.c:846

3111 msgid "could not read HEAD's commit message"

3112 msgstr "不能读取 HEAD 的提交说明"

3113

2897 -#: sequencer.c:846

3114 +#: sequencer.c:852

3115 #, c-format

3116 msgid "cannot write '%s'"

3117 msgstr "不能写 '%s'"

3118

2902 -#: sequencer.c:855 git-rebase--interactive.sh:445

3119 +#: sequencer.c:861 git-rebase--interactive.sh:445

3120 msgid "This is the 1st commit message:"

3121 msgstr "这是第一个提交说明："

3122

2906 -#: sequencer.c:863

3123 +#: sequencer.c:869

3124 #, c-format

3125 msgid "could not read commit message of %s"

3126 msgstr "不能读取 %s 的提交说明"

3127

2911 -#: sequencer.c:870

3128 +#: sequencer.c:876

3129 #, c-format

3130 msgid "This is the commit message #%d:"

3131 msgstr "这是提交说明 #%d："

3132

2916 -#: sequencer.c:875

3133 +#: sequencer.c:881

3134 #, c-format

3135 msgid "The commit message #%d will be skipped:"

3136 msgstr "提交说明 #%d 将被跳过："

3137

2921 -#: sequencer.c:880

3138 +#: sequencer.c:886

3139 #, c-format

3140 msgid "unknown command: %d"

3141 msgstr "未知命令：%d"

3142

2926 -#: sequencer.c:946

3143 +#: sequencer.c:952

3144 msgid "your index file is unmerged."

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

3146

2930 -#: sequencer.c:964

3147 +#: sequencer.c:970

3148 #, c-format

3149 msgid "commit %s is a merge but no -m option was given."

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

3151

2935 -#: sequencer.c:972

3152 +#: sequencer.c:978

3153 #, c-format

3154 msgid "commit %s does not have parent %d"

3155 msgstr "提交 %s 没有第 %d 个父提交"

3156

2940 -#: sequencer.c:976

3157 +#: sequencer.c:982

3158 #, c-format

3159 msgid "mainline was specified but commit %s is not a merge."

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

3161

2945 -#: sequencer.c:982

3162 +#: sequencer.c:988

3163 #, c-format

3164 msgid "cannot get commit message for %s"

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

3166

3167 #. TRANSLATORS: The first %s will be a "todo" command like

3168 #. "revert" or "pick", the second %s a SHA1.

2952 -#: sequencer.c:1001

3169 +#: sequencer.c:1009

3170 #, c-format

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

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

3173

2957 -#: sequencer.c:1063 sequencer.c:1812

3174 +#: sequencer.c:1071 sequencer.c:1820

3175 #, c-format

3176 msgid "could not rename '%s' to '%s'"

3177 msgstr "不能将 '%s' 重命名为 '%s'"

3178

2962 -#: sequencer.c:1114

3179 +#: sequencer.c:1122

3180 #, c-format

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

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

3183

2967 -#: sequencer.c:1115

3184 +#: sequencer.c:1123

3185 #, c-format

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

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

3188

2972 -#: sequencer.c:1157

3189 +#: sequencer.c:1165

3190 msgid "empty commit set passed"

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

3192

2976 -#: sequencer.c:1167

3193 +#: sequencer.c:1175

3194 #, c-format

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

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

3197

2981 -#: sequencer.c:1174

3198 +#: sequencer.c:1182

3199 #, c-format

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

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

3202

2986 -#: sequencer.c:1294

3203 +#: sequencer.c:1302

3204 #, c-format

3205 msgid "invalid line %d: %.*s"

3206 msgstr "无效行 %d：%.*s"

3207

2991 -#: sequencer.c:1302

3208 +#: sequencer.c:1310

3209 #, c-format

3210 msgid "cannot '%s' without a previous commit"

3211 msgstr "没有父提交的情况下不能 '%s'"

3212

2996 -#: sequencer.c:1334

3213 +#: sequencer.c:1342

3214 #, c-format

3215 msgid "could not read '%s'."

3216 msgstr "不能读取 '%s'。"

3217

3001 -#: sequencer.c:1341

3218 +#: sequencer.c:1349

3219 msgid "please fix this using 'git rebase --edit-todo'."

3220 msgstr "请用 'git rebase --edit-todo' 来修改。"

3221

3005 -#: sequencer.c:1343

3222 +#: sequencer.c:1351

3223 #, c-format

3224 msgid "unusable instruction sheet: '%s'"

3225 msgstr "不可用的指令清单：'%s'"

3226

3010 -#: sequencer.c:1348

3227 +#: sequencer.c:1356

3228 msgid "no commits parsed."

3229 msgstr "没有解析提交。"

3230

3014 -#: sequencer.c:1359

3231 +#: sequencer.c:1367

3232 msgid "cannot cherry-pick during a revert."

3233 msgstr "不能在回退中执行拣选。"

3234

3018 -#: sequencer.c:1361

3235 +#: sequencer.c:1369

3236 msgid "cannot revert during a cherry-pick."

3237 msgstr "不能在拣选中执行回退。"

3238

3022 -#: sequencer.c:1424

3239 +#: sequencer.c:1432

3240 #, c-format

3241 msgid "invalid key: %s"

3242 msgstr "无效键名：%s"

3243

3027 -#: sequencer.c:1427

3244 +#: sequencer.c:1435

3245 #, c-format

3246 msgid "invalid value for %s: %s"

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

3248

3032 -#: sequencer.c:1484

3249 +#: sequencer.c:1492

3250 #, c-format

3251 msgid "malformed options sheet: '%s'"

3252 msgstr "非法的选项清单：'%s'"

3253

3037 -#: sequencer.c:1522

3254 +#: sequencer.c:1530

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

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

3257

3041 -#: sequencer.c:1523

3258 +#: sequencer.c:1531

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

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

3261

3045 -#: sequencer.c:1526

3262 +#: sequencer.c:1534

3263 #, c-format

3264 msgid "could not create sequencer directory '%s'"

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

3266

3050 -#: sequencer.c:1540

3267 +#: sequencer.c:1548

3268 msgid "could not lock HEAD"

3269 msgstr "不能锁定 HEAD"

3270

3054 -#: sequencer.c:1596 sequencer.c:2150

3271 +#: sequencer.c:1604 sequencer.c:2159

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

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

3274

3058 -#: sequencer.c:1598

3275 +#: sequencer.c:1606

3276 msgid "cannot resolve HEAD"

3277 msgstr "不能解析 HEAD"

3278

3062 -#: sequencer.c:1600 sequencer.c:1634

3279 +#: sequencer.c:1608 sequencer.c:1642

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

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

3282

3066 -#: sequencer.c:1620 builtin/grep.c:904

3283 +#: sequencer.c:1628 builtin/grep.c:910

3284 #, c-format

3285 msgid "cannot open '%s'"

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

3287

3071 -#: sequencer.c:1622

3288 +#: sequencer.c:1630

3289 #, c-format

3290 msgid "cannot read '%s': %s"

3291 msgstr "不能读取 '%s'：%s"

3292

3076 -#: sequencer.c:1623

3293 +#: sequencer.c:1631

3294 msgid "unexpected end of file"

3295 msgstr "意外的文件结束"

3296

3080 -#: sequencer.c:1629

3297 +#: sequencer.c:1637

3298 #, c-format

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

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

3301

3085 -#: sequencer.c:1640

3302 +#: sequencer.c:1648

3303 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3304 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

3305

3089 -#: sequencer.c:1777 sequencer.c:2049

3306 +#: sequencer.c:1785 sequencer.c:2058

3307 msgid "cannot read HEAD"

3308 msgstr "不能读取 HEAD"

3309

3093 -#: sequencer.c:1817 builtin/difftool.c:574

3310 +#: sequencer.c:1825 builtin/difftool.c:616

3311 #, c-format

3312 msgid "could not copy '%s' to '%s'"

3313 msgstr "不能拷贝 '%s' 至 '%s'"

3314

3098 -#: sequencer.c:1833

3315 +#: sequencer.c:1841

3316 msgid "could not read index"

3317 msgstr "不能读取索引"

3318

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

3103 -#: sequencer.c:1838

3320 +#: sequencer.c:1846

3321 #, c-format

3322 msgid ""

3323 "execution failed: %s\n"

@@ -3115,11 +3332,11 @@ msgstr ""

3332 " git rebase --continue\n"

3333 "\n"

3334

3118 -#: sequencer.c:1844

3335 +#: sequencer.c:1852

3336 msgid "and made changes to the index and/or the working tree\n"

3337 msgstr "并且修改索引和/或工作区\n"

3338

3122 -#: sequencer.c:1850

3339 +#: sequencer.c:1858

3340 #, c-format

3341 msgid ""

3342 "execution succeeded: %s\n"

@@ -3136,17 +3353,17 @@ msgstr ""

3353 " git rebase --continue\n"

3354 "\n"

3355

3139 -#: sequencer.c:1905 git-rebase.sh:168

3356 +#: sequencer.c:1913 git-rebase.sh:168

3357 #, c-format

3358 msgid "Applied autostash."

3359 msgstr "成功应用 autostash。"

3360

3144 -#: sequencer.c:1917

3361 +#: sequencer.c:1925

3362 #, c-format

3363 msgid "cannot store %s"

3364 msgstr "不能存储 %s"

3365

3149 -#: sequencer.c:1919 git-rebase.sh:172

3366 +#: sequencer.c:1927 git-rebase.sh:172

3367 #, c-format

3368 msgid ""

3369 "Applying autostash resulted in conflicts.\n"

@@ -3157,82 +3374,84 @@ msgstr ""

3374 "您的修改安全地保存在 stash 中。\n"

3375 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

3376

3160 -#: sequencer.c:2000

3377 +#: sequencer.c:2009

3378 #, c-format

3162 -msgid "stopped at %s... %.*s"

3163 -msgstr "停止在 %s... %.*s"

3379 +msgid "Stopped at %s... %.*s\n"

3380 +msgstr "停止在 %s... %.*s\n"

3381

3165 -#: sequencer.c:2027

3382 +#: sequencer.c:2036

3383 #, c-format

3384 msgid "unknown command %d"

3385 msgstr "未知命令 %d"

3386

3170 -#: sequencer.c:2057

3387 +#: sequencer.c:2066

3388 msgid "could not read orig-head"

3389 msgstr "不能读取 orig-head"

3390

3174 -#: sequencer.c:2061

3391 +#: sequencer.c:2070

3392 msgid "could not read 'onto'"

3393 msgstr "不能读取 'onto'"

3394

3178 -#: sequencer.c:2068

3395 +#: sequencer.c:2077

3396 #, c-format

3397 msgid "could not update %s"

3398 msgstr "不能更新 %s"

3399

3183 -#: sequencer.c:2075

3400 +#: sequencer.c:2084

3401 #, c-format

3402 msgid "could not update HEAD to %s"

3403 msgstr "不能更新 HEAD 为 %s"

3404

3188 -#: sequencer.c:2159

3405 +#: sequencer.c:2168

3406 msgid "cannot rebase: You have unstaged changes."

3407 msgstr "不能变基：您有未暂存的变更。"

3408

3192 -#: sequencer.c:2164

3409 +#: sequencer.c:2173

3410 msgid "could not remove CHERRY_PICK_HEAD"

3411 msgstr "不能删除 CHERRY_PICK_HEAD"

3412

3196 -#: sequencer.c:2173

3413 +#: sequencer.c:2182

3414 msgid "cannot amend non-existing commit"

3415 msgstr "不能修补不存在的提交"

3416

3200 -#: sequencer.c:2175

3417 +#: sequencer.c:2184

3418 #, c-format

3419 msgid "invalid file: '%s'"

3420 msgstr "无效文件：'%s'"

3421

3205 -#: sequencer.c:2177

3422 +#: sequencer.c:2186

3423 #, c-format

3424 msgid "invalid contents: '%s'"

3425 msgstr "无效内容：'%s'"

3426

3210 -#: sequencer.c:2180

3427 +#: sequencer.c:2189

3428 msgid ""

3429 "\n"

3430 "You have uncommitted changes in your working tree. Please, commit them\n"

3431 "first and then run 'git rebase --continue' again."

3215 -msgstr "\n您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

3432 +msgstr ""

3433 +"\n"

3434 +"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

3435

3217 -#: sequencer.c:2190

3436 +#: sequencer.c:2199

3437 msgid "could not commit staged changes."

3438 msgstr "不能提交暂存的修改。"

3439

3221 -#: sequencer.c:2270

3440 +#: sequencer.c:2279

3441 #, c-format

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

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

3444

3226 -#: sequencer.c:2274

3445 +#: sequencer.c:2283

3446 #, c-format

3447 msgid "%s: bad revision"

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

3449

3231 -#: sequencer.c:2307

3450 +#: sequencer.c:2316

3451 msgid "can't revert as initial commit"

3452 msgstr "不能作为初始提交回退"

3453

3235 -#: setup.c:160

3454 +#: setup.c:165

3455 #, c-format

3456 msgid ""

3457 "%s: no such path in the working tree.\n"

@@ -3241,7 +3460,7 @@ msgstr ""

3460 "%s：工作区中无此路径。\n"

3461 "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"

3462

3244 -#: setup.c:173

3463 +#: setup.c:178

3464 #, c-format

3465 msgid ""

3466 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3252,7 +3471,7 @@ msgstr ""

3471 "使用 '--' 来分隔版本和路径，例如：\n"

3472 "'git <command> [<revision>...] -- [<file>...]'"

3473

3255 -#: setup.c:223

3474 +#: setup.c:228

3475 #, c-format

3476 msgid ""

3477 "ambiguous argument '%s': both revision and filename\n"

@@ -3263,29 +3482,34 @@ msgstr ""

3482 "使用 '--' 来分隔版本和路径，例如：\n"

3483 "'git <command> [<revision>...] -- [<file>...]'"

3484

3266 -#: setup.c:470

3485 +#: setup.c:475

3486 #, c-format

3487 msgid "Expected git repo version <= %d, found %d"

3488 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

3489

3271 -#: setup.c:478

3490 +#: setup.c:483

3491 msgid "unknown repository extensions found:"

3492 msgstr "发现未知的仓库扩展："

3493

3275 -#: setup.c:768

3494 +#: setup.c:776

3495 #, c-format

3496 msgid "Not a git repository (or any of the parent directories): %s"

3497 msgstr "不是一个 git 仓库（或者任何父目录）：%s"

3498

3280 -#: setup.c:770 setup.c:922 builtin/index-pack.c:1643

3499 +#: setup.c:778 builtin/index-pack.c:1646

3500 msgid "Cannot come back to cwd"

3501 msgstr "无法返回当前工作目录"

3502

3284 -#: setup.c:852

3503 +#: setup.c:1010

3504 msgid "Unable to read current working directory"

3505 msgstr "不能读取当前工作目录"

3506

3288 -#: setup.c:927

3507 +#: setup.c:1022 setup.c:1028

3508 +#, c-format

3509 +msgid "Cannot change to '%s'"

3510 +msgstr "不能切换到 '%s'"

3511 +

3512 +#: setup.c:1041

3513 #, c-format

3514 msgid ""

3515 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3294,12 +3518,7 @@ msgstr ""

3518 "不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"

3519 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

3520

3297 -#: setup.c:934

3298 -#, c-format

3299 -msgid "Cannot change to '%s/..'"

3300 -msgstr "不能切换到 '%s/..'"

3301 -

3302 -#: setup.c:996

3521 +#: setup.c:1106

3522 #, c-format

3523 msgid ""

3524 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3308,55 +3527,55 @@ msgstr ""

3527 "参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"

3528 "文件属主必须始终拥有读写权限。"

3529

3311 -#: sha1_file.c:490

3530 +#: sha1_file.c:559

3531 #, c-format

3532 msgid "path '%s' does not exist"

3533 msgstr "路径 '%s' 不存在"

3534

3316 -#: sha1_file.c:516

3535 +#: sha1_file.c:585

3536 #, c-format

3537 msgid "reference repository '%s' as a linked checkout is not supported yet."

3538 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

3539

3321 -#: sha1_file.c:522

3540 +#: sha1_file.c:591

3541 #, c-format

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

3543 msgstr "参考仓库 '%s' 不是一个本地仓库。"

3544

3326 -#: sha1_file.c:528

3545 +#: sha1_file.c:597

3546 #, c-format

3547 msgid "reference repository '%s' is shallow"

3548 msgstr "参考仓库 '%s' 是一个浅克隆"

3549

3331 -#: sha1_file.c:536

3550 +#: sha1_file.c:605

3551 #, c-format

3552 msgid "reference repository '%s' is grafted"

3553 msgstr "参考仓库 '%s' 已被嫁接"

3554

3336 -#: sha1_file.c:1176

3555 +#: sha1_file.c:1245

3556 msgid "offset before end of packfile (broken .idx?)"

3557 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

3558

3340 -#: sha1_file.c:2637

3559 +#: sha1_file.c:2721

3560 #, c-format

3561 msgid "offset before start of pack index for %s (corrupt index?)"

3562 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

3563

3345 -#: sha1_file.c:2641

3564 +#: sha1_file.c:2725

3565 #, c-format

3566 msgid "offset beyond end of pack index for %s (truncated index?)"

3567 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

3568

3350 -#: sha1_name.c:407

3569 +#: sha1_name.c:409

3570 #, c-format

3571 msgid "short SHA1 %s is ambiguous"

3572 msgstr "短 SHA1 %s 存在歧义"

3573

3355 -#: sha1_name.c:418

3574 +#: sha1_name.c:420

3575 msgid "The candidates are:"

3576 msgstr "候选者有："

3577

3359 -#: sha1_name.c:578

3578 +#: sha1_name.c:580

3579 msgid ""

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

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

@@ -3377,61 +3596,71 @@ msgstr ""

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

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

3598

3380 -#: submodule.c:65 submodule.c:99

3599 +#: submodule.c:67 submodule.c:101

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

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

3602

3384 -#: submodule.c:69 submodule.c:103

3603 +#: submodule.c:71 submodule.c:105

3604 #, c-format

3605 msgid "Could not find section in .gitmodules where path=%s"

3606 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

3607

3389 -#: submodule.c:77

3608 +#: submodule.c:79

3609 #, c-format

3610 msgid "Could not update .gitmodules entry %s"

3611 msgstr "不能更新 .gitmodules 条目 %s"

3612

3394 -#: submodule.c:110

3613 +#: submodule.c:112

3614 #, c-format

3615 msgid "Could not remove .gitmodules entry for %s"

3616 msgstr "无法移除 %s 的 .gitmodules 条目"

3617

3399 -#: submodule.c:121

3618 +#: submodule.c:123

3619 msgid "staging updated .gitmodules failed"

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

3621

3403 -#: submodule.c:159

3622 +#: submodule.c:161

3623 msgid "negative values not allowed for submodule.fetchJobs"

3624 msgstr "submodule.fetchJobs 不允许为负值"

3625

3407 -#: submodule.c:1184

3626 +#: submodule.c:1194

3627 #, c-format

3409 -msgid "could not start 'git status in submodule '%s'"

3410 -msgstr "无法在子模组 '%s' 中启动 git status"

3628 +msgid "'%s' not recognized as a git repository"

3629 +msgstr "'%s' 没有识别为一个 git 仓库"

3630

3412 -#: submodule.c:1197

3631 +#: submodule.c:1332

3632 #, c-format

3414 -msgid "could not run 'git status in submodule '%s'"

3415 -msgstr "无法在子模组 '%s' 中执行 git status"

3633 +msgid "could not start 'git status' in submodule '%s'"

3634 +msgstr "无法在子模组 '%s' 中启动 'git status'"

3635

3417 -#: submodule.c:1398

3636 +#: submodule.c:1345

3637 +#, c-format

3638 +msgid "could not run 'git status' in submodule '%s'"

3639 +msgstr "无法在子模组 '%s' 中执行 'git status'"

3640 +

3641 +#: submodule.c:1421

3642 +#, c-format

3643 +msgid "submodule '%s' has dirty index"

3644 +msgstr "子模组 '%s' 中有脏索引"

3645 +

3646 +#: submodule.c:1679

3647 #, c-format

3648 msgid ""

3649 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

3650 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"

3651

3423 -#: submodule.c:1410 submodule.c:1471

3652 +#: submodule.c:1691 submodule.c:1747

3653 #, c-format

3654 msgid "could not lookup name for submodule '%s'"

3655 msgstr "不能查询子模组 '%s' 的名称"

3656

3428 -#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640

3429 -#: builtin/submodule--helper.c:650

3657 +#: submodule.c:1695 builtin/submodule--helper.c:678

3658 +#: builtin/submodule--helper.c:688

3659 #, c-format

3660 msgid "could not create directory '%s'"

3661 msgstr "不能创建目录 '%s'"

3662

3434 -#: submodule.c:1420

3663 +#: submodule.c:1698

3664 #, c-format

3665 msgid ""

3666 "Migrating git directory of '%s%s' from\n"

@@ -3442,12 +3671,25 @@ msgstr ""

3671 "'%s' 迁移至\n"

3672 "'%s'\n"

3673

3445 -#: submodule.c:1512

3674 +#: submodule.c:1782

3675 #, c-format

3676 msgid "could not recurse into submodule '%s'"

3677 msgstr "无法递归进子模组路径 '%s'"

3678

3450 -#: submodule-config.c:360

3679 +#: submodule.c:1826

3680 +msgid "could not start ls-files in .."

3681 +msgstr "无法在 .. 中启动 ls-files"

3682 +

3683 +#: submodule.c:1846

3684 +msgid "BUG: returned path string doesn't match cwd?"

3685 +msgstr "BUG：返回的路径和当前路径不匹配？"

3686 +

3687 +#: submodule.c:1865

3688 +#, c-format

3689 +msgid "ls-tree returned unexpected return code %d"

3690 +msgstr "ls-tree 返回未知返回值 %d"

3691 +

3692 +#: submodule-config.c:380

3693 #, c-format

3694 msgid "invalid value for %s"

3695 msgstr "%s 的值无效"

@@ -3485,7 +3727,7 @@ msgstr "不能自标准输入读取"

3727 #: trailer.c:949 builtin/am.c:44

3728 #, c-format

3729 msgid "could not stat %s"

3488 -msgstr "不能获取 %s 的文件状态"

3730 +msgstr "不能获取 %s 的状态"

3731

3732 #: trailer.c:951

3733 #, c-format

@@ -3516,14 +3758,14 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

3758 msgid "transport: invalid depth option '%s'"

3759 msgstr "传输：无效的深度选项 '%s'"

3760

3519 -#: transport.c:885

3761 +#: transport.c:889

3762 #, c-format

3763 msgid ""

3764 "The following submodule paths contain changes that can\n"

3765 "not be found on any remote:\n"

3766 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

3767

3526 -#: transport.c:889

3768 +#: transport.c:893

3769 #, c-format

3770 msgid ""

3771 "\n"

@@ -3550,11 +3792,11 @@ msgstr ""

3792 "以推送至远程。\n"

3793 "\n"

3794

3553 -#: transport.c:897

3795 +#: transport.c:901

3796 msgid "Aborting."

3797 msgstr "正在终止。"

3798

3557 -#: transport-helper.c:1082

3799 +#: transport-helper.c:1080

3800 #, c-format

3801 msgid "Could not read ref %s"

3802 msgstr "不能读取引用 %s"

@@ -3575,7 +3817,7 @@ msgstr "树对象条目中空的文件名"

3817 msgid "too-short tree file"

3818 msgstr "太短的树文件"

3819

3578 -#: unpack-trees.c:99

3820 +#: unpack-trees.c:104

3821 #, c-format

3822 msgid ""

3823 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3584,7 +3826,7 @@ msgstr ""

3826 "您对下列文件的本地修改将被检出操作覆盖：\n"

3827 "%%s请在切换分支前提交您的修改或者保存进度。"

3828

3587 -#: unpack-trees.c:101

3829 +#: unpack-trees.c:106

3830 #, c-format

3831 msgid ""

3832 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3593,7 +3835,7 @@ msgstr ""

3835 "您对下列文件的本地修改将被检出操作覆盖：\n"

3836 "%%s"

3837

3596 -#: unpack-trees.c:104

3838 +#: unpack-trees.c:109

3839 #, c-format

3840 msgid ""

3841 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3602,7 +3844,7 @@ msgstr ""

3844 "您对下列文件的本地修改将被合并操作覆盖：\n"

3845 "%%s请在合并前提交您的修改或者保存进度。"

3846

3605 -#: unpack-trees.c:106

3847 +#: unpack-trees.c:111

3848 #, c-format

3849 msgid ""

3850 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3611,7 +3853,7 @@ msgstr ""

3853 "您对下列文件的本地修改将被合并操作覆盖：\n"

3854 "%%s"

3855

3614 -#: unpack-trees.c:109

3856 +#: unpack-trees.c:114

3857 #, c-format

3858 msgid ""

3859 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3620,7 +3862,7 @@ msgstr ""

3862 "您对下列文件的本地修改将被 %s 覆盖：\n"

3863 "%%s请在 %s 之前提交您的修改或者保存进度。"

3864

3623 -#: unpack-trees.c:111

3865 +#: unpack-trees.c:116

3866 #, c-format

3867 msgid ""

3868 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3629,7 +3871,7 @@ msgstr ""

3871 "您对下列文件的本地修改将被 %s 覆盖：\n"

3872 "%%s"

3873

3632 -#: unpack-trees.c:116

3874 +#: unpack-trees.c:121

3875 #, c-format

3876 msgid ""

3877 "Updating the following directories would lose untracked files in them:\n"

@@ -3638,7 +3880,7 @@ msgstr ""

3880 "更新如下目录将会丢失其中未跟踪的文件：\n"

3881 "%s"

3882

3641 -#: unpack-trees.c:120

3883 +#: unpack-trees.c:125

3884 #, c-format

3885 msgid ""

3886 "The following untracked working tree files would be removed by checkout:\n"

@@ -3647,7 +3889,7 @@ msgstr ""

3889 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

3890 "%%s请在切换分支之前移动或删除。"

3891

3650 -#: unpack-trees.c:122

3892 +#: unpack-trees.c:127

3893 #, c-format

3894 msgid ""

3895 "The following untracked working tree files would be removed by checkout:\n"

@@ -3656,7 +3898,7 @@ msgstr ""

3898 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

3899 "%%s"

3900

3659 -#: unpack-trees.c:125

3901 +#: unpack-trees.c:130

3902 #, c-format

3903 msgid ""

3904 "The following untracked working tree files would be removed by merge:\n"

@@ -3665,7 +3907,7 @@ msgstr ""

3907 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

3908 "%%s请在合并前移动或删除。"

3909

3668 -#: unpack-trees.c:127

3910 +#: unpack-trees.c:132

3911 #, c-format

3912 msgid ""

3913 "The following untracked working tree files would be removed by merge:\n"

@@ -3674,7 +3916,7 @@ msgstr ""

3916 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

3917 "%%s"

3918

3677 -#: unpack-trees.c:130

3919 +#: unpack-trees.c:135

3920 #, c-format

3921 msgid ""

3922 "The following untracked working tree files would be removed by %s:\n"

@@ -3683,7 +3925,7 @@ msgstr ""

3925 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

3926 "%%s请在 %s 前移动或删除。"

3927

3686 -#: unpack-trees.c:132

3928 +#: unpack-trees.c:137

3929 #, c-format

3930 msgid ""

3931 "The following untracked working tree files would be removed by %s:\n"

@@ -3692,7 +3934,7 @@ msgstr ""

3934 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

3935 "%%s"

3936

3695 -#: unpack-trees.c:137

3937 +#: unpack-trees.c:142

3938 #, c-format

3939 msgid ""

3940 "The following untracked working tree files would be overwritten by "

@@ -3702,7 +3944,7 @@ msgstr ""

3944 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

3945 "%%s请在切换分支前移动或删除。"

3946

3705 -#: unpack-trees.c:139

3947 +#: unpack-trees.c:144

3948 #, c-format

3949 msgid ""

3950 "The following untracked working tree files would be overwritten by "

@@ -3712,7 +3954,7 @@ msgstr ""

3954 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

3955 "%%s"

3956

3715 -#: unpack-trees.c:142

3957 +#: unpack-trees.c:147

3958 #, c-format

3959 msgid ""

3960 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3721,7 +3963,7 @@ msgstr ""

3963 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

3964 "%%s请在合并前移动或删除。"

3965

3724 -#: unpack-trees.c:144

3966 +#: unpack-trees.c:149

3967 #, c-format

3968 msgid ""

3969 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3730,7 +3972,7 @@ msgstr ""

3972 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

3973 "%%s"

3974

3733 -#: unpack-trees.c:147

3975 +#: unpack-trees.c:152

3976 #, c-format

3977 msgid ""

3978 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3739,7 +3981,7 @@ msgstr ""

3981 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

3982 "%%s请在 %s 前移动或删除。"

3983

3742 -#: unpack-trees.c:149

3984 +#: unpack-trees.c:154

3985 #, c-format

3986 msgid ""

3987 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3748,12 +3990,12 @@ msgstr ""

3990 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

3991 "%%s"

3992

3751 -#: unpack-trees.c:156

3993 +#: unpack-trees.c:161

3994 #, c-format

3995 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3996 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

3997

3756 -#: unpack-trees.c:159

3998 +#: unpack-trees.c:164

3999 #, c-format

4000 msgid ""

4001 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

@@ -3762,7 +4004,7 @@ msgstr ""

4004 "无法更新稀疏检出：如下条目不是最新：\n"

4005 "%s"

4006

3765 -#: unpack-trees.c:161

4007 +#: unpack-trees.c:166

4008 #, c-format

4009 msgid ""

4010 "The following working tree files would be overwritten by sparse checkout "

@@ -3772,7 +4014,7 @@ msgstr ""

4014 "工作区中下列文件将被稀疏检出更新所覆盖：\n"

4015 "%s"

4016

3775 -#: unpack-trees.c:163

4017 +#: unpack-trees.c:168

4018 #, c-format

4019 msgid ""

4020 "The following working tree files would be removed by sparse checkout "

@@ -3782,45 +4024,59 @@ msgstr ""

4024 "工作区中下列文件将被稀疏检出更新所删除：\n"

4025 "%s"

4026

3785 -#: unpack-trees.c:240

4027 +#: unpack-trees.c:170

4028 +#, c-format

4029 +msgid ""

4030 +"Cannot update submodule:\n"

4031 +"%s"

4032 +msgstr ""

4033 +"无法更新子模组：\n"

4034 +"%s"

4035 +

4036 +#: unpack-trees.c:247

4037 #, c-format

4038 msgid "Aborting\n"

4039 msgstr "终止中\n"

4040

3790 -#: unpack-trees.c:270

4041 +#: unpack-trees.c:272

4042 +#, c-format

4043 +msgid "submodule update strategy not supported for submodule '%s'"

4044 +msgstr "子模组 %s 不支持子模组更新策略"

4045 +

4046 +#: unpack-trees.c:340

4047 msgid "Checking out files"

4048 msgstr "正在检出文件"

4049

3794 -#: urlmatch.c:120

4050 +#: urlmatch.c:163

4051 msgid "invalid URL scheme name or missing '://' suffix"

4052 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"

4053

3798 -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

4054 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405

4055 #, c-format

4056 msgid "invalid %XX escape sequence"

4057 msgstr "无效的 %XX 转义序列"

4058

3803 -#: urlmatch.c:172

4059 +#: urlmatch.c:215

4060 msgid "missing host and scheme is not 'file:'"

4061 msgstr "缺失主机名且 URL 方案不是 'file:'"

4062

3807 -#: urlmatch.c:189

4063 +#: urlmatch.c:232

4064 msgid "a 'file:' URL may not have a port number"

4065 msgstr "一个 'file:' URL 不应该包含端口号"

4066

3811 -#: urlmatch.c:199

4067 +#: urlmatch.c:247

4068 msgid "invalid characters in host name"

4069 msgstr "主机名中包含无效的字符"

4070

3815 -#: urlmatch.c:244 urlmatch.c:255

4071 +#: urlmatch.c:292 urlmatch.c:303

4072 msgid "invalid port number"

4073 msgstr "无效的端口号"

4074

3819 -#: urlmatch.c:322

4075 +#: urlmatch.c:371

4076 msgid "invalid '..' path segment"

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

4078

3823 -#: worktree.c:282

4079 +#: worktree.c:285

4080 #, c-format

4081 msgid "failed to read '%s'"

4082 msgstr "无法读取 '%s'"

@@ -3836,27 +4092,27 @@ msgid "could not open '%s' for writing"

4092 msgstr "无法打开 '%s' 进行写入"

4093

4094 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

3839 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

4095 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015

4096 #: builtin/pull.c:341

4097 #, c-format

4098 msgid "could not open '%s' for reading"

4099 msgstr "无法打开 '%s' 进行读取"

4100

3845 -#: wrapper.c:605 wrapper.c:626

4101 +#: wrapper.c:581 wrapper.c:602

4102 #, c-format

4103 msgid "unable to access '%s'"

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

4105

3850 -#: wrapper.c:634

4106 +#: wrapper.c:610

4107 msgid "unable to get current working directory"

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

4109

3854 -#: wrapper.c:658

4110 +#: wrapper.c:634

4111 #, c-format

4112 msgid "could not write to %s"

4113 msgstr "不能写入 %s"

4114

3859 -#: wrapper.c:660

4115 +#: wrapper.c:636

4116 #, c-format

4117 msgid "could not close %s"

4118 msgstr "不能关闭 %s"

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

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

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

4149

3894 -#: wt-status.c:199 wt-status.c:945

4150 +#: wt-status.c:199 wt-status.c:958

4151 msgid "Changes to be committed:"

4152 msgstr "要提交的变更："

4153

3898 -#: wt-status.c:217 wt-status.c:954

4154 +#: wt-status.c:217 wt-status.c:967

4155 msgid "Changes not staged for commit:"

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

4157

@@ -4001,15 +4257,15 @@ msgstr "修改的内容, "

4257 msgid "untracked content, "

4258 msgstr "未跟踪的内容, "

4259

4004 -#: wt-status.c:818

4260 +#: wt-status.c:831

4261 msgid "Submodules changed but not updated:"

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

4263

4008 -#: wt-status.c:820

4264 +#: wt-status.c:833

4265 msgid "Submodule changes to be committed:"

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

4267

4012 -#: wt-status.c:901

4268 +#: wt-status.c:914

4269 msgid ""

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

4271 "Everything below will be removed."

@@ -4017,77 +4273,77 @@ msgstr ""

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

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

4275

4020 -#: wt-status.c:1013

4276 +#: wt-status.c:1026

4277 msgid "You have unmerged paths."

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

4279

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

4025 -#: wt-status.c:1016

4281 +#: wt-status.c:1029

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

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

4284

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

4030 -#: wt-status.c:1018

4286 +#: wt-status.c:1031

4287 msgid " (use \"git merge --abort\" to abort the merge)"

4288 msgstr " （使用 \"git merge --abort\" 终止合并）"

4289

4034 -#: wt-status.c:1023

4290 +#: wt-status.c:1036

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

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

4293

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

4039 -#: wt-status.c:1026

4295 +#: wt-status.c:1039

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

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

4298

4043 -#: wt-status.c:1036

4299 +#: wt-status.c:1049

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

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

4302

4047 -#: wt-status.c:1039

4303 +#: wt-status.c:1052

4304 msgid "The current patch is empty."

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

4306

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

4052 -#: wt-status.c:1043

4308 +#: wt-status.c:1056

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

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

4311

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

4057 -#: wt-status.c:1045

4313 +#: wt-status.c:1058

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

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

4316

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

4062 -#: wt-status.c:1047

4318 +#: wt-status.c:1060

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

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

4321

4066 -#: wt-status.c:1176

4322 +#: wt-status.c:1189

4323 msgid "git-rebase-todo is missing."

4324 msgstr "git-rebase-todo 丢失。"

4325

4070 -#: wt-status.c:1178

4326 +#: wt-status.c:1191

4327 msgid "No commands done."

4328 msgstr "没有命令被执行。"

4329

4074 -#: wt-status.c:1181

4330 +#: wt-status.c:1194

4331 #, c-format

4332 msgid "Last command done (%d command done):"

4333 msgid_plural "Last commands done (%d commands done):"

4334 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："

4335 msgstr[1] "最后的命令已完成（%d 条命令被执行）："

4336

4081 -#: wt-status.c:1192

4337 +#: wt-status.c:1205

4338 #, c-format

4339 msgid " (see more in file %s)"

4340 msgstr " （更多参见文件 %s）"

4341

4086 -#: wt-status.c:1197

4342 +#: wt-status.c:1210

4343 msgid "No commands remaining."

4344 msgstr "未剩下任何命令。"

4345

4090 -#: wt-status.c:1200

4346 +#: wt-status.c:1213

4347 #, c-format

4348 msgid "Next command to do (%d remaining command):"

4349 msgid_plural "Next commands to do (%d remaining commands):"

@@ -4095,165 +4351,165 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："

4351 msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："

4352

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

4098 -#: wt-status.c:1208

4354 +#: wt-status.c:1221

4355 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4356 msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"

4357

4102 -#: wt-status.c:1221

4358 +#: wt-status.c:1234

4359 #, c-format

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

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

4362

4107 -#: wt-status.c:1226

4363 +#: wt-status.c:1239

4364 msgid "You are currently rebasing."

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

4366

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

4112 -#: wt-status.c:1240

4368 +#: wt-status.c:1253

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

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

4371

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

4117 -#: wt-status.c:1242

4373 +#: wt-status.c:1255

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

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

4376

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

4122 -#: wt-status.c:1244

4378 +#: wt-status.c:1257

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

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

4381

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

4127 -#: wt-status.c:1250

4383 +#: wt-status.c:1263

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

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

4386

4131 -#: wt-status.c:1254

4387 +#: wt-status.c:1267

4388 #, c-format

4389 msgid ""

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

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

4392

4137 -#: wt-status.c:1259

4393 +#: wt-status.c:1272

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

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

4396

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

4142 -#: wt-status.c:1262

4398 +#: wt-status.c:1275

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

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

4401

4146 -#: wt-status.c:1266

4402 +#: wt-status.c:1279

4403 #, c-format

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

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

4406

4151 -#: wt-status.c:1271

4407 +#: wt-status.c:1284

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

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

4410

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

4156 -#: wt-status.c:1274

4412 +#: wt-status.c:1287

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

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

4415

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

4161 -#: wt-status.c:1276

4417 +#: wt-status.c:1289

4418 msgid ""

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

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

4421

4166 -#: wt-status.c:1286

4422 +#: wt-status.c:1299

4423 #, c-format

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

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

4426

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

4172 -#: wt-status.c:1291

4428 +#: wt-status.c:1304

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

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

4431

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

4177 -#: wt-status.c:1294

4433 +#: wt-status.c:1307

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

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

4436

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

4182 -#: wt-status.c:1296

4438 +#: wt-status.c:1309

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

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

4441

4186 -#: wt-status.c:1305

4442 +#: wt-status.c:1318

4443 #, c-format

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

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

4446

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

4192 -#: wt-status.c:1310

4448 +#: wt-status.c:1323

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

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

4451

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

4197 -#: wt-status.c:1313

4453 +#: wt-status.c:1326

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

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

4456

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

4202 -#: wt-status.c:1315

4458 +#: wt-status.c:1328

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

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

4461

4206 -#: wt-status.c:1326

4462 +#: wt-status.c:1339

4463 #, c-format

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

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

4466

4211 -#: wt-status.c:1330

4467 +#: wt-status.c:1343

4468 msgid "You are currently bisecting."

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

4470

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

4216 -#: wt-status.c:1333

4472 +#: wt-status.c:1346

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

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

4475

4220 -#: wt-status.c:1530

4476 +#: wt-status.c:1543

4477 msgid "On branch "

4478 msgstr "位于分支 "

4479

4224 -#: wt-status.c:1536

4480 +#: wt-status.c:1549

4481 msgid "interactive rebase in progress; onto "

4482 msgstr "交互式变基操作正在进行中；至 "

4483

4228 -#: wt-status.c:1538

4484 +#: wt-status.c:1551

4485 msgid "rebase in progress; onto "

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

4487

4232 -#: wt-status.c:1543

4488 +#: wt-status.c:1556

4489 msgid "HEAD detached at "

4490 msgstr "头指针分离于 "

4491

4236 -#: wt-status.c:1545

4492 +#: wt-status.c:1558

4493 msgid "HEAD detached from "

4494 msgstr "头指针分离自 "

4495

4240 -#: wt-status.c:1548

4496 +#: wt-status.c:1561

4497 msgid "Not currently on any branch."

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

4499

4244 -#: wt-status.c:1566

4500 +#: wt-status.c:1579

4501 msgid "Initial commit"

4502 msgstr "初始提交"

4503

4248 -#: wt-status.c:1580

4504 +#: wt-status.c:1593

4505 msgid "Untracked files"

4506 msgstr "未跟踪的文件"

4507

4252 -#: wt-status.c:1582

4508 +#: wt-status.c:1595

4509 msgid "Ignored files"

4510 msgstr "忽略的文件"

4511

4256 -#: wt-status.c:1586

4512 +#: wt-status.c:1599

4513 #, c-format

4514 msgid ""

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

@@ -4263,103 +4519,99 @@ msgstr ""

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

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

4521

4266 -#: wt-status.c:1592

4522 +#: wt-status.c:1605

4523 #, c-format

4524 msgid "Untracked files not listed%s"

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

4526

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

4272 -#: wt-status.c:1594

4528 +#: wt-status.c:1607

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

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

4531

4276 -#: wt-status.c:1600

4532 +#: wt-status.c:1613

4533 msgid "No changes"

4534 msgstr "没有修改"

4535

4280 -#: wt-status.c:1605

4536 +#: wt-status.c:1618

4537 #, c-format

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

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

4540

4285 -#: wt-status.c:1608

4541 +#: wt-status.c:1621

4542 #, c-format

4543 msgid "no changes added to commit\n"

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

4545

4290 -#: wt-status.c:1611

4546 +#: wt-status.c:1624

4547 #, c-format

4548 msgid ""

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

4550 "track)\n"

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

4552

4297 -#: wt-status.c:1614

4553 +#: wt-status.c:1627

4554 #, c-format

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

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

4557

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

4303 -#: wt-status.c:1617

4559 +#: wt-status.c:1630

4560 #, c-format

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

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

4563

4308 -#: wt-status.c:1620 wt-status.c:1625

4564 +#: wt-status.c:1633 wt-status.c:1638

4565 #, c-format

4566 msgid "nothing to commit\n"

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

4568

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

4314 -#: wt-status.c:1623

4570 +#: wt-status.c:1636

4571 #, c-format

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

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

4574

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

4320 -#: wt-status.c:1627

4576 +#: wt-status.c:1640

4577 #, c-format

4578 msgid "nothing to commit, working tree clean\n"

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

4580

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

4326 -#: wt-status.c:1734

4582 +#: wt-status.c:1749

4583 msgid "Initial commit on "

4584 msgstr "初始提交于 "

4585

4330 -#: wt-status.c:1738

4586 +#: wt-status.c:1753

4587 msgid "HEAD (no branch)"

4588 msgstr "HEAD（非分支）"

4589

4334 -#: wt-status.c:1767

4335 -msgid "gone"

4336 -msgstr "丢失"

4337 -

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

4339 -#: wt-status.c:1769 wt-status.c:1777

4591 +#: wt-status.c:1782 wt-status.c:1790

4592 msgid "behind "

4593 msgstr "落后 "

4594

4343 -#: wt-status.c:1772 wt-status.c:1775

4595 +#: wt-status.c:1785 wt-status.c:1788

4596 msgid "ahead "

4597 msgstr "领先 "

4598

4599 #. TRANSLATORS: the action is e.g. "pull with rebase"

4348 -#: wt-status.c:2277

4600 +#: wt-status.c:2280

4601 #, c-format

4602 msgid "cannot %s: You have unstaged changes."

4603 msgstr "不能%s：您有未暂存的变更。"

4604

4353 -#: wt-status.c:2283

4605 +#: wt-status.c:2286

4606 msgid "additionally, your index contains uncommitted changes."

4607 msgstr "另外，您的索引中包含未提交的变更。"

4608

4357 -#: wt-status.c:2285

4609 +#: wt-status.c:2288

4610 #, c-format

4611 msgid "cannot %s: Your index contains uncommitted changes."

4612 msgstr "不能%s：您的索引中包含未提交的变更。"

4613

4362 -#: compat/precompose_utf8.c:57 builtin/clone.c:414

4614 +#: compat/precompose_utf8.c:57 builtin/clone.c:432

4615 #, c-format

4616 msgid "failed to unlink '%s'"

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

@@ -4386,7 +4638,7 @@ msgstr "删除 '%s'\n"

4638 msgid "Unstaged changes after refreshing the index:"

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

4640

4389 -#: builtin/add.c:209 builtin/rev-parse.c:845

4641 +#: builtin/add.c:209 builtin/rev-parse.c:872

4642 msgid "Could not read the index"

4643 msgstr "不能读取索引"

4644

@@ -4421,9 +4673,9 @@ msgstr "不能应用 '%s'"

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

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

4675

4424 -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123

4676 +#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123

4677 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4426 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

4678 +#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163

4679 msgid "dry run"

4680 msgstr "演习"

4681

@@ -4431,7 +4683,7 @@ msgstr "演习"

4683 msgid "interactive picking"

4684 msgstr "交互式拣选"

4685

4434 -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

4686 +#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286

4687 msgid "select hunks interactively"

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

4689

@@ -4471,11 +4723,11 @@ msgstr "跳过因出错不能添加的文件"

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

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

4725

4474 -#: builtin/add.c:283 builtin/update-index.c:947

4726 +#: builtin/add.c:283 builtin/update-index.c:951

4727 msgid "(+/-)x"

4728 msgstr "(+/-)x"

4729

4478 -#: builtin/add.c:283 builtin/update-index.c:948

4730 +#: builtin/add.c:283 builtin/update-index.c:952

4731 msgid "override the executable bit of the listed files"

4732 msgstr "覆盖列表里文件的可执行位"

4733

@@ -4511,8 +4763,8 @@ msgstr "没有指定文件，也没有文件被添加。\n"

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

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

4765

4514 -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279

4515 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

4766 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298

4767 +#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350

4768 #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

4769 #: builtin/submodule--helper.c:244

4770 msgid "index file corrupt"

@@ -4564,9 +4816,9 @@ msgstr "无效的时区偏移值"

4816

4817 #: builtin/am.c:984

4818 msgid "Patch format detection failed."

4567 -msgstr "补丁格式检测失败。"

4819 +msgstr "补丁格式探测失败。"

4820

4569 -#: builtin/am.c:989 builtin/clone.c:379

4821 +#: builtin/am.c:989 builtin/clone.c:397

4822 #, c-format

4823 msgid "failed to create directory '%s'"

4824 msgstr "无法创建目录 '%s'"

@@ -4598,7 +4850,7 @@ msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"

4850 msgid "Patch is empty. Was it split wrong?"

4851 msgstr "补丁为空。是不是切分错误？"

4852

4601 -#: builtin/am.c:1390 builtin/log.c:1550

4853 +#: builtin/am.c:1390 builtin/log.c:1557

4854 #, c-format

4855 msgid "invalid ident line: %s"

4856 msgstr "包含无效的身份标识：%s"

@@ -4632,7 +4884,7 @@ msgstr "回落到基础版本上打补丁及进行三方合并..."

4884 msgid "Failed to merge in the changes."

4885 msgstr "无法合并变更。"

4886

4635 -#: builtin/am.c:1686 builtin/merge.c:632

4887 +#: builtin/am.c:1686 builtin/merge.c:631

4888 msgid "git write-tree failed to write a tree"

4889 msgstr "git write-tree 无法写入一树对象"

4890

@@ -4794,15 +5046,15 @@ msgid "pass it through git-apply"

5046 msgstr "传递给 git-apply"

5047

5048 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4797 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135

5049 +#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135

5050 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4799 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

5051 +#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398

5052 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

5053 msgid "n"

5054 msgstr "n"

5055

4804 -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

4805 -#: builtin/tag.c:387 builtin/verify-tag.c:38

5056 +#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37

5057 +#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38

5058 msgid "format"

5059 msgstr "格式"

5060

@@ -4838,8 +5090,8 @@ msgstr "将作者日期作为提交日期"

5090 msgid "use current timestamp for author date"

5091 msgstr "用当前时间作为作者日期"

5092

4841 -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233

4842 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

5093 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232

5094 +#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413

5095 msgid "key-id"

5096 msgstr "key-id"

5097

@@ -4940,111 +5192,111 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"

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

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

5194

4943 -#: builtin/blame.c:1786

5195 +#: builtin/blame.c:1777

5196 msgid "Blaming lines"

5197 msgstr "追踪代码行"

5198

4947 -#: builtin/blame.c:2582

5199 +#: builtin/blame.c:2573

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

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

5202

4951 -#: builtin/blame.c:2583

5203 +#: builtin/blame.c:2574

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

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

5206

4955 -#: builtin/blame.c:2584

5207 +#: builtin/blame.c:2575

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

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

5210

4959 -#: builtin/blame.c:2585

5211 +#: builtin/blame.c:2576

5212 msgid "Show work cost statistics"

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

5214

4963 -#: builtin/blame.c:2586

5215 +#: builtin/blame.c:2577

5216 msgid "Force progress reporting"

5217 msgstr "强制进度显示"

5218

4967 -#: builtin/blame.c:2587

5219 +#: builtin/blame.c:2578

5220 msgid "Show output score for blame entries"

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

5222

4971 -#: builtin/blame.c:2588

5223 +#: builtin/blame.c:2579

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

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

5226

4975 -#: builtin/blame.c:2589

5227 +#: builtin/blame.c:2580

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

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

5230

4979 -#: builtin/blame.c:2590

5231 +#: builtin/blame.c:2581

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

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

5234

4983 -#: builtin/blame.c:2591

5235 +#: builtin/blame.c:2582

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

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

5238

4987 -#: builtin/blame.c:2592

5239 +#: builtin/blame.c:2583

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

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

5242

4991 -#: builtin/blame.c:2593

5243 +#: builtin/blame.c:2584

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

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

5246

4995 -#: builtin/blame.c:2594

5247 +#: builtin/blame.c:2585

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

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

5250

4999 -#: builtin/blame.c:2595

5251 +#: builtin/blame.c:2586

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

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

5254

5003 -#: builtin/blame.c:2596

5255 +#: builtin/blame.c:2587

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

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

5258

5007 -#: builtin/blame.c:2597

5259 +#: builtin/blame.c:2588

5260 msgid "Ignore whitespace differences"

5261 msgstr "忽略空白差异"

5262

5011 -#: builtin/blame.c:2604

5263 +#: builtin/blame.c:2595

5264 msgid "Use an experimental heuristic to improve diffs"

5265 msgstr "使用一个试验性的启发式算法改进差异显示"

5266

5015 -#: builtin/blame.c:2606

5267 +#: builtin/blame.c:2597

5268 msgid "Spend extra cycles to find better match"

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

5270

5019 -#: builtin/blame.c:2607

5271 +#: builtin/blame.c:2598

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

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

5274

5023 -#: builtin/blame.c:2608

5275 +#: builtin/blame.c:2599

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

5277 msgstr "使用 <文件> 的内容作为最终的图片"

5278

5027 -#: builtin/blame.c:2609 builtin/blame.c:2610

5279 +#: builtin/blame.c:2600 builtin/blame.c:2601

5280 msgid "score"

5281 msgstr "得分"

5282

5031 -#: builtin/blame.c:2609

5283 +#: builtin/blame.c:2600

5284 msgid "Find line copies within and across files"

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

5286

5035 -#: builtin/blame.c:2610

5287 +#: builtin/blame.c:2601

5288 msgid "Find line movements within and across files"

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

5290

5039 -#: builtin/blame.c:2611

5291 +#: builtin/blame.c:2602

5292 msgid "n,m"

5293 msgstr "n,m"

5294

5043 -#: builtin/blame.c:2611

5295 +#: builtin/blame.c:2602

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

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

5298

5047 -#: builtin/blame.c:2658

5299 +#: builtin/blame.c:2649

5300 msgid "--progress can't be used with --incremental or porcelain formats"

5301 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"

5302

@@ -5054,38 +5306,38 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"

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

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

5308 #. fewer display columns.

5057 -#: builtin/blame.c:2706

5309 +#: builtin/blame.c:2697

5310 msgid "4 years, 11 months ago"

5311 msgstr "4 年 11 个月前"

5312

5061 -#: builtin/blame.c:2786

5313 +#: builtin/blame.c:2777

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

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

5316

5065 -#: builtin/blame.c:2806

5317 +#: builtin/blame.c:2797

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

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

5320

5069 -#: builtin/blame.c:2811

5321 +#: builtin/blame.c:2802

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

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

5324

5073 -#: builtin/blame.c:2838

5325 +#: builtin/blame.c:2829

5326 msgid ""

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

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

5329

5078 -#: builtin/blame.c:2849

5330 +#: builtin/blame.c:2840

5331 #, c-format

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

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

5334

5083 -#: builtin/blame.c:2860

5335 +#: builtin/blame.c:2851

5336 #, c-format

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

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

5339

5088 -#: builtin/blame.c:2879

5340 +#: builtin/blame.c:2870

5341 #, c-format

5342 msgid "file %s has only %lu line"

5343 msgid_plural "file %s has only %lu lines"

@@ -5112,8 +5364,12 @@ msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"

5364 msgid "git branch [<options>] [-r | -a] [--points-at]"

5365 msgstr "git branch [<选项>] [-r | -a] [--points-at]"

5366

5367 +#: builtin/branch.c:31

5368 +msgid "git branch [<options>] [-r | -a] [--format]"

5369 +msgstr "git branch [<选项>] [-r | -a] [--format]"

5370 +

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

5116 -#: builtin/branch.c:143

5372 +#: builtin/branch.c:144

5373 #, c-format

5374 msgid ""

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

@@ -5123,7 +5379,7 @@ msgstr ""

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

5380

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

5126 -#: builtin/branch.c:147

5382 +#: builtin/branch.c:148

5383 #, c-format

5384 msgid ""

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

@@ -5132,12 +5388,12 @@ msgstr ""

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

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

5390

5135 -#: builtin/branch.c:161

5391 +#: builtin/branch.c:162

5392 #, c-format

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

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

5395

5140 -#: builtin/branch.c:165

5396 +#: builtin/branch.c:166

5397 #, c-format

5398 msgid ""

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

@@ -5146,163 +5402,91 @@ msgstr ""

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

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

5404

5149 -#: builtin/branch.c:178

5405 +#: builtin/branch.c:179

5406 msgid "Update of config-file failed"

5407 msgstr "无法更新 config 文件"

5408

5153 -#: builtin/branch.c:206

5409 +#: builtin/branch.c:210

5410 msgid "cannot use -a with -d"

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

5412

5157 -#: builtin/branch.c:212

5413 +#: builtin/branch.c:216

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

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

5416

5161 -#: builtin/branch.c:226

5417 +#: builtin/branch.c:230

5418 #, c-format

5419 msgid "Cannot delete branch '%s' checked out at '%s'"

5420 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"

5421

5166 -#: builtin/branch.c:241

5422 +#: builtin/branch.c:245

5423 #, c-format

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

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

5426

5171 -#: builtin/branch.c:242

5427 +#: builtin/branch.c:246

5428 #, c-format

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

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

5431

5176 -#: builtin/branch.c:257

5432 +#: builtin/branch.c:261

5433 #, c-format

5434 msgid "Error deleting remote-tracking branch '%s'"

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

5436

5181 -#: builtin/branch.c:258

5437 +#: builtin/branch.c:262

5438 #, c-format

5439 msgid "Error deleting branch '%s'"

5440 msgstr "无法删除分支 '%s'"

5441

5186 -#: builtin/branch.c:265

5442 +#: builtin/branch.c:269

5443 #, c-format

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

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

5446

5191 -#: builtin/branch.c:266

5447 +#: builtin/branch.c:270

5448 #, c-format

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

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

5451

5196 -#: builtin/branch.c:312

5197 -#, c-format

5198 -msgid "[%s: gone]"

5199 -msgstr "[%s: 丢失]"

5200 -

5201 -#: builtin/branch.c:317

5202 -#, c-format

5203 -msgid "[%s]"

5204 -msgstr "[%s]"

5205 -

5206 -#: builtin/branch.c:322

5207 -#, c-format

5208 -msgid "[%s: behind %d]"

5209 -msgstr "[%s：落后 %d]"

5210 -

5211 -#: builtin/branch.c:324

5212 -#, c-format

5213 -msgid "[behind %d]"

5214 -msgstr "[落后 %d]"

5215 -

5216 -#: builtin/branch.c:328

5217 -#, c-format

5218 -msgid "[%s: ahead %d]"

5219 -msgstr "[%s：领先 %d]"

5220 -

5221 -#: builtin/branch.c:330

5222 -#, c-format

5223 -msgid "[ahead %d]"

5224 -msgstr "[领先 %d]"

5225 -

5226 -#: builtin/branch.c:333

5227 -#, c-format

5228 -msgid "[%s: ahead %d, behind %d]"

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

5230 -

5231 -#: builtin/branch.c:336

5232 -#, c-format

5233 -msgid "[ahead %d, behind %d]"

5234 -msgstr "[领先 %d，落后 %d]"

5235 -

5236 -#: builtin/branch.c:349

5237 -msgid " **** invalid ref ****"

5238 -msgstr " **** 无效引用 ****"

5239 -

5240 -#: builtin/branch.c:375

5241 -#, c-format

5242 -msgid "(no branch, rebasing %s)"

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

5244 -

5245 -#: builtin/branch.c:378

5246 -#, c-format

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

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

5249 -

5250 -#. TRANSLATORS: make sure this matches

5251 -#. "HEAD detached at " in wt-status.c

5252 -#: builtin/branch.c:384

5253 -#, c-format

5254 -msgid "(HEAD detached at %s)"

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

5256 -

5257 -#. TRANSLATORS: make sure this matches

5258 -#. "HEAD detached from " in wt-status.c

5259 -#: builtin/branch.c:389

5260 -#, c-format

5261 -msgid "(HEAD detached from %s)"

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

5263 -

5264 -#: builtin/branch.c:393

5265 -msgid "(no branch)"

5266 -msgstr "（非分支）"

5267 -

5268 -#: builtin/branch.c:535

5452 +#: builtin/branch.c:441

5453 #, c-format

5454 msgid "Branch %s is being rebased at %s"

5455 msgstr "分支 %s 正被变基到 %s"

5456

5273 -#: builtin/branch.c:539

5457 +#: builtin/branch.c:445

5458 #, c-format

5459 msgid "Branch %s is being bisected at %s"

5460 msgstr "分支 %s 正被二分查找于 %s"

5461

5278 -#: builtin/branch.c:554

5462 +#: builtin/branch.c:460

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

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

5465

5282 -#: builtin/branch.c:564

5466 +#: builtin/branch.c:470

5467 #, c-format

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

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

5470

5287 -#: builtin/branch.c:581

5471 +#: builtin/branch.c:487

5472 msgid "Branch rename failed"

5473 msgstr "分支重命名失败"

5474

5291 -#: builtin/branch.c:585

5475 +#: builtin/branch.c:490

5476 #, c-format

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

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

5479

5296 -#: builtin/branch.c:588

5480 +#: builtin/branch.c:493

5481 #, c-format

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

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

5484

5301 -#: builtin/branch.c:595

5485 +#: builtin/branch.c:502

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

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

5488

5305 -#: builtin/branch.c:611

5489 +#: builtin/branch.c:518

5490 #, c-format

5491 msgid ""

5492 "Please edit the description for the branch\n"

@@ -5313,204 +5497,213 @@ msgstr ""

5497 " %s\n"

5498 "以 '%c' 开头的行将被过滤。\n"

5499

5316 -#: builtin/branch.c:643

5500 +#: builtin/branch.c:551

5501 msgid "Generic options"

5502 msgstr "通用选项"

5503

5320 -#: builtin/branch.c:645

5504 +#: builtin/branch.c:553

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

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

5507

5324 -#: builtin/branch.c:646

5508 +#: builtin/branch.c:554

5509 msgid "suppress informational messages"

5510 msgstr "不显示信息"

5511

5328 -#: builtin/branch.c:647

5512 +#: builtin/branch.c:555

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

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

5515

5332 -#: builtin/branch.c:649

5516 +#: builtin/branch.c:557

5517 msgid "change upstream info"

5518 msgstr "改变上游信息"

5519

5336 -#: builtin/branch.c:651

5520 +#: builtin/branch.c:559

5521 msgid "upstream"

5522 msgstr "上游"

5523

5340 -#: builtin/branch.c:651

5524 +#: builtin/branch.c:559

5525 msgid "change the upstream info"

5526 msgstr "改变上游信息"

5527

5344 -#: builtin/branch.c:652

5528 +#: builtin/branch.c:560

5529 msgid "Unset the upstream info"

5530 msgstr "取消上游信息的设置"

5531

5348 -#: builtin/branch.c:653

5532 +#: builtin/branch.c:561

5533 msgid "use colored output"

5534 msgstr "使用彩色输出"

5535

5352 -#: builtin/branch.c:654

5536 +#: builtin/branch.c:562

5537 msgid "act on remote-tracking branches"

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

5539

5356 -#: builtin/branch.c:656 builtin/branch.c:657

5540 +#: builtin/branch.c:564 builtin/branch.c:566

5541 msgid "print only branches that contain the commit"

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

5543

5360 -#: builtin/branch.c:660

5544 +#: builtin/branch.c:565 builtin/branch.c:567

5545 +msgid "print only branches that don't contain the commit"

5546 +msgstr "只打印不包含该提交的分支"

5547 +

5548 +#: builtin/branch.c:570

5549 msgid "Specific git-branch actions:"

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

5551

5364 -#: builtin/branch.c:661

5552 +#: builtin/branch.c:571

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

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

5555

5368 -#: builtin/branch.c:663

5556 +#: builtin/branch.c:573

5557 msgid "delete fully merged branch"

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

5559

5372 -#: builtin/branch.c:664

5560 +#: builtin/branch.c:574

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

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

5563

5376 -#: builtin/branch.c:665

5564 +#: builtin/branch.c:575

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

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

5567

5380 -#: builtin/branch.c:666

5568 +#: builtin/branch.c:576

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

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

5571

5384 -#: builtin/branch.c:667

5572 +#: builtin/branch.c:577

5573 msgid "list branch names"

5574 msgstr "列出分支名"

5575

5388 -#: builtin/branch.c:668

5576 +#: builtin/branch.c:578

5577 msgid "create the branch's reflog"

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

5579

5392 -#: builtin/branch.c:670

5580 +#: builtin/branch.c:580

5581 msgid "edit the description for the branch"

5582 msgstr "标记分支的描述"

5583

5396 -#: builtin/branch.c:671

5584 +#: builtin/branch.c:581

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

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

5587

5400 -#: builtin/branch.c:672

5588 +#: builtin/branch.c:582

5589 msgid "print only branches that are merged"

5590 msgstr "只打印已经合并的分支"

5591

5404 -#: builtin/branch.c:673

5592 +#: builtin/branch.c:583

5593 msgid "print only branches that are not merged"

5594 msgstr "只打印尚未合并的分支"

5595

5408 -#: builtin/branch.c:674

5596 +#: builtin/branch.c:584

5597 msgid "list branches in columns"

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

5599

5412 -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

5600 +#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426

5601 msgid "key"

5602 msgstr "key"

5603

5416 -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

5604 +#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427

5605 msgid "field name to sort on"

5606 msgstr "排序的字段名"

5607

5420 -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

5608 +#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404

5609 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

5422 -#: builtin/tag.c:384

5610 +#: builtin/tag.c:429

5611 msgid "object"

5612 msgstr "对象"

5613

5426 -#: builtin/branch.c:679

5614 +#: builtin/branch.c:589

5615 msgid "print only branches of the object"

5616 msgstr "只打印指向该对象的分支"

5617

5430 -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388

5618 +#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434

5619 msgid "sorting and filtering are case insensitive"

5620 msgstr "排序和过滤属于大小写不敏感"

5621

5434 -#: builtin/branch.c:698

5622 +#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433

5623 +#: builtin/verify-tag.c:38

5624 +msgid "format to use for the output"

5625 +msgstr "输出格式"

5626 +

5627 +#: builtin/branch.c:611

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

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

5630

5438 -#: builtin/branch.c:702 builtin/clone.c:706

5631 +#: builtin/branch.c:615 builtin/clone.c:724

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

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

5634

5442 -#: builtin/branch.c:724

5635 +#: builtin/branch.c:638

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

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

5638

5446 -#: builtin/branch.c:735 builtin/branch.c:787

5639 +#: builtin/branch.c:649 builtin/branch.c:701

5640 msgid "branch name required"

5641 msgstr "必须提供分支名"

5642

5450 -#: builtin/branch.c:763

5643 +#: builtin/branch.c:677

5644 msgid "Cannot give description to detached HEAD"

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

5646

5454 -#: builtin/branch.c:768

5647 +#: builtin/branch.c:682

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

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

5650

5458 -#: builtin/branch.c:775

5651 +#: builtin/branch.c:689

5652 #, c-format

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

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

5655

5463 -#: builtin/branch.c:778

5656 +#: builtin/branch.c:692

5657 #, c-format

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

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

5660

5468 -#: builtin/branch.c:793

5661 +#: builtin/branch.c:707

5662 msgid "too many branches for a rename operation"

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

5664

5472 -#: builtin/branch.c:798

5665 +#: builtin/branch.c:712

5666 msgid "too many branches to set new upstream"

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

5668

5476 -#: builtin/branch.c:802

5669 +#: builtin/branch.c:716

5670 #, c-format

5671 msgid ""

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

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

5674

5482 -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

5675 +#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762

5676 #, c-format

5677 msgid "no such branch '%s'"

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

5679

5487 -#: builtin/branch.c:809

5680 +#: builtin/branch.c:723

5681 #, c-format

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

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

5684

5492 -#: builtin/branch.c:821

5685 +#: builtin/branch.c:735

5686 msgid "too many branches to unset upstream"

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

5688

5496 -#: builtin/branch.c:825

5689 +#: builtin/branch.c:739

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

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

5692

5500 -#: builtin/branch.c:831

5693 +#: builtin/branch.c:745

5694 #, c-format

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

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

5697

5505 -#: builtin/branch.c:845

5698 +#: builtin/branch.c:759

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

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

5701

5509 -#: builtin/branch.c:851

5702 +#: builtin/branch.c:765

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

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

5705

5513 -#: builtin/branch.c:854

5706 +#: builtin/branch.c:768

5707 #, c-format

5708 msgid ""

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

@@ -5518,7 +5711,7 @@ msgid ""

5711 msgstr ""

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

5713

5521 -#: builtin/branch.c:871

5714 +#: builtin/branch.c:785

5715 #, c-format

5716 msgid ""

5717 "\n"

@@ -5529,16 +5722,16 @@ msgstr ""

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

5723 "\n"

5724

5532 -#: builtin/bundle.c:51

5725 +#: builtin/bundle.c:45

5726 #, c-format

5727 msgid "%s is okay\n"

5728 msgstr "%s 可以\n"

5729

5537 -#: builtin/bundle.c:64

5730 +#: builtin/bundle.c:58

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

5732 msgstr "需要一个仓库来创建包。"

5733

5541 -#: builtin/bundle.c:68

5734 +#: builtin/bundle.c:62

5735 msgid "Need a repository to unbundle."

5736 msgstr "需要一个仓库来解包。"

5737

@@ -5586,7 +5779,7 @@ msgstr "对于数据对象，对其内容做文本转换"

5779 msgid "for blob objects, run filters on object's content"

5780 msgstr "对于数据对象，对其内容做过滤"

5781

5589 -#: builtin/cat-file.c:561 git-submodule.sh:929

5782 +#: builtin/cat-file.c:561 git-submodule.sh:943

5783 msgid "blob"

5784 msgstr "数据对象"

5785

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

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

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

5837

5645 -#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

5838 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352

5839 msgid "suppress progress reporting"

5840 msgstr "不显示进度报告"

5841

@@ -5732,9 +5925,9 @@ msgid "write the content to temporary files"

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

5926

5927 #: builtin/checkout-index.c:174 builtin/column.c:30

5735 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600

5736 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967

5737 -#: builtin/worktree.c:471

5928 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638

5929 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980

5930 +#: builtin/worktree.c:472

5931 msgid "string"

5932 msgstr "字符串"

5933

@@ -5746,114 +5939,114 @@ msgstr "在创建文件时，在前面加上 <字符串>"

5939 msgid "copy out the files from named stage"

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

5941

5749 -#: builtin/checkout.c:25

5942 +#: builtin/checkout.c:27

5943 msgid "git checkout [<options>] <branch>"

5944 msgstr "git checkout [<选项>] <分支>"

5945

5753 -#: builtin/checkout.c:26

5946 +#: builtin/checkout.c:28

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

5948 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."

5949

5757 -#: builtin/checkout.c:134 builtin/checkout.c:167

5950 +#: builtin/checkout.c:153 builtin/checkout.c:186

5951 #, c-format

5952 msgid "path '%s' does not have our version"

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

5954

5762 -#: builtin/checkout.c:136 builtin/checkout.c:169

5955 +#: builtin/checkout.c:155 builtin/checkout.c:188

5956 #, c-format

5957 msgid "path '%s' does not have their version"

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

5959

5767 -#: builtin/checkout.c:152

5960 +#: builtin/checkout.c:171

5961 #, c-format

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

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

5964

5772 -#: builtin/checkout.c:196

5965 +#: builtin/checkout.c:215

5966 #, c-format

5967 msgid "path '%s' does not have necessary versions"

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

5969

5777 -#: builtin/checkout.c:213

5970 +#: builtin/checkout.c:232

5971 #, c-format

5972 msgid "path '%s': cannot merge"

5973 msgstr "path '%s'：无法合并"

5974

5782 -#: builtin/checkout.c:230

5975 +#: builtin/checkout.c:249

5976 #, c-format

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

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

5979

5787 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

5788 -#: builtin/checkout.c:259

5980 +#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275

5981 +#: builtin/checkout.c:278

5982 #, c-format

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

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

5985

5793 -#: builtin/checkout.c:262 builtin/checkout.c:265

5986 +#: builtin/checkout.c:281 builtin/checkout.c:284

5987 #, c-format

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

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

5990

5798 -#: builtin/checkout.c:268

5991 +#: builtin/checkout.c:287

5992 #, c-format

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

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

5995

5803 -#: builtin/checkout.c:339 builtin/checkout.c:346

5996 +#: builtin/checkout.c:358 builtin/checkout.c:365

5997 #, c-format

5998 msgid "path '%s' is unmerged"

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

6000

5808 -#: builtin/checkout.c:494

6001 +#: builtin/checkout.c:513

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

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

6004

5812 -#: builtin/checkout.c:625

6005 +#: builtin/checkout.c:644

6006 #, c-format

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

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

6009

5817 -#: builtin/checkout.c:666

6010 +#: builtin/checkout.c:685

6011 msgid "HEAD is now at"

6012 msgstr "HEAD 目前位于"

6013

5821 -#: builtin/checkout.c:670 builtin/clone.c:660

6014 +#: builtin/checkout.c:689 builtin/clone.c:678

6015 msgid "unable to update HEAD"

6016 msgstr "不能更新 HEAD"

6017

5825 -#: builtin/checkout.c:674

6018 +#: builtin/checkout.c:693

6019 #, c-format

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

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

6022

5830 -#: builtin/checkout.c:677

6023 +#: builtin/checkout.c:696

6024 #, c-format

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

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

6027

5835 -#: builtin/checkout.c:681

6028 +#: builtin/checkout.c:700

6029 #, c-format

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

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

6032

5840 -#: builtin/checkout.c:683 builtin/checkout.c:1072

6033 +#: builtin/checkout.c:702 builtin/checkout.c:1090

6034 #, c-format

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

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

6037

5845 -#: builtin/checkout.c:685

6038 +#: builtin/checkout.c:704

6039 #, c-format

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

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

6042

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

5851 -#: builtin/checkout.c:736

6044 +#: builtin/checkout.c:755

6045 #, c-format

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

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

6048

5856 -#: builtin/checkout.c:742

6049 +#: builtin/checkout.c:761

6050 #, c-format

6051 msgid ""

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

@@ -5874,7 +6067,7 @@ msgstr[1] ""

6067 "\n"

6068 "%s\n"

6069

5877 -#: builtin/checkout.c:761

6070 +#: builtin/checkout.c:780

6071 #, c-format

6072 msgid ""

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

@@ -5901,150 +6094,150 @@ msgstr[1] ""

6094 " git branch <新分支名> %s\n"

6095 "\n"

6096

5904 -#: builtin/checkout.c:797

6097 +#: builtin/checkout.c:816

6098 msgid "internal error in revision walk"

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

6100

5908 -#: builtin/checkout.c:801

6101 +#: builtin/checkout.c:820

6102 msgid "Previous HEAD position was"

6103 msgstr "之前的 HEAD 位置是"

6104

5912 -#: builtin/checkout.c:828 builtin/checkout.c:1067

6105 +#: builtin/checkout.c:847 builtin/checkout.c:1085

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

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

6108

5916 -#: builtin/checkout.c:973

6109 +#: builtin/checkout.c:991

6110 #, c-format

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

6112 msgstr "应只有一个引用，却给出了 %d 个"

6113

5921 -#: builtin/checkout.c:1013 builtin/worktree.c:214

6114 +#: builtin/checkout.c:1031 builtin/worktree.c:214

6115 #, c-format

6116 msgid "invalid reference: %s"

6117 msgstr "无效引用：%s"

6118

5926 -#: builtin/checkout.c:1042

6119 +#: builtin/checkout.c:1060

6120 #, c-format

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

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

6123

5931 -#: builtin/checkout.c:1081

6124 +#: builtin/checkout.c:1099

6125 msgid "paths cannot be used with switching branches"

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

6127

5935 -#: builtin/checkout.c:1084 builtin/checkout.c:1088

6128 +#: builtin/checkout.c:1102 builtin/checkout.c:1106

6129 #, c-format

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

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

6132

5940 -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100

5941 -#: builtin/checkout.c:1103

6133 +#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118

6134 +#: builtin/checkout.c:1121

6135 #, c-format

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

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

6138

5946 -#: builtin/checkout.c:1108

6139 +#: builtin/checkout.c:1126

6140 #, c-format

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

6142 msgstr "不能切换分支到一个非提交 '%s'"

6143

5951 -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

5952 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5953 -#: builtin/worktree.c:326

6144 +#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111

6145 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325

6146 +#: builtin/worktree.c:327

6147 msgid "branch"

6148 msgstr "分支"

6149

5957 -#: builtin/checkout.c:1142

6150 +#: builtin/checkout.c:1160

6151 msgid "create and checkout a new branch"

6152 msgstr "创建并检出一个新的分支"

6153

5961 -#: builtin/checkout.c:1144

6154 +#: builtin/checkout.c:1162

6155 msgid "create/reset and checkout a branch"

6156 msgstr "创建/重置并检出一个分支"

6157

5965 -#: builtin/checkout.c:1145

6158 +#: builtin/checkout.c:1163

6159 msgid "create reflog for new branch"

6160 msgstr "为新的分支创建引用日志"

6161

5969 -#: builtin/checkout.c:1146 builtin/worktree.c:328

6162 +#: builtin/checkout.c:1164 builtin/worktree.c:329

6163 msgid "detach HEAD at named commit"

6164 msgstr "HEAD 从指定的提交分离"

6165

5973 -#: builtin/checkout.c:1147

6166 +#: builtin/checkout.c:1165

6167 msgid "set upstream info for new branch"

6168 msgstr "为新的分支设置上游信息"

6169

5977 -#: builtin/checkout.c:1149

6170 +#: builtin/checkout.c:1167

6171 msgid "new-branch"

6172 msgstr "新分支"

6173

5981 -#: builtin/checkout.c:1149

6174 +#: builtin/checkout.c:1167

6175 msgid "new unparented branch"

6176 msgstr "新的没有父提交的分支"

6177

5985 -#: builtin/checkout.c:1150

6178 +#: builtin/checkout.c:1168

6179 msgid "checkout our version for unmerged files"

6180 msgstr "对尚未合并的文件检出我们的版本"

6181

5989 -#: builtin/checkout.c:1152

6182 +#: builtin/checkout.c:1170

6183 msgid "checkout their version for unmerged files"

6184 msgstr "对尚未合并的文件检出他们的版本"

6185

5993 -#: builtin/checkout.c:1154

6186 +#: builtin/checkout.c:1172

6187 msgid "force checkout (throw away local modifications)"

6188 msgstr "强制检出（丢弃本地修改）"

6189

5997 -#: builtin/checkout.c:1155

6190 +#: builtin/checkout.c:1173

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

6192 msgstr "和新的分支执行三方合并"

6193

6001 -#: builtin/checkout.c:1156 builtin/merge.c:235

6194 +#: builtin/checkout.c:1174 builtin/merge.c:234

6195 msgid "update ignored files (default)"

6196 msgstr "更新忽略的文件（默认）"

6197

6005 -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

6198 +#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251

6199 msgid "style"

6200 msgstr "风格"

6201

6009 -#: builtin/checkout.c:1158

6202 +#: builtin/checkout.c:1176

6203 msgid "conflict style (merge or diff3)"

6204 msgstr "冲突输出风格（merge 或 diff3）"

6205

6013 -#: builtin/checkout.c:1161

6206 +#: builtin/checkout.c:1179

6207 msgid "do not limit pathspecs to sparse entries only"

6208 msgstr "对路径不做稀疏检出的限制"

6209

6017 -#: builtin/checkout.c:1163

6210 +#: builtin/checkout.c:1181

6211 msgid "second guess 'git checkout <no-such-branch>'"

6212 msgstr "二次猜测'git checkout <无此分支>'"

6213

6021 -#: builtin/checkout.c:1165

6214 +#: builtin/checkout.c:1183

6215 msgid "do not check if another worktree is holding the given ref"

6216 msgstr "不检查指定的引用是否被其他工作区所占用"

6217

6025 -#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119

6026 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

6027 -#: builtin/send-pack.c:168

6218 +#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119

6219 +#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539

6220 +#: builtin/send-pack.c:172

6221 msgid "force progress reporting"

6222 msgstr "强制显示进度报告"

6223

6031 -#: builtin/checkout.c:1197

6224 +#: builtin/checkout.c:1224

6225 msgid "-b, -B and --orphan are mutually exclusive"

6226 msgstr "-b、-B 和 --orphan 是互斥的"

6227

6035 -#: builtin/checkout.c:1214

6228 +#: builtin/checkout.c:1241

6229 msgid "--track needs a branch name"

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

6231

6039 -#: builtin/checkout.c:1219

6232 +#: builtin/checkout.c:1246

6233 msgid "Missing branch name; try -b"

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

6235

6043 -#: builtin/checkout.c:1255

6236 +#: builtin/checkout.c:1282

6237 msgid "invalid path specification"

6238 msgstr "无效的路径规格"

6239

6047 -#: builtin/checkout.c:1262

6240 +#: builtin/checkout.c:1289

6241 #, c-format

6242 msgid ""

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

@@ -6053,12 +6246,12 @@ msgstr ""

6246 "不能同时更新路径并切换到分支'%s'。\n"

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

6248

6056 -#: builtin/checkout.c:1267

6249 +#: builtin/checkout.c:1294

6250 #, c-format

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

6252 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

6253

6061 -#: builtin/checkout.c:1271

6254 +#: builtin/checkout.c:1298

6255 msgid ""

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

6257 "checking out of the index."

@@ -6096,7 +6289,7 @@ msgstr "将忽略仓库 %s\n"

6289 msgid "failed to remove %s"

6290 msgstr "无法删除 %s"

6291

6099 -#: builtin/clean.c:291 git-add--interactive.perl:623

6292 +#: builtin/clean.c:297 git-add--interactive.perl:614

6293 #, c-format

6294 msgid ""

6295 "Prompt help:\n"

@@ -6109,7 +6302,7 @@ msgstr ""

6302 "foo - 通过唯一前缀选择一个选项\n"

6303 " - （空）什么也不选择\n"

6304

6112 -#: builtin/clean.c:295 git-add--interactive.perl:632

6305 +#: builtin/clean.c:301 git-add--interactive.perl:623

6306 #, c-format

6307 msgid ""

6308 "Prompt help:\n"

@@ -6130,38 +6323,38 @@ msgstr ""

6323 "* - 选择所有选项\n"

6324 " - （空）结束选择\n"

6325

6133 -#: builtin/clean.c:511 git-add--interactive.perl:598

6134 -#: git-add--interactive.perl:603

6326 +#: builtin/clean.c:517 git-add--interactive.perl:589

6327 +#: git-add--interactive.perl:594

6328 #, c-format, perl-format

6329 msgid "Huh (%s)?\n"

6330 msgstr "嗯（%s）？\n"

6331

6139 -#: builtin/clean.c:653

6332 +#: builtin/clean.c:659

6333 #, c-format

6334 msgid "Input ignore patterns>> "

6335 msgstr "输入模版以排除条目>> "

6336

6144 -#: builtin/clean.c:690

6337 +#: builtin/clean.c:696

6338 #, c-format

6339 msgid "WARNING: Cannot find items matched by: %s"

6340 msgstr "警告：无法找到和 %s 匹配的条目"

6341

6149 -#: builtin/clean.c:711

6342 +#: builtin/clean.c:717

6343 msgid "Select items to delete"

6344 msgstr "选择要删除的条目"

6345

6346 #. TRANSLATORS: Make sure to keep [y/N] as is

6154 -#: builtin/clean.c:752

6347 +#: builtin/clean.c:758

6348 #, c-format

6349 msgid "Remove %s [y/N]? "

6350 msgstr "删除 %s [y/N]？"

6351

6159 -#: builtin/clean.c:777 git-add--interactive.perl:1669

6352 +#: builtin/clean.c:783 git-add--interactive.perl:1660

6353 #, c-format

6354 msgid "Bye.\n"

6355 msgstr "再见。\n"

6356

6164 -#: builtin/clean.c:785

6357 +#: builtin/clean.c:791

6358 msgid ""

6359 "clean - start cleaning\n"

6360 "filter by pattern - exclude items from deletion\n"

@@ -6179,69 +6372,70 @@ msgstr ""

6372 "help - 显示本帮助\n"

6373 "? - 显示如何在提示符下选择的帮助"

6374

6182 -#: builtin/clean.c:812 git-add--interactive.perl:1745

6375 +#: builtin/clean.c:818 git-add--interactive.perl:1736

6376 msgid "*** Commands ***"

6377 msgstr "*** 命令 ***"

6378

6186 -#: builtin/clean.c:813 git-add--interactive.perl:1742

6379 +#: builtin/clean.c:819 git-add--interactive.perl:1733

6380 msgid "What now"

6381 msgstr "请选择"

6382

6190 -#: builtin/clean.c:821

6383 +#: builtin/clean.c:827

6384 msgid "Would remove the following item:"

6385 msgid_plural "Would remove the following items:"

6386 msgstr[0] "将删除如下条目："

6387 msgstr[1] "将删除如下条目："

6388

6196 -#: builtin/clean.c:838

6389 +#: builtin/clean.c:844

6390 msgid "No more files to clean, exiting."

6391 msgstr "没有要清理的文件，退出。"

6392

6200 -#: builtin/clean.c:869

6393 +#: builtin/clean.c:875

6394 msgid "do not print names of files removed"

6395 msgstr "不打印删除文件的名称"

6396

6204 -#: builtin/clean.c:871

6397 +#: builtin/clean.c:877

6398 msgid "force"

6399 msgstr "强制"

6400

6208 -#: builtin/clean.c:872

6401 +#: builtin/clean.c:878

6402 msgid "interactive cleaning"

6403 msgstr "交互式清除"

6404

6212 -#: builtin/clean.c:874

6405 +#: builtin/clean.c:880

6406 msgid "remove whole directories"

6407 msgstr "删除整个目录"

6408

6216 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

6217 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176

6409 +#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451

6410 +#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348

6411 +#: builtin/name-rev.c:350 builtin/show-ref.c:176

6412 msgid "pattern"

6413 msgstr "模式"

6414

6221 -#: builtin/clean.c:876

6415 +#: builtin/clean.c:882

6416 msgid "add <pattern> to ignore rules"

6417 msgstr "添加 <模式> 到忽略规则"

6418

6225 -#: builtin/clean.c:877

6419 +#: builtin/clean.c:883

6420 msgid "remove ignored files, too"

6421 msgstr "也删除忽略的文件"

6422

6229 -#: builtin/clean.c:879

6423 +#: builtin/clean.c:885

6424 msgid "remove only ignored files"

6425 msgstr "只删除忽略的文件"

6426

6233 -#: builtin/clean.c:897

6427 +#: builtin/clean.c:903

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

6429 msgstr "-x 和 -X 不能同时使用"

6430

6237 -#: builtin/clean.c:901

6431 +#: builtin/clean.c:907

6432 msgid ""

6433 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

6434 "clean"

6435 msgstr ""

6436 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

6437

6244 -#: builtin/clean.c:904

6438 +#: builtin/clean.c:910

6439 msgid ""

6440 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

6441 "refusing to clean"

@@ -6252,130 +6446,134 @@ msgstr ""

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

6447 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

6448

6255 -#: builtin/clone.c:65

6449 +#: builtin/clone.c:80

6450 msgid "don't create a checkout"

6451 msgstr "不创建一个检出"

6452

6259 -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478

6453 +#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478

6454 msgid "create a bare repository"

6455 msgstr "创建一个纯仓库"

6456

6263 -#: builtin/clone.c:70

6457 +#: builtin/clone.c:85

6458 msgid "create a mirror repository (implies bare)"

6459 msgstr "创建一个镜像仓库（也是纯仓库）"

6460

6267 -#: builtin/clone.c:72

6461 +#: builtin/clone.c:87

6462 msgid "to clone from a local repository"

6463 msgstr "从本地仓库克隆"

6464

6271 -#: builtin/clone.c:74

6465 +#: builtin/clone.c:89

6466 msgid "don't use local hardlinks, always copy"

6467 msgstr "不使用本地硬链接，始终复制"

6468

6275 -#: builtin/clone.c:76

6469 +#: builtin/clone.c:91

6470 msgid "setup as shared repository"

6471 msgstr "设置为共享仓库"

6472

6279 -#: builtin/clone.c:78 builtin/clone.c:80

6473 +#: builtin/clone.c:93 builtin/clone.c:97

6474 +msgid "pathspec"

6475 +msgstr "路径"

6476 +

6477 +#: builtin/clone.c:93 builtin/clone.c:97

6478 msgid "initialize submodules in the clone"

6479 msgstr "在克隆时初始化子模组"

6480

6283 -#: builtin/clone.c:82

6481 +#: builtin/clone.c:100

6482 msgid "number of submodules cloned in parallel"

6483 msgstr "并发克隆的子模组的数量"

6484

6287 -#: builtin/clone.c:83 builtin/init-db.c:475

6485 +#: builtin/clone.c:101 builtin/init-db.c:475

6486 msgid "template-directory"

6487 msgstr "模板目录"

6488

6291 -#: builtin/clone.c:84 builtin/init-db.c:476

6489 +#: builtin/clone.c:102 builtin/init-db.c:476

6490 msgid "directory from which templates will be used"

6491 msgstr "模板目录将被使用"

6492

6295 -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604

6296 -#: builtin/submodule--helper.c:970

6493 +#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642

6494 +#: builtin/submodule--helper.c:983

6495 msgid "reference repository"

6496 msgstr "参考仓库"

6497

6300 -#: builtin/clone.c:90

6498 +#: builtin/clone.c:108

6499 msgid "use --reference only while cloning"

6500 msgstr "仅在克隆时参考 --reference 指向的本地仓库"

6501

6304 -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44

6502 +#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43

6503 msgid "name"

6504 msgstr "名称"

6505

6308 -#: builtin/clone.c:92

6506 +#: builtin/clone.c:110

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

6508 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"

6509

6312 -#: builtin/clone.c:94

6510 +#: builtin/clone.c:112

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

6512 msgstr "检出 <分支> 而不是远程 HEAD"

6513

6316 -#: builtin/clone.c:96

6514 +#: builtin/clone.c:114

6515 msgid "path to git-upload-pack on the remote"

6516 msgstr "远程 git-upload-pack 路径"

6517

6320 -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999

6518 +#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006

6519 #: builtin/pull.c:202

6520 msgid "depth"

6521 msgstr "深度"

6522

6325 -#: builtin/clone.c:98

6523 +#: builtin/clone.c:116

6524 msgid "create a shallow clone of that depth"

6525 msgstr "创建一个指定深度的浅克隆"

6526

6329 -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

6527 +#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918

6528 #: parse-options.h:142

6529 msgid "time"

6530 msgstr "时间"

6531

6334 -#: builtin/clone.c:100

6532 +#: builtin/clone.c:118

6533 msgid "create a shallow clone since a specific time"

6534 msgstr "从一个特定时间创建一个浅克隆"

6535

6338 -#: builtin/clone.c:101 builtin/fetch.c:124

6536 +#: builtin/clone.c:119 builtin/fetch.c:124

6537 msgid "revision"

6538 msgstr "版本"

6539

6342 -#: builtin/clone.c:102 builtin/fetch.c:125

6540 +#: builtin/clone.c:120 builtin/fetch.c:125

6541 msgid "deepen history of shallow clone, excluding rev"

6542 msgstr "深化浅克隆的历史，除了特定版本"

6543

6346 -#: builtin/clone.c:104

6544 +#: builtin/clone.c:122

6545 msgid "clone only one branch, HEAD or --branch"

6546 msgstr "只克隆一个分支、HEAD 或 --branch"

6547

6350 -#: builtin/clone.c:106

6548 +#: builtin/clone.c:124

6549 msgid "any cloned submodules will be shallow"

6550 msgstr "子模组将以浅下载模式克隆"

6551

6354 -#: builtin/clone.c:107 builtin/init-db.c:484

6552 +#: builtin/clone.c:125 builtin/init-db.c:484

6553 msgid "gitdir"

6554 msgstr "git目录"

6555

6358 -#: builtin/clone.c:108 builtin/init-db.c:485

6556 +#: builtin/clone.c:126 builtin/init-db.c:485

6557 msgid "separate git dir from working tree"

6558 msgstr "git目录和工作区分离"

6559

6362 -#: builtin/clone.c:109

6560 +#: builtin/clone.c:127

6561 msgid "key=value"

6562 msgstr "key=value"

6563

6366 -#: builtin/clone.c:110

6564 +#: builtin/clone.c:128

6565 msgid "set config inside the new repository"

6566 msgstr "在新仓库中设置配置信息"

6567

6370 -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

6568 +#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550

6569 msgid "use IPv4 addresses only"

6570 msgstr "只使用 IPv4 地址"

6571

6374 -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

6572 +#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552

6573 msgid "use IPv6 addresses only"

6574 msgstr "只使用 IPv6 地址"

6575

6378 -#: builtin/clone.c:250

6576 +#: builtin/clone.c:268

6577 msgid ""

6578 "No directory name could be guessed.\n"

6579 "Please specify a directory on the command line"

@@ -6383,42 +6581,42 @@ msgstr ""

6581 "无法猜到目录名。\n"

6582 "请在命令行指定一个目录"

6583

6386 -#: builtin/clone.c:303

6584 +#: builtin/clone.c:321

6585 #, c-format

6586 msgid "info: Could not add alternate for '%s': %s\n"

6587 msgstr "info: 不能为 '%s' 添加一个备用：%s\n"

6588

6391 -#: builtin/clone.c:375

6589 +#: builtin/clone.c:393

6590 #, c-format

6591 msgid "failed to open '%s'"

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

6593

6396 -#: builtin/clone.c:383

6594 +#: builtin/clone.c:401

6595 #, c-format

6596 msgid "%s exists and is not a directory"

6597 msgstr "%s 存在且不是一个目录"

6598

6401 -#: builtin/clone.c:397

6599 +#: builtin/clone.c:415

6600 #, c-format

6601 msgid "failed to stat %s\n"

6602 msgstr "无法枚举 %s 状态\n"

6603

6406 -#: builtin/clone.c:419

6604 +#: builtin/clone.c:437

6605 #, c-format

6606 msgid "failed to create link '%s'"

6607 msgstr "无法创建链接 '%s'"

6608

6411 -#: builtin/clone.c:423

6609 +#: builtin/clone.c:441

6610 #, c-format

6611 msgid "failed to copy file to '%s'"

6612 msgstr "无法拷贝文件至 '%s'"

6613

6416 -#: builtin/clone.c:448

6614 +#: builtin/clone.c:466

6615 #, c-format

6616 msgid "done.\n"

6617 msgstr "完成。\n"

6618

6421 -#: builtin/clone.c:460

6619 +#: builtin/clone.c:478

6620 msgid ""

6621 "Clone succeeded, but checkout failed.\n"

6622 "You can inspect what was checked out with 'git status'\n"

@@ -6428,136 +6626,135 @@ msgstr ""

6626 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

6627 "'git checkout -f HEAD' 重试\n"

6628

6431 -#: builtin/clone.c:537

6629 +#: builtin/clone.c:555

6630 #, c-format

6631 msgid "Could not find remote branch %s to clone."

6632 msgstr "不能发现要克隆的远程分支 %s。"

6633

6436 -#: builtin/clone.c:632

6634 +#: builtin/clone.c:650

6635 msgid "remote did not send all necessary objects"

6636 msgstr "远程没有发送所有必须的对象"

6637

6440 -#: builtin/clone.c:648

6638 +#: builtin/clone.c:666

6639 #, c-format

6640 msgid "unable to update %s"

6641 msgstr "不能更新 %s"

6642

6445 -#: builtin/clone.c:697

6643 +#: builtin/clone.c:715

6644 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

6645 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

6646

6449 -#: builtin/clone.c:728

6647 +#: builtin/clone.c:746

6648 msgid "unable to checkout working tree"

6649 msgstr "不能检出工作区"

6650

6453 -#: builtin/clone.c:768

6651 +#: builtin/clone.c:786

6652 msgid "unable to write parameters to config file"

6653 msgstr "无法将参数写入配置文件"

6654

6457 -#: builtin/clone.c:831

6655 +#: builtin/clone.c:849

6656 msgid "cannot repack to clean up"

6657 msgstr "无法执行 repack 来清理"

6658

6461 -#: builtin/clone.c:833

6659 +#: builtin/clone.c:851

6660 msgid "cannot unlink temporary alternates file"

6661 msgstr "无法删除临时的 alternates 文件"

6662

6465 -#: builtin/clone.c:866 builtin/receive-pack.c:1895

6663 +#: builtin/clone.c:884 builtin/receive-pack.c:1901

6664 msgid "Too many arguments."

6665 msgstr "太多参数。"

6666

6469 -#: builtin/clone.c:870

6667 +#: builtin/clone.c:888

6668 msgid "You must specify a repository to clone."

6669 msgstr "您必须指定一个仓库来克隆。"

6670

6473 -#: builtin/clone.c:883

l10n: zh_CN: for git v2.13.0 l10n round 1