1003b3a55d · matheusbsbs/matheus-bagliano

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

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2013-03-05 12:36+0800\n"

16 -"PO-Revision-Date: 2013-03-05 13:07+0800\n"

15 +"POT-Creation-Date: 2013-04-10 15:16+0800\n"

16 +"PO-Revision-Date: 2013-04-12 09:23+0800\n"

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

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

19 "Language: zh_CN\n"

@@ -22,7 +22,7 @@ msgstr ""

22 "Content-Transfer-Encoding: 8bit\n"

23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

24

25 -#: advice.c:49

25 +#: advice.c:53

26 #, c-format

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

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

@@ -31,7 +31,7 @@ msgstr "提示：%.*s\n"

31 #. * Message used both when 'git commit' fails and when

32 #. * other commands doing a merge do.

33 #.

34 -#: advice.c:79

34 +#: advice.c:83

35 msgid ""

36 "Fix them up in the work tree,\n"

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

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

68 msgid "archive format"

69 msgstr "归档格式"

70

71 -#: archive.c:324 builtin/log.c:1115

71 +#: archive.c:324 builtin/log.c:1117

72 msgid "prefix"

73 msgstr "前缀"

74

@@ -76,15 +76,15 @@ msgstr "前缀"

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

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

78

79 -#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366

80 -#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653

81 -#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77

79 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366

80 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659

81 +#: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77

82 #: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536

83 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149

84 msgid "file"

85 msgstr "文件"

86

87 -#: archive.c:327 builtin/archive.c:92

87 +#: archive.c:327 builtin/archive.c:89

88 msgid "write the archive to this file"

89 msgstr "归档写入此文件"

90

@@ -112,19 +112,19 @@ msgstr "压缩效果更好"

112 msgid "list supported archive formats"

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

114

115 -#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85

115 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86

116 msgid "repo"

117 msgstr "版本库"

118

119 -#: archive.c:346 builtin/archive.c:94

119 +#: archive.c:346 builtin/archive.c:91

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

121 msgstr "从远程版本库（<版本库>）提取归档文件"

122

123 -#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615

123 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615

124 msgid "command"

125 msgstr "命令"

126

127 -#: archive.c:348 builtin/archive.c:96

127 +#: archive.c:348 builtin/archive.c:93

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

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

130

@@ -136,6 +136,34 @@ msgstr ""

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

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

138

139 +#: branch.c:201

140 +#, c-format

141 +msgid "Cannot setup tracking information; starting point '%s' is not a branch."

142 +msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

143 +

144 +#: branch.c:203

145 +#, c-format

146 +msgid "the requested upstream branch '%s' does not exist"

147 +msgstr "请求的上游分支 '%s' 不存在"

148 +

149 +#: branch.c:205

150 +msgid ""

151 +"\n"

152 +"If you are planning on basing your work on an upstream\n"

153 +"branch that already exists at the remote, you may need to\n"

154 +"run \"git fetch\" to retrieve it.\n"

155 +"\n"

156 +"If you are planning to push out a new local branch that\n"

157 +"will track its remote counterpart, you may want to use\n"

158 +"\"git push -u\" to set the upstream config as you push."

159 +msgstr ""

160 +"\n"

161 +"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"

162 +"您可能需要执行 \"git fetch\" 来获取分支。\n"

163 +"\n"

164 +"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"

165 +"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

166 +

167 #: bundle.c:36

168 #, c-format

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

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

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

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

176

149 -#: bundle.c:89 builtin/commit.c:674

177 +#: bundle.c:89 builtin/commit.c:676

178 #, c-format

179 msgid "could not open '%s'"

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

@@ -155,35 +183,35 @@ msgstr "不能打开 '%s'"

183 msgid "Repository lacks these prerequisite commits:"

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

185

158 -#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299

159 -#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347

186 +#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300

187 +#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349

188 #: builtin/shortlog.c:157

189 msgid "revision walk setup failed"

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

191

192 #: bundle.c:186

193 #, c-format

166 -msgid "The bundle contains %d ref"

167 -msgid_plural "The bundle contains %d refs"

168 -msgstr[0] "这个包中含有 %d 个引用"

169 -msgstr[1] "这个包中含有 %d 个引用"

194 +msgid "The bundle contains this ref:"

195 +msgid_plural "The bundle contains these %d refs:"

196 +msgstr[0] "这个包中含有这个引用："

197 +msgstr[1] "这个包中含有 %d 个引用："

198

171 -#: bundle.c:192

199 +#: bundle.c:193

200 msgid "The bundle records a complete history."

201 msgstr "这个包记录一个完整历史。"

202

203 #: bundle.c:195

204 #, c-format

177 -msgid "The bundle requires this ref"

178 -msgid_plural "The bundle requires these %d refs"

179 -msgstr[0] "这个包需要这个引用"

180 -msgstr[1] "这个包需要 %d 个这些引用"

205 +msgid "The bundle requires this ref:"

206 +msgid_plural "The bundle requires these %d refs:"

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

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

209

210 #: bundle.c:294

211 msgid "rev-list died"

212 msgstr "rev-list 终止"

213

186 -#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260

214 +#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260

215 #, c-format

216 msgid "unrecognized argument: %s"

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

@@ -335,7 +363,7 @@ msgstr ""

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

364 "%s"

365

338 -#: diff.c:3468

366 +#: diff.c:3480

367 #, c-format

368 msgid ""

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

@@ -344,12 +372,12 @@ msgstr ""

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

373 "%s"

374

347 -#: diff.c:3482

375 +#: diff.c:3494

376 #, c-format

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

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

379

352 -#: gpg-interface.c:59 gpg-interface.c:127

380 +#: gpg-interface.c:59 gpg-interface.c:131

381 msgid "could not run gpg."

382 msgstr "不能执行 gpg。"

383

@@ -361,27 +389,27 @@ msgstr "gpg 没有接受数据"

389 msgid "gpg failed to sign the data"

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

391

364 -#: gpg-interface.c:112

392 +#: gpg-interface.c:115

393 #, c-format

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

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

396

369 -#: gpg-interface.c:115

397 +#: gpg-interface.c:118

398 #, c-format

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

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

401

374 -#: grep.c:1622

402 +#: grep.c:1623

403 #, c-format

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

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

406

379 -#: grep.c:1639

407 +#: grep.c:1640

408 #, c-format

409 msgid "'%s': %s"

410 msgstr "'%s'：%s"

411

384 -#: grep.c:1650

412 +#: grep.c:1651

413 #, c-format

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

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

@@ -449,8 +477,8 @@ msgstr[1] ""

477 msgid "failed to read the cache"

478 msgstr "无法读取缓存"

479

452 -#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534

453 -#: builtin/clone.c:586

480 +#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563

481 +#: builtin/clone.c:635

482 msgid "unable to write new index file"

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

484

@@ -499,7 +527,7 @@ msgstr "不能读取对象 %s '%s'"

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

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

529

502 -#: merge-recursive.c:773 builtin/clone.c:302

530 +#: merge-recursive.c:773 builtin/clone.c:303

531 #, c-format

532 msgid "failed to open '%s'"

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

@@ -634,7 +662,7 @@ msgstr "略过 %s（已经做过相同合并）"

662 msgid "Auto-merging %s"

663 msgstr "自动合并 %s"

664

637 -#: merge-recursive.c:1633 git-submodule.sh:942

665 +#: merge-recursive.c:1633 git-submodule.sh:1029

666 msgid "submodule"

667 msgstr "子模组"

668

@@ -704,10 +732,15 @@ msgstr "合并未返回提交"

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

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

734

707 -#: merge-recursive.c:2009 builtin/merge.c:643

735 +#: merge-recursive.c:2009 builtin/merge.c:658

736 msgid "Unable to write index."

737 msgstr "不能写入索引。"

738

739 +#: object.c:195

740 +#, c-format

741 +msgid "unable to parse object: %s"

742 +msgstr "不能解析对象：%s"

743 +

744 #: parse-options.c:489

745 msgid "..."

746 msgstr "..."

@@ -744,18 +777,18 @@ msgstr "路径 '%s' 属于模组 '%.*s'"

777 msgid "'%s' is beyond a symbolic link"

778 msgstr "'%s' 位于符号链接中"

779

747 -#: remote.c:1653

780 +#: remote.c:1781

781 #, c-format

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

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

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

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

786

754 -#: remote.c:1659

787 +#: remote.c:1787

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

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

790

758 -#: remote.c:1662

791 +#: remote.c:1790

792 #, c-format

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

794 msgid_plural ""

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

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

798

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

767 -#: remote.c:1670

800 +#: remote.c:1798

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

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

803

771 -#: remote.c:1673

804 +#: remote.c:1801

805 #, c-format

806 msgid ""

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

@@ -784,23 +817,23 @@ msgstr[1] ""

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

818

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

787 -#: remote.c:1683

820 +#: remote.c:1811

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

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

823

791 -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984

792 -#: builtin/merge.c:994

824 +#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999

825 +#: builtin/merge.c:1009

826 #, c-format

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

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

829

797 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986

798 -#: builtin/merge.c:999

830 +#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779

831 +#: builtin/merge.c:1001 builtin/merge.c:1014

832 #, c-format

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

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

835

803 -#: sequencer.c:146

836 +#: sequencer.c:229

837 msgid ""

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

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

@@ -808,7 +841,7 @@ msgstr ""

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

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

843

811 -#: sequencer.c:149

844 +#: sequencer.c:232

845 msgid ""

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

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

@@ -817,228 +850,228 @@ msgstr ""

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

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

852

820 -#: sequencer.c:162 sequencer.c:774 sequencer.c:857

853 +#: sequencer.c:245 sequencer.c:859 sequencer.c:942

854 #, c-format

855 msgid "Could not write to %s"

856 msgstr "不能写入 %s"

857

825 -#: sequencer.c:165

858 +#: sequencer.c:248

859 #, c-format

860 msgid "Error wrapping up %s"

861 msgstr "错误收尾 %s"

862

830 -#: sequencer.c:180

863 +#: sequencer.c:263

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

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

866

834 -#: sequencer.c:182

867 +#: sequencer.c:265

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

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

870

838 -#: sequencer.c:185

871 +#: sequencer.c:268

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

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

874

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

843 -#: sequencer.c:236

876 +#: sequencer.c:319

877 #, c-format

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

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

880

848 -#: sequencer.c:267

881 +#: sequencer.c:350

882 msgid "Could not resolve HEAD commit\n"

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

884

852 -#: sequencer.c:288

885 +#: sequencer.c:371

886 msgid "Unable to update cache tree\n"

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

888

856 -#: sequencer.c:333

889 +#: sequencer.c:416

890 #, c-format

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

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

893

861 -#: sequencer.c:338

894 +#: sequencer.c:421

895 #, c-format

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

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

898

866 -#: sequencer.c:404

899 +#: sequencer.c:487

900 msgid "Your index file is unmerged."

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

902

870 -#: sequencer.c:423

903 +#: sequencer.c:506

904 #, c-format

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

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

907

875 -#: sequencer.c:431

908 +#: sequencer.c:514

909 #, c-format

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

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

912

880 -#: sequencer.c:435

913 +#: sequencer.c:518

914 #, c-format

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

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

917

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

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

887 -#: sequencer.c:448

920 +#: sequencer.c:531

921 #, c-format

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

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

924

892 -#: sequencer.c:452

925 +#: sequencer.c:535

926 #, c-format

927 msgid "Cannot get commit message for %s"

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

929

897 -#: sequencer.c:536

930 +#: sequencer.c:621

931 #, c-format

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

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

934

902 -#: sequencer.c:537

935 +#: sequencer.c:622

936 #, c-format

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

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

939

907 -#: sequencer.c:569

940 +#: sequencer.c:654

941 msgid "empty commit set passed"

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

943

911 -#: sequencer.c:577

944 +#: sequencer.c:662

945 #, c-format

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

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

948

916 -#: sequencer.c:582

949 +#: sequencer.c:667

950 #, c-format

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

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

953

921 -#: sequencer.c:640

954 +#: sequencer.c:725

955 #, c-format

956 msgid "Cannot %s during a %s"

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

958

926 -#: sequencer.c:662

959 +#: sequencer.c:747

960 #, c-format

961 msgid "Could not parse line %d."

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

963

931 -#: sequencer.c:667

964 +#: sequencer.c:752

965 msgid "No commits parsed."

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

967

935 -#: sequencer.c:680

968 +#: sequencer.c:765

969 #, c-format

970 msgid "Could not open %s"

971 msgstr "不能打开 %s"

972

940 -#: sequencer.c:684

973 +#: sequencer.c:769

974 #, c-format

975 msgid "Could not read %s."

976 msgstr "不能读取 %s。"

977

945 -#: sequencer.c:691

978 +#: sequencer.c:776

979 #, c-format

980 msgid "Unusable instruction sheet: %s"

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

982

950 -#: sequencer.c:719

983 +#: sequencer.c:804

984 #, c-format

985 msgid "Invalid key: %s"

986 msgstr "无效键名：%s"

987

955 -#: sequencer.c:722

988 +#: sequencer.c:807

989 #, c-format

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

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

992

960 -#: sequencer.c:734

993 +#: sequencer.c:819

994 #, c-format

995 msgid "Malformed options sheet: %s"

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

997

965 -#: sequencer.c:755

998 +#: sequencer.c:840

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

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

1001

969 -#: sequencer.c:756

1002 +#: sequencer.c:841

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

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

1005

973 -#: sequencer.c:760

1006 +#: sequencer.c:845

1007 #, c-format

1008 msgid "Could not create sequencer directory %s"

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

1010

978 -#: sequencer.c:776 sequencer.c:861

1011 +#: sequencer.c:861 sequencer.c:946

1012 #, c-format

1013 msgid "Error wrapping up %s."

1014 msgstr "错误收尾 %s。"

1015

983 -#: sequencer.c:795 sequencer.c:929

1016 +#: sequencer.c:880 sequencer.c:1014

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

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

1019

987 -#: sequencer.c:797

1020 +#: sequencer.c:882

1021 msgid "cannot resolve HEAD"

1022 msgstr "不能解析 HEAD"

1023

991 -#: sequencer.c:799

1024 +#: sequencer.c:884

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

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

1027

995 -#: sequencer.c:821 builtin/apply.c:4056

1028 +#: sequencer.c:906 builtin/apply.c:4060

1029 #, c-format

1030 msgid "cannot open %s: %s"

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

1032

1000 -#: sequencer.c:824

1033 +#: sequencer.c:909

1034 #, c-format

1035 msgid "cannot read %s: %s"

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

1037

1005 -#: sequencer.c:825

1038 +#: sequencer.c:910

1039 msgid "unexpected end of file"

1040 msgstr "意外的文件结束"

1041

1009 -#: sequencer.c:831

1042 +#: sequencer.c:916

1043 #, c-format

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

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

1046

1014 -#: sequencer.c:854

1047 +#: sequencer.c:939

1048 #, c-format

1049 msgid "Could not format %s."

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

1051

1019 -#: sequencer.c:1016

1052 +#: sequencer.c:1101

1053 msgid "Can't revert as initial commit"

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

1055

1023 -#: sequencer.c:1017

1056 +#: sequencer.c:1102

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

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

1059

1027 -#: sha1_name.c:1044

1060 +#: sha1_name.c:1036

1061 msgid "HEAD does not point to a branch"

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

1063

1031 -#: sha1_name.c:1047

1064 +#: sha1_name.c:1039

1065 #, c-format

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

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

1068

1036 -#: sha1_name.c:1049

1069 +#: sha1_name.c:1041

1070 #, c-format

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

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

1073

1041 -#: sha1_name.c:1052

1074 +#: sha1_name.c:1044

1075 #, c-format

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

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

@@ -1175,291 +1208,333 @@ msgid "untracked content, "

1208 msgstr "未跟踪的内容, "

1209

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

1178 -#: wt-status.c:303

1211 +#: wt-status.c:306

1212 #, c-format

1213 msgid "new file: %s"

1214 msgstr "新文件： %s"

1215

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

1184 -#: wt-status.c:306

1217 +#: wt-status.c:309

1218 #, c-format

1219 msgid "copied: %s -> %s"

1220 msgstr "拷贝： %s -> %s"

1221

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

1190 -#: wt-status.c:309

1223 +#: wt-status.c:312

1224 #, c-format

1225 msgid "deleted: %s"

1226 msgstr "删除： %s"

1227

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

1196 -#: wt-status.c:312

1229 +#: wt-status.c:315

1230 #, c-format

1231 msgid "modified: %s"

1232 msgstr "修改： %s"

1233

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

1202 -#: wt-status.c:315

1235 +#: wt-status.c:318

1236 #, c-format

1237 msgid "renamed: %s -> %s"

1238 msgstr "重命名： %s -> %s"

1239

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

1208 -#: wt-status.c:318

1241 +#: wt-status.c:321

1242 #, c-format

1243 msgid "typechange: %s"

1244 msgstr "类型变更： %s"

1245

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

1214 -#: wt-status.c:321

1247 +#: wt-status.c:324

1248 #, c-format

1249 msgid "unknown: %s"

1250 msgstr "未知： %s"

1251

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

1220 -#: wt-status.c:324

1253 +#: wt-status.c:327

1254 #, c-format

1255 msgid "unmerged: %s"

1256 msgstr "未合并： %s"

1257

1225 -#: wt-status.c:327

1258 +#: wt-status.c:330

1259 #, c-format

1260 msgid "bug: unhandled diff status %c"

1261 msgstr "bug：未处理的差异状态 %c"

1262

1230 -#: wt-status.c:789

1263 +#: wt-status.c:805

1264 msgid "You have unmerged paths."

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

1266

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

1235 -#: wt-status.c:792 wt-status.c:944

1268 +#: wt-status.c:808 wt-status.c:960

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

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

1271

1239 -#: wt-status.c:795

1272 +#: wt-status.c:811

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

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

1275

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

1244 -#: wt-status.c:798

1277 +#: wt-status.c:814

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

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

1280

1248 -#: wt-status.c:808

1281 +#: wt-status.c:824

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

1283 msgstr "您正处于一个 am 过程中。"

1284

1252 -#: wt-status.c:811

1285 +#: wt-status.c:827

1286 msgid "The current patch is empty."

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

1288

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

1257 -#: wt-status.c:815

1290 +#: wt-status.c:831

1291 msgid " (fix conflicts and then run \"git am --resolved\")"

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

1293

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

1262 -#: wt-status.c:817

1295 +#: wt-status.c:833

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

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

1298

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

1267 -#: wt-status.c:819

1300 +#: wt-status.c:835

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

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

1303

1271 -#: wt-status.c:879 wt-status.c:896

1304 +#: wt-status.c:895 wt-status.c:912

1305 #, c-format

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

1307 msgstr "您正在将分支 '%s' 变基到 '%s'。"

1308

1276 -#: wt-status.c:884 wt-status.c:901

1309 +#: wt-status.c:900 wt-status.c:917

1310 msgid "You are currently rebasing."

1311 msgstr "您正在变基。"

1312

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

1281 -#: wt-status.c:887

1314 +#: wt-status.c:903

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

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

1317

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

1286 -#: wt-status.c:889

