903147923e · matheusbsbs/matheus-bagliano

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

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2013-08-06 14:10+0800\n"

16 -"PO-Revision-Date: 2013-08-06 14:45+0800\n"

15 +"POT-Creation-Date: 2013-11-02 08:06+0800\n"

16 +"PO-Revision-Date: 2013-11-02 08:14+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"

@@ -60,71 +60,76 @@ msgstr ""

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

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

62

63 -#: archive.c:323

63 +#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328

64 +#, c-format

65 +msgid "pathspec '%s' did not match any files"

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

67 +

68 +#: archive.c:327

69 msgid "fmt"

70 msgstr "格式"

71

67 -#: archive.c:323

72 +#: archive.c:327

73 msgid "archive format"

74 msgstr "归档格式"

75

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

76 +#: archive.c:328 builtin/log.c:1193

77 msgid "prefix"

78 msgstr "前缀"

79

75 -#: archive.c:325

80 +#: archive.c:329

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

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

83

79 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292

80 -#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673

81 -#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77

82 -#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408

83 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152

84 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264

85 +#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680

86 +#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

87 +#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

88 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

89 msgid "file"

90 msgstr "文件"

91

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

92 +#: archive.c:331 builtin/archive.c:89

93 msgid "write the archive to this file"

94 msgstr "归档写入此文件"

95

91 -#: archive.c:329

96 +#: archive.c:333

97 msgid "read .gitattributes in working directory"

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

99

95 -#: archive.c:330

100 +#: archive.c:334

101 msgid "report archived files on stderr"

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

103

99 -#: archive.c:331

104 +#: archive.c:335

105 msgid "store only"

106 msgstr "只存储"

107

103 -#: archive.c:332

108 +#: archive.c:336

109 msgid "compress faster"

110 msgstr "压缩速度更快"

111

107 -#: archive.c:340

112 +#: archive.c:344

113 msgid "compress better"

114 msgstr "压缩效果更好"

115

111 -#: archive.c:343

116 +#: archive.c:347

117 msgid "list supported archive formats"

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

119

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

120 +#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84

121 msgid "repo"

122 msgstr "版本库"

123

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

124 +#: archive.c:350 builtin/archive.c:91

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

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

127

123 -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487

128 +#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487

129 msgid "command"

130 msgstr "命令"

131

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

132 +#: archive.c:352 builtin/archive.c:93

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

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

135

@@ -205,17 +210,17 @@ msgstr "一个分支名 '%s' 已经存在。"

210 msgid "Cannot force update the current branch."

211 msgstr "无法强制更新当前分支。"

212

208 -#: branch.c:216

213 +#: branch.c:215

214 #, c-format

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

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

217

213 -#: branch.c:218

218 +#: branch.c:217

219 #, c-format

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

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

222

218 -#: branch.c:220

223 +#: branch.c:219

224 msgid ""

225 "\n"

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

@@ -233,26 +238,26 @@ msgstr ""

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

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

240

236 -#: branch.c:265

241 +#: branch.c:264

242 #, c-format

243 msgid "Not a valid object name: '%s'."

244 msgstr "不是一个有效的对象名：'%s'。"

245

241 -#: branch.c:285

246 +#: branch.c:284

247 #, c-format

248 msgid "Ambiguous object name: '%s'."

249 msgstr "歧义的对象名：'%s'。"

250

246 -#: branch.c:290

251 +#: branch.c:289

252 #, c-format

253 msgid "Not a valid branch point: '%s'."

254 msgstr "无效的分支点：'%s'。"

255

251 -#: branch.c:296

256 +#: branch.c:295

257 msgid "Failed to lock ref for update"

258 msgstr "无法为更新锁定引用"

259

255 -#: branch.c:314

260 +#: branch.c:313

261 msgid "Failed to write ref"

262 msgstr "不能写引用"

263

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

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

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

273

269 -#: bundle.c:89 builtin/commit.c:697

274 +#: bundle.c:89 builtin/commit.c:706

275 #, c-format

276 msgid "could not open '%s'"

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

@@ -275,9 +280,9 @@ msgstr "不能打开 '%s'"

280 msgid "Repository lacks these prerequisite commits:"

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

282

278 -#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331

279 -#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364

280 -#: builtin/shortlog.c:156

283 +#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

284 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364

285 +#: builtin/shortlog.c:158

286 msgid "revision walk setup failed"

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

288

@@ -303,7 +308,7 @@ msgstr[1] "这个包需要 %d 个引用："

308 msgid "rev-list died"

309 msgstr "rev-list 终止"

310

306 -#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259

311 +#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261

312 #, c-format

313 msgid "unrecognized argument: %s"

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

@@ -455,7 +460,7 @@ msgstr ""

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

461 "%s"

462

458 -#: diff.c:3487

463 +#: diff.c:3490

464 #, c-format

465 msgid ""

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

@@ -464,7 +469,7 @@ msgstr ""

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

470 "%s"

471

467 -#: diff.c:3501

472 +#: diff.c:3504

473 #, c-format

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

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

@@ -491,17 +496,17 @@ msgstr "不能创建临时文件 '%s'：%s"

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

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

498

494 -#: grep.c:1623

499 +#: grep.c:1695

500 #, c-format

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

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

503

499 -#: grep.c:1640

504 +#: grep.c:1712

505 #, c-format

506 msgid "'%s': %s"

507 msgstr "'%s'：%s"

508

504 -#: grep.c:1651

509 +#: grep.c:1723

510 #, c-format

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

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

@@ -574,8 +579,8 @@ msgstr "%s：%s - %s"

579 msgid "failed to read the cache"

580 msgstr "无法读取缓存"

581

577 -#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

578 -#: builtin/clone.c:656

582 +#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

583 +#: builtin/clone.c:655

584 msgid "unable to write new index file"

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

586

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

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

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

631

627 -#: merge-recursive.c:774 builtin/clone.c:312

632 +#: merge-recursive.c:774 builtin/clone.c:311

633 #, c-format

634 msgid "failed to open '%s'"

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

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

764 msgid "Auto-merging %s"

765 msgstr "自动合并 %s"

766

762 -#: merge-recursive.c:1634 git-submodule.sh:1118

767 +#: merge-recursive.c:1634 git-submodule.sh:1125

768 msgid "submodule"

769 msgstr "子模组"

770

@@ -854,59 +859,122 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

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

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

861

857 -#: object.c:204

862 +#: object.c:202

863 #, c-format

864 msgid "unable to parse object: %s"

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

866

862 -#: parse-options.c:489

867 +#: parse-options.c:537

868 msgid "..."

869 msgstr "..."

870

866 -#: parse-options.c:507

871 +#: parse-options.c:555

872 #, c-format

873 msgid "usage: %s"

874 msgstr "用法：%s"

875

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

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

873 -#: parse-options.c:511

878 +#: parse-options.c:559

879 #, c-format

880 msgid " or: %s"

881 msgstr " 或：%s"

882

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

879 -#: parse-options.c:514

884 +#: parse-options.c:562

885 #, c-format

886 msgid " %s"

887 msgstr " %s"

888

884 -#: parse-options.c:548

889 +#: parse-options.c:596

890 msgid "-NUM"

891 msgstr "-数字"

892

888 -#: pathspec.c:83

893 +#: pathspec.c:118

894 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

895 +msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"

896 +

897 +#: pathspec.c:128

898 +msgid ""

899 +"global 'literal' pathspec setting is incompatible with all other global "

900 +"pathspec settings"

901 +msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"

902 +

903 +#: pathspec.c:158

904 +msgid "invalid parameter for pathspec magic 'prefix'"

905 +msgstr "路径规则包含无效的神奇前缀"

906 +

907 +#: pathspec.c:164

908 +#, c-format

909 +msgid "Invalid pathspec magic '%.*s' in '%s'"

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

911 +

912 +#: pathspec.c:168

913 +#, c-format

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

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

916 +

917 +#: pathspec.c:186

918 +#, c-format

919 +msgid "Unimplemented pathspec magic '%c' in '%s'"

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

921 +

922 +#: pathspec.c:211

923 #, c-format

890 -msgid "Path '%s' is in submodule '%.*s'"

891 -msgstr "路径 '%s' 属于模组 '%.*s'"

924 +msgid "%s: 'literal' and 'glob' are incompatible"

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

926

893 -#: pathspec.c:99

927 +#: pathspec.c:222

928 #, c-format

895 -msgid "'%s' is beyond a symbolic link"

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

929 +msgid "%s: '%s' is outside repository"

930 +msgstr "%s：'%s' 在版本库之外"

931

898 -#: remote.c:1788

932 +#: pathspec.c:278

933 +#, c-format

934 +msgid "Pathspec '%s' is in submodule '%.*s'"

935 +msgstr "路径规则 '%s' 在子模组 '%.*s' 中"

936 +

937 +#.

938 +#. * We may want to substitute "this command" with a command

939 +#. * name. E.g. when add--interactive dies when running

940 +#. * "checkout -p"

941 +#.

942 +#: pathspec.c:340

943 +#, c-format

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

945 +msgstr "%s：路径规则神奇前缀不被此命令支持：%s"

946 +

947 +#: pathspec.c:415

948 +#, c-format

949 +msgid "pathspec '%s' is beyond a symbolic link"

950 +msgstr "路径规则 '%s' 位于符号链接中"

951 +

952 +#: remote.c:1833

953 +#, c-format

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

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

956 +

957 +#: remote.c:1837

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

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

960 +

961 +#: remote.c:1840

962 +#, c-format

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

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

965 +

966 +#: remote.c:1844

967 #, c-format

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

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

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

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

972

905 -#: remote.c:1794

973 +#: remote.c:1850

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

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

976

909 -#: remote.c:1797

977 +#: remote.c:1853

978 #, c-format

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

980 msgid_plural ""

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

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

984

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

918 -#: remote.c:1805

986 +#: remote.c:1861

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

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

989

922 -#: remote.c:1808

990 +#: remote.c:1864

991 #, c-format

992 msgid ""

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

@@ -935,7 +1003,7 @@ msgstr[1] ""

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

1004

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

938 -#: remote.c:1818

1006 +#: remote.c:1874

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

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

1009

@@ -977,7 +1045,7 @@ msgstr ""

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

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

1047

980 -#: sequencer.c:245 sequencer.c:869 sequencer.c:952

1048 +#: sequencer.c:245 sequencer.c:870 sequencer.c:953

1049 #, c-format

1050 msgid "Could not write to %s"

1051 msgstr "不能写入 %s"

@@ -1000,197 +1068,197 @@ msgid "Commit your changes or stash them to proceed."

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

1069

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

1003 -#: sequencer.c:324

1071 +#: sequencer.c:325

1072 #, c-format

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

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

1075

1008 -#: sequencer.c:355

1076 +#: sequencer.c:356

1077 msgid "Could not resolve HEAD commit\n"

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

1079

1012 -#: sequencer.c:377

1080 +#: sequencer.c:378

1081 msgid "Unable to update cache tree\n"

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

1083

1016 -#: sequencer.c:422

1084 +#: sequencer.c:423

1085 #, c-format

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

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

1088

1021 -#: sequencer.c:427

1089 +#: sequencer.c:428

1090 #, c-format

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

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

1093

1026 -#: sequencer.c:493

1094 +#: sequencer.c:494

1095 msgid "Your index file is unmerged."

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

1097

1030 -#: sequencer.c:512

1098 +#: sequencer.c:513

1099 #, c-format

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

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

1102

1035 -#: sequencer.c:520

1103 +#: sequencer.c:521

1104 #, c-format

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

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

1107

1040 -#: sequencer.c:524

1108 +#: sequencer.c:525

1109 #, c-format

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

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

1112

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

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

1047 -#: sequencer.c:537

1115 +#: sequencer.c:538

1116 #, c-format

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

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

1119

1052 -#: sequencer.c:541

1120 +#: sequencer.c:542

1121 #, c-format

1122 msgid "Cannot get commit message for %s"

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

1124

1057 -#: sequencer.c:627

1125 +#: sequencer.c:628

1126 #, c-format

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

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

1129

1062 -#: sequencer.c:628

1130 +#: sequencer.c:629

1131 #, c-format

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

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

1134

1067 -#: sequencer.c:664

1135 +#: sequencer.c:665

1136 msgid "empty commit set passed"

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

1138

1071 -#: sequencer.c:672

1139 +#: sequencer.c:673

1140 #, c-format

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

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

1143

1076 -#: sequencer.c:677

1144 +#: sequencer.c:678

1145 #, c-format

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

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

1148

1081 -#: sequencer.c:735

1149 +#: sequencer.c:736

1150 #, c-format

1151 msgid "Cannot %s during a %s"

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

1153

1086 -#: sequencer.c:757

1154 +#: sequencer.c:758

1155 #, c-format

1156 msgid "Could not parse line %d."

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

1158

1091 -#: sequencer.c:762

1159 +#: sequencer.c:763

1160 msgid "No commits parsed."

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

1162

1095 -#: sequencer.c:775

1163 +#: sequencer.c:776

1164 #, c-format

1165 msgid "Could not open %s"

1166 msgstr "不能打开 %s"

1167

1100 -#: sequencer.c:779

1168 +#: sequencer.c:780

1169 #, c-format

1170 msgid "Could not read %s."

1171 msgstr "不能读取 %s。"

1172

1105 -#: sequencer.c:786

1173 +#: sequencer.c:787

1174 #, c-format

1175 msgid "Unusable instruction sheet: %s"

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

1177

1110 -#: sequencer.c:814

1178 +#: sequencer.c:815

1179 #, c-format

1180 msgid "Invalid key: %s"

1181 msgstr "无效键名：%s"

1182

1115 -#: sequencer.c:817

1183 +#: sequencer.c:818

1184 #, c-format

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

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

1187

1120 -#: sequencer.c:829

1188 +#: sequencer.c:830

1189 #, c-format

1190 msgid "Malformed options sheet: %s"

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

1192

1125 -#: sequencer.c:850

1193 +#: sequencer.c:851

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

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

1196

1129 -#: sequencer.c:851

1197 +#: sequencer.c:852

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

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

1200

1133 -#: sequencer.c:855

1201 +#: sequencer.c:856

1202 #, c-format

1203 msgid "Could not create sequencer directory %s"

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

1205

1138 -#: sequencer.c:871 sequencer.c:956

1206 +#: sequencer.c:872 sequencer.c:957

1207 #, c-format

1208 msgid "Error wrapping up %s."

1209 msgstr "错误收尾 %s。"

1210

1143 -#: sequencer.c:890 sequencer.c:1024

1211 +#: sequencer.c:891 sequencer.c:1025

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

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

1214

1147 -#: sequencer.c:892

1215 +#: sequencer.c:893

1216 msgid "cannot resolve HEAD"

1217 msgstr "不能解析 HEAD"

1218

1151 -#: sequencer.c:894

1219 +#: sequencer.c:895

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

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

1222

1155 -#: sequencer.c:916 builtin/apply.c:4061

1223 +#: sequencer.c:917 builtin/apply.c:4061

1224 #, c-format

1225 msgid "cannot open %s: %s"

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

1227

1160 -#: sequencer.c:919

1228 +#: sequencer.c:920

1229 #, c-format

1230 msgid "cannot read %s: %s"

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

1232

1165 -#: sequencer.c:920

1233 +#: sequencer.c:921

1234 msgid "unexpected end of file"

1235 msgstr "意外的文件结束"

1236

1169 -#: sequencer.c:926

1237 +#: sequencer.c:927

1238 #, c-format

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

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

1241

1174 -#: sequencer.c:949

1242 +#: sequencer.c:950

1243 #, c-format

1244 msgid "Could not format %s."

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

1246

1179 -#: sequencer.c:1092

1247 +#: sequencer.c:1093

1248 #, c-format

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

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

1251

1184 -#: sequencer.c:1095

1252 +#: sequencer.c:1096

1253 #, c-format

1254 msgid "%s: bad revision"

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

1256

1189 -#: sequencer.c:1129

1257 +#: sequencer.c:1130

1258 msgid "Can't revert as initial commit"

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

1260

1193 -#: sequencer.c:1130

1261 +#: sequencer.c:1131

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

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

1264

@@ -1215,400 +1283,493 @@ msgstr ""

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

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

1285

1218 -#: sha1_name.c:1097

1286 +#: sha1_name.c:1112

1287 msgid "HEAD does not point to a branch"

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

1289

1222 -#: sha1_name.c:1100

1290 +#: sha1_name.c:1115

1291 #, c-format

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

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

1294

1227 -#: sha1_name.c:1102

1295 +#: sha1_name.c:1117

1296 #, c-format

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

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

1299

1232 -#: sha1_name.c:1106

1300 +#: sha1_name.c:1121

1301 #, c-format

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

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

1304

1237 -#: wrapper.c:408

1305 +#: submodule.c:64 submodule.c:98

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

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

1308 +

1309 +#: submodule.c:68 submodule.c:102

1310 +#, c-format

1311 +msgid "Could not find section in .gitmodules where path=%s"

1312 +msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

1313 +

1314 +#. Maybe the user already did that, don't error out here

1315 +#: submodule.c:76

1316 +#, c-format

1317 +msgid "Could not update .gitmodules entry %s"

1318 +msgstr "不能更新 .gitmodules 条目 %s"

1319 +

1320 +#. Maybe the user already did that, don't error out here

1321 +#: submodule.c:109

1322 +#, c-format

1323 +msgid "Could not remove .gitmodules entry for %s"

1324 +msgstr "无法移除 %s 的 .gitmodules 条目"

1325 +

1326 +#: submodule.c:127

1327 +msgid "could not find .gitmodules in index"

1328 +msgstr "无法在索引中找到 .gitmodules"

1329 +

1330 +#: submodule.c:133

1331 +msgid "reading updated .gitmodules failed"

1332 +msgstr "读取更新后的 .gitmodules 失败"

1333 +

1334 +#: submodule.c:135

1335 +msgid "unable to stat updated .gitmodules"

1336 +msgstr "不能枚举更新后的 .gitmodules"

1337 +

1338 +#: submodule.c:139

1339 +msgid "unable to remove .gitmodules from index"

1340 +msgstr "不能从索引中移除 .gitmodules"

1341 +

1342 +#: submodule.c:141

1343 +msgid "adding updated .gitmodules failed"

1344 +msgstr "添加更新后的 .gitmodules 失败"

1345 +

1346 +#: submodule.c:143

1347 +msgid "staging updated .gitmodules failed"

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

1349 +

1350 +#: submodule.c:1144 builtin/init-db.c:363

1351 +#, c-format

1352 +msgid "Could not create git link %s"

1353 +msgstr "不能创建 git link %s"

1354 +

1355 +#: submodule.c:1155

1356 +#, c-format

1357 +msgid "Could not set core.worktree in %s"

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

1359 +

1360 +#: urlmatch.c:120

1361 +msgid "invalid URL scheme name or missing '://' suffix"

1362 +msgstr "无效的 URL 方案名称或丢失 '://' 后缀"

1363 +

1364 +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

1365 +#, c-format

1366 +msgid "invalid %XX escape sequence"

1367 +msgstr "无效的 %XX 转义序列"

1368 +

1369 +#: urlmatch.c:172

1370 +msgid "missing host and scheme is not 'file:'"

1371 +msgstr "缺失主机名且URL方案不是 'file:'"

1372 +

1373 +#: urlmatch.c:189

1374 +msgid "a 'file:' URL may not have a port number"

1375 +msgstr "一个 'file:' URL 不应该包含端口号"

1376 +

1377 +#: urlmatch.c:199

1378 +msgid "invalid characters in host name"

