07432cef2c · matheusbsbs/matheus-bagliano

@@ -1,6 +1,6 @@

1 # Chinese translations for Git package

2 # Git 软件包的简体中文翻译.

4 # This file is distributed under the same license as the Git package.

5 # Contributers:

6 # - Jiang Xin <worldhello.net AT gmail.com>

@@ -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: 2012-09-15 10:21+0800\n"

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

15 +"POT-Creation-Date: 2013-01-25 12:33+0800\n"

16 +"PO-Revision-Date: 2013-02-09 00:47+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:40

25 +#: advice.c:45

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:70

34 +#: advice.c:75

35 msgid ""

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

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

@@ -43,93 +43,98 @@ msgstr ""

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

44

45 #: archive.c:10

46 -#, fuzzy

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

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

47 +msgstr "git archive [选项] <树或提交> [<路径>...]"

48

49 #: archive.c:11

51 -#, fuzzy

50 msgid "git archive --list"

53 -msgstr "git archive：NACK %s"

51 +msgstr "git archive --list"

52

53 #: archive.c:12

54 msgid ""

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

56 msgstr ""

57 +"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"

58

59 #: archive.c:13

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

62 -msgstr ""

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

62

64 -#: archive.c:322

63 +#: archive.c:323

64 msgid "fmt"

66 -msgstr ""

65 +msgstr "格式"

66

68 -#: archive.c:322

67 +#: archive.c:323

68 msgid "archive format"

70 -msgstr ""

69 +msgstr "归档格式"

70

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

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

72 msgid "prefix"

74 -msgstr ""

73 +msgstr "前缀"

74

76 -#: archive.c:324

75 +#: archive.c:325

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

78 -msgstr ""

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

78

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

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

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

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

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

79 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380

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

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

82 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540

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

84 msgid "file"

85 msgstr "文件"

86

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

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

88 msgid "write the archive to this file"

90 -msgstr ""

89 +msgstr "归档写入此文件"

90

92 -#: archive.c:328

93 -#, fuzzy

91 +#: archive.c:329

92 msgid "read .gitattributes in working directory"

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

93 +msgstr "读取工作区中的 .gitattributes"

94

97 -#: archive.c:329

95 +#: archive.c:330

96 msgid "report archived files on stderr"

99 -msgstr ""

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

98

101 -#: archive.c:330

99 +#: archive.c:331

100 msgid "store only"

103 -msgstr ""

101 +msgstr "只存储"

102

105 -#: archive.c:331

103 +#: archive.c:332

104 msgid "compress faster"

107 -msgstr ""

105 +msgstr "压缩速度更快"

106

109 -#: archive.c:339

107 +#: archive.c:340

108 msgid "compress better"

111 -msgstr ""

109 +msgstr "压缩效果更好"

110

113 -#: archive.c:342

111 +#: archive.c:343

112 msgid "list supported archive formats"

115 -msgstr ""

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

114

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

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

116 msgid "repo"

119 -msgstr ""

117 +msgstr "版本库"

118

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

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

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

123 -msgstr ""

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

122

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

126 -#, fuzzy

123 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619

124 msgid "command"

128 -msgstr "运行 $command"

125 +msgstr "命令"

126

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

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

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

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

130 +

131 +#: attr.c:259

132 +msgid ""

133 +"Negative patterns are forbidden in git attributes\n"

134 +"Use '\\!' for literal leading exclamation."

135 msgstr ""

136 +"在 git attributes 中不允许使用负值模版\n"

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

138

139 #: bundle.c:36

140 #, c-format

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

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

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

148

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

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

150 #, c-format

151 msgid "could not open '%s'"

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

@@ -150,9 +155,9 @@ msgstr "不能打开 '%s'"

155 msgid "Repository lacks these prerequisite commits:"

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

157

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

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

155 -#: builtin/shortlog.c:181

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

160 +#: builtin/shortlog.c:157

161 msgid "revision walk setup failed"

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

163

@@ -178,7 +183,7 @@ msgstr[1] "这个包需要 %d 个这些引用"

183 msgid "rev-list died"

184 msgstr "rev-list 终止"

185

181 -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284

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

187 #, c-format

188 msgid "unrecognized argument: %s"

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

@@ -209,12 +214,12 @@ msgstr "不能创建 '%s'"

214 msgid "index-pack died"

215 msgstr "index-pack 终止"

216

212 -#: commit.c:48

217 +#: commit.c:50

218 #, c-format

219 msgid "could not parse %s"

220 msgstr "不能解析 %s"

221

217 -#: commit.c:50

222 +#: commit.c:52

223 #, c-format

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

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

@@ -305,18 +310,23 @@ msgstr[0] "%lu 年前"

310 msgstr[1] "%lu 年前"

311

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

308 -#: diff.c:105

313 +#: diff.c:111

314 #, c-format

310 -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"

311 -msgstr " 无法解析 dirstat 阈值 '%.*s'\n"

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

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

317

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

314 -#: diff.c:110

319 +#: diff.c:116

320 #, c-format

316 -msgid " Unknown dirstat parameter '%.*s'\n"

317 -msgstr " 未知 dirstat 参数 '%.*s'\n"

321 +msgid " Unknown dirstat parameter '%s'\n"

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

323

319 -#: diff.c:210

324 +#: diff.c:194

325 +#, c-format

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

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

328 +

329 +#: diff.c:237

330 #, c-format

331 msgid ""

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

@@ -325,32 +335,7 @@ msgstr ""

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

336 "%s"

337

328 -#: diff.c:1401

329 -msgid " 0 files changed"

330 -msgstr " 0 个文件被修改"

331 -

332 -#: diff.c:1405

333 -#, c-format

334 -msgid " %d file changed"

335 -msgid_plural " %d files changed"

336 -msgstr[0] " %d 个文件被修改"

337 -msgstr[1] " %d 个文件被修改"

338 -

339 -#: diff.c:1422

340 -#, c-format

341 -msgid ", %d insertion(+)"

342 -msgid_plural ", %d insertions(+)"

343 -msgstr[0] "，插入 %d 行(+)"

344 -msgstr[1] "，插入 %d 行(+)"

345 -

346 -#: diff.c:1433

347 -#, c-format

348 -msgid ", %d deletion(-)"

349 -msgid_plural ", %d deletions(-)"

350 -msgstr[0] "，删除 %d 行(-)"

351 -msgstr[1] "，删除 %d 行(-)"

352 -

353 -#: diff.c:3460

338 +#: diff.c:3494

339 #, c-format

340 msgid ""

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

@@ -359,6 +344,11 @@ msgstr ""

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

345 "%s"

346

347 +#: diff.c:3508

348 +#, c-format

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

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

351 +

352 #: gpg-interface.c:59

353 msgid "could not run gpg."

354 msgstr "不能执行 gpg。"

@@ -371,17 +361,17 @@ msgstr "gpg 没有接受数据"

361 msgid "gpg failed to sign the data"

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

363

374 -#: grep.c:1320

364 +#: grep.c:1622

365 #, c-format

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

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

368

379 -#: grep.c:1337

369 +#: grep.c:1639

370 #, c-format

371 msgid "'%s': %s"

372 msgstr "'%s'：%s"

373

384 -#: grep.c:1348

374 +#: grep.c:1650

375 #, c-format

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

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

@@ -441,6 +431,15 @@ msgstr[1] ""

431 "\n"

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

433

434 +#: merge.c:56

435 +msgid "failed to read the cache"

436 +msgstr "无法读取缓存"

437 +

438 +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534

439 +#: builtin/clone.c:586

440 +msgid "unable to write new index file"

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

442 +

443 #: merge-recursive.c:190

444 #, c-format

445 msgid "(bad commit)\n"

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

483 #: merge-recursive.c:750

484 #, c-format

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

487 -msgstr "%s '%s' 应为二进制对象（blob）"

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

487

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

489 #, c-format

@@ -568,7 +567,7 @@ msgstr ""

567 #: merge-recursive.c:1248

568 #, c-format

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

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

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

571

572 #: merge-recursive.c:1447

573 #, c-format

@@ -593,7 +592,7 @@ msgstr "不能读取对象 %s"

592 #: merge-recursive.c:1516

593 #, c-format

594 msgid "object %s is not a blob"

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

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

596

597 #: merge-recursive.c:1564

598 msgid "modify"

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

620 msgid "Auto-merging %s"

621 msgstr "自动合并 %s"

622

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

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

624 msgid "submodule"

625 msgstr "子模组"

626

@@ -691,40 +690,44 @@ msgstr "合并未返回提交"

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

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

692

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

693 +#: merge-recursive.c:2009 builtin/merge.c:643

694 msgid "Unable to write index."

695 msgstr "不能写入索引。"

696

698 -#: parse-options.c:494

697 +#: parse-options.c:485

698 msgid "..."

699 msgstr "..."

700

702 -#: parse-options.c:512

701 +#: parse-options.c:503

702 #, c-format

703 msgid "usage: %s"

704 msgstr "用法：%s"

705

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

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

709 -#: parse-options.c:516

708 +#: parse-options.c:507

709 #, c-format

710 msgid " or: %s"

711 msgstr " 或：%s"

712

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

715 -#: parse-options.c:519

714 +#: parse-options.c:510

715 #, c-format

716 msgid " %s"

717 msgstr " %s"

718

720 -#: remote.c:1632

719 +#: remote.c:1686

720 #, c-format

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

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

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

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

725

727 -#: remote.c:1638

726 +#: remote.c:1692

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

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

729 +

730 +#: remote.c:1695

731 #, c-format

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

733 msgid_plural ""

@@ -732,7 +735,12 @@ msgid_plural ""

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

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

737

735 -#: remote.c:1646

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

739 +#: remote.c:1703

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

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

742 +

743 +#: remote.c:1706

744 #, c-format

745 msgid ""

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

@@ -747,19 +755,24 @@ msgstr[1] ""

755 "您的分支和 '%s' 出现了偏离，\n"

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

757

750 -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977

751 -#: builtin/merge.c:1087 builtin/merge.c:1097

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

759 +#: remote.c:1716

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

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

762 +

763 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985

764 +#: builtin/merge.c:995

765 #, c-format

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

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

768

756 -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867

757 -#: builtin/merge.c:1089 builtin/merge.c:1102

769 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987

770 +#: builtin/merge.c:1000

771 #, c-format

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

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

774

762 -#: sequencer.c:144

775 +#: sequencer.c:146

776 msgid ""

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

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

@@ -767,7 +780,7 @@ msgstr ""

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

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

782

770 -#: sequencer.c:147

783 +#: sequencer.c:149

784 msgid ""

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

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

@@ -776,214 +789,210 @@ msgstr ""

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

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

791

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

792 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857

793 #, c-format

794 msgid "Could not write to %s"

795 msgstr "不能写入 %s"

796

784 -#: sequencer.c:163

797 +#: sequencer.c:165

798 #, c-format

799 msgid "Error wrapping up %s"

800 msgstr "错误收尾 %s"

801

789 -#: sequencer.c:178

802 +#: sequencer.c:180

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

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

805

793 -#: sequencer.c:180

806 +#: sequencer.c:182

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

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

809

797 -#: sequencer.c:183

810 +#: sequencer.c:185

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

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

813

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

802 -#: sequencer.c:233

815 +#: sequencer.c:236

816 #, c-format

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

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

819

807 -#: sequencer.c:261

820 +#: sequencer.c:267

821 msgid "Could not resolve HEAD commit\n"

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

823

811 -#: sequencer.c:282

824 +#: sequencer.c:288

825 msgid "Unable to update cache tree\n"

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

827

815 -#: sequencer.c:327

828 +#: sequencer.c:333

829 #, c-format

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

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

832

820 -#: sequencer.c:332

833 +#: sequencer.c:338

834 #, c-format

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

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

837

825 -#: sequencer.c:398

838 +#: sequencer.c:404

839 msgid "Your index file is unmerged."

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

841

829 -#: sequencer.c:401

830 -msgid "You do not have a valid HEAD"

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

832 -

833 -#: sequencer.c:416

842 +#: sequencer.c:423

843 #, c-format

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

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

846

838 -#: sequencer.c:424

847 +#: sequencer.c:431

848 #, c-format

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

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

851

843 -#: sequencer.c:428

852 +#: sequencer.c:435

853 #, c-format

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

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

856

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

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

850 -#: sequencer.c:439

859 +#: sequencer.c:448

860 #, c-format

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

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

863

855 -#: sequencer.c:443

864 +#: sequencer.c:452

865 #, c-format

866 msgid "Cannot get commit message for %s"

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

868

860 -#: sequencer.c:527

869 +#: sequencer.c:536

870 #, c-format

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

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

873

865 -#: sequencer.c:528

874 +#: sequencer.c:537

875 #, c-format

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

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

878

870 -#: sequencer.c:560

879 +#: sequencer.c:569

880 msgid "empty commit set passed"

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

882

874 -#: sequencer.c:568

883 +#: sequencer.c:577

884 #, c-format

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

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

887

879 -#: sequencer.c:573

888 +#: sequencer.c:582

889 #, c-format

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

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

892

884 -#: sequencer.c:631

893 +#: sequencer.c:640

894 #, c-format

895 msgid "Cannot %s during a %s"

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

897

889 -#: sequencer.c:653

898 +#: sequencer.c:662

899 #, c-format

900 msgid "Could not parse line %d."

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

902

894 -#: sequencer.c:658

903 +#: sequencer.c:667

904 msgid "No commits parsed."

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

906

898 -#: sequencer.c:671

907 +#: sequencer.c:680

908 #, c-format

909 msgid "Could not open %s"

910 msgstr "不能打开 %s"

911

903 -#: sequencer.c:675

912 +#: sequencer.c:684

913 #, c-format

914 msgid "Could not read %s."

915 msgstr "不能读取 %s。"

916

908 -#: sequencer.c:682

917 +#: sequencer.c:691

918 #, c-format

919 msgid "Unusable instruction sheet: %s"

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

921

913 -#: sequencer.c:710

922 +#: sequencer.c:719

923 #, c-format

924 msgid "Invalid key: %s"

925 msgstr "无效键名：%s"

926

918 -#: sequencer.c:713

927 +#: sequencer.c:722

928 #, c-format

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

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

931

923 -#: sequencer.c:725

932 +#: sequencer.c:734

933 #, c-format

934 msgid "Malformed options sheet: %s"

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

936

928 -#: sequencer.c:746

937 +#: sequencer.c:755

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

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

940

932 -#: sequencer.c:747

941 +#: sequencer.c:756

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

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

944

936 -#: sequencer.c:751

945 +#: sequencer.c:760

946 #, c-format

947 msgid "Could not create sequencer directory %s"

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

949

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

950 +#: sequencer.c:776 sequencer.c:861

951 #, c-format

952 msgid "Error wrapping up %s."

953 msgstr "错误收尾 %s。"

954

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

955 +#: sequencer.c:795 sequencer.c:929

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

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

958

950 -#: sequencer.c:788

959 +#: sequencer.c:797

960 msgid "cannot resolve HEAD"

961 msgstr "不能解析 HEAD"

962

954 -#: sequencer.c:790

963 +#: sequencer.c:799

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

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

966

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

967 +#: sequencer.c:821 builtin/apply.c:4016

968 #, c-format

969 msgid "cannot open %s: %s"

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

971

963 -#: sequencer.c:815

972 +#: sequencer.c:824

973 #, c-format

974 msgid "cannot read %s: %s"

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

976

968 -#: sequencer.c:816

977 +#: sequencer.c:825

978 msgid "unexpected end of file"

979 msgstr "意外的文件结束"

980

972 -#: sequencer.c:822

981 +#: sequencer.c:831

982 #, c-format

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

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

985

977 -#: sequencer.c:845

986 +#: sequencer.c:854

987 #, c-format

988 msgid "Could not format %s."

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

990

982 -#: sequencer.c:1007

991 +#: sequencer.c:1016

992 msgid "Can't revert as initial commit"

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

994

986 -#: sequencer.c:1008

995 +#: sequencer.c:1017

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

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

998

@@ -1007,16 +1016,21 @@ msgid "Upstream branch '%s' not stored as a remote-tracking branch"

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

1017

1018 #: wrapper.c:408

1010 -#, fuzzy, c-format

1019 +#, c-format

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

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

1021 +msgstr "不能访问 '%s'：%s"

1022 +

1023 +#: wrapper.c:423

1024 +#, c-format

1025 +msgid "unable to access '%s'"

1026 +msgstr "不能访问 '%s'"

1027

1014 -#: wrapper.c:426

1028 +#: wrapper.c:434

1029 #, c-format

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

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

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

1032

1019 -#: wrapper.c:427

1033 +#: wrapper.c:435

1034 msgid "no such user"

1035 msgstr "无此用户"

1036

@@ -1185,235 +1199,227 @@ msgstr "未合并： %s"

1199 msgid "bug: unhandled diff status %c"

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

1201

1188 -#: wt-status.c:785

1202 +#: wt-status.c:787

1203 msgid "You have unmerged paths."

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

1205

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

1193 -#: wt-status.c:788 wt-status.c:912

1207 +#: wt-status.c:790 wt-status.c:914

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

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

1210

1197 -#: wt-status.c:791

1211 +#: wt-status.c:793

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

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

1214

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

1202 -#: wt-status.c:794

1216 +#: wt-status.c:796

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

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

1219

1206 -#: wt-status.c:804

1220 +#: wt-status.c:806

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

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

1223

1210 -#: wt-status.c:807

1224 +#: wt-status.c:809

1225 msgid "The current patch is empty."

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

1227

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

1215 -#: wt-status.c:811

1229 +#: wt-status.c:813

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

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

1232

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

1220 -#: wt-status.c:813

1234 +#: wt-status.c:815

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

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

1237

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

1225 -#: wt-status.c:815

1239 +#: wt-status.c:817

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

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

1242

1229 -#: wt-status.c:873 wt-status.c:883

1243 +#: wt-status.c:875 wt-status.c:885

1244 msgid "You are currently rebasing."

1245 msgstr "您正在变基。"

1246

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

1234 -#: wt-status.c:876

1248 +#: wt-status.c:878

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

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

1251

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

1239 -#: wt-status.c:878

1253 +#: wt-status.c:880

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

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

1256

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

1244 -#: wt-status.c:880