1319 +#: wt-status.c:905

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

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

1322

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

1291 -#: wt-status.c:891

1324 +#: wt-status.c:907

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

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

1327

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

1296 -#: wt-status.c:904

1329 +#: wt-status.c:920

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

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

1332

1300 -#: wt-status.c:908

1333 +#: wt-status.c:924

1334 #, c-format

1335 msgid ""

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

1337 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"

1338

1306 -#: wt-status.c:913

1339 +#: wt-status.c:929

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

1341 msgstr "您正在变基过程中拆分一个提交。"

1342

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

1311 -#: wt-status.c:916

1344 +#: wt-status.c:932

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

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

1347

1315 -#: wt-status.c:920

1348 +#: wt-status.c:936

1349 #, c-format

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

1351 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"

1352

1320 -#: wt-status.c:925

1353 +#: wt-status.c:941

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

1355 msgstr "您正在变基过程中编辑一个提交。"

1356

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

1325 -#: wt-status.c:928

1358 +#: wt-status.c:944

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

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

1361

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

1330 -#: wt-status.c:930

1363 +#: wt-status.c:946

1364 msgid ""

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

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

1367

1335 -#: wt-status.c:940

1368 +#: wt-status.c:956

1369 msgid "You are currently cherry-picking."

1370 msgstr "您正在做拣选操作。"

1371

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

1340 -#: wt-status.c:947

1373 +#: wt-status.c:963

1374 msgid " (all conflicts fixed: run \"git commit\")"

1375 msgstr " （解决所有冲突后，执行 \"git commit\"）"

1376

1344 -#: wt-status.c:958

1377 +#: wt-status.c:972

1378 +#, c-format

1379 +msgid "You are currently reverting commit %s."

1380 +msgstr "您正在反转提交 %s 。"

1381 +

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

1383 +#: wt-status.c:977

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

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

1386 +

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

1388 +#: wt-status.c:980

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

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

1391 +

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

1393 +#: wt-status.c:982

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

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

1396 +

1397 +#: wt-status.c:993

1398 #, c-format

1346 -msgid "You are currently bisecting branch '%s'."

1347 -msgstr "您正在分支 '%s' 中做二分查找。"

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

1400 +msgstr "您正在从分支 '%s' 开始做二分查找。"

1401

1349 -#: wt-status.c:962

1402 +#: wt-status.c:997

1403 msgid "You are currently bisecting."

1404 msgstr "您正在做二分查找。"

1405

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

1354 -#: wt-status.c:965

1407 +#: wt-status.c:1000

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

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

1410

1358 -#: wt-status.c:1064

1411 +#: wt-status.c:1175

1412 msgid "On branch "

1413 msgstr "位于分支 "

1414

1362 -#: wt-status.c:1071

1415 +#: wt-status.c:1186

1416 +msgid "HEAD detached at "

1417 +msgstr "头指针分离于 "

1418 +

1419 +#: wt-status.c:1188

1420 +msgid "HEAD detached from "

1421 +msgstr "头指针分离自 "

1422 +

1423 +#: wt-status.c:1191

1424 msgid "Not currently on any branch."

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

1426

1366 -#: wt-status.c:1083

1427 +#: wt-status.c:1208

1428 msgid "Initial commit"

1429 msgstr "初始提交"

1430

1370 -#: wt-status.c:1097

1431 +#: wt-status.c:1222

1432 msgid "Untracked files"

1433 msgstr "未跟踪的文件"

1434

1374 -#: wt-status.c:1099

1435 +#: wt-status.c:1224

1436 msgid "Ignored files"

1437 msgstr "忽略的文件"

1438

1378 -#: wt-status.c:1101

1439 +# 译者：以下三条实际为一个段落

1440 +#: wt-status.c:1228

1441 +#, c-format

1442 +msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"

1443 +msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"

1444 +

1445 +# 译者：为对齐，下面两句内容有调整

1446 +#: wt-status.c:1232

1447 +msgid "may speed it up, but you have to be careful not to forget to add"

1448 +msgstr "也许能提高速度，但您需要小心不要忘了添加新文件"

1449 +

1450 +#: wt-status.c:1235

1451 +msgid "new files yourself (see 'git help status')."

1452 +msgstr "（参见 'git help status'）。"

1453 +

1454 +#: wt-status.c:1238

1455 #, c-format

1456 msgid "Untracked files not listed%s"

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

1458

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

1384 -#: wt-status.c:1103

1460 +#: wt-status.c:1240

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

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

1463

1388 -#: wt-status.c:1109

1464 +#: wt-status.c:1246

1465 msgid "No changes"

1466 msgstr "没有修改"

1467

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

1393 -#: wt-status.c:1114

1468 +#: wt-status.c:1251

1469 #, c-format

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

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

1472

1398 -#: wt-status.c:1117

1473 +#: wt-status.c:1254

1474 #, c-format

1475 msgid "no changes added to commit\n"

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

1477

1403 -#: wt-status.c:1120

1478 +#: wt-status.c:1257

1479 #, c-format

1480 msgid ""

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

1482 "track)\n"

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

1484

1410 -#: wt-status.c:1123

1485 +#: wt-status.c:1260

1486 #, c-format

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

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

1489

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

1416 -#: wt-status.c:1126

1491 +#: wt-status.c:1263

1492 #, c-format

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

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

1495

1421 -#: wt-status.c:1129 wt-status.c:1134

1496 +#: wt-status.c:1266 wt-status.c:1271

1497 #, c-format

1498 msgid "nothing to commit\n"

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

1500

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

1427 -#: wt-status.c:1132

1502 +#: wt-status.c:1269

1503 #, c-format

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

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

1506

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

1433 -#: wt-status.c:1136

1508 +#: wt-status.c:1273

1509 #, c-format

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

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

1512

1438 -#: wt-status.c:1244

1513 +#: wt-status.c:1381

1514 msgid "HEAD (no branch)"

1515 msgstr "HEAD（非分支）"

1516

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

1443 -#: wt-status.c:1250

1518 +#: wt-status.c:1387

1519 msgid "Initial commit on "

1520 msgstr "初始提交于 "

1521

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

1448 -#: wt-status.c:1265

1523 +#: wt-status.c:1402

1524 msgid "behind "

1525 msgstr "落后 "

1526

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

1453 -#: wt-status.c:1268 wt-status.c:1271

1528 +#: wt-status.c:1405 wt-status.c:1408

1529 msgid "ahead "

1530 msgstr "领先 "

1531

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

1458 -#: wt-status.c:1273

1533 +#: wt-status.c:1410

1534 msgid ", behind "

1535 msgstr "，落后 "

1536

1462 -#: compat/precompose_utf8.c:58 builtin/clone.c:341

1537 +#: compat/precompose_utf8.c:58 builtin/clone.c:342

1538 #, c-format

1539 msgid "failed to unlink '%s'"

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

@@ -1473,7 +1548,7 @@ msgstr "git add [选项] [--] <路径匹配>..."

1548 msgid "unexpected diff status %c"

1549 msgstr "意外的差异状态 %c"

1550

1476 -#: builtin/add.c:68 builtin/commit.c:231

1551 +#: builtin/add.c:68 builtin/commit.c:233

1552 msgid "updating files failed"

1553 msgstr "更新文件失败"

1554

@@ -1528,9 +1603,9 @@ msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

1603 msgid "dry run"

1604 msgstr "演习"

1605

1531 -#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19

1532 -#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613

1533 -#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112

1606 +#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19

1607 +#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613

1608 +#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112

1609 msgid "be verbose"

1610 msgstr "冗长输出"

1611

@@ -1538,7 +1613,7 @@ msgstr "冗长输出"

1613 msgid "interactive picking"

1614 msgstr "交互式拣选"

1615

1541 -#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258

1616 +#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258

1617 msgid "select hunks interactively"

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

1619

@@ -1594,9 +1669,9 @@ msgstr "添加文件失败"

1669 #. * this is not the original behavior and can't be

1670 #. * changed until users trained themselves not to type

1671 #. * "git add -u" or "git add -A". For now, we warn and

1597 -#. * keep the old behavior. Later, this warning can be

1598 -#. * turned into a die(...), and eventually we may

1599 -#. * reallow the command with a new behavior.

1672 +#. * keep the old behavior. Later, the behavior can be changed

1673 +#. * to tree-wide, keeping the warning for a while, and

1674 +#. * eventually we can drop the warning.

1675 #.

1676 #: builtin/add.c:335

1677 #, c-format

@@ -1650,11 +1725,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

1726

1727 #: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204

1653 -#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235

1728 +#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

1729 msgid "index file corrupt"

1730 msgstr "索引文件损坏"

1731

1657 -#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370

1732 +#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1733 msgid "Unable to write new index file"

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

1735

@@ -1782,24 +1857,24 @@ msgstr "无法读取符号链接 %s"

1857 msgid "unable to open or read %s"

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

1859

1785 -#: builtin/apply.c:2684

1860 +#: builtin/apply.c:2688

1861 #, c-format

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

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

1864

1790 -#: builtin/apply.c:2802

1865 +#: builtin/apply.c:2806

1866 #, c-format

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

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

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

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

1871

1797 -#: builtin/apply.c:2814

1872 +#: builtin/apply.c:2818

1873 #, c-format

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

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

1876

1802 -#: builtin/apply.c:2820

1877 +#: builtin/apply.c:2824

1878 #, c-format

1879 msgid ""

1880 "while searching for:\n"

@@ -1808,318 +1883,318 @@ msgstr ""

1883 "当查询：\n"

1884 "%.*s"

1885

1811 -#: builtin/apply.c:2839

1886 +#: builtin/apply.c:2843

1887 #, c-format

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

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

1890

1816 -#: builtin/apply.c:2942

1891 +#: builtin/apply.c:2946

1892 #, c-format

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

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

1895

1821 -#: builtin/apply.c:2948

1896 +#: builtin/apply.c:2952

1897 #, c-format

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

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

1900

1826 -#: builtin/apply.c:2969

1901 +#: builtin/apply.c:2973

1902 #, c-format

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

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

1905

1831 -#: builtin/apply.c:3091

1906 +#: builtin/apply.c:3095

1907 #, c-format

1908 msgid "cannot checkout %s"

1909 msgstr "不能检出 %s"

1910

1836 -#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189

1911 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193

1912 #, c-format

1913 msgid "read of %s failed"

1914 msgstr "读取 %s 失败"

1915

1841 -#: builtin/apply.c:3169 builtin/apply.c:3391

1916 +#: builtin/apply.c:3173 builtin/apply.c:3395

1917 #, c-format

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

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

1920

1846 -#: builtin/apply.c:3250 builtin/apply.c:3405

1921 +#: builtin/apply.c:3254 builtin/apply.c:3409

1922 #, c-format

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

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

1925

1851 -#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419

1926 +#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423

1927 #, c-format

1928 msgid "%s: %s"

1929 msgstr "%s：%s"

1930

1856 -#: builtin/apply.c:3259 builtin/apply.c:3413

1931 +#: builtin/apply.c:3263 builtin/apply.c:3417

1932 #, c-format

1933 msgid "%s: does not match index"

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

1935

1861 -#: builtin/apply.c:3361

1936 +#: builtin/apply.c:3365

1937 msgid "removal patch leaves file contents"

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

1939

1865 -#: builtin/apply.c:3430

1940 +#: builtin/apply.c:3434

1941 #, c-format

1942 msgid "%s: wrong type"

1943 msgstr "%s：错误类型"

1944

1870 -#: builtin/apply.c:3432

1945 +#: builtin/apply.c:3436

1946 #, c-format

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

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

1949

1875 -#: builtin/apply.c:3533

1950 +#: builtin/apply.c:3537

1951 #, c-format

1952 msgid "%s: already exists in index"

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

1954

1880 -#: builtin/apply.c:3536

1955 +#: builtin/apply.c:3540

1956 #, c-format

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

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

1959

1885 -#: builtin/apply.c:3556

1960 +#: builtin/apply.c:3560

1961 #, c-format

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

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

1964

1890 -#: builtin/apply.c:3561

1965 +#: builtin/apply.c:3565

1966 #, c-format

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

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

1969

1895 -#: builtin/apply.c:3569

1970 +#: builtin/apply.c:3573

1971 #, c-format

1972 msgid "%s: patch does not apply"

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

1974

1900 -#: builtin/apply.c:3582

1975 +#: builtin/apply.c:3586

1976 #, c-format

1977 msgid "Checking patch %s..."

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

1979

1905 -#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124

1980 +#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124

1981 #, c-format

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

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

1984

1910 -#: builtin/apply.c:3818

1985 +#: builtin/apply.c:3822

1986 #, c-format

1987 msgid "unable to remove %s from index"

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

1989

1915 -#: builtin/apply.c:3846

1990 +#: builtin/apply.c:3850

1991 #, c-format

1992 msgid "corrupt patch for subproject %s"

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

1994

1920 -#: builtin/apply.c:3850

1995 +#: builtin/apply.c:3854

1996 #, c-format

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

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

1999

1925 -#: builtin/apply.c:3855

2000 +#: builtin/apply.c:3859

2001 #, c-format

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

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

2004

1930 -#: builtin/apply.c:3858 builtin/apply.c:3966

2005 +#: builtin/apply.c:3862 builtin/apply.c:3970

2006 #, c-format

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

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

2009

1935 -#: builtin/apply.c:3891

2010 +#: builtin/apply.c:3895

2011 #, c-format

2012 msgid "closing file '%s'"

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

2014

1940 -#: builtin/apply.c:3940

2015 +#: builtin/apply.c:3944

2016 #, c-format

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

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

2019

1945 -#: builtin/apply.c:4027

2020 +#: builtin/apply.c:4031

2021 #, c-format

2022 msgid "Applied patch %s cleanly."

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

2024

1950 -#: builtin/apply.c:4035

2025 +#: builtin/apply.c:4039

2026 msgid "internal error"

2027 msgstr "内部错误"

2028

2029 #. Say this even without --verbose

1955 -#: builtin/apply.c:4038

2030 +#: builtin/apply.c:4042

2031 #, c-format

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

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

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

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

2036

1962 -#: builtin/apply.c:4048

2037 +#: builtin/apply.c:4052

2038 #, c-format

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

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

2041

1967 -#: builtin/apply.c:4069

2042 +#: builtin/apply.c:4073

2043 #, c-format

2044 msgid "Hunk #%d applied cleanly."

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

2046

1972 -#: builtin/apply.c:4072

2047 +#: builtin/apply.c:4076

2048 #, c-format

2049 msgid "Rejected hunk #%d."

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

2051

1977 -#: builtin/apply.c:4222

2052 +#: builtin/apply.c:4226

2053 msgid "unrecognized input"

2054 msgstr "未能识别的输入"

2055

1981 -#: builtin/apply.c:4233

2056 +#: builtin/apply.c:4237

2057 msgid "unable to read index file"

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

2059

1985 -#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91

2060 +#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92

2061 #: builtin/fetch.c:63

2062 msgid "path"

2063 msgstr "路径"

2064

1990 -#: builtin/apply.c:4353

2065 +#: builtin/apply.c:4357

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

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

2068

1994 -#: builtin/apply.c:4356

2069 +#: builtin/apply.c:4360

2070 msgid "apply changes matching the given path"

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

2072

1998 -#: builtin/apply.c:4358

2073 +#: builtin/apply.c:4362

2074 msgid "num"

2075 msgstr "数字"

2076

2002 -#: builtin/apply.c:4359

2077 +#: builtin/apply.c:4363

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

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

2080

2006 -#: builtin/apply.c:4362

2081 +#: builtin/apply.c:4366

2082 msgid "ignore additions made by the patch"

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

2084

2010 -#: builtin/apply.c:4364

2085 +#: builtin/apply.c:4368

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

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

2088

2014 -#: builtin/apply.c:4368

2089 +#: builtin/apply.c:4372

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

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

2092

2018 -#: builtin/apply.c:4370

2093 +#: builtin/apply.c:4374

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

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

2096

2022 -#: builtin/apply.c:4372

2097 +#: builtin/apply.c:4376

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

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

2100

2026 -#: builtin/apply.c:4374

2101 +#: builtin/apply.c:4378

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

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

2104

2030 -#: builtin/apply.c:4376

2105 +#: builtin/apply.c:4380

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

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

2108

2034 -#: builtin/apply.c:4378

2109 +#: builtin/apply.c:4382

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

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

2112

2038 -#: builtin/apply.c:4380

2113 +#: builtin/apply.c:4384

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

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

2116

2042 -#: builtin/apply.c:4382

2117 +#: builtin/apply.c:4386

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

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

2120

2046 -#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463

2121 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463

2122 msgid "paths are separated with NUL character"

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

2124

2050 -#: builtin/apply.c:4387

2125 +#: builtin/apply.c:4391

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

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

2128

2054 -#: builtin/apply.c:4388

2129 +#: builtin/apply.c:4392

2130 msgid "action"

2131 msgstr "动作"

2132

2058 -#: builtin/apply.c:4389

2133 +#: builtin/apply.c:4393

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

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

2136

2062 -#: builtin/apply.c:4392 builtin/apply.c:4395

2137 +#: builtin/apply.c:4396 builtin/apply.c:4399

2138 msgid "ignore changes in whitespace when finding context"

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

2140

2066 -#: builtin/apply.c:4398

2141 +#: builtin/apply.c:4402

2142 msgid "apply the patch in reverse"

2143 msgstr "反向应用补丁"

2144

2070 -#: builtin/apply.c:4400

2145 +#: builtin/apply.c:4404

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

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

2148

2074 -#: builtin/apply.c:4402

2149 +#: builtin/apply.c:4406

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

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

2152

2078 -#: builtin/apply.c:4404

2153 +#: builtin/apply.c:4408

2154 msgid "allow overlapping hunks"

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

2156

2082 -#: builtin/apply.c:4407

2157 +#: builtin/apply.c:4411

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

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

2160

2086 -#: builtin/apply.c:4410

2161 +#: builtin/apply.c:4414

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

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

2164

2090 -#: builtin/apply.c:4412

2165 +#: builtin/apply.c:4416

2166 msgid "root"

2167 msgstr "根目录"

2168

2094 -#: builtin/apply.c:4413

2169 +#: builtin/apply.c:4417

2170 msgid "prepend <root> to all filenames"

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

2172

2098 -#: builtin/apply.c:4435

2173 +#: builtin/apply.c:4439

2174 msgid "--3way outside a repository"

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

2176

2102 -#: builtin/apply.c:4443

2177 +#: builtin/apply.c:4447

2178 msgid "--index outside a repository"

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

2180

2106 -#: builtin/apply.c:4446

2181 +#: builtin/apply.c:4450

2182 msgid "--cached outside a repository"

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

2184

2110 -#: builtin/apply.c:4462

2185 +#: builtin/apply.c:4466

2186 #, c-format

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

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

2189

2115 -#: builtin/apply.c:4476

2190 +#: builtin/apply.c:4480

2191 #, c-format

2192 msgid "squelched %d whitespace error"

2193 msgid_plural "squelched %d whitespace errors"

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

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

2196

2122 -#: builtin/apply.c:4482 builtin/apply.c:4492