1379 +msgstr "主机名中包含无效的字符"

1380 +

1381 +#: urlmatch.c:244 urlmatch.c:255

1382 +msgid "invalid port number"

1383 +msgstr "无效的端口号"

1384 +

1385 +#: urlmatch.c:322

1386 +msgid "invalid '..' path segment"

1387 +msgstr "无效的 '..' 路径片段"

1388 +

1389 +#: wrapper.c:422

1390 #, c-format

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

1392 msgstr "不能访问 '%s'：%s"

1393

1242 -#: wrapper.c:429

1394 +#: wrapper.c:443

1395 #, c-format

1396 msgid "unable to access '%s'"

1397 msgstr "不能访问 '%s'"

1398

1247 -#: wrapper.c:440

1399 +#: wrapper.c:454

1400 #, c-format

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

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

1403

1252 -#: wrapper.c:441

1404 +#: wrapper.c:455

1405 msgid "no such user"

1406 msgstr "无此用户"

1407

1256 -#: wt-status.c:141

1408 +#: wt-status.c:146

1409 msgid "Unmerged paths:"

1410 msgstr "未合并的路径："

1411

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

1261 -#: wt-status.c:168 wt-status.c:195

1413 +#: wt-status.c:173 wt-status.c:200

1414 #, c-format

1415 msgid " (use \"git reset %s <file>...\" to unstage)"

1416 msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"

1417

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

1267 -#: wt-status.c:170 wt-status.c:197

1419 +#: wt-status.c:175 wt-status.c:202

1420 msgid " (use \"git rm --cached <file>...\" to unstage)"

1421 msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"

1422

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

1272 -#: wt-status.c:174

1424 +#: wt-status.c:179

1425 msgid " (use \"git add <file>...\" to mark resolution)"

1426 msgstr " （使用 \"git add <file>...\" 标记解决方案）"

1427

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

1277 -#: wt-status.c:176 wt-status.c:180

1429 +#: wt-status.c:181 wt-status.c:185

1430 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

1431 msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"

1432

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

1282 -#: wt-status.c:178

1434 +#: wt-status.c:183

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

1436 msgstr " （使用 \"git rm <file>...\" 标记解决方案）"

1437

1286 -#: wt-status.c:189

1438 +#: wt-status.c:194

1439 msgid "Changes to be committed:"

1440 msgstr "要提交的变更："

1441

1290 -#: wt-status.c:207

1442 +#: wt-status.c:212

1443 msgid "Changes not staged for commit:"

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

1445

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

1295 -#: wt-status.c:211

1447 +#: wt-status.c:216

1448 msgid " (use \"git add <file>...\" to update what will be committed)"

1449 msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"

1450

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

1300 -#: wt-status.c:213

1452 +#: wt-status.c:218

1453 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

1454 msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"

1455

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

1305 -#: wt-status.c:214

1457 +#: wt-status.c:219

1458 msgid ""

1459 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

1460 msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"

1461

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

1311 -#: wt-status.c:216

1463 +#: wt-status.c:221

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

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

1466

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

1316 -#: wt-status.c:228

1468 +#: wt-status.c:233

1469 #, c-format

1470 msgid " (use \"git %s <file>...\" to include in what will be committed)"

1471 msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"

1472

1321 -#: wt-status.c:245

1473 +#: wt-status.c:250

1474 msgid "bug"

1475 msgstr "bug"

1476

1325 -#: wt-status.c:250

1477 +#: wt-status.c:255

1478 msgid "both deleted:"

1479 msgstr "双方删除："

1480

1329 -#: wt-status.c:251

1481 +#: wt-status.c:256

1482 msgid "added by us:"

1483 msgstr "由我们添加："

1484

1333 -#: wt-status.c:252

1485 +#: wt-status.c:257

1486 msgid "deleted by them:"

1487 msgstr "由他们删除："

1488

1337 -#: wt-status.c:253

1489 +#: wt-status.c:258

1490 msgid "added by them:"

1491 msgstr "由他们添加："

1492

1341 -#: wt-status.c:254

1493 +#: wt-status.c:259

1494 msgid "deleted by us:"

1495 msgstr "由我们删除："

1496

1345 -#: wt-status.c:255

1497 +#: wt-status.c:260

1498 msgid "both added:"

1499 msgstr "双方添加："

1500

1349 -#: wt-status.c:256

1501 +#: wt-status.c:261

1502 msgid "both modified:"

1503 msgstr "双方修改："

1504

1505 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1354 -#: wt-status.c:286

1506 +#: wt-status.c:291

1507 msgid "new commits, "

1508 msgstr "新提交, "

1509

1510 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1359 -#: wt-status.c:288

1511 +#: wt-status.c:293

1512 msgid "modified content, "

1513 msgstr "修改的内容, "

1514

1515 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1364 -#: wt-status.c:290

1516 +#: wt-status.c:295

1517 msgid "untracked content, "

1518 msgstr "未跟踪的内容, "

1519

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

1369 -#: wt-status.c:307

1521 +#: wt-status.c:312

1522 #, c-format

1523 msgid "new file: %s"

1524 msgstr "新文件： %s"

1525

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

1375 -#: wt-status.c:310

1527 +#: wt-status.c:315

1528 #, c-format

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

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

1531

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

1381 -#: wt-status.c:313

1533 +#: wt-status.c:318

1534 #, c-format

1535 msgid "deleted: %s"

1536 msgstr "删除： %s"

1537

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

1387 -#: wt-status.c:316

1539 +#: wt-status.c:321

1540 #, c-format

1541 msgid "modified: %s"

1542 msgstr "修改： %s"

1543

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

1393 -#: wt-status.c:319

1545 +#: wt-status.c:324

1546 #, c-format

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

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

1549

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

1399 -#: wt-status.c:322

1551 +#: wt-status.c:327

1552 #, c-format

1553 msgid "typechange: %s"

1554 msgstr "类型变更： %s"

1555

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

1405 -#: wt-status.c:325

1557 +#: wt-status.c:330

1558 #, c-format

1559 msgid "unknown: %s"

1560 msgstr "未知： %s"

1561

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

1411 -#: wt-status.c:328

1563 +#: wt-status.c:333

1564 #, c-format

1565 msgid "unmerged: %s"

1566 msgstr "未合并： %s"

1567

1416 -#: wt-status.c:331

1568 +#: wt-status.c:336

1569 #, c-format

1570 msgid "bug: unhandled diff status %c"

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

1572

1421 -#: wt-status.c:803

1573 +#: wt-status.c:703

1574 +msgid "Submodules changed but not updated:"

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

1576 +

1577 +#: wt-status.c:705

1578 +msgid "Submodule changes to be committed:"

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

1580 +

1581 +#: wt-status.c:848

1582 msgid "You have unmerged paths."

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

1584

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

1426 -#: wt-status.c:806

1586 +#: wt-status.c:851

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

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

1589

1430 -#: wt-status.c:809

1590 +#: wt-status.c:854

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

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

1593

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

1435 -#: wt-status.c:812

1595 +#: wt-status.c:857

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

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

1598

1439 -#: wt-status.c:822

1599 +#: wt-status.c:867

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

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

1602

1443 -#: wt-status.c:825

1603 +#: wt-status.c:870

1604 msgid "The current patch is empty."

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

1606

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

1448 -#: wt-status.c:829

1608 +#: wt-status.c:874

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

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

1611

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

1453 -#: wt-status.c:831

1613 +#: wt-status.c:876

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

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

1616

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

1458 -#: wt-status.c:833

1618 +#: wt-status.c:878

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

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

1621

1462 -#: wt-status.c:893 wt-status.c:910

1622 +#: wt-status.c:938 wt-status.c:955

1623 #, c-format

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

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

1626

1467 -#: wt-status.c:898 wt-status.c:915

1627 +#: wt-status.c:943 wt-status.c:960

1628 msgid "You are currently rebasing."

1629 msgstr "您正在变基。"

1630

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

1472 -#: wt-status.c:901

1632 +#: wt-status.c:946

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

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

1635

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

1477 -#: wt-status.c:903

1637 +#: wt-status.c:948

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

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

1640

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

1482 -#: wt-status.c:905

1642 +#: wt-status.c:950

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

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

1645

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

1487 -#: wt-status.c:918

1647 +#: wt-status.c:963

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

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

1650

1491 -#: wt-status.c:922

1651 +#: wt-status.c:967

1652 #, c-format

1653 msgid ""

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

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

1656

1497 -#: wt-status.c:927

1657 +#: wt-status.c:972

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

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

1660

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

1502 -#: wt-status.c:930

1662 +#: wt-status.c:975

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

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

1665

1506 -#: wt-status.c:934

1666 +#: wt-status.c:979

1667 #, c-format

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

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

1670

1511 -#: wt-status.c:939

1671 +#: wt-status.c:984

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

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

1674

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

1516 -#: wt-status.c:942

1676 +#: wt-status.c:987

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

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

1679

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

1521 -#: wt-status.c:944

1681 +#: wt-status.c:989

1682 msgid ""

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

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

1685

1526 -#: wt-status.c:954

1527 -msgid "You are currently cherry-picking."

1528 -msgstr "您正在做拣选操作。"

1686 +#: wt-status.c:999

1687 +#, c-format

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

1689 +msgstr "您正在做拣选提交 %s。"

1690

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

1531 -#: wt-status.c:958

1692 +#: wt-status.c:1004

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

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

1695

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

1536 -#: wt-status.c:961

1697 +#: wt-status.c:1007

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

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

1700

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

1541 -#: wt-status.c:963

1702 +#: wt-status.c:1009

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

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

1705

1545 -#: wt-status.c:972

1706 +#: wt-status.c:1018

1707 #, c-format

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

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

1710

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

1551 -#: wt-status.c:977

1712 +#: wt-status.c:1023

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

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

1715

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

1556 -#: wt-status.c:980

1717 +#: wt-status.c:1026

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

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

1720

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

1561 -#: wt-status.c:982

1722 +#: wt-status.c:1028

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

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

1725

1565 -#: wt-status.c:993

1726 +#: wt-status.c:1039

1727 #, c-format

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

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

1730

1570 -#: wt-status.c:997

1731 +#: wt-status.c:1043

1732 msgid "You are currently bisecting."

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

1734

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

1575 -#: wt-status.c:1000

1736 +#: wt-status.c:1046

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

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

1739

1579 -#: wt-status.c:1173

1740 +#: wt-status.c:1221

1741 msgid "On branch "

1742 msgstr "位于分支 "

1743

1583 -#: wt-status.c:1180

1744 +#: wt-status.c:1228

1745 msgid "rebase in progress; onto "

1746 msgstr "变基正在进行中；至 "

1747

1587 -#: wt-status.c:1187

1748 +#: wt-status.c:1235

1749 msgid "HEAD detached at "

1750 msgstr "头指针分离于 "

1751

1591 -#: wt-status.c:1189

1752 +#: wt-status.c:1237

1753 msgid "HEAD detached from "

1754 msgstr "头指针分离自 "

1755

1595 -#: wt-status.c:1192

1756 +#: wt-status.c:1240

1757 msgid "Not currently on any branch."

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

1759

1599 -#: wt-status.c:1209

1760 +#: wt-status.c:1257

1761 msgid "Initial commit"

1762 msgstr "初始提交"

1763

1603 -#: wt-status.c:1223

1764 +#: wt-status.c:1271

1765 msgid "Untracked files"

1766 msgstr "未跟踪的文件"

1767

1607 -#: wt-status.c:1225

1768 +#: wt-status.c:1273

1769 msgid "Ignored files"

1770 msgstr "忽略的文件"

1771

1611 -#: wt-status.c:1229

1772 +#: wt-status.c:1277

1773 #, c-format

1774 msgid ""

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

@@ -1618,97 +1779,101 @@ msgstr ""

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

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

1781

1621 -#: wt-status.c:1235

1782 +#: wt-status.c:1283

1783 #, c-format

1784 msgid "Untracked files not listed%s"

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

1786

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

1627 -#: wt-status.c:1237

1788 +#: wt-status.c:1285

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

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

1791

1631 -#: wt-status.c:1243

1792 +#: wt-status.c:1291

1793 msgid "No changes"

1794 msgstr "没有修改"

1795

1635 -#: wt-status.c:1248

1796 +#: wt-status.c:1296

1797 #, c-format

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

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

1800

1640 -#: wt-status.c:1251

1801 +#: wt-status.c:1299

1802 #, c-format

1803 msgid "no changes added to commit\n"

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

1805

1645 -#: wt-status.c:1254

1806 +#: wt-status.c:1302

1807 #, c-format

1808 msgid ""

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

1810 "track)\n"

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

1812

1652 -#: wt-status.c:1257

1813 +#: wt-status.c:1305

1814 #, c-format

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

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

1817

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

1658 -#: wt-status.c:1260

1819 +#: wt-status.c:1308

1820 #, c-format

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

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

1823

1663 -#: wt-status.c:1263 wt-status.c:1268

1824 +#: wt-status.c:1311 wt-status.c:1316

1825 #, c-format

1826 msgid "nothing to commit\n"

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

1828

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

1669 -#: wt-status.c:1266

1830 +#: wt-status.c:1314

1831 #, c-format

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

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

1834

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

1675 -#: wt-status.c:1270

1836 +#: wt-status.c:1318

1837 #, c-format

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

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

1840

1680 -#: wt-status.c:1378

1841 +#: wt-status.c:1427

1842 msgid "HEAD (no branch)"

1843 msgstr "HEAD（非分支）"

1844

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

1685 -#: wt-status.c:1384

1846 +#: wt-status.c:1433

1847 msgid "Initial commit on "

1848 msgstr "初始提交于 "

1849

1850 +#: wt-status.c:1463

1851 +msgid "gone"

1852 +msgstr "丢失"

1853 +

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

1690 -#: wt-status.c:1399

1855 +#: wt-status.c:1465

1856 msgid "behind "

1857 msgstr "落后 "

1858

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

1695 -#: wt-status.c:1402 wt-status.c:1405

1860 +#: wt-status.c:1468 wt-status.c:1471

1861 msgid "ahead "

1862 msgstr "领先 "

1863

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

1700 -#: wt-status.c:1407

1865 +#: wt-status.c:1473

1866 msgid ", behind "

1867 msgstr "，落后 "

1868

1704 -#: compat/precompose_utf8.c:58 builtin/clone.c:351

1869 +#: compat/precompose_utf8.c:55 builtin/clone.c:350

1870 #, c-format

1871 msgid "failed to unlink '%s'"

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

1873

1874 #: builtin/add.c:20

1875 msgid "git add [options] [--] <pathspec>..."

1711 -msgstr "git add [选项] [--] <路径匹配>..."

1876 +msgstr "git add [选项] [--] <路径规则>..."

1877

1878 # 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短

1879 #.

@@ -1774,10 +1939,10 @@ msgstr ""

1939 "像本地工作区移除的路径 '%s'\n"

1940 "在此版本的 Git 中被忽略。\n"

1941 "\n"

1777 -"* 'git add --ignore-removal <pathspec>'，是当前版本的默认操作，\n"

1942 +"* 'git add --ignore-removal <路径规则>'，是当前版本的默认操作，\n"

1943 " 忽略您本地工作区中移除的文件。\n"

1944 "\n"

1780 -"* 'git add --all <pathspec>' 将让您同时对删除操作进行记录。\n"

1945 +"* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"

1946 "\n"

1947 "运行 'git status' 来检查您本地工作区中移除的路径。\n"

1948

@@ -1786,7 +1951,7 @@ msgstr ""

1951 msgid "unexpected diff status %c"

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

1953

1789 -#: builtin/add.c:149 builtin/commit.c:252

1954 +#: builtin/add.c:149 builtin/commit.c:260

1955 msgid "updating files failed"

1956 msgstr "更新文件失败"

1957

@@ -1795,140 +1960,135 @@ msgstr "更新文件失败"

1960 msgid "remove '%s'\n"

1961 msgstr "删除 '%s'\n"

1962

1798 -#: builtin/add.c:253

1963 +#: builtin/add.c:237

1964 msgid "Unstaged changes after refreshing the index:"

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

1966

1802 -#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337

1803 -#, c-format

1804 -msgid "pathspec '%s' did not match any files"

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

1806 -

1807 -#: builtin/add.c:339

1967 +#: builtin/add.c:299

1968 msgid "Could not read the index"

1969 msgstr "不能读取索引"

1970

1811 -#: builtin/add.c:350

1971 +#: builtin/add.c:310

1972 #, c-format

1973 msgid "Could not open '%s' for writing."

1974 msgstr "不能打开 '%s' 以写入。"

1975

1816 -#: builtin/add.c:354

1976 +#: builtin/add.c:314

1977 msgid "Could not write patch"

1978 msgstr "不能生成补丁"

1979

1820 -#: builtin/add.c:359

1980 +#: builtin/add.c:319

1981 #, c-format

1982 msgid "Could not stat '%s'"

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

1984

1825 -#: builtin/add.c:361

1985 +#: builtin/add.c:321

1986 msgid "Empty patch. Aborted."

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

1988

1829 -#: builtin/add.c:367

1989 +#: builtin/add.c:327

1990 #, c-format

1991 msgid "Could not apply '%s'"

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

1993

1834 -#: builtin/add.c:377

1994 +#: builtin/add.c:337

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

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

1997

1838 -#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63

1839 -#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253

1840 -#: builtin/rm.c:268

1998 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66

1999 +#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253

2000 +#: builtin/rm.c:269

2001 msgid "dry run"

2002 msgstr "演习"

2003

1844 -#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19

1845 -#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613

1846 -#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113

2004 +#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

2005 +#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

2006 +#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113

2007 msgid "be verbose"

2008 msgstr "冗长输出"

2009

1850 -#: builtin/add.c:397

2010 +#: builtin/add.c:357

2011 msgid "interactive picking"

2012 msgstr "交互式拣选"

2013

1854 -#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261

2014 +#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272

2015 msgid "select hunks interactively"

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

2017

1858 -#: builtin/add.c:399

2018 +#: builtin/add.c:359

2019 msgid "edit current diff and apply"

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

2021

1862 -#: builtin/add.c:400

2022 +#: builtin/add.c:360

2023 msgid "allow adding otherwise ignored files"

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

2025

1866 -#: builtin/add.c:401

2026 +#: builtin/add.c:361

2027 msgid "update tracked files"

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

2029

1870 -#: builtin/add.c:402

2030 +#: builtin/add.c:362

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

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

2033

1874 -#: builtin/add.c:403

2034 +#: builtin/add.c:363

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

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

2037

2038 #. takes no arguments

1879 -#: builtin/add.c:406

2039 +#: builtin/add.c:366

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

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

2042

1883 -#: builtin/add.c:408

2043 +#: builtin/add.c:368

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

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

2046

1887 -#: builtin/add.c:409

2047 +#: builtin/add.c:369

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

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

2050

1891 -#: builtin/add.c:410

2051 +#: builtin/add.c:370

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

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

2054

1895 -#: builtin/add.c:432

2055 +#: builtin/add.c:392

2056 #, c-format

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

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

2059

1900 -#: builtin/add.c:433

2060 +#: builtin/add.c:393

2061 msgid "no files added"

2062 msgstr "没有文件被添加"

2063

1904 -#: builtin/add.c:439

2064 +#: builtin/add.c:399

2065 msgid "adding files failed"

2066 msgstr "添加文件失败"

2067

1908 -#: builtin/add.c:478

2068 +#: builtin/add.c:438

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

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

2071

1912 -#: builtin/add.c:496

2072 +#: builtin/add.c:456

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

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

2075

1916 -#: builtin/add.c:526