1258 +#: wt-status.c:882

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

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

1261

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

1249 -#: wt-status.c:886

1263 +#: wt-status.c:888

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

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

1266

1253 -#: wt-status.c:888

1267 +#: wt-status.c:890

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

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

1270

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

1258 -#: wt-status.c:891

1272 +#: wt-status.c:893

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

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

1275

1262 -#: wt-status.c:893

1276 +#: wt-status.c:895

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

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

1279

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

1267 -#: wt-status.c:896

1281 +#: wt-status.c:898

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

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

1284

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

1272 -#: wt-status.c:898

1286 +#: wt-status.c:900

1287 msgid ""

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

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

1290

1277 -#: wt-status.c:908

1291 +#: wt-status.c:910

1292 msgid "You are currently cherry-picking."

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

1294

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

1282 -#: wt-status.c:915

1296 +#: wt-status.c:917

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

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

1299

1286 -#: wt-status.c:924

1300 +#: wt-status.c:926

1301 msgid "You are currently bisecting."

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

1303

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

1291 -#: wt-status.c:927

1305 +#: wt-status.c:929

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

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

1308

1295 -#: wt-status.c:978

1309 +#: wt-status.c:980

1310 msgid "On branch "

1311 msgstr "位于分支 "

1312

1299 -#: wt-status.c:985

1313 +#: wt-status.c:987

1314 msgid "Not currently on any branch."

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

1316

1303 -#: wt-status.c:997

1317 +#: wt-status.c:999

1318 msgid "Initial commit"

1319 msgstr "初始提交"

1320

1307 -#: wt-status.c:1011

1308 -#, fuzzy

1321 +#: wt-status.c:1013

1322 msgid "Untracked files"

1310 -msgstr "未跟踪的"

1323 +msgstr "未跟踪的文件"

1324

1312 -#: wt-status.c:1013

1313 -#, fuzzy

1325 +#: wt-status.c:1015

1326 msgid "Ignored files"

1315 -msgstr "忽略的"

1327 +msgstr "忽略的文件"

1328

1317 -#: wt-status.c:1015

1329 +#: wt-status.c:1017

1330 #, c-format

1331 msgid "Untracked files not listed%s"

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

1333

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

1323 -#: wt-status.c:1017

1335 +#: wt-status.c:1019

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

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

1338

1327 -#: wt-status.c:1023

1339 +#: wt-status.c:1025

1340 msgid "No changes"

1341 msgstr "没有修改"

1342

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

1332 -#: wt-status.c:1028

1333 -#, fuzzy, c-format

1344 +#: wt-status.c:1030

1345 +#, c-format

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

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

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

1348

1337 -#: wt-status.c:1031

1338 -#, fuzzy, c-format

1349 +#: wt-status.c:1033

1350 +#, c-format

1351 msgid "no changes added to commit\n"

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

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

1353

1342 -#: wt-status.c:1034

1343 -#, fuzzy, c-format

1354 +#: wt-status.c:1036

1355 +#, c-format

1356 msgid ""

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

1358 "track)\n"

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

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

1360

1349 -#: wt-status.c:1037

1350 -#, fuzzy, c-format

1361 +#: wt-status.c:1039

1362 +#, c-format

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

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

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

1365

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

1355 -#: wt-status.c:1040

1356 -#, fuzzy, c-format

1367 +#: wt-status.c:1042

1368 +#, c-format

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

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

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

1371

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

1361 -#, fuzzy, c-format

1372 +#: wt-status.c:1045 wt-status.c:1050

1373 +#, c-format

1374 msgid "nothing to commit\n"

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

1375 +msgstr "无文件要提交\n"

1376

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

1366 -#: wt-status.c:1046

1367 -#, fuzzy, c-format

1378 +#: wt-status.c:1048

1379 +#, c-format

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

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

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

1382

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

1372 -#: wt-status.c:1050

1373 -#, fuzzy, c-format

1384 +#: wt-status.c:1052

1385 +#, c-format

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

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

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

1388

1377 -#: wt-status.c:1158

1389 +#: wt-status.c:1160

1390 msgid "HEAD (no branch)"

1391 msgstr "HEAD（非分支）"

1392

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

1382 -#: wt-status.c:1164

1394 +#: wt-status.c:1166

1395 msgid "Initial commit on "

1396 msgstr "初始提交于 "

1397

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

1387 -#: wt-status.c:1179

1399 +#: wt-status.c:1181

1400 msgid "behind "

1401 msgstr "落后 "

1402

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

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

1404 +#: wt-status.c:1184 wt-status.c:1187

1405 msgid "ahead "

1406 msgstr "领先 "

1407

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

1397 -#: wt-status.c:1187

1409 +#: wt-status.c:1189

1410 msgid ", behind "

1411 msgstr "，落后 "

1412

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

1402 -#, c-format

1403 -msgid "failed to unlink '%s'"

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

1405 -

1413 #: builtin/add.c:19

1407 -#, fuzzy

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

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

1415 +msgstr "git add [选项] [--] <filepattern>..."

1416

1417 #: builtin/add.c:62

1418 #, c-format

1419 msgid "unexpected diff status %c"

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

1421

1416 -#: builtin/add.c:67 builtin/commit.c:229

1422 +#: builtin/add.c:67 builtin/commit.c:231

1423 msgid "updating files failed"

1424 msgstr "更新文件失败"

1425

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

1437 msgid "Unstaged changes after refreshing the index:"

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

1439

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

1440 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275

1441 #, c-format

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

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

@@ -1472,60 +1478,57 @@ msgstr "不能应用 '%s'"

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

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

1480

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

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

1477 -#: builtin/rm.c:133

1481 +#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63

1482 +#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253

1483 +#: builtin/rm.c:206

1484 msgid "dry run"

1479 -msgstr ""

1485 +msgstr "演习"

1486

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

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

1487 +#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160

1488 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522

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

1490 msgid "be verbose"

1491 msgstr "冗长输出"

1492

1493 #: builtin/add.c:322

1488 -#, fuzzy

1494 msgid "interactive picking"

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

1495 +msgstr "交互式拣选"

1496

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

1497 +#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258

1498 msgid "select hunks interactively"

1494 -msgstr ""

1499 +msgstr "交互式挑选数据块"

1500

1501 #: builtin/add.c:324

1502 msgid "edit current diff and apply"

1498 -msgstr ""

1503 +msgstr "编辑当前差异并应用"

1504

1505 #: builtin/add.c:325

1506 msgid "allow adding otherwise ignored files"

1502 -msgstr ""

1507 +msgstr "允许添加忽略的文件"

1508

1509 #: builtin/add.c:326

1505 -#, fuzzy

1510 msgid "update tracked files"

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

1511 +msgstr "更新已跟踪的文件"

1512

1513 #: builtin/add.c:327

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

1511 -msgstr ""

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

1516

1517 #: builtin/add.c:328

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

1515 -msgstr ""

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

1520

1521 #: builtin/add.c:329

1518 -#, fuzzy

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

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

1523 +msgstr "不添加，只刷新索引"

1524

1525 #: builtin/add.c:330

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

1524 -msgstr ""

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

1528

1529 #: builtin/add.c:331

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

1528 -msgstr ""

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

1532

1533 #: builtin/add.c:353

1534 #, c-format

@@ -1558,12 +1561,12 @@ msgstr "没有指定文件，也没有文件被添加。\n"

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

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

1563

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

1562 -#: builtin/rm.c:162

1564 +#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82

1565 +#: builtin/rm.c:235

1566 msgid "index file corrupt"

1567 msgstr "索引文件损坏"

1568

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

1569 +#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370

1570 msgid "Unable to write new index file"

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

1572

@@ -1691,28 +1694,24 @@ msgstr "无法读取符号链接 %s"

1694 msgid "unable to open or read %s"

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

1696

1694 -#: builtin/apply.c:2149

1695 -msgid "oops"

1696 -msgstr "哎哟"

1697 -

1698 -#: builtin/apply.c:2671

1697 +#: builtin/apply.c:2682

1698 #, c-format

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

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

1701

1703 -#: builtin/apply.c:2789

1702 +#: builtin/apply.c:2800

1703 #, c-format

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

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

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

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

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

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

1708

1710 -#: builtin/apply.c:2801

1709 +#: builtin/apply.c:2812

1710 #, c-format

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

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

1713

1715 -#: builtin/apply.c:2807

1714 +#: builtin/apply.c:2818

1715 #, c-format

1716 msgid ""

1717 "while searching for:\n"

@@ -1721,319 +1720,318 @@ msgstr ""

1720 "当查询：\n"

1721 "%.*s"

1722

1724 -#: builtin/apply.c:2826

1723 +#: builtin/apply.c:2837

1724 #, c-format

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

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

1727

1729 -#: builtin/apply.c:2929

1728 +#: builtin/apply.c:2940

1729 #, c-format

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

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

1732

1734 -#: builtin/apply.c:2935

1733 +#: builtin/apply.c:2946

1734 #, c-format

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

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

1737

1739 -#: builtin/apply.c:2956

1738 +#: builtin/apply.c:2967

1739 #, c-format

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

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

1742

1744 -#: builtin/apply.c:3078

1743 +#: builtin/apply.c:3089

1744 #, c-format

1745 msgid "cannot checkout %s"

1746 msgstr "不能检出 %s"

1747

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

1748 +#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187

1749 #, c-format

1750 msgid "read of %s failed"

1751 msgstr "读取 %s 失败"

1752

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

1753 +#: builtin/apply.c:3167 builtin/apply.c:3389

1754 #, c-format

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

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

1757

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

1758 +#: builtin/apply.c:3248 builtin/apply.c:3403

1759 #, c-format

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

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

1762

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

1763 +#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417

1764 #, c-format

1765 msgid "%s: %s"

1766 msgstr "%s：%s"

1767

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

1768 +#: builtin/apply.c:3257 builtin/apply.c:3411

1769 #, c-format

1770 msgid "%s: does not match index"

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

1772

1774 -#: builtin/apply.c:3348

1773 +#: builtin/apply.c:3359

1774 msgid "removal patch leaves file contents"

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

1776

1778 -#: builtin/apply.c:3417

1777 +#: builtin/apply.c:3428

1778 #, c-format

1779 msgid "%s: wrong type"

1780 msgstr "%s：错误类型"

1781

1783 -#: builtin/apply.c:3419

1782 +#: builtin/apply.c:3430

1783 #, c-format

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

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

1786

1788 -#: builtin/apply.c:3520

1787 +#: builtin/apply.c:3531

1788 #, c-format

1789 msgid "%s: already exists in index"

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

1791

1793 -#: builtin/apply.c:3523

1792 +#: builtin/apply.c:3534

1793 #, c-format

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

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

1796

1798 -#: builtin/apply.c:3543

1797 +#: builtin/apply.c:3554

1798 #, c-format

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

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

1801

1803 -#: builtin/apply.c:3548

1802 +#: builtin/apply.c:3559

1803 #, c-format

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

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

1806

1808 -#: builtin/apply.c:3556

1807 +#: builtin/apply.c:3567

1808 #, c-format

1809 msgid "%s: patch does not apply"

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

1811

1813 -#: builtin/apply.c:3569

1812 +#: builtin/apply.c:3580

1813 #, c-format

1814 msgid "Checking patch %s..."

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

1816

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

1817 +#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124

1818 #, c-format

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

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

1821

1823 -#: builtin/apply.c:3767

1822 +#: builtin/apply.c:3778

1823 #, c-format

1824 msgid "unable to remove %s from index"

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

1826

1828 -#: builtin/apply.c:3795

1827 +#: builtin/apply.c:3806

1828 #, c-format

1829 msgid "corrupt patch for subproject %s"

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

1831

1833 -#: builtin/apply.c:3799

1832 +#: builtin/apply.c:3810

1833 #, c-format

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

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

1836

1838 -#: builtin/apply.c:3804

1837 +#: builtin/apply.c:3815

1838 #, c-format

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

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

1841

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

1842 +#: builtin/apply.c:3818 builtin/apply.c:3926

1843 #, c-format

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

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

1846

1848 -#: builtin/apply.c:3840

1847 +#: builtin/apply.c:3851

1848 #, c-format

1849 msgid "closing file '%s'"

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

1851

1853 -#: builtin/apply.c:3889

1852 +#: builtin/apply.c:3900

1853 #, c-format

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

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

1856

1858 -#: builtin/apply.c:3976

1857 +#: builtin/apply.c:3987

1858 #, c-format

1859 msgid "Applied patch %s cleanly."

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

1861

1863 -#: builtin/apply.c:3984

1862 +#: builtin/apply.c:3995

1863 msgid "internal error"

1864 msgstr "内部错误"

1865

1866 #. Say this even without --verbose

1868 -#: builtin/apply.c:3987

1867 +#: builtin/apply.c:3998

1868 #, c-format

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

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

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

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

1873

1875 -#: builtin/apply.c:3997

1874 +#: builtin/apply.c:4008

1875 #, c-format

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

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

1878

1880 -#: builtin/apply.c:4018

1879 +#: builtin/apply.c:4029

1880 #, c-format

1881 msgid "Hunk #%d applied cleanly."

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

1883

1885 -#: builtin/apply.c:4021

1884 +#: builtin/apply.c:4032

1885 #, c-format

1886 msgid "Rejected hunk #%d."

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

1888

1890 -#: builtin/apply.c:4171

1889 +#: builtin/apply.c:4182

1890 msgid "unrecognized input"

1891 msgstr "未能识别的输入"

1892

1894 -#: builtin/apply.c:4182

1893 +#: builtin/apply.c:4193

1894 msgid "unable to read index file"

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

1896

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

1897 +#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91

1898 #: builtin/fetch.c:63

1899 msgid "path"

1900 msgstr "路径"

1901

1903 -#: builtin/apply.c:4302

1902 +#: builtin/apply.c:4313

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

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

1905

1907 -#: builtin/apply.c:4305

1906 +#: builtin/apply.c:4316

1907 msgid "apply changes matching the given path"

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

1909

1911 -#: builtin/apply.c:4307

1910 +#: builtin/apply.c:4318

1911 msgid "num"

1912 msgstr "数字"

1913

1915 -#: builtin/apply.c:4308

1914 +#: builtin/apply.c:4319

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

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

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

1917

1919 -#: builtin/apply.c:4311

1918 +#: builtin/apply.c:4322

1919 msgid "ignore additions made by the patch"

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

1921

1923 -#: builtin/apply.c:4313

1922 +#: builtin/apply.c:4324

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

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

1925

1927 -#: builtin/apply.c:4317

1928 -#, fuzzy

1926 +#: builtin/apply.c:4328

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

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

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

1929

1932 -#: builtin/apply.c:4319

1930 +#: builtin/apply.c:4330

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

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

1933

1936 -#: builtin/apply.c:4321

1934 +#: builtin/apply.c:4332

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

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

1937

1940 -#: builtin/apply.c:4323

1938 +#: builtin/apply.c:4334

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

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

1941

1944 -#: builtin/apply.c:4325

1942 +#: builtin/apply.c:4336

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

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

1945

1948 -#: builtin/apply.c:4327

1946 +#: builtin/apply.c:4338

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

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

1949

1952 -#: builtin/apply.c:4329

1950 +#: builtin/apply.c:4340

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

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

1953

1956 -#: builtin/apply.c:4331

1954 +#: builtin/apply.c:4342

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

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

1957

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

1958 +#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460

1959 msgid "paths are separated with NUL character"

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

1961

1964 -#: builtin/apply.c:4336

1962 +#: builtin/apply.c:4347

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

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

1965

1968 -#: builtin/apply.c:4337

1966 +#: builtin/apply.c:4348

1967 msgid "action"

1968 msgstr "动作"

1969

1972 -#: builtin/apply.c:4338

1970 +#: builtin/apply.c:4349

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

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

1973

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

1974 +#: builtin/apply.c:4352 builtin/apply.c:4355

1975 msgid "ignore changes in whitespace when finding context"

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

1977

1980 -#: builtin/apply.c:4347

1978 +#: builtin/apply.c:4358

1979 msgid "apply the patch in reverse"

1980 msgstr "反向应用补丁"

1981

1984 -#: builtin/apply.c:4349

1982 +#: builtin/apply.c:4360

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

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

1985

1988 -#: builtin/apply.c:4351

1986 +#: builtin/apply.c:4362

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

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

1989

1992 -#: builtin/apply.c:4353

1990 +#: builtin/apply.c:4364

1991 msgid "allow overlapping hunks"

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

1993

1996 -#: builtin/apply.c:4356

1994 +#: builtin/apply.c:4367

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

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

1997

2000 -#: builtin/apply.c:4359

1998 +#: builtin/apply.c:4370

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

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

2001

2004 -#: builtin/apply.c:4361

2002 +#: builtin/apply.c:4372

2003 msgid "root"

2004 msgstr "根目录"

2005

2008 -#: builtin/apply.c:4362

2006 +#: builtin/apply.c:4373

2007 msgid "prepend <root> to all filenames"

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

2009

2012 -#: builtin/apply.c:4384

2010 +#: builtin/apply.c:4395

2011 msgid "--3way outside a repository"

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

2013

2016 -#: builtin/apply.c:4392

2014 +#: builtin/apply.c:4403

2015 msgid "--index outside a repository"

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

2017

2020 -#: builtin/apply.c:4395

2018 +#: builtin/apply.c:4406

2019 msgid "--cached outside a repository"

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

2021

2024 -#: builtin/apply.c:4411

2022 +#: builtin/apply.c:4422

2023 #, c-format

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

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

2026

2029 -#: builtin/apply.c:4425

2027 +#: builtin/apply.c:4436

2028 #, c-format

2029 msgid "squelched %d whitespace error"

2030 msgid_plural "squelched %d whitespace errors"

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

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

2033

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

2034 +#: builtin/apply.c:4442 builtin/apply.c:4452

2035 #, c-format

2036 msgid "%d line adds whitespace errors."

2037 msgid_plural "%d lines add whitespace errors."

@@ -2077,135 +2075,131 @@ msgstr "git archive：应为刷新"

2075

2076 #: builtin/bisect--helper.c:7

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

2080 -msgstr ""

2078 +msgstr "git bisect--helper --next-all [--no-checkout]"

2079

2080 #: builtin/bisect--helper.c:17