2197 +#: builtin/apply.c:4486 builtin/apply.c:4496

2198 #, c-format

2199 msgid "%d line adds whitespace errors."

2200 msgid_plural "%d lines add whitespace errors."

@@ -2143,21 +2218,21 @@ msgstr "git archive：未提供远程URL"

2218 msgid "git archive: expected ACK/NAK, got EOF"

2219 msgstr "git archive：应为ACK/NACK，却得到EOF"

2220

2146 -#: builtin/archive.c:63

2221 +#: builtin/archive.c:61

2222 #, c-format

2223 msgid "git archive: NACK %s"

2224 msgstr "git archive：NACK %s"

2225

2151 -#: builtin/archive.c:65

2226 +#: builtin/archive.c:63

2227 #, c-format

2228 msgid "remote error: %s"

2229 msgstr "远程错误：%s"

2230

2156 -#: builtin/archive.c:66

2231 +#: builtin/archive.c:64

2232 msgid "git archive: protocol error"

2233 msgstr "git archive：协议错误"

2234

2160 -#: builtin/archive.c:71

2235 +#: builtin/archive.c:68

2236 msgid "git archive: expected a flush"

2237 msgstr "git archive：应为刷新"

2238

@@ -2273,24 +2348,24 @@ msgstr "n,m"

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

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

2350

2276 -#: builtin/branch.c:23

2351 +#: builtin/branch.c:24

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

2353 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"

2354

2280 -#: builtin/branch.c:24

2355 +#: builtin/branch.c:25

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

2357 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"

2358

2284 -#: builtin/branch.c:25

2359 +#: builtin/branch.c:26

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

2361 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."

2362

2288 -#: builtin/branch.c:26

2363 +#: builtin/branch.c:27

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

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

2366

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

2293 -#: builtin/branch.c:145

2368 +#: builtin/branch.c:146

2369 #, c-format

2370 msgid ""

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

@@ -2300,7 +2375,7 @@ msgstr ""

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

2376

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

2303 -#: builtin/branch.c:149

2378 +#: builtin/branch.c:150

2379 #, c-format

2380 msgid ""

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

@@ -2309,12 +2384,12 @@ msgstr ""

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

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

2386

2312 -#: builtin/branch.c:163

2387 +#: builtin/branch.c:164

2388 #, c-format

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

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

2391

2317 -#: builtin/branch.c:167

2392 +#: builtin/branch.c:168

2393 #, c-format

2394 msgid ""

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

@@ -2323,285 +2398,327 @@ msgstr ""

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

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

2400

2326 -#: builtin/branch.c:180

2401 +#: builtin/branch.c:181

2402 msgid "Update of config-file failed"

2403 msgstr "无法更新 config 文件"

2404

2330 -#: builtin/branch.c:208

2405 +#: builtin/branch.c:209

2406 msgid "cannot use -a with -d"

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

2408

2334 -#: builtin/branch.c:214

2409 +#: builtin/branch.c:215

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

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

2412

2338 -#: builtin/branch.c:222

2413 +#: builtin/branch.c:223

2414 #, c-format

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

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

2417

2343 -#: builtin/branch.c:235

2418 +#: builtin/branch.c:236

2419 #, c-format

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

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

2422

2348 -#: builtin/branch.c:236

2423 +#: builtin/branch.c:237

2424 #, c-format

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

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

2427

2353 -#: builtin/branch.c:250

2428 +#: builtin/branch.c:251

2429 #, c-format

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

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

2432

2358 -#: builtin/branch.c:251

2433 +#: builtin/branch.c:252

2434 #, c-format

2435 msgid "Error deleting branch '%s'"

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

2437

2363 -#: builtin/branch.c:258

2438 +#: builtin/branch.c:259

2439 #, c-format

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

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

2442

2368 -#: builtin/branch.c:259

2443 +#: builtin/branch.c:260

2444 #, c-format

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

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

2447

2373 -#: builtin/branch.c:361

2448 +#: builtin/branch.c:362

2449 #, c-format

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

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

2452

2378 -#: builtin/branch.c:433

2453 +#: builtin/branch.c:434

2454 #, c-format

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

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

2457

2383 -#: builtin/branch.c:435

2458 +#: builtin/branch.c:436

2459 #, c-format

2460 msgid "[behind %d]"

2461 msgstr "[落后 %d]"

2462

2388 -#: builtin/branch.c:439

2463 +#: builtin/branch.c:440

2464 #, c-format

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

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

2467

2393 -#: builtin/branch.c:441

2468 +#: builtin/branch.c:442

2469 #, c-format

2470 msgid "[ahead %d]"

2471 msgstr "[领先 %d]"

2472

2398 -#: builtin/branch.c:444

2473 +#: builtin/branch.c:445

2474 #, c-format

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

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

2477

2403 -#: builtin/branch.c:447

2478 +#: builtin/branch.c:448

2479 #, c-format

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

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

2482

2408 -#: builtin/branch.c:469

2483 +#: builtin/branch.c:470

2484 msgid " **** invalid ref ****"

2485 msgstr " **** 无效引用 ****"

2486

2412 -#: builtin/branch.c:560

2487 +#: builtin/branch.c:562

2488 +#, c-format

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

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

2491 +

2492 +#: builtin/branch.c:565

2493 +#, c-format

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

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

2496 +

2497 +#: builtin/branch.c:568

2498 +#, c-format

2499 +msgid "(detached from %s)"

2500 +msgstr "（分离自 %s）"

2501 +

2502 +#: builtin/branch.c:571

2503 msgid "(no branch)"

2504 msgstr "（非分支）"

2505

2416 -#: builtin/branch.c:593

2506 +#: builtin/branch.c:617

2507 #, c-format

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

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

2510

2421 -#: builtin/branch.c:625

2511 +#: builtin/branch.c:649

2512 msgid "some refs could not be read"

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

2514

2425 -#: builtin/branch.c:638

2515 +#: builtin/branch.c:662

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

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

2518

2429 -#: builtin/branch.c:648

2519 +#: builtin/branch.c:672

2520 #, c-format

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

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

2523

2434 -#: builtin/branch.c:663

2524 +#: builtin/branch.c:687

2525 msgid "Branch rename failed"

2526 msgstr "分支重命名失败"

2527

2438 -#: builtin/branch.c:667

2528 +#: builtin/branch.c:691

2529 #, c-format

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

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

2532

2443 -#: builtin/branch.c:671

2533 +#: builtin/branch.c:695

2534 #, c-format

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

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

2537

2448 -#: builtin/branch.c:678

2538 +#: builtin/branch.c:702

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

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

2541

2452 -#: builtin/branch.c:693

2542 +#: builtin/branch.c:717

2543 #, c-format

2544 msgid "malformed object name %s"

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

2546

2457 -#: builtin/branch.c:717

2547 +#: builtin/branch.c:741

2548 #, c-format

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

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

2551

2462 -#: builtin/branch.c:747

2552 +#: builtin/branch.c:771

2553 msgid "Generic options"

2554 msgstr "通用选项"

2555

2466 -#: builtin/branch.c:749

2556 +#: builtin/branch.c:773

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

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

2559

2470 -#: builtin/branch.c:750

2560 +#: builtin/branch.c:774

2561 msgid "suppress informational messages"

2562 msgstr "不显示信息"

2563

2474 -#: builtin/branch.c:751

2564 +#: builtin/branch.c:775

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

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

2567

2478 -#: builtin/branch.c:753

2568 +#: builtin/branch.c:777

2569 msgid "change upstream info"

2570 msgstr "改变上游信息"

2571

2482 -#: builtin/branch.c:757

2572 +#: builtin/branch.c:781

2573 msgid "use colored output"

2574 msgstr "使用彩色输出"

2575

2486 -#: builtin/branch.c:758

2576 +#: builtin/branch.c:782

2577 msgid "act on remote-tracking branches"

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

2579

2490 -#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2491 -#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367

2492 -#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468

2580 +#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812

2581 +#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369

2582 +#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2583 msgid "commit"

2584 msgstr "提交"

2585

2496 -#: builtin/branch.c:762 builtin/branch.c:768

2586 +#: builtin/branch.c:786 builtin/branch.c:792

2587 msgid "print only branches that contain the commit"

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

2589

2500 -#: builtin/branch.c:774

2590 +#: builtin/branch.c:798

2591 msgid "Specific git-branch actions:"

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

2593

2504 -#: builtin/branch.c:775

2594 +#: builtin/branch.c:799

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

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

2597

2508 -#: builtin/branch.c:777

2598 +#: builtin/branch.c:801

2599 msgid "delete fully merged branch"

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

2601

2512 -#: builtin/branch.c:778

2602 +#: builtin/branch.c:802

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

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

2605

2516 -#: builtin/branch.c:779

2606 +#: builtin/branch.c:803

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

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

2609

2520 -#: builtin/branch.c:780

2610 +#: builtin/branch.c:804

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

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

2613

2524 -#: builtin/branch.c:781

2614 +#: builtin/branch.c:805

2615 msgid "list branch names"

2616 msgstr "列出分支名"

2617

2528 -#: builtin/branch.c:782

2618 +#: builtin/branch.c:806

2619 msgid "create the branch's reflog"

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

2621

2532 -#: builtin/branch.c:784

2622 +#: builtin/branch.c:808

2623 msgid "edit the description for the branch"

2624 msgstr "标记分支的描述"

2625

2536 -#: builtin/branch.c:785

2626 +#: builtin/branch.c:809

2627 msgid "force creation (when already exists)"

2628 msgstr "强制创建（当已经存在）"

2629

2540 -#: builtin/branch.c:788

2630 +#: builtin/branch.c:812

2631 msgid "print only not merged branches"

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

2633

2544 -#: builtin/branch.c:794

2634 +#: builtin/branch.c:818

2635 msgid "print only merged branches"

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

2637

2548 -#: builtin/branch.c:798

2638 +#: builtin/branch.c:822

2639 msgid "list branches in columns"

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

2641

2552 -#: builtin/branch.c:811

2642 +#: builtin/branch.c:835

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

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

2645

2556 -#: builtin/branch.c:816 builtin/clone.c:561

2646 +#: builtin/branch.c:840 builtin/clone.c:609

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

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

2649

2560 -#: builtin/branch.c:839

2650 +#: builtin/branch.c:863

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

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

2653

2564 -#: builtin/branch.c:845

2654 +#: builtin/branch.c:869 builtin/branch.c:908

2655 msgid "branch name required"

2656 msgstr "必须提供分支名"

2657

2568 -#: builtin/branch.c:860

2658 +#: builtin/branch.c:884

2659 msgid "Cannot give description to detached HEAD"

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

2661

2572 -#: builtin/branch.c:865

2662 +#: builtin/branch.c:889

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

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

2665

2576 -#: builtin/branch.c:872

2666 +#: builtin/branch.c:896

2667 #, c-format

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

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

2670

2581 -#: builtin/branch.c:875

2671 +#: builtin/branch.c:899

2672 #, c-format

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

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

2675

2586 -#: builtin/branch.c:888

2676 +#: builtin/branch.c:914

2677 msgid "too many branches for a rename operation"

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

2679

2590 -#: builtin/branch.c:893

2680 +#: builtin/branch.c:919

2681 +msgid "too many branches to set new upstream"

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

2683 +

2684 +#: builtin/branch.c:923

2685 +#, c-format

2686 +msgid ""

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

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

2689 +

2690 +#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970

2691 +#, c-format

2692 +msgid "no such branch '%s'"

2693 +msgstr "没有此分支 '%s'"

2694 +

2695 +#: builtin/branch.c:930

2696 #, c-format

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

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

2699

2595 -#: builtin/branch.c:905

2700 +#: builtin/branch.c:942

2701 +msgid "too many branches to unset upstream"

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

2703 +

2704 +#: builtin/branch.c:946

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

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

2707 +

2708 +#: builtin/branch.c:952

2709 #, c-format

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

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

2712

2600 -#: builtin/branch.c:920

2713 +#: builtin/branch.c:967

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

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

2716 +

2717 +#: builtin/branch.c:973

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

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

2720

2604 -#: builtin/branch.c:923

2721 +#: builtin/branch.c:976

2722 #, c-format

2723 msgid ""

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

@@ -2609,7 +2726,7 @@ msgid ""

2726 msgstr ""

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

2728

2612 -#: builtin/branch.c:940

2729 +#: builtin/branch.c:993

2730 #, c-format

2731 msgid ""

2732 "\n"

@@ -2620,12 +2737,12 @@ msgstr ""

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

2738 "\n"

2739

2623 -#: builtin/branch.c:941

2740 +#: builtin/branch.c:994

2741 #, c-format

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

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

2744

2628 -#: builtin/branch.c:942

2745 +#: builtin/branch.c:995

2746 #, c-format

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

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

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

2824 msgid "input paths are terminated by a null character"

2825 msgstr "输入路径以null字符终止"

2826

2710 -#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177

2827 +#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177

2828 msgid "suppress progress reporting"

2829 msgstr "不显示进度报告"

2830

@@ -2829,61 +2946,61 @@ msgstr "'%s' 不能和 %s 同时使用"

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

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

2948

2832 -#: builtin/checkout.c:265 builtin/checkout.c:426

2949 +#: builtin/checkout.c:265 builtin/checkout.c:455

2950 msgid "corrupt index file"

2951 msgstr "损坏的索引文件"

2952

2836 -#: builtin/checkout.c:295 builtin/checkout.c:302

2953 +#: builtin/checkout.c:326 builtin/checkout.c:333

2954 #, c-format

2955 msgid "path '%s' is unmerged"

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

2957

2841 -#: builtin/checkout.c:448

2958 +#: builtin/checkout.c:477

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

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

2961

2845 -#: builtin/checkout.c:569

2962 +#: builtin/checkout.c:598

2963 #, c-format

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

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

2966

2850 -#: builtin/checkout.c:602

2967 +#: builtin/checkout.c:631

2968 msgid "HEAD is now at"

2969 msgstr "HEAD 目前位于"

2970

2854 -#: builtin/checkout.c:609

2971 +#: builtin/checkout.c:638

2972 #, c-format

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

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

2975

2859 -#: builtin/checkout.c:612

2976 +#: builtin/checkout.c:641

2977 #, c-format

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

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

2980

2864 -#: builtin/checkout.c:616

2981 +#: builtin/checkout.c:645

2982 #, c-format

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

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

2985

2869 -#: builtin/checkout.c:618 builtin/checkout.c:955

2986 +#: builtin/checkout.c:647 builtin/checkout.c:984

2987 #, c-format

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

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

2990

2874 -#: builtin/checkout.c:620

2991 +#: builtin/checkout.c:649

2992 #, c-format

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

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

2995

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

2880 -#: builtin/checkout.c:676

2997 +#: builtin/checkout.c:705

2998 #, c-format

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

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

3001

3002 #. The singular version

2886 -#: builtin/checkout.c:682

3003 +#: builtin/checkout.c:711

3004 #, c-format

3005 msgid ""

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

@@ -2904,7 +3021,7 @@ msgstr[1] ""

3021 "\n"

3022 "%s\n"

3023

2907 -#: builtin/checkout.c:700

3024 +#: builtin/checkout.c:729

3025 #, c-format

3026 msgid ""

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

@@ -2919,132 +3036,132 @@ msgstr ""

3036 " git branch new_branch_name %s\n"

3037 "\n"

3038

2922 -#: builtin/checkout.c:730

3039 +#: builtin/checkout.c:759

3040 msgid "internal error in revision walk"

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

3042

2926 -#: builtin/checkout.c:734

3043 +#: builtin/checkout.c:763

3044 msgid "Previous HEAD position was"

3045 msgstr "之前的 HEAD 位置是"

3046

2930 -#: builtin/checkout.c:761 builtin/checkout.c:950

3047 +#: builtin/checkout.c:790 builtin/checkout.c:979

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

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

3050

3051 #. case (1)

2935 -#: builtin/checkout.c:886

3052 +#: builtin/checkout.c:915

3053 #, c-format

3054 msgid "invalid reference: %s"

3055 msgstr "无效引用：%s"

3056

3057 #. case (1): want a tree

2941 -#: builtin/checkout.c:925

3058 +#: builtin/checkout.c:954

3059 #, c-format

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

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

3062

2946 -#: builtin/checkout.c:964

3063 +#: builtin/checkout.c:993

3064 msgid "paths cannot be used with switching branches"

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

3066

2950 -#: builtin/checkout.c:967 builtin/checkout.c:971

3067 +#: builtin/checkout.c:996 builtin/checkout.c:1000

3068 #, c-format

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

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

3071

2955 -#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983

2956 -#: builtin/checkout.c:986

3072 +#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012

3073 +#: builtin/checkout.c:1015

3074 #, c-format

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

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

3077

2961 -#: builtin/checkout.c:991

3078 +#: builtin/checkout.c:1020

3079 #, c-format

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

3081 msgstr "不能切换分支到一个非提交 '%s'"

3082

2966 -#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89

3083 +#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90

3084 #: builtin/remote.c:169 builtin/remote.c:171

3085 msgid "branch"

3086 msgstr "分支"

3087

2971 -#: builtin/checkout.c:1014

3088 +#: builtin/checkout.c:1043

3089 msgid "create and checkout a new branch"

3090 msgstr "创建并检出一个新的分支"

3091

2975 -#: builtin/checkout.c:1016

3092 +#: builtin/checkout.c:1045

3093 msgid "create/reset and checkout a branch"

3094 msgstr "创建/重置并检出一个分支"

3095

2979 -#: builtin/checkout.c:1017

3096 +#: builtin/checkout.c:1046

3097 msgid "create reflog for new branch"

3098 msgstr "为新的分支创建引用日志"

3099

2983 -#: builtin/checkout.c:1018

3100 +#: builtin/checkout.c:1047

3101 msgid "detach the HEAD at named commit"

3102 msgstr "成为指向该提交的分离头指针"

3103

2987 -#: builtin/checkout.c:1019

3104 +#: builtin/checkout.c:1048

3105 msgid "set upstream info for new branch"

3106 msgstr "为新的分支设置上游信息"

3107

2991 -#: builtin/checkout.c:1021

3108 +#: builtin/checkout.c:1050

3109 msgid "new branch"

3110 msgstr "新分支"

3111

2995 -#: builtin/checkout.c:1021

3112 +#: builtin/checkout.c:1050

3113 msgid "new unparented branch"

3114 msgstr "新的没有父提交的分支"

3115

2999 -#: builtin/checkout.c:1022

3116 +#: builtin/checkout.c:1051

3117 msgid "checkout our version for unmerged files"

3118 msgstr "对尚未合并的文件检出我们的版本"

3119

3003 -#: builtin/checkout.c:1024

3120 +#: builtin/checkout.c:1053

3121 msgid "checkout their version for unmerged files"

3122 msgstr "对尚未合并的文件检出他们的版本"

3123

3007 -#: builtin/checkout.c:1026

3124 +#: builtin/checkout.c:1055

3125 msgid "force checkout (throw away local modifications)"

3126 msgstr "强制检出（丢弃本地修改）"

3127

3011 -#: builtin/checkout.c:1027

3128 +#: builtin/checkout.c:1056

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