2076 +#: builtin/add.c:486

2077 #, c-format

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

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

2080

1921 -#: builtin/add.c:527

2081 +#: builtin/add.c:487

2082 #, c-format

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

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

2085

1926 -#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919

1927 -#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297

2086 +#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

2087 +#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299

2088 msgid "index file corrupt"

2089 msgstr "索引文件损坏"

2090

1931 -#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432

2091 +#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432

2092 msgid "Unable to write new index file"

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

2094

@@ -2176,7 +2336,7 @@ msgstr "%s：补丁未应用"

2336 msgid "Checking patch %s..."

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

2338

2179 -#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127

2339 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127

2340 #, c-format

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

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

@@ -2256,8 +2416,8 @@ msgstr "未能识别的输入"

2416 msgid "unable to read index file"

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

2418

2259 -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91

2260 -#: builtin/fetch.c:63

2419 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2420 +#: builtin/fetch.c:77

2421 msgid "path"

2422 msgstr "路径"

2423

@@ -2317,7 +2477,7 @@ msgstr "如果一个补丁不能应用则尝试三路合并"

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

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

2479

2320 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462

2480 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452

2481 msgid "paths are separated with NUL character"

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

2483

@@ -2447,103 +2607,103 @@ msgstr "执行 'git bisect next'"

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

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

2609

2450 -#: builtin/blame.c:26

2610 +#: builtin/blame.c:27

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

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

2613

2454 -#: builtin/blame.c:31

2614 +#: builtin/blame.c:32

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

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

2617

2458 -#: builtin/blame.c:2276

2618 +#: builtin/blame.c:2248

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

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

2621

2462 -#: builtin/blame.c:2277

2622 +#: builtin/blame.c:2249

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

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

2625

2466 -#: builtin/blame.c:2278

2626 +#: builtin/blame.c:2250

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

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

2629

2470 -#: builtin/blame.c:2279

2630 +#: builtin/blame.c:2251

2631 msgid "Show work cost statistics"

2632 msgstr "显示命令消耗统计"

2633

2474 -#: builtin/blame.c:2280

2634 +#: builtin/blame.c:2252

2635 msgid "Show output score for blame entries"

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

2637

2478 -#: builtin/blame.c:2281

2638 +#: builtin/blame.c:2253

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

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

2641

2482 -#: builtin/blame.c:2282

2642 +#: builtin/blame.c:2254

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

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

2645

2486 -#: builtin/blame.c:2283

2646 +#: builtin/blame.c:2255

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

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

2649

2490 -#: builtin/blame.c:2284

2650 +#: builtin/blame.c:2256

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

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

2653

2494 -#: builtin/blame.c:2285

2654 +#: builtin/blame.c:2257

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

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

2657

2498 -#: builtin/blame.c:2286

2658 +#: builtin/blame.c:2258

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

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

2661

2502 -#: builtin/blame.c:2287

2662 +#: builtin/blame.c:2259

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

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

2665

2506 -#: builtin/blame.c:2288

2666 +#: builtin/blame.c:2260

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

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

2669

2510 -#: builtin/blame.c:2289

2670 +#: builtin/blame.c:2261

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

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

2673

2514 -#: builtin/blame.c:2290

2674 +#: builtin/blame.c:2262

2675 msgid "Ignore whitespace differences"

2676 msgstr "忽略空白差异"

2677

2518 -#: builtin/blame.c:2291

2678 +#: builtin/blame.c:2263

2679 msgid "Spend extra cycles to find better match"

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

2681

2522 -#: builtin/blame.c:2292

2682 +#: builtin/blame.c:2264

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

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

2685

2526 -#: builtin/blame.c:2293

2686 +#: builtin/blame.c:2265

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

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

2689

2530 -#: builtin/blame.c:2294 builtin/blame.c:2295

2690 +#: builtin/blame.c:2266 builtin/blame.c:2267

2691 msgid "score"

2692 msgstr "得分"

2693

2534 -#: builtin/blame.c:2294

2694 +#: builtin/blame.c:2266

2695 msgid "Find line copies within and across files"

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

2697

2538 -#: builtin/blame.c:2295

2698 +#: builtin/blame.c:2267

2699 msgid "Find line movements within and across files"

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

2701

2542 -#: builtin/blame.c:2296

2702 +#: builtin/blame.c:2268

2703 msgid "n,m"

2704 msgstr "n,m"

2705

2546 -#: builtin/blame.c:2296

2706 +#: builtin/blame.c:2268

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

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

2709

@@ -2651,273 +2811,283 @@ msgstr "分支 '%s' 未指向一个提交"

2811

2812 #: builtin/branch.c:453

2813 #, c-format

2814 +msgid "[%s: gone]"

2815 +msgstr "[%s: 丢失]"

2816 +

2817 +#: builtin/branch.c:456

2818 +#, c-format

2819 +msgid "[%s]"

2820 +msgstr "[%s]"

2821 +

2822 +#: builtin/branch.c:459

2823 +#, c-format

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

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

2826

2657 -#: builtin/branch.c:455

2827 +#: builtin/branch.c:461

2828 #, c-format

2829 msgid "[behind %d]"

2830 msgstr "[落后 %d]"

2831

2662 -#: builtin/branch.c:459

2832 +#: builtin/branch.c:465

2833 #, c-format

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

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

2836

2667 -#: builtin/branch.c:461

2837 +#: builtin/branch.c:467

2838 #, c-format

2839 msgid "[ahead %d]"

2840 msgstr "[领先 %d]"

2841

2672 -#: builtin/branch.c:464

2842 +#: builtin/branch.c:470

2843 #, c-format

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

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

2846

2677 -#: builtin/branch.c:467

2847 +#: builtin/branch.c:473

2848 #, c-format

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

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

2851

2682 -#: builtin/branch.c:490

2852 +#: builtin/branch.c:496

2853 msgid " **** invalid ref ****"

2854 msgstr " **** 无效引用 ****"

2855

2686 -#: builtin/branch.c:582

2856 +#: builtin/branch.c:588

2857 #, c-format

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

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

2860

2691 -#: builtin/branch.c:585

2861 +#: builtin/branch.c:591

2862 #, c-format

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

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

2865

2696 -#: builtin/branch.c:588

2866 +#: builtin/branch.c:594

2867 #, c-format

2868 msgid "(detached from %s)"

2869 msgstr "（分离自 %s）"

2870

2701 -#: builtin/branch.c:591

2871 +#: builtin/branch.c:597

2872 msgid "(no branch)"

2873 msgstr "（非分支）"

2874

2705 -#: builtin/branch.c:637

2875 +#: builtin/branch.c:643

2876 #, c-format

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

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

2879

2710 -#: builtin/branch.c:669

2880 +#: builtin/branch.c:675

2881 msgid "some refs could not be read"

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

2883

2714 -#: builtin/branch.c:682

2884 +#: builtin/branch.c:688

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

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

2887

2718 -#: builtin/branch.c:692

2888 +#: builtin/branch.c:698

2889 #, c-format

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

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

2892

2723 -#: builtin/branch.c:707

2893 +#: builtin/branch.c:713

2894 msgid "Branch rename failed"

2895 msgstr "分支重命名失败"

2896

2727 -#: builtin/branch.c:711

2897 +#: builtin/branch.c:717

2898 #, c-format

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

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

2901

2732 -#: builtin/branch.c:715

2902 +#: builtin/branch.c:721

2903 #, c-format

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

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

2906

2737 -#: builtin/branch.c:722

2907 +#: builtin/branch.c:728

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

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

2910

2741 -#: builtin/branch.c:737

2911 +#: builtin/branch.c:743

2912 #, c-format

2913 msgid "malformed object name %s"

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

2915

2746 -#: builtin/branch.c:761

2916 +#: builtin/branch.c:767

2917 #, c-format

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

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

2920

2751 -#: builtin/branch.c:791

2921 +#: builtin/branch.c:797

2922 msgid "Generic options"

2923 msgstr "通用选项"

2924

2755 -#: builtin/branch.c:793

2925 +#: builtin/branch.c:799

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

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

2928

2759 -#: builtin/branch.c:794

2929 +#: builtin/branch.c:800

2930 msgid "suppress informational messages"

2931 msgstr "不显示信息"

2932

2763 -#: builtin/branch.c:795

2933 +#: builtin/branch.c:801

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

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

2936

2767 -#: builtin/branch.c:797

2937 +#: builtin/branch.c:803

2938 msgid "change upstream info"

2939 msgstr "改变上游信息"

2940

2771 -#: builtin/branch.c:801

2941 +#: builtin/branch.c:807

2942 msgid "use colored output"

2943 msgstr "使用彩色输出"

2944

2775 -#: builtin/branch.c:802

2945 +#: builtin/branch.c:808

2946 msgid "act on remote-tracking branches"

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

2948

2779 -#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2780 -#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434

2781 -#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468

2949 +#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838

2950 +#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461

2951 +#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2952 msgid "commit"

2953 msgstr "提交"

2954

2785 -#: builtin/branch.c:806 builtin/branch.c:812

2955 +#: builtin/branch.c:812 builtin/branch.c:818

2956 msgid "print only branches that contain the commit"

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

2958

2789 -#: builtin/branch.c:818

2959 +#: builtin/branch.c:824

2960 msgid "Specific git-branch actions:"

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

2962

2793 -#: builtin/branch.c:819

2963 +#: builtin/branch.c:825

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

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

2966

2797 -#: builtin/branch.c:821

2967 +#: builtin/branch.c:827

2968 msgid "delete fully merged branch"

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

2970

2801 -#: builtin/branch.c:822

2971 +#: builtin/branch.c:828

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

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

2974

2805 -#: builtin/branch.c:823

2975 +#: builtin/branch.c:829

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

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

2978

2809 -#: builtin/branch.c:824

2979 +#: builtin/branch.c:830

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

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

2982

2813 -#: builtin/branch.c:825

2983 +#: builtin/branch.c:831

2984 msgid "list branch names"

2985 msgstr "列出分支名"

2986

2817 -#: builtin/branch.c:826

2987 +#: builtin/branch.c:832

2988 msgid "create the branch's reflog"

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

2990

2821 -#: builtin/branch.c:828

2991 +#: builtin/branch.c:834

2992 msgid "edit the description for the branch"

2993 msgstr "标记分支的描述"

2994

2825 -#: builtin/branch.c:829

2995 +#: builtin/branch.c:835

2996 msgid "force creation (when already exists)"

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

2998

2829 -#: builtin/branch.c:832

2999 +#: builtin/branch.c:838

3000 msgid "print only not merged branches"

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

3002

2833 -#: builtin/branch.c:838

3003 +#: builtin/branch.c:844

3004 msgid "print only merged branches"

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

3006

2837 -#: builtin/branch.c:842

3007 +#: builtin/branch.c:848

3008 msgid "list branches in columns"

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

3010

2841 -#: builtin/branch.c:855

3011 +#: builtin/branch.c:861

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

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

3014

2845 -#: builtin/branch.c:860 builtin/clone.c:630

3015 +#: builtin/branch.c:866 builtin/clone.c:629

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

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

3018

2849 -#: builtin/branch.c:883

3019 +#: builtin/branch.c:890

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

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

3022

2853 -#: builtin/branch.c:889 builtin/branch.c:928

3023 +#: builtin/branch.c:896 builtin/branch.c:935

3024 msgid "branch name required"

3025 msgstr "必须提供分支名"

3026

2857 -#: builtin/branch.c:904

3027 +#: builtin/branch.c:911

3028 msgid "Cannot give description to detached HEAD"

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

3030

2861 -#: builtin/branch.c:909

3031 +#: builtin/branch.c:916

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

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

3034

2865 -#: builtin/branch.c:916

3035 +#: builtin/branch.c:923

3036 #, c-format

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

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

3039

2870 -#: builtin/branch.c:919

3040 +#: builtin/branch.c:926

3041 #, c-format

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

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

3044

2875 -#: builtin/branch.c:934

3045 +#: builtin/branch.c:941

3046 msgid "too many branches for a rename operation"

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

3048

2879 -#: builtin/branch.c:939

3049 +#: builtin/branch.c:946

3050 msgid "too many branches to set new upstream"

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

3052

2883 -#: builtin/branch.c:943

3053 +#: builtin/branch.c:950

3054 #, c-format

3055 msgid ""

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

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

3058

2889 -#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990

3059 +#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997

3060 #, c-format

3061 msgid "no such branch '%s'"

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

3063

2894 -#: builtin/branch.c:950

3064 +#: builtin/branch.c:957

3065 #, c-format

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

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

3068

2899 -#: builtin/branch.c:962

3069 +#: builtin/branch.c:969

3070 msgid "too many branches to unset upstream"

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

3072

2903 -#: builtin/branch.c:966

3073 +#: builtin/branch.c:973

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

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

3076

2907 -#: builtin/branch.c:972

3077 +#: builtin/branch.c:979

3078 #, c-format

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

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

3081

2912 -#: builtin/branch.c:987

3082 +#: builtin/branch.c:994

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

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

3085

2916 -#: builtin/branch.c:993

3086 +#: builtin/branch.c:1000

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

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

3089

2920 -#: builtin/branch.c:996

3090 +#: builtin/branch.c:1003

3091 #, c-format

3092 msgid ""

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

@@ -2925,7 +3095,7 @@ msgid ""

3095 msgstr ""

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

3097

2928 -#: builtin/branch.c:1013

3098 +#: builtin/branch.c:1020

3099 #, c-format

3100 msgid ""

3101 "\n"

@@ -2936,12 +3106,12 @@ msgstr ""

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

3107 "\n"

3108

2939 -#: builtin/branch.c:1014

3109 +#: builtin/branch.c:1021

3110 #, c-format

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

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

3113

2944 -#: builtin/branch.c:1015

3114 +#: builtin/branch.c:1022

3115 #, c-format

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

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

@@ -2959,43 +3129,43 @@ msgstr "需要一个版本库来创建包。"

3129 msgid "Need a repository to unbundle."

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

3131

2962 -#: builtin/cat-file.c:285

3132 +#: builtin/cat-file.c:312

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

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

3135

2966 -#: builtin/cat-file.c:286

3136 +#: builtin/cat-file.c:313

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

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

3139

2970 -#: builtin/cat-file.c:323

3140 +#: builtin/cat-file.c:350

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

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

3143

2974 -#: builtin/cat-file.c:324

3144 +#: builtin/cat-file.c:351

3145 msgid "show object type"

3146 msgstr "显示对象类型"

3147

2978 -#: builtin/cat-file.c:325

3148 +#: builtin/cat-file.c:352

3149 msgid "show object size"

3150 msgstr "显示对象大小"

3151

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

3152 +#: builtin/cat-file.c:354

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

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

3155

2986 -#: builtin/cat-file.c:328

3156 +#: builtin/cat-file.c:355

3157 msgid "pretty-print object's content"

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

3159

2990 -#: builtin/cat-file.c:330

3160 +#: builtin/cat-file.c:357

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

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

3163

2994 -#: builtin/cat-file.c:332

3164 +#: builtin/cat-file.c:359

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

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

3167

2998 -#: builtin/cat-file.c:335

3168 +#: builtin/cat-file.c:362

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

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

3171

@@ -3020,10 +3190,10 @@ msgid "read file names from stdin"

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

3191

3192 #: builtin/check-attr.c:23 builtin/check-ignore.c:24

3023 -msgid "input paths are terminated by a null character"

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

3193 +msgid "terminate input and output records by a NUL character"

3194 +msgstr "输入和输出的记录使用 NUL 字符终结"

3195

3026 -#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177

3196 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259

3197 msgid "suppress progress reporting"

3198 msgstr "不显示进度报告"

3199

@@ -3031,27 +3201,31 @@ msgstr "不显示进度报告"

3201 msgid "show non-matching input paths"

3202 msgstr "显示未匹配的输入路径"

3203

3034 -#: builtin/check-ignore.c:143

3204 +#: builtin/check-ignore.c:28

3205 +msgid "ignore index when checking"

3206 +msgstr "检查时忽略索引"

3207 +

3208 +#: builtin/check-ignore.c:154

3209 msgid "cannot specify pathnames with --stdin"

3210 msgstr "不能同时提供路径及 --stdin 参数"

3211

3038 -#: builtin/check-ignore.c:146

3212 +#: builtin/check-ignore.c:157

3213 msgid "-z only makes sense with --stdin"

3214 msgstr "-z 需要和 --stdin 参数共用才有意义"

3215

3042 -#: builtin/check-ignore.c:148

3216 +#: builtin/check-ignore.c:159

3217 msgid "no path specified"

3218 msgstr "未指定路径"

3219

3046 -#: builtin/check-ignore.c:152

3220 +#: builtin/check-ignore.c:163

3221 msgid "--quiet is only valid with a single pathname"

3222 msgstr "参数 --quiet 只在提供一个路径名时有效"

3223

3050 -#: builtin/check-ignore.c:154

3224 +#: builtin/check-ignore.c:165

3225 msgid "cannot have both --quiet and --verbose"

3226 msgstr "不能同时提供 --quiet 和 --verbose 参数"

3227

3054 -#: builtin/check-ignore.c:157

3228 +#: builtin/check-ignore.c:168

3229 msgid "--non-matching is only valid with --verbose"

3230 msgstr "--non-matching 选项只在使用 --verbose 时有效"

3231

@@ -3124,107 +3298,107 @@ msgstr "git checkout [选项] <分支>"

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

3299 msgstr "git checkout [选项] [<分支>] -- <文件>..."

3300

3127 -#: builtin/checkout.c:117 builtin/checkout.c:150

3301 +#: builtin/checkout.c:114 builtin/checkout.c:147

3302 #, c-format

3303 msgid "path '%s' does not have our version"

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

3305

3132 -#: builtin/checkout.c:119 builtin/checkout.c:152

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

3307 #, c-format

3308 msgid "path '%s' does not have their version"

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

3310

3137 -#: builtin/checkout.c:135

3311 +#: builtin/checkout.c:132

3312 #, c-format

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

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

3315

3142 -#: builtin/checkout.c:179

3316 +#: builtin/checkout.c:176

3317 #, c-format

3318 msgid "path '%s' does not have necessary versions"

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

3320

3147 -#: builtin/checkout.c:196

3321 +#: builtin/checkout.c:193

3322 #, c-format

3323 msgid "path '%s': cannot merge"

3324 msgstr "path '%s'：无法合并"

3325

3152 -#: builtin/checkout.c:213

3326 +#: builtin/checkout.c:210

3327 #, c-format

3328 msgid "Unable to add merge result for '%s'"

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

3330

3157 -#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243

3158 -#: builtin/checkout.c:246

3331 +#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238

3332 +#: builtin/checkout.c:241

3333 #, c-format

3334 msgid "'%s' cannot be used with updating paths"

3335 msgstr "'%s' 不能在更新路径时使用"

3336

3163 -#: builtin/checkout.c:249 builtin/checkout.c:252

3337 +#: builtin/checkout.c:244 builtin/checkout.c:247

3338 #, c-format

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

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

3341

3168 -#: builtin/checkout.c:255

3342 +#: builtin/checkout.c:250

3343 #, c-format

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

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

3346

3173 -#: builtin/checkout.c:266 builtin/checkout.c:458

3347 +#: builtin/checkout.c:261 builtin/checkout.c:451

3348 msgid "corrupt index file"

3349 msgstr "损坏的索引文件"

3350

3177 -#: builtin/checkout.c:329 builtin/checkout.c:336

3351 +#: builtin/checkout.c:322 builtin/checkout.c:329

3352 #, c-format

3353 msgid "path '%s' is unmerged"

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

3355