2081 msgid "perform 'git bisect next'"

2084 -msgstr ""

2082 +msgstr "执行 'git bisect next'"

2083

2084 #: builtin/bisect--helper.c:19

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

2088 -msgstr ""

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

2087

2088 #: builtin/blame.c:25

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

2092 -msgstr ""

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

2091

2092 #: builtin/blame.c:30 builtin/shortlog.c:15

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

2096 -msgstr ""

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

2095

2098 -#: builtin/blame.c:2316

2096 +#: builtin/blame.c:2364

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

2100 -msgstr ""

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

2099

2102 -#: builtin/blame.c:2317

2100 +#: builtin/blame.c:2365

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

2104 -msgstr ""

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

2103

2106 -#: builtin/blame.c:2318

2104 +#: builtin/blame.c:2366

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

2108 -msgstr ""

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

2107

2110 -#: builtin/blame.c:2319

2111 -#, fuzzy

2108 +#: builtin/blame.c:2367

2109 msgid "Show work cost statistics"

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

2110 +msgstr "显示命令消耗统计"

2111

2115 -#: builtin/blame.c:2320

2112 +#: builtin/blame.c:2368

2113 msgid "Show output score for blame entries"

2117 -msgstr ""

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

2115

2119 -#: builtin/blame.c:2321

2116 +#: builtin/blame.c:2369

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

2121 -msgstr ""

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

2119

2123 -#: builtin/blame.c:2322

2120 +#: builtin/blame.c:2370

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

2125 -msgstr ""

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

2123

2127 -#: builtin/blame.c:2323

2124 +#: builtin/blame.c:2371

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

2129 -msgstr ""

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

2127

2131 -#: builtin/blame.c:2324

2128 +#: builtin/blame.c:2372

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

2133 -msgstr ""

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

2131

2135 -#: builtin/blame.c:2325

2132 +#: builtin/blame.c:2373

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

2137 -msgstr ""

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

2135

2139 -#: builtin/blame.c:2326

2136 +#: builtin/blame.c:2374

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

2141 -msgstr ""

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

2139

2143 -#: builtin/blame.c:2327

2140 +#: builtin/blame.c:2375

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

2145 -msgstr ""

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

2143

2147 -#: builtin/blame.c:2328

2144 +#: builtin/blame.c:2376

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

2149 -msgstr ""

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

2147

2151 -#: builtin/blame.c:2329

2148 +#: builtin/blame.c:2377

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

2153 -msgstr ""

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

2151

2155 -#: builtin/blame.c:2330

2152 +#: builtin/blame.c:2378

2153 msgid "Ignore whitespace differences"

2157 -msgstr ""

2154 +msgstr "忽略空白差异"

2155

2159 -#: builtin/blame.c:2331

2156 +#: builtin/blame.c:2379

2157 msgid "Spend extra cycles to find better match"

2161 -msgstr ""

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

2159

2163 -#: builtin/blame.c:2332

2160 +#: builtin/blame.c:2380

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

2165 -msgstr ""

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

2163

2167 -#: builtin/blame.c:2333

2168 -#, fuzzy

2164 +#: builtin/blame.c:2381

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

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

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

2167

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

2168 +#: builtin/blame.c:2382 builtin/blame.c:2383

2169 msgid "score"

2174 -msgstr ""

2170 +msgstr "得分"

2171

2176 -#: builtin/blame.c:2334

2172 +#: builtin/blame.c:2382

2173 msgid "Find line copies within and across files"

2178 -msgstr ""

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

2175

2180 -#: builtin/blame.c:2335

2176 +#: builtin/blame.c:2383

2177 msgid "Find line movements within and across files"

2182 -msgstr ""

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

2179

2184 -#: builtin/blame.c:2336

2185 -#, fuzzy

2180 +#: builtin/blame.c:2384

2181 msgid "n,m"

2187 -msgstr "数字"

2182 +msgstr "n,m"

2183

2189 -#: builtin/blame.c:2336

2184 +#: builtin/blame.c:2384

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

2191 -msgstr ""

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

2187

2188 #: builtin/branch.c:23

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

2195 -msgstr ""

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

2191

2192 #: builtin/branch.c:24

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

2199 -msgstr ""

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

2195

2196 #: builtin/branch.c:25

2202 -#, fuzzy

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

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

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

2199

2200 #: builtin/branch.c:26

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

2208 -msgstr ""

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

2203

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

2205 #: builtin/branch.c:145

@@ -2227,294 +2221,291 @@ msgstr ""

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

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

2223

2230 -#: builtin/branch.c:181

2224 +#: builtin/branch.c:163

2225 +#, c-format

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

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

2228 +

2229 +#: builtin/branch.c:167

2230 +#, c-format

2231 +msgid ""

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

2233 +"If you are sure you want to delete it, run 'git branch -D %s'."

2234 +msgstr ""

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

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

2237 +

2238 +#: builtin/branch.c:180

2239 +msgid "Update of config-file failed"

2240 +msgstr "无法更新 config 文件"

2241 +

2242 +#: builtin/branch.c:208

2243 msgid "cannot use -a with -d"

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

2245

2234 -#: builtin/branch.c:187

2246 +#: builtin/branch.c:214

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

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

2249

2238 -#: builtin/branch.c:192

2250 +#: builtin/branch.c:222

2251 #, c-format

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

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

2254

2243 -#: builtin/branch.c:203

2255 +#: builtin/branch.c:235

2256 #, c-format

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

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

2259

2248 -#: builtin/branch.c:204

2260 +#: builtin/branch.c:236

2261 #, c-format

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

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

2264

2253 -#: builtin/branch.c:211

2254 -#, c-format

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

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

2257 -

2258 -#: builtin/branch.c:217

2259 -#, c-format

2260 -msgid ""

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

2262 -"If you are sure you want to delete it, run 'git branch -D %s'."

2263 -msgstr ""

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

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

2266 -

2267 -#: builtin/branch.c:226

2265 +#: builtin/branch.c:250

2266 #, c-format

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

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

2269

2272 -#: builtin/branch.c:227

2270 +#: builtin/branch.c:251

2271 #, c-format

2272 msgid "Error deleting branch '%s'"

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

2274

2277 -#: builtin/branch.c:234

2275 +#: builtin/branch.c:258

2276 #, c-format

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

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

2279

2282 -#: builtin/branch.c:235

2280 +#: builtin/branch.c:259

2281 #, c-format

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

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

2284

2287 -#: builtin/branch.c:240

2288 -msgid "Update of config-file failed"

2289 -msgstr "无法更新 config 文件"

2290 -

2291 -#: builtin/branch.c:338

2285 +#: builtin/branch.c:361

2286 #, c-format

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

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

2289

2296 -#: builtin/branch.c:410

2290 +#: builtin/branch.c:433

2291 #, c-format

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

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

2294

2301 -#: builtin/branch.c:412

2295 +#: builtin/branch.c:435

2296 #, c-format

2297 msgid "[behind %d]"

2298 msgstr "[落后 %d]"

2299

2306 -#: builtin/branch.c:416

2300 +#: builtin/branch.c:439

2301 #, c-format

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

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

2304

2311 -#: builtin/branch.c:418

2305 +#: builtin/branch.c:441

2306 #, c-format

2307 msgid "[ahead %d]"

2308 msgstr "[领先 %d]"

2309

2316 -#: builtin/branch.c:421

2310 +#: builtin/branch.c:444

2311 #, c-format

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

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

2314

2321 -#: builtin/branch.c:424

2315 +#: builtin/branch.c:447

2316 #, c-format

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

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

2319

2326 -#: builtin/branch.c:537

2320 +#: builtin/branch.c:560

2321 msgid "(no branch)"

2322 msgstr "（非分支）"

2323

2330 -#: builtin/branch.c:602

2324 +#: builtin/branch.c:625

2325 msgid "some refs could not be read"

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

2327

2334 -#: builtin/branch.c:615

2328 +#: builtin/branch.c:638

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

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

2331

2338 -#: builtin/branch.c:625

2332 +#: builtin/branch.c:648

2333 #, c-format

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

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

2336

2343 -#: builtin/branch.c:640

2337 +#: builtin/branch.c:663

2338 msgid "Branch rename failed"

2339 msgstr "分支重命名失败"

2340

2347 -#: builtin/branch.c:644

2341 +#: builtin/branch.c:667

2342 #, c-format

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

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

2345

2352 -#: builtin/branch.c:648

2346 +#: builtin/branch.c:671

2347 #, c-format

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

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

2350

2357 -#: builtin/branch.c:655

2351 +#: builtin/branch.c:678

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

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

2354

2361 -#: builtin/branch.c:670

2355 +#: builtin/branch.c:693

2356 #, c-format

2357 msgid "malformed object name %s"

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

2359

2366 -#: builtin/branch.c:694

2360 +#: builtin/branch.c:717

2361 #, c-format

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

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

2364

2371 -#: builtin/branch.c:724

2372 -#, fuzzy

2365 +#: builtin/branch.c:747

2366 msgid "Generic options"

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

2367 +msgstr "通用选项"

2368

2376 -#: builtin/branch.c:726

2369 +#: builtin/branch.c:749

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

2378 -msgstr ""

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

2372

2380 -#: builtin/branch.c:727

2373 +#: builtin/branch.c:750

2374 msgid "suppress informational messages"

2382 -msgstr ""

2375 +msgstr "不显示信息"

2376

2384 -#: builtin/branch.c:728

2377 +#: builtin/branch.c:751

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

2386 -msgstr ""

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

2380

2388 -#: builtin/branch.c:730

2381 +#: builtin/branch.c:753

2382 msgid "change upstream info"

2390 -msgstr ""

2383 +msgstr "改变上游信息"

2384

2392 -#: builtin/branch.c:734

2393 -#, fuzzy

2385 +#: builtin/branch.c:757

2386 msgid "use colored output"

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

2387 +msgstr "使用彩色输出"

2388

2397 -#: builtin/branch.c:735

2398 -#, fuzzy

2389 +#: builtin/branch.c:758

2390 msgid "act on remote-tracking branches"

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

2391 +msgstr "作用于远程跟踪分支"

2392

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

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

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

2405 -#, fuzzy

2393 +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2394 +#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379

2395 +#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470

2396 msgid "commit"

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

2397 +msgstr "提交"

2398

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

2399 +#: builtin/branch.c:762 builtin/branch.c:768

2400 msgid "print only branches that contain the commit"

2411 -msgstr ""

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

2402

2413 -#: builtin/branch.c:751

2403 +#: builtin/branch.c:774

2404 msgid "Specific git-branch actions:"

2415 -msgstr ""

2405 +msgstr "具体的 git-branch 动作："

2406

2417 -#: builtin/branch.c:752

2407 +#: builtin/branch.c:775

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

2419 -msgstr ""

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

2410

2421 -#: builtin/branch.c:754

2411 +#: builtin/branch.c:777

2412 msgid "delete fully merged branch"

2423 -msgstr ""

2413 +msgstr "删除完全合并的分支"

2414

2425 -#: builtin/branch.c:755

2415 +#: builtin/branch.c:778

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

2427 -msgstr ""

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

2418

2429 -#: builtin/branch.c:756

2419 +#: builtin/branch.c:779

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

2431 -msgstr ""

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

2422

2433 -#: builtin/branch.c:757

2423 +#: builtin/branch.c:780

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

2435 -msgstr ""

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

2426

2437 -#: builtin/branch.c:758

2438 -#, fuzzy

2427 +#: builtin/branch.c:781

2428 msgid "list branch names"

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

2429 +msgstr "列出分支名"

2430

2442 -#: builtin/branch.c:759

2431 +#: builtin/branch.c:782

2432 msgid "create the branch's reflog"

2444 -msgstr ""

2433 +msgstr "创建分支的引用日志"

2434

2446 -#: builtin/branch.c:761

2435 +#: builtin/branch.c:784

2436 msgid "edit the description for the branch"

2448 -msgstr ""

2437 +msgstr "标记分支的描述"

2438

2450 -#: builtin/branch.c:762

2451 -#, fuzzy

2439 +#: builtin/branch.c:785

2440 msgid "force creation (when already exists)"

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

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

2442

2455 -#: builtin/branch.c:765

2456 -#, fuzzy

2443 +#: builtin/branch.c:788

2444 msgid "print only not merged branches"

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

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

2446

2460 -#: builtin/branch.c:771

2447 +#: builtin/branch.c:794

2448 msgid "print only merged branches"

2462 -msgstr ""

2449 +msgstr "只打印合并的分支"

2450

2464 -#: builtin/branch.c:775

2451 +#: builtin/branch.c:798

2452 msgid "list branches in columns"

2466 -msgstr ""

2453 +msgstr "以列的方式显示分支"

2454

2468 -#: builtin/branch.c:788

2455 +#: builtin/branch.c:811

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

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

2458

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

2459 +#: builtin/branch.c:816 builtin/clone.c:561

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

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

2462

2476 -#: builtin/branch.c:813

2463 +#: builtin/branch.c:836

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

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

2466

2480 -#: builtin/branch.c:864

2481 -#, fuzzy, c-format

2467 +#: builtin/branch.c:887

2468 +#, c-format

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

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

2470 +msgstr "分支 '%s' 不存在"

2471

2485 -#: builtin/branch.c:876

2472 +#: builtin/branch.c:899

2473 #, c-format

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

2488 -msgstr ""

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

2476

2490 -#: builtin/branch.c:891

2477 +#: builtin/branch.c:914

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

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

2480

2494 -#: builtin/branch.c:894

2481 +#: builtin/branch.c:917

2482 #, c-format

2483 msgid ""

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

2485 "track or --set-upstream-to\n"

2486 msgstr ""

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

2488

2501 -#: builtin/branch.c:911

2489 +#: builtin/branch.c:934

2490 #, c-format

2491 msgid ""

2492 "\n"

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

2494 "\n"

2495 msgstr ""

2496 +"\n"

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

2498 +"\n"

2499

2509 -#: builtin/branch.c:912

2510 -#, fuzzy, c-format

2500 +#: builtin/branch.c:935

2501 +#, c-format

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

2512 -msgstr " HEAD分支：%s"

2503 +msgstr " git branch -d %s\n"

2504

2514 -#: builtin/branch.c:913

2505 +#: builtin/branch.c:936

2506 #, c-format

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

2517 -msgstr ""

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

2509

2510 #: builtin/bundle.c:47

2511 #, c-format

@@ -2531,129 +2522,119 @@ msgstr "需要一个版本库来解包。"

2522

2523 #: builtin/cat-file.c:247

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

2534 -msgstr ""

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

2526

2527 #: builtin/cat-file.c:248

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

2538 -msgstr ""

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

2530

2531 #: builtin/cat-file.c:266

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

2542 -msgstr ""

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

2534

2535 #: builtin/cat-file.c:267

2545 -#, fuzzy

2536 msgid "show object type"

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

2537 +msgstr "显示对象类型"

2538

2539 #: builtin/cat-file.c:268

2550 -#, fuzzy

2540 msgid "show object size"

2552 -msgstr "坏对象 %s"

2541 +msgstr "显示对象大小"

2542

2543 #: builtin/cat-file.c:270

2544 msgid "exit with zero when there's no error"

2556 -msgstr ""

2545 +msgstr "当没有错误时退出并返回零"

2546

2547 #: builtin/cat-file.c:271

2548 msgid "pretty-print object's content"

2560 -msgstr ""

2549 +msgstr "美观地打印对象的内容"

2550

2551 #: builtin/cat-file.c:273

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

2564 -msgstr ""

2553 +msgstr "对于数据（blob）对象，对其内容执行 textconv"

2554

2555 #: builtin/cat-file.c:275

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

2568 -msgstr ""

2557 +msgstr "显示从标准输入提供的对象的信息和内容"

2558

2559 #: builtin/cat-file.c:278

2571 -#, fuzzy

2560 msgid "show info about objects fed from the standard input"

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

2561 +msgstr "显示从标准输入提供的对象的信息"

2562

2563 #: builtin/check-attr.c:11

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

2577 -msgstr ""

2565 +msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."

2566

2567 #: builtin/check-attr.c:12

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

2581 -msgstr ""

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

2569 +msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"

2570

2571 #: builtin/check-attr.c:19

2572 msgid "report all attributes set on file"

2585 -msgstr ""

2573 +msgstr "报告设置在文件上的所有属性"

2574

2575 #: builtin/check-attr.c:20

2576 msgid "use .gitattributes only from the index"

2589 -msgstr ""

2577 +msgstr "只使用索引中的 .gitattributes"

2578

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

2592 -#, fuzzy

2580 msgid "read file names from stdin"

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

2581 +msgstr "从标准输入读出文件名"

2582

2583 #: builtin/check-attr.c:23

2597 -#, fuzzy

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

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

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

2586

2587 #: builtin/checkout-index.c:126

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

2603 -msgstr ""

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

2590

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

2592 msgid "check out all files in the index"

2607 -msgstr ""

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

2594

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

2596 msgid "force overwrite of existing files"

2611 -msgstr ""

2597 +msgstr "强制覆盖现有的文件"

2598

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

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

2615 -msgstr ""

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

2602

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

2618 -#, fuzzy

2604 msgid "don't checkout new files"

2620 -msgstr "不能检出 %s"

2605 +msgstr "不检出新文件"

2606

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

2623 -#, fuzzy

2608 msgid "update stat information in the index file"

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

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

2610

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

2628 -#, fuzzy

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

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

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

2614

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

2616 msgid "write the content to temporary files"

2634 -msgstr ""

2617 +msgstr "将内容写入临时文件"

2618

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

2620 msgid "string"

2638 -msgstr ""

2621 +msgstr "字符串"

2622

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

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

2642 -msgstr ""

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

2626

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

2628 msgid "copy out the files from named stage"

2646 -msgstr ""

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

2630

2631 #: builtin/checkout.c:25

2649 -#, fuzzy

2632 msgid "git checkout [options] <branch>"

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

2633 +msgstr "git checkout [选项] <分支>"

2634

2635 #: builtin/checkout.c:26

2654 -#, fuzzy

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

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

2637 +msgstr "git checkout [选项] [<分支>] -- <文件>..."

2638

2639 #: builtin/checkout.c:116 builtin/checkout.c:149

2640 #, c-format