3130 msgstr "和新的分支执行三路合并"

3131

3015 -#: builtin/checkout.c:1028 builtin/merge.c:215

3132 +#: builtin/checkout.c:1057 builtin/merge.c:217

3133 msgid "update ignored files (default)"

3134 msgstr "更新忽略的文件（默认）"

3135

3019 -#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245

3136 +#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245

3137 msgid "style"

3138 msgstr "风格"

3139

3023 -#: builtin/checkout.c:1030

3140 +#: builtin/checkout.c:1059

3141 msgid "conflict style (merge or diff3)"

3142 msgstr "冲突输出风格（merge 或 diff3）"

3143

3027 -#: builtin/checkout.c:1033

3144 +#: builtin/checkout.c:1062

3145 msgid "second guess 'git checkout no-such-branch'"

3146 msgstr "再者猜测'git checkout no-such-branch'"

3147

3031 -#: builtin/checkout.c:1057

3148 +#: builtin/checkout.c:1086

3149 msgid "-b, -B and --orphan are mutually exclusive"

3150 msgstr "-b、-B 和 --orphan 是互斥的"

3151

3035 -#: builtin/checkout.c:1074

3152 +#: builtin/checkout.c:1103

3153 msgid "--track needs a branch name"

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

3155

3039 -#: builtin/checkout.c:1081

3156 +#: builtin/checkout.c:1110

3157 msgid "Missing branch name; try -b"

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

3159

3043 -#: builtin/checkout.c:1116

3160 +#: builtin/checkout.c:1145

3161 msgid "invalid path specification"

3162 msgstr "无效的路径规格"

3163

3047 -#: builtin/checkout.c:1123

3164 +#: builtin/checkout.c:1152

3165 #, c-format

3166 msgid ""

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

@@ -3053,12 +3170,12 @@ msgstr ""

3170 "不能同时更新路径并切换到分支'%s'。\n"

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

3172

3056 -#: builtin/checkout.c:1128

3173 +#: builtin/checkout.c:1157

3174 #, c-format

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

3176 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

3177

3061 -#: builtin/checkout.c:1132

3178 +#: builtin/checkout.c:1161

3179 msgid ""

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

3181 "checking out of the index."

@@ -3106,7 +3223,7 @@ msgstr "强制"

3223 msgid "remove whole directories"

3224 msgstr "删除整个目录"

3225

3109 -#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717

3226 +#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3227 #: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182

3228 msgid "pattern"

3229 msgstr "模式"

@@ -3140,215 +3257,233 @@ msgid ""

3257 msgstr ""

3258 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"

3259

3143 -#: builtin/clone.c:36

3260 +#: builtin/clone.c:37

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

3262 msgstr "git clone [选项] [--] <版本库> [<路径>]"

3263

3147 -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

3264 +#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214

3265 #: builtin/push.c:436

3266 msgid "force progress reporting"

3267 msgstr "强制显示进度报告"

3268

3152 -#: builtin/clone.c:66

3269 +#: builtin/clone.c:67

3270 msgid "don't create a checkout"

3271 msgstr "不创建一个检出"

3272

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

3273 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

3274 msgid "create a bare repository"

3275 msgstr "创建一个裸版本库"

3276

3160 -#: builtin/clone.c:72

3277 +#: builtin/clone.c:73

3278 msgid "create a mirror repository (implies bare)"

3279 msgstr "创建一个镜像版本库（也是裸版本库）"

3280

3164 -#: builtin/clone.c:74

3281 +#: builtin/clone.c:75

3282 msgid "to clone from a local repository"

3283 msgstr "从本地版本库克隆"

3284

3168 -#: builtin/clone.c:76

3285 +#: builtin/clone.c:77

3286 msgid "don't use local hardlinks, always copy"

3287 msgstr "不使用本地硬链接，始终复制"

3288

3172 -#: builtin/clone.c:78

3289 +#: builtin/clone.c:79

3290 msgid "setup as shared repository"

3291 msgstr "设置为共享版本库"

3292

3176 -#: builtin/clone.c:80 builtin/clone.c:82

3293 +#: builtin/clone.c:81 builtin/clone.c:83

3294 msgid "initialize submodules in the clone"

3295 msgstr "在克隆时初始化子模组"

3296

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

3297 +#: builtin/clone.c:84 builtin/init-db.c:485

3298 msgid "template-directory"

3299 msgstr "模板目录"

3300

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

3301 +#: builtin/clone.c:85 builtin/init-db.c:486

3302 msgid "directory from which templates will be used"

3303 msgstr "模板目录将被使用"

3304

3188 -#: builtin/clone.c:86

3305 +#: builtin/clone.c:87

3306 msgid "reference repository"

3307 msgstr "引用版本库"

3308

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

3309 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

3310 msgid "name"

3311 msgstr "名称"

3312

3196 -#: builtin/clone.c:88

3313 +#: builtin/clone.c:89

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

3315 msgstr "使用<名称>而不是 'origin' 去跟踪上游"

3316

3200 -#: builtin/clone.c:90

3317 +#: builtin/clone.c:91

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

3319 msgstr "检出<分支>而不是远程HEAD"

3320

3204 -#: builtin/clone.c:92

3321 +#: builtin/clone.c:93

3322 msgid "path to git-upload-pack on the remote"

3323 msgstr "远程 git-upload-pack 路径"

3324

3208 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662

3325 +#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662

3326 msgid "depth"

3327 msgstr "深度"

3328

3212 -#: builtin/clone.c:94

3329 +#: builtin/clone.c:95

3330 msgid "create a shallow clone of that depth"

3331 msgstr "创建一个指定深度的浅克隆"

3332

3216 -#: builtin/clone.c:96

3333 +#: builtin/clone.c:97

3334 msgid "clone only one branch, HEAD or --branch"

3335 msgstr "只克隆一个分支、HEAD 或 --branch"

3336

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

3337 +#: builtin/clone.c:98 builtin/init-db.c:494

3338 msgid "gitdir"

3339 msgstr "git目录"

3340

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

3341 +#: builtin/clone.c:99 builtin/init-db.c:495

3342 msgid "separate git dir from working tree"

3343 msgstr "git目录和工作区分离"

3344

3228 -#: builtin/clone.c:99

3345 +#: builtin/clone.c:100

3346 msgid "key=value"

3347 msgstr "key=value"

3348

3232 -#: builtin/clone.c:100

3349 +#: builtin/clone.c:101

3350 msgid "set config inside the new repository"

3351 msgstr "在新版本库中设置配置信息"

3352

3236 -#: builtin/clone.c:243

3353 +#: builtin/clone.c:244

3354 #, c-format

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

3356 msgstr "引用版本库 '%s' 不是一个本地目录。"

3357

3241 -#: builtin/clone.c:306

3358 +#: builtin/clone.c:307

3359 #, c-format

3360 msgid "failed to create directory '%s'"

3361 msgstr "无法创建目录 '%s'"

3362

3246 -#: builtin/clone.c:308 builtin/diff.c:77

3363 +#: builtin/clone.c:309 builtin/diff.c:77

3364 #, c-format

3365 msgid "failed to stat '%s'"

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

3367

3251 -#: builtin/clone.c:310

3368 +#: builtin/clone.c:311

3369 #, c-format

3370 msgid "%s exists and is not a directory"

3371 msgstr "%s 存在且不是一个目录"

3372

3256 -#: builtin/clone.c:324

3373 +#: builtin/clone.c:325

3374 #, c-format

3375 msgid "failed to stat %s\n"

3376 msgstr "无法枚举 %s 状态\n"

3377

3261 -#: builtin/clone.c:346

3378 +#: builtin/clone.c:347

3379 #, c-format

3380 msgid "failed to create link '%s'"

3381 msgstr "无法创建链接 '%s'"

3382

3266 -#: builtin/clone.c:350

3383 +#: builtin/clone.c:351

3384 #, c-format

3385 msgid "failed to copy file to '%s'"

3386 msgstr "无法拷贝文件至 '%s'"

3387

3271 -#: builtin/clone.c:373

3388 +#: builtin/clone.c:374

3389 #, c-format

3390 msgid "done.\n"

3391 msgstr "完成。\n"

3392

3276 -#: builtin/clone.c:443

3393 +#: builtin/clone.c:387

3394 +msgid ""

3395 +"Clone succeeded, but checkout failed.\n"

3396 +"You can inspect what was checked out with 'git status'\n"

3397 +"and retry the checkout with 'git checkout -f HEAD'\n"

3398 +msgstr ""

3399 +"克隆成功，但是检出失败。\n"

3400 +"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

3401 +"'git checkout -f HEAD' 重试\n"

3402 +

3403 +#: builtin/clone.c:466

3404 #, c-format

3405 msgid "Could not find remote branch %s to clone."

3406 msgstr "不能发现要克隆的远程分支 %s。"

3407

3281 -#: builtin/clone.c:552

3408 +#: builtin/clone.c:540

3409 +msgid "remote did not send all necessary objects"

3410 +msgstr "远程没有发送所有必须的对象"

3411 +

3412 +#: builtin/clone.c:600

3413 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3414 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

3415

3285 -#: builtin/clone.c:690

3416 +#: builtin/clone.c:631

3417 +msgid "unable to checkout working tree"

3418 +msgstr "不能检出工作区"

3419 +

3420 +#: builtin/clone.c:739

3421 msgid "Too many arguments."

3422 msgstr "太多参数。"

3423

3289 -#: builtin/clone.c:694

3424 +#: builtin/clone.c:743

3425 msgid "You must specify a repository to clone."

3426 msgstr "您必须指定一个版本库来克隆。"

3427

3293 -#: builtin/clone.c:705

3428 +#: builtin/clone.c:754

3429 #, c-format

3430 msgid "--bare and --origin %s options are incompatible."

3431 msgstr "--bare 和 --origin %s 选项不兼容。"

3432

3298 -#: builtin/clone.c:708

3433 +#: builtin/clone.c:757

3434 msgid "--bare and --separate-git-dir are incompatible."

3435 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

3436

3302 -#: builtin/clone.c:721

3437 +#: builtin/clone.c:770

3438 #, c-format

3439 msgid "repository '%s' does not exist"

3440 msgstr "版本库 '%s' 不存在"

3441

3307 -#: builtin/clone.c:726

3442 +#: builtin/clone.c:775

3443 msgid "--depth is ignored in local clones; use file:// instead."

3444 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

3445

3311 -#: builtin/clone.c:736

3446 +#: builtin/clone.c:785

3447 #, c-format

3448 msgid "destination path '%s' already exists and is not an empty directory."

3449 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

3450

3316 -#: builtin/clone.c:746

3451 +#: builtin/clone.c:795

3452 #, c-format

3453 msgid "working tree '%s' already exists."

3454 msgstr "工作区 '%s' 已经存在。"

3455

3321 -#: builtin/clone.c:759 builtin/clone.c:771

3456 +#: builtin/clone.c:808 builtin/clone.c:820

3457 #, c-format

3458 msgid "could not create leading directories of '%s'"

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

3460

3326 -#: builtin/clone.c:762

3461 +#: builtin/clone.c:811

3462 #, c-format

3463 msgid "could not create work tree dir '%s'."

3464 msgstr "不能为 '%s' 创建工作区目录。"

3465

3331 -#: builtin/clone.c:781

3466 +#: builtin/clone.c:830

3467 #, c-format

3468 msgid "Cloning into bare repository '%s'...\n"

3469 msgstr "克隆到裸版本库 '%s'...\n"

3470

3336 -#: builtin/clone.c:783

3471 +#: builtin/clone.c:832

3472 #, c-format

3473 msgid "Cloning into '%s'...\n"

3474 msgstr "正克隆到 '%s'...\n"

3475

3341 -#: builtin/clone.c:818

3476 +#: builtin/clone.c:867

3477 #, c-format

3478 msgid "Don't know how to clone %s"

3479 msgstr "不知道如何克隆 %s"

3480

3346 -#: builtin/clone.c:867

3481 +#: builtin/clone.c:916

3482 #, c-format

3483 msgid "Remote branch %s not found in upstream %s"

3484 msgstr "远程分支 %s 在上游 %s 未发现"

3485

3351 -#: builtin/clone.c:874

3486 +#: builtin/clone.c:923

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

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

3489

@@ -3440,93 +3575,93 @@ msgstr ""

3575 "\n"

3576 "否则，请使用命令 'git reset'\n"

3577

3443 -#: builtin/commit.c:258

3578 +#: builtin/commit.c:260

3579 msgid "failed to unpack HEAD tree object"

3580 msgstr "无法解包 HEAD 树对象"

3581

3447 -#: builtin/commit.c:300

3582 +#: builtin/commit.c:302

3583 msgid "unable to create temporary index"

3584 msgstr "不能创建临时索引"

3585

3451 -#: builtin/commit.c:306

3586 +#: builtin/commit.c:308

3587 msgid "interactive add failed"

3588 msgstr "交互式添加失败"

3589

3455 -#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410

3590 +#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412

3591 msgid "unable to write new_index file"

3592 msgstr "无法写 new_index 文件"

3593

3459 -#: builtin/commit.c:391

3594 +#: builtin/commit.c:393

3595 msgid "cannot do a partial commit during a merge."

3596 msgstr "在合并过程中不能做部分提交。"

3597

3463 -#: builtin/commit.c:393

3598 +#: builtin/commit.c:395

3599 msgid "cannot do a partial commit during a cherry-pick."

3600 msgstr "在拣选过程中不能做部分提交。"

3601

3467 -#: builtin/commit.c:403

3602 +#: builtin/commit.c:405

3603 msgid "cannot read the index"

3604 msgstr "无法读取索引"

3605

3471 -#: builtin/commit.c:423

3606 +#: builtin/commit.c:425

3607 msgid "unable to write temporary index file"

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

3609

3475 -#: builtin/commit.c:511 builtin/commit.c:517

3610 +#: builtin/commit.c:513 builtin/commit.c:519

3611 #, c-format

3612 msgid "invalid commit: %s"

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

3614

3480 -#: builtin/commit.c:540

3615 +#: builtin/commit.c:542

3616 msgid "malformed --author parameter"

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

3618

3484 -#: builtin/commit.c:560

3619 +#: builtin/commit.c:562

3620 #, c-format

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

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

3623

3489 -#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954

3624 +#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956

3625 #, c-format

3626 msgid "could not lookup commit %s"

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

3628

3494 -#: builtin/commit.c:610 builtin/shortlog.c:272

3629 +#: builtin/commit.c:612 builtin/shortlog.c:272

3630 #, c-format

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

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

3633

3499 -#: builtin/commit.c:612

3634 +#: builtin/commit.c:614

3635 msgid "could not read log from standard input"

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

3637

3503 -#: builtin/commit.c:616

3638 +#: builtin/commit.c:618

3639 #, c-format

3640 msgid "could not read log file '%s'"

3641 msgstr "不能读取日志文件 '%s'"

3642

3508 -#: builtin/commit.c:622

3643 +#: builtin/commit.c:624

3644 msgid "commit has empty message"

3645 msgstr "提交说明为空"

3646

3512 -#: builtin/commit.c:638

3647 +#: builtin/commit.c:640

3648 msgid "could not read MERGE_MSG"

3649 msgstr "不能读取 MERGE_MSG"

3650

3516 -#: builtin/commit.c:642

3651 +#: builtin/commit.c:644

3652 msgid "could not read SQUASH_MSG"

3653 msgstr "不能读取 SQUASH_MSG"

3654

3520 -#: builtin/commit.c:646

3655 +#: builtin/commit.c:648

3656 #, c-format

3657 msgid "could not read '%s'"

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

3659

3525 -#: builtin/commit.c:707

3660 +#: builtin/commit.c:709

3661 msgid "could not write commit template"

3662 msgstr "不能写提交模版"

3663

3529 -#: builtin/commit.c:718

3664 +#: builtin/commit.c:720

3665 #, c-format

3666 msgid ""

3667 "\n"

@@ -3540,7 +3675,7 @@ msgstr ""

3675 "\t%s\n"

3676 "然后重试。\n"

3677

3543 -#: builtin/commit.c:723

3678 +#: builtin/commit.c:725

3679 #, c-format

3680 msgid ""

3681 "\n"

@@ -3554,7 +3689,7 @@ msgstr ""

3689 "\t%s\n"

3690 "然后重试。\n"

3691

3557 -#: builtin/commit.c:735

3692 +#: builtin/commit.c:737

3693 #, c-format

3694 msgid ""

3695 "Please enter the commit message for your changes. Lines starting\n"

@@ -3563,7 +3698,7 @@ msgstr ""

3698 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

3699 "说明将会终止提交。\n"

3700

3566 -#: builtin/commit.c:740

3701 +#: builtin/commit.c:742

3702 #, c-format

3703 msgid ""

3704 "Please enter the commit message for your changes. Lines starting\n"

@@ -3574,355 +3709,355 @@ msgstr ""

3709 "也可以删除它们。一个空的提交说明将会终止提交。\n"

3710

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

3577 -#: builtin/commit.c:753

3712 +#: builtin/commit.c:755

3713 #, c-format

3714 msgid "%sAuthor: %s"

3715 msgstr "%s作者： %s"

3716

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

3583 -#: builtin/commit.c:760

3718 +#: builtin/commit.c:762

3719 #, c-format

3720 msgid "%sCommitter: %s"

3721 msgstr "%s提交者： %s"

3722

3588 -#: builtin/commit.c:780

3723 +#: builtin/commit.c:782

3724 msgid "Cannot read index"

3725 msgstr "无法读取索引"

3726

3592 -#: builtin/commit.c:817

3727 +#: builtin/commit.c:819

3728 msgid "Error building trees"

3729 msgstr "无法创建树对象"

3730

3596 -#: builtin/commit.c:832 builtin/tag.c:359

3731 +#: builtin/commit.c:834 builtin/tag.c:359

3732 #, c-format

3733 msgid "Please supply the message using either -m or -F option.\n"

3734 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

3735

3601 -#: builtin/commit.c:929

3736 +#: builtin/commit.c:931

3737 #, c-format

3738 msgid "No existing author found with '%s'"

3739 msgstr "没有找到匹配 '%s' 的作者"

3740

3606 -#: builtin/commit.c:944 builtin/commit.c:1138

3741 +#: builtin/commit.c:946 builtin/commit.c:1140

3742 #, c-format

3743 msgid "Invalid untracked files mode '%s'"

3744 msgstr "无效的未追踪文件参数 '%s'"

3745

3611 -#: builtin/commit.c:974

3746 +#: builtin/commit.c:976

3747 msgid "Using both --reset-author and --author does not make sense"

3748 msgstr "同时使用 --reset-author 和 --author 没有意义"

3749

3615 -#: builtin/commit.c:985

3750 +#: builtin/commit.c:987

3751 msgid "You have nothing to amend."

3752 msgstr "您没有可修补的提交。"

3753

3619 -#: builtin/commit.c:988

3754 +#: builtin/commit.c:990

3755 msgid "You are in the middle of a merge -- cannot amend."

3756 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

3757

3623 -#: builtin/commit.c:990

3758 +#: builtin/commit.c:992

3759 msgid "You are in the middle of a cherry-pick -- cannot amend."

3760 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