3182 -#: builtin/checkout.c:480

3356 +#: builtin/checkout.c:473

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

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

3359

3186 -#: builtin/checkout.c:601

3360 +#: builtin/checkout.c:594

3361 #, c-format

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

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

3364

3191 -#: builtin/checkout.c:639

3365 +#: builtin/checkout.c:632

3366 msgid "HEAD is now at"

3367 msgstr "HEAD 目前位于"

3368

3195 -#: builtin/checkout.c:646

3369 +#: builtin/checkout.c:639

3370 #, c-format

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

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

3373

3200 -#: builtin/checkout.c:649

3374 +#: builtin/checkout.c:642

3375 #, c-format

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

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

3378

3205 -#: builtin/checkout.c:653

3379 +#: builtin/checkout.c:646

3380 #, c-format

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

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

3383

3210 -#: builtin/checkout.c:655 builtin/checkout.c:997

3384 +#: builtin/checkout.c:648 builtin/checkout.c:1033

3385 #, c-format

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

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

3388

3215 -#: builtin/checkout.c:657

3389 +#: builtin/checkout.c:650

3390 #, c-format

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

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

3393

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

3221 -#: builtin/checkout.c:713

3395 +#: builtin/checkout.c:706

3396 #, c-format

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

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

3399

3400 #. The singular version

3227 -#: builtin/checkout.c:719

3401 +#: builtin/checkout.c:712

3402 #, c-format

3403 msgid ""

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

@@ -3245,7 +3419,7 @@ msgstr[1] ""

3419 "\n"

3420 "%s\n"

3421

3248 -#: builtin/checkout.c:737

3422 +#: builtin/checkout.c:730

3423 #, c-format

3424 msgid ""

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

@@ -3260,136 +3434,140 @@ msgstr ""

3434 " git branch new_branch_name %s\n"

3435 "\n"

3436

3263 -#: builtin/checkout.c:767

3437 +#: builtin/checkout.c:760

3438 msgid "internal error in revision walk"

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

3440

3267 -#: builtin/checkout.c:771

3441 +#: builtin/checkout.c:764

3442 msgid "Previous HEAD position was"

3443 msgstr "之前的 HEAD 位置是"

3444

3271 -#: builtin/checkout.c:798 builtin/checkout.c:992

3445 +#: builtin/checkout.c:791 builtin/checkout.c:1028

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

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

3448

3275 -#. case (1)

3276 -#: builtin/checkout.c:928

3449 +#: builtin/checkout.c:935

3450 +#, c-format

3451 +msgid "only one reference expected, %d given."

3452 +msgstr "只要一个引用，却给出了 %d 个"

3453 +

3454 +#: builtin/checkout.c:974

3455 #, c-format

3456 msgid "invalid reference: %s"

3457 msgstr "无效引用：%s"

3458

3459 #. case (1): want a tree

3282 -#: builtin/checkout.c:967

3460 +#: builtin/checkout.c:1003

3461 #, c-format

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

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

3464

3287 -#: builtin/checkout.c:1006

3465 +#: builtin/checkout.c:1042

3466 msgid "paths cannot be used with switching branches"

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

3468

3291 -#: builtin/checkout.c:1009 builtin/checkout.c:1013

3469 +#: builtin/checkout.c:1045 builtin/checkout.c:1049

3470 #, c-format

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

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

3473

3296 -#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025

3297 -#: builtin/checkout.c:1028

3474 +#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061

3475 +#: builtin/checkout.c:1064

3476 #, c-format

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

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

3479

3302 -#: builtin/checkout.c:1033

3480 +#: builtin/checkout.c:1069

3481 #, c-format

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

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

3484

3307 -#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89

3485 +#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

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

3487 msgid "branch"

3488 msgstr "分支"

3489

3312 -#: builtin/checkout.c:1056

3490 +#: builtin/checkout.c:1092

3491 msgid "create and checkout a new branch"

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

3493

3316 -#: builtin/checkout.c:1058

3494 +#: builtin/checkout.c:1094

3495 msgid "create/reset and checkout a branch"

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

3497

3320 -#: builtin/checkout.c:1059

3498 +#: builtin/checkout.c:1095

3499 msgid "create reflog for new branch"

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

3501

3324 -#: builtin/checkout.c:1060

3502 +#: builtin/checkout.c:1096

3503 msgid "detach the HEAD at named commit"

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

3505

3328 -#: builtin/checkout.c:1061

3506 +#: builtin/checkout.c:1097

3507 msgid "set upstream info for new branch"

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

3509

3332 -#: builtin/checkout.c:1063

3510 +#: builtin/checkout.c:1099

3511 msgid "new branch"

3512 msgstr "新分支"

3513

3336 -#: builtin/checkout.c:1063

3514 +#: builtin/checkout.c:1099

3515 msgid "new unparented branch"

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

3517

3340 -#: builtin/checkout.c:1064

3518 +#: builtin/checkout.c:1100

3519 msgid "checkout our version for unmerged files"

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

3521

3344 -#: builtin/checkout.c:1066

3522 +#: builtin/checkout.c:1102

3523 msgid "checkout their version for unmerged files"

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

3525

3348 -#: builtin/checkout.c:1068

3526 +#: builtin/checkout.c:1104

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

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

3529

3352 -#: builtin/checkout.c:1069

3530 +#: builtin/checkout.c:1105

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

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

3533

3356 -#: builtin/checkout.c:1070 builtin/merge.c:232

3534 +#: builtin/checkout.c:1106 builtin/merge.c:232

3535 msgid "update ignored files (default)"

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

3537

3360 -#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249

3538 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251

3539 msgid "style"

3540 msgstr "风格"

3541

3364 -#: builtin/checkout.c:1072

3542 +#: builtin/checkout.c:1108

3543 msgid "conflict style (merge or diff3)"

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

3545

3368 -#: builtin/checkout.c:1075

3546 +#: builtin/checkout.c:1111

3547 msgid "do not limit pathspecs to sparse entries only"

3548 msgstr "对路径不做稀疏检出的限制"

3549

3372 -#: builtin/checkout.c:1077

3550 +#: builtin/checkout.c:1113

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

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

3553

3376 -#: builtin/checkout.c:1101

3554 +#: builtin/checkout.c:1136

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

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

3557

3380 -#: builtin/checkout.c:1118

3558 +#: builtin/checkout.c:1153

3559 msgid "--track needs a branch name"

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

3561

3384 -#: builtin/checkout.c:1125

3562 +#: builtin/checkout.c:1160

3563 msgid "Missing branch name; try -b"

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

3565

3388 -#: builtin/checkout.c:1160

3566 +#: builtin/checkout.c:1197

3567 msgid "invalid path specification"

3568 msgstr "无效的路径规格"

3569

3392 -#: builtin/checkout.c:1167

3570 +#: builtin/checkout.c:1204

3571 #, c-format

3572 msgid ""

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

@@ -3398,50 +3576,50 @@ msgstr ""

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

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

3578

3401 -#: builtin/checkout.c:1172

3579 +#: builtin/checkout.c:1209

3580 #, c-format

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

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

3583

3406 -#: builtin/checkout.c:1176

3584 +#: builtin/checkout.c:1213

3585 msgid ""

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

3587 "checking out of the index."

3588 msgstr ""

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

3590

3413 -#: builtin/clean.c:25

3591 +#: builtin/clean.c:26

3592 msgid ""

3593 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

3594 msgstr ""

3595 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."

3596

3419 -#: builtin/clean.c:29

3597 +#: builtin/clean.c:30

3598 #, c-format

3599 msgid "Removing %s\n"

3600 msgstr "正删除 %s\n"

3601

3424 -#: builtin/clean.c:30

3602 +#: builtin/clean.c:31

3603 #, c-format

3604 msgid "Would remove %s\n"

3605 msgstr "将删除 %s\n"

3606

3429 -#: builtin/clean.c:31

3607 +#: builtin/clean.c:32

3608 #, c-format

3609 msgid "Skipping repository %s\n"

3610 msgstr "忽略版本库 %s\n"

3611

3434 -#: builtin/clean.c:32

3612 +#: builtin/clean.c:33

3613 #, c-format

3614 msgid "Would skip repository %s\n"

3615 msgstr "将忽略版本库 %s\n"

3616

3439 -#: builtin/clean.c:33

3617 +#: builtin/clean.c:34

3618 #, c-format

3619 msgid "failed to remove %s"

3620 msgstr "无法删除 %s"

3621

3444 -#: builtin/clean.c:293

3622 +#: builtin/clean.c:294

3623 msgid ""

3624 "Prompt help:\n"

3625 "1 - select a numbered item\n"

@@ -3453,7 +3631,7 @@ msgstr ""

3631 "foo - 通过标题选择一个选项\n"

3632 " - （空）什么也不选择"

3633

3456 -#: builtin/clean.c:297

3634 +#: builtin/clean.c:298

3635 msgid ""

3636 "Prompt help:\n"

3637 "1 - select a single item\n"

@@ -3473,35 +3651,35 @@ msgstr ""

3651 "* - 选择所有选项\n"

3652 " - （空）结束选择"

3653

3476 -#: builtin/clean.c:515

3654 +#: builtin/clean.c:516

3655 #, c-format

3656 msgid "Huh (%s)?"

3657 msgstr "嗯（%s）？"

3658

3481 -#: builtin/clean.c:658

3659 +#: builtin/clean.c:659

3660 #, c-format

3661 msgid "Input ignore patterns>> "

3662 msgstr "输入模版以排除条目>> "

3663

3486 -#: builtin/clean.c:695

3664 +#: builtin/clean.c:696

3665 #, c-format

3666 msgid "WARNING: Cannot find items matched by: %s"

3667 msgstr "警告：无法找到和 %s 匹配的条目"

3668

3491 -#: builtin/clean.c:716

3669 +#: builtin/clean.c:717

3670 msgid "Select items to delete"

3671 msgstr "选择要删除的条目"

3672

3495 -#: builtin/clean.c:756

3673 +#: builtin/clean.c:757

3674 #, c-format

3675 msgid "remove %s? "

3676 msgstr "删除 %s？"

3677

3500 -#: builtin/clean.c:781

3678 +#: builtin/clean.c:782

3679 msgid "Bye."

3680 msgstr "再见。"

3681

3504 -#: builtin/clean.c:789

3682 +#: builtin/clean.c:790

3683 msgid ""

3684 "clean - start cleaning\n"

3685 "filter by pattern - exclude items from deletion\n"

@@ -3519,21 +3697,21 @@ msgstr ""

3697 "help - 显示本帮助\n"

3698 "? - 显示如何在提示符下选择的帮助"

3699

3522 -#: builtin/clean.c:816

3700 +#: builtin/clean.c:817

3701 msgid "*** Commands ***"

3702 msgstr "*** 命令 ***"

3703

3526 -#: builtin/clean.c:817

3704 +#: builtin/clean.c:818

3705 msgid "What now"

3706 msgstr "请选择"

3707

3530 -#: builtin/clean.c:825

3708 +#: builtin/clean.c:826

3709 msgid "Would remove the following item:"

3710 msgid_plural "Would remove the following items:"

3711 msgstr[0] "将删除如下条目："

3712 msgstr[1] "将删除如下条目："

3713

3536 -#: builtin/clean.c:842

3714 +#: builtin/clean.c:843

3715 msgid "No more files to clean, exiting."

3716 msgstr "没有要清理的文件，退出。"

3717

@@ -3553,8 +3731,8 @@ msgstr "交互式清除"

3731 msgid "remove whole directories"

3732 msgstr "删除整个目录"

3733

3556 -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716

3557 -#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186

3734 +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3735 +#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185

3736 msgid "pattern"

3737 msgstr "模式"

3738

@@ -3592,8 +3770,8 @@ msgstr ""

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

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

3772

3595 -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229

3596 -#: builtin/push.c:462

3773 +#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229

3774 +#: builtin/push.c:474

3775 msgid "force progress reporting"

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

3777

@@ -3605,123 +3783,123 @@ msgstr "不创建一个检出"

3783 msgid "create a bare repository"

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

3785

3608 -#: builtin/clone.c:72

3786 +#: builtin/clone.c:71

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

3788 msgstr "创建一个镜像版本库（也是裸版本库）"

3789

3612 -#: builtin/clone.c:74

3790 +#: builtin/clone.c:73

3791 msgid "to clone from a local repository"

3792 msgstr "从本地版本库克隆"

3793

3616 -#: builtin/clone.c:76

3794 +#: builtin/clone.c:75

3795 msgid "don't use local hardlinks, always copy"

3796 msgstr "不使用本地硬链接，始终复制"

3797

3620 -#: builtin/clone.c:78

3798 +#: builtin/clone.c:77

3799 msgid "setup as shared repository"

3800 msgstr "设置为共享版本库"

3801

3624 -#: builtin/clone.c:80 builtin/clone.c:82

3802 +#: builtin/clone.c:79 builtin/clone.c:81

3803 msgid "initialize submodules in the clone"

3804 msgstr "在克隆时初始化子模组"

3805

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

3806 +#: builtin/clone.c:82 builtin/init-db.c:485

3807 msgid "template-directory"

3808 msgstr "模板目录"

3809

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

3810 +#: builtin/clone.c:83 builtin/init-db.c:486

3811 msgid "directory from which templates will be used"

3812 msgstr "模板目录将被使用"

3813

3636 -#: builtin/clone.c:86

3814 +#: builtin/clone.c:85

3815 msgid "reference repository"

3816 msgstr "引用版本库"

3817

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

3818 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

3819 msgid "name"

3820 msgstr "名称"

3821

3644 -#: builtin/clone.c:88

3822 +#: builtin/clone.c:87

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

3824 msgstr "使用<名称>而不是 'origin' 去跟踪上游"

3825

3648 -#: builtin/clone.c:90

3826 +#: builtin/clone.c:89

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

3828 msgstr "检出<分支>而不是远程HEAD"

3829

3652 -#: builtin/clone.c:92

3830 +#: builtin/clone.c:91

3831 msgid "path to git-upload-pack on the remote"

3832 msgstr "远程 git-upload-pack 路径"

3833

3656 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661

3834 +#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663

3835 msgid "depth"

3836 msgstr "深度"

3837

3660 -#: builtin/clone.c:94

3838 +#: builtin/clone.c:93

3839 msgid "create a shallow clone of that depth"

3840 msgstr "创建一个指定深度的浅克隆"

3841

3664 -#: builtin/clone.c:96

3842 +#: builtin/clone.c:95

3843 msgid "clone only one branch, HEAD or --branch"

3844 msgstr "只克隆一个分支、HEAD 或 --branch"

3845

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

3846 +#: builtin/clone.c:96 builtin/init-db.c:494

3847 msgid "gitdir"

3848 msgstr "git目录"

3849

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

3850 +#: builtin/clone.c:97 builtin/init-db.c:495

3851 msgid "separate git dir from working tree"

3852 msgstr "git目录和工作区分离"

3853

3676 -#: builtin/clone.c:99

3854 +#: builtin/clone.c:98

3855 msgid "key=value"

3856 msgstr "key=value"

3857

3680 -#: builtin/clone.c:100

3858 +#: builtin/clone.c:99

3859 msgid "set config inside the new repository"

3860 msgstr "在新版本库中设置配置信息"

3861

3684 -#: builtin/clone.c:253

3862 +#: builtin/clone.c:252

3863 #, c-format

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

3865 msgstr "引用版本库 '%s' 不是一个本地版本库。"

3866

3689 -#: builtin/clone.c:316

3867 +#: builtin/clone.c:315

3868 #, c-format

3869 msgid "failed to create directory '%s'"

3870 msgstr "无法创建目录 '%s'"

3871

3694 -#: builtin/clone.c:318 builtin/diff.c:77

3872 +#: builtin/clone.c:317 builtin/diff.c:77

3873 #, c-format

3874 msgid "failed to stat '%s'"

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

3876

3699 -#: builtin/clone.c:320

3877 +#: builtin/clone.c:319

3878 #, c-format

3879 msgid "%s exists and is not a directory"

3880 msgstr "%s 存在且不是一个目录"

3881

3704 -#: builtin/clone.c:334

3882 +#: builtin/clone.c:333

3883 #, c-format

3884 msgid "failed to stat %s\n"

3885 msgstr "无法枚举 %s 状态\n"

3886

3709 -#: builtin/clone.c:356

3887 +#: builtin/clone.c:355

3888 #, c-format

3889 msgid "failed to create link '%s'"

3890 msgstr "无法创建链接 '%s'"

3891

3714 -#: builtin/clone.c:360

3892 +#: builtin/clone.c:359

3893 #, c-format

3894 msgid "failed to copy file to '%s'"

3895 msgstr "无法拷贝文件至 '%s'"

3896

3719 -#: builtin/clone.c:383

3897 +#: builtin/clone.c:382 builtin/clone.c:559

3898 #, c-format

3899 msgid "done.\n"

3900 msgstr "完成。\n"

3901

3724 -#: builtin/clone.c:396

3902 +#: builtin/clone.c:395

3903 msgid ""

3904 "Clone succeeded, but checkout failed.\n"

3905 "You can inspect what was checked out with 'git status'\n"

@@ -3731,104 +3909,99 @@ msgstr ""

3909 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

3910 "'git checkout -f HEAD' 重试\n"

3911

3734 -#: builtin/clone.c:475

3912 +#: builtin/clone.c:474

3913 #, c-format

3914 msgid "Could not find remote branch %s to clone."

3915 msgstr "不能发现要克隆的远程分支 %s。"

3916

3739 -#: builtin/clone.c:555

3917 +#: builtin/clone.c:554

3918 #, c-format

3919 msgid "Checking connectivity... "

3920 msgstr "检查连接... "

3921

3744 -#: builtin/clone.c:558

3922 +#: builtin/clone.c:557

3923 msgid "remote did not send all necessary objects"

3924 msgstr "远程没有发送所有必须的对象"

3925

3748 -#: builtin/clone.c:560

3749 -#, c-format

3750 -msgid "done\n"

3751 -msgstr "完成\n"

3752 -

3753 -#: builtin/clone.c:621

3926 +#: builtin/clone.c:620

3927 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3928 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

3929

3757 -#: builtin/clone.c:652

3930 +#: builtin/clone.c:651

3931 msgid "unable to checkout working tree"

3932 msgstr "不能检出工作区"

3933

3761 -#: builtin/clone.c:760

3934 +#: builtin/clone.c:759

3935 msgid "Too many arguments."

3936 msgstr "太多参数。"

3937

3765 -#: builtin/clone.c:764

3938 +#: builtin/clone.c:763

3939 msgid "You must specify a repository to clone."

3940 msgstr "您必须指定一个版本库来克隆。"

3941

3769 -#: builtin/clone.c:775

3942 +#: builtin/clone.c:774

3943 #, c-format

3944 msgid "--bare and --origin %s options are incompatible."

3945 msgstr "--bare 和 --origin %s 选项不兼容。"

3946

3774 -#: builtin/clone.c:778

3947 +#: builtin/clone.c:777

3948 msgid "--bare and --separate-git-dir are incompatible."

3949 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

3950

3778 -#: builtin/clone.c:791

3951 +#: builtin/clone.c:790

3952 #, c-format

3953 msgid "repository '%s' does not exist"

3954 msgstr "版本库 '%s' 不存在"

3955

3783 -#: builtin/clone.c:796

3956 +#: builtin/clone.c:795

3957 msgid "--depth is ignored in local clones; use file:// instead."

3958 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

3959

3787 -#: builtin/clone.c:798

3960 +#: builtin/clone.c:797

3961 msgid "--local is ignored"

3962 msgstr "--local 被忽略"