@@ -2687,19 +2668,19 @@ msgstr "无法为 '%s' 添加合并结果"

2668

2669 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242

2670 #: builtin/checkout.c:245

2690 -#, fuzzy, c-format

2671 +#, c-format

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

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

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

2674

2675 #: builtin/checkout.c:248 builtin/checkout.c:251

2695 -#, fuzzy, c-format

2676 +#, c-format

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

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

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

2679

2680 #: builtin/checkout.c:254

2681 #, c-format

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

2702 -msgstr ""

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

2684

2685 #: builtin/checkout.c:265 builtin/checkout.c:426

2686 msgid "corrupt index file"

@@ -2710,11 +2691,6 @@ msgstr "损坏的索引文件"

2691 msgid "path '%s' is unmerged"

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

2693

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

2714 -#: builtin/merge.c:811

2715 -msgid "unable to write new index file"

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

2717 -

2694 #: builtin/checkout.c:448

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

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

@@ -2743,7 +2719,7 @@ msgstr "已经位于 '%s'\n"

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

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

2721

2746 -#: builtin/checkout.c:618

2722 +#: builtin/checkout.c:618 builtin/checkout.c:955

2723 #, c-format

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

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

@@ -2820,313 +2796,299 @@ msgstr "无效引用：%s"

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

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

2798

2823 -#: builtin/checkout.c:961

2824 -#, fuzzy

2799 +#: builtin/checkout.c:964

2800 msgid "paths cannot be used with switching branches"

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

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

2802

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

2829 -#, fuzzy, c-format

2803 +#: builtin/checkout.c:967 builtin/checkout.c:971

2804 +#, c-format

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

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

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

2807

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

2834 -#: builtin/checkout.c:983

2835 -#, fuzzy, c-format

2808 +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983

2809 +#: builtin/checkout.c:986

2810 +#, c-format

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

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

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

2813

2839 -#: builtin/checkout.c:988

2840 -#, fuzzy, c-format

2814 +#: builtin/checkout.c:991

2815 +#, c-format

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

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

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

2818

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

2819 +#: builtin/checkout.c:1012 builtin/gc.c:177

2820 msgid "suppress progress reporting"

2846 -msgstr ""

2821 +msgstr "不显示进度报告"

2822

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

2823 +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89

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

2850 -#, fuzzy

2825 msgid "branch"

2852 -msgstr "位于分支 "

2826 +msgstr "分支"

2827

2854 -#: builtin/checkout.c:1011

2828 +#: builtin/checkout.c:1014

2829 msgid "create and checkout a new branch"

2856 -msgstr ""

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

2831

2858 -#: builtin/checkout.c:1013

2832 +#: builtin/checkout.c:1016

2833 msgid "create/reset and checkout a branch"

2860 -msgstr ""

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

2835

2862 -#: builtin/checkout.c:1014

2863 -#, fuzzy

2836 +#: builtin/checkout.c:1017

2837 msgid "create reflog for new branch"

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

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

2839

2867 -#: builtin/checkout.c:1015

2840 +#: builtin/checkout.c:1018

2841 msgid "detach the HEAD at named commit"

2869 -msgstr ""

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

2843

2871 -#: builtin/checkout.c:1016

2872 -#, fuzzy

2844 +#: builtin/checkout.c:1019

2845 msgid "set upstream info for new branch"

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

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

2847

2876 -#: builtin/checkout.c:1018

2877 -#, fuzzy

2848 +#: builtin/checkout.c:1021

2849 msgid "new branch"

2879 -msgstr "[新分支]"

2850 +msgstr "新分支"

2851

2881 -#: builtin/checkout.c:1018

2882 -#, fuzzy

2852 +#: builtin/checkout.c:1021

2853 msgid "new unparented branch"

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

2854 +msgstr "新的没有父提交的分支"

2855

2886 -#: builtin/checkout.c:1019

2856 +#: builtin/checkout.c:1022

2857 msgid "checkout our version for unmerged files"

2888 -msgstr ""

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

2859

2890 -#: builtin/checkout.c:1021

2860 +#: builtin/checkout.c:1024

2861 msgid "checkout their version for unmerged files"

2892 -msgstr ""

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

2863

2894 -#: builtin/checkout.c:1023

2864 +#: builtin/checkout.c:1026

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

2896 -msgstr ""

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

2867

2898 -#: builtin/checkout.c:1024

2868 +#: builtin/checkout.c:1027

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

2900 -msgstr ""

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

2871

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

2903 -#, fuzzy

2872 +#: builtin/checkout.c:1028 builtin/merge.c:215

2873 msgid "update ignored files (default)"

2905 -msgstr "更新文件失败"

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

2875

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

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

2877 msgid "style"

2909 -msgstr ""

2878 +msgstr "风格"

2879

2911 -#: builtin/checkout.c:1027

2880 +#: builtin/checkout.c:1030

2881 msgid "conflict style (merge or diff3)"

2913 -msgstr ""

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

2883

2915 -#: builtin/checkout.c:1030

2884 +#: builtin/checkout.c:1033

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

2917 -msgstr ""

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

2887

2919 -#: builtin/checkout.c:1054

2920 -#, fuzzy

2888 +#: builtin/checkout.c:1057

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

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

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

2891

2924 -#: builtin/checkout.c:1071

2892 +#: builtin/checkout.c:1074

2893 msgid "--track needs a branch name"

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

2895

2928 -#: builtin/checkout.c:1078

2896 +#: builtin/checkout.c:1081

2897 msgid "Missing branch name; try -b"

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

2899

2932 -#: builtin/checkout.c:1113

2900 +#: builtin/checkout.c:1116

2901 msgid "invalid path specification"

2902 msgstr "无效的路径规格"

2903

2936 -#: builtin/checkout.c:1120

2937 -#, fuzzy, c-format

2904 +#: builtin/checkout.c:1123

2905 +#, c-format

2906 msgid ""

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

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

2909 msgstr ""

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

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

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

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

2912

2945 -#: builtin/checkout.c:1125

2946 -#, fuzzy, c-format

2913 +#: builtin/checkout.c:1128

2914 +#, c-format

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

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

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

2917

2950 -#: builtin/checkout.c:1129

2918 +#: builtin/checkout.c:1132

2919 msgid ""

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

2921 "checking out of the index."

2922 msgstr ""

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

2924

2957 -#: builtin/clean.c:19

2925 +#: builtin/clean.c:20

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

2959 -msgstr ""

2927 +msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."

2928

2961 -#: builtin/clean.c:51

2929 +#: builtin/clean.c:24

2930 +#, c-format

2931 +msgid "Removing %s\n"

2932 +msgstr "正删除 %s\n"

2933 +

2934 +#: builtin/clean.c:25

2935 +#, c-format

2936 +msgid "Would remove %s\n"

2937 +msgstr "将删除 %s\n"

2938 +

2939 +#: builtin/clean.c:26

2940 +#, c-format

2941 +msgid "Skipping repository %s\n"

2942 +msgstr "忽略版本库 %s\n"

2943 +

2944 +#: builtin/clean.c:27

2945 +#, c-format

2946 +msgid "Would skip repository %s\n"

2947 +msgstr "将忽略版本库 %s\n"

2948 +

2949 +#: builtin/clean.c:28

2950 +#, c-format

2951 +msgid "failed to remove %s"

2952 +msgstr "无法删除 %s"

2953 +

2954 +#: builtin/clean.c:159

2955 msgid "do not print names of files removed"

2963 -msgstr ""

2956 +msgstr "不打印删除文件的名称"

2957

2965 -#: builtin/clean.c:53

2958 +#: builtin/clean.c:161

2959 msgid "force"

2967 -msgstr ""

2960 +msgstr "强制"

2961

2969 -#: builtin/clean.c:55

2970 -#, fuzzy

2962 +#: builtin/clean.c:163

2963 msgid "remove whole directories"

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

2964 +msgstr "删除整个目录"

2965

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

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

2966 +#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717

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

2968 msgid "pattern"

2977 -msgstr ""

2969 +msgstr "模式"

2970

2979 -#: builtin/clean.c:57

2971 +#: builtin/clean.c:165

2972 msgid "add <pattern> to ignore rules"

2981 -msgstr ""

2973 +msgstr "添加<模式>到忽略规则"

2974

2983 -#: builtin/clean.c:58

2975 +#: builtin/clean.c:166

2976 msgid "remove ignored files, too"

2985 -msgstr ""

2977 +msgstr "也删除忽略的文件"

2978

2987 -#: builtin/clean.c:60

2979 +#: builtin/clean.c:168

2980 msgid "remove only ignored files"

2989 -msgstr ""

2981 +msgstr "只删除忽略的文件"

2982

2991 -#: builtin/clean.c:78

2983 +#: builtin/clean.c:186

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

2985 msgstr "-x 和 -X 不能同时使用"

2986

2995 -#: builtin/clean.c:82

2987 +#: builtin/clean.c:190

2988 msgid ""

2989 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"

2990 msgstr ""

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

2992

3001 -#: builtin/clean.c:85

2993 +#: builtin/clean.c:193

2994 msgid ""

2995 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "

2996 "clean"

2997 msgstr ""

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

2999

3008 -#: builtin/clean.c:155 builtin/clean.c:176

3009 -#, c-format

3010 -msgid "Would remove %s\n"

3011 -msgstr "将删除 %s\n"

3012 -

3013 -#: builtin/clean.c:159 builtin/clean.c:179

3014 -#, c-format

3015 -msgid "Removing %s\n"

3016 -msgstr "正删除 %s\n"

3017 -

3018 -#: builtin/clean.c:162 builtin/clean.c:182

3019 -#, c-format

3020 -msgid "failed to remove %s"

3021 -msgstr "无法删除 %s"

3022 -

3023 -#: builtin/clean.c:166

3024 -#, c-format

3025 -msgid "Would not remove %s\n"

3026 -msgstr "不会删除 %s\n"

3027 -

3028 -#: builtin/clean.c:168

3029 -#, c-format

3030 -msgid "Not removing %s\n"

3031 -msgstr "未删除 %s\n"

3032 -

3000 #: builtin/clone.c:36

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

3035 -msgstr ""

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

3003

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

3038 -#: builtin/push.c:399

3005 +#: builtin/push.c:407

3006 msgid "force progress reporting"

3040 -msgstr ""

3007 +msgstr "强制显示进度报告"

3008

3009 #: builtin/clone.c:66

3010 msgid "don't create a checkout"

3044 -msgstr ""

3011 +msgstr "不创建一个检出"

3012

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

3047 -#, fuzzy

3014 msgid "create a bare repository"

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

3015 +msgstr "创建一个裸版本库"

3016

3017 #: builtin/clone.c:72

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

3053 -msgstr ""

3019 +msgstr "创建一个镜像版本库（也是裸版本库）"

3020

3021 #: builtin/clone.c:74

3022 msgid "to clone from a local repository"

3057 -msgstr ""

3023 +msgstr "从本地版本库克隆"

3024

3025 #: builtin/clone.c:76

3026 msgid "don't use local hardlinks, always copy"

3061 -msgstr ""

3027 +msgstr "不使用本地硬链接，始终复制"

3028

3029 #: builtin/clone.c:78

3064 -#, fuzzy

3030 msgid "setup as shared repository"

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

3031 +msgstr "设置为共享版本库"

3032

3033 #: builtin/clone.c:80 builtin/clone.c:82

3034 msgid "initialize submodules in the clone"

3070 -msgstr ""

3035 +msgstr "在克隆时初始化子模组"

3036

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

3073 -#, fuzzy

3038 msgid "template-directory"

3075 -msgstr "文件/目录"

3039 +msgstr "模板目录"

3040

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

3042 msgid "directory from which templates will be used"

3079 -msgstr ""

3043 +msgstr "模板目录将被使用"

3044

3045 #: builtin/clone.c:86

3046 msgid "reference repository"

3083 -msgstr ""

3047 +msgstr "引用版本库"

3048

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

3086 -#, fuzzy

3050 msgid "name"

3088 -msgstr "重命名"

3051 +msgstr "名称"

3052

3053 #: builtin/clone.c:88

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

3092 -msgstr ""

3055 +msgstr "使用<名称>而不是 'origin' 去跟踪上游"

3056

3057 #: builtin/clone.c:90

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

3096 -msgstr ""

3059 +msgstr "检出<分支>而不是远程HEAD"

3060

3061 #: builtin/clone.c:92

3062 msgid "path to git-upload-pack on the remote"

3100 -msgstr ""

3063 +msgstr "远程 git-upload-pack 路径"

3064

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

3065 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662

3066 msgid "depth"

3104 -msgstr ""

3067 +msgstr "深度"

3068

3069 #: builtin/clone.c:94

3070 msgid "create a shallow clone of that depth"

3108 -msgstr ""

3071 +msgstr "创建一个指定深度的浅克隆"

3072

3073 #: builtin/clone.c:96

3074 msgid "clone only one branch, HEAD or --branch"

3112 -msgstr ""

3075 +msgstr "只克隆一个分支、HEAD 或 --branch"

3076

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

3078 msgid "gitdir"

3116 -msgstr ""

3079 +msgstr "git目录"

3080

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

3082 msgid "separate git dir from working tree"

3120 -msgstr ""

3083 +msgstr "git目录和工作区分离"

3084

3085 #: builtin/clone.c:99

3086 msgid "key=value"

3124 -msgstr ""

3087 +msgstr "key=value"

3088

3089 #: builtin/clone.c:100

3127 -#, fuzzy

3090 msgid "set config inside the new repository"

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

3091 +msgstr "在新版本库中设置配置信息"

3092

3093 #: builtin/clone.c:243

3094 #, c-format

@@ -3153,6 +3115,11 @@ msgstr "%s 存在且不是一个目录"

3115 msgid "failed to stat %s\n"

3116 msgstr "无法枚举 %s 状态\n"

3117

3118 +#: builtin/clone.c:341

3119 +#, c-format

3120 +msgid "failed to unlink '%s'"

3121 +msgstr "无法删除 '%s'"

3122 +

3123 #: builtin/clone.c:346

3124 #, c-format

3125 msgid "failed to create link '%s'"

@@ -3177,116 +3144,117 @@ msgstr "不能发现要克隆的远程分支 %s。"

3144 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3145 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

3146

3180 -#: builtin/clone.c:642

3147 +#: builtin/clone.c:690

3148 msgid "Too many arguments."

3149 msgstr "太多参数。"

3150

3184 -#: builtin/clone.c:646

3151 +#: builtin/clone.c:694

3152 msgid "You must specify a repository to clone."

3153 msgstr "您必须指定一个版本库来克隆。"

3154

3188 -#: builtin/clone.c:657

3155 +#: builtin/clone.c:705

3156 #, c-format

3157 msgid "--bare and --origin %s options are incompatible."

3158 msgstr "--bare 和 --origin %s 选项不兼容。"

3159

3193 -#: builtin/clone.c:671

3160 +#: builtin/clone.c:708

3161 +msgid "--bare and --separate-git-dir are incompatible."

3162 +msgstr "--bare 和 --separate-git-dir 选项不兼容。"

3163 +

3164 +#: builtin/clone.c:721

3165 #, c-format

3166 msgid "repository '%s' does not exist"

3167 msgstr "版本库 '%s' 不存在"

3168

3198 -#: builtin/clone.c:676

3169 +#: builtin/clone.c:726

3170 msgid "--depth is ignored in local clones; use file:// instead."

3171 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

3172

3202 -#: builtin/clone.c:686

3173 +#: builtin/clone.c:736

3174 #, c-format

3175 msgid "destination path '%s' already exists and is not an empty directory."

3176 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

3177

3207 -#: builtin/clone.c:696

3178 +#: builtin/clone.c:746

3179 #, c-format

3180 msgid "working tree '%s' already exists."

3181 msgstr "工作区 '%s' 已经存在。"

3182

3212 -#: builtin/clone.c:709 builtin/clone.c:723

3183 +#: builtin/clone.c:759 builtin/clone.c:773

3184 #, c-format

3185 msgid "could not create leading directories of '%s'"

3186 msgstr "不能为 '%s' 创建先导目录"

3187

3217 -#: builtin/clone.c:712

3188 +#: builtin/clone.c:762

3189 #, c-format

3190 msgid "could not create work tree dir '%s'."

3191 msgstr "不能为 '%s' 创建工作区目录。"

3192

3222 -#: builtin/clone.c:731

3193 +#: builtin/clone.c:783

3194 #, c-format

3195 msgid "Cloning into bare repository '%s'...\n"

3196 msgstr "克隆到裸版本库 '%s'...\n"

3197

3227 -#: builtin/clone.c:733

3198 +#: builtin/clone.c:785

3199 #, c-format

3200 msgid "Cloning into '%s'...\n"

3201 msgstr "正克隆到 '%s'...\n"

3202

3232 -#: builtin/clone.c:789

3203 +#: builtin/clone.c:827

3204 #, c-format

3205 msgid "Don't know how to clone %s"

3206 msgstr "不知道如何克隆 %s"

3207

3237 -#: builtin/clone.c:838

3208 +#: builtin/clone.c:876

3209 #, c-format

3210 msgid "Remote branch %s not found in upstream %s"

3211 msgstr "远程分支 %s 在上游 %s 未发现"

3212

3242 -#: builtin/clone.c:845

3213 +#: builtin/clone.c:883

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

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

3216

3217 #: builtin/column.c:9

3218 msgid "git column [options]"

3248 -msgstr ""

3219 +msgstr "git column [选项]"

3220

3221 #: builtin/column.c:26

3222 msgid "lookup config vars"

3252 -msgstr ""

3223 +msgstr "查找配置变量"

3224

3225 #: builtin/column.c:27 builtin/column.c:28

3255 -#, fuzzy

3226 msgid "layout to use"

3257 -msgstr "本地已过时"

3227 +msgstr "要使用的布局"

3228

3229 #: builtin/column.c:29

3230 msgid "Maximum width"

3261 -msgstr ""

3231 +msgstr "最大宽度"

3232

3233 #: builtin/column.c:30

3234 msgid "Padding space on left border"

3265 -msgstr ""

3235 +msgstr "左边框的填充空间"

3236

3237 #: builtin/column.c:31

3238 msgid "Padding space on right border"

3269 -msgstr ""

3239 +msgstr "右边框的填充空间"

3240