3761

3627 -#: builtin/commit.c:993

3762 +#: builtin/commit.c:995

3763 msgid "Options --squash and --fixup cannot be used together"

3764 msgstr "选项 --squash 和 --fixup 不能同时使用"

3765

3631 -#: builtin/commit.c:1003

3766 +#: builtin/commit.c:1005

3767 msgid "Only one of -c/-C/-F/--fixup can be used."

3768 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

3769

3635 -#: builtin/commit.c:1005

3770 +#: builtin/commit.c:1007

3771 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

3772 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

3773

3639 -#: builtin/commit.c:1013

3774 +#: builtin/commit.c:1015

3775 msgid "--reset-author can be used only with -C, -c or --amend."

3776 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

3777

3643 -#: builtin/commit.c:1030

3778 +#: builtin/commit.c:1032

3779 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

3780 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

3781

3647 -#: builtin/commit.c:1032

3782 +#: builtin/commit.c:1034

3783 msgid "No paths with --include/--only does not make sense."

3784 msgstr "参数 --include/--only 不跟路径没有意义。"

3785

3651 -#: builtin/commit.c:1034

3786 +#: builtin/commit.c:1036

3787 msgid "Clever... amending the last one with dirty index."

3788 msgstr "聪明... 在索引不干净下修补最后的提交。"

3789

3655 -#: builtin/commit.c:1036

3790 +#: builtin/commit.c:1038

3791 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

3792 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

3793

3659 -#: builtin/commit.c:1046 builtin/tag.c:575

3794 +#: builtin/commit.c:1048 builtin/tag.c:575

3795 #, c-format

3796 msgid "Invalid cleanup mode %s"

3797 msgstr "无效的清理模式 %s"

3798

3664 -#: builtin/commit.c:1051

3799 +#: builtin/commit.c:1053

3800 msgid "Paths with -a does not make sense."

3801 msgstr "路径和 -a 选项同时使用没有意义。"

3802

3668 -#: builtin/commit.c:1057 builtin/commit.c:1192

3803 +#: builtin/commit.c:1059 builtin/commit.c:1194

3804 msgid "--long and -z are incompatible"

3805 msgstr "--long 和 -z 选项不兼容"

3806

3672 -#: builtin/commit.c:1152 builtin/commit.c:1388

3807 +#: builtin/commit.c:1154 builtin/commit.c:1390

3808 msgid "show status concisely"

3809 msgstr "以简洁的格式显示状态"

3810

3676 -#: builtin/commit.c:1154 builtin/commit.c:1390

3811 +#: builtin/commit.c:1156 builtin/commit.c:1392

3812 msgid "show branch information"

3813 msgstr "显示分支信息"

3814

3680 -#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426

3815 +#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426

3816 msgid "machine-readable output"

3817 msgstr "机器可读的输出"

3818

3684 -#: builtin/commit.c:1159 builtin/commit.c:1394

3819 +#: builtin/commit.c:1161 builtin/commit.c:1396

3820 msgid "show status in long format (default)"

3821 msgstr "以长格式显示状态（默认）"

3822

3688 -#: builtin/commit.c:1162 builtin/commit.c:1397

3823 +#: builtin/commit.c:1164 builtin/commit.c:1399

3824 msgid "terminate entries with NUL"

3825 msgstr "条目以NUL字符结尾"

3826

3692 -#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647

3693 -#: builtin/fast-export.c:650 builtin/tag.c:459

3827 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653

3828 +#: builtin/fast-export.c:656 builtin/tag.c:459

3829 msgid "mode"

3830 msgstr "模式"

3831

3697 -#: builtin/commit.c:1165 builtin/commit.c:1400

3832 +#: builtin/commit.c:1167 builtin/commit.c:1402

3833 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3834 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

3835

3701 -#: builtin/commit.c:1168

3836 +#: builtin/commit.c:1170

3837 msgid "show ignored files"

3838 msgstr "显示忽略的文件"

3839

3705 -#: builtin/commit.c:1169 parse-options.h:151

3840 +#: builtin/commit.c:1171 parse-options.h:151

3841 msgid "when"

3842 msgstr "何时"

3843

3709 -#: builtin/commit.c:1170

3844 +#: builtin/commit.c:1172

3845 msgid ""

3846 "ignore changes to submodules, optional when: all, dirty, untracked. "

3847 "(Default: all)"

3848 msgstr ""

3849 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

3850

3716 -#: builtin/commit.c:1172

3851 +#: builtin/commit.c:1174

3852 msgid "list untracked files in columns"

3853 msgstr "以列的方式显示未跟踪的文件"

3854

3720 -#: builtin/commit.c:1246

3855 +#: builtin/commit.c:1248

3856 msgid "couldn't look up newly created commit"

3857 msgstr "无法找到新创建的提交"

3858

3724 -#: builtin/commit.c:1248

3859 +#: builtin/commit.c:1250

3860 msgid "could not parse newly created commit"

3861 msgstr "不能解析新创建的提交"

3862

3728 -#: builtin/commit.c:1289

3863 +#: builtin/commit.c:1291

3864 msgid "detached HEAD"

3865 msgstr "分离头指针"

3866

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

3733 -#: builtin/commit.c:1291

3868 +#: builtin/commit.c:1293

3869 msgid " (root-commit)"

3870 msgstr "（根提交）"

3871

3737 -#: builtin/commit.c:1358

3872 +#: builtin/commit.c:1360

3873 msgid "suppress summary after successful commit"

3874 msgstr "提交成功后不显示概述信息"

3875

3741 -#: builtin/commit.c:1359

3876 +#: builtin/commit.c:1361

3877 msgid "show diff in commit message template"

3878 msgstr "在提交说明模板里显示差异"

3879

3745 -#: builtin/commit.c:1361

3880 +#: builtin/commit.c:1363

3881 msgid "Commit message options"

3882 msgstr "提交说明选项"

3883

3749 -#: builtin/commit.c:1362 builtin/tag.c:457

3884 +#: builtin/commit.c:1364 builtin/tag.c:457

3885 msgid "read message from file"

3886 msgstr "从文件中读取提交说明"

3887

3753 -#: builtin/commit.c:1363

3888 +#: builtin/commit.c:1365

3889 msgid "author"

3890 msgstr "作者"

3891

3757 -#: builtin/commit.c:1363

3892 +#: builtin/commit.c:1365

3893 msgid "override author for commit"

3894 msgstr "提交时覆盖作者"

3895

3761 -#: builtin/commit.c:1364 builtin/gc.c:178

3896 +#: builtin/commit.c:1366 builtin/gc.c:178

3897 msgid "date"

3898 msgstr "日期"

3899

3765 -#: builtin/commit.c:1364

3900 +#: builtin/commit.c:1366

3901 msgid "override date for commit"

3902 msgstr "提交时覆盖日期"

3903

3769 -#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533

3904 +#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533

3905 #: builtin/notes.c:690 builtin/tag.c:455

3906 msgid "message"

3907 msgstr "说明"

3908

3774 -#: builtin/commit.c:1365

3909 +#: builtin/commit.c:1367

3910 msgid "commit message"

3911 msgstr "提交说明"

3912

3778 -#: builtin/commit.c:1366

3913 +#: builtin/commit.c:1368

3914 msgid "reuse and edit message from specified commit"

3915 msgstr "重用并编辑指定提交的提交说明"

3916

3782 -#: builtin/commit.c:1367

3917 +#: builtin/commit.c:1369

3918 msgid "reuse message from specified commit"

3919 msgstr "重用指定提交的提交说明"

3920

3786 -#: builtin/commit.c:1368

3921 +#: builtin/commit.c:1370

3922 msgid "use autosquash formatted message to fixup specified commit"

3923 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

3924

3790 -#: builtin/commit.c:1369

3925 +#: builtin/commit.c:1371

3926 msgid "use autosquash formatted message to squash specified commit"

3927 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

3928

3794 -#: builtin/commit.c:1370

3929 +#: builtin/commit.c:1372

3930 msgid "the commit is authored by me now (used with -C/-c/--amend)"

3931 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

3932

3798 -#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109

3933 +#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109

3934 msgid "add Signed-off-by:"

3935 msgstr "添加 Signed-off-by: 签名"

3936

3802 -#: builtin/commit.c:1372

3937 +#: builtin/commit.c:1374

3938 msgid "use specified template file"

3939 msgstr "使用指定的模板文件"

3940

3806 -#: builtin/commit.c:1373

3941 +#: builtin/commit.c:1375

3942 msgid "force edit of commit"

3943 msgstr "强制编辑提交"

3944

3945 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

3811 -#: builtin/commit.c:1374

3946 +#: builtin/commit.c:1376

3947 msgid "default"

3948 msgstr "default"

3949

3815 -#: builtin/commit.c:1374 builtin/tag.c:460

3950 +#: builtin/commit.c:1376 builtin/tag.c:460

3951 msgid "how to strip spaces and #comments from message"

3952 msgstr "设置如何删除提交说明里的空格和#注释"

3953

3819 -#: builtin/commit.c:1375

3954 +#: builtin/commit.c:1377

3955 msgid "include status in commit message template"

3956 msgstr "在提交说明模板里包含状态信息"

3957

3823 -#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461

3958 +#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461

3959 msgid "key id"

3960 msgstr "key id"

3961

3827 -#: builtin/commit.c:1377 builtin/merge.c:214

3962 +#: builtin/commit.c:1379 builtin/merge.c:216

3963 msgid "GPG sign commit"

3964 msgstr "GPG 提交签名"

3965

3966 #. end commit message options

3832 -#: builtin/commit.c:1380

3967 +#: builtin/commit.c:1382

3968 msgid "Commit contents options"

3969 msgstr "提交内容选项"

3970

3836 -#: builtin/commit.c:1381

3971 +#: builtin/commit.c:1383

3972 msgid "commit all changed files"

3973 msgstr "提交所有改动的文件"

3974

3840 -#: builtin/commit.c:1382

3975 +#: builtin/commit.c:1384

3976 msgid "add specified files to index for commit"

3977 msgstr "添加指定的文件到索引区等待提交"

3978

3844 -#: builtin/commit.c:1383

3979 +#: builtin/commit.c:1385

3980 msgid "interactively add files"

3981 msgstr "交互式添加文件"

3982

3848 -#: builtin/commit.c:1384

3983 +#: builtin/commit.c:1386

3984 msgid "interactively add changes"

3985 msgstr "交互式添加变更"

3986

3852 -#: builtin/commit.c:1385

3987 +#: builtin/commit.c:1387

3988 msgid "commit only specified files"

3989 msgstr "只提交指定的文件"

3990

3856 -#: builtin/commit.c:1386

3991 +#: builtin/commit.c:1388

3992 msgid "bypass pre-commit hook"

3993 msgstr "绕过 pre-commit 钩子"

3994

3860 -#: builtin/commit.c:1387

3995 +#: builtin/commit.c:1389

3996 msgid "show what would be committed"

3997 msgstr "显示将要提交的内容"

3998

3864 -#: builtin/commit.c:1398

3999 +#: builtin/commit.c:1400

4000 msgid "amend previous commit"

4001 msgstr "修改先前的提交"

4002

3868 -#: builtin/commit.c:1399

4003 +#: builtin/commit.c:1401

4004 msgid "bypass post-rewrite hook"

4005 msgstr "绕过 post-rewrite 钩子"

4006

3872 -#: builtin/commit.c:1404

4007 +#: builtin/commit.c:1406

4008 msgid "ok to record an empty change"

4009 msgstr "允许一个空提交"

4010

3876 -#: builtin/commit.c:1407

4011 +#: builtin/commit.c:1409

4012 msgid "ok to record a change with an empty message"

4013 msgstr "允许空的提交说明"

4014

3880 -#: builtin/commit.c:1439

4015 +#: builtin/commit.c:1441

4016 msgid "could not parse HEAD commit"

4017 msgstr "不能解析 HEAD 提交"

4018

3884 -#: builtin/commit.c:1477 builtin/merge.c:508

4019 +#: builtin/commit.c:1479 builtin/merge.c:510

4020 #, c-format

4021 msgid "could not open '%s' for reading"

4022 msgstr "不能为读入打开 '%s'"

4023

3889 -#: builtin/commit.c:1484

4024 +#: builtin/commit.c:1486

4025 #, c-format

4026 msgid "Corrupt MERGE_HEAD file (%s)"

4027 msgstr "损坏的 MERGE_HEAD 文件（%s）"

4028

3894 -#: builtin/commit.c:1491

4029 +#: builtin/commit.c:1493

4030 msgid "could not read MERGE_MODE"

4031 msgstr "不能读取 MERGE_MODE"

4032

3898 -#: builtin/commit.c:1510

4033 +#: builtin/commit.c:1512

4034 #, c-format

4035 msgid "could not read commit message: %s"

4036 msgstr "不能读取提交说明：%s"

4037

3903 -#: builtin/commit.c:1524

4038 +#: builtin/commit.c:1526

4039 #, c-format

4040 msgid "Aborting commit; you did not edit the message.\n"

4041 msgstr "终止提交；您未更改来自模版的提交说明。\n"

4042

3908 -#: builtin/commit.c:1529

4043 +#: builtin/commit.c:1531

4044 #, c-format

4045 msgid "Aborting commit due to empty commit message.\n"

4046 msgstr "终止提交因为提交说明为空。\n"

4047

3913 -#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857

4048 +#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872

4049 msgid "failed to write commit object"

4050 msgstr "无法写提交对象"

4051

3917 -#: builtin/commit.c:1565

4052 +#: builtin/commit.c:1567

4053 msgid "cannot lock HEAD ref"

4054 msgstr "无法锁定 HEAD 引用"

4055

3921 -#: builtin/commit.c:1569

4056 +#: builtin/commit.c:1571

4057 msgid "cannot update HEAD ref"

4058 msgstr "无法更新 HEAD 引用"

4059

3925 -#: builtin/commit.c:1580

4060 +#: builtin/commit.c:1582

4061 msgid ""

4062 "Repository has been updated, but unable to write\n"

4063 "new_index file. Check that disk is not full or quota is\n"

@@ -4047,7 +4182,7 @@ msgstr "终止值是NUL字节"

4182 msgid "respect include directives on lookup"

4183 msgstr "查询时参照 include 指令递归查找"

4184

4050 -#: builtin/count-objects.c:69

4185 +#: builtin/count-objects.c:82

4186 msgid "git count-objects [-v]"

4187 msgstr "git count-objects [-v]"

4188

@@ -4059,47 +4194,47 @@ msgstr "git describe [选项] <提交号>*"

4194 msgid "git describe [options] --dirty"

4195 msgstr "git describe [选项] --dirty"

4196

4062 -#: builtin/describe.c:234

4197 +#: builtin/describe.c:233

4198 #, c-format

4199 msgid "annotated tag %s not available"

4200 msgstr "注释 tag %s 无效"

4201

4067 -#: builtin/describe.c:238

4202 +#: builtin/describe.c:237

4203 #, c-format

4204 msgid "annotated tag %s has no embedded name"

4205 msgstr "注释 tag %s 没有嵌入名称"

4206

4072 -#: builtin/describe.c:240

4207 +#: builtin/describe.c:239

4208 #, c-format

4209 msgid "tag '%s' is really '%s' here"

4210 msgstr "tag '%s' 的确是在 '%s'"

4211

4077 -#: builtin/describe.c:267

4212 +#: builtin/describe.c:266

4213 #, c-format

4214 msgid "Not a valid object name %s"

4215 msgstr "不是一个有效的对象名 %s"

4216

4082 -#: builtin/describe.c:270

4217 +#: builtin/describe.c:269

4218 #, c-format

4219 msgid "%s is not a valid '%s' object"

4220 msgstr "%s 不是一个有效的 '%s' 对象"

4221

4087 -#: builtin/describe.c:287

4222 +#: builtin/describe.c:286

4223 #, c-format

4224 msgid "no tag exactly matches '%s'"

4225 msgstr "没有 tag 准确匹配 '%s'"

4226

4092 -#: builtin/describe.c:289

4227 +#: builtin/describe.c:288

4228 #, c-format

4229 msgid "searching to describe %s\n"

4230 msgstr "搜索描述 %s\n"

4231

4097 -#: builtin/describe.c:329

4232 +#: builtin/describe.c:328

4233 #, c-format

4234 msgid "finished search at %s\n"

4235 msgstr "完成搜索 %s\n"

4236

4102 -#: builtin/describe.c:353

4237 +#: builtin/describe.c:352

4238 #, c-format

4239 msgid ""

4240 "No annotated tags can describe '%s'.\n"

@@ -4108,7 +4243,7 @@ msgstr ""

4243 "没有注释 tag 能描述 '%s'。\n"

4244 "然而，有非注释 tag：尝试 --tags。"

4245

4111 -#: builtin/describe.c:357

4246 +#: builtin/describe.c:356

4247 #, c-format

4248 msgid ""

4249 "No tags can describe '%s'.\n"

@@ -4117,12 +4252,12 @@ msgstr ""

4252 "没有注释 tag 能描述 '%s'。\n"

4253 "尝试 --always，或者创建一些 tag。"

4254

4120 -#: builtin/describe.c:378

4255 +#: builtin/describe.c:377

4256 #, c-format

4257 msgid "traversed %lu commits\n"

4258 msgstr "已遍历 %lu 个提交\n"

4259

4125 -#: builtin/describe.c:381

4260 +#: builtin/describe.c:380

4261 #, c-format

4262 msgid ""

4263 "more than %i tags found; listed %i most recent\n"

@@ -4131,59 +4266,59 @@ msgstr ""

4266 "发现多于 %i 个 tag，列出最近的 %i 个\n"

4267 "在 %s 放弃搜索\n"

4268

4134 -#: builtin/describe.c:403

4269 +#: builtin/describe.c:402

4270 msgid "find the tag that comes after the commit"

4271 msgstr "寻找提交之后的 tag（用于描述提交）"

4272

4138 -#: builtin/describe.c:404

4273 +#: builtin/describe.c:403

4274 msgid "debug search strategy on stderr"

4275 msgstr "在标准错误上调试搜索策略"

4276

4277 +#: builtin/describe.c:404

4278 +msgid "use any ref"

4279 +msgstr "使用任意引用"

4280 +

4281 #: builtin/describe.c:405

4143 -msgid "use any ref in .git/refs"

4144 -msgstr "使用 .git/refs 里的任意引用"

4282 +msgid "use any tag, even unannotated"

4283 +msgstr "使用任意 tag，即使未带注解"

4284

4285 #: builtin/describe.c:406

4147 -msgid "use any tag in .git/refs/tags"

4148 -msgstr "使用 .git/refs/tags 里的任意 tag"

4149 -

4150 -#: builtin/describe.c:407

4286 msgid "always use long format"

4287 msgstr "始终使用长提交号格式"

4288

4154 -#: builtin/describe.c:410

4289 +#: builtin/describe.c:409

4290 msgid "only output exact matches"

4291 msgstr "只输出精确匹配"

4292

4158 -#: builtin/describe.c:412

4293 +#: builtin/describe.c:411

4294 msgid "consider <n> most recent tags (default: 10)"

4295 msgstr "考虑最近 <n> 个 tags（默认：10）"