3963

3791 -#: builtin/clone.c:808

3964 +#: builtin/clone.c:807

3965 #, c-format

3966 msgid "destination path '%s' already exists and is not an empty directory."

3967 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

3968

3796 -#: builtin/clone.c:818

3969 +#: builtin/clone.c:817

3970 #, c-format

3971 msgid "working tree '%s' already exists."

3972 msgstr "工作区 '%s' 已经存在。"

3973

3801 -#: builtin/clone.c:831 builtin/clone.c:843

3974 +#: builtin/clone.c:830 builtin/clone.c:842

3975 #, c-format

3976 msgid "could not create leading directories of '%s'"

3977 msgstr "不能为 '%s' 创建先导目录"

3978

3806 -#: builtin/clone.c:834

3979 +#: builtin/clone.c:833

3980 #, c-format

3981 msgid "could not create work tree dir '%s'."

3982 msgstr "不能为 '%s' 创建工作区目录。"

3983

3811 -#: builtin/clone.c:853

3984 +#: builtin/clone.c:852

3985 #, c-format

3986 msgid "Cloning into bare repository '%s'...\n"

3987 msgstr "克隆到裸版本库 '%s'...\n"

3988

3816 -#: builtin/clone.c:855

3989 +#: builtin/clone.c:854

3990 #, c-format

3991 msgid "Cloning into '%s'...\n"

3992 msgstr "正克隆到 '%s'...\n"

3993

3821 -#: builtin/clone.c:890

3994 +#: builtin/clone.c:888

3995 #, c-format

3996 msgid "Don't know how to clone %s"

3997 msgstr "不知道如何克隆 %s"

3998

3826 -#: builtin/clone.c:942

3999 +#: builtin/clone.c:939 builtin/clone.c:947

4000 #, c-format

4001 msgid "Remote branch %s not found in upstream %s"

4002 msgstr "远程分支 %s 在上游 %s 未发现"

4003

3831 -#: builtin/clone.c:949

4004 +#: builtin/clone.c:950

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

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

4007

@@ -3864,15 +4037,15 @@ msgstr "两列之间的填充空间"

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

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

4039

3867 -#: builtin/commit.c:35

4040 +#: builtin/commit.c:36

4041 msgid "git commit [options] [--] <pathspec>..."

3869 -msgstr "git commit [选项] [--] <路径匹配>..."

4042 +msgstr "git commit [选项] [--] <路径规则>..."

4043

3871 -#: builtin/commit.c:40

4044 +#: builtin/commit.c:41

4045 msgid "git status [options] [--] <pathspec>..."

3873 -msgstr "git status [选项] [--] <路径匹配>..."

4046 +msgstr "git status [选项] [--] <路径规则>..."

4047

3875 -#: builtin/commit.c:45

4048 +#: builtin/commit.c:46

4049 msgid ""

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

4051 "on your username and hostname. Please check that they are accurate.\n"

@@ -3895,7 +4068,7 @@ msgstr ""

4068 "\n"

4069 " git commit --amend --reset-author\n"

4070

3898 -#: builtin/commit.c:57

4071 +#: builtin/commit.c:58

4072 msgid ""

4073 "You asked to amend the most recent commit, but doing so would make\n"

4074 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -3904,7 +4077,7 @@ msgstr ""

4077 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"

4078 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"

4079

3907 -#: builtin/commit.c:62

4080 +#: builtin/commit.c:63

4081 msgid ""

4082 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

4083 "If you wish to commit it anyway, use:\n"

@@ -3918,11 +4091,11 @@ msgstr ""

4091 " git commit --allow-empty\n"

4092 "\n"

4093

3921 -#: builtin/commit.c:69

4094 +#: builtin/commit.c:70

4095 msgid "Otherwise, please use 'git reset'\n"

4096 msgstr "否则，请使用命令 'git reset'\n"

4097

3925 -#: builtin/commit.c:72

4098 +#: builtin/commit.c:73

4099 msgid ""

4100 "If you wish to skip this commit, use:\n"

4101 "\n"

@@ -3938,93 +4111,93 @@ msgstr ""

4111 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"

4112 "操作。\n"

4113

3941 -#: builtin/commit.c:279

4114 +#: builtin/commit.c:287

4115 msgid "failed to unpack HEAD tree object"

4116 msgstr "无法解包 HEAD 树对象"

4117

3945 -#: builtin/commit.c:321

4118 +#: builtin/commit.c:329

4119 msgid "unable to create temporary index"

4120 msgstr "不能创建临时索引"

4121

3949 -#: builtin/commit.c:327

4122 +#: builtin/commit.c:335

4123 msgid "interactive add failed"

4124 msgstr "交互式添加失败"

4125

3953 -#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431

4126 +#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439

4127 msgid "unable to write new_index file"

4128 msgstr "无法写 new_index 文件"

4129

3957 -#: builtin/commit.c:412

4130 +#: builtin/commit.c:420

4131 msgid "cannot do a partial commit during a merge."

4132 msgstr "在合并过程中不能做部分提交。"

4133

3961 -#: builtin/commit.c:414

4134 +#: builtin/commit.c:422

4135 msgid "cannot do a partial commit during a cherry-pick."

4136 msgstr "在拣选过程中不能做部分提交。"

4137

3965 -#: builtin/commit.c:424

4138 +#: builtin/commit.c:432

4139 msgid "cannot read the index"

4140 msgstr "无法读取索引"

4141

3969 -#: builtin/commit.c:444

4142 +#: builtin/commit.c:452

4143 msgid "unable to write temporary index file"

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

4145

3973 -#: builtin/commit.c:535 builtin/commit.c:541

4146 +#: builtin/commit.c:543 builtin/commit.c:549

4147 #, c-format

4148 msgid "invalid commit: %s"

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

4150

3978 -#: builtin/commit.c:563

4151 +#: builtin/commit.c:571

4152 msgid "malformed --author parameter"

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

4154

3982 -#: builtin/commit.c:583

4155 +#: builtin/commit.c:591

4156 #, c-format

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

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

4159

3987 -#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982

4160 +#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007

4161 #, c-format

4162 msgid "could not lookup commit %s"

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

4164

3992 -#: builtin/commit.c:633 builtin/shortlog.c:271

4165 +#: builtin/commit.c:642 builtin/shortlog.c:273

4166 #, c-format

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

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

4169

3997 -#: builtin/commit.c:635

4170 +#: builtin/commit.c:644

4171 msgid "could not read log from standard input"

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

4173

4001 -#: builtin/commit.c:639

4174 +#: builtin/commit.c:648

4175 #, c-format

4176 msgid "could not read log file '%s'"

4177 msgstr "不能读取日志文件 '%s'"

4178

4006 -#: builtin/commit.c:645

4179 +#: builtin/commit.c:654

4180 msgid "commit has empty message"

4181 msgstr "提交说明为空"

4182

4010 -#: builtin/commit.c:661

4183 +#: builtin/commit.c:670

4184 msgid "could not read MERGE_MSG"

4185 msgstr "不能读取 MERGE_MSG"

4186

4014 -#: builtin/commit.c:665

4187 +#: builtin/commit.c:674

4188 msgid "could not read SQUASH_MSG"

4189 msgstr "不能读取 SQUASH_MSG"

4190

4018 -#: builtin/commit.c:669

4191 +#: builtin/commit.c:678

4192 #, c-format

4193 msgid "could not read '%s'"

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

4195

4023 -#: builtin/commit.c:730

4196 +#: builtin/commit.c:749

4197 msgid "could not write commit template"

4198 msgstr "不能写提交模版"

4199

4027 -#: builtin/commit.c:741

4200 +#: builtin/commit.c:760

4201 #, c-format

4202 msgid ""

4203 "\n"

@@ -4038,7 +4211,7 @@ msgstr ""

4211 "\t%s\n"

4212 "然后重试。\n"

4213

4041 -#: builtin/commit.c:746

4214 +#: builtin/commit.c:765

4215 #, c-format

4216 msgid ""

4217 "\n"

@@ -4052,7 +4225,7 @@ msgstr ""

4225 "\t%s\n"

4226 "然后重试。\n"

4227

4055 -#: builtin/commit.c:758

4228 +#: builtin/commit.c:777

4229 #, c-format

4230 msgid ""

4231 "Please enter the commit message for your changes. Lines starting\n"

@@ -4061,7 +4234,7 @@ msgstr ""

4234 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

4235 "说明将会终止提交。\n"

4236

4064 -#: builtin/commit.c:763

4237 +#: builtin/commit.c:782

4238 #, c-format

4239 msgid ""

4240 "Please enter the commit message for your changes. Lines starting\n"

@@ -4072,355 +4245,355 @@ msgstr ""

4245 "也可以删除它们。一个空的提交说明将会终止提交。\n"

4246

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

4075 -#: builtin/commit.c:776

4248 +#: builtin/commit.c:795

4249 #, c-format

4250 msgid "%sAuthor: %s"

4251 msgstr "%s作者： %s"

4252

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

4081 -#: builtin/commit.c:783

4254 +#: builtin/commit.c:802

4255 #, c-format

4256 msgid "%sCommitter: %s"

4257 msgstr "%s提交者： %s"

4258

4086 -#: builtin/commit.c:803

4259 +#: builtin/commit.c:822

4260 msgid "Cannot read index"

4261 msgstr "无法读取索引"

4262

4090 -#: builtin/commit.c:845

4263 +#: builtin/commit.c:865

4264 msgid "Error building trees"

4265 msgstr "无法创建树对象"

4266

4094 -#: builtin/commit.c:860 builtin/tag.c:359

4267 +#: builtin/commit.c:880 builtin/tag.c:359

4268 #, c-format

4269 msgid "Please supply the message using either -m or -F option.\n"

4270 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

4271

4099 -#: builtin/commit.c:957

4272 +#: builtin/commit.c:982

4273 #, c-format

4274 msgid "No existing author found with '%s'"

4275 msgstr "没有找到匹配 '%s' 的作者"

4276

4104 -#: builtin/commit.c:972 builtin/commit.c:1208

4277 +#: builtin/commit.c:997 builtin/commit.c:1237

4278 #, c-format

4279 msgid "Invalid untracked files mode '%s'"

4280 msgstr "无效的未追踪文件参数 '%s'"

4281

4109 -#: builtin/commit.c:1009

4282 +#: builtin/commit.c:1034

4283 msgid "--long and -z are incompatible"

4284 msgstr "--long 和 -z 选项不兼容"

4285

4113 -#: builtin/commit.c:1039

4286 +#: builtin/commit.c:1064

4287 msgid "Using both --reset-author and --author does not make sense"

4288 msgstr "同时使用 --reset-author 和 --author 没有意义"

4289

4117 -#: builtin/commit.c:1050

4290 +#: builtin/commit.c:1075

4291 msgid "You have nothing to amend."

4292 msgstr "您没有可修补的提交。"

4293

4121 -#: builtin/commit.c:1053

4294 +#: builtin/commit.c:1078

4295 msgid "You are in the middle of a merge -- cannot amend."

4296 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

4297

4125 -#: builtin/commit.c:1055

4298 +#: builtin/commit.c:1080

4299 msgid "You are in the middle of a cherry-pick -- cannot amend."

4300 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

4301

4129 -#: builtin/commit.c:1058

4302 +#: builtin/commit.c:1083

4303 msgid "Options --squash and --fixup cannot be used together"

4304 msgstr "选项 --squash 和 --fixup 不能同时使用"

4305

4133 -#: builtin/commit.c:1068

4306 +#: builtin/commit.c:1093

4307 msgid "Only one of -c/-C/-F/--fixup can be used."

4308 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

4309

4137 -#: builtin/commit.c:1070

4310 +#: builtin/commit.c:1095

4311 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4312 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

4313

4141 -#: builtin/commit.c:1078

4314 +#: builtin/commit.c:1103

4315 msgid "--reset-author can be used only with -C, -c or --amend."

4316 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

4317

4145 -#: builtin/commit.c:1095

4318 +#: builtin/commit.c:1120

4319 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4320 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

4321

4149 -#: builtin/commit.c:1097

4322 +#: builtin/commit.c:1122

4323 msgid "No paths with --include/--only does not make sense."

4324 msgstr "参数 --include/--only 不跟路径没有意义。"

4325

4153 -#: builtin/commit.c:1099

4326 +#: builtin/commit.c:1124

4327 msgid "Clever... amending the last one with dirty index."

4328 msgstr "聪明... 在索引不干净下修补最后的提交。"

4329

4157 -#: builtin/commit.c:1101

4330 +#: builtin/commit.c:1126

4331 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

4332 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

4333

4161 -#: builtin/commit.c:1111 builtin/tag.c:575

4334 +#: builtin/commit.c:1136 builtin/tag.c:572

4335 #, c-format

4336 msgid "Invalid cleanup mode %s"

4337 msgstr "无效的清理模式 %s"

4338

4166 -#: builtin/commit.c:1116

4339 +#: builtin/commit.c:1141

4340 msgid "Paths with -a does not make sense."

4341 msgstr "路径和 -a 选项同时使用没有意义。"

4342

4170 -#: builtin/commit.c:1222 builtin/commit.c:1455

4343 +#: builtin/commit.c:1251 builtin/commit.c:1482

4344 msgid "show status concisely"

4345 msgstr "以简洁的格式显示状态"

4346

4174 -#: builtin/commit.c:1224 builtin/commit.c:1457

4347 +#: builtin/commit.c:1253 builtin/commit.c:1484

4348 msgid "show branch information"

4349 msgstr "显示分支信息"

4350

4178 -#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452

4351 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460

4352 msgid "machine-readable output"

4353 msgstr "机器可读的输出"

4354

4182 -#: builtin/commit.c:1229 builtin/commit.c:1461

4355 +#: builtin/commit.c:1258 builtin/commit.c:1488

4356 msgid "show status in long format (default)"

4357 msgstr "以长格式显示状态（默认）"

4358

4186 -#: builtin/commit.c:1232 builtin/commit.c:1464

4359 +#: builtin/commit.c:1261 builtin/commit.c:1491

4360 msgid "terminate entries with NUL"

4361 msgstr "条目以NUL字符结尾"

4362

4190 -#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667

4191 -#: builtin/fast-export.c:670 builtin/tag.c:459

4363 +#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674

4364 +#: builtin/fast-export.c:677 builtin/tag.c:459

4365 msgid "mode"

4366 msgstr "模式"

4367

4195 -#: builtin/commit.c:1235 builtin/commit.c:1467

4368 +#: builtin/commit.c:1264 builtin/commit.c:1494

4369 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4370 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

4371

4199 -#: builtin/commit.c:1238

4372 +#: builtin/commit.c:1267

4373 msgid "show ignored files"

4374 msgstr "显示忽略的文件"

4375

4203 -#: builtin/commit.c:1239 parse-options.h:154

4376 +#: builtin/commit.c:1268 parse-options.h:156

4377 msgid "when"

4378 msgstr "何时"

4379

4207 -#: builtin/commit.c:1240

4380 +#: builtin/commit.c:1269

4381 msgid ""

4382 "ignore changes to submodules, optional when: all, dirty, untracked. "

4383 "(Default: all)"

4384 msgstr ""

4385 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

4386

4214 -#: builtin/commit.c:1242

4387 +#: builtin/commit.c:1271

4388 msgid "list untracked files in columns"

4389 msgstr "以列的方式显示未跟踪的文件"

4390

4218 -#: builtin/commit.c:1313

4391 +#: builtin/commit.c:1340

4392 msgid "couldn't look up newly created commit"

4393 msgstr "无法找到新创建的提交"

4394

4222 -#: builtin/commit.c:1315

4395 +#: builtin/commit.c:1342

4396 msgid "could not parse newly created commit"

4397 msgstr "不能解析新创建的提交"

4398

4226 -#: builtin/commit.c:1356

4399 +#: builtin/commit.c:1383

4400 msgid "detached HEAD"

4401 msgstr "分离头指针"

4402

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

4231 -#: builtin/commit.c:1358

4404 +#: builtin/commit.c:1385

4405 msgid " (root-commit)"

4406 msgstr "（根提交）"

4407

4235 -#: builtin/commit.c:1425

4408 +#: builtin/commit.c:1452

4409 msgid "suppress summary after successful commit"

4410 msgstr "提交成功后不显示概述信息"

4411

4239 -#: builtin/commit.c:1426

4412 +#: builtin/commit.c:1453

4413 msgid "show diff in commit message template"

4414 msgstr "在提交说明模板里显示差异"

4415

4243 -#: builtin/commit.c:1428

4416 +#: builtin/commit.c:1455

4417 msgid "Commit message options"

4418 msgstr "提交说明选项"

4419

4247 -#: builtin/commit.c:1429 builtin/tag.c:457

4420 +#: builtin/commit.c:1456 builtin/tag.c:457

4421 msgid "read message from file"

4422 msgstr "从文件中读取提交说明"

4423

4251 -#: builtin/commit.c:1430

4424 +#: builtin/commit.c:1457

4425 msgid "author"

4426 msgstr "作者"

4427

4255 -#: builtin/commit.c:1430

4428 +#: builtin/commit.c:1457

4429 msgid "override author for commit"

4430 msgstr "提交时覆盖作者"

4431

4259 -#: builtin/commit.c:1431 builtin/gc.c:178

4432 +#: builtin/commit.c:1458 builtin/gc.c:260

4433 msgid "date"

4434 msgstr "日期"

4435

4263 -#: builtin/commit.c:1431

4436 +#: builtin/commit.c:1458

4437 msgid "override date for commit"

4438 msgstr "提交时覆盖日期"

4439

4267 -#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405

4440 +#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405

4441 #: builtin/notes.c:562 builtin/tag.c:455

4442 msgid "message"

4443 msgstr "说明"

4444

4272 -#: builtin/commit.c:1432

4445 +#: builtin/commit.c:1459

4446 msgid "commit message"

4447 msgstr "提交说明"

4448

4276 -#: builtin/commit.c:1433

4449 +#: builtin/commit.c:1460

4450 msgid "reuse and edit message from specified commit"

4451 msgstr "重用并编辑指定提交的提交说明"

4452

4280 -#: builtin/commit.c:1434

4453 +#: builtin/commit.c:1461

4454 msgid "reuse message from specified commit"

4455 msgstr "重用指定提交的提交说明"

4456

4284 -#: builtin/commit.c:1435

4457 +#: builtin/commit.c:1462

4458 msgid "use autosquash formatted message to fixup specified commit"

4459 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

4460

4288 -#: builtin/commit.c:1436

4461 +#: builtin/commit.c:1463

4462 msgid "use autosquash formatted message to squash specified commit"

4463 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

4464

4292 -#: builtin/commit.c:1437

4465 +#: builtin/commit.c:1464

4466 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4467 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

4468

4296 -#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111

4469 +#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86

4470 msgid "add Signed-off-by:"

4471 msgstr "添加 Signed-off-by: 签名"

4472

4300 -#: builtin/commit.c:1439

4473 +#: builtin/commit.c:1466

4474 msgid "use specified template file"

4475 msgstr "使用指定的模板文件"

4476

4304 -#: builtin/commit.c:1440

4477 +#: builtin/commit.c:1467

4478 msgid "force edit of commit"

4479 msgstr "强制编辑提交"

4480

4481 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

4309 -#: builtin/commit.c:1441

4482 +#: builtin/commit.c:1468

4483 msgid "default"

4484 msgstr "default"

4485

4313 -#: builtin/commit.c:1441 builtin/tag.c:460

4486 +#: builtin/commit.c:1468 builtin/tag.c:460

4487 msgid "how to strip spaces and #comments from message"