3241 #: builtin/column.c:32

3242 msgid "Padding space between columns"

3273 -msgstr ""

3243 +msgstr "两列之间的填充空间"

3244

3245 #: builtin/column.c:51

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

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

3248

3279 -#: builtin/commit.c:33

3280 -#, fuzzy

3249 +#: builtin/commit.c:34

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

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

3251 +msgstr "git commit [选项] [--] <文件模式>..."

3252

3284 -#: builtin/commit.c:38

3285 -#, fuzzy

3253 +#: builtin/commit.c:39

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

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

3255 +msgstr "git status [选项] [--] <文件模式>..."

3256

3289 -#: builtin/commit.c:43

3257 +#: builtin/commit.c:44

3258 msgid ""

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

3260 "on your username and hostname. Please check that they are accurate.\n"

@@ -3309,7 +3277,7 @@ msgstr ""

3277 "\n"

3278 " git commit --amend --reset-author\n"

3279

3312 -#: builtin/commit.c:55

3280 +#: builtin/commit.c:56

3281 msgid ""

3282 "You asked to amend the most recent commit, but doing so would make\n"

3283 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -3318,7 +3286,7 @@ msgstr ""

3286 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"

3287 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"

3288

3321 -#: builtin/commit.c:60

3289 +#: builtin/commit.c:61

3290 msgid ""

3291 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

3292 "If you wish to commit it anyway, use:\n"

@@ -3334,93 +3302,93 @@ msgstr ""

3302 "\n"

3303 "否则，请使用命令 'git reset'\n"

3304

3337 -#: builtin/commit.c:256

3305 +#: builtin/commit.c:258

3306 msgid "failed to unpack HEAD tree object"

3307 msgstr "无法解包 HEAD 树对象"

3308

3341 -#: builtin/commit.c:298

3309 +#: builtin/commit.c:300

3310 msgid "unable to create temporary index"

3311 msgstr "不能创建临时索引"

3312

3345 -#: builtin/commit.c:304

3313 +#: builtin/commit.c:306

3314 msgid "interactive add failed"

3315 msgstr "交互式添加失败"

3316

3349 -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408

3317 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410

3318 msgid "unable to write new_index file"

3319 msgstr "无法写 new_index 文件"

3320

3353 -#: builtin/commit.c:389

3321 +#: builtin/commit.c:391

3322 msgid "cannot do a partial commit during a merge."

3323 msgstr "在合并过程中不能做部分提交。"

3324

3357 -#: builtin/commit.c:391

3325 +#: builtin/commit.c:393

3326 msgid "cannot do a partial commit during a cherry-pick."

3327 msgstr "在拣选过程中不能做部分提交。"

3328

3361 -#: builtin/commit.c:401

3329 +#: builtin/commit.c:403

3330 msgid "cannot read the index"

3331 msgstr "无法读取索引"

3332

3365 -#: builtin/commit.c:421

3333 +#: builtin/commit.c:423

3334 msgid "unable to write temporary index file"

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

3336

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

3337 +#: builtin/commit.c:511 builtin/commit.c:517

3338 #, c-format

3339 msgid "invalid commit: %s"

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

3341

3374 -#: builtin/commit.c:539

3342 +#: builtin/commit.c:540

3343 msgid "malformed --author parameter"

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

3345

3378 -#: builtin/commit.c:600

3346 +#: builtin/commit.c:560

3347 #, c-format

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

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

3350

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

3351 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954

3352 #, c-format

3353 msgid "could not lookup commit %s"

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

3355

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

3356 +#: builtin/commit.c:610 builtin/shortlog.c:272

3357 #, c-format

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

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

3360

3393 -#: builtin/commit.c:652

3361 +#: builtin/commit.c:612

3362 msgid "could not read log from standard input"

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

3364

3397 -#: builtin/commit.c:656

3365 +#: builtin/commit.c:616

3366 #, c-format

3367 msgid "could not read log file '%s'"

3368 msgstr "不能读取日志文件 '%s'"

3369

3402 -#: builtin/commit.c:662

3370 +#: builtin/commit.c:622

3371 msgid "commit has empty message"

3372 msgstr "提交说明为空"

3373

3406 -#: builtin/commit.c:678

3374 +#: builtin/commit.c:638

3375 msgid "could not read MERGE_MSG"

3376 msgstr "不能读取 MERGE_MSG"

3377

3410 -#: builtin/commit.c:682

3378 +#: builtin/commit.c:642

3379 msgid "could not read SQUASH_MSG"

3380 msgstr "不能读取 SQUASH_MSG"

3381

3414 -#: builtin/commit.c:686

3382 +#: builtin/commit.c:646

3383 #, c-format

3384 msgid "could not read '%s'"

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

3386

3419 -#: builtin/commit.c:738

3387 +#: builtin/commit.c:707

3388 msgid "could not write commit template"

3389 msgstr "不能写提交模版"

3390

3423 -#: builtin/commit.c:749

3391 +#: builtin/commit.c:718

3392 #, c-format

3393 msgid ""

3394 "\n"

@@ -3434,7 +3402,7 @@ msgstr ""

3402 "\t%s\n"

3403 "然后重试。\n"

3404

3437 -#: builtin/commit.c:754

3405 +#: builtin/commit.c:723

3406 #, c-format

3407 msgid ""

3408 "\n"

@@ -3448,7 +3416,7 @@ msgstr ""

3416 "\t%s\n"

3417 "然后重试。\n"

3418

3451 -#: builtin/commit.c:766

3419 +#: builtin/commit.c:735

3420 msgid ""

3421 "Please enter the commit message for your changes. Lines starting\n"

3422 "with '#' will be ignored, and an empty message aborts the commit.\n"

@@ -3456,7 +3424,7 @@ msgstr ""

3424 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n"

3425 "说明将会终止提交。\n"

3426

3459 -#: builtin/commit.c:771

3427 +#: builtin/commit.c:740

3428 msgid ""

3429 "Please enter the commit message for your changes. Lines starting\n"

3430 "with '#' will be kept; you may remove them yourself if you want to.\n"

@@ -3466,357 +3434,355 @@ msgstr ""

3434 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"

3435

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

3469 -#: builtin/commit.c:784

3437 +#: builtin/commit.c:753

3438 #, c-format

3439 msgid "%sAuthor: %s"

3440 msgstr "%s作者： %s"

3441

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

3475 -#: builtin/commit.c:791

3443 +#: builtin/commit.c:760

3444 #, c-format

3445 msgid "%sCommitter: %s"

3446 msgstr "%s提交者： %s"

3447

3480 -#: builtin/commit.c:811

3448 +#: builtin/commit.c:780

3449 msgid "Cannot read index"

3450 msgstr "无法读取索引"

3451

3484 -#: builtin/commit.c:848

3452 +#: builtin/commit.c:817

3453 msgid "Error building trees"

3454 msgstr "无法创建树对象"

3455

3488 -#: builtin/commit.c:863 builtin/tag.c:361

3456 +#: builtin/commit.c:832 builtin/tag.c:361

3457 #, c-format

3458 msgid "Please supply the message using either -m or -F option.\n"

3491 -msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"

3459 +msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

3460

3493 -#: builtin/commit.c:960

3461 +#: builtin/commit.c:929

3462 #, c-format

3463 msgid "No existing author found with '%s'"

3464 msgstr "没有找到匹配 '%s' 的作者"

3465

3498 -#: builtin/commit.c:975 builtin/commit.c:1175

3466 +#: builtin/commit.c:944 builtin/commit.c:1148

3467 #, c-format

3468 msgid "Invalid untracked files mode '%s'"

3469 msgstr "无效的未追踪文件参数 '%s'"

3470

3503 -#: builtin/commit.c:1015

3471 +#: builtin/commit.c:984

3472 msgid "Using both --reset-author and --author does not make sense"

3473 msgstr "同时使用 --reset-author 和 --author 没有意义"

3474

3507 -#: builtin/commit.c:1026

3475 +#: builtin/commit.c:995

3476 msgid "You have nothing to amend."

3477 msgstr "您没有可修补的提交。"

3478

3511 -#: builtin/commit.c:1029

3479 +#: builtin/commit.c:998

3480 msgid "You are in the middle of a merge -- cannot amend."

3481 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

3482

3515 -#: builtin/commit.c:1031

3483 +#: builtin/commit.c:1000

3484 msgid "You are in the middle of a cherry-pick -- cannot amend."

3485 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

3486

3519 -#: builtin/commit.c:1034

3487 +#: builtin/commit.c:1003

3488 msgid "Options --squash and --fixup cannot be used together"

3489 msgstr "选项 --squash 和 --fixup 不能同时使用"

3490

3523 -#: builtin/commit.c:1044

3491 +#: builtin/commit.c:1013

3492 msgid "Only one of -c/-C/-F/--fixup can be used."

3493 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

3494

3527 -#: builtin/commit.c:1046

3495 +#: builtin/commit.c:1015

3496 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

3497 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

3498

3531 -#: builtin/commit.c:1054

3499 +#: builtin/commit.c:1023

3500 msgid "--reset-author can be used only with -C, -c or --amend."

3501 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

3502

3535 -#: builtin/commit.c:1071

3503 +#: builtin/commit.c:1040

3504 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

3505 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

3506

3539 -#: builtin/commit.c:1073

3507 +#: builtin/commit.c:1042

3508 msgid "No paths with --include/--only does not make sense."

3509 msgstr "参数 --include/--only 不跟路径没有意义。"

3510

3543 -#: builtin/commit.c:1075

3511 +#: builtin/commit.c:1044

3512 msgid "Clever... amending the last one with dirty index."

3513 msgstr "聪明... 在索引不干净下修补最后的提交。"

3514

3547 -#: builtin/commit.c:1077

3515 +#: builtin/commit.c:1046

3516 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

3517 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

3518

3551 -#: builtin/commit.c:1087 builtin/tag.c:577

3519 +#: builtin/commit.c:1056 builtin/tag.c:577

3520 #, c-format

3521 msgid "Invalid cleanup mode %s"

3522 msgstr "无效的清理模式 %s"

3523

3556 -#: builtin/commit.c:1092

3524 +#: builtin/commit.c:1061

3525 msgid "Paths with -a does not make sense."

3526 msgstr "路径和 -a 选项同时使用没有意义。"

3527

3560 -#: builtin/commit.c:1189 builtin/commit.c:1417

3528 +#: builtin/commit.c:1067 builtin/commit.c:1202

3529 +msgid "--long and -z are incompatible"

3530 +msgstr "--long 和 -z 选项不兼容"

3531 +

3532 +#: builtin/commit.c:1162 builtin/commit.c:1400

3533 msgid "show status concisely"

3562 -msgstr ""

3534 +msgstr "以简洁的格式显示状态"

3535

3564 -#: builtin/commit.c:1191 builtin/commit.c:1419

3536 +#: builtin/commit.c:1164 builtin/commit.c:1402

3537 msgid "show branch information"

3566 -msgstr ""

3538 +msgstr "显示分支信息"

3539

3568 -#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389

3540 +#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397

3541 msgid "machine-readable output"

3570 -msgstr ""

3542 +msgstr "机器可读的输出"

3543 +

3544 +#: builtin/commit.c:1169 builtin/commit.c:1406

3545 +msgid "show status in long format (default)"

3546 +msgstr "以长格式显示状态（默认）"

3547

3572 -#: builtin/commit.c:1196 builtin/commit.c:1423

3548 +#: builtin/commit.c:1172 builtin/commit.c:1409

3549 msgid "terminate entries with NUL"

3574 -msgstr ""

3550 +msgstr "条目以NUL字符结尾"

3551

3576 -#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636

3577 -#: builtin/fast-export.c:639 builtin/tag.c:461

3552 +#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647

3553 +#: builtin/fast-export.c:650 builtin/tag.c:461

3554 msgid "mode"

3579 -msgstr ""

3555 +msgstr "模式"

3556

3581 -#: builtin/commit.c:1199 builtin/commit.c:1426

3557 +#: builtin/commit.c:1175 builtin/commit.c:1412

3558 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3583 -msgstr ""

3559 +msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

3560

3585 -#: builtin/commit.c:1202

3561 +#: builtin/commit.c:1178

3562 msgid "show ignored files"

3587 -msgstr ""

3563 +msgstr "显示忽略的文件"

3564

3589 -#: builtin/commit.c:1203 parse-options.h:151

3565 +#: builtin/commit.c:1179 parse-options.h:151

3566 msgid "when"

3567 msgstr "何时"

3568

3593 -#: builtin/commit.c:1204

3569 +#: builtin/commit.c:1180

3570 msgid ""

3571 "ignore changes to submodules, optional when: all, dirty, untracked. "

3572 "(Default: all)"

3573 msgstr ""

3574 +"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

3575

3599 -#: builtin/commit.c:1206

3600 -#, fuzzy

3576 +#: builtin/commit.c:1182

3577 msgid "list untracked files in columns"

3602 -msgstr "无效的未追踪文件参数 '%s'"

3578 +msgstr "以列的方式显示未跟踪的文件"

3579

3604 -#: builtin/commit.c:1275

3580 +#: builtin/commit.c:1256

3581 msgid "couldn't look up newly created commit"

3582 msgstr "无法找到新创建的提交"

3583

3608 -#: builtin/commit.c:1277

3584 +#: builtin/commit.c:1258

3585 msgid "could not parse newly created commit"

3586 msgstr "不能解析新创建的提交"

3587

3612 -#: builtin/commit.c:1318

3588 +#: builtin/commit.c:1299

3589 msgid "detached HEAD"

3590 msgstr "分离头指针"

3591

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

3617 -#: builtin/commit.c:1320

3593 +#: builtin/commit.c:1301

3594 msgid " (root-commit)"

3595 msgstr "（根提交）"

3596

3621 -#: builtin/commit.c:1387

3597 +#: builtin/commit.c:1370

3598 msgid "suppress summary after successful commit"

3623 -msgstr ""

3599 +msgstr "提交成功后不显示概述信息"

3600

3625 -#: builtin/commit.c:1388

3601 +#: builtin/commit.c:1371

3602 msgid "show diff in commit message template"

3627 -msgstr ""

3603 +msgstr "在提交说明模板里显示差异"

3604

3629 -#: builtin/commit.c:1390

3630 -#, fuzzy

3605 +#: builtin/commit.c:1373

3606 msgid "Commit message options"

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

3607 +msgstr "提交说明选项"

3608

3634 -#: builtin/commit.c:1391 builtin/tag.c:459

3609 +#: builtin/commit.c:1374 builtin/tag.c:459

3610 msgid "read message from file"

3636 -msgstr ""

3611 +msgstr "从文件中读取提交说明"

3612

3638 -#: builtin/commit.c:1392

3613 +#: builtin/commit.c:1375

3614 msgid "author"

3640 -msgstr ""

3615 +msgstr "作者"

3616

3642 -#: builtin/commit.c:1392

3643 -#, fuzzy

3617 +#: builtin/commit.c:1375

3618 msgid "override author for commit"

3645 -msgstr "合并未返回提交"

3619 +msgstr "提交时覆盖作者"

3620

3647 -#: builtin/commit.c:1393 builtin/gc.c:178

3621 +#: builtin/commit.c:1376 builtin/gc.c:178

3622 msgid "date"

3649 -msgstr ""

3623 +msgstr "日期"

3624

3651 -#: builtin/commit.c:1393

3652 -#, fuzzy

3625 +#: builtin/commit.c:1376

3626 msgid "override date for commit"

3654 -msgstr "合并未返回提交"

3627 +msgstr "提交时覆盖日期"

3628

3656 -#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534

3657 -#: builtin/notes.c:691 builtin/tag.c:457

3658 -#, fuzzy

3629 +#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537

3630 +#: builtin/notes.c:694 builtin/tag.c:457

3631 msgid "message"

3660 -msgstr "无 tag 说明？"

3632 +msgstr "说明"

3633

3662 -#: builtin/commit.c:1394

3663 -#, fuzzy

3634 +#: builtin/commit.c:1377

3635 msgid "commit message"

3665 -msgstr "空提交信息。"

3636 +msgstr "提交说明"

3637

3667 -#: builtin/commit.c:1395

3638 +#: builtin/commit.c:1378

3639 msgid "reuse and edit message from specified commit"

3669 -msgstr ""

3640 +msgstr "重用并编辑指定提交的提交说明"

3641

3671 -#: builtin/commit.c:1396

3642 +#: builtin/commit.c:1379

3643 msgid "reuse message from specified commit"

3673 -msgstr ""

3644 +msgstr "重用指定提交的提交说明"

3645

3675 -#: builtin/commit.c:1397

3646 +#: builtin/commit.c:1380

3647 msgid "use autosquash formatted message to fixup specified commit"

3677 -msgstr ""

3648 +msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

3649

3679 -#: builtin/commit.c:1398

3650 +#: builtin/commit.c:1381

3651 msgid "use autosquash formatted message to squash specified commit"

3681 -msgstr ""

3652 +msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

3653

3683 -#: builtin/commit.c:1399

3654 +#: builtin/commit.c:1382

3655 msgid "the commit is authored by me now (used with -C/-c/--amend)"

3685 -msgstr ""

3656 +msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

3657

3687 -#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109

3658 +#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109

3659 msgid "add Signed-off-by:"

3689 -msgstr ""

3660 +msgstr "添加 Signed-off-by: 签名"

3661

3691 -#: builtin/commit.c:1401

3662 +#: builtin/commit.c:1384

3663 msgid "use specified template file"

3693 -msgstr ""

3664 +msgstr "使用指定的模板文件"

3665

3695 -#: builtin/commit.c:1402

3696 -#, fuzzy

3666 +#: builtin/commit.c:1385

3667 msgid "force edit of commit"

3698 -msgstr "合并未返回提交"

3668 +msgstr "强制编辑提交"

3669

3700 -#: builtin/commit.c:1403

3670 +# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

3671 +#: builtin/commit.c:1386

3672 msgid "default"

3702 -msgstr ""

3673 +msgstr "default"

3674

3704 -#: builtin/commit.c:1403 builtin/tag.c:462

3675 +#: builtin/commit.c:1386 builtin/tag.c:462

3676 msgid "how to strip spaces and #comments from message"

3706 -msgstr ""

3677 +msgstr "设置如何删除提交说明里的空格和#注释"