4296

4162 -#: builtin/describe.c:414

4297 +#: builtin/describe.c:413

4298 msgid "only consider tags matching <pattern>"

4299 msgstr "只考虑匹配 <模式> 的 tags"

4300

4166 -#: builtin/describe.c:416 builtin/name-rev.c:238

4301 +#: builtin/describe.c:415 builtin/name-rev.c:238

4302 msgid "show abbreviated commit object as fallback"

4303 msgstr "显示简写的提交号作为后备"

4304

4170 -#: builtin/describe.c:417

4305 +#: builtin/describe.c:416

4306 msgid "mark"

4307 msgstr "标记"

4308

4174 -#: builtin/describe.c:418

4309 +#: builtin/describe.c:417

4310 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4311 msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"

4312

4178 -#: builtin/describe.c:436

4313 +#: builtin/describe.c:435

4314 msgid "--long is incompatible with --abbrev=0"

4315 msgstr "--long 与 --abbrev=0 不兼容"

4316

4182 -#: builtin/describe.c:462

4317 +#: builtin/describe.c:461

4318 msgid "No names found, cannot describe anything."

4319 msgstr "没有发现名称，无法描述任何东西。"

4320

4186 -#: builtin/describe.c:482

4321 +#: builtin/describe.c:481

4322 msgid "--dirty is incompatible with committishes"

4323 msgstr "--dirty 不能与提交同时使用"

4324

@@ -4225,39 +4360,39 @@ msgstr "提供了无法处理的对象 '%s'。"

4360 msgid "git fast-export [rev-list-opts]"

4361 msgstr "git fast-export [rev-list-opts]"

4362

4228 -#: builtin/fast-export.c:646

4363 +#: builtin/fast-export.c:652

4364 msgid "show progress after <n> objects"

4365 msgstr "在 <n> 个对象之后显示进度"

4366

4232 -#: builtin/fast-export.c:648

4367 +#: builtin/fast-export.c:654

4368 msgid "select handling of signed tags"

4369 msgstr "选择如何处理签名 tags"

4370

4236 -#: builtin/fast-export.c:651

4371 +#: builtin/fast-export.c:657

4372 msgid "select handling of tags that tag filtered objects"

4373 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"

4374

4240 -#: builtin/fast-export.c:654

4375 +#: builtin/fast-export.c:660

4376 msgid "Dump marks to this file"

4377 msgstr "把标记存储到这个文件"

4378

4244 -#: builtin/fast-export.c:656

4379 +#: builtin/fast-export.c:662

4380 msgid "Import marks from this file"

4381 msgstr "从这个文件导入标记"

4382

4248 -#: builtin/fast-export.c:658

4383 +#: builtin/fast-export.c:664

4384 msgid "Fake a tagger when tags lack one"

4385 msgstr "当 tags 缺少标记者字段时，假装提供一个"

4386

4252 -#: builtin/fast-export.c:660

4387 +#: builtin/fast-export.c:666

4388 msgid "Output full tree for each commit"

4389 msgstr "每次提交都输出整个树"

4390

4256 -#: builtin/fast-export.c:662

4391 +#: builtin/fast-export.c:668

4392 msgid "Use the done feature to terminate the stream"

4393 msgstr "使用 done 功能来终止流"

4394

4260 -#: builtin/fast-export.c:663

4395 +#: builtin/fast-export.c:669

4396 msgid "Skip output of blob data"

4397 msgstr "跳过数据对象的输出"

4398

@@ -4334,7 +4469,7 @@ msgstr "深化浅克隆的历史"

4469 msgid "convert to a complete repository"

4470 msgstr "转换为一个完整的版本库"

4471

4337 -#: builtin/fetch.c:88 builtin/log.c:1119

4472 +#: builtin/fetch.c:88 builtin/log.c:1121

4473 msgid "dir"

4474 msgstr "目录"

4475

@@ -4872,28 +5007,23 @@ msgstr "显示用法"

5007 msgid "no pattern given."

5008 msgstr "未提供模式匹配。"

5009

4875 -#: builtin/grep.c:825

4876 -#, c-format

4877 -msgid "bad object %s"

4878 -msgstr "坏对象 %s"

4879 -

4880 -#: builtin/grep.c:868

5010 +#: builtin/grep.c:866

5011 msgid "--open-files-in-pager only works on the worktree"

5012 msgstr "--open-files-in-pager 仅用于工作区"

5013

4884 -#: builtin/grep.c:891

5014 +#: builtin/grep.c:889

5015 msgid "--cached or --untracked cannot be used with --no-index."

5016 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

5017

4888 -#: builtin/grep.c:896

5018 +#: builtin/grep.c:894

5019 msgid "--no-index or --untracked cannot be used with revs."

5020 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

5021

4892 -#: builtin/grep.c:899

5022 +#: builtin/grep.c:897

5023 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5024 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

5025

4896 -#: builtin/grep.c:907

5026 +#: builtin/grep.c:905

5027 msgid "both --cached and trees are given."

5028 msgstr "同时给出了 --cached 和树对象。"

5029

@@ -5017,280 +5147,280 @@ msgstr "用法：%s%s"

5147 msgid "`git %s' is aliased to `%s'"

5148 msgstr "`git %s' 是 `%s' 的别名"

5149

5020 -#: builtin/index-pack.c:170

5150 +#: builtin/index-pack.c:182

5151 #, c-format

5152 msgid "object type mismatch at %s"

5153 msgstr "%s 的对象类型不匹配"

5154

5025 -#: builtin/index-pack.c:190

5155 +#: builtin/index-pack.c:202

5156 msgid "object of unexpected type"

5157 msgstr "意外的类型的对象"

5158

5029 -#: builtin/index-pack.c:227

5159 +#: builtin/index-pack.c:239

5160 #, c-format

5161 msgid "cannot fill %d byte"

5162 msgid_plural "cannot fill %d bytes"

5163 msgstr[0] "无法填充 %d 字节"

5164 msgstr[1] "无法填充 %d 字节"

5165

5036 -#: builtin/index-pack.c:237

5166 +#: builtin/index-pack.c:249

5167 msgid "early EOF"

5168 msgstr "过早的文件结束符（EOF）"

5169

5040 -#: builtin/index-pack.c:238

5170 +#: builtin/index-pack.c:250

5171 msgid "read error on input"

5172 msgstr "输入上的读错误"

5173

5044 -#: builtin/index-pack.c:250

5174 +#: builtin/index-pack.c:262

5175 msgid "used more bytes than were available"

5176 msgstr "用掉了超过可用的字节"

5177

5048 -#: builtin/index-pack.c:257

5178 +#: builtin/index-pack.c:269

5179 msgid "pack too large for current definition of off_t"

5180 msgstr "包太大超过了当前 off_t 的定义"

5181

5052 -#: builtin/index-pack.c:273

5182 +#: builtin/index-pack.c:285

5183 #, c-format

5184 msgid "unable to create '%s'"

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

5186

5057 -#: builtin/index-pack.c:278

5187 +#: builtin/index-pack.c:290

5188 #, c-format

5189 msgid "cannot open packfile '%s'"

5190 msgstr "无法打开包文件 '%s'"

5191

5062 -#: builtin/index-pack.c:292

5192 +#: builtin/index-pack.c:304

5193 msgid "pack signature mismatch"

5194 msgstr "包签名不匹配"

5195

5066 -#: builtin/index-pack.c:294

5196 +#: builtin/index-pack.c:306

5197 #, c-format

5198 msgid "pack version %<PRIu32> unsupported"

5199 msgstr "不支持包版本 %<PRIu32>"

5200

5071 -#: builtin/index-pack.c:312

5201 +#: builtin/index-pack.c:324

5202 #, c-format

5203 msgid "pack has bad object at offset %lu: %s"

5204 msgstr "包中有错误的对象位于 %lu：%s"

5205

5076 -#: builtin/index-pack.c:434

5206 +#: builtin/index-pack.c:446

5207 #, c-format

5208 msgid "inflate returned %d"

5209 msgstr "解压缩返回 %d"

5210

5081 -#: builtin/index-pack.c:483

5211 +#: builtin/index-pack.c:495

5212 msgid "offset value overflow for delta base object"

5213 msgstr "偏移值覆盖了 delta 基准对象"

5214

5085 -#: builtin/index-pack.c:491

5215 +#: builtin/index-pack.c:503

5216 msgid "delta base offset is out of bound"

5217 msgstr "delta 基准偏移越界"

5218

5089 -#: builtin/index-pack.c:499

5219 +#: builtin/index-pack.c:511

5220 #, c-format

5221 msgid "unknown object type %d"

5222 msgstr "未知对象类型 %d"

5223

5094 -#: builtin/index-pack.c:530

5224 +#: builtin/index-pack.c:542

5225 msgid "cannot pread pack file"

5226 msgstr "无法读取包文件"

5227

5098 -#: builtin/index-pack.c:532

5228 +#: builtin/index-pack.c:544

5229 #, c-format

5230 msgid "premature end of pack file, %lu byte missing"

5231 msgid_plural "premature end of pack file, %lu bytes missing"

5232 msgstr[0] "包文件过早结束，缺少 %lu 字节"

5233 msgstr[1] "包文件过早结束，缺少 %lu 字节"

5234

5105 -#: builtin/index-pack.c:558

5235 +#: builtin/index-pack.c:570

5236 msgid "serious inflate inconsistency"

5237 msgstr "解压缩严重的不一致"

5238

5109 -#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678

5110 -#: builtin/index-pack.c:712 builtin/index-pack.c:721

5239 +#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690

5240 +#: builtin/index-pack.c:724 builtin/index-pack.c:733

5241 #, c-format

5242 msgid "SHA1 COLLISION FOUND WITH %s !"

5243 msgstr "发现 %s 出现 SHA1 冲突！"

5244

5115 -#: builtin/index-pack.c:652 builtin/pack-objects.c:170

5245 +#: builtin/index-pack.c:664 builtin/pack-objects.c:170

5246 #: builtin/pack-objects.c:262

5247 #, c-format

5248 msgid "unable to read %s"

5249 msgstr "不能读 %s"

5250

5121 -#: builtin/index-pack.c:718

5251 +#: builtin/index-pack.c:730

5252 #, c-format

5253 msgid "cannot read existing object %s"

5254 msgstr "不能读取现存对象 %s"

5255

5126 -#: builtin/index-pack.c:732

5256 +#: builtin/index-pack.c:744

5257 #, c-format

5258 msgid "invalid blob object %s"

5259 msgstr "无效的数据（blob）对象 %s"

5260

5131 -#: builtin/index-pack.c:747

5261 +#: builtin/index-pack.c:759

5262 #, c-format

5263 msgid "invalid %s"

5264 msgstr "无效的 %s"

5265

5136 -#: builtin/index-pack.c:749

5266 +#: builtin/index-pack.c:761

5267 msgid "Error in object"

5268 msgstr "对象中出错"

5269

5140 -#: builtin/index-pack.c:751

5270 +#: builtin/index-pack.c:763

5271 #, c-format

5272 msgid "Not all child objects of %s are reachable"

5273 msgstr "%s 的所有子对象并非都可达"

5274

5145 -#: builtin/index-pack.c:821 builtin/index-pack.c:847

5275 +#: builtin/index-pack.c:833 builtin/index-pack.c:863

5276 msgid "failed to apply delta"

5277 msgstr "无法应用 delta"

5278

5149 -#: builtin/index-pack.c:986

5279 +#: builtin/index-pack.c:1004

5280 msgid "Receiving objects"

5281 msgstr "接收对象中"

5282

5153 -#: builtin/index-pack.c:986

5283 +#: builtin/index-pack.c:1004

5284 msgid "Indexing objects"

5285 msgstr "索引对象中"

5286

5157 -#: builtin/index-pack.c:1012

5287 +#: builtin/index-pack.c:1030

5288 msgid "pack is corrupted (SHA1 mismatch)"

5289 msgstr "包冲突（SHA1 不匹配）"

5290

5161 -#: builtin/index-pack.c:1017

5291 +#: builtin/index-pack.c:1035

5292 msgid "cannot fstat packfile"

5293 msgstr "不能枚举包文件状态"

5294

5165 -#: builtin/index-pack.c:1020

5295 +#: builtin/index-pack.c:1038

5296 msgid "pack has junk at the end"

5297 msgstr "包的结尾有垃圾数据"

5298

5169 -#: builtin/index-pack.c:1031

5299 +#: builtin/index-pack.c:1049

5300 msgid "confusion beyond insanity in parse_pack_objects()"

5301 msgstr "parse_pack_objects() 中遇到不可理喻的问题"

5302

5173 -#: builtin/index-pack.c:1054

5303 +#: builtin/index-pack.c:1072

5304 msgid "Resolving deltas"

5305 msgstr "处理 delta 中"

5306

5177 -#: builtin/index-pack.c:1064

5307 +#: builtin/index-pack.c:1082

5308 #, c-format

5309 msgid "unable to create thread: %s"

5310 msgstr "不能创建线程：%s"

5311

5182 -#: builtin/index-pack.c:1106

5312 +#: builtin/index-pack.c:1124

5313 msgid "confusion beyond insanity"

5314 msgstr "不可理喻"

5315

5186 -#: builtin/index-pack.c:1112

5316 +#: builtin/index-pack.c:1132

5317 #, c-format

5318 msgid "completed with %d local objects"

5319 msgstr "完成 %d 个本地对象"

5320

5191 -#: builtin/index-pack.c:1121

5321 +#: builtin/index-pack.c:1142

5322 #, c-format

5323 msgid "Unexpected tail checksum for %s (disk corruption?)"

5324 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"

5325

5196 -#: builtin/index-pack.c:1125

5326 +#: builtin/index-pack.c:1146

5327 #, c-format

5328 msgid "pack has %d unresolved delta"

5329 msgid_plural "pack has %d unresolved deltas"

5330 msgstr[0] "包有 %d 个未解决的 delta"

5331 msgstr[1] "包有 %d 个未解决的 delta"

5332

5203 -#: builtin/index-pack.c:1150

5333 +#: builtin/index-pack.c:1171

5334 #, c-format

5335 msgid "unable to deflate appended object (%d)"

5336 msgstr "不能压缩附加对象（%d）"

5337

5208 -#: builtin/index-pack.c:1229

5338 +#: builtin/index-pack.c:1250

5339 #, c-format

5340 msgid "local object %s is corrupt"

5341 msgstr "本地对象 %s 已损坏"

5342

5213 -#: builtin/index-pack.c:1253

5343 +#: builtin/index-pack.c:1274

5344 msgid "error while closing pack file"

5345 msgstr "关闭包文件时出错"

5346

5217 -#: builtin/index-pack.c:1266

5347 +#: builtin/index-pack.c:1287

5348 #, c-format

5349 msgid "cannot write keep file '%s'"

5350 msgstr "无法写保留文件 '%s'"

5351

5222 -#: builtin/index-pack.c:1274

5352 +#: builtin/index-pack.c:1295

5353 #, c-format

5354 msgid "cannot close written keep file '%s'"

5355 msgstr "无法关闭保留文件 '%s'"

5356

5227 -#: builtin/index-pack.c:1287

5357 +#: builtin/index-pack.c:1308

5358 msgid "cannot store pack file"

5359 msgstr "无法存储包文件"

5360

5231 -#: builtin/index-pack.c:1298

5361 +#: builtin/index-pack.c:1319

5362 msgid "cannot store index file"

5363 msgstr "无法存储索引文件"

5364

5235 -#: builtin/index-pack.c:1331

5365 +#: builtin/index-pack.c:1352

5366 #, c-format

5367 msgid "bad pack.indexversion=%<PRIu32>"

5368 msgstr "坏的 pack.indexversion=%<PRIu32>"

5369

5240 -#: builtin/index-pack.c:1337

5370 +#: builtin/index-pack.c:1358

5371 #, c-format

5372 msgid "invalid number of threads specified (%d)"

5373 msgstr "指定的线程数无效（%d）"

5374

5245 -#: builtin/index-pack.c:1341 builtin/index-pack.c:1514

5375 +#: builtin/index-pack.c:1362 builtin/index-pack.c:1535

5376 #, c-format

5377 msgid "no threads support, ignoring %s"

5378 msgstr "没有线程支持，忽略 %s"

5379

5250 -#: builtin/index-pack.c:1399

5380 +#: builtin/index-pack.c:1420

5381 #, c-format

5382 msgid "Cannot open existing pack file '%s'"

5383 msgstr "无法打开现存包文件 '%s'"

5384

5255 -#: builtin/index-pack.c:1401

5385 +#: builtin/index-pack.c:1422

5386 #, c-format

5387 msgid "Cannot open existing pack idx file for '%s'"

5388 msgstr "无法为 %s 打开包索引文件"

5389

5260 -#: builtin/index-pack.c:1448

5390 +#: builtin/index-pack.c:1469

5391 #, c-format

5392 msgid "non delta: %d object"

5393 msgid_plural "non delta: %d objects"

5394 msgstr[0] "非 delta：%d 个对象"

5395 msgstr[1] "非 delta：%d 个对象"

5396

5267 -#: builtin/index-pack.c:1455

5397 +#: builtin/index-pack.c:1476

5398 #, c-format

5399 msgid "chain length = %d: %lu object"

5400 msgid_plural "chain length = %d: %lu objects"

5401 msgstr[0] "链长 = %d: %lu 对象"

5402 msgstr[1] "链长 = %d: %lu 对象"

5403

5274 -#: builtin/index-pack.c:1482

5404 +#: builtin/index-pack.c:1503

5405 msgid "Cannot come back to cwd"

5406 msgstr "无法返回当前工作目录"

5407

5278 -#: builtin/index-pack.c:1526 builtin/index-pack.c:1529

5279 -#: builtin/index-pack.c:1541 builtin/index-pack.c:1545

5408 +#: builtin/index-pack.c:1547 builtin/index-pack.c:1550

5409 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1566

5410 #, c-format

5411 msgid "bad %s"

5412 msgstr "错误选项 %s"

5413

5284 -#: builtin/index-pack.c:1559

5414 +#: builtin/index-pack.c:1580

5415 msgid "--fix-thin cannot be used without --stdin"

5416 msgstr "--fix-thin 不能和 --stdin 同时使用"

5417

5288 -#: builtin/index-pack.c:1563 builtin/index-pack.c:1573

5418 +#: builtin/index-pack.c:1584 builtin/index-pack.c:1594

5419 #, c-format

5420 msgid "packfile name '%s' does not end with '.pack'"

5421 msgstr "包名 '%s' 没有以 '.pack' 结尾"

5422

5293 -#: builtin/index-pack.c:1582

5423 +#: builtin/index-pack.c:1603

5424 msgid "--verify with no packfile name given"

5425 msgstr "--verify 没有提供包名参数"

5426

@@ -5459,252 +5589,247 @@ msgstr "不能访问当前工作目录"

5589 msgid "Cannot access work tree '%s'"

5590 msgstr "不能访问工作区 '%s'"

5591

5462 -#: builtin/log.c:39

5592 +#: builtin/log.c:40

5593 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5594 msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"

5595

5466 -#: builtin/log.c:40