4488 msgstr "设置如何删除提交说明里的空格和#注释"

4489

4317 -#: builtin/commit.c:1442

4490 +#: builtin/commit.c:1469

4491 msgid "include status in commit message template"

4492 msgstr "在提交说明模板里包含状态信息"

4493

4321 -#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461

4494 +#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461

4495 msgid "key id"

4496 msgstr "key id"

4497

4325 -#: builtin/commit.c:1444 builtin/merge.c:231

4498 +#: builtin/commit.c:1471 builtin/merge.c:231

4499 msgid "GPG sign commit"

4500 msgstr "GPG 提交签名"

4501

4502 #. end commit message options

4330 -#: builtin/commit.c:1447

4503 +#: builtin/commit.c:1474

4504 msgid "Commit contents options"

4505 msgstr "提交内容选项"

4506

4334 -#: builtin/commit.c:1448

4507 +#: builtin/commit.c:1475

4508 msgid "commit all changed files"

4509 msgstr "提交所有改动的文件"

4510

4338 -#: builtin/commit.c:1449

4511 +#: builtin/commit.c:1476

4512 msgid "add specified files to index for commit"

4513 msgstr "添加指定的文件到索引区等待提交"

4514

4342 -#: builtin/commit.c:1450

4515 +#: builtin/commit.c:1477

4516 msgid "interactively add files"

4517 msgstr "交互式添加文件"

4518

4346 -#: builtin/commit.c:1451

4519 +#: builtin/commit.c:1478

4520 msgid "interactively add changes"

4521 msgstr "交互式添加变更"

4522

4350 -#: builtin/commit.c:1452

4523 +#: builtin/commit.c:1479

4524 msgid "commit only specified files"

4525 msgstr "只提交指定的文件"

4526

4354 -#: builtin/commit.c:1453

4527 +#: builtin/commit.c:1480

4528 msgid "bypass pre-commit hook"

4529 msgstr "绕过 pre-commit 钩子"

4530

4358 -#: builtin/commit.c:1454

4531 +#: builtin/commit.c:1481

4532 msgid "show what would be committed"

4533 msgstr "显示将要提交的内容"

4534

4362 -#: builtin/commit.c:1465

4535 +#: builtin/commit.c:1492

4536 msgid "amend previous commit"

4537 msgstr "修改先前的提交"

4538

4366 -#: builtin/commit.c:1466

4539 +#: builtin/commit.c:1493

4540 msgid "bypass post-rewrite hook"

4541 msgstr "绕过 post-rewrite 钩子"

4542

4370 -#: builtin/commit.c:1471

4543 +#: builtin/commit.c:1498

4544 msgid "ok to record an empty change"

4545 msgstr "允许一个空提交"

4546

4374 -#: builtin/commit.c:1474

4547 +#: builtin/commit.c:1500

4548 msgid "ok to record a change with an empty message"

4549 msgstr "允许空的提交说明"

4550

4378 -#: builtin/commit.c:1507

4551 +#: builtin/commit.c:1529

4552 msgid "could not parse HEAD commit"

4553 msgstr "不能解析 HEAD 提交"

4554

4382 -#: builtin/commit.c:1545 builtin/merge.c:525

4555 +#: builtin/commit.c:1567 builtin/merge.c:525

4556 #, c-format

4557 msgid "could not open '%s' for reading"

4558 msgstr "不能为读入打开 '%s'"

4559

4387 -#: builtin/commit.c:1552

4560 +#: builtin/commit.c:1574

4561 #, c-format

4562 msgid "Corrupt MERGE_HEAD file (%s)"

4563 msgstr "损坏的 MERGE_HEAD 文件（%s）"

4564

4392 -#: builtin/commit.c:1559

4565 +#: builtin/commit.c:1581

4566 msgid "could not read MERGE_MODE"

4567 msgstr "不能读取 MERGE_MODE"

4568

4396 -#: builtin/commit.c:1578

4569 +#: builtin/commit.c:1600

4570 #, c-format

4571 msgid "could not read commit message: %s"

4572 msgstr "不能读取提交说明：%s"

4573

4401 -#: builtin/commit.c:1592

4574 +#: builtin/commit.c:1614

4575 #, c-format

4576 msgid "Aborting commit; you did not edit the message.\n"

4577 msgstr "终止提交；您未更改来自模版的提交说明。\n"

4578

4406 -#: builtin/commit.c:1597

4579 +#: builtin/commit.c:1619

4580 #, c-format

4581 msgid "Aborting commit due to empty commit message.\n"

4582 msgstr "终止提交因为提交说明为空。\n"

4583

4411 -#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886

4584 +#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886

4585 msgid "failed to write commit object"

4586 msgstr "无法写提交对象"

4587

4415 -#: builtin/commit.c:1633

4588 +#: builtin/commit.c:1655

4589 msgid "cannot lock HEAD ref"

4590 msgstr "无法锁定 HEAD 引用"

4591

4419 -#: builtin/commit.c:1637

4592 +#: builtin/commit.c:1659

4593 msgid "cannot update HEAD ref"

4594 msgstr "无法更新 HEAD 引用"

4595

4423 -#: builtin/commit.c:1648

4596 +#: builtin/commit.c:1670

4597 msgid ""

4598 "Repository has been updated, but unable to write\n"

4599 "new_index file. Check that disk is not full or quota is\n"

@@ -4429,127 +4602,131 @@ msgstr ""

4602 "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"

4603 "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"

4604

4432 -#: builtin/config.c:7

4605 +#: builtin/config.c:8

4606 msgid "git config [options]"

4607 msgstr "git config [选项]"

4608

4436 -#: builtin/config.c:52

4609 +#: builtin/config.c:54

4610 msgid "Config file location"

4611 msgstr "配置文件位置"

4612

4440 -#: builtin/config.c:53

4613 +#: builtin/config.c:55

4614 msgid "use global config file"

4615 msgstr "使用全局配置文件"

4616

4444 -#: builtin/config.c:54

4617 +#: builtin/config.c:56

4618 msgid "use system config file"

4619 msgstr "使用系统级配置文件"

4620

4448 -#: builtin/config.c:55

4621 +#: builtin/config.c:57

4622 msgid "use repository config file"

4623 msgstr "使用版本库级配置文件"

4624

4452 -#: builtin/config.c:56

4625 +#: builtin/config.c:58

4626 msgid "use given config file"

4627 msgstr "使用指定的配置文件"

4628

4456 -#: builtin/config.c:57

4629 +#: builtin/config.c:59

4630 msgid "blob-id"

4631 msgstr "数据对象ID"

4632

4460 -#: builtin/config.c:57

4633 +#: builtin/config.c:59

4634 msgid "read config from given blob object"

4635 msgstr "从给定的数据对象读取配置"

4636

4464 -#: builtin/config.c:58

4637 +#: builtin/config.c:60

4638 msgid "Action"

4639 msgstr "操作"

4640

4468 -#: builtin/config.c:59

4641 +#: builtin/config.c:61

4642 msgid "get value: name [value-regex]"

4643 msgstr "获取值：name [value-regex]"

4644

4472 -#: builtin/config.c:60

4645 +#: builtin/config.c:62

4646 msgid "get all values: key [value-regex]"

4647 msgstr "获得所有的值：key [value-regex]"

4648

4476 -#: builtin/config.c:61

4649 +#: builtin/config.c:63

4650 msgid "get values for regexp: name-regex [value-regex]"

4651 msgstr "根据正则表达式获得值：name-regex [value-regex]"

4652

4480 -#: builtin/config.c:62

4653 +#: builtin/config.c:64

4654 +msgid "get value specific for the URL: section[.var] URL"

4655 +msgstr "获得 URL 取值：section[.var] URL"

4656 +

4657 +#: builtin/config.c:65

4658 msgid "replace all matching variables: name value [value_regex]"

4659 msgstr "替换所有匹配的变量：name value [value_regex]"

4660

4484 -#: builtin/config.c:63

4661 +#: builtin/config.c:66

4662 msgid "add a new variable: name value"

4663 msgstr "添加一个新的变量：name value"

4664

4488 -#: builtin/config.c:64

4665 +#: builtin/config.c:67

4666 msgid "remove a variable: name [value-regex]"

4667 msgstr "删除一个变量：name [value-regex]"

4668

4492 -#: builtin/config.c:65

4669 +#: builtin/config.c:68

4670 msgid "remove all matches: name [value-regex]"

4671 msgstr "删除所有匹配项：name [value-regex]"

4672

4496 -#: builtin/config.c:66

4673 +#: builtin/config.c:69

4674 msgid "rename section: old-name new-name"

4675 msgstr "重命名小节：old-name new-name"

4676

4500 -#: builtin/config.c:67

4677 +#: builtin/config.c:70

4678 msgid "remove a section: name"

4679 msgstr "删除一个小节：name"

4680

4504 -#: builtin/config.c:68

4681 +#: builtin/config.c:71

4682 msgid "list all"

4683 msgstr "列出所有"

4684

4508 -#: builtin/config.c:69

4685 +#: builtin/config.c:72

4686 msgid "open an editor"

4687 msgstr "打开一个编辑器"

4688

4512 -#: builtin/config.c:70 builtin/config.c:71

4689 +#: builtin/config.c:73 builtin/config.c:74

4690 msgid "slot"

4691 msgstr "slot"

4692

4516 -#: builtin/config.c:70

4693 +#: builtin/config.c:73

4694 msgid "find the color configured: [default]"

4695 msgstr "找到配置的颜色：[默认]"

4696

4520 -#: builtin/config.c:71

4697 +#: builtin/config.c:74

4698 msgid "find the color setting: [stdout-is-tty]"

4699 msgstr "找到颜色设置：[stdout-is-tty]"

4700

4524 -#: builtin/config.c:72

4701 +#: builtin/config.c:75

4702 msgid "Type"

4703 msgstr "类型"

4704

4528 -#: builtin/config.c:73

4705 +#: builtin/config.c:76

4706 msgid "value is \"true\" or \"false\""

4707 msgstr "值是 \"true\" 或 \"false\""

4708

4532 -#: builtin/config.c:74

4709 +#: builtin/config.c:77

4710 msgid "value is decimal number"

4711 msgstr "值是十进制数"

4712

4536 -#: builtin/config.c:75

4713 +#: builtin/config.c:78

4714 msgid "value is --bool or --int"

4715 msgstr "值是 --bool or --int"

4716

4540 -#: builtin/config.c:76

4717 +#: builtin/config.c:79

4718 msgid "value is a path (file or directory name)"

4719 msgstr "值是一个路径（文件或目录名）"

4720

4544 -#: builtin/config.c:77

4721 +#: builtin/config.c:80

4722 msgid "Other"

4723 msgstr "其它"

4724

4548 -#: builtin/config.c:78

4725 +#: builtin/config.c:81

4726 msgid "terminate values with NUL byte"

4727 msgstr "终止值是NUL字节"

4728

4552 -#: builtin/config.c:79

4729 +#: builtin/config.c:82

4730 msgid "respect include directives on lookup"

4731 msgstr "查询时参照 include 指令递归查找"

4732

@@ -4734,45 +4911,45 @@ msgstr "提供了无法处理的对象 '%s'。"

4911 msgid "git fast-export [rev-list-opts]"

4912 msgstr "git fast-export [rev-list-opts]"

4913

4737 -#: builtin/fast-export.c:666

4914 +#: builtin/fast-export.c:673

4915 msgid "show progress after <n> objects"

4916 msgstr "在 <n> 个对象之后显示进度"

4917

4741 -#: builtin/fast-export.c:668

4918 +#: builtin/fast-export.c:675

4919 msgid "select handling of signed tags"

4920 msgstr "选择如何处理签名 tags"

4921

4745 -#: builtin/fast-export.c:671

4922 +#: builtin/fast-export.c:678

4923 msgid "select handling of tags that tag filtered objects"

4924 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"

4925

4749 -#: builtin/fast-export.c:674

4926 +#: builtin/fast-export.c:681

4927 msgid "Dump marks to this file"

4928 msgstr "把标记存储到这个文件"

4929

4753 -#: builtin/fast-export.c:676

4930 +#: builtin/fast-export.c:683

4931 msgid "Import marks from this file"

4932 msgstr "从这个文件导入标记"

4933

4757 -#: builtin/fast-export.c:678

4934 +#: builtin/fast-export.c:685

4935 msgid "Fake a tagger when tags lack one"

4936 msgstr "当 tags 缺少标记者字段时，假装提供一个"

4937

4761 -#: builtin/fast-export.c:680

4938 +#: builtin/fast-export.c:687

4939 msgid "Output full tree for each commit"

4940 msgstr "每次提交都输出整个树"

4941

4765 -#: builtin/fast-export.c:682

4942 +#: builtin/fast-export.c:689

4943 msgid "Use the done feature to terminate the stream"

4944 msgstr "使用 done 功能来终止流"

4945

4769 -#: builtin/fast-export.c:683

4946 +#: builtin/fast-export.c:690

4947 msgid "Skip output of blob data"

4948 msgstr "跳过数据对象的输出"

4949

4950 #: builtin/fetch.c:20

4951 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4775 -msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"

4952 +msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"

4953

4954 #: builtin/fetch.c:21

4955 msgid "git fetch [<options>] <group>"

@@ -4786,146 +4963,146 @@ msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"

4963 msgid "git fetch --all [<options>]"

4964 msgstr "git fetch --all [<选项>]"

4965

4789 -#: builtin/fetch.c:60

4966 +#: builtin/fetch.c:74

4967 msgid "fetch from all remotes"

4968 msgstr "从所有的远程抓取"

4969

4793 -#: builtin/fetch.c:62

4970 +#: builtin/fetch.c:76

4971 msgid "append to .git/FETCH_HEAD instead of overwriting"

4972 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

4973

4797 -#: builtin/fetch.c:64

4974 +#: builtin/fetch.c:78

4975 msgid "path to upload pack on remote end"

4976 msgstr "上传包到远程的路径"

4977

4801 -#: builtin/fetch.c:65

4978 +#: builtin/fetch.c:79

4979 msgid "force overwrite of local branch"

4980 msgstr "强制覆盖本地分支"

4981

4805 -#: builtin/fetch.c:67

4982 +#: builtin/fetch.c:81

4983 msgid "fetch from multiple remotes"

4984 msgstr "从多个远程抓取"

4985

4809 -#: builtin/fetch.c:69

4986 +#: builtin/fetch.c:83

4987 msgid "fetch all tags and associated objects"

4988 msgstr "抓取所有的 tags 和关联对象"

4989

4813 -#: builtin/fetch.c:71

4990 +#: builtin/fetch.c:85

4991 msgid "do not fetch all tags (--no-tags)"

4992 msgstr "不抓取任何 tags (--no-tags)"

4993

4817 -#: builtin/fetch.c:73

4994 +#: builtin/fetch.c:87

4995 msgid "prune remote-tracking branches no longer on remote"

4996 msgstr "清除远程已经不存在的分支的跟踪分支"

4997

4998 # 译者：可选值，不能翻译

4822 -#: builtin/fetch.c:74

4999 +#: builtin/fetch.c:88

5000 msgid "on-demand"

5001 msgstr "on-demand"

5002

4826 -#: builtin/fetch.c:75

5003 +#: builtin/fetch.c:89

5004 msgid "control recursive fetching of submodules"

5005 msgstr "控制子模组的递归抓取"

5006

4830 -#: builtin/fetch.c:79

5007 +#: builtin/fetch.c:93

5008 msgid "keep downloaded pack"

5009 msgstr "保持下载包"

5010

4834 -#: builtin/fetch.c:81

5011 +#: builtin/fetch.c:95

5012 msgid "allow updating of HEAD ref"

5013 msgstr "允许更新 HEAD 引用"

5014

4838 -#: builtin/fetch.c:84

5015 +#: builtin/fetch.c:98

5016 msgid "deepen history of shallow clone"

5017 msgstr "深化浅克隆的历史"

5018

4842 -#: builtin/fetch.c:86

5019 +#: builtin/fetch.c:100

5020 msgid "convert to a complete repository"

5021 msgstr "转换为一个完整的版本库"

5022

4846 -#: builtin/fetch.c:88 builtin/log.c:1177

5023 +#: builtin/fetch.c:102 builtin/log.c:1197

5024 msgid "dir"

5025 msgstr "目录"

5026

4850 -#: builtin/fetch.c:89

5027 +#: builtin/fetch.c:103

5028 msgid "prepend this to submodule path output"

5029 msgstr "在子模组路径输出的前面加上此目录"

5030

4854 -#: builtin/fetch.c:92

5031 +#: builtin/fetch.c:106

5032 msgid "default mode for recursion"

5033 msgstr "递归的默认模式"

5034

4858 -#: builtin/fetch.c:220

5035 +#: builtin/fetch.c:236

5036 msgid "Couldn't find remote ref HEAD"

5037 msgstr "无法发现远程 HEAD 引用"

5038

4862 -#: builtin/fetch.c:273

5039 +#: builtin/fetch.c:290

5040 #, c-format

5041 msgid "object %s not found"

5042 msgstr "对象 %s 未发现"

5043

4867 -#: builtin/fetch.c:278

5044 +#: builtin/fetch.c:295

5045 msgid "[up to date]"

5046 msgstr "[最新]"

5047

4871 -#: builtin/fetch.c:292

5048 +#: builtin/fetch.c:309

5049 #, c-format

5050 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5051 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

5052

4876 -#: builtin/fetch.c:293 builtin/fetch.c:379

5053 +#: builtin/fetch.c:310 builtin/fetch.c:396

5054 msgid "[rejected]"

5055 msgstr "[已拒绝]"

5056

4880 -#: builtin/fetch.c:304

5057 +#: builtin/fetch.c:321

5058 msgid "[tag update]"

5059 msgstr "[tag更新]"

5060

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

4885 -#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359

5062 +#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376

5063 msgid " (unable to update local ref)"

5064 msgstr " （不能更新本地引用）"

5065

4889 -#: builtin/fetch.c:324

5066 +#: builtin/fetch.c:341

5067 msgid "[new tag]"

5068 msgstr "[新tag]"

5069

4893 -#: builtin/fetch.c:327

5070 +#: builtin/fetch.c:344

5071 msgid "[new branch]"

5072 msgstr "[新分支]"

5073

4897 -#: builtin/fetch.c:330

5074 +#: builtin/fetch.c:347

5075 msgid "[new ref]"

5076 msgstr "[新引用]"

5077

4901 -#: builtin/fetch.c:375

5078 +#: builtin/fetch.c:392

5079 msgid "unable to update local ref"

5080 msgstr "不能更新本地引用"

5081

4905 -#: builtin/fetch.c:375

5082 +#: builtin/fetch.c:392

5083 msgid "forced update"

5084 msgstr "强制更新"

5085

4909 -#: builtin/fetch.c:381

5086 +#: builtin/fetch.c:398

5087 msgid "(non-fast-forward)"

5088 msgstr "（非快进式）"

5089

4913 -#: builtin/fetch.c:412 builtin/fetch.c:718

5090 +#: builtin/fetch.c:429 builtin/fetch.c:735

5091 #, c-format

5092 msgid "cannot open %s: %s\n"

5093 msgstr "无法打开 %s：%s\n"

5094

4918 -#: builtin/fetch.c:421

5095 +#: builtin/fetch.c:438

5096 #, c-format

5097 msgid "%s did not send all necessary objects\n"

5098 msgstr "%s 未发送所有必须的对象\n"

5099

4923 -#: builtin/fetch.c:520

5100 +#: builtin/fetch.c:537

5101 #, c-format

5102 msgid "From %.*s\n"