3678

3708 -#: builtin/commit.c:1404

3709 -#, fuzzy

3679 +#: builtin/commit.c:1387

3680 msgid "include status in commit message template"

3711 -msgstr "不能写提交模版"

3681 +msgstr "在提交说明模板里包含状态信息"

3682

3713 -#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463

3683 +#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463

3684 msgid "key id"

3715 -msgstr ""

3685 +msgstr "key id"

3686

3717 -#: builtin/commit.c:1406 builtin/merge.c:214

3687 +#: builtin/commit.c:1389 builtin/merge.c:214

3688 msgid "GPG sign commit"

3719 -msgstr ""

3689 +msgstr "GPG 提交签名"

3690

3691 #. end commit message options

3722 -#: builtin/commit.c:1409

3692 +#: builtin/commit.c:1392

3693 msgid "Commit contents options"

3724 -msgstr ""

3694 +msgstr "提交内容选项"

3695

3726 -#: builtin/commit.c:1410

3696 +#: builtin/commit.c:1393

3697 msgid "commit all changed files"

3728 -msgstr ""

3698 +msgstr "提交所有改动的文件"

3699

3730 -#: builtin/commit.c:1411

3700 +#: builtin/commit.c:1394

3701 msgid "add specified files to index for commit"

3732 -msgstr ""

3702 +msgstr "添加指定的文件到索引区等待提交"

3703

3734 -#: builtin/commit.c:1412

3735 -#, fuzzy

3704 +#: builtin/commit.c:1395

3705 msgid "interactively add files"

3737 -msgstr "交互式添加失败"

3706 +msgstr "交互式添加文件"

3707

3739 -#: builtin/commit.c:1413

3740 -#, fuzzy

3708 +#: builtin/commit.c:1396

3709 msgid "interactively add changes"

3742 -msgstr "交互式添加失败"

3710 +msgstr "交互式添加变更"

3711

3744 -#: builtin/commit.c:1414

3745 -#, fuzzy

3712 +#: builtin/commit.c:1397

3713 msgid "commit only specified files"

3747 -msgstr "无法还原修改的文件"

3714 +msgstr "只提交指定的文件"

3715

3749 -#: builtin/commit.c:1415

3716 +#: builtin/commit.c:1398

3717 msgid "bypass pre-commit hook"

3751 -msgstr ""

3718 +msgstr "绕过 pre-commit 钩子"

3719

3753 -#: builtin/commit.c:1416

3754 -#, fuzzy

3720 +#: builtin/commit.c:1399

3721 msgid "show what would be committed"

3756 -msgstr "要提交的变更："

3722 +msgstr "显示将要提交的内容"

3723

3758 -#: builtin/commit.c:1424

3724 +#: builtin/commit.c:1410

3725 msgid "amend previous commit"

3760 -msgstr ""

3726 +msgstr "修改先前的提交"

3727

3762 -#: builtin/commit.c:1425

3728 +#: builtin/commit.c:1411

3729 msgid "bypass post-rewrite hook"

3764 -msgstr ""

3730 +msgstr "绕过 post-rewrite 钩子"

3731

3766 -#: builtin/commit.c:1430

3732 +#: builtin/commit.c:1416

3733 msgid "ok to record an empty change"

3768 -msgstr ""

3734 +msgstr "允许一个空提交"

3735

3770 -#: builtin/commit.c:1433

3736 +#: builtin/commit.c:1419

3737 msgid "ok to record a change with an empty message"

3772 -msgstr ""

3738 +msgstr "允许空的提交说明"

3739

3774 -#: builtin/commit.c:1464

3740 +#: builtin/commit.c:1451

3741 msgid "could not parse HEAD commit"

3742 msgstr "不能解析 HEAD 提交"

3743

3778 -#: builtin/commit.c:1502 builtin/merge.c:508

3744 +#: builtin/commit.c:1489 builtin/merge.c:508

3745 #, c-format

3746 msgid "could not open '%s' for reading"

3747 msgstr "不能为读入打开 '%s'"

3748

3783 -#: builtin/commit.c:1509

3749 +#: builtin/commit.c:1496

3750 #, c-format

3751 msgid "Corrupt MERGE_HEAD file (%s)"

3752 msgstr "损坏的 MERGE_HEAD 文件（%s）"

3753

3788 -#: builtin/commit.c:1516

3754 +#: builtin/commit.c:1503

3755 msgid "could not read MERGE_MODE"

3756 msgstr "不能读取 MERGE_MODE"

3757

3792 -#: builtin/commit.c:1535

3758 +#: builtin/commit.c:1522

3759 #, c-format

3760 msgid "could not read commit message: %s"

3761 msgstr "不能读取提交说明：%s"

3762

3797 -#: builtin/commit.c:1549

3763 +#: builtin/commit.c:1536

3764 #, c-format

3765 msgid "Aborting commit; you did not edit the message.\n"

3766 msgstr "终止提交；您未更改来自模版的提交说明。\n"

3767

3802 -#: builtin/commit.c:1554

3768 +#: builtin/commit.c:1541

3769 #, c-format

3770 msgid "Aborting commit due to empty commit message.\n"

3771 msgstr "终止提交因为提交说明为空。\n"

3772

3807 -#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960

3773 +#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858

3774 msgid "failed to write commit object"

3775 msgstr "无法写提交对象"

3776

3811 -#: builtin/commit.c:1590

3777 +#: builtin/commit.c:1577

3778 msgid "cannot lock HEAD ref"

3779 msgstr "无法锁定 HEAD 引用"

3780

3815 -#: builtin/commit.c:1594

3781 +#: builtin/commit.c:1581

3782 msgid "cannot update HEAD ref"

3783 msgstr "无法更新 HEAD 引用"

3784

3819 -#: builtin/commit.c:1605

3785 +#: builtin/commit.c:1592

3786 msgid ""

3787 "Repository has been updated, but unable to write\n"

3788 "new_index file. Check that disk is not full or quota is\n"

@@ -3827,135 +3793,131 @@ msgstr ""

3793

3794 #: builtin/config.c:7

3795 msgid "git config [options]"

3830 -msgstr ""

3796 +msgstr "git config [选项]"

3797

3832 -#: builtin/config.c:52

3798 +#: builtin/config.c:51

3799 msgid "Config file location"

3834 -msgstr ""

3800 +msgstr "配置文件位置"

3801

3836 -#: builtin/config.c:53

3837 -#, fuzzy

3802 +#: builtin/config.c:52

3803 msgid "use global config file"

3839 -msgstr "无法更新 config 文件"

3804 +msgstr "使用全局配置文件"

3805

3841 -#: builtin/config.c:54

3806 +#: builtin/config.c:53

3807 msgid "use system config file"

3843 -msgstr ""

3808 +msgstr "使用系统级配置文件"

3809

3845 -#: builtin/config.c:55

3846 -#, fuzzy

3810 +#: builtin/config.c:54

3811 msgid "use repository config file"

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

3812 +msgstr "使用版本库级配置文件"

3813

3850 -#: builtin/config.c:56

3851 -#, fuzzy

3814 +#: builtin/config.c:55

3815 msgid "use given config file"

3853 -msgstr "未预期的文件结束"

3816 +msgstr "使用指定的配置文件"

3817

3855 -#: builtin/config.c:57

3856 -#, fuzzy

3818 +#: builtin/config.c:56

3819 msgid "Action"

3858 -msgstr "动作"

3820 +msgstr "操作"

3821

3860 -#: builtin/config.c:58

3822 +#: builtin/config.c:57

3823 msgid "get value: name [value-regex]"

3862 -msgstr ""

3824 +msgstr "获取值：name [value-regex]"

3825

3864 -#: builtin/config.c:59

3826 +#: builtin/config.c:58

3827 msgid "get all values: key [value-regex]"

3866 -msgstr ""

3828 +msgstr "获得所有的值：key [value-regex]"

3829

3868 -#: builtin/config.c:60

3830 +#: builtin/config.c:59

3831 msgid "get values for regexp: name-regex [value-regex]"

3870 -msgstr ""

3832 +msgstr "根据正则表达式获得值：name-regex [value-regex]"

3833

3872 -#: builtin/config.c:61

3834 +#: builtin/config.c:60

3835 msgid "replace all matching variables: name value [value_regex]"

3874 -msgstr ""

3836 +msgstr "替换所有匹配的变量：name value [value_regex]"

3837

3876 -#: builtin/config.c:62

3838 +#: builtin/config.c:61

3839 msgid "add a new variable: name value"

3878 -msgstr ""

3840 +msgstr "添加一个新的变量：name value"

3841

3880 -#: builtin/config.c:63

3842 +#: builtin/config.c:62

3843 msgid "remove a variable: name [value-regex]"

3882 -msgstr ""

3844 +msgstr "删除一个变量：name [value-regex]"

3845

3884 -#: builtin/config.c:64

3846 +#: builtin/config.c:63

3847 msgid "remove all matches: name [value-regex]"

3886 -msgstr ""

3848 +msgstr "删除所有匹配项：name [value-regex]"

3849

3888 -#: builtin/config.c:65

3850 +#: builtin/config.c:64

3851 msgid "rename section: old-name new-name"

3890 -msgstr ""

3852 +msgstr "重命名小节：old-name new-name"

3853

3892 -#: builtin/config.c:66

3854 +#: builtin/config.c:65

3855 msgid "remove a section: name"

3894 -msgstr ""

3856 +msgstr "删除一个小节：name"

3857

3896 -#: builtin/config.c:67

3858 +#: builtin/config.c:66

3859 msgid "list all"

3898 -msgstr ""

3860 +msgstr "列出所有"

3861

3900 -#: builtin/config.c:68

3862 +#: builtin/config.c:67

3863 msgid "open an editor"

3902 -msgstr ""

3864 +msgstr "打开一个编辑器"

3865

3904 -#: builtin/config.c:69 builtin/config.c:70

3866 +#: builtin/config.c:68 builtin/config.c:69

3867 msgid "slot"

3906 -msgstr ""

3868 +msgstr "slot"

3869

3908 -#: builtin/config.c:69

3870 +#: builtin/config.c:68

3871 msgid "find the color configured: [default]"

3910 -msgstr ""

3872 +msgstr "找到配置的颜色：[默认]"

3873

3912 -#: builtin/config.c:70

3874 +#: builtin/config.c:69

3875 msgid "find the color setting: [stdout-is-tty]"

3914 -msgstr ""

3876 +msgstr "找到颜色设置：[stdout-is-tty]"

3877

3916 -#: builtin/config.c:71

3878 +#: builtin/config.c:70

3879 msgid "Type"

3918 -msgstr ""

3880 +msgstr "类型"

3881

3920 -#: builtin/config.c:72

3882 +#: builtin/config.c:71

3883 msgid "value is \"true\" or \"false\""

3922 -msgstr ""

3884 +msgstr "值是 \"true\" 或 \"false\""

3885

3924 -#: builtin/config.c:73

3886 +#: builtin/config.c:72

3887 msgid "value is decimal number"

3926 -msgstr ""

3888 +msgstr "值是十进制数"

3889

3928 -#: builtin/config.c:74

3890 +#: builtin/config.c:73

3891 msgid "value is --bool or --int"

3930 -msgstr ""

3892 +msgstr "值是 --bool or --int"

3893

3932 -#: builtin/config.c:75

3894 +#: builtin/config.c:74

3895 msgid "value is a path (file or directory name)"

3934 -msgstr ""

3896 +msgstr "值是一个路径（文件或目录名）"

3897

3936 -#: builtin/config.c:76

3898 +#: builtin/config.c:75

3899 msgid "Other"

3938 -msgstr ""

3900 +msgstr "其它"

3901

3940 -#: builtin/config.c:77

3902 +#: builtin/config.c:76

3903 msgid "terminate values with NUL byte"

3942 -msgstr ""

3904 +msgstr "终止值是NUL字节"

3905

3944 -#: builtin/config.c:78

3906 +#: builtin/config.c:77

3907 msgid "respect include directives on lookup"

3946 -msgstr ""

3908 +msgstr "查询时参照 include 指令递归查找"

3909

3910 #: builtin/count-objects.c:69

3911 msgid "git count-objects [-v]"

3950 -msgstr ""

3912 +msgstr "git count-objects [-v]"

3913

3914 #: builtin/describe.c:15

3915 msgid "git describe [options] <committish>*"

3954 -msgstr ""

3916 +msgstr "git describe [选项] <提交号>*"

3917

3918 #: builtin/describe.c:16

3919 msgid "git describe [options] --dirty"

3958 -msgstr ""

3920 +msgstr "git describe [选项] --dirty"

3921

3922 #: builtin/describe.c:234

3923 #, c-format

@@ -4031,49 +3993,47 @@ msgstr ""

3993

3994 #: builtin/describe.c:403

3995 msgid "find the tag that comes after the commit"

4034 -msgstr ""

3996 +msgstr "寻找提交之后的 tag（用于描述提交）"

3997

3998 #: builtin/describe.c:404

3999 msgid "debug search strategy on stderr"

4038 -msgstr ""

4000 +msgstr "在标准错误上调试搜索策略"

4001

4002 #: builtin/describe.c:405

4003 msgid "use any ref in .git/refs"

4042 -msgstr ""

4004 +msgstr "使用 .git/refs 里的任意引用"

4005

4006 #: builtin/describe.c:406

4007 msgid "use any tag in .git/refs/tags"

4046 -msgstr ""

4008 +msgstr "使用 .git/refs/tags 里的任意 tag"

4009

4010 #: builtin/describe.c:407

4011 msgid "always use long format"

4050 -msgstr ""

4012 +msgstr "始终使用长提交号格式"

4013

4014 #: builtin/describe.c:410

4053 -#, fuzzy

4015 msgid "only output exact matches"

4055 -msgstr "没有 tag 准确匹配 '%s'"

4016 +msgstr "只输出精确匹配"

4017

4018 #: builtin/describe.c:412

4019 msgid "consider <n> most recent tags (default: 10)"

4059 -msgstr ""

4020 +msgstr "考虑最近 <n> 个 tags（默认：10）"

4021

4022 #: builtin/describe.c:414

4062 -#, fuzzy

4023 msgid "only consider tags matching <pattern>"

4064 -msgstr "输出和模式匹配的行"

4024 +msgstr "只考虑匹配 <模式> 的 tags"

4025

4026 #: builtin/describe.c:416 builtin/name-rev.c:238

4027 msgid "show abbreviated commit object as fallback"

4068 -msgstr ""

4028 +msgstr "显示简写的提交号作为后备"

4029

4030 #: builtin/describe.c:417

4031 msgid "mark"

4072 -msgstr ""

4032 +msgstr "标记"

4033

4034 #: builtin/describe.c:418

4035 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4076 -msgstr ""

4036 +msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"

4037

4038 #: builtin/describe.c:436

4039 msgid "--long is incompatible with --abbrev=0"

@@ -4092,160 +4052,155 @@ msgstr "--dirty 不能与提交同时使用"

4052 msgid "'%s': not a regular file or symlink"

4053 msgstr "'%s'：不是一个正规文件或符号链接"

4054

4095 -#: builtin/diff.c:224

4055 +#: builtin/diff.c:228

4056 #, c-format

4057 msgid "invalid option: %s"

4058 msgstr "无效选项：%s"

4059

4100 -#: builtin/diff.c:301

4060 +#: builtin/diff.c:305

4061 msgid "Not a git repository"

4062 msgstr "不是一个 git 版本库"

4063

4104 -#: builtin/diff.c:344

4064 +#: builtin/diff.c:348

4065 #, c-format

4066 msgid "invalid object '%s' given."

4067 msgstr "提供了无效对象 '%s'。"

4068

4109 -#: builtin/diff.c:349

4069 +#: builtin/diff.c:353

4070 #, c-format

4071 msgid "more than %d trees given: '%s'"

4072 msgstr "提供了超过 %d 个树对象：'%s'"

4073

4114 -#: builtin/diff.c:359

4074 +#: builtin/diff.c:363

4075 #, c-format

4076 msgid "more than two blobs given: '%s'"

4117 -msgstr "提供了超过两个二进制对象（blob）：'%s'"

4077 +msgstr "提供了超过两个数据（blob）对象：'%s'"

4078

4119 -#: builtin/diff.c:367

4079 +#: builtin/diff.c:371

4080 #, c-format

4081 msgid "unhandled object '%s' given."

4082 msgstr "提供了无法处理的对象 '%s'。"

4083

4084 #: builtin/fast-export.c:22

4085 msgid "git fast-export [rev-list-opts]"

4126 -msgstr ""

4086 +msgstr "git fast-export [rev-list-opts]"

4087

4128 -#: builtin/fast-export.c:635

4129 -#, fuzzy

4088 +#: builtin/fast-export.c:646

4089 msgid "show progress after <n> objects"

4131 -msgstr "显示各种类型的对象"

4090 +msgstr "在 <n> 个对象之后显示进度"

4091

4133 -#: builtin/fast-export.c:637

4092 +#: builtin/fast-export.c:648

4093 msgid "select handling of signed tags"

4135 -msgstr ""

4094 +msgstr "选择如何处理签名 tags"

4095

4137 -#: builtin/fast-export.c:640

4096 +#: builtin/fast-export.c:651

4097 msgid "select handling of tags that tag filtered objects"

4139 -msgstr ""

4098 +msgstr "选择当 tag 指向被过滤时 tags 的处理方式"

4099

4141 -#: builtin/fast-export.c:643

4100 +#: builtin/fast-export.c:654

4101 msgid "Dump marks to this file"

4143 -msgstr ""

4102 +msgstr "把标记存储到这个文件"

4103

4145 -#: builtin/fast-export.c:645

4104 +#: builtin/fast-export.c:656

4105 msgid "Import marks from this file"

4147 -msgstr ""

4106 +msgstr "从这个文件导入标记"

4107

4149 -#: builtin/fast-export.c:647

4108 +#: builtin/fast-export.c:658

4109 msgid "Fake a tagger when tags lack one"

4151 -msgstr ""

4110 +msgstr "当 tags 缺少标记者字段时，假装提供一个"

4111

4153 -#: builtin/fast-export.c:649

4112 +#: builtin/fast-export.c:660

4113 msgid "Output full tree for each commit"

4155 -msgstr ""