5596 +#: builtin/log.c:41

5597 msgid " or: git show [options] <object>..."

5598 msgstr " 或者：git show [选项] <对象>..."

5599

5470 -#: builtin/log.c:102

5600 +#: builtin/log.c:103

5601 msgid "suppress diff output"

5602 msgstr "不显示差异输出"

5603

5474 -#: builtin/log.c:103

5604 +#: builtin/log.c:104

5605 msgid "show source"

5606 msgstr "显示源"

5607

5478 -#: builtin/log.c:104

5608 +#: builtin/log.c:105

5609 msgid "Use mail map file"

5610 msgstr "使用邮件映射文件"

5611

5482 -#: builtin/log.c:105

5612 +#: builtin/log.c:106

5613 msgid "decorate options"

5614 msgstr "修饰选项"

5615

5486 -#: builtin/log.c:198

5616 +#: builtin/log.c:199

5617 #, c-format

5618 msgid "Final output: %d %s\n"

5619 msgstr "最终输出：%d %s\n"

5620

5491 -#: builtin/log.c:419 builtin/log.c:511

5621 +#: builtin/log.c:422 builtin/log.c:514

5622 #, c-format

5623 msgid "Could not read object %s"

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

5625

5496 -#: builtin/log.c:535

5626 +#: builtin/log.c:538

5627 #, c-format

5628 msgid "Unknown type: %d"

5629 msgstr "未知类型：%d"

5630

5501 -#: builtin/log.c:627

5631 +#: builtin/log.c:630

5632 msgid "format.headers without value"

5633 msgstr "format.headers 没有值"

5634

5505 -#: builtin/log.c:701

5635 +#: builtin/log.c:704

5636 msgid "name of output directory is too long"

5637 msgstr "输出目录名太长"

5638

5509 -#: builtin/log.c:717

5639 +#: builtin/log.c:720

5640 #, c-format

5641 msgid "Cannot open patch file %s"

5642 msgstr "无法打开补丁文件 %s"

5643

5514 -#: builtin/log.c:731

5644 +#: builtin/log.c:734

5645 msgid "Need exactly one range."

5646 msgstr "只需要一个范围。"

5647

5518 -#: builtin/log.c:739

5648 +#: builtin/log.c:742

5649 msgid "Not a range."

5650 msgstr "不是一个范围。"

5651

5522 -#: builtin/log.c:812

5652 +#: builtin/log.c:815

5653 msgid "Cover letter needs email format"

5654 msgstr "信封需要邮件地址格式"

5655

5526 -#: builtin/log.c:885

5656 +#: builtin/log.c:888

5657 #, c-format

5658 msgid "insane in-reply-to: %s"

5659 msgstr "不正常的 in-reply-to：%s"

5660

5531 -#: builtin/log.c:913

5661 +#: builtin/log.c:916

5662 msgid "git format-patch [options] [<since> | <revision range>]"

5663 msgstr "git format-patch [选项] [<从> | <修订集范围>]"

5664

5535 -#: builtin/log.c:958

5665 +#: builtin/log.c:961

5666 msgid "Two output directories?"

5667 msgstr "两个输出目录？"

5668

5539 -#: builtin/log.c:1097

5669 +#: builtin/log.c:1099

5670 msgid "use [PATCH n/m] even with a single patch"

5671 msgstr "使用 [PATCH n/m]，即使只有一个补丁"

5672

5543 -#: builtin/log.c:1100

5673 +#: builtin/log.c:1102

5674 msgid "use [PATCH] even with multiple patches"

5675 msgstr "使用 [PATCH]，即使有多个补丁"

5676

5547 -#: builtin/log.c:1104

5677 +#: builtin/log.c:1106

5678 msgid "print patches to standard out"

5679 msgstr "打印补丁到标准输出"

5680

5551 -#: builtin/log.c:1106

5681 +#: builtin/log.c:1108

5682 msgid "generate a cover letter"

5683 msgstr "生成一封附信"

5684

5555 -#: builtin/log.c:1108

5685 +#: builtin/log.c:1110

5686 msgid "use simple number sequence for output file names"

5687 msgstr "使用简单的数字序列作为输出文件名"

5688

5559 -#: builtin/log.c:1109

5689 +#: builtin/log.c:1111

5690 msgid "sfx"

5691 msgstr "后缀"

5692

5563 -#: builtin/log.c:1110

5693 +#: builtin/log.c:1112

5694 msgid "use <sfx> instead of '.patch'"

5695 msgstr "使用 <后缀> 代替 '.patch'"

5696

5567 -#: builtin/log.c:1112

5697 +#: builtin/log.c:1114

5698 msgid "start numbering patches at <n> instead of 1"

5699 msgstr "补丁以 <n> 开始编号，而不是1"

5700

5571 -#: builtin/log.c:1114

5701 +#: builtin/log.c:1116

5702 msgid "mark the series as Nth re-roll"

5703 msgstr "标记补丁系列是第几次重制"

5704

5575 -#: builtin/log.c:1116

5705 +#: builtin/log.c:1118

5706 msgid "Use [<prefix>] instead of [PATCH]"

5707 msgstr "使用 [<前缀>] 代替 [PATCH]"

5708

5579 -#: builtin/log.c:1119

5709 +#: builtin/log.c:1121

5710 msgid "store resulting files in <dir>"

5711 msgstr "把结果文件存储在 <dir>"

5712

5583 -#: builtin/log.c:1122

5713 +#: builtin/log.c:1124

5714 msgid "don't strip/add [PATCH]"

5715 msgstr "不删除/添加 [PATCH]"

5716

5587 -#: builtin/log.c:1125

5717 +#: builtin/log.c:1127

5718 msgid "don't output binary diffs"

5719 msgstr "不输出二进制差异"

5720

5591 -#: builtin/log.c:1127

5721 +#: builtin/log.c:1129

5722 msgid "don't include a patch matching a commit upstream"

5723 msgstr "不包含已在上游提交中的补丁"

5724

5595 -#: builtin/log.c:1129

5725 +#: builtin/log.c:1131

5726 msgid "show patch format instead of default (patch + stat)"

5727 msgstr "显示纯补丁格式而非默认的（补丁+状态）"

5728

5599 -#: builtin/log.c:1131

5729 +#: builtin/log.c:1133

5730 msgid "Messaging"

5731 msgstr "邮件发送"

5732

5603 -#: builtin/log.c:1132

5733 +#: builtin/log.c:1134

5734 msgid "header"

5735 msgstr "header"

5736

5607 -#: builtin/log.c:1133

5737 +#: builtin/log.c:1135

5738 msgid "add email header"

5739 msgstr "添加邮件头"

5740

5611 -#: builtin/log.c:1134 builtin/log.c:1136

5741 +#: builtin/log.c:1136 builtin/log.c:1138

5742 msgid "email"

5743 msgstr "邮件地址"

5744

5615 -#: builtin/log.c:1134

5745 +#: builtin/log.c:1136

5746 msgid "add To: header"

5747 msgstr "添加收件人"

5748

5619 -#: builtin/log.c:1136

5749 +#: builtin/log.c:1138

5750 msgid "add Cc: header"

5751 msgstr "添加抄送"

5752

5623 -#: builtin/log.c:1138

5753 +#: builtin/log.c:1140

5754 msgid "message-id"

5755 msgstr "message-id"

5756

5627 -#: builtin/log.c:1139

5757 +#: builtin/log.c:1141

5758 msgid "make first mail a reply to <message-id>"

5759 msgstr "使第一封邮件作为对 <message-id> 的回复"

5760

5631 -#: builtin/log.c:1140 builtin/log.c:1143

5761 +#: builtin/log.c:1142 builtin/log.c:1145

5762 msgid "boundary"

5763 msgstr "边界"

5764

5635 -#: builtin/log.c:1141

5765 +#: builtin/log.c:1143

5766 msgid "attach the patch"

5767 msgstr "附件方式添加补丁"

5768

5639 -#: builtin/log.c:1144

5769 +#: builtin/log.c:1146

5770 msgid "inline the patch"

5771 msgstr "内联显示补丁"

5772

5643 -#: builtin/log.c:1148

5773 +#: builtin/log.c:1150

5774 msgid "enable message threading, styles: shallow, deep"

5775 msgstr "启用邮件线索，风格：浅，深"

5776

5647 -#: builtin/log.c:1150

5777 +#: builtin/log.c:1152

5778 msgid "signature"

5779 msgstr "签名"

5780

5651 -#: builtin/log.c:1151

5781 +#: builtin/log.c:1153

5782 msgid "add a signature"

5783 msgstr "添加一个签名"

5784

5655 -#: builtin/log.c:1153

5785 +#: builtin/log.c:1155

5786 msgid "don't print the patch filenames"

5787 msgstr "不要打印补丁文件名"

5788

5659 -#: builtin/log.c:1202

5660 -#, c-format

5661 -msgid "bogus committer info %s"

5662 -msgstr "虚假的提交者信息 %s"

5663 -

5664 -#: builtin/log.c:1247

5789 +#: builtin/log.c:1239

5790 msgid "-n and -k are mutually exclusive."

5791 msgstr "-n 和 -k 互斥。"

5792

5668 -#: builtin/log.c:1249

5793 +#: builtin/log.c:1241

5794 msgid "--subject-prefix and -k are mutually exclusive."

5795 msgstr "--subject-prefix 和 -k 互斥。"

5796

5672 -#: builtin/log.c:1257

5797 +#: builtin/log.c:1249

5798 msgid "--name-only does not make sense"

5799 msgstr "--name-only 无意义"

5800

5676 -#: builtin/log.c:1259

5801 +#: builtin/log.c:1251

5802 msgid "--name-status does not make sense"

5803 msgstr "--name-status 无意义"

5804

5680 -#: builtin/log.c:1261

5805 +#: builtin/log.c:1253

5806 msgid "--check does not make sense"

5807 msgstr "--check 无意义"

5808

5684 -#: builtin/log.c:1284

5809 +#: builtin/log.c:1276

5810 msgid "standard output, or directory, which one?"

5811 msgstr "标准输出或目录，哪一个？"

5812

5688 -#: builtin/log.c:1286

5813 +#: builtin/log.c:1278

5814 #, c-format

5815 msgid "Could not create directory '%s'"

5816 msgstr "不能创建目录 '%s'"

5817

5693 -#: builtin/log.c:1439

5818 +#: builtin/log.c:1431

5819 msgid "Failed to create output files"

5820 msgstr "无法创建输出文件"

5821

5697 -#: builtin/log.c:1488

5822 +#: builtin/log.c:1480

5823 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5824 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"

5825

5701 -#: builtin/log.c:1543

5826 +#: builtin/log.c:1535

5827 #, c-format

5828 msgid ""

5829 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

5830 msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"

5831

5707 -#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570

5832 +#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562

5833 #, c-format

5834 msgid "Unknown commit %s"

5835 msgstr "未知提交 %s"

@@ -5904,109 +6029,113 @@ msgstr "允许快进（默认）"

6029 msgid "abort if fast-forward is not possible"

6030 msgstr "如果不能快进就放弃合并"

6031

5907 -#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112

6032 +#: builtin/merge.c:203

6033 +msgid "Verify that the named commit has a valid GPG signature"

6034 +msgstr "验证指定的提交是否包含一个有效的 GPG 签名"

6035 +

6036 +#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112

6037 msgid "strategy"

6038 msgstr "策略"

6039

5911 -#: builtin/merge.c:203

6040 +#: builtin/merge.c:205

6041 msgid "merge strategy to use"

6042 msgstr "要使用的合并策略"

6043

5915 -#: builtin/merge.c:204

6044 +#: builtin/merge.c:206

6045 msgid "option=value"

6046 msgstr "option=value"

6047

5919 -#: builtin/merge.c:205

6048 +#: builtin/merge.c:207

6049 msgid "option for selected merge strategy"

6050 msgstr "所选的合并策略的选项"

6051

5923 -#: builtin/merge.c:207

6052 +#: builtin/merge.c:209

6053 msgid "merge commit message (for a non-fast-forward merge)"

6054 msgstr "合并的提交说明（针对非快进式合并）"

6055

5927 -#: builtin/merge.c:211

6056 +#: builtin/merge.c:213

6057 msgid "abort the current in-progress merge"

6058 msgstr "放弃当前正在进行的合并"

6059

5931 -#: builtin/merge.c:240

6060 +#: builtin/merge.c:242

6061 msgid "could not run stash."

6062 msgstr "不能进行进度保存。"

6063

5935 -#: builtin/merge.c:245

6064 +#: builtin/merge.c:247

6065 msgid "stash failed"

6066 msgstr "进度保存失败"

6067

5939 -#: builtin/merge.c:250

6068 +#: builtin/merge.c:252

6069 #, c-format

6070 msgid "not a valid object: %s"

6071 msgstr "不是一个有效对象：%s"

6072

5944 -#: builtin/merge.c:269 builtin/merge.c:286

6073 +#: builtin/merge.c:271 builtin/merge.c:288

6074 msgid "read-tree failed"

6075 msgstr "读取树失败"

6076

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

5949 -#: builtin/merge.c:316

6078 +#: builtin/merge.c:318

6079 msgid " (nothing to squash)"

6080 msgstr " （无可压缩）"

6081

5953 -#: builtin/merge.c:329

6082 +#: builtin/merge.c:331

6083 #, c-format

6084 msgid "Squash commit -- not updating HEAD\n"

6085 msgstr "压缩提交 -- 未更新 HEAD\n"

6086

5958 -#: builtin/merge.c:361

6087 +#: builtin/merge.c:363

6088 msgid "Writing SQUASH_MSG"

6089 msgstr "写入 SQUASH_MSG"

6090

5962 -#: builtin/merge.c:363

6091 +#: builtin/merge.c:365

6092 msgid "Finishing SQUASH_MSG"

6093 msgstr "完成 SQUASH_MSG"

6094

5966 -#: builtin/merge.c:386

6095 +#: builtin/merge.c:388

6096 #, c-format

6097 msgid "No merge message -- not updating HEAD\n"

6098 msgstr "无合并信息 -- 未更新 HEAD\n"

6099

5971 -#: builtin/merge.c:436

6100 +#: builtin/merge.c:438

6101 #, c-format

6102 msgid "'%s' does not point to a commit"

6103 msgstr "'%s' 没有指向一个提交"

6104

5976 -#: builtin/merge.c:535

6105 +#: builtin/merge.c:550

6106 #, c-format

6107 msgid "Bad branch.%s.mergeoptions string: %s"

6108 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"

6109

5981 -#: builtin/merge.c:628

6110 +#: builtin/merge.c:643

6111 msgid "git write-tree failed to write a tree"

6112 msgstr "git write-tree 无法写入一树对象"

6113

5985 -#: builtin/merge.c:656

6114 +#: builtin/merge.c:671

6115 msgid "Not handling anything other than two heads merge."

6116 msgstr "不能处理两个头合并之外的任何操作。"

6117

5989 -#: builtin/merge.c:670

6118 +#: builtin/merge.c:685

6119 #, c-format

6120 msgid "Unknown option for merge-recursive: -X%s"

6121 msgstr "merge-recursive 的未知选项：-X%s"

6122

5994 -#: builtin/merge.c:684

6123 +#: builtin/merge.c:699

6124 #, c-format

6125 msgid "unable to write %s"

6126 msgstr "不能写 %s"

6127

5999 -#: builtin/merge.c:773

6128 +#: builtin/merge.c:788

6129 #, c-format

6130 msgid "Could not read from '%s'"

6131 msgstr "不能从 '%s' 读取"

6132

6004 -#: builtin/merge.c:782

6133 +#: builtin/merge.c:797

6134 #, c-format

6135 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6136 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

6137

6009 -#: builtin/merge.c:788

6138 +#: builtin/merge.c:803

6139 #, c-format

6140 msgid ""

6141 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6020,52 +6149,52 @@ msgstr ""

6149 "\n"

6150 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

6151

6023 -#: builtin/merge.c:812

6152 +#: builtin/merge.c:827

6153 msgid "Empty commit message."

6154 msgstr "空提交信息。"

6155

6027 -#: builtin/merge.c:824

6156 +#: builtin/merge.c:839

6157 #, c-format

6158 msgid "Wonderful.\n"

6159 msgstr "太棒了。\n"

6160

6032 -#: builtin/merge.c:889

6161 +#: builtin/merge.c:904

6162 #, c-format

6163 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6164 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

6165

6037 -#: builtin/merge.c:905

6166 +#: builtin/merge.c:920

6167 #, c-format

6168 msgid "'%s' is not a commit"

6169 msgstr "'%s' 不是一个提交"

6170

6042 -#: builtin/merge.c:946

6171 +#: builtin/merge.c:961

6172 msgid "No current branch."

6173 msgstr "没有当前分支。"

6174

6046 -#: builtin/merge.c:948

6175 +#: builtin/merge.c:963

6176 msgid "No remote for the current branch."

6177 msgstr "当前分支没有对应的远程版本库。"

6178

6050 -#: builtin/merge.c:950

6179 +#: builtin/merge.c:965

6180 msgid "No default upstream defined for the current branch."

6181 msgstr "当前分支没有定义默认的上游分支。"

6182

6054 -#: builtin/merge.c:955

6183 +#: builtin/merge.c:970

6184 #, c-format

6185 msgid "No remote tracking branch for %s from %s"

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

6187

6059 -#: builtin/merge.c:1042 builtin/merge.c:1199

6188 +#: builtin/merge.c:1057 builtin/merge.c:1214

6189 #, c-format

6190 msgid "%s - not something we can merge"

6191 msgstr "%s - 不能被合并"

6192

6064 -#: builtin/merge.c:1110

6193 +#: builtin/merge.c:1125

6194 msgid "There is no merge to abort (MERGE_HEAD missing)."

6195 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"

6196

6068 -#: builtin/merge.c:1126 git-pull.sh:31

6197 +#: builtin/merge.c:1141 git-pull.sh:31

6198 msgid ""

6199 "You have not concluded your merge (MERGE_HEAD exists).\n"

6200 "Please, commit your changes before you can merge."

@@ -6073,11 +6202,11 @@ msgstr ""

6202 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"

6203 "请在合并前先提交您的修改。"

6204

6076 -#: builtin/merge.c:1129 git-pull.sh:34

6205 +#: builtin/merge.c:1144 git-pull.sh:34

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

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

6208

6080 -#: builtin/merge.c:1133

6209 +#: builtin/merge.c:1148

6210 msgid ""

6211 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6212 "Please, commit your changes before you can merge."

@@ -6085,79 +6214,100 @@ msgstr ""

6214 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

6215 "请在合并前先提交您的修改。"

6216

6088 -#: builtin/merge.c:1136

6217 +#: builtin/merge.c:1151

6218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6219 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

6220

6092 -#: builtin/merge.c:1145

6221 +#: builtin/merge.c:1160

6222 msgid "You cannot combine --squash with --no-ff."

6223 msgstr "您不能将 --squash 与 --no-ff 同时使用。"

6224

6096 -#: builtin/merge.c:1150

6225 +#: builtin/merge.c:1165

6226 msgid "You cannot combine --no-ff with --ff-only."

6227 msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"

6228