5103 msgstr "来自 %.*s\n"

5104

4928 -#: builtin/fetch.c:531

5105 +#: builtin/fetch.c:548

5106 #, c-format

5107 msgid ""

5108 "some local refs could not be updated; try running\n"

@@ -4935,98 +5112,98 @@ msgstr ""

5112 " 'git remote prune %s' 来删除旧的、有冲突的分支"

5113

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

4938 -#: builtin/fetch.c:581

5115 +#: builtin/fetch.c:598

5116 #, c-format

5117 msgid " (%s will become dangling)"

5118 msgstr " （%s 将成为摇摆状态）"

5119

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

4944 -#: builtin/fetch.c:582

5121 +#: builtin/fetch.c:599

5122 #, c-format

5123 msgid " (%s has become dangling)"

5124 msgstr " （%s 已成为摇摆状态）"

5125

4949 -#: builtin/fetch.c:589

5126 +#: builtin/fetch.c:606

5127 msgid "[deleted]"

5128 msgstr "[已删除]"

5129

4953 -#: builtin/fetch.c:590 builtin/remote.c:1055

5130 +#: builtin/fetch.c:607 builtin/remote.c:1055

5131 msgid "(none)"

5132 msgstr "（无）"

5133

4957 -#: builtin/fetch.c:708

5134 +#: builtin/fetch.c:725

5135 #, c-format

5136 msgid "Refusing to fetch into current branch %s of non-bare repository"

5137 msgstr "拒绝获取到非裸版本库的当前分支 %s"

5138

4962 -#: builtin/fetch.c:742

4963 -#, c-format

4964 -msgid "Don't know how to fetch from %s"

4965 -msgstr "不知道如何从 %s 获取"

4966 -

4967 -#: builtin/fetch.c:823

5139 +#: builtin/fetch.c:744

5140 #, c-format

5141 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5142 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

5143

4972 -#: builtin/fetch.c:826

5144 +#: builtin/fetch.c:747

5145 #, c-format

5146 msgid "Option \"%s\" is ignored for %s\n"

5147 msgstr "选项 \"%s\" 为 %s 所忽略\n"

5148

4977 -#: builtin/fetch.c:928

5149 +#: builtin/fetch.c:801

5150 +#, c-format

5151 +msgid "Don't know how to fetch from %s"

5152 +msgstr "不知道如何从 %s 获取"

5153 +

5154 +#: builtin/fetch.c:976

5155 #, c-format

5156 msgid "Fetching %s\n"

5157 msgstr "正在获取 %s\n"

5158

4982 -#: builtin/fetch.c:930 builtin/remote.c:100

5159 +#: builtin/fetch.c:978 builtin/remote.c:100

5160 #, c-format

5161 msgid "Could not fetch %s"

5162 msgstr "不能获取 %s"

5163

4987 -#: builtin/fetch.c:949

5164 +#: builtin/fetch.c:997

5165 msgid ""

5166 "No remote repository specified. Please, specify either a URL or a\n"

5167 "remote name from which new revisions should be fetched."

5168 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

5169

4993 -#: builtin/fetch.c:969

5170 +#: builtin/fetch.c:1020

5171 msgid "You need to specify a tag name."

5172 msgstr "您需要指定一个 tag 名称。"

5173

4997 -#: builtin/fetch.c:1015

5174 +#: builtin/fetch.c:1068

5175 msgid "--depth and --unshallow cannot be used together"

5176 msgstr "--depth 和 --unshallow 不能同时使用"

5177

5001 -#: builtin/fetch.c:1017

5178 +#: builtin/fetch.c:1070

5179 msgid "--unshallow on a complete repository does not make sense"

5180 msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"

5181

5005 -#: builtin/fetch.c:1036

5182 +#: builtin/fetch.c:1089

5183 msgid "fetch --all does not take a repository argument"

5184 msgstr "fetch --all 不能带一个版本库参数"

5185

5009 -#: builtin/fetch.c:1038

5186 +#: builtin/fetch.c:1091

5187 msgid "fetch --all does not make sense with refspecs"

5011 -msgstr "fetch --all 带引用表达式没有任何意义"

5188 +msgstr "fetch --all 带引用规则没有任何意义"

5189

5013 -#: builtin/fetch.c:1049

5190 +#: builtin/fetch.c:1102

5191 #, c-format

5192 msgid "No such remote or remote group: %s"

5193 msgstr "没有这样的远程或远程组：%s"

5194

5018 -#: builtin/fetch.c:1057

5195 +#: builtin/fetch.c:1110

5196 msgid "Fetching a group and specifying refspecs does not make sense"

5020 -msgstr "获取组并指定引用表达式没有意义"

5197 +msgstr "获取组并指定引用规则没有意义"

5198

5199 #: builtin/fmt-merge-msg.c:13

5200 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5201 msgstr ""

5202 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5203

5027 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5028 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179

5029 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243

5204 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5205 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178

5206 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245

5207 msgid "n"

5208 msgstr "n"

5209

@@ -5050,117 +5227,121 @@ msgstr "使用 <文本> 作为提交说明的开始"

5227 msgid "file to read from"

5228 msgstr "从文件中读取"

5229

5053 -#: builtin/for-each-ref.c:979

5230 +#: builtin/for-each-ref.c:995

5231 msgid "git for-each-ref [options] [<pattern>]"

5232 msgstr "git for-each-ref [选项] [<模式>]"

5233

5057 -#: builtin/for-each-ref.c:994

5234 +#: builtin/for-each-ref.c:1010

5235 msgid "quote placeholders suitably for shells"

5236 msgstr "引用占位符适用于 shells"

5237

5061 -#: builtin/for-each-ref.c:996

5238 +#: builtin/for-each-ref.c:1012

5239 msgid "quote placeholders suitably for perl"

5240 msgstr "引用占位符适用于 perl"

5241

5065 -#: builtin/for-each-ref.c:998

5242 +#: builtin/for-each-ref.c:1014

5243 msgid "quote placeholders suitably for python"

5244 msgstr "引用占位符适用于 python"

5245

5069 -#: builtin/for-each-ref.c:1000

5246 +#: builtin/for-each-ref.c:1016

5247 msgid "quote placeholders suitably for tcl"

5248 msgstr "引用占位符适用于 tcl"

5249

5073 -#: builtin/for-each-ref.c:1003

5250 +#: builtin/for-each-ref.c:1019

5251 msgid "show only <n> matched refs"

5252 msgstr "只显示 <n> 个匹配的引用"

5253

5077 -#: builtin/for-each-ref.c:1004

5254 +#: builtin/for-each-ref.c:1020

5255 msgid "format"

5256 msgstr "格式"

5257

5081 -#: builtin/for-each-ref.c:1004

5258 +#: builtin/for-each-ref.c:1020

5259 msgid "format to use for the output"

5260 msgstr "输出格式"

5261

5085 -#: builtin/for-each-ref.c:1005

5262 +#: builtin/for-each-ref.c:1021

5263 msgid "key"

5264 msgstr "key"

5265

5089 -#: builtin/for-each-ref.c:1006

5266 +#: builtin/for-each-ref.c:1022

5267 msgid "field name to sort on"

5268 msgstr "排序的字段名"

5269

5093 -#: builtin/fsck.c:608

5270 +#: builtin/fsck.c:607

5271 msgid "git fsck [options] [<object>...]"

5272 msgstr "git fsck [选项] [<对象>...]"

5273

5097 -#: builtin/fsck.c:614

5274 +#: builtin/fsck.c:613

5275 msgid "show unreachable objects"

5276 msgstr "显示不可达的对象"

5277

5101 -#: builtin/fsck.c:615

5278 +#: builtin/fsck.c:614

5279 msgid "show dangling objects"

5280 msgstr "显示摇摆的对象"

5281

5105 -#: builtin/fsck.c:616

5282 +#: builtin/fsck.c:615

5283 msgid "report tags"

5284 msgstr "报告 tags"

5285

5109 -#: builtin/fsck.c:617

5286 +#: builtin/fsck.c:616

5287 msgid "report root nodes"

5288 msgstr "报告根节点"

5289

5113 -#: builtin/fsck.c:618

5290 +#: builtin/fsck.c:617

5291 msgid "make index objects head nodes"

5292 msgstr "将索引亦作为检查的头节点"

5293

5117 -#: builtin/fsck.c:619

5294 +#: builtin/fsck.c:618

5295 msgid "make reflogs head nodes (default)"

5296 msgstr "将引用日志作为检查的头节点（默认）"

5297

5121 -#: builtin/fsck.c:620

5298 +#: builtin/fsck.c:619

5299 msgid "also consider packs and alternate objects"

5300 msgstr "也考虑包和备用对象"

5301

5125 -#: builtin/fsck.c:621

5302 +#: builtin/fsck.c:620

5303 msgid "enable more strict checking"

5304 msgstr "启用更严格的检查"

5305

5129 -#: builtin/fsck.c:623

5306 +#: builtin/fsck.c:622

5307 msgid "write dangling objects in .git/lost-found"

5308 msgstr "将摇摆对象写入 .git/lost-found 中"

5309

5133 -#: builtin/fsck.c:624 builtin/prune.c:134

5310 +#: builtin/fsck.c:623 builtin/prune.c:134

5311 msgid "show progress"

5312 msgstr "显示进度"

5313

5137 -#: builtin/gc.c:22

5314 +#: builtin/gc.c:23

5315 msgid "git gc [options]"

5316 msgstr "git gc [选项]"

5317

5141 -#: builtin/gc.c:63

5318 +#: builtin/gc.c:79

5319 #, c-format

5320 msgid "Invalid %s: '%s'"

5321 msgstr "无效的 %s：'%s'"

5322

5146 -#: builtin/gc.c:90

5323 +#: builtin/gc.c:106

5324 #, c-format

5325 msgid "insanely long object directory %.*s"

5326 msgstr "不正常的长对象目录 %.*s"

5327

5151 -#: builtin/gc.c:179

5328 +#: builtin/gc.c:261

5329 msgid "prune unreferenced objects"

5330 msgstr "清除未引用的对象"

5331

5155 -#: builtin/gc.c:181

5332 +#: builtin/gc.c:263

5333 msgid "be more thorough (increased runtime)"

5334 msgstr "更彻底（增加运行时间）"

5335

5159 -#: builtin/gc.c:182

5336 +#: builtin/gc.c:264

5337 msgid "enable auto-gc mode"

5338 msgstr "启用自动垃圾回收模式"

5339

5163 -#: builtin/gc.c:222

5340 +#: builtin/gc.c:265

5341 +msgid "force running gc even if there may be another gc running"

5342 +msgstr "强制执行 gc 即使另外一个 gc 正在执行"

5343 +

5344 +#: builtin/gc.c:305

5345 #, c-format

5346 msgid ""

5347 "Auto packing the repository for optimum performance. You may also\n"

@@ -5169,41 +5350,49 @@ msgstr ""

5350 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"

5351 "参见 \"git help gc\" 以获取更多信息。\n"

5352

5172 -#: builtin/gc.c:249

5353 +#. be quiet on --auto

5354 +#: builtin/gc.c:315

5355 +#, c-format

5356 +msgid ""

5357 +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5358 +msgstr ""

5359 +"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"

5360 +

5361 +#: builtin/gc.c:340

5362 msgid ""

5363 "There are too many unreachable loose objects; run 'git prune' to remove them."

5364 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

5365

5177 -#: builtin/grep.c:22

5366 +#: builtin/grep.c:23

5367 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

5368 msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"

5369

5181 -#: builtin/grep.c:217

5370 +#: builtin/grep.c:218

5371 #, c-format

5372 msgid "grep: failed to create thread: %s"

5373 msgstr "grep：无法创建线程：%s"

5374

5186 -#: builtin/grep.c:364

5375 +#: builtin/grep.c:365

5376 #, c-format

5377 msgid "Failed to chdir: %s"

5378 msgstr "无法切换目录：%s"

5379

5191 -#: builtin/grep.c:442 builtin/grep.c:477

5380 +#: builtin/grep.c:443 builtin/grep.c:478

5381 #, c-format

5382 msgid "unable to read tree (%s)"

5383 msgstr "无法读取树（%s）"

5384

5196 -#: builtin/grep.c:492

5385 +#: builtin/grep.c:493

5386 #, c-format

5387 msgid "unable to grep from object of type %s"

5388 msgstr "无法抓取来自于 %s 类型的对象"

5389

5201 -#: builtin/grep.c:550

5390 +#: builtin/grep.c:551

5391 #, c-format

5392 msgid "switch `%c' expects a numerical value"

5393 msgstr "开关 `%c' 期望一个数字值"

5394

5206 -#: builtin/grep.c:567

5395 +#: builtin/grep.c:568

5396 #, c-format

5397 msgid "cannot open '%s'"

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

@@ -5246,158 +5435,162 @@ msgid "don't match patterns in binary files"

5435 msgstr "不在二进制文件中匹配模式"

5436

5437 #: builtin/grep.c:662

5438 +msgid "process binary files with textconv filters"

5439 +msgstr "用 textconv 过滤器处理二进制文件"

5440 +

5441 +#: builtin/grep.c:664

5442 msgid "descend at most <depth> levels"

5443 msgstr "最多以指定的深度向下寻找"

5444

5252 -#: builtin/grep.c:666

5445 +#: builtin/grep.c:668

5446 msgid "use extended POSIX regular expressions"

5447 msgstr "使用扩展的 POSIX 正则表达式"

5448

5256 -#: builtin/grep.c:669

5449 +#: builtin/grep.c:671

5450 msgid "use basic POSIX regular expressions (default)"

5451 msgstr "使用基本的 POSIX 正则表达式（默认）"

5452

5260 -#: builtin/grep.c:672

5453 +#: builtin/grep.c:674

5454 msgid "interpret patterns as fixed strings"

5455 msgstr "把模式解析为固定的字符串"

5456

5264 -#: builtin/grep.c:675

5457 +#: builtin/grep.c:677

5458 msgid "use Perl-compatible regular expressions"

5459 msgstr "使用 Perl 兼容的正则表达式"

5460

5268 -#: builtin/grep.c:678

5461 +#: builtin/grep.c:680

5462 msgid "show line numbers"

5463 msgstr "显示行号"

5464

5272 -#: builtin/grep.c:679

5465 +#: builtin/grep.c:681

5466 msgid "don't show filenames"

5467 msgstr "不显示文件名"

5468

5276 -#: builtin/grep.c:680

5469 +#: builtin/grep.c:682

5470 msgid "show filenames"

5471 msgstr "显示文件名"

5472

5280 -#: builtin/grep.c:682

5473 +#: builtin/grep.c:684

5474 msgid "show filenames relative to top directory"

5475 msgstr "显示相对于顶级目录的文件名"

5476

5284 -#: builtin/grep.c:684

5477 +#: builtin/grep.c:686

5478 msgid "show only filenames instead of matching lines"

5479 msgstr "只显示文件名而不显示匹配的行"

5480

5288 -#: builtin/grep.c:686

5481 +#: builtin/grep.c:688

5482 msgid "synonym for --files-with-matches"

5483 msgstr "和 --files-with-matches 同义"

5484

5292 -#: builtin/grep.c:689

5485 +#: builtin/grep.c:691

5486 msgid "show only the names of files without match"

5487 msgstr "只显示未匹配的文件名"

5488

5296 -#: builtin/grep.c:691

5489 +#: builtin/grep.c:693

5490 msgid "print NUL after filenames"

5491 msgstr "在文件名后输出 NUL 字符"

5492

5300 -#: builtin/grep.c:693

5493 +#: builtin/grep.c:695

5494 msgid "show the number of matches instead of matching lines"

5495 msgstr "显示总匹配行数，而不显示匹配的行"

5496

5304 -#: builtin/grep.c:694

5497 +#: builtin/grep.c:696

5498 msgid "highlight matches"

5499 msgstr "高亮显示匹配项"

5500

5308 -#: builtin/grep.c:696

5501 +#: builtin/grep.c:698

5502 msgid "print empty line between matches from different files"

5503 msgstr "在不同文件的匹配项之间打印空行"

5504

5312 -#: builtin/grep.c:698

5505 +#: builtin/grep.c:700

5506 msgid "show filename only once above matches from same file"

5507 msgstr "只在同一文件的匹配项的上面显示一次文件名"

5508

5316 -#: builtin/grep.c:701

5509 +#: builtin/grep.c:703

5510 msgid "show <n> context lines before and after matches"

5511 msgstr "显示匹配项前后的 <n> 行上下文"

5512

5320 -#: builtin/grep.c:704

5513 +#: builtin/grep.c:706

5514 msgid "show <n> context lines before matches"

5515 msgstr "显示匹配项前 <n> 行上下文"

5516

5324 -#: builtin/grep.c:706

5517 +#: builtin/grep.c:708

5518 msgid "show <n> context lines after matches"

5519 msgstr "显示匹配项后 <n> 行上下文"

5520

5328 -#: builtin/grep.c:707

5521 +#: builtin/grep.c:709

5522 msgid "shortcut for -C NUM"

5523 msgstr "快捷键 -C 数字"

5524

5332 -#: builtin/grep.c:710

5525 +#: builtin/grep.c:712

5526 msgid "show a line with the function name before matches"

5527 msgstr "在匹配的前面显示一行函数名"

5528

5336 -#: builtin/grep.c:712

5529 +#: builtin/grep.c:714

5530 msgid "show the surrounding function"

5531 msgstr "显示所在函数的前后内容"

5532

5340 -#: builtin/grep.c:715

5533 +#: builtin/grep.c:717

5534 msgid "read patterns from file"

5535 msgstr "从文件读取模式"

5536

5344 -#: builtin/grep.c:717

5537 +#: builtin/grep.c:719

5538 msgid "match <pattern>"

5539 msgstr "匹配 <模式>"

5540

5348 -#: builtin/grep.c:719

5541 +#: builtin/grep.c:721

5542 msgid "combine patterns specified with -e"

5543 msgstr "组合用 -e 参数设定的模式"

5544

5352 -#: builtin/grep.c:731

5545 +#: builtin/grep.c:733

5546 msgid "indicate hit with exit status without output"

5547 msgstr "不输出，而用退出码标识命中状态"

5548

5356 -#: builtin/grep.c:733

5549 +#: builtin/grep.c:735

5550 msgid "show only matches from files that match all patterns"

5551 msgstr "只显示匹配所有模式的文件中的匹配"

5552

5360 -#: builtin/grep.c:735

5553 +#: builtin/grep.c:737

5554 msgid "show parse tree for grep expression"

5555 msgstr "显示 grep 表达式的解析树"

5556

5364 -#: builtin/grep.c:739

5557 +#: builtin/grep.c:741

5558 msgid "pager"

5559 msgstr "分页"

5560

5368 -#: builtin/grep.c:739

5561 +#: builtin/grep.c:741

5562 msgid "show matching files in the pager"

5563 msgstr "分页显示匹配的文件"

5564

5372 -#: builtin/grep.c:742

5565 +#: builtin/grep.c:744

5566 msgid "allow calling of grep(1) (ignored by this build)"

5567 msgstr "允许调用 grep(1)（本次构建忽略）"

5568

5376 -#: builtin/grep.c:743 builtin/show-ref.c:188

5569 +#: builtin/grep.c:745 builtin/show-ref.c:187

5570 msgid "show usage"

5571 msgstr "显示用法"

5572

5380 -#: builtin/grep.c:810

5573 +#: builtin/grep.c:812

5574 msgid "no pattern given."

5575 msgstr "未提供模式匹配。"

5576

5384 -#: builtin/grep.c:865

5577 +#: builtin/grep.c:870