4114 +msgstr "每次提交都输出整个树"

4115

4157 -#: builtin/fast-export.c:651

4116 +#: builtin/fast-export.c:662

4117 msgid "Use the done feature to terminate the stream"

4159 -msgstr ""

4118 +msgstr "使用 done 功能来终止流"

4119

4161 -#: builtin/fast-export.c:652

4120 +#: builtin/fast-export.c:663

4121 msgid "Skip output of blob data"

4163 -msgstr ""

4122 +msgstr "跳过数据对象的输出"

4123

4124 #: builtin/fetch.c:20

4166 -#, fuzzy

4125 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4168 -msgstr "git apply [选项] [<补丁>...]"

4126 +msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"

4127

4128 #: builtin/fetch.c:21

4129 msgid "git fetch [<options>] <group>"

4172 -msgstr ""

4130 +msgstr "git fetch [<选项>] <组>"

4131

4132 #: builtin/fetch.c:22

4133 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

4176 -msgstr ""

4134 +msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"

4135

4136 #: builtin/fetch.c:23

4137 msgid "git fetch --all [<options>]"

4180 -msgstr ""

4138 +msgstr "git fetch --all [<选项>]"

4139

4140 #: builtin/fetch.c:60

4141 msgid "fetch from all remotes"

4184 -msgstr ""

4142 +msgstr "从所有的远程抓取"

4143

4144 #: builtin/fetch.c:62

4145 msgid "append to .git/FETCH_HEAD instead of overwriting"

4188 -msgstr ""

4146 +msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

4147

4148 #: builtin/fetch.c:64

4149 msgid "path to upload pack on remote end"

4192 -msgstr ""

4150 +msgstr "上传包到远程的路径"

4151

4152 #: builtin/fetch.c:65

4153 msgid "force overwrite of local branch"

4196 -msgstr ""

4154 +msgstr "强制覆盖本地分支"

4155

4156 #: builtin/fetch.c:67

4157 msgid "fetch from multiple remotes"

4200 -msgstr ""

4158 +msgstr "从多个远程抓取"

4159

4160 #: builtin/fetch.c:69

4203 -#, fuzzy

4161 msgid "fetch all tags and associated objects"

4205 -msgstr "更新远程引用和相关的对象"

4162 +msgstr "抓取所有的 tags 和关联对象"

4163

4164 #: builtin/fetch.c:71

4165 msgid "do not fetch all tags (--no-tags)"

4209 -msgstr ""

4166 +msgstr "不抓取任何 tags (--no-tags)"

4167

4168 #: builtin/fetch.c:73

4212 -#, fuzzy

4169 msgid "prune remote-tracking branches no longer on remote"

4214 -msgstr "%s 没有来自 %s 的远程跟踪分支"

4170 +msgstr "清除远程已经不存在的分支的跟踪分支"

4171

4172 +# 译者：可选值，不能翻译

4173 #: builtin/fetch.c:74

4174 msgid "on-demand"

4218 -msgstr ""

4175 +msgstr "on-demand"

4176

4177 #: builtin/fetch.c:75

4178 msgid "control recursive fetching of submodules"

4222 -msgstr ""

4179 +msgstr "控制子模组的递归抓取"

4180

4181 #: builtin/fetch.c:79

4182 msgid "keep downloaded pack"

4226 -msgstr ""

4183 +msgstr "保持下载包"

4184

4185 #: builtin/fetch.c:81

4229 -#, fuzzy

4186 msgid "allow updating of HEAD ref"

4231 -msgstr "无法更新 HEAD 引用"

4187 +msgstr "允许更新 HEAD 引用"

4188

4189 #: builtin/fetch.c:84

4190 msgid "deepen history of shallow clone"

4235 -msgstr ""

4191 +msgstr "深化浅克隆的历史"

4192

4237 -#: builtin/fetch.c:85 builtin/log.c:1083

4193 +#: builtin/fetch.c:85 builtin/log.c:1119

4194 msgid "dir"

4239 -msgstr ""

4195 +msgstr "目录"

4196

4197 #: builtin/fetch.c:86

4242 -#, fuzzy

4198 msgid "prepend this to submodule path output"

4244 -msgstr "无法递归进子模组路径 '$sm_path'"

4199 +msgstr "在子模组路径输出的前面加上此目录"

4200

4201 #: builtin/fetch.c:89

4202 msgid "default mode for recursion"

4248 -msgstr ""

4203 +msgstr "递归的默认模式"

4204

4205 #: builtin/fetch.c:201

4206 msgid "Couldn't find remote ref HEAD"

@@ -4256,68 +4211,68 @@ msgstr "无法发现远程 HEAD 引用"

4211 msgid "object %s not found"

4212 msgstr "对象 %s 未发现"

4213

4259 -#: builtin/fetch.c:260

4214 +#: builtin/fetch.c:259

4215 msgid "[up to date]"

4216 msgstr "[最新]"

4217

4263 -#: builtin/fetch.c:274

4218 +#: builtin/fetch.c:273

4219 #, c-format

4220 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

4221 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

4222

4268 -#: builtin/fetch.c:275 builtin/fetch.c:361

4223 +#: builtin/fetch.c:274 builtin/fetch.c:360

4224 msgid "[rejected]"

4225 msgstr "[已拒绝]"

4226

4272 -#: builtin/fetch.c:286

4227 +#: builtin/fetch.c:285

4228 msgid "[tag update]"

4229 msgstr "[tag更新]"

4230

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

4277 -#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341

4232 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

4233 msgid " (unable to update local ref)"

4234 msgstr " （不能更新本地引用）"

4235

4281 -#: builtin/fetch.c:306

4236 +#: builtin/fetch.c:305

4237 msgid "[new tag]"

4238 msgstr "[新tag]"

4239

4285 -#: builtin/fetch.c:309

4240 +#: builtin/fetch.c:308

4241 msgid "[new branch]"

4242 msgstr "[新分支]"

4243

4289 -#: builtin/fetch.c:312

4244 +#: builtin/fetch.c:311

4245 msgid "[new ref]"

4246 msgstr "[新引用]"

4247

4293 -#: builtin/fetch.c:357

4248 +#: builtin/fetch.c:356

4249 msgid "unable to update local ref"

4250 msgstr "不能更新本地引用"

4251

4297 -#: builtin/fetch.c:357

4252 +#: builtin/fetch.c:356

4253 msgid "forced update"

4254 msgstr "强制更新"

4255

4301 -#: builtin/fetch.c:363

4256 +#: builtin/fetch.c:362

4257 msgid "(non-fast-forward)"

4258 msgstr "（非快进式）"

4259

4305 -#: builtin/fetch.c:394 builtin/fetch.c:686

4260 +#: builtin/fetch.c:393 builtin/fetch.c:685

4261 #, c-format

4262 msgid "cannot open %s: %s\n"

4263 msgstr "无法打开 %s：%s\n"

4264

4310 -#: builtin/fetch.c:403

4265 +#: builtin/fetch.c:402

4266 #, c-format

4267 msgid "%s did not send all necessary objects\n"

4268 msgstr "%s 未发送所有必须的对象\n"

4269

4315 -#: builtin/fetch.c:489

4270 +#: builtin/fetch.c:488

4271 #, c-format

4272 msgid "From %.*s\n"

4273 msgstr "来自 %.*s\n"

4274

4320 -#: builtin/fetch.c:500

4275 +#: builtin/fetch.c:499

4276 #, c-format

4277 msgid ""

4278 "some local refs could not be updated; try running\n"

@@ -4327,203 +4282,200 @@ msgstr ""

4282 " 'git remote prune %s' 来删除旧的、有冲突的分支"

4283

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

4330 -#: builtin/fetch.c:550

4285 +#: builtin/fetch.c:549

4286 #, c-format

4287 msgid " (%s will become dangling)"

4333 -msgstr " （%s 将成为悬空状态）"

4288 +msgstr " （%s 将成为摇摆状态）"

4289

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

4336 -#: builtin/fetch.c:551

4291 +#: builtin/fetch.c:550

4292 #, c-format

4293 msgid " (%s has become dangling)"

4339 -msgstr " （%s 已成为悬空状态）"

4294 +msgstr " （%s 已成为摇摆状态）"

4295

4341 -#: builtin/fetch.c:558

4296 +#: builtin/fetch.c:557

4297 msgid "[deleted]"

4298 msgstr "[已删除]"

4299

4345 -#: builtin/fetch.c:559 builtin/remote.c:1055

4300 +#: builtin/fetch.c:558 builtin/remote.c:1055

4301 msgid "(none)"

4302 msgstr "（无）"

4303

4349 -#: builtin/fetch.c:676

4304 +#: builtin/fetch.c:675

4305 #, c-format

4306 msgid "Refusing to fetch into current branch %s of non-bare repository"

4307 msgstr "拒绝获取到非裸版本库的当前分支 %s"

4308

4354 -#: builtin/fetch.c:710

4309 +#: builtin/fetch.c:709

4310 #, c-format

4311 msgid "Don't know how to fetch from %s"

4312 msgstr "不知道如何从 %s 获取"

4313

4359 -#: builtin/fetch.c:787

4314 +#: builtin/fetch.c:786

4315 #, c-format

4316 msgid "Option \"%s\" value \"%s\" is not valid for %s"

4317 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

4318

4364 -#: builtin/fetch.c:790

4319 +#: builtin/fetch.c:789

4320 #, c-format

4321 msgid "Option \"%s\" is ignored for %s\n"

4322 msgstr "选项 \"%s\" 为 %s 所忽略\n"

4323

4369 -#: builtin/fetch.c:892

4324 +#: builtin/fetch.c:891

4325 #, c-format

4326 msgid "Fetching %s\n"

4327 msgstr "正在获取 %s\n"

4328

4374 -#: builtin/fetch.c:894 builtin/remote.c:100

4329 +#: builtin/fetch.c:893 builtin/remote.c:100

4330 #, c-format

4331 msgid "Could not fetch %s"

4332 msgstr "不能获取 %s"

4333

4379 -#: builtin/fetch.c:913

4334 +#: builtin/fetch.c:912

4335 msgid ""

4336 "No remote repository specified. Please, specify either a URL or a\n"

4337 "remote name from which new revisions should be fetched."

4338 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

4339

4385 -#: builtin/fetch.c:933

4340 +#: builtin/fetch.c:932

4341 msgid "You need to specify a tag name."

4342 msgstr "您需要指定一个 tag 名称。"

4343

4389 -#: builtin/fetch.c:985

4344 +#: builtin/fetch.c:984

4345 msgid "fetch --all does not take a repository argument"

4346 msgstr "fetch --all 不能带一个版本库参数"

4347

4393 -#: builtin/fetch.c:987

4348 +#: builtin/fetch.c:986

4349 msgid "fetch --all does not make sense with refspecs"

4350 msgstr "fetch --all 带引用表达式没有任何意义"

4351

4397 -#: builtin/fetch.c:998

4352 +#: builtin/fetch.c:997

4353 #, c-format

4354 msgid "No such remote or remote group: %s"

4355 msgstr "没有这样的远程或远程组：%s"

4356

4402 -#: builtin/fetch.c:1006

4357 +#: builtin/fetch.c:1005

4358 msgid "Fetching a group and specifying refspecs does not make sense"

4359 msgstr "获取组并指定引用表达式没有意义"

4360

4361 #: builtin/fmt-merge-msg.c:13

4362 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4363 msgstr ""

4364 +"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4365

4410 -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786

4411 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192

4412 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235

4366 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701

4367 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175

4368 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239

4369 msgid "n"

4414 -msgstr "数字"

4370 +msgstr "n"

4371

4416 -#: builtin/fmt-merge-msg.c:654

4372 +#: builtin/fmt-merge-msg.c:660

4373 msgid "populate log with at most <n> entries from shortlog"

4418 -msgstr ""

4374 +msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"

4375

4420 -#: builtin/fmt-merge-msg.c:657

4376 +#: builtin/fmt-merge-msg.c:663

4377 msgid "alias for --log (deprecated)"

4422 -msgstr ""

4378 +msgstr "参数 --log 的别名（已弃用）"

4379

4424 -#: builtin/fmt-merge-msg.c:660

4380 +#: builtin/fmt-merge-msg.c:666

4381 msgid "text"

4426 -msgstr ""

4382 +msgstr "文本"

4383

4428 -#: builtin/fmt-merge-msg.c:661

4384 +#: builtin/fmt-merge-msg.c:667

4385 msgid "use <text> as start of message"

4430 -msgstr ""

4386 +msgstr "使用 <文本> 作为提交说明的开始"

4387

4432 -#: builtin/fmt-merge-msg.c:662

4433 -#, fuzzy

4388 +#: builtin/fmt-merge-msg.c:668

4389 msgid "file to read from"

4435 -msgstr "不能读 %s"

4390 +msgstr "从文件中读取"

4391

4392 #: builtin/for-each-ref.c:979

4438 -#, fuzzy

4393 msgid "git for-each-ref [options] [<pattern>]"

4440 -msgstr "git apply [选项] [<补丁>...]"

4394 +msgstr "git for-each-ref [选项] [<模式>]"

4395

4396 #: builtin/for-each-ref.c:994

4397 msgid "quote placeholders suitably for shells"

4444 -msgstr ""

4398 +msgstr "引用占位符适用于 shells"

4399

4400 #: builtin/for-each-ref.c:996

4401 msgid "quote placeholders suitably for perl"

4448 -msgstr ""

4402 +msgstr "引用占位符适用于 perl"

4403

4404 #: builtin/for-each-ref.c:998

4405 msgid "quote placeholders suitably for python"

4452 -msgstr ""

4406 +msgstr "引用占位符适用于 python"

4407

4408 #: builtin/for-each-ref.c:1000

4409 msgid "quote placeholders suitably for tcl"

4456 -msgstr ""

4410 +msgstr "引用占位符适用于 tcl"

4411

4412 #: builtin/for-each-ref.c:1003

4413 msgid "show only <n> matched refs"

4460 -msgstr ""

4414 +msgstr "只显示 <n> 个匹配的引用"

4415

4416 #: builtin/for-each-ref.c:1004

4417 msgid "format"

4464 -msgstr ""

4418 +msgstr "格式"

4419

4420 #: builtin/for-each-ref.c:1004

4421 msgid "format to use for the output"

4468 -msgstr ""

4422 +msgstr "输出格式"

4423

4424 #: builtin/for-each-ref.c:1005

4425 msgid "key"

4472 -msgstr ""

4426 +msgstr "key"

4427

4428 #: builtin/for-each-ref.c:1006

4429 msgid "field name to sort on"

4476 -msgstr ""

4430 +msgstr "排序的字段名"

4431

4432 #: builtin/fsck.c:608

4479 -#, fuzzy

4433 msgid "git fsck [options] [<object>...]"

4481 -msgstr "git apply [选项] [<补丁>...]"

4434 +msgstr "git fsck [选项] [<对象>...]"

4435

4436 #: builtin/fsck.c:614

4437 msgid "show unreachable objects"

4485 -msgstr ""

4438 +msgstr "显示不可达的对象"

4439

4440 #: builtin/fsck.c:615

4488 -#, fuzzy

4441 msgid "show dangling objects"

4490 -msgstr "索引对象中"

4442 +msgstr "显示摇摆的对象"

4443

4444 #: builtin/fsck.c:616

4445 msgid "report tags"

4494 -msgstr ""

4446 +msgstr "报告 tags"

4447

4448 #: builtin/fsck.c:617

4449 msgid "report root nodes"

4498 -msgstr ""

4450 +msgstr "报告根节点"

4451

4452 #: builtin/fsck.c:618

4453 msgid "make index objects head nodes"

4502 -msgstr ""

4454 +msgstr "将索引亦作为检查的头节点"

4455

4456 #: builtin/fsck.c:619

4457 msgid "make reflogs head nodes (default)"

4506 -msgstr ""

4458 +msgstr "将引用日志作为检查的头节点（默认）"

4459

4460 #: builtin/fsck.c:620

4461 msgid "also consider packs and alternate objects"

4510 -msgstr ""

4462 +msgstr "也考虑包和备用对象"

4463

4464 #: builtin/fsck.c:621

4465 msgid "enable more strict checking"

4514 -msgstr ""

4466 +msgstr "启用更严格的检查"

4467

4468 #: builtin/fsck.c:623

4469 msgid "write dangling objects in .git/lost-found"

4518 -msgstr ""

4470 +msgstr "将摇摆对象写入 .git/lost-found 中"

4471

4472 #: builtin/fsck.c:624 builtin/prune.c:134

4473 msgid "show progress"

4522 -msgstr ""

4474 +msgstr "显示进度"

4475

4476 #: builtin/gc.c:22

4477 msgid "git gc [options]"

4526 -msgstr ""

4478 +msgstr "git gc [选项]"

4479

4480 #: builtin/gc.c:63

4481 #, c-format

@@ -4537,22 +4489,17 @@ msgstr "不正常的长对象目录 %.*s"

4489

4490 #: builtin/gc.c:179

4491 msgid "prune unreferenced objects"

4540 -msgstr ""

4492 +msgstr "清除未引用的对象"

4493

4494 #: builtin/gc.c:181

4495 msgid "be more thorough (increased runtime)"

4544 -msgstr ""

4496 +msgstr "更彻底（增加运行时间）"

4497

4498 #: builtin/gc.c:182

4499 msgid "enable auto-gc mode"

4548 -msgstr ""

4500 +msgstr "启用自动垃圾回收模式"

4501

4550 -#: builtin/gc.c:221

4551 -#, c-format

4552 -msgid "Auto packing the repository for optimum performance.\n"

4553 -msgstr "自动打包版本库以求最佳性能。\n"

4554 -

4555 -#: builtin/gc.c:224

4502 +#: builtin/gc.c:222

4503 #, c-format

4504 msgid ""

4505 "Auto packing the repository for optimum performance. You may also\n"

@@ -4561,239 +4508,240 @@ msgstr ""

4508 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"

4509 "参见 \"git help gc\" 以获取更多信息。\n"

4510

4564 -#: builtin/gc.c:251

4511 +#: builtin/gc.c:249

4512 msgid ""

4513 "There are too many unreachable loose objects; run 'git prune' to remove them."

4514 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

4515

4516 #: builtin/grep.c:22