6100 -#: builtin/merge.c:1157

6229 +#: builtin/merge.c:1172

6230 msgid "No commit specified and merge.defaultToUpstream not set."

6231 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"

6232

6104 -#: builtin/merge.c:1189

6233 +#: builtin/merge.c:1204

6234 msgid "Can merge only exactly one commit into empty head"

6235 msgstr "只能将一个提交合并到空分支上"

6236

6108 -#: builtin/merge.c:1192

6237 +#: builtin/merge.c:1207

6238 msgid "Squash commit into empty head not supported yet"

6239 msgstr "尚不支持到空分支的压缩提交"

6240

6112 -#: builtin/merge.c:1194

6241 +#: builtin/merge.c:1209

6242 msgid "Non-fast-forward commit does not make sense into an empty head"

6243 msgstr "到空分支的非快进式提交没有意义"

6244

6116 -#: builtin/merge.c:1310

6245 +#: builtin/merge.c:1265

6246 +#, c-format

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

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

6249 +

6250 +#: builtin/merge.c:1268

6251 +#, c-format

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

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

6254 +

6255 +#. 'N'

6256 +#: builtin/merge.c:1271

6257 +#, c-format

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

6259 +msgstr "提交 %s 没有一个 GPG 签名。"

6260 +

6261 +#: builtin/merge.c:1274

6262 +#, c-format

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

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

6265 +

6266 +#: builtin/merge.c:1358

6267 #, c-format

6268 msgid "Updating %s..%s\n"

6269 msgstr "更新 %s..%s\n"

6270

6121 -#: builtin/merge.c:1349

6271 +#: builtin/merge.c:1397

6272 #, c-format

6273 msgid "Trying really trivial in-index merge...\n"

6274 msgstr "尝试非常小的索引内合并...\n"

6275

6126 -#: builtin/merge.c:1356

6276 +#: builtin/merge.c:1404

6277 #, c-format

6278 msgid "Nope.\n"

6279 msgstr "无。\n"

6280

6131 -#: builtin/merge.c:1388

6281 +#: builtin/merge.c:1436

6282 msgid "Not possible to fast-forward, aborting."

6283 msgstr "无法快进，终止。"

6284

6135 -#: builtin/merge.c:1411 builtin/merge.c:1490

6285 +#: builtin/merge.c:1459 builtin/merge.c:1538

6286 #, c-format

6287 msgid "Rewinding the tree to pristine...\n"

6288 msgstr "将树回滚至原始状态...\n"

6289

6140 -#: builtin/merge.c:1415

6290 +#: builtin/merge.c:1463

6291 #, c-format

6292 msgid "Trying merge strategy %s...\n"

6293 msgstr "尝试合并策略 %s...\n"

6294

6145 -#: builtin/merge.c:1481

6295 +#: builtin/merge.c:1529

6296 #, c-format

6297 msgid "No merge strategy handled the merge.\n"

6298 msgstr "没有合并策略处理此合并。\n"

6299

6150 -#: builtin/merge.c:1483

6300 +#: builtin/merge.c:1531

6301 #, c-format

6302 msgid "Merge with strategy %s failed.\n"

6303 msgstr "使用策略 %s 合并失败。\n"

6304

6155 -#: builtin/merge.c:1492

6305 +#: builtin/merge.c:1540

6306 #, c-format

6307 msgid "Using the %s to prepare resolving by hand.\n"

6308 msgstr "使用 %s 以准备手工解决。\n"

6309

6160 -#: builtin/merge.c:1504

6310 +#: builtin/merge.c:1552

6311 #, c-format

6312 msgid "Automatic merge went well; stopped before committing as requested\n"

6313 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -7172,11 +7322,15 @@ msgstr "清除本地删除的引用"

7322 msgid "bypass pre-push hook"

7323 msgstr "绕过 pre-push 钩子"

7324

7175 -#: builtin/push.c:448

7325 +#: builtin/push.c:440

7326 +msgid "push missing but relevant tags"

7327 +msgstr "推送缺失的有关的 tags"

7328 +

7329 +#: builtin/push.c:450

7330 msgid "--delete is incompatible with --all, --mirror and --tags"

7331 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

7332

7179 -#: builtin/push.c:450

7333 +#: builtin/push.c:452

7334 msgid "--delete doesn't make sense without any refs"

7335 msgstr "--delete 未接任何引用没有意义"

7336

@@ -9086,7 +9240,7 @@ msgstr ""

9240 msgid "Pull is not possible because you have unmerged files."

9241 msgstr "Pull 不可用，因为您尚有未合并的文件。"

9242

9089 -#: git-pull.sh:197

9243 +#: git-pull.sh:203

9244 msgid "updating an unborn branch with changes added to the index"

9245 msgstr "更新尚未诞生的分支，变更添加至索引"

9246

@@ -9094,7 +9248,7 @@ msgstr "更新尚未诞生的分支，变更添加至索引"

9248 #. The working tree and the index file is still based on the

9249 #. $orig_head commit, but we are merging into $curr_head.

9250 #. First update the working tree to match $curr_head.

9097 -#: git-pull.sh:229

9251 +#: git-pull.sh:235

9252 #, sh-format

9253 msgid ""

9254 "Warning: fetch updated the current branch head.\n"

@@ -9104,11 +9258,11 @@ msgstr ""

9258 "警告：fetch 更新了当前的分支。您的工作区\n"

9259 "警告：从原提交 $orig_head 快进。"

9260

9107 -#: git-pull.sh:254

9261 +#: git-pull.sh:260

9262 msgid "Cannot merge multiple branches into empty head"

9263 msgstr "无法将多个分支合并到空分支"

9264

9111 -#: git-pull.sh:258

9265 +#: git-pull.sh:264

9266 msgid "Cannot rebase onto multiple branches"

9267 msgstr "无法变基到多个分支"

9268

@@ -9362,37 +9516,37 @@ msgstr "未指定分支名"

9516 msgid "(To restore them type \"git stash apply\")"

9517 msgstr "（为恢复数据输入 \"git stash apply\"）"

9518

9365 -#: git-submodule.sh:90

9519 +#: git-submodule.sh:91

9520 #, sh-format

9521 msgid "cannot strip one component off url '$remoteurl'"

9522 msgstr "无法从 url '$remoteurl' 剥离一个组件"

9523

9370 -#: git-submodule.sh:195

9524 +#: git-submodule.sh:196

9525 #, sh-format

9526 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"

9527 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"

9528

9375 -#: git-submodule.sh:238

9529 +#: git-submodule.sh:239

9530 #, sh-format

9531 msgid "Clone of '$url' into submodule path '$sm_path' failed"

9532 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"

9533

9380 -#: git-submodule.sh:250

9534 +#: git-submodule.sh:251

9535 #, sh-format

9536 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

9537 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"

9538

9385 -#: git-submodule.sh:343

9539 +#: git-submodule.sh:349

9540 #, sh-format

9541 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

9542 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"

9543

9390 -#: git-submodule.sh:360

9544 +#: git-submodule.sh:366

9545 #, sh-format

9546 msgid "'$sm_path' already exists in the index"

9547 msgstr "'$sm_path' 已经存在于索引中"

9548

9395 -#: git-submodule.sh:364

9549 +#: git-submodule.sh:370

9550 #, sh-format

9551 msgid ""

9552 "The following path is ignored by one of your .gitignore files:\n"

@@ -9403,189 +9557,258 @@ msgstr ""

9557 "$sm_path\n"

9558 "如果您确实想添加它，使用 -f 参数。"

9559

9406 -#: git-submodule.sh:382

9560 +#: git-submodule.sh:388

9561 #, sh-format

9562 msgid "Adding existing repo at '$sm_path' to the index"

9563 msgstr "添加位于 '$sm_path' 的现存版本库到索引"

9564

9411 -#: git-submodule.sh:384

9565 +#: git-submodule.sh:390

9566 #, sh-format

9567 msgid "'$sm_path' already exists and is not a valid git repo"

9568 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"

9569

9416 -#: git-submodule.sh:392

9570 +#: git-submodule.sh:398

9571 #, sh-format

9572 msgid "A git directory for '$sm_name' is found locally with remote(s):"

9573 msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库："

9574

9421 -#: git-submodule.sh:394

9575 +#: git-submodule.sh:400

9576 #, sh-format

9577 msgid ""

9578 "If you want to reuse this local git directory instead of cloning again from"

9579 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"

9580

9427 -#: git-submodule.sh:396

9581 +#: git-submodule.sh:402

9582 #, sh-format

9583 msgid ""

9584 "use the '--force' option. If the local git directory is not the correct repo"

9585 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"

9586

9433 -#: git-submodule.sh:397

9587 +#: git-submodule.sh:403

9588 #, sh-format

9589 msgid ""

9590 "or you are unsure what this means choose another name with the '--name' "

9591 "option."

9592 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"

9593

9440 -#: git-submodule.sh:399

9594 +#: git-submodule.sh:405

9595 #, sh-format

9596 msgid "Reactivating local git directory for submodule '$sm_name'."

9597 msgstr "激活本地 git 目录到子模组 '$sm_name'。"

9598

9445 -#: git-submodule.sh:411

9599 +#: git-submodule.sh:417

9600 #, sh-format

9601 msgid "Unable to checkout submodule '$sm_path'"

9602 msgstr "不能检出子模组 '$sm_path'"

9603

9450 -#: git-submodule.sh:416

9604 +#: git-submodule.sh:422

9605 #, sh-format

9606 msgid "Failed to add submodule '$sm_path'"

9607 msgstr "无法添加子模组 '$sm_path'"

9608

9455 -#: git-submodule.sh:425

9609 +#: git-submodule.sh:431

9610 #, sh-format

9611 msgid "Failed to register submodule '$sm_path'"

9612 msgstr "无法注册子模组 '$sm_path'"

9613

9460 -#: git-submodule.sh:468

9614 +#: git-submodule.sh:474

9615 #, sh-format

9616 msgid "Entering '$prefix$sm_path'"

9617 msgstr "正在进入 '$prefix$sm_path'"

9618

9465 -#: git-submodule.sh:482

9619 +#: git-submodule.sh:488

9620 #, sh-format

9621 msgid "Stopping at '$sm_path'; script returned non-zero status."

9622 msgstr "停止于 '$sm_path'，脚本返回非零值。"

9623

9470 -#: git-submodule.sh:526

9624 +#: git-submodule.sh:532

9625 #, sh-format

9626 msgid "No url found for submodule path '$sm_path' in .gitmodules"

9627 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"

9628

9475 -#: git-submodule.sh:535

9629 +#: git-submodule.sh:541

9630 #, sh-format

9631 msgid "Failed to register url for submodule path '$sm_path'"

9632 msgstr "无法为子模组路径 '$sm_path' 注册 url"

9633

9480 -#: git-submodule.sh:537

9634 +#: git-submodule.sh:543

9635 #, sh-format

9636 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

9637 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"

9638

9485 -#: git-submodule.sh:545

9639 +#: git-submodule.sh:551

9640 #, sh-format

9641 msgid "Failed to register update mode for submodule path '$sm_path'"

9642 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"

9643

9490 -#: git-submodule.sh:649

9644 +#: git-submodule.sh:588

9645 +#, sh-format

9646 +msgid "Use '.' if you really want to deinitialize all submodules"

9647 +msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"

9648 +

9649 +#: git-submodule.sh:603

9650 +#, sh-format

9651 +msgid "Submodule work tree '$sm_path' contains a .git directory"

9652 +msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录"

9653 +

9654 +#: git-submodule.sh:604

9655 +#, sh-format

9656 +msgid ""

9657 +"(use 'rm -rf' if you really want to remove it including all of its history)"

9658 +msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"

9659 +

9660 +#: git-submodule.sh:610

9661 #, sh-format

9662 msgid ""

9493 -"Submodule path '$sm_path' not initialized\n"

9663 +"Submodule work tree '$sm_path' contains local modifications; use '-f' to "

9664 +"discard them"

9665 +msgstr "子模组工作区 '$sm_path' 包含本地修改；使用 '-f' 丢弃它们"

9666 +

9667 +#: git-submodule.sh:613

9668 +#, sh-format

9669 +msgid "Cleared directory '$sm_path'"

9670 +msgstr "已清除目录 '$sm_path'"

9671 +

9672 +#: git-submodule.sh:614

9673 +#, sh-format

9674 +msgid "Could not remove submodule work tree '$sm_path'"

9675 +msgstr "无法移除子模组工作区 '$sm_path'"

9676 +

9677 +#: git-submodule.sh:617

9678 +#, sh-format

9679 +msgid "Could not create empty submodule directory '$sm_path'"

9680 +msgstr "不能创建空的子模组目录 '$sm_path'"

9681 +

9682 +#: git-submodule.sh:626

9683 +#, sh-format

9684 +msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"

9685 +msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册"

9686 +

9687 +#: git-submodule.sh:731

9688 +#, sh-format

9689 +msgid ""

9690 +"Submodule path '$prefix$sm_path' not initialized\n"

9691 "Maybe you want to use 'update --init'?"

9692 msgstr ""

9496 -"子模组路径 '$sm_path' 没有初始化\n"

9693 +"子模组路径 '$prefix$sm_path' 没有初始化\n"

9694 "也许您想用 'update --init'？"

9695

9499 -#: git-submodule.sh:662

9696 +#: git-submodule.sh:744

9697 #, sh-format

9501 -msgid "Unable to find current revision in submodule path '$sm_path'"

9502 -msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"

9698 +msgid "Unable to find current revision in submodule path '$prefix$sm_path'"

9699 +msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本"

9700

9504 -#: git-submodule.sh:671 git-submodule.sh:695

9701 +#: git-submodule.sh:753

9702 #, sh-format

9703 msgid "Unable to fetch in submodule path '$sm_path'"

9704 msgstr "无法在子模组路径 '$sm_path' 中获取"

9705

9509 -#: git-submodule.sh:709

9706 +#: git-submodule.sh:777

9707 #, sh-format

9511 -msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

9512 -msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"

9708 +msgid "Unable to fetch in submodule path '$prefix$sm_path'"

9709 +msgstr "无法在子模组路径 '$prefix$sm_path' 中获取"

9710

9514 -#: git-submodule.sh:710

9711 +#: git-submodule.sh:791

9712 #, sh-format

9516 -msgid "Submodule path '$sm_path': rebased into '$sha1'"

9517 -msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"

9713 +msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"

9714 +msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'"

9715

9519 -#: git-submodule.sh:715

9716 +#: git-submodule.sh:792

9717 #, sh-format

9521 -msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

9522 -msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"

9718 +msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"

9719 +msgstr "子模组路径 '$prefix$sm_path'：变基至 '$sha1'"

9720

9524 -#: git-submodule.sh:716

9721 +#: git-submodule.sh:797

9722 #, sh-format

9526 -msgid "Submodule path '$sm_path': merged in '$sha1'"

9527 -msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"

9723 +msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"

9724 +msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中"

9725

9529 -#: git-submodule.sh:721

9726 +#: git-submodule.sh:798

9727 #, sh-format

9531 -msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

9532 -msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"

9728 +msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"

9729 +msgstr "子模组路径 '$prefix$sm_path'：已合并入 '$sha1'"

9730

9534 -#: git-submodule.sh:722

9731 +#: git-submodule.sh:803

9732 #, sh-format

9536 -msgid "Submodule path '$sm_path': checked out '$sha1'"

9537 -msgstr "子模组路径 '$sm_path'：检出 '$sha1'"

9733 +msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"

9734 +msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'"

9735

9539 -#: git-submodule.sh:744 git-submodule.sh:1066

9736 +#: git-submodule.sh:804

9737 #, sh-format

9541 -msgid "Failed to recurse into submodule path '$sm_path'"

9542 -msgstr "无法递归进子模组路径 '$sm_path'"

9738 +msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"

9739 +msgstr "子模组路径 '$prefix$sm_path'：检出 '$sha1'"

9740 +

9741 +#: git-submodule.sh:831

9742 +#, sh-format

9743 +msgid "Failed to recurse into submodule path '$prefix$sm_path'"

9744 +msgstr "无法递归进子模组路径 '$prefix$sm_path'"

9745

9544 -#: git-submodule.sh:852

9746 +#: git-submodule.sh:939

9747 msgid "The --cached option cannot be used with the --files option"

9748 msgstr "选项 --cached 不能和选项 --files 同时使用"

9749

9750 #. unexpected type

9549 -#: git-submodule.sh:892

9751 +#: git-submodule.sh:979

9752 #, sh-format

9753 msgid "unexpected mode $mod_dst"

9754 msgstr "意外的模式 $mod_dst"

9755

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

9555 -#: git-submodule.sh:910

9757 +#: git-submodule.sh:997

9758 #, sh-format

9759 msgid " Warn: $name doesn't contain commit $sha1_src"

9760 msgstr " 警告：$name 未包含提交 $sha1_src"

9761

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

9561 -#: git-submodule.sh:913

9763 +#: git-submodule.sh:1000

9764 #, sh-format

9765 msgid " Warn: $name doesn't contain commit $sha1_dst"

9766 msgstr " 警告：$name 未包含提交 $sha1_dst"

9767

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

9567 -#: git-submodule.sh:916

9769 +#: git-submodule.sh:1003

9770 #, sh-format

9771 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

9772 msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"

9773

9572 -#: git-submodule.sh:941

9774 +#: git-submodule.sh:1028

9775 msgid "blob"

9776 msgstr "数据对象"

9777

9576 -#: git-submodule.sh:979

9778 +#: git-submodule.sh:1066

9779 msgid "Submodules changed but not updated:"

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

9781

9580 -#: git-submodule.sh:981

9782 +#: git-submodule.sh:1068

9783 msgid "Submodule changes to be committed:"

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

9785

9584 -#: git-submodule.sh:1129

9786 +#: git-submodule.sh:1153

9787 +#, sh-format

9788 +msgid "Failed to recurse into submodule path '$sm_path'"

9789 +msgstr "无法递归进子模组路径 '$sm_path'"

9790 +

9791 +#: git-submodule.sh:1216

9792 #, sh-format

9793 msgid "Synchronizing submodule url for '$prefix$sm_path'"

9794 msgstr "为 '$prefix$sm_path' 同步子模组 url"

9795

9796 +#, fuzzy

9797 +#~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'"

9798 +#~ msgstr "为 '$prefix$sm_path' 同步子模组 url"

9799 +

9800 +#~ msgid "use any ref in .git/refs"

9801 +#~ msgstr "使用 .git/refs 里的任意引用"

9802 +

9803 +#~ msgid "use any tag in .git/refs/tags"

9804 +#~ msgstr "使用 .git/refs/tags 里的任意 tag"

9805 +

9806 +#~ msgid "bad object %s"

9807 +#~ msgstr "坏对象 %s"

9808 +

9809 +#~ msgid "bogus committer info %s"

9810 +#~ msgstr "虚假的提交者信息 %s"

9811 +

9812 #~ msgid "can't fdopen 'show' output fd"

9813 #~ msgstr "不能打开 'show' 输出文件句柄"

9814

l10n: zh_CN.po: translate 54 messages (2048t0f0u)