5578 msgid "--open-files-in-pager only works on the worktree"

5579 msgstr "--open-files-in-pager 仅用于工作区"

5580

5388 -#: builtin/grep.c:888

5581 +#: builtin/grep.c:893

5582 msgid "--cached or --untracked cannot be used with --no-index."

5583 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

5584

5392 -#: builtin/grep.c:893

5585 +#: builtin/grep.c:898

5586 msgid "--no-index or --untracked cannot be used with revs."

5587 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

5588

5396 -#: builtin/grep.c:896

5589 +#: builtin/grep.c:901

5590 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5591 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

5592

5400 -#: builtin/grep.c:904

5593 +#: builtin/grep.c:909

5594 msgid "both --cached and trees are given."

5595 msgstr "同时给出了 --cached 和树对象。"

5596

@@ -5652,8 +5845,8 @@ msgstr "解压缩严重的不一致"

5845 msgid "SHA1 COLLISION FOUND WITH %s !"

5846 msgstr "发现 %s 出现 SHA1 冲突！"

5847

5655 -#: builtin/index-pack.c:669 builtin/pack-objects.c:170

5656 -#: builtin/pack-objects.c:262

5848 +#: builtin/index-pack.c:669 builtin/pack-objects.c:171

5849 +#: builtin/pack-objects.c:263

5850 #, c-format

5851 msgid "unable to read %s"

5852 msgstr "不能读 %s"

@@ -5682,155 +5875,155 @@ msgstr "对象中出错"

5875 msgid "Not all child objects of %s are reachable"

5876 msgstr "%s 的所有子对象并非都可达"

5877

5685 -#: builtin/index-pack.c:838 builtin/index-pack.c:868

5878 +#: builtin/index-pack.c:839 builtin/index-pack.c:869

5879 msgid "failed to apply delta"

5880 msgstr "无法应用 delta"

5881

5689 -#: builtin/index-pack.c:1009

5882 +#: builtin/index-pack.c:1010

5883 msgid "Receiving objects"

5884 msgstr "接收对象中"

5885

5693 -#: builtin/index-pack.c:1009

5886 +#: builtin/index-pack.c:1010

5887 msgid "Indexing objects"

5888 msgstr "索引对象中"

5889

5697 -#: builtin/index-pack.c:1035

5890 +#: builtin/index-pack.c:1036

5891 msgid "pack is corrupted (SHA1 mismatch)"

5892 msgstr "包冲突（SHA1 不匹配）"

5893

5701 -#: builtin/index-pack.c:1040

5894 +#: builtin/index-pack.c:1041

5895 msgid "cannot fstat packfile"

5896 msgstr "不能枚举包文件状态"

5897

5705 -#: builtin/index-pack.c:1043

5898 +#: builtin/index-pack.c:1044

5899 msgid "pack has junk at the end"

5900 msgstr "包的结尾有垃圾数据"

5901

5709 -#: builtin/index-pack.c:1054

5902 +#: builtin/index-pack.c:1055

5903 msgid "confusion beyond insanity in parse_pack_objects()"

5904 msgstr "parse_pack_objects() 中遇到不可理喻的问题"

5905

5713 -#: builtin/index-pack.c:1077

5906 +#: builtin/index-pack.c:1078

5907 msgid "Resolving deltas"

5908 msgstr "处理 delta 中"

5909

5717 -#: builtin/index-pack.c:1087

5910 +#: builtin/index-pack.c:1088

5911 #, c-format

5912 msgid "unable to create thread: %s"

5913 msgstr "不能创建线程：%s"

5914

5722 -#: builtin/index-pack.c:1129

5915 +#: builtin/index-pack.c:1130

5916 msgid "confusion beyond insanity"

5917 msgstr "不可理喻"

5918

5726 -#: builtin/index-pack.c:1137

5919 +#: builtin/index-pack.c:1138

5920 #, c-format

5921 msgid "completed with %d local objects"

5922 msgstr "完成 %d 个本地对象"

5923

5731 -#: builtin/index-pack.c:1147

5924 +#: builtin/index-pack.c:1148

5925 #, c-format

5926 msgid "Unexpected tail checksum for %s (disk corruption?)"

5927 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"

5928

5736 -#: builtin/index-pack.c:1151

5929 +#: builtin/index-pack.c:1152

5930 #, c-format

5931 msgid "pack has %d unresolved delta"

5932 msgid_plural "pack has %d unresolved deltas"

5933 msgstr[0] "包有 %d 个未解决的 delta"

5934 msgstr[1] "包有 %d 个未解决的 delta"

5935

5743 -#: builtin/index-pack.c:1176

5936 +#: builtin/index-pack.c:1177

5937 #, c-format

5938 msgid "unable to deflate appended object (%d)"

5939 msgstr "不能压缩附加对象（%d）"

5940

5748 -#: builtin/index-pack.c:1255

5941 +#: builtin/index-pack.c:1256

5942 #, c-format

5943 msgid "local object %s is corrupt"

5944 msgstr "本地对象 %s 已损坏"

5945

5753 -#: builtin/index-pack.c:1279

5946 +#: builtin/index-pack.c:1280

5947 msgid "error while closing pack file"

5948 msgstr "关闭包文件时出错"

5949

5757 -#: builtin/index-pack.c:1292

5950 +#: builtin/index-pack.c:1293

5951 #, c-format

5952 msgid "cannot write keep file '%s'"

5953 msgstr "无法写保留文件 '%s'"

5954

5762 -#: builtin/index-pack.c:1300

5955 +#: builtin/index-pack.c:1301

5956 #, c-format

5957 msgid "cannot close written keep file '%s'"

5958 msgstr "无法关闭保留文件 '%s'"

5959

5767 -#: builtin/index-pack.c:1313

5960 +#: builtin/index-pack.c:1314

5961 msgid "cannot store pack file"

5962 msgstr "无法存储包文件"

5963

5771 -#: builtin/index-pack.c:1324

5964 +#: builtin/index-pack.c:1325

5965 msgid "cannot store index file"

5966 msgstr "无法存储索引文件"

5967

5775 -#: builtin/index-pack.c:1357

5968 +#: builtin/index-pack.c:1358

5969 #, c-format

5970 msgid "bad pack.indexversion=%<PRIu32>"

5971 msgstr "坏的 pack.indexversion=%<PRIu32>"

5972

5780 -#: builtin/index-pack.c:1363

5973 +#: builtin/index-pack.c:1364

5974 #, c-format

5975 msgid "invalid number of threads specified (%d)"

5976 msgstr "指定的线程数无效（%d）"

5977

5785 -#: builtin/index-pack.c:1367 builtin/index-pack.c:1545

5978 +#: builtin/index-pack.c:1368 builtin/index-pack.c:1546

5979 #, c-format

5980 msgid "no threads support, ignoring %s"

5981 msgstr "没有线程支持，忽略 %s"

5982

5790 -#: builtin/index-pack.c:1425

5983 +#: builtin/index-pack.c:1426

5984 #, c-format

5985 msgid "Cannot open existing pack file '%s'"

5986 msgstr "无法打开现存包文件 '%s'"

5987

5795 -#: builtin/index-pack.c:1427

5988 +#: builtin/index-pack.c:1428

5989 #, c-format

5990 msgid "Cannot open existing pack idx file for '%s'"

5991 msgstr "无法为 %s 打开包索引文件"

5992

5800 -#: builtin/index-pack.c:1474

5993 +#: builtin/index-pack.c:1475

5994 #, c-format

5995 msgid "non delta: %d object"

5996 msgid_plural "non delta: %d objects"

5997 msgstr[0] "非 delta：%d 个对象"

5998 msgstr[1] "非 delta：%d 个对象"

5999

5807 -#: builtin/index-pack.c:1481

6000 +#: builtin/index-pack.c:1482

6001 #, c-format

6002 msgid "chain length = %d: %lu object"

6003 msgid_plural "chain length = %d: %lu objects"

6004 msgstr[0] "链长 = %d: %lu 对象"

6005 msgstr[1] "链长 = %d: %lu 对象"

6006

5814 -#: builtin/index-pack.c:1509

6007 +#: builtin/index-pack.c:1510

6008 msgid "Cannot come back to cwd"

6009 msgstr "无法返回当前工作目录"

6010

5818 -#: builtin/index-pack.c:1557 builtin/index-pack.c:1560

5819 -#: builtin/index-pack.c:1572 builtin/index-pack.c:1576

6011 +#: builtin/index-pack.c:1558 builtin/index-pack.c:1561

6012 +#: builtin/index-pack.c:1573 builtin/index-pack.c:1577

6013 #, c-format

6014 msgid "bad %s"

6015 msgstr "错误选项 %s"

6016

5824 -#: builtin/index-pack.c:1590

6017 +#: builtin/index-pack.c:1591

6018 msgid "--fix-thin cannot be used without --stdin"

6019 msgstr "--fix-thin 不能和 --stdin 同时使用"

6020

5828 -#: builtin/index-pack.c:1594 builtin/index-pack.c:1604

6021 +#: builtin/index-pack.c:1595 builtin/index-pack.c:1605

6022 #, c-format

6023 msgid "packfile name '%s' does not end with '.pack'"

6024 msgstr "包名 '%s' 没有以 '.pack' 结尾"

6025

5833 -#: builtin/index-pack.c:1613

6026 +#: builtin/index-pack.c:1614

6027 msgid "--verify with no packfile name given"

6028 msgstr "--verify 没有提供包名参数"

6029

@@ -5919,11 +6112,6 @@ msgstr "不能处理 %d 类型的文件"

6112 msgid "unable to move %s to %s"

6113 msgstr "不能移动 %s 至 %s"

6114

5922 -#: builtin/init-db.c:363

5923 -#, c-format

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

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

5926 -

6115 #.

6116 #. * TRANSLATORS: The first '%s' is either "Reinitialized

6117 #. * existing" or "Initialized empty", the second " shared" or

@@ -5967,7 +6155,7 @@ msgstr "权限"

6155 msgid "specify that the git repository is to be shared amongst several users"

6156 msgstr "指定 git 版本库是多个用户之间共享的"

6157

5970 -#: builtin/init-db.c:493 builtin/prune-packed.c:75

6158 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155

6159 msgid "be quiet"

6160 msgstr "保持安静"

6161

@@ -6007,381 +6195,381 @@ msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"

6195 msgid " or: git show [options] <object>..."

6196 msgstr " 或者：git show [选项] <对象>..."

6197

6010 -#: builtin/log.c:124

6198 +#: builtin/log.c:125

6199 msgid "suppress diff output"

6200 msgstr "不显示差异输出"

6201

6014 -#: builtin/log.c:125

6202 +#: builtin/log.c:126

6203 msgid "show source"

6204 msgstr "显示源"

6205

6018 -#: builtin/log.c:126

6206 +#: builtin/log.c:127

6207 msgid "Use mail map file"

6208 msgstr "使用邮件映射文件"

6209

6022 -#: builtin/log.c:127

6210 +#: builtin/log.c:128

6211 msgid "decorate options"

6212 msgstr "修饰选项"

6213

6026 -#: builtin/log.c:230

6214 +#: builtin/log.c:231

6215 #, c-format

6216 msgid "Final output: %d %s\n"

6217 msgstr "最终输出：%d %s\n"

6218

6031 -#: builtin/log.c:453 builtin/log.c:545

6219 +#: builtin/log.c:473 builtin/log.c:565

6220 #, c-format

6221 msgid "Could not read object %s"

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

6223

6036 -#: builtin/log.c:569

6224 +#: builtin/log.c:589

6225 #, c-format

6226 msgid "Unknown type: %d"

6227 msgstr "未知类型：%d"

6228

6041 -#: builtin/log.c:669

6229 +#: builtin/log.c:689

6230 msgid "format.headers without value"

6231 msgstr "format.headers 没有值"

6232

6045 -#: builtin/log.c:751

6233 +#: builtin/log.c:771

6234 msgid "name of output directory is too long"

6235 msgstr "输出目录名太长"

6236

6049 -#: builtin/log.c:767

6237 +#: builtin/log.c:787

6238 #, c-format

6239 msgid "Cannot open patch file %s"

6240 msgstr "无法打开补丁文件 %s"

6241

6054 -#: builtin/log.c:781

6242 +#: builtin/log.c:801

6243 msgid "Need exactly one range."

6244 msgstr "只需要一个范围。"

6245

6058 -#: builtin/log.c:789

6246 +#: builtin/log.c:809

6247 msgid "Not a range."

6248 msgstr "不是一个范围。"

6249

6062 -#: builtin/log.c:891

6250 +#: builtin/log.c:911

6251 msgid "Cover letter needs email format"

6252 msgstr "信封需要邮件地址格式"

6253

6066 -#: builtin/log.c:967

6254 +#: builtin/log.c:987

6255 #, c-format

6256 msgid "insane in-reply-to: %s"

6257 msgstr "不正常的 in-reply-to：%s"

6258

6071 -#: builtin/log.c:995

6259 +#: builtin/log.c:1015

6260 msgid "git format-patch [options] [<since> | <revision range>]"

6261 msgstr "git format-patch [选项] [<从> | <修订集范围>]"

6262

6075 -#: builtin/log.c:1040

6263 +#: builtin/log.c:1060

6264 msgid "Two output directories?"

6265 msgstr "两个输出目录？"

6266

6079 -#: builtin/log.c:1155

6267 +#: builtin/log.c:1175

6268 msgid "use [PATCH n/m] even with a single patch"

6269 msgstr "使用 [PATCH n/m]，即使只有一个补丁"

6270

6083 -#: builtin/log.c:1158

6271 +#: builtin/log.c:1178

6272 msgid "use [PATCH] even with multiple patches"

6273 msgstr "使用 [PATCH]，即使有多个补丁"

6274

6087 -#: builtin/log.c:1162

6275 +#: builtin/log.c:1182

6276 msgid "print patches to standard out"

6277 msgstr "打印补丁到标准输出"

6278

6091 -#: builtin/log.c:1164

6279 +#: builtin/log.c:1184

6280 msgid "generate a cover letter"

6281 msgstr "生成一封附信"

6282

6095 -#: builtin/log.c:1166

6283 +#: builtin/log.c:1186

6284 msgid "use simple number sequence for output file names"

6285 msgstr "使用简单的数字序列作为输出文件名"

6286

6099 -#: builtin/log.c:1167

6287 +#: builtin/log.c:1187

6288 msgid "sfx"

6289 msgstr "后缀"

6290

6103 -#: builtin/log.c:1168

6291 +#: builtin/log.c:1188

6292 msgid "use <sfx> instead of '.patch'"

6293 msgstr "使用 <后缀> 代替 '.patch'"

6294

6107 -#: builtin/log.c:1170

6295 +#: builtin/log.c:1190

6296 msgid "start numbering patches at <n> instead of 1"

6297 msgstr "补丁以 <n> 开始编号，而不是1"

6298

6111 -#: builtin/log.c:1172

6299 +#: builtin/log.c:1192

6300 msgid "mark the series as Nth re-roll"

6301 msgstr "标记补丁系列是第几次重制"

6302

6115 -#: builtin/log.c:1174

6303 +#: builtin/log.c:1194

6304 msgid "Use [<prefix>] instead of [PATCH]"

6305 msgstr "使用 [<前缀>] 代替 [PATCH]"

6306

6119 -#: builtin/log.c:1177

6307 +#: builtin/log.c:1197

6308 msgid "store resulting files in <dir>"

6309 msgstr "把结果文件存储在 <dir>"

6310

6123 -#: builtin/log.c:1180

6311 +#: builtin/log.c:1200

6312 msgid "don't strip/add [PATCH]"

6313 msgstr "不删除/添加 [PATCH]"

6314

6127 -#: builtin/log.c:1183

6315 +#: builtin/log.c:1203

6316 msgid "don't output binary diffs"

6317 msgstr "不输出二进制差异"

6318

6131 -#: builtin/log.c:1185

6319 +#: builtin/log.c:1205

6320 msgid "don't include a patch matching a commit upstream"

6321 msgstr "不包含已在上游提交中的补丁"

6322

6135 -#: builtin/log.c:1187

6323 +#: builtin/log.c:1207

6324 msgid "show patch format instead of default (patch + stat)"

6325 msgstr "显示纯补丁格式而非默认的（补丁+状态）"

6326

6139 -#: builtin/log.c:1189

6327 +#: builtin/log.c:1209

6328 msgid "Messaging"

6329 msgstr "邮件发送"

6330

6143 -#: builtin/log.c:1190

6331 +#: builtin/log.c:1210

6332 msgid "header"

6333 msgstr "header"

6334

6147 -#: builtin/log.c:1191

6335 +#: builtin/log.c:1211

6336 msgid "add email header"

6337 msgstr "添加邮件头"

6338

6151 -#: builtin/log.c:1192 builtin/log.c:1194

6339 +#: builtin/log.c:1212 builtin/log.c:1214

6340 msgid "email"

6341 msgstr "邮件地址"

6342

6155 -#: builtin/log.c:1192

6343 +#: builtin/log.c:1212

6344 msgid "add To: header"

6345 msgstr "添加收件人"

6346

6159 -#: builtin/log.c:1194

6347 +#: builtin/log.c:1214

6348 msgid "add Cc: header"

6349 msgstr "添加抄送"

6350

6163 -#: builtin/log.c:1196

6351 +#: builtin/log.c:1216

6352 msgid "ident"

6353 msgstr "ident"

6354

6167 -#: builtin/log.c:1197

6355 +#: builtin/log.c:1217

6356 msgid "set From address to <ident> (or committer ident if absent)"

6357 msgstr "设置 From 地址为 <ident>（如若不提供，用提交者ID做为地址）"

6358

6171 -#: builtin/log.c:1199

6359 +#: builtin/log.c:1219

6360 msgid "message-id"

6361 msgstr "message-id"

6362

6175 -#: builtin/log.c:1200

6363 +#: builtin/log.c:1220

6364 msgid "make first mail a reply to <message-id>"

6365 msgstr "使第一封邮件作为对 <message-id> 的回复"

6366

6179 -#: builtin/log.c:1201 builtin/log.c:1204

6367 +#: builtin/log.c:1221 builtin/log.c:1224

6368 msgid "boundary"

6369 msgstr "边界"

6370

6183 -#: builtin/log.c:1202

6371 +#: builtin/log.c:1222

6372 msgid "attach the patch"

6373 msgstr "附件方式添加补丁"

6374

6187 -#: builtin/log.c:1205

6375 +#: builtin/log.c:1225

6376 msgid "inline the patch"

6377 msgstr "内联显示补丁"

6378

6191 -#: builtin/log.c:1209

6379 +#: builtin/log.c:1229

6380 msgid "enable message threading, styles: shallow, deep"

6381 msgstr "启用邮件线索，风格：浅，深"

6382

6195 -#: builtin/log.c:1211

6383 +#: builtin/log.c:1231

6384 msgid "signature"

6385 msgstr "签名"

6386

6199 -#: builtin/log.c:1212

6387 +#: builtin/log.c:1232

6388 msgid "add a signature"

6389 msgstr "添加一个签名"

6390

6203 -#: builtin/log.c:1214

6391 +#: builtin/log.c:1233

6392 msgid "don't print the patch filenames"

6393 msgstr "不要打印补丁文件名"

6394

6207 -#: builtin/log.c:1288

6395 +#: builtin/log.c:1307

6396 #, c-format

6397 msgid "invalid ident line: %s"

6398 msgstr "包含无效的身份标识：%s"

6399

6212 -#: builtin/log.c:1303

6400 +#: builtin/log.c:1322

l10n: zh_CN.po: translate 68 messages (2194t0f0u)