4517 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

4571 -msgstr ""

4518 +msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"

4519

4573 -#: builtin/grep.c:216

4520 +#: builtin/grep.c:217

4521 #, c-format

4522 msgid "grep: failed to create thread: %s"

4523 msgstr "grep：无法创建线程：%s"

4524

4578 -#: builtin/grep.c:454

4525 +#: builtin/grep.c:365

4526 #, c-format

4527 msgid "Failed to chdir: %s"

4528 msgstr "无法切换目录：%s"

4529

4583 -#: builtin/grep.c:530 builtin/grep.c:564

4530 +#: builtin/grep.c:443 builtin/grep.c:478

4531 #, c-format

4532 msgid "unable to read tree (%s)"

4533 msgstr "无法读取树（%s）"

4534

4588 -#: builtin/grep.c:578

4535 +#: builtin/grep.c:493

4536 #, c-format

4537 msgid "unable to grep from object of type %s"

4538 msgstr "无法抓取来自于 %s 类型的对象"

4539

4593 -#: builtin/grep.c:636

4540 +#: builtin/grep.c:551

4541 #, c-format

4542 msgid "switch `%c' expects a numerical value"

4543 msgstr "开关 `%c' 期望一个数字值"

4544

4598 -#: builtin/grep.c:653

4545 +#: builtin/grep.c:568

4546 #, c-format

4547 msgid "cannot open '%s'"

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

4549

4603 -#: builtin/grep.c:728

4550 +#: builtin/grep.c:643

4551 msgid "search in index instead of in the work tree"

4605 -msgstr ""

4552 +msgstr "在索引区搜索而不是在工作区"

4553

4607 -#: builtin/grep.c:730

4554 +#: builtin/grep.c:645

4555 msgid "find in contents not managed by git"

4609 -msgstr ""

4556 +msgstr "在未被 git 管理的内容中查找"

4557

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

4612 -#: builtin/grep.c:732

4613 -#, fuzzy

4559 +#: builtin/grep.c:647

4560 msgid "search in both tracked and untracked files"

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

4561 +msgstr "在跟踪和未跟踪的文件中搜索"

4562

4617 -#: builtin/grep.c:734

4563 +#: builtin/grep.c:649

4564 msgid "search also in ignored files"

4619 -msgstr ""

4565 +msgstr "也在忽略的文件中搜索"

4566

4621 -#: builtin/grep.c:737

4567 +#: builtin/grep.c:652

4568 msgid "show non-matching lines"

4623 -msgstr ""

4569 +msgstr "显示未匹配的行"

4570

4625 -#: builtin/grep.c:739

4571 +#: builtin/grep.c:654

4572 msgid "case insensitive matching"

4627 -msgstr ""

4573 +msgstr "不区分大小写匹配"

4574

4629 -#: builtin/grep.c:741

4575 +#: builtin/grep.c:656

4576 msgid "match patterns only at word boundaries"

4631 -msgstr ""

4577 +msgstr "只在单词边界匹配模式"

4578

4633 -#: builtin/grep.c:743

4579 +#: builtin/grep.c:658

4580 msgid "process binary files as text"

4635 -msgstr ""

4581 +msgstr "把二进制文件当做文本处理"

4582

4637 -#: builtin/grep.c:745

4583 +#: builtin/grep.c:660

4584 msgid "don't match patterns in binary files"

4639 -msgstr ""

4585 +msgstr "不在二进制文件中匹配模式"

4586

4641 -#: builtin/grep.c:748

4587 +#: builtin/grep.c:663

4588 msgid "descend at most <depth> levels"

4643 -msgstr ""

4589 +msgstr "最多以指定的深度向下寻找"

4590

4645 -#: builtin/grep.c:752

4591 +#: builtin/grep.c:667

4592 msgid "use extended POSIX regular expressions"

4647 -msgstr ""

4593 +msgstr "使用扩展的 POSIX 正则表达式"

4594

4649 -#: builtin/grep.c:755

4595 +#: builtin/grep.c:670

4596 msgid "use basic POSIX regular expressions (default)"

4651 -msgstr ""

4597 +msgstr "使用基本的 POSIX 正则表达式（默认）"

4598

4653 -#: builtin/grep.c:758

4599 +#: builtin/grep.c:673

4600 msgid "interpret patterns as fixed strings"

4655 -msgstr ""

4601 +msgstr "把模式解析为固定的字符串"

4602

4657 -#: builtin/grep.c:761

4603 +#: builtin/grep.c:676

4604 msgid "use Perl-compatible regular expressions"

4659 -msgstr ""

4605 +msgstr "使用 Perl 兼容的正则表达式"

4606

4661 -#: builtin/grep.c:764

4607 +#: builtin/grep.c:679

4608 msgid "show line numbers"

4663 -msgstr ""

4609 +msgstr "显示行号"

4610

4665 -#: builtin/grep.c:765

4611 +#: builtin/grep.c:680

4612 msgid "don't show filenames"

4667 -msgstr ""

4613 +msgstr "不显示文件名"

4614

4669 -#: builtin/grep.c:766

4670 -#, fuzzy

4615 +#: builtin/grep.c:681

4616 msgid "show filenames"

4672 -msgstr "%s文件："

4617 +msgstr "显示文件名"

4618

4674 -#: builtin/grep.c:768

4619 +#: builtin/grep.c:683

4620 msgid "show filenames relative to top directory"

4676 -msgstr ""

4621 +msgstr "显示相对于顶级目录的文件名"

4622

4678 -#: builtin/grep.c:770

4623 +#: builtin/grep.c:685

4624 msgid "show only filenames instead of matching lines"

4680 -msgstr ""

4625 +msgstr "只显示文件名而不显示匹配的行"

4626

4682 -#: builtin/grep.c:772

4627 +#: builtin/grep.c:687

4628 msgid "synonym for --files-with-matches"

4684 -msgstr ""

4629 +msgstr "和 --files-with-matches 同义"

4630

4686 -#: builtin/grep.c:775

4631 +#: builtin/grep.c:690

4632 msgid "show only the names of files without match"

4688 -msgstr ""

4633 +msgstr "只显示未匹配的文件名"

4634

4690 -#: builtin/grep.c:777

4691 -#, fuzzy

4635 +#: builtin/grep.c:692

4636 msgid "print NUL after filenames"

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

4637 +msgstr "在文件名后输出 NUL 字符"

4638

4695 -#: builtin/grep.c:779

4639 +#: builtin/grep.c:694

4640 msgid "show the number of matches instead of matching lines"

4697 -msgstr ""

4641 +msgstr "显示总匹配行数，而不显示匹配的行"

4642

4699 -#: builtin/grep.c:780

4643 +#: builtin/grep.c:695

4644 msgid "highlight matches"

4701 -msgstr ""

4645 +msgstr "高亮显示匹配项"

4646

4703 -#: builtin/grep.c:782

4647 +#: builtin/grep.c:697

4648 msgid "print empty line between matches from different files"

4705 -msgstr ""

4649 +msgstr "在不同文件的匹配项之间打印空行"

4650

4707 -#: builtin/grep.c:784

4651 +#: builtin/grep.c:699

4652 msgid "show filename only once above matches from same file"

4709 -msgstr ""

4653 +msgstr "只在同一文件的匹配项的上面显示一次文件名"

4654

4711 -#: builtin/grep.c:787

4655 +#: builtin/grep.c:702

4656 msgid "show <n> context lines before and after matches"

4713 -msgstr ""

4657 +msgstr "显示匹配项前后的 <n> 行上下文"

4658

4715 -#: builtin/grep.c:790

4659 +#: builtin/grep.c:705

4660 msgid "show <n> context lines before matches"

4717 -msgstr ""

4661 +msgstr "显示匹配项前 <n> 行上下文"

4662

4719 -#: builtin/grep.c:792

4663 +#: builtin/grep.c:707

4664 msgid "show <n> context lines after matches"

4721 -msgstr ""

4665 +msgstr "显示匹配项后 <n> 行上下文"

4666

4723 -#: builtin/grep.c:793

4667 +#: builtin/grep.c:708

4668 msgid "shortcut for -C NUM"

4725 -msgstr ""

4669 +msgstr "快捷键 -C 数字"

4670

4727 -#: builtin/grep.c:796

4671 +#: builtin/grep.c:711

4672 msgid "show a line with the function name before matches"

4729 -msgstr ""

4673 +msgstr "在匹配的前面显示一行函数名"

4674

4731 -#: builtin/grep.c:798

4675 +#: builtin/grep.c:713

4676 msgid "show the surrounding function"

4733 -msgstr ""

4677 +msgstr "显示所在函数的前后内容"

4678

4735 -#: builtin/grep.c:801

4679 +#: builtin/grep.c:716

4680 msgid "read patterns from file"

4737 -msgstr ""

4681 +msgstr "从文件读取模式"

4682

4739 -#: builtin/grep.c:803

4683 +#: builtin/grep.c:718

4684 msgid "match <pattern>"

4741 -msgstr ""

4685 +msgstr "匹配 <模式>"

4686

4743 -#: builtin/grep.c:805

4687 +#: builtin/grep.c:720

4688 msgid "combine patterns specified with -e"

4745 -msgstr ""

4689 +msgstr "组合用 -e 参数设定的模式"

4690

4747 -#: builtin/grep.c:817

4691 +#: builtin/grep.c:732

4692 msgid "indicate hit with exit status without output"

4749 -msgstr ""

4693 +msgstr "不输出，而用退出码标识命中状态"

4694

4751 -#: builtin/grep.c:819

4695 +#: builtin/grep.c:734

4696 msgid "show only matches from files that match all patterns"

4753 -msgstr ""

4697 +msgstr "只显示匹配所有模式的文件中的匹配"

4698

4755 -#: builtin/grep.c:822

4699 +#: builtin/grep.c:736

4700 +msgid "show parse tree for grep expression"

4701 +msgstr "显示 grep 表达式的解析树"

4702 +

4703 +#: builtin/grep.c:740

4704 msgid "pager"

4757 -msgstr ""

4705 +msgstr "分页"

4706

4759 -#: builtin/grep.c:822

4707 +#: builtin/grep.c:740

4708 msgid "show matching files in the pager"

4761 -msgstr ""

4709 +msgstr "分页显示匹配的文件"

4710

4763 -#: builtin/grep.c:825

4711 +#: builtin/grep.c:743

4712 msgid "allow calling of grep(1) (ignored by this build)"

4765 -msgstr ""

4713 +msgstr "允许调用 grep(1)（本次构建忽略）"

4714

4767 -#: builtin/grep.c:826 builtin/show-ref.c:201

4715 +#: builtin/grep.c:744 builtin/show-ref.c:184

4716 msgid "show usage"

4769 -msgstr ""

4717 +msgstr "显示用法"

4718

4771 -#: builtin/grep.c:917

4719 +#: builtin/grep.c:811

4720 msgid "no pattern given."

4721 msgstr "未提供模式匹配。"

4722

4775 -#: builtin/grep.c:931

4723 +#: builtin/grep.c:825

4724 #, c-format

4725 msgid "bad object %s"

4726 msgstr "坏对象 %s"

4727

4780 -#: builtin/grep.c:972

4728 +#: builtin/grep.c:866

4729 msgid "--open-files-in-pager only works on the worktree"

4730 msgstr "--open-files-in-pager 仅用于工作区"

4731

4784 -#: builtin/grep.c:995

4732 +#: builtin/grep.c:889

4733 msgid "--cached or --untracked cannot be used with --no-index."

4734 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

4735

4788 -#: builtin/grep.c:1000

4736 +#: builtin/grep.c:894

4737 msgid "--no-index or --untracked cannot be used with revs."

4738 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

4739

4792 -#: builtin/grep.c:1003

4740 +#: builtin/grep.c:897

4741 msgid "--[no-]exclude-standard cannot be used for tracked contents."

4742 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

4743

4796 -#: builtin/grep.c:1011

4744 +#: builtin/grep.c:905

4745 msgid "both --cached and trees are given."

4746 msgstr "同时给出了 --cached 和树对象。"

4747

@@ -4802,56 +4750,56 @@ msgid ""

4750 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "

4751 "<file>..."

4752 msgstr ""

4753 +"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "

4754 +"<文件>..."

4755

4756 #: builtin/hash-object.c:61

4757 msgid "git hash-object --stdin-paths < <list-of-paths>"

4808 -msgstr ""

4758 +msgstr "git hash-object --stdin-paths < <路径列表>"

4759

4760 #: builtin/hash-object.c:72

4761 msgid "type"

4812 -msgstr ""

4762 +msgstr "类型"

4763

4764 #: builtin/hash-object.c:72

4815 -#, fuzzy

4765 msgid "object type"

4817 -msgstr "坏的对象类型。"

4766 +msgstr "对象类型"

4767

4768 #: builtin/hash-object.c:73

4769 msgid "write the object into the object database"

4821 -msgstr ""

4770 +msgstr "将对象写入对象数据库"

4771

4772 #: builtin/hash-object.c:74

4773 msgid "read the object from stdin"

4825 -msgstr ""

4774 +msgstr "从标准输入读取对象"

4775

4776 #: builtin/hash-object.c:76

4777 msgid "store file as is without filters"

4829 -msgstr ""

4778 +msgstr "原样存储文件不使用过滤器"

4779

4780 #: builtin/hash-object.c:77

4781 msgid "process file as it were from this path"

4833 -msgstr ""

4782 +msgstr "处理文件并假设其来自于此路径"

4783

4784 #: builtin/help.c:43

4836 -#, fuzzy

4785 msgid "print all available commands"

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

4786 +msgstr "打印所有可用的命令"

4787

4788 #: builtin/help.c:44

4789 msgid "show man page"

4842 -msgstr ""

4790 +msgstr "显示 man 手册"

4791

4792 #: builtin/help.c:45

4793 msgid "show manual in web browser"

4846 -msgstr ""

4794 +msgstr "在 web 浏览器中显示手册"

4795

4796 #: builtin/help.c:47

4797 msgid "show info page"

4850 -msgstr ""

4798 +msgstr "显示 info 手册"

4799

4800 #: builtin/help.c:53

4801 msgid "git help [--all] [--man|--web|--info] [command]"

4854 -msgstr ""

4802 +msgstr "git help [--all] [--man|--web|--info] [命令]"

4803

4804 #: builtin/help.c:65

4805 #, c-format

@@ -4869,7 +4817,7 @@ msgstr "无法解析 emacsclient 版本。"

4817 #: builtin/help.c:114

4818 #, c-format

4819 msgid "emacsclient version '%d' too old (< 22)."

4872 -msgstr "emacsclient 版本 '%d' 太老 (< 22)。"

4820 +msgstr "emacsclient 版本 '%d' 太老（< 22）。"

4821

4822 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177

4823 #, c-format

@@ -4970,7 +4918,7 @@ msgstr "包签名不匹配"

4918 #: builtin/index-pack.c:294

4919 #, c-format

4920 msgid "pack version %<PRIu32> unsupported"

4973 -msgstr ""

4921 +msgstr "不支持包版本 %<PRIu32>"

4922

4923 #: builtin/index-pack.c:312

4924 #, c-format

@@ -5030,7 +4978,7 @@ msgstr "不能读取现存对象 %s"

4978 #: builtin/index-pack.c:732

4979 #, c-format

4980 msgid "invalid blob object %s"

5033 -msgstr "无效的二进制对象（blob）%s"

4981 +msgstr "无效的数据（blob）对象 %s"

4982

4983 #: builtin/index-pack.c:747

4984 #, c-format

@@ -5079,9 +5027,9 @@ msgid "Resolving deltas"

5027 msgstr "处理 delta 中"

5028

5029 #: builtin/index-pack.c:1064

5082 -#, fuzzy, c-format

5030 +#, c-format

5031 msgid "unable to create thread: %s"

5084 -msgstr "grep：无法创建线程：%s"

5032 +msgstr "不能创建线程：%s"

5033

5034 #: builtin/index-pack.c:1106

5035 msgid "confusion beyond insanity"

@@ -5090,12 +5038,12 @@ msgstr "不可理喻"

5038 #: builtin/index-pack.c:1112

5039 #, c-format

5040 msgid "completed with %d local objects"

5093 -msgstr ""

5041 +msgstr "完成 %d 个本地对象"

5042

5043 #: builtin/index-pack.c:1121

5044 #, c-format

5045 msgid "Unexpected tail checksum for %s (disk corruption?)"

5098 -msgstr ""

5046 +msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"

5047

5048 #: builtin/index-pack.c:1125

5049 #, c-format

@@ -5107,7 +5055,7 @@ msgstr[1] "包有 %d 个未解决的 delta"

5055 #: builtin/index-pack.c:1150

5056 #, c-format

5057 msgid "unable to deflate appended object (%d)"

5110 -msgstr "不能缩小附加对象（%d）"

5058 +msgstr "不能压缩附加对象（%d）"

5059

5060 #: builtin/index-pack.c:1229

5061 #, c-format

@@ -5137,19 +5085,19 @@ msgid "cannot store index file"

5085 msgstr "无法存储索引文件"

5086

5087 #: builtin/index-pack.c:1331

5140 -#, fuzzy, c-format

5088 +#, c-format

5089 msgid "bad pack.indexversion=%<PRIu32>"

5142 -msgstr "坏的索引版本 '%s'"

5090 +msgstr "坏的 pack.indexversion=%<PRIu32>"

5091

5092 #: builtin/index-pack.c:1337

5093 #, c-format

5094 msgid "invalid number of threads specified (%d)"

5147 -msgstr ""

5095 +msgstr "指定的线程数无效（%d）"

5096

5097 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514

5098 #, c-format

5099 msgid "no threads support, ignoring %s"

5152 -msgstr ""

5100 +msgstr "没有线程支持，忽略 %s"

5101

5102 #: builtin/index-pack.c:1399

5103 #, c-format

@@ -5320,19 +5268,20 @@ msgid ""

5268 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"

5269 "[=<permissions>]] [directory]"

5270 msgstr ""

5271 +"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "

5272 +"[目录]"

5273

5274 #: builtin/init-db.c:490

5275 msgid "permissions"

5326 -msgstr ""

5276 +msgstr "权限"

5277

5278 #: builtin/init-db.c:491

l10n: zh_CN.po: 800+ new translations on command usages