1b7f4a3454 · matheusbsbs/matheus-bagliano

@@ -134,8 +134,8 @@ msgid ""

134 msgstr ""

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

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

137 -"POT-Creation-Date: 2015-07-14 07:19+0800\n"

138 -"PO-Revision-Date: 2015-08-04 00:43+0800\n"

137 +"POT-Creation-Date: 2015-09-05 09:16+0800\n"

138 +"PO-Revision-Date: 2015-09-08 23:00+0800\n"

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

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

141 "Language: zh_CN\n"

@@ -157,94 +157,106 @@ msgstr ""

157 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"

158 "解决方案并提交。"

159

160 -#: archive.c:11

160 +#: advice.c:101 builtin/merge.c:1227

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

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

163 +

164 +#: advice.c:103

165 +msgid "Please, commit your changes before you can merge."

166 +msgstr "请在合并前先提交您的修改。"

167 +

168 +#: advice.c:104

169 +msgid "Exiting because of unfinished merge."

170 +msgstr "因为存在未完成的合并而退出。"

171 +

172 +#: archive.c:12

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

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

175

164 -#: archive.c:12

176 +#: archive.c:13

177 msgid "git archive --list"

178 msgstr "git archive --list"

179

168 -#: archive.c:13

180 +#: archive.c:14

181 msgid ""

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

183 msgstr ""

184 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"

185

174 -#: archive.c:14

186 +#: archive.c:15

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

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

189

178 -#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

190 +#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327

191 #, c-format

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

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

194

183 -#: archive.c:427

195 +#: archive.c:428

196 msgid "fmt"

197 msgstr "格式"

198

187 -#: archive.c:427

199 +#: archive.c:428

200 msgid "archive format"

201 msgstr "归档格式"

202

191 -#: archive.c:428 builtin/log.c:1204

203 +#: archive.c:429 builtin/log.c:1229

204 msgid "prefix"

205 msgstr "前缀"

206

195 -#: archive.c:429

207 +#: archive.c:430

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

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

210

199 -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

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

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

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

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

211 +#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516

212 +#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987

213 +#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99

214 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395

215 +#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153

216 msgid "file"

217 msgstr "文件"

218

207 -#: archive.c:431 builtin/archive.c:89

219 +#: archive.c:432 builtin/archive.c:89

220 msgid "write the archive to this file"

221 msgstr "归档写入此文件"

222

211 -#: archive.c:433

223 +#: archive.c:434

224 msgid "read .gitattributes in working directory"

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

226

215 -#: archive.c:434

227 +#: archive.c:435

228 msgid "report archived files on stderr"

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

230

219 -#: archive.c:435

231 +#: archive.c:436

232 msgid "store only"

233 msgstr "只存储"

234

223 -#: archive.c:436

235 +#: archive.c:437

236 msgid "compress faster"

237 msgstr "压缩速度更快"

238

227 -#: archive.c:444

239 +#: archive.c:445

240 msgid "compress better"

241 msgstr "压缩效果更好"

242

231 -#: archive.c:447

243 +#: archive.c:448

244 msgid "list supported archive formats"

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

246

235 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

247 +#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77

248 msgid "repo"

249 msgstr "仓库"

250

239 -#: archive.c:450 builtin/archive.c:91

251 +#: archive.c:451 builtin/archive.c:91

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

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

254

243 -#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478

255 +#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479

256 msgid "command"

257 msgstr "命令"

258

247 -#: archive.c:452 builtin/archive.c:93

259 +#: archive.c:453 builtin/archive.c:93

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

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

262

@@ -363,6 +375,11 @@ msgstr "歧义的对象名：'%s'。"

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

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

377

378 +#: branch.c:399

379 +#, c-format

380 +msgid "'%s' is already checked out at '%s'"

381 +msgstr "'%s' 已经检出到 '%s'"

382 +

383 #: bundle.c:34

384 #, c-format

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

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

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

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

392

376 -#: bundle.c:87 builtin/commit.c:766

393 +#: bundle.c:87 builtin/commit.c:765

394 #, c-format

395 msgid "could not open '%s'"

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

@@ -382,9 +399,9 @@ msgstr "不能打开 '%s'"

399 msgid "Repository lacks these prerequisite commits:"

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

401

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

386 -#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

387 -#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

402 +#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708

403 +#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334

404 +#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358

405 #: builtin/shortlog.c:158

406 msgid "revision walk setup failed"

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

@@ -407,38 +424,38 @@ msgid_plural "The bundle requires these %d refs:"

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

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

426

410 -#: bundle.c:251

427 +#: bundle.c:253

428 msgid "Could not spawn pack-objects"

429 msgstr "不能生成 pack-objects 进程"

430

414 -#: bundle.c:269

431 +#: bundle.c:264

432 msgid "pack-objects died"

433 msgstr "pack-objects 终止"

434

418 -#: bundle.c:309

435 +#: bundle.c:304

436 msgid "rev-list died"

437 msgstr "rev-list 终止"

438

422 -#: bundle.c:358

439 +#: bundle.c:353

440 #, c-format

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

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

443

427 -#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

444 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261

445 #, c-format

446 msgid "unrecognized argument: %s"

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

448

432 -#: bundle.c:443

449 +#: bundle.c:449

450 msgid "Refusing to create empty bundle."

451 msgstr "不能创建空包。"

452

436 -#: bundle.c:453

453 +#: bundle.c:459

454 #, c-format

455 msgid "cannot create '%s'"

456 msgstr "不能创建 '%s'"

457

441 -#: bundle.c:474

458 +#: bundle.c:480

459 msgid "index-pack died"

460 msgstr "index-pack 终止"

461

@@ -447,7 +464,8 @@ msgstr "index-pack 终止"

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

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

466

450 -#: commit.c:40

467 +#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489

468 +#: builtin/am.c:2101

469 #, c-format

470 msgid "could not parse %s"

471 msgstr "不能解析 %s"

@@ -606,23 +624,23 @@ msgid "Performing inexact rename detection"

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

625

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

609 -#: diff.c:114

627 +#: diff.c:116

628 #, c-format

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

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

631

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

615 -#: diff.c:119

633 +#: diff.c:121

634 #, c-format

635 msgid " Unknown dirstat parameter '%s'\n"

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

637

620 -#: diff.c:214

638 +#: diff.c:216

639 #, c-format

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

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

642

625 -#: diff.c:266

643 +#: diff.c:268

644 #, c-format

645 msgid ""

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

@@ -631,16 +649,16 @@ msgstr ""

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

650 "%s"

651

634 -#: diff.c:2997

652 +#: diff.c:2998

653 #, c-format

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

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

656

639 -#: diff.c:3393

657 +#: diff.c:3394

658 msgid "--follow requires exactly one pathspec"

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

660

643 -#: diff.c:3556

661 +#: diff.c:3557

662 #, c-format

663 msgid ""

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

@@ -649,37 +667,37 @@ msgstr ""

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

668 "%s"

669

652 -#: diff.c:3570

670 +#: diff.c:3571

671 #, c-format

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

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

674

657 -#: dir.c:1852

675 +#: dir.c:1853

676 msgid "failed to get kernel name and information"

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

678

661 -#: dir.c:1945

679 +#: dir.c:1936

680 msgid "Untracked cache is disabled on this system."

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

682

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

683 +#: gpg-interface.c:166 gpg-interface.c:237

684 msgid "could not run gpg."

685 msgstr "不能执行 gpg。"

686

669 -#: gpg-interface.c:141

687 +#: gpg-interface.c:178

688 msgid "gpg did not accept the data"

689 msgstr "gpg 没有接受数据"

690

673 -#: gpg-interface.c:152

691 +#: gpg-interface.c:189

692 msgid "gpg failed to sign the data"

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

694

677 -#: gpg-interface.c:185

695 +#: gpg-interface.c:222

696 #, c-format

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

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

699

682 -#: gpg-interface.c:188

700 +#: gpg-interface.c:225

701 #, c-format

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

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

@@ -763,20 +781,12 @@ msgstr[1] ""

781 msgid "%s: %s - %s"

782 msgstr "%s：%s - %s"

783

766 -#: lockfile.c:345

767 -msgid "BUG: reopen a lockfile that is still open"

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

769 -

770 -#: lockfile.c:347

771 -msgid "BUG: reopen a lockfile that has been committed"

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

773 -

784 #: merge.c:41

785 msgid "failed to read the cache"

786 msgstr "无法读取缓存"

787

778 -#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587

779 -#: builtin/clone.c:647

788 +#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375

789 +#: builtin/checkout.c:586 builtin/clone.c:715

790 msgid "unable to write new index file"

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

792

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

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

834 msgstr "%s '%s' 应为数据对象"

835

826 -#: merge-recursive.c:788 builtin/clone.c:306

836 +#: merge-recursive.c:788 builtin/clone.c:364

837 #, c-format

838 msgid "failed to open '%s'"

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

@@ -1036,19 +1046,19 @@ msgstr "不能写入索引。"

1046 msgid "Cannot commit uninitialized/unreferenced notes tree"

1047 msgstr "不能提交未初始化/未引用的注解树"

1048

1039 -#: notes-utils.c:82

1049 +#: notes-utils.c:100

1050 #, c-format

1051 msgid "Bad notes.rewriteMode value: '%s'"

1052 msgstr "坏的 notes.rewriteMode 值：'%s'"

1053

1044 -#: notes-utils.c:92

1054 +#: notes-utils.c:110

1055 #, c-format

1056 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

1057 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

1058

1059 #. TRANSLATORS: The first %s is the name of the

1060 #. environment variable, the second %s is its value

1051 -#: notes-utils.c:119

1061 +#: notes-utils.c:137

1062 #, c-format

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

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

@@ -1058,29 +1068,29 @@ msgstr "坏的 %s 值：'%s'"

1068 msgid "unable to parse object: %s"

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

1070

1061 -#: parse-options.c:546

1071 +#: parse-options.c:563

1072 msgid "..."

1073 msgstr "..."

1074

1065 -#: parse-options.c:564

1075 +#: parse-options.c:581

1076 #, c-format

1077 msgid "usage: %s"

1078 msgstr "用法：%s"

1079

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

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

1072 -#: parse-options.c:568

1082 +#: parse-options.c:585

1083 #, c-format

1084 msgid " or: %s"

1085 msgstr " 或：%s"

1086

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

1078 -#: parse-options.c:571

1088 +#: parse-options.c:588

1089 #, c-format

1090 msgid " %s"

1091 msgstr " %s"

1092

1083 -#: parse-options.c:605

1093 +#: parse-options.c:622

1094 msgid "-NUM"

1095 msgstr "-数字"

1096

@@ -1146,7 +1156,7 @@ msgstr ""

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

1157 "添加 ':/' 或 '.' ？"

1158

1149 -#: pretty.c:968

1159 +#: pretty.c:969

1160 msgid "unable to parse --pretty format"

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

1162

@@ -1154,7 +1164,7 @@ msgstr "不能解析 --pretty 格式"

1164 msgid "done"

1165 msgstr "完成"

1166

1157 -#: read-cache.c:1295

1167 +#: read-cache.c:1296

1168 #, c-format

1169 msgid ""

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

@@ -1163,7 +1173,7 @@ msgstr ""

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

1174 "使用版本 %i"

1175

1166 -#: read-cache.c:1305

1176 +#: read-cache.c:1306

1177 #, c-format

1178 msgid ""

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

@@ -1172,6 +1182,31 @@ msgstr ""

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

1183 "使用版本 %i"

1184

1185 +#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1186 +#: builtin/merge.c:983

1187 +#, c-format

1188 +msgid "Could not open '%s' for writing"

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

1190 +

1191 +#: refs.c:3001

1192 +#, c-format

1193 +msgid "could not delete reference %s: %s"

1194 +msgstr "无法删除引用 %s：%s"

1195 +

1196 +#: refs.c:3004

1197 +#, c-format

1198 +msgid "could not delete references: %s"

1199 +msgstr "无法删除引用：%s"

1200 +

1201 +#: refs.c:3013

1202 +#, c-format

1203 +msgid "could not remove reference %s"

1204 +msgstr "无法删除引用 %s"

1205 +

1206 +#: ref-filter.c:660

1207 +msgid "unable to parse format"

1208 +msgstr "不能解析格式"

1209 +

1210 #: remote.c:792

1211 #, c-format

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

@@ -1291,7 +1326,16 @@ msgstr[1] ""

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

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

1328

1294 -#: revision.c:2366

1329 +#: revision.c:2198

1330 +msgid "your current branch appears to be broken"

1331 +msgstr "您的当前分支好像被损坏"

1332 +

1333 +#: revision.c:2201

1334 +#, c-format

1335 +msgid "your current branch '%s' does not have any commits yet"

1336 +msgstr "您的当前分支 '%s' 尚无任何提交"

1337 +

1338 +#: revision.c:2395

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

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

1341

@@ -1304,31 +1348,25 @@ msgstr "不能打开 /dev/null"

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

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

1350

1307 -#: send-pack.c:272

1351 +#: send-pack.c:295

1352 msgid "failed to sign the push certificate"

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

1354

1311 -#: send-pack.c:378

1355 +#: send-pack.c:404

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

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

1358

1315 -#: send-pack.c:389

1359 +#: send-pack.c:406

1360 +msgid ""

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

1362 +"signed push"

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

1364 +

1365 +#: send-pack.c:418

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

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

1368

1319 -#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1320 -#: builtin/merge.c:983

1321 -#, c-format

1322 -msgid "Could not open '%s' for writing"

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

1324 -

1325 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1326 -#: builtin/merge.c:988

1327 -#, c-format

1328 -msgid "Could not write to '%s'"

1329 -msgstr "不能写入 '%s'"

1330 -

1331 -#: sequencer.c:195

1369 +#: sequencer.c:183

1370 msgid ""

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

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

@@ -1336,7 +1374,7 @@ msgstr ""

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

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

1376

1339 -#: sequencer.c:198

1377 +#: sequencer.c:186

1378 msgid ""

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

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

@@ -1345,220 +1383,220 @@ msgstr ""

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

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

1385

1348 -#: sequencer.c:211 sequencer.c:861 sequencer.c:944

1386 +#: sequencer.c:199 sequencer.c:842 sequencer.c:922

1387 #, c-format

1388 msgid "Could not write to %s"

1389 msgstr "不能写入 %s"

1390

1353 -#: sequencer.c:214

1391 +#: sequencer.c:202

1392 #, c-format

1393 msgid "Error wrapping up %s"

1394 msgstr "错误收尾 %s"

1395

1358 -#: sequencer.c:229

1396 +#: sequencer.c:217

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

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

1399

1362 -#: sequencer.c:231

1400 +#: sequencer.c:219

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

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

1403

1366 -#: sequencer.c:234

1404 +#: sequencer.c:222

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

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

1407

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

1371 -#: sequencer.c:321

1409 +#: sequencer.c:309

1410 #, c-format

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

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

1413

1376 -#: sequencer.c:339

1414 +#: sequencer.c:327

1415 msgid "Could not resolve HEAD commit\n"

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

1417

1380 -#: sequencer.c:359

1418 +#: sequencer.c:347

1419 msgid "Unable to update cache tree\n"

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

1421

1384 -#: sequencer.c:411

1422 +#: sequencer.c:399

1423 #, c-format

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

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

1426

1389 -#: sequencer.c:416

1427 +#: sequencer.c:404

1428 #, c-format

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

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

1431

1394 -#: sequencer.c:482

1432 +#: sequencer.c:469

1433 msgid "Your index file is unmerged."

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

1435

1398 -#: sequencer.c:501

1436 +#: sequencer.c:488

1437 #, c-format

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

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

1440

1403 -#: sequencer.c:509

1441 +#: sequencer.c:496

1442 #, c-format

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

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

1445

1408 -#: sequencer.c:513

1446 +#: sequencer.c:500

1447 #, c-format

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

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

1450

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

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

1415 -#: sequencer.c:526

1453 +#: sequencer.c:513

1454 #, c-format

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

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

1457

1420 -#: sequencer.c:530

1458 +#: sequencer.c:517

1459 #, c-format

1460 msgid "Cannot get commit message for %s"

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

1462

1425 -#: sequencer.c:616

1463 +#: sequencer.c:603

1464 #, c-format

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

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

1467

1430 -#: sequencer.c:617

1468 +#: sequencer.c:604

1469 #, c-format

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

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

1472

1435 -#: sequencer.c:653

1473 +#: sequencer.c:639

1474 msgid "empty commit set passed"

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

1476

1439 -#: sequencer.c:661

1477 +#: sequencer.c:647

1478 #, c-format

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

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

1481

1444 -#: sequencer.c:665

1482 +#: sequencer.c:651

1483 #, c-format

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

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

1486

1449 -#: sequencer.c:725

1487 +#: sequencer.c:711

1488 #, c-format

1489 msgid "Cannot %s during a %s"

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

1491

1454 -#: sequencer.c:747

1492 +#: sequencer.c:733

1493 #, c-format

1494 msgid "Could not parse line %d."

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

1496

1459 -#: sequencer.c:752

1497 +#: sequencer.c:738

1498 msgid "No commits parsed."

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

1500

1463 -#: sequencer.c:765

1501 +#: sequencer.c:750

1502 #, c-format

1503 msgid "Could not open %s"

1504 msgstr "不能打开 %s"

1505

1468 -#: sequencer.c:769

1506 +#: sequencer.c:754

1507 #, c-format

1508 msgid "Could not read %s."

1509 msgstr "不能读取 %s。"

1510

1473 -#: sequencer.c:776

1511 +#: sequencer.c:761

1512 #, c-format

1513 msgid "Unusable instruction sheet: %s"

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

1515

1478 -#: sequencer.c:806

1516 +#: sequencer.c:791

1517 #, c-format

1518 msgid "Invalid key: %s"

1519 msgstr "无效键名：%s"

1520

1483 -#: sequencer.c:809

1521 +#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49

1522 #, c-format

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

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

1525

1488 -#: sequencer.c:821

1526 +#: sequencer.c:804

1527 #, c-format

1528 msgid "Malformed options sheet: %s"

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

1530

1493 -#: sequencer.c:842

1531 +#: sequencer.c:823

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

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

1534

1497 -#: sequencer.c:843

1535 +#: sequencer.c:824

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

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

1538

1501 -#: sequencer.c:847

1539 +#: sequencer.c:828

1540 #, c-format

1541 msgid "Could not create sequencer directory %s"

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

1543

1506 -#: sequencer.c:863 sequencer.c:948

1544 +#: sequencer.c:844 sequencer.c:926

1545 #, c-format

1546 msgid "Error wrapping up %s."

1547 msgstr "错误收尾 %s。"

1548

1511 -#: sequencer.c:882 sequencer.c:1018

1549 +#: sequencer.c:863 sequencer.c:996

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

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

1552

1515 -#: sequencer.c:884

1553 +#: sequencer.c:865

1554 msgid "cannot resolve HEAD"

1555 msgstr "不能解析 HEAD"

1556

1519 -#: sequencer.c:886

1557 +#: sequencer.c:867

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

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

1560

1523 -#: sequencer.c:908 builtin/apply.c:4291

1561 +#: sequencer.c:887 builtin/apply.c:4291

1562 #, c-format

1563 msgid "cannot open %s: %s"

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

1565

1528 -#: sequencer.c:911

1566 +#: sequencer.c:890

1567 #, c-format

1568 msgid "cannot read %s: %s"

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

1570

1533 -#: sequencer.c:912

1571 +#: sequencer.c:891

1572 msgid "unexpected end of file"

1573 msgstr "意外的文件结束"

1574

1537 -#: sequencer.c:918

1575 +#: sequencer.c:897

1576 #, c-format

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

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

1579

1542 -#: sequencer.c:941

1580 +#: sequencer.c:919

1581 #, c-format

1582 msgid "Could not format %s."

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

1584

1547 -#: sequencer.c:1086

1585 +#: sequencer.c:1064

1586 #, c-format

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

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

1589

1552 -#: sequencer.c:1089

1590 +#: sequencer.c:1067

1591 #, c-format

1592 msgid "%s: bad revision"

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

1594

1557 -#: sequencer.c:1123

1595 +#: sequencer.c:1101

1596 msgid "Can't revert as initial commit"

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

1598

1561 -#: sequencer.c:1124

1599 +#: sequencer.c:1102

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

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

1602

@@ -1588,30 +1626,30 @@ msgstr ""

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

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

1628

1591 -#: submodule.c:64 submodule.c:98

1629 +#: submodule.c:61 submodule.c:95

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

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

1632

1595 -#: submodule.c:68 submodule.c:102

1633 +#: submodule.c:65 submodule.c:99

1634 #, c-format

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

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

1637

1600 -#: submodule.c:76

1638 +#: submodule.c:73

1639 #, c-format

1640 msgid "Could not update .gitmodules entry %s"

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

1642

1605 -#: submodule.c:109

1643 +#: submodule.c:106

1644 #, c-format

1645 msgid "Could not remove .gitmodules entry for %s"

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

1647

1610 -#: submodule.c:120

1648 +#: submodule.c:117

1649 msgid "staging updated .gitmodules failed"

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

1651

1614 -#: submodule.c:1115

1652 +#: submodule.c:1045

1653 #, c-format

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

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

@@ -1641,6 +1679,11 @@ msgstr "不能读取输入文件 '%s'"

1679 msgid "could not read from stdin"

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

1681

1682 +#: transport-helper.c:1025

1683 +#, c-format

1684 +msgid "Could not read ref %s"

1685 +msgstr "不能读取引用 %s"

1686 +

1687 #: unpack-trees.c:203

1688 msgid "Checking out files"

1689 msgstr "正在检出文件"

@@ -1674,203 +1717,219 @@ msgstr "无效的端口号"

1717 msgid "invalid '..' path segment"

1718 msgstr "无效的 '..' 路径片段"

1719

1677 -#: wrapper.c:523

1720 +#: wrapper.c:219 wrapper.c:362

1721 +#, c-format

1722 +msgid "could not open '%s' for reading and writing"

1723 +msgstr "无法打开 '%s' 进行读写"

1724 +

1725 +#: wrapper.c:221 wrapper.c:364

1726 +#, c-format

1727 +msgid "could not open '%s' for writing"

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

1729 +

1730 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1731 +#: builtin/merge.c:1076 builtin/pull.c:380

1732 +#, c-format

1733 +msgid "could not open '%s' for reading"

1734 +msgstr "无法打开 '%s' 进行读取"

1735 +

1736 +#: wrapper.c:579

1737 #, c-format

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

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

1740

1682 -#: wrapper.c:544

1741 +#: wrapper.c:600

1742 #, c-format

1743 msgid "unable to access '%s'"

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

1745

1687 -#: wrapper.c:555

1746 +#: wrapper.c:611

1747 #, c-format

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

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

1750

1692 -#: wrapper.c:556

1751 +#: wrapper.c:612

1752 msgid "no such user"

1753 msgstr "无此用户"

1754

1696 -#: wrapper.c:564

1755 +#: wrapper.c:620

1756 msgid "unable to get current working directory"

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

1758

1700 -#: wrapper.c:575

1759 +#: wrapper.c:631

1760 #, c-format

1761 msgid "could not open %s for writing"

1762 msgstr "不能写入 %s"

1763

1705 -#: wrapper.c:587

1764 +#: wrapper.c:642 builtin/am.c:424

1765 #, c-format

1766 msgid "could not write to %s"

1767 msgstr "不能写入 %s"

1768

1710 -#: wrapper.c:593

1769 +#: wrapper.c:648

1770 #, c-format

1771 msgid "could not close %s"

1772 msgstr "不能关闭 %s"

1773

1715 -#: wt-status.c:150

1774 +#: wt-status.c:149

1775 msgid "Unmerged paths:"

1776 msgstr "未合并的路径："

1777

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

1720 -#: wt-status.c:177 wt-status.c:204

1779 +#: wt-status.c:176 wt-status.c:203

1780 #, c-format

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

1782 msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"

1783

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

1726 -#: wt-status.c:179 wt-status.c:206

1785 +#: wt-status.c:178 wt-status.c:205

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

1787 msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"

1788

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

1731 -#: wt-status.c:183

1790 +#: wt-status.c:182

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

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

1793

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

1736 -#: wt-status.c:185 wt-status.c:189

1795 +#: wt-status.c:184 wt-status.c:188

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

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

1798

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

1741 -#: wt-status.c:187

1800 +#: wt-status.c:186

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

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

1803

1745 -#: wt-status.c:198 wt-status.c:881

1804 +#: wt-status.c:197 wt-status.c:880

1805 msgid "Changes to be committed:"

1806 msgstr "要提交的变更："

1807

1749 -#: wt-status.c:216 wt-status.c:890

1808 +#: wt-status.c:215 wt-status.c:889

1809 msgid "Changes not staged for commit:"

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

1811

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

1754 -#: wt-status.c:220

1813 +#: wt-status.c:219

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

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

1816

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

1759 -#: wt-status.c:222

1818 +#: wt-status.c:221

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

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

1821

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

1764 -#: wt-status.c:223

1823 +#: wt-status.c:222

1824 msgid ""

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

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

1827

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

1770 -#: wt-status.c:225

1829 +#: wt-status.c:224

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

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

1832

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

1775 -#: wt-status.c:237

1834 +#: wt-status.c:236

1835 #, c-format

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

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

1838

1780 -#: wt-status.c:252

1839 +#: wt-status.c:251

1840 msgid "both deleted:"

1841 msgstr "双方删除："

1842

1784 -#: wt-status.c:254

1843 +#: wt-status.c:253

1844 msgid "added by us:"

1845 msgstr "由我们添加："

1846

1788 -#: wt-status.c:256

1847 +#: wt-status.c:255

1848 msgid "deleted by them:"

1849 msgstr "由他们删除："

1850

1792 -#: wt-status.c:258

1851 +#: wt-status.c:257

1852 msgid "added by them:"

1853 msgstr "由他们添加："

1854

1796 -#: wt-status.c:260

1855 +#: wt-status.c:259

1856 msgid "deleted by us:"

1857 msgstr "由我们删除："

1858

1800 -#: wt-status.c:262

1859 +#: wt-status.c:261

1860 msgid "both added:"

1861 msgstr "双方添加："

1862

1804 -#: wt-status.c:264

1863 +#: wt-status.c:263

1864 msgid "both modified:"

1865 msgstr "双方修改："

1866

1808 -#: wt-status.c:266

1867 +#: wt-status.c:265

1868 #, c-format

1869 msgid "bug: unhandled unmerged status %x"

1870 msgstr "bug：无法处理的未合并状态 %x"

1871

1813 -#: wt-status.c:274

1872 +#: wt-status.c:273

1873 msgid "new file:"

1874 msgstr "新文件："

1875

1817 -#: wt-status.c:276

1876 +#: wt-status.c:275

1877 msgid "copied:"

1878 msgstr "拷贝："

1879

1821 -#: wt-status.c:278

1880 +#: wt-status.c:277

1881 msgid "deleted:"

1882 msgstr "删除："

1883

1825 -#: wt-status.c:280

1884 +#: wt-status.c:279

1885 msgid "modified:"

1886 msgstr "修改："

1887

1829 -#: wt-status.c:282

1888 +#: wt-status.c:281

1889 msgid "renamed:"

1890 msgstr "重命名："

1891

1833 -#: wt-status.c:284

1892 +#: wt-status.c:283

1893 msgid "typechange:"

1894 msgstr "类型变更："

1895

1837 -#: wt-status.c:286

1896 +#: wt-status.c:285

1897 msgid "unknown:"

1898 msgstr "未知："

1899

1841 -#: wt-status.c:288

1900 +#: wt-status.c:287

1901 msgid "unmerged:"

1902 msgstr "未合并："

1903

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

1846 -#: wt-status.c:370

1905 +#: wt-status.c:369

1906 msgid "new commits, "

1907 msgstr "新提交, "

1908

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

1851 -#: wt-status.c:372

1910 +#: wt-status.c:371

1911 msgid "modified content, "

1912 msgstr "修改的内容, "

1913

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

1856 -#: wt-status.c:374

1915 +#: wt-status.c:373

1916 msgid "untracked content, "

1917 msgstr "未跟踪的内容, "

1918

1860 -#: wt-status.c:391

1919 +#: wt-status.c:390

1920 #, c-format

1921 msgid "bug: unhandled diff status %c"

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

1923

1865 -#: wt-status.c:755

1924 +#: wt-status.c:754

1925 msgid "Submodules changed but not updated:"

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

1927

1869 -#: wt-status.c:757

1928 +#: wt-status.c:756

1929 msgid "Submodule changes to be committed:"

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

1931

1873 -#: wt-status.c:838

1932 +#: wt-status.c:837

1933 msgid ""

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

1935 "Everything below will be removed."

@@ -1878,198 +1937,234 @@ msgstr ""

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

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

1939

1881 -#: wt-status.c:949

1940 +#: wt-status.c:948

1941 msgid "You have unmerged paths."

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

1943

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

1886 -#: wt-status.c:952

1945 +#: wt-status.c:951

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

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

1948

1890 -#: wt-status.c:955

1949 +#: wt-status.c:954

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

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

1952

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

1895 -#: wt-status.c:958

1954 +#: wt-status.c:957

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

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

1957

1899 -#: wt-status.c:968

1958 +#: wt-status.c:967

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

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

1961

1903 -#: wt-status.c:971

1962 +#: wt-status.c:970

1963 msgid "The current patch is empty."

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

1965

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

1908 -#: wt-status.c:975

1967 +#: wt-status.c:974

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

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

1970

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

1913 -#: wt-status.c:977

1972 +#: wt-status.c:976

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

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

1975

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

1918 -#: wt-status.c:979

1977 +#: wt-status.c:978

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

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

1980

1922 -#: wt-status.c:1039 wt-status.c:1056

1981 +#: wt-status.c:1105

1982 +msgid "No commands done."

1983 +msgstr "没有命令被执行。"

1984 +

1985 +#: wt-status.c:1108

1986 +#, c-format

1987 +msgid "Last command done (%d command done):"

1988 +msgid_plural "Last commands done (%d commands done):"

1989 +msgstr[0] "最后一条命令已完成（%d 条命令被执行）："

1990 +msgstr[1] "最后的命令已完成（%d 条命令被执行）："

1991 +

1992 +#: wt-status.c:1119

1993 +#, c-format

1994 +msgid " (see more in file %s)"

1995 +msgstr " （更多参见文件 %s）"

1996 +

1997 +#: wt-status.c:1124

1998 +msgid "No commands remaining."

1999 +msgstr "未剩下任何命令。"

2000 +

2001 +#: wt-status.c:1127

2002 +#, c-format

2003 +msgid "Next command to do (%d remaining command):"

2004 +msgid_plural "Next commands to do (%d remaining commands):"

2005 +msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："

2006 +msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："

2007 +

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

2009 +#: wt-status.c:1135

2010 +msgid " (use \"git rebase --edit-todo\" to view and edit)"

2011 +msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"

2012 +

2013 +#: wt-status.c:1148

2014 #, c-format

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

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

2017

1927 -#: wt-status.c:1044 wt-status.c:1061

2018 +#: wt-status.c:1153

2019 msgid "You are currently rebasing."

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

2021

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

1932 -#: wt-status.c:1047

2023 +#: wt-status.c:1167

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

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

2026

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

1937 -#: wt-status.c:1049

2028 +#: wt-status.c:1169

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

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

2031

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

1942 -#: wt-status.c:1051

2033 +#: wt-status.c:1171

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

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

2036

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

1947 -#: wt-status.c:1064

2038 +#: wt-status.c:1177

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

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

2041

1951 -#: wt-status.c:1068

2042 +#: wt-status.c:1181

2043 #, c-format

2044 msgid ""

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

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

2047

1957 -#: wt-status.c:1073

2048 +#: wt-status.c:1186

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

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

2051

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

1962 -#: wt-status.c:1076

2053 +#: wt-status.c:1189

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

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

2056

1966 -#: wt-status.c:1080

2057 +#: wt-status.c:1193

2058 #, c-format

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

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

2061

1971 -#: wt-status.c:1085

2062 +#: wt-status.c:1198

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

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

2065

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

1976 -#: wt-status.c:1088

2067 +#: wt-status.c:1201

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

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

2070

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

1981 -#: wt-status.c:1090

2072 +#: wt-status.c:1203

2073 msgid ""

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

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

2076

1986 -#: wt-status.c:1100

2077 +#: wt-status.c:1213

2078 #, c-format

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

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

2081

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

1992 -#: wt-status.c:1105

2083 +#: wt-status.c:1218

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

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

2086

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

1997 -#: wt-status.c:1108

2088 +#: wt-status.c:1221

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

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

2091

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

2002 -#: wt-status.c:1110

2093 +#: wt-status.c:1223

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

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

2096

2006 -#: wt-status.c:1119

2097 +#: wt-status.c:1232

2098 #, c-format

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

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

2101

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

2012 -#: wt-status.c:1124

2103 +#: wt-status.c:1237

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

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

2106

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

2017 -#: wt-status.c:1127

2108 +#: wt-status.c:1240

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

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

2111

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

2022 -#: wt-status.c:1129

2113 +#: wt-status.c:1242

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

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

2116

2026 -#: wt-status.c:1140

2117 +#: wt-status.c:1253

2118 #, c-format

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

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

2121

2031 -#: wt-status.c:1144

2122 +#: wt-status.c:1257

2123 msgid "You are currently bisecting."

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

2125

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

2036 -#: wt-status.c:1147

2127 +#: wt-status.c:1260

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

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

2130

2040 -#: wt-status.c:1324

2131 +#: wt-status.c:1437

2132 msgid "On branch "

2133 msgstr "位于分支 "

2134

2044 -#: wt-status.c:1331

2135 +#: wt-status.c:1445

2136 +msgid "interactive rebase in progress; onto "

2137 +msgstr "交互式变基操作正在进行中；至 "

2138 +

2139 +#: wt-status.c:1447

2140 msgid "rebase in progress; onto "

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

2142

2048 -#: wt-status.c:1336

2143 +#: wt-status.c:1452

2144 msgid "HEAD detached at "

2145 msgstr "头指针分离于 "

2146

2052 -#: wt-status.c:1338

2147 +#: wt-status.c:1454

2148 msgid "HEAD detached from "

2149 msgstr "头指针分离自 "

2150

2056 -#: wt-status.c:1341

2151 +#: wt-status.c:1457

2152 msgid "Not currently on any branch."

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

2154

2060 -#: wt-status.c:1358

2155 +#: wt-status.c:1474

2156 msgid "Initial commit"

2157 msgstr "初始提交"

2158

2064 -#: wt-status.c:1372

2159 +#: wt-status.c:1488

2160 msgid "Untracked files"

2161 msgstr "未跟踪的文件"

2162

2068 -#: wt-status.c:1374

2163 +#: wt-status.c:1490

2164 msgid "Ignored files"

2165 msgstr "忽略的文件"

2166

2072 -#: wt-status.c:1378

2167 +#: wt-status.c:1494

2168 #, c-format

2169 msgid ""

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

@@ -2079,84 +2174,84 @@ msgstr ""

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

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

2176

2082 -#: wt-status.c:1384

2177 +#: wt-status.c:1500

2178 #, c-format

2179 msgid "Untracked files not listed%s"

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

2181

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

2088 -#: wt-status.c:1386

2183 +#: wt-status.c:1502

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

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

2186

2092 -#: wt-status.c:1392

2187 +#: wt-status.c:1508

2188 msgid "No changes"

2189 msgstr "没有修改"

2190

2096 -#: wt-status.c:1397

2191 +#: wt-status.c:1513

2192 #, c-format

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

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

2195

2101 -#: wt-status.c:1400

2196 +#: wt-status.c:1516

2197 #, c-format

2198 msgid "no changes added to commit\n"

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

2200

2106 -#: wt-status.c:1403

2201 +#: wt-status.c:1519

2202 #, c-format

2203 msgid ""

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

2205 "track)\n"

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

2207

2113 -#: wt-status.c:1406

2208 +#: wt-status.c:1522

2209 #, c-format

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

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

2212

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

2119 -#: wt-status.c:1409

2214 +#: wt-status.c:1525

2215 #, c-format

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

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

2218

2124 -#: wt-status.c:1412 wt-status.c:1417

2219 +#: wt-status.c:1528 wt-status.c:1533

2220 #, c-format

2221 msgid "nothing to commit\n"

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

2223

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

2130 -#: wt-status.c:1415

2225 +#: wt-status.c:1531

2226 #, c-format

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

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

2229

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

2136 -#: wt-status.c:1419

2231 +#: wt-status.c:1535

2232 #, c-format

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

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

2235

2141 -#: wt-status.c:1528

2236 +#: wt-status.c:1644

2237 msgid "HEAD (no branch)"

2238 msgstr "HEAD（非分支）"

2239

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

2146 -#: wt-status.c:1534

2241 +#: wt-status.c:1650

2242 msgid "Initial commit on "

2243 msgstr "初始提交于 "

2244

2150 -#: wt-status.c:1561

2245 +#: wt-status.c:1677

2246 msgid "gone"

2247 msgstr "丢失"

2248

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

2155 -#: wt-status.c:1563 wt-status.c:1571

2250 +#: wt-status.c:1679 wt-status.c:1687

2251 msgid "behind "

2252 msgstr "落后 "

2253

2159 -#: compat/precompose_utf8.c:55 builtin/clone.c:345

2254 +#: compat/precompose_utf8.c:55 builtin/clone.c:403

2255 #, c-format

2256 msgid "failed to unlink '%s'"

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

@@ -2183,14 +2278,14 @@ msgstr "删除 '%s'\n"

2278 msgid "Unstaged changes after refreshing the index:"

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

2280

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

2281 +#: builtin/add.c:194 builtin/rev-parse.c:799

2282 msgid "Could not read the index"

2283 msgstr "不能读取索引"

2284

2285 #: builtin/add.c:205

2286 #, c-format

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

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

2288 +msgstr "无法打开 '%s' 进行写入。"

2289

2290 #: builtin/add.c:209

2291 msgid "Could not write patch"

@@ -2218,15 +2313,15 @@ msgstr "不能应用 '%s'"

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

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

2315

2221 -#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

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

2223 -#: builtin/rm.c:268

2316 +#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

2317 +#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2318 +#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162

2319 msgid "dry run"

2320 msgstr "演习"

2321

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

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

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

2323 +#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636

2324 +#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114

2325 msgid "be verbose"

2326 msgstr "冗长输出"

2327

@@ -2234,7 +2329,7 @@ msgstr "冗长输出"

2329 msgid "interactive picking"

2330 msgstr "交互式拣选"

2331

2237 -#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286

2332 +#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2333 msgid "select hunks interactively"

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

2335

@@ -2301,15 +2396,416 @@ msgstr "没有指定文件，也没有文件被添加。\n"

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

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

2398

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

2305 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2399 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940

2400 +#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2401 msgid "index file corrupt"

2402 msgstr "索引文件损坏"

2403

2309 -#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2404 +#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2405 msgid "Unable to write new index file"

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

2407

2408 +#: builtin/am.c:41

2409 +#, c-format

2410 +msgid "could not stat %s"

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

2412 +

2413 +#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737

2414 +#: builtin/merge.c:1079

2415 +#, c-format

2416 +msgid "could not read '%s'"

2417 +msgstr "不能读取 '%s'"

2418 +

2419 +#: builtin/am.c:444

2420 +msgid "could not parse author script"

2421 +msgstr "不能解析作者脚本"

2422 +

2423 +#: builtin/am.c:521

2424 +#, c-format

2425 +msgid "'%s' was deleted by the applypatch-msg hook"

2426 +msgstr "'%s' 被 applypatch-msg 钩子删除"

2427 +

2428 +#: builtin/am.c:562 builtin/notes.c:300

2429 +#, c-format

2430 +msgid "Malformed input line: '%s'."

2431 +msgstr "非法的输入行：'%s'。"

2432 +

2433 +#: builtin/am.c:599 builtin/notes.c:315

2434 +#, c-format

2435 +msgid "Failed to copy notes from '%s' to '%s'"

2436 +msgstr "从 '%s' 拷贝注解到 '%s' 时失败"

2437 +

2438 +#: builtin/am.c:625

2439 +msgid "fseek failed"

2440 +msgstr "fseek 失败"

2441 +

2442 +#: builtin/am.c:786 builtin/am.c:874

2443 +#, c-format

2444 +msgid "could not open '%s' for reading: %s"

2445 +msgstr "无法打开 '%s' 进行读取：%s"

2446 +

2447 +#: builtin/am.c:793

2448 +#, c-format

2449 +msgid "could not open '%s' for writing: %s"

2450 +msgstr "无法打开 '%s' 进行写入：%s"

2451 +

2452 +#: builtin/am.c:802

2453 +#, c-format

2454 +msgid "could not parse patch '%s'"

2455 +msgstr "无法解析补丁 '%s'"

2456 +

2457 +#: builtin/am.c:867

2458 +msgid "Only one StGIT patch series can be applied at once"

2459 +msgstr "一次只能有一个 StGIT 补丁队列被应用"

2460 +

2461 +#: builtin/am.c:915

2462 +msgid "invalid timestamp"

2463 +msgstr "无效的时间戳"

2464 +

2465 +#: builtin/am.c:918 builtin/am.c:926

2466 +msgid "invalid Date line"

2467 +msgstr "无效的日期行"

2468 +

2469 +#: builtin/am.c:923

2470 +msgid "invalid timezone offset"

2471 +msgstr "无效的时区偏移值"

2472 +

2473 +#: builtin/am.c:1010

2474 +msgid "Patch format detection failed."

2475 +msgstr "补丁格式检测失败。"

2476 +

2477 +#: builtin/am.c:1015 builtin/clone.c:368

2478 +#, c-format

2479 +msgid "failed to create directory '%s'"

2480 +msgstr "无法创建目录 '%s'"

2481 +

2482 +#: builtin/am.c:1019

2483 +msgid "Failed to split patches."

2484 +msgstr "无法拆分补丁。"

2485 +

2486 +#: builtin/am.c:1151 builtin/commit.c:362

2487 +msgid "unable to write index file"

2488 +msgstr "无法写入索引文件"

2489 +

2490 +#: builtin/am.c:1202

2491 +#, c-format

2492 +msgid "When you have resolved this problem, run \"%s --continue\"."

2493 +msgstr "当您解决这一问题，执行 \"%s --continue\"。"

2494 +

2495 +#: builtin/am.c:1203

2496 +#, c-format

2497 +msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2498 +msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"

2499 +

2500 +#: builtin/am.c:1204

2501 +#, c-format

2502 +msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2503 +msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"

2504 +

2505 +#: builtin/am.c:1312

2506 +msgid "Patch is empty. Was it split wrong?"

2507 +msgstr "补丁为空。是不是切分错误？"

2508 +

2509 +#: builtin/am.c:1386 builtin/log.c:1345

2510 +#, c-format

2511 +msgid "invalid ident line: %s"

2512 +msgstr "包含无效的身份标识：%s"

2513 +

2514 +#: builtin/am.c:1413

2515 +#, c-format

2516 +msgid "unable to parse commit %s"

2517 +msgstr "不能解析提交 %s"

2518 +

2519 +#: builtin/am.c:1587

2520 +msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2521 +msgstr "仓库缺乏必要的数据对象以进行三方合并。"

2522 +

2523 +#: builtin/am.c:1589

2524 +msgid "Using index info to reconstruct a base tree..."

2525 +msgstr "使用索引来重建一个（三方合并的）基础目录树..."

2526 +

2527 +#: builtin/am.c:1608

2528 +msgid ""

2529 +"Did you hand edit your patch?\n"

2530 +"It does not apply to blobs recorded in its index."

2531 +msgstr ""

2532 +"您是否曾手动编辑过您的补丁？\n"

2533 +"无法应用补丁到索引中的数据对象上。"

2534 +

2535 +#: builtin/am.c:1614

2536 +msgid "Falling back to patching base and 3-way merge..."

2537 +msgstr "回落到基础版本上打补丁及进行三方合并..."

2538 +

2539 +#: builtin/am.c:1639

2540 +msgid "Failed to merge in the changes."

2541 +msgstr "无法合并变更。"

2542 +

2543 +#: builtin/am.c:1664 builtin/merge.c:632

2544 +msgid "git write-tree failed to write a tree"

2545 +msgstr "git write-tree 无法写入一树对象"

2546 +

2547 +#: builtin/am.c:1671

2548 +msgid "applying to an empty history"

2549 +msgstr "正应用到一个空历史上"

2550 +

2551 +#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829

2552 +#: builtin/merge.c:854

2553 +msgid "failed to write commit object"

2554 +msgstr "无法写提交对象"

2555 +

2556 +#: builtin/am.c:1716 builtin/am.c:1720

2557 +#, c-format

2558 +msgid "cannot resume: %s does not exist."

2559 +msgstr "无法继续：%s 不存在。"

2560 +

2561 +#: builtin/am.c:1736

2562 +msgid "cannot be interactive without stdin connected to a terminal."

2563 +msgstr "标准输入没有和终端关联，不能进行交互式操作。"

2564 +

2565 +#: builtin/am.c:1741

2566 +msgid "Commit Body is:"

2567 +msgstr "提交内容为："

2568 +

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

2570 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

2571 +#. in your translation. The program will only accept English

2572 +#. input at this point.

2573 +#.

2574 +#: builtin/am.c:1751

2575 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2576 +msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："

2577 +

2578 +#: builtin/am.c:1801

2579 +#, c-format

2580 +msgid "Dirty index: cannot apply patches (dirty: %s)"

2581 +msgstr "脏索引：不能应用补丁（脏文件：%s）"

2582 +

2583 +#: builtin/am.c:1836 builtin/am.c:1907

2584 +#, c-format

2585 +msgid "Applying: %.*s"

2586 +msgstr "应用：%.*s"

2587 +

2588 +#: builtin/am.c:1852

2589 +msgid "No changes -- Patch already applied."

2590 +msgstr "没有变更 —— 补丁已经应用过。"

2591 +

2592 +#: builtin/am.c:1860

2593 +#, c-format

2594 +msgid "Patch failed at %s %.*s"

2595 +msgstr "打补丁失败于 %s %.*s"

2596 +

2597 +#: builtin/am.c:1866

2598 +#, c-format

2599 +msgid "The copy of the patch that failed is found in: %s"

2600 +msgstr "失败的补丁文件副本位于：%s"

2601 +

2602 +#: builtin/am.c:1910

2603 +msgid ""

2604 +"No changes - did you forget to use 'git add'?\n"

2605 +"If there is nothing left to stage, chances are that something else\n"

2606 +"already introduced the same changes; you might want to skip this patch."

2607 +msgstr ""

2608 +"没有变更 —— 您是不是忘了执行 'git add'？\n"

2609 +"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"

2610 +"您也许想要跳过这个补丁。"

2611 +

2612 +#: builtin/am.c:1917

2613 +msgid ""

2614 +"You still have unmerged paths in your index.\n"

2615 +"Did you forget to use 'git add'?"

2616 +msgstr ""

2617 +"您的索引中仍有未合并的路径。\n"

2618 +"您是否忘了执行 'git add'？"

2619 +

2620 +#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308

2621 +#: builtin/reset.c:316

2622 +#, c-format

2623 +msgid "Could not parse object '%s'."

2624 +msgstr "不能解析对象 '%s'。"

2625 +

2626 +#: builtin/am.c:2077

2627 +msgid "failed to clean index"

2628 +msgstr "无法清空索引"

2629 +

2630 +#: builtin/am.c:2111

2631 +msgid ""

2632 +"You seem to have moved HEAD since the last 'am' failure.\n"

2633 +"Not rewinding to ORIG_HEAD"

2634 +msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"

2635 +

2636 +#: builtin/am.c:2172

2637 +#, c-format

2638 +msgid "Invalid value for --patch-format: %s"

2639 +msgstr "无效的 --patch-format 值：%s"

2640 +

2641 +#: builtin/am.c:2194

2642 +msgid "git am [options] [(<mbox>|<Maildir>)...]"

2643 +msgstr "git am [选项] [(<mbox>|<Maildir>)...]"

2644 +

2645 +#: builtin/am.c:2195

2646 +msgid "git am [options] (--continue | --skip | --abort)"

2647 +msgstr "git am [选项] (--continue | --skip | --abort)"

2648 +

2649 +#: builtin/am.c:2201

2650 +msgid "run interactively"

2651 +msgstr "以交互式方式运行"

2652 +

2653 +#: builtin/am.c:2203

2654 +msgid "historical option -- no-op"

2655 +msgstr "老的参数 —— 无作用"

2656 +

2657 +#: builtin/am.c:2205

2658 +msgid "allow fall back on 3way merging if needed"

2659 +msgstr "如果必要，允许使用三方合并。"

2660 +

2661 +#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57

2662 +#: builtin/repack.c:171

2663 +msgid "be quiet"

2664 +msgstr "静默模式"

2665 +

2666 +#: builtin/am.c:2208

2667 +msgid "add a Signed-off-by line to the commit message"

2668 +msgstr "在提交说明中添加一个 Signed-off-by 签名"

2669 +

2670 +#: builtin/am.c:2211

2671 +msgid "recode into utf8 (default)"

2672 +msgstr "使用 utf8 字符集（默认）"

2673 +

2674 +#: builtin/am.c:2213

2675 +msgid "pass -k flag to git-mailinfo"

2676 +msgstr "向 git-mailinfo 传递 -k 参数"

2677 +

2678 +#: builtin/am.c:2215

2679 +msgid "pass -b flag to git-mailinfo"

2680 +msgstr "向 git-mailinfo 传递 -b 参数"

2681 +

2682 +#: builtin/am.c:2217

2683 +msgid "pass -m flag to git-mailinfo"

2684 +msgstr "向 git-mailinfo 传递 -m 参数"

2685 +

2686 +#: builtin/am.c:2219

2687 +msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2688 +msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"

2689 +

2690 +#: builtin/am.c:2222

2691 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2692 +msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"

2693 +

2694 +#: builtin/am.c:2225

2695 +msgid "strip everything before a scissors line"

2696 +msgstr "丢弃裁切线前的所有内容"

2697 +

2698 +#: builtin/am.c:2226 builtin/apply.c:4563

2699 +msgid "action"

2700 +msgstr "动作"

2701 +

2702 +#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236

2703 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248

2704 +#: builtin/am.c:2254

2705 +msgid "pass it through git-apply"

2706 +msgstr "传递给 git-apply"

2707 +

2708 +#: builtin/am.c:2235 builtin/apply.c:4587

2709 +msgid "root"

2710 +msgstr "根目录"

2711 +

2712 +#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525

2713 +#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2714 +#: builtin/pull.c:167

2715 +msgid "path"

2716 +msgstr "路径"

2717 +

2718 +#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2719 +#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2720 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2721 +#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

2722 +#: parse-options.h:134 parse-options.h:243

2723 +msgid "n"

2724 +msgstr "n"

2725 +

2726 +#: builtin/am.c:2247 builtin/apply.c:4531

2727 +msgid "num"

2728 +msgstr "数字"

2729 +

2730 +#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438

2731 +msgid "format"

2732 +msgstr "格式"

2733 +

2734 +#: builtin/am.c:2251

2735 +msgid "format the patch(es) are in"

2736 +msgstr "补丁的格式"

2737 +

2738 +#: builtin/am.c:2257

2739 +msgid "override error message when patch failure occurs"

2740 +msgstr "打补丁失败时显示的错误信息"

2741 +

2742 +#: builtin/am.c:2259

2743 +msgid "continue applying patches after resolving a conflict"

2744 +msgstr "冲突解决后继续应用补丁"

2745 +

2746 +#: builtin/am.c:2262

2747 +msgid "synonyms for --continue"

2748 +msgstr "和 --continue 同义"

2749 +

2750 +#: builtin/am.c:2265

2751 +msgid "skip the current patch"

2752 +msgstr "跳过当前补丁"

2753 +

2754 +#: builtin/am.c:2268

2755 +msgid "restore the original branch and abort the patching operation."

2756 +msgstr "恢复原始分支并终止打补丁操作。"

2757 +

2758 +#: builtin/am.c:2272

2759 +msgid "lie about committer date"

2760 +msgstr "将作者日期作为提交日期"

2761 +

2762 +#: builtin/am.c:2274

2763 +msgid "use current timestamp for author date"

2764 +msgstr "用当前时间作为作者日期"

2765 +

2766 +#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225

2767 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2768 +msgid "key-id"

2769 +msgstr "key-id"

2770 +

2771 +#: builtin/am.c:2277

2772 +msgid "GPG-sign commits"

2773 +msgstr "使用 GPG 签名提交"

2774 +

2775 +#: builtin/am.c:2280

2776 +msgid "(internal use for git-rebase)"

2777 +msgstr "（内部使用，用于 git-rebase）"

2778 +

2779 +#: builtin/am.c:2295

2780 +msgid ""

2781 +"The -b/--binary option has been a no-op for long time, and\n"

2782 +"it will be removed. Please do not use it anymore."

2783 +msgstr ""

2784 +"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"

2785 +"请不要再使用它了。"

2786 +

2787 +#: builtin/am.c:2302

2788 +msgid "failed to read the index"

2789 +msgstr "无法读取索引"

2790 +

2791 +#: builtin/am.c:2317

2792 +#, c-format

2793 +msgid "previous rebase directory %s still exists but mbox given."

2794 +msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"

2795 +

2796 +#: builtin/am.c:2341

2797 +#, c-format

2798 +msgid ""

2799 +"Stray %s directory found.\n"

2800 +"Use \"git am --abort\" to remove it."

2801 +msgstr ""

2802 +"发现了错误的 %s 目录。\n"

2803 +"使用 \"git am --abort\" 删除它。"

2804 +

2805 +#: builtin/am.c:2347

2806 +msgid "Resolve operation not in progress, we are not resuming."

2807 +msgstr "解决操作未进行，我们不会继续。"

2808 +

2809 #: builtin/apply.c:59

2810 msgid "git apply [<options>] [<patch>...]"

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

@@ -2568,7 +3064,7 @@ msgstr "%s：补丁未应用"

3064 msgid "Checking patch %s..."

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

3066

2571 -#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135

3067 +#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

3068 #, c-format

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

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

@@ -2647,11 +3143,6 @@ msgstr "未能识别的输入"

3143 msgid "unable to read index file"

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

3145

2650 -#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2651 -#: builtin/fetch.c:92

2652 -msgid "path"

2653 -msgstr "路径"

2654 -

3146 #: builtin/apply.c:4526

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

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

@@ -2660,10 +3151,6 @@ msgstr "不要应用与给出路径向匹配的变更"

3151 msgid "apply changes matching the given path"

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

3153

2663 -#: builtin/apply.c:4531

2664 -msgid "num"

2665 -msgstr "数字"

2666 -

3154 #: builtin/apply.c:4532

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

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

@@ -2720,10 +3207,6 @@ msgstr "路径以 NUL 字符分隔"

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

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

3209

2723 -#: builtin/apply.c:4563

2724 -msgid "action"

2725 -msgstr "动作"

2726 -

3210 #: builtin/apply.c:4564

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

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

@@ -2756,10 +3239,6 @@ msgstr "允许不正确的文件末尾换行符"

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

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

3241

2759 -#: builtin/apply.c:4587

2760 -msgid "root"

2761 -msgstr "根目录"

2762 -

3242 #: builtin/apply.c:4588

3243 msgid "prepend <root> to all filenames"

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

@@ -2842,11 +3321,11 @@ msgstr "执行 'git bisect next'"

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

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

3323

2845 -#: builtin/blame.c:31

3324 +#: builtin/blame.c:32

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

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

3327

2849 -#: builtin/blame.c:36

3328 +#: builtin/blame.c:37

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

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

3331

@@ -3029,316 +3508,316 @@ msgstr "未能找到远程跟踪分支 '%s'。"

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

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

3510

3032 -#: builtin/branch.c:258

3511 +#: builtin/branch.c:259

3512 #, c-format

3513 msgid "Error deleting remote-tracking branch '%s'"

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

3515

3037 -#: builtin/branch.c:259

3516 +#: builtin/branch.c:260

3517 #, c-format

3518 msgid "Error deleting branch '%s'"

3519 msgstr "无法删除分支 '%s'"

3520

3042 -#: builtin/branch.c:266

3521 +#: builtin/branch.c:267

3522 #, c-format

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

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

3525

3047 -#: builtin/branch.c:267

3526 +#: builtin/branch.c:268

3527 #, c-format

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

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

3530

3052 -#: builtin/branch.c:368

3531 +#: builtin/branch.c:369

3532 #, c-format

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

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

3535

3057 -#: builtin/branch.c:451

3536 +#: builtin/branch.c:452

3537 #, c-format

3538 msgid "[%s: gone]"

3539 msgstr "[%s: 丢失]"

3540

3062 -#: builtin/branch.c:456

3541 +#: builtin/branch.c:457

3542 #, c-format

3543 msgid "[%s]"

3544 msgstr "[%s]"

3545

3067 -#: builtin/branch.c:461

3546 +#: builtin/branch.c:462

3547 #, c-format

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

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

3550

3072 -#: builtin/branch.c:463

3551 +#: builtin/branch.c:464

3552 #, c-format

3553 msgid "[behind %d]"

3554 msgstr "[落后 %d]"

3555

3077 -#: builtin/branch.c:467

3556 +#: builtin/branch.c:468

3557 #, c-format

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

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

3560

3082 -#: builtin/branch.c:469

3561 +#: builtin/branch.c:470

3562 #, c-format

3563 msgid "[ahead %d]"

3564 msgstr "[领先 %d]"

3565

3087 -#: builtin/branch.c:472

3566 +#: builtin/branch.c:473

3567 #, c-format

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

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

3570

3092 -#: builtin/branch.c:475

3571 +#: builtin/branch.c:476

3572 #, c-format

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

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

3575

3097 -#: builtin/branch.c:488

3576 +#: builtin/branch.c:489

3577 msgid " **** invalid ref ****"

3578 msgstr " **** 无效引用 ****"

3579

3101 -#: builtin/branch.c:579

3580 +#: builtin/branch.c:580

3581 #, c-format

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

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

3584

3106 -#: builtin/branch.c:582

3585 +#: builtin/branch.c:583

3586 #, c-format

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

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

3589

3111 -#: builtin/branch.c:588

3590 +#: builtin/branch.c:589

3591 #, c-format

3592 msgid "(HEAD detached at %s)"

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

3594

3116 -#: builtin/branch.c:591

3595 +#: builtin/branch.c:592

3596 #, c-format

3597 msgid "(HEAD detached from %s)"

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

3599

3121 -#: builtin/branch.c:595

3600 +#: builtin/branch.c:596

3601 msgid "(no branch)"

3602 msgstr "（非分支）"

3603

3125 -#: builtin/branch.c:642

3604 +#: builtin/branch.c:643

3605 #, c-format

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

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

3608

3130 -#: builtin/branch.c:690

3609 +#: builtin/branch.c:691

3610 msgid "some refs could not be read"

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

3612

3134 -#: builtin/branch.c:703

3613 +#: builtin/branch.c:704

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

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

3616

3138 -#: builtin/branch.c:713

3617 +#: builtin/branch.c:714

3618 #, c-format

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

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

3621

3143 -#: builtin/branch.c:728

3622 +#: builtin/branch.c:729

3623 msgid "Branch rename failed"

3624 msgstr "分支重命名失败"

3625

3147 -#: builtin/branch.c:732

3626 +#: builtin/branch.c:733

3627 #, c-format

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

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

3630

3152 -#: builtin/branch.c:736

3631 +#: builtin/branch.c:737

3632 #, c-format

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

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

3635

3157 -#: builtin/branch.c:743

3636 +#: builtin/branch.c:744

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

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

3639

3161 -#: builtin/branch.c:758

3640 +#: builtin/branch.c:759

3641 #, c-format

3642 msgid "malformed object name %s"

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

3644

3166 -#: builtin/branch.c:780

3645 +#: builtin/branch.c:781

3646 #, c-format

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

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

3649

3171 -#: builtin/branch.c:810

3650 +#: builtin/branch.c:811

3651 msgid "Generic options"

3652 msgstr "通用选项"

3653

3175 -#: builtin/branch.c:812

3654 +#: builtin/branch.c:813

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

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

3657

3179 -#: builtin/branch.c:813

3658 +#: builtin/branch.c:814

3659 msgid "suppress informational messages"

3660 msgstr "不显示信息"

3661

3183 -#: builtin/branch.c:814

3662 +#: builtin/branch.c:815

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

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

3665

3187 -#: builtin/branch.c:816

3666 +#: builtin/branch.c:817

3667 msgid "change upstream info"

3668 msgstr "改变上游信息"

3669

3191 -#: builtin/branch.c:820

3670 +#: builtin/branch.c:821

3671 msgid "use colored output"

3672 msgstr "使用彩色输出"

3673

3195 -#: builtin/branch.c:821

3674 +#: builtin/branch.c:822

3675 msgid "act on remote-tracking branches"

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

3677

3199 -#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

3200 -#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

3201 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

3202 -#: builtin/tag.c:622

3678 +#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3679 +#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3680 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3681 +#: builtin/tag.c:624

3682 msgid "commit"

3683 msgstr "提交"

3684

3206 -#: builtin/branch.c:825 builtin/branch.c:831

3685 +#: builtin/branch.c:826 builtin/branch.c:832

3686 msgid "print only branches that contain the commit"

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

3688

3210 -#: builtin/branch.c:837

3689 +#: builtin/branch.c:838

3690 msgid "Specific git-branch actions:"

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

3692

3214 -#: builtin/branch.c:838

3693 +#: builtin/branch.c:839

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

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

3696

3218 -#: builtin/branch.c:840

3697 +#: builtin/branch.c:841

3698 msgid "delete fully merged branch"

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

3700

3222 -#: builtin/branch.c:841

3701 +#: builtin/branch.c:842

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

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

3704

3226 -#: builtin/branch.c:842

3705 +#: builtin/branch.c:843

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

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

3708

3230 -#: builtin/branch.c:843

3709 +#: builtin/branch.c:844

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

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

3712

3234 -#: builtin/branch.c:844

3713 +#: builtin/branch.c:845

3714 msgid "list branch names"

3715 msgstr "列出分支名"

3716

3238 -#: builtin/branch.c:845

3717 +#: builtin/branch.c:846

3718 msgid "create the branch's reflog"

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

3720

3242 -#: builtin/branch.c:847

3721 +#: builtin/branch.c:848

3722 msgid "edit the description for the branch"

3723 msgstr "标记分支的描述"

3724

3246 -#: builtin/branch.c:848

3725 +#: builtin/branch.c:849

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

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

3728

3250 -#: builtin/branch.c:851

3729 +#: builtin/branch.c:852

3730 msgid "print only not merged branches"

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

3732

3254 -#: builtin/branch.c:857

3733 +#: builtin/branch.c:858

3734 msgid "print only merged branches"

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

3736

3258 -#: builtin/branch.c:861

3737 +#: builtin/branch.c:862

3738 msgid "list branches in columns"

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

3740

3262 -#: builtin/branch.c:874

3741 +#: builtin/branch.c:875

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

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

3744

3266 -#: builtin/branch.c:878 builtin/clone.c:622

3745 +#: builtin/branch.c:879 builtin/clone.c:690

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

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

3748

3270 -#: builtin/branch.c:900

3749 +#: builtin/branch.c:901

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

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

3752

3274 -#: builtin/branch.c:911 builtin/branch.c:950

3753 +#: builtin/branch.c:912 builtin/branch.c:951

3754 msgid "branch name required"

3755 msgstr "必须提供分支名"

3756

3278 -#: builtin/branch.c:926

3757 +#: builtin/branch.c:927

3758 msgid "Cannot give description to detached HEAD"

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

3760

3282 -#: builtin/branch.c:931

3761 +#: builtin/branch.c:932

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

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

3764

3286 -#: builtin/branch.c:938

3765 +#: builtin/branch.c:939

3766 #, c-format

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

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

3769

3291 -#: builtin/branch.c:941

3770 +#: builtin/branch.c:942

3771 #, c-format

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

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

3774

3296 -#: builtin/branch.c:956

3775 +#: builtin/branch.c:957

3776 msgid "too many branches for a rename operation"

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

3778

3300 -#: builtin/branch.c:961

3779 +#: builtin/branch.c:962

3780 msgid "too many branches to set new upstream"

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

3782

3304 -#: builtin/branch.c:965

3783 +#: builtin/branch.c:966

3784 #, c-format

3785 msgid ""

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

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

3788

3310 -#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3789 +#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3790 #, c-format

3791 msgid "no such branch '%s'"

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

3793

3315 -#: builtin/branch.c:972

3794 +#: builtin/branch.c:973

3795 #, c-format

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

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

3798

3320 -#: builtin/branch.c:984

3799 +#: builtin/branch.c:985

3800 msgid "too many branches to unset upstream"

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

3802

3324 -#: builtin/branch.c:988

3803 +#: builtin/branch.c:989

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

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

3806

3328 -#: builtin/branch.c:994

3807 +#: builtin/branch.c:995

3808 #, c-format

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

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

3811

3333 -#: builtin/branch.c:1008

3812 +#: builtin/branch.c:1009

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

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

3815

3337 -#: builtin/branch.c:1014

3816 +#: builtin/branch.c:1015

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

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

3819

3341 -#: builtin/branch.c:1017

3820 +#: builtin/branch.c:1018

3821 #, c-format

3822 msgid ""

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

@@ -3346,7 +3825,7 @@ msgid ""

3825 msgstr ""

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

3827

3349 -#: builtin/branch.c:1034

3828 +#: builtin/branch.c:1035

3829 #, c-format

3830 msgid ""

3831 "\n"

@@ -3357,12 +3836,12 @@ msgstr ""

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

3837 "\n"

3838

3360 -#: builtin/branch.c:1035

3839 +#: builtin/branch.c:1036

3840 #, c-format

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

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

3843

3365 -#: builtin/branch.c:1036

3844 +#: builtin/branch.c:1037

3845 #, c-format

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

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

@@ -3380,7 +3859,7 @@ msgstr "需要一个仓库来创建包。"

3859 msgid "Need a repository to unbundle."

3860 msgstr "需要一个仓库来解包。"

3861

3383 -#: builtin/cat-file.c:369

3862 +#: builtin/cat-file.c:428

3863 msgid ""

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

3865 "<type>|--textconv) <object>"

@@ -3388,53 +3867,61 @@ msgstr ""

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

3868 ">|--textconv) <对象>"

3869

3391 -#: builtin/cat-file.c:370

3870 +#: builtin/cat-file.c:429

3871 msgid ""

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

3873 "objects>"

3874 msgstr ""

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

3876

3398 -#: builtin/cat-file.c:407

3877 +#: builtin/cat-file.c:466

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

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

3880

3402 -#: builtin/cat-file.c:408

3881 +#: builtin/cat-file.c:467

3882 msgid "show object type"

3883 msgstr "显示对象类型"

3884

3406 -#: builtin/cat-file.c:409

3885 +#: builtin/cat-file.c:468

3886 msgid "show object size"

3887 msgstr "显示对象大小"

3888

3410 -#: builtin/cat-file.c:411

3889 +#: builtin/cat-file.c:470

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

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

3892

3414 -#: builtin/cat-file.c:412

3893 +#: builtin/cat-file.c:471

3894 msgid "pretty-print object's content"

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

3896

3418 -#: builtin/cat-file.c:414

3897 +#: builtin/cat-file.c:473

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

3899 msgstr "对于数据对象，对其内容执行 textconv"

3900

3422 -#: builtin/cat-file.c:416

3901 +#: builtin/cat-file.c:475

3902 msgid "allow -s and -t to work with broken/corrupt objects"

3903 msgstr "允许 -s 和 -t 对损坏的对象生效"

3904

3426 -#: builtin/cat-file.c:418

3905 +#: builtin/cat-file.c:476

3906 +msgid "buffer --batch output"

3907 +msgstr "缓冲 --batch 的输出"

3908 +

3909 +#: builtin/cat-file.c:478

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

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

3912

3430 -#: builtin/cat-file.c:421

3913 +#: builtin/cat-file.c:481

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

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

3916

3434 -#: builtin/cat-file.c:424

3917 +#: builtin/cat-file.c:484

3918 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3919 msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"

3920

3921 +#: builtin/cat-file.c:486

3922 +msgid "show all objects with --batch or --batch-check"

3923 +msgstr "使用 --batch 或 --batch-check 参数显示所有对象"

3924 +

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

3926 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3927 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."

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

3946 msgid "terminate input and output records by a NUL character"

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

3948

3462 -#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279

3949 +#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

3950 msgid "suppress progress reporting"

3951 msgstr "不显示进度报告"

3952

@@ -3473,7 +3960,7 @@ msgstr "检查时忽略索引"

3960

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

3962 msgid "cannot specify pathnames with --stdin"

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

3963 +msgstr "不能同时指定路径及 --stdin 参数"

3964

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

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

@@ -3556,114 +4043,114 @@ msgstr "在创建文件时，在前面加上 <字符串>"

4043 msgid "copy out the files from named stage"

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

4045

3559 -#: builtin/checkout.c:24

4046 +#: builtin/checkout.c:25

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

4048 msgstr "git checkout [<选项>] <分支>"

4049

3563 -#: builtin/checkout.c:25

4050 +#: builtin/checkout.c:26

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

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

4053

3567 -#: builtin/checkout.c:134 builtin/checkout.c:167

4054 +#: builtin/checkout.c:133 builtin/checkout.c:166

4055 #, c-format

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

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

4058

3572 -#: builtin/checkout.c:136 builtin/checkout.c:169

4059 +#: builtin/checkout.c:135 builtin/checkout.c:168

4060 #, c-format

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

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

4063

3577 -#: builtin/checkout.c:152

4064 +#: builtin/checkout.c:151

4065 #, c-format

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

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

4068

3582 -#: builtin/checkout.c:196

4069 +#: builtin/checkout.c:195

4070 #, c-format

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

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

4073

3587 -#: builtin/checkout.c:213

4074 +#: builtin/checkout.c:212

4075 #, c-format

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

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

4078

3592 -#: builtin/checkout.c:230

4079 +#: builtin/checkout.c:229

4080 #, c-format

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

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

4083

3597 -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

3598 -#: builtin/checkout.c:260

4084 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4085 +#: builtin/checkout.c:259

4086 #, c-format

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

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

4089

3603 -#: builtin/checkout.c:263 builtin/checkout.c:266

4090 +#: builtin/checkout.c:262 builtin/checkout.c:265

4091 #, c-format

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

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

4094

3608 -#: builtin/checkout.c:269

4095 +#: builtin/checkout.c:268

4096 #, c-format

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

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

4099

3613 -#: builtin/checkout.c:280 builtin/checkout.c:474

4100 +#: builtin/checkout.c:279 builtin/checkout.c:473

4101 msgid "corrupt index file"

4102 msgstr "损坏的索引文件"

4103

3617 -#: builtin/checkout.c:340 builtin/checkout.c:347

4104 +#: builtin/checkout.c:339 builtin/checkout.c:346

4105 #, c-format

4106 msgid "path '%s' is unmerged"

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

4108

3622 -#: builtin/checkout.c:496

4109 +#: builtin/checkout.c:495

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

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

4112

3626 -#: builtin/checkout.c:627

4113 +#: builtin/checkout.c:622

4114 #, c-format

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

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

4115 +msgid "Can not do reflog for '%s': %s\n"

4116 +msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

4117

3631 -#: builtin/checkout.c:663

4118 +#: builtin/checkout.c:660

4119 msgid "HEAD is now at"

4120 msgstr "HEAD 目前位于"

4121

3635 -#: builtin/checkout.c:670

4122 +#: builtin/checkout.c:667

4123 #, c-format

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

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

4126

3640 -#: builtin/checkout.c:673

4127 +#: builtin/checkout.c:670

4128 #, c-format

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

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

4131

3645 -#: builtin/checkout.c:677

4132 +#: builtin/checkout.c:674

4133 #, c-format

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

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

4136

3650 -#: builtin/checkout.c:679 builtin/checkout.c:1134

4137 +#: builtin/checkout.c:676 builtin/checkout.c:1065

4138 #, c-format

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

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

4141

3655 -#: builtin/checkout.c:681

4142 +#: builtin/checkout.c:678

4143 #, c-format

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

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

4146

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

3661 -#: builtin/checkout.c:733

4148 +#: builtin/checkout.c:730

4149 #, c-format

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

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

4152

3666 -#: builtin/checkout.c:739

4153 +#: builtin/checkout.c:736

4154 #, c-format

4155 msgid ""

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

@@ -3684,7 +4171,7 @@ msgstr[1] ""

4171 "\n"

4172 "%s\n"

4173

3687 -#: builtin/checkout.c:758

4174 +#: builtin/checkout.c:755

4175 #, c-format

4176 msgid ""

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

@@ -3711,149 +4198,144 @@ msgstr[1] ""

4198 " git branch <新分支名> %s\n"

4199 "\n"

4200

3714 -#: builtin/checkout.c:794

4201 +#: builtin/checkout.c:791

4202 msgid "internal error in revision walk"

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

4204

3718 -#: builtin/checkout.c:798

4205 +#: builtin/checkout.c:795

4206 msgid "Previous HEAD position was"

4207 msgstr "之前的 HEAD 位置是"

4208

3722 -#: builtin/checkout.c:825 builtin/checkout.c:1129

4209 +#: builtin/checkout.c:822 builtin/checkout.c:1060

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

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

4212

3726 -#: builtin/checkout.c:931

3727 -#, c-format

3728 -msgid "'%s' is already checked out at '%s'"

3729 -msgstr "'%s' 已经检出到 '%s'"

3730 -

3731 -#: builtin/checkout.c:1036

4213 +#: builtin/checkout.c:967

4214 #, c-format

4215 msgid "only one reference expected, %d given."

4216 msgstr "只要一个引用，却给出了 %d 个"

4217

3736 -#: builtin/checkout.c:1075

4218 +#: builtin/checkout.c:1006 builtin/worktree.c:210

4219 #, c-format

4220 msgid "invalid reference: %s"

4221 msgstr "无效引用：%s"

4222

3741 -#: builtin/checkout.c:1104

4223 +#: builtin/checkout.c:1035

4224 #, c-format

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

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

4227

3746 -#: builtin/checkout.c:1143

4228 +#: builtin/checkout.c:1074

4229 msgid "paths cannot be used with switching branches"

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

4231

3750 -#: builtin/checkout.c:1146 builtin/checkout.c:1150

4232 +#: builtin/checkout.c:1077 builtin/checkout.c:1081

4233 #, c-format

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

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

4236

3755 -#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162

3756 -#: builtin/checkout.c:1165

4237 +#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

4238 +#: builtin/checkout.c:1096

4239 #, c-format

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

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

4242

3761 -#: builtin/checkout.c:1170

4243 +#: builtin/checkout.c:1101

4244 #, c-format

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

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

4247

3766 -#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83

3767 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282

3768 -#: builtin/worktree.c:284

4248 +#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

4249 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

4250 +#: builtin/worktree.c:319

4251 msgid "branch"

4252 msgstr "分支"

4253

3772 -#: builtin/checkout.c:1204

4254 +#: builtin/checkout.c:1135

4255 msgid "create and checkout a new branch"

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

4257

3776 -#: builtin/checkout.c:1206

4258 +#: builtin/checkout.c:1137

4259 msgid "create/reset and checkout a branch"

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

4261

3780 -#: builtin/checkout.c:1207

4262 +#: builtin/checkout.c:1138

4263 msgid "create reflog for new branch"

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

4265

3784 -#: builtin/checkout.c:1208

4266 +#: builtin/checkout.c:1139

4267 msgid "detach the HEAD at named commit"

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

4269

3788 -#: builtin/checkout.c:1209

4270 +#: builtin/checkout.c:1140

4271 msgid "set upstream info for new branch"

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

4273

3792 -#: builtin/checkout.c:1211

4274 +#: builtin/checkout.c:1142

4275 msgid "new-branch"

4276 msgstr "新分支"

4277

3796 -#: builtin/checkout.c:1211

4278 +#: builtin/checkout.c:1142

4279 msgid "new unparented branch"

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

4281

3800 -#: builtin/checkout.c:1212

4282 +#: builtin/checkout.c:1143

4283 msgid "checkout our version for unmerged files"

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

4285

3804 -#: builtin/checkout.c:1214

4286 +#: builtin/checkout.c:1145

4287 msgid "checkout their version for unmerged files"

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

4289

3808 -#: builtin/checkout.c:1216

4290 +#: builtin/checkout.c:1147

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

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

4293

3812 -#: builtin/checkout.c:1217

4294 +#: builtin/checkout.c:1148

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

4296 msgstr "和新的分支执行三方合并"

4297

3816 -#: builtin/checkout.c:1218 builtin/merge.c:227

4298 +#: builtin/checkout.c:1149 builtin/merge.c:227

4299 msgid "update ignored files (default)"

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

4301

3820 -#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244

4302 +#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4303 msgid "style"

4304 msgstr "风格"

4305

3824 -#: builtin/checkout.c:1220

4306 +#: builtin/checkout.c:1151

4307 msgid "conflict style (merge or diff3)"

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

4309

3828 -#: builtin/checkout.c:1223

4310 +#: builtin/checkout.c:1154

4311 msgid "do not limit pathspecs to sparse entries only"

4312 msgstr "对路径不做稀疏检出的限制"

4313

3832 -#: builtin/checkout.c:1225

4314 +#: builtin/checkout.c:1156

4315 msgid "second guess 'git checkout <no-such-branch>'"

4316 msgstr "二次猜测'git checkout <无此分支>'"

4317

3836 -#: builtin/checkout.c:1227

4318 +#: builtin/checkout.c:1158

4319 msgid "do not check if another worktree is holding the given ref"

4320 msgstr "不检查指定的引用是否被其他工作区所占用"

4321

3840 -#: builtin/checkout.c:1252

4322 +#: builtin/checkout.c:1181

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

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

4325

3844 -#: builtin/checkout.c:1269

4326 +#: builtin/checkout.c:1198

4327 msgid "--track needs a branch name"

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

4329

3848 -#: builtin/checkout.c:1274

4330 +#: builtin/checkout.c:1203

4331 msgid "Missing branch name; try -b"

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

4333

3852 -#: builtin/checkout.c:1310

4334 +#: builtin/checkout.c:1239

4335 msgid "invalid path specification"

4336 msgstr "无效的路径规格"

4337

3856 -#: builtin/checkout.c:1317

4338 +#: builtin/checkout.c:1246

4339 #, c-format

4340 msgid ""

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

@@ -3862,50 +4344,50 @@ msgstr ""

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

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

4346

3865 -#: builtin/checkout.c:1322

4347 +#: builtin/checkout.c:1251

4348 #, c-format

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

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

4351

3870 -#: builtin/checkout.c:1326

4352 +#: builtin/checkout.c:1255

4353 msgid ""

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

4355 "checking out of the index."

4356 msgstr ""

4357 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"

4358

3877 -#: builtin/clean.c:26

4359 +#: builtin/clean.c:25

4360 msgid ""

4361 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

4362 msgstr ""

4363 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."

4364

3883 -#: builtin/clean.c:30

4365 +#: builtin/clean.c:29

4366 #, c-format

4367 msgid "Removing %s\n"

4368 msgstr "正删除 %s\n"

4369

3888 -#: builtin/clean.c:31

4370 +#: builtin/clean.c:30

4371 #, c-format

4372 msgid "Would remove %s\n"

4373 msgstr "将删除 %s\n"

4374

3893 -#: builtin/clean.c:32

4375 +#: builtin/clean.c:31

4376 #, c-format

4377 msgid "Skipping repository %s\n"

4378 msgstr "忽略仓库 %s\n"

4379

3898 -#: builtin/clean.c:33

4380 +#: builtin/clean.c:32

4381 #, c-format

4382 msgid "Would skip repository %s\n"

4383 msgstr "将忽略仓库 %s\n"

4384

3903 -#: builtin/clean.c:34

4385 +#: builtin/clean.c:33

4386 #, c-format

4387 msgid "failed to remove %s"

4388 msgstr "无法删除 %s"

4389

3908 -#: builtin/clean.c:295

4390 +#: builtin/clean.c:317

4391 msgid ""

4392 "Prompt help:\n"

4393 "1 - select a numbered item\n"

@@ -3917,7 +4399,7 @@ msgstr ""

4399 "foo - 通过标题选择一个选项\n"

4400 " - （空）什么也不选择"

4401

3920 -#: builtin/clean.c:299

4402 +#: builtin/clean.c:321

4403 msgid ""

4404 "Prompt help:\n"

4405 "1 - select a single item\n"

@@ -3937,36 +4419,36 @@ msgstr ""

4419 "* - 选择所有选项\n"

4420 " - （空）结束选择"

4421

3940 -#: builtin/clean.c:515

4422 +#: builtin/clean.c:537

4423 #, c-format

4424 msgid "Huh (%s)?"

4425 msgstr "嗯（%s）？"

4426

3945 -#: builtin/clean.c:657

4427 +#: builtin/clean.c:679

4428 #, c-format

4429 msgid "Input ignore patterns>> "

4430 msgstr "输入模版以排除条目>> "

4431

3950 -#: builtin/clean.c:694

4432 +#: builtin/clean.c:716

4433 #, c-format

4434 msgid "WARNING: Cannot find items matched by: %s"

4435 msgstr "警告：无法找到和 %s 匹配的条目"

4436

3955 -#: builtin/clean.c:715

4437 +#: builtin/clean.c:737

4438 msgid "Select items to delete"

4439 msgstr "选择要删除的条目"

4440

4441 #. TRANSLATORS: Make sure to keep [y/N] as is

3960 -#: builtin/clean.c:756

4442 +#: builtin/clean.c:778

4443 #, c-format

4444 msgid "Remove %s [y/N]? "

4445 msgstr "删除 %s [y/N]？"

4446

3965 -#: builtin/clean.c:781

4447 +#: builtin/clean.c:803

4448 msgid "Bye."

4449 msgstr "再见。"

4450

3969 -#: builtin/clean.c:789

4451 +#: builtin/clean.c:811

4452 msgid ""

4453 "clean - start cleaning\n"

4454 "filter by pattern - exclude items from deletion\n"

@@ -3984,69 +4466,69 @@ msgstr ""

4466 "help - 显示本帮助\n"

4467 "? - 显示如何在提示符下选择的帮助"

4468

3987 -#: builtin/clean.c:816

4469 +#: builtin/clean.c:838

4470 msgid "*** Commands ***"

4471 msgstr "*** 命令 ***"

4472

3991 -#: builtin/clean.c:817

4473 +#: builtin/clean.c:839

4474 msgid "What now"

4475 msgstr "请选择"

4476

3995 -#: builtin/clean.c:825

4477 +#: builtin/clean.c:847

4478 msgid "Would remove the following item:"

4479 msgid_plural "Would remove the following items:"

4480 msgstr[0] "将删除如下条目："

4481 msgstr[1] "将删除如下条目："

4482

4001 -#: builtin/clean.c:842

4483 +#: builtin/clean.c:864

4484 msgid "No more files to clean, exiting."

4485 msgstr "没有要清理的文件，退出。"

4486

4005 -#: builtin/clean.c:873

4487 +#: builtin/clean.c:895

4488 msgid "do not print names of files removed"

4489 msgstr "不打印删除文件的名称"

4490

4009 -#: builtin/clean.c:875

4491 +#: builtin/clean.c:897

4492 msgid "force"

4493 msgstr "强制"

4494

4013 -#: builtin/clean.c:876

4495 +#: builtin/clean.c:898

4496 msgid "interactive cleaning"

4497 msgstr "交互式清除"

4498

4017 -#: builtin/clean.c:878

4499 +#: builtin/clean.c:900

4500 msgid "remove whole directories"

4501 msgstr "删除整个目录"

4502

4021 -#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

4503 +#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4504 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4505 msgid "pattern"

4506 msgstr "模式"

4507

4026 -#: builtin/clean.c:880

4508 +#: builtin/clean.c:902

4509 msgid "add <pattern> to ignore rules"

4510 msgstr "添加 <模式> 到忽略规则"

4511

4030 -#: builtin/clean.c:881

4512 +#: builtin/clean.c:903

4513 msgid "remove ignored files, too"

4514 msgstr "也删除忽略的文件"

4515

4034 -#: builtin/clean.c:883

4516 +#: builtin/clean.c:905

4517 msgid "remove only ignored files"

4518 msgstr "只删除忽略的文件"

4519

4038 -#: builtin/clean.c:901

4520 +#: builtin/clean.c:923

4521 msgid "-x and -X cannot be used together"

4522 msgstr "-x 和 -X 不能同时使用"

4523

4042 -#: builtin/clean.c:905

4524 +#: builtin/clean.c:927

4525 msgid ""

4526 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4527 "clean"

4528 msgstr ""

4529 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

4530

4049 -#: builtin/clean.c:908

4531 +#: builtin/clean.c:930

4532 msgid ""

4533 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4534 "refusing to clean"

@@ -4057,8 +4539,8 @@ msgstr ""

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

4540 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

4541

4060 -#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

4061 -#: builtin/push.c:523

4542 +#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4543 +#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4544 msgid "force progress reporting"

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

4546

@@ -4066,7 +4548,7 @@ msgstr "强制显示进度报告"

4548 msgid "don't create a checkout"

4549 msgstr "不创建一个检出"

4550

4069 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

4551 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

4552 msgid "create a bare repository"

4553 msgstr "创建一个纯仓库"

4554

@@ -4090,11 +4572,11 @@ msgstr "设置为共享仓库"

4572 msgid "initialize submodules in the clone"

4573 msgstr "在克隆时初始化子模组"

4574

4093 -#: builtin/clone.c:75 builtin/init-db.c:500

4575 +#: builtin/clone.c:75 builtin/init-db.c:501

4576 msgid "template-directory"

4577 msgstr "模板目录"

4578

4097 -#: builtin/clone.c:76 builtin/init-db.c:501

4579 +#: builtin/clone.c:76 builtin/init-db.c:502

4580 msgid "directory from which templates will be used"

4581 msgstr "模板目录将被使用"

4582

@@ -4122,7 +4604,8 @@ msgstr "检出 <分支> 而不是远程 HEAD"

4604 msgid "path to git-upload-pack on the remote"

4605 msgstr "远程 git-upload-pack 路径"

4606

4125 -#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

4607 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659

4608 +#: builtin/pull.c:186

4609 msgid "depth"

4610 msgstr "深度"

4611

@@ -4134,11 +4617,11 @@ msgstr "创建一个指定深度的浅克隆"

4617 msgid "clone only one branch, HEAD or --branch"

4618 msgstr "只克隆一个分支、HEAD 或 --branch"

4619

4137 -#: builtin/clone.c:91 builtin/init-db.c:509

4620 +#: builtin/clone.c:91 builtin/init-db.c:510

4621 msgid "gitdir"

4622 msgstr "git目录"

4623

4141 -#: builtin/clone.c:92 builtin/init-db.c:510

4624 +#: builtin/clone.c:92 builtin/init-db.c:511

4625 msgid "separate git dir from working tree"

4626 msgstr "git目录和工作区分离"

4627

@@ -4150,57 +4633,52 @@ msgstr "key=value"

4633 msgid "set config inside the new repository"

4634 msgstr "在新仓库中设置配置信息"

4635

4153 -#: builtin/clone.c:240

4636 +#: builtin/clone.c:298

4637 #, c-format

4638 msgid "reference repository '%s' is not a local repository."

4639 msgstr "参考仓库 '%s' 不是一个本地仓库。"

4640

4158 -#: builtin/clone.c:244

4641 +#: builtin/clone.c:302

4642 #, c-format

4643 msgid "reference repository '%s' is shallow"

4644 msgstr "参考仓库 '%s' 是一个浅克隆"

4645

4163 -#: builtin/clone.c:247

4646 +#: builtin/clone.c:305

4647 #, c-format

4648 msgid "reference repository '%s' is grafted"

4649 msgstr "参考仓库 '%s' 已被嫁接"

4650

4168 -#: builtin/clone.c:310

4169 -#, c-format

4170 -msgid "failed to create directory '%s'"

4171 -msgstr "无法创建目录 '%s'"

4172 -

4173 -#: builtin/clone.c:312 builtin/diff.c:84

4651 +#: builtin/clone.c:370 builtin/diff.c:84

4652 #, c-format

4653 msgid "failed to stat '%s'"

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

4655

4178 -#: builtin/clone.c:314

4656 +#: builtin/clone.c:372

4657 #, c-format

4658 msgid "%s exists and is not a directory"

4659 msgstr "%s 存在且不是一个目录"

4660

4183 -#: builtin/clone.c:328

4661 +#: builtin/clone.c:386

4662 #, c-format

4663 msgid "failed to stat %s\n"

4664 msgstr "无法枚举 %s 状态\n"

4665

4188 -#: builtin/clone.c:350

4666 +#: builtin/clone.c:408

4667 #, c-format

4668 msgid "failed to create link '%s'"

4669 msgstr "无法创建链接 '%s'"

4670

4193 -#: builtin/clone.c:354

4671 +#: builtin/clone.c:412

4672 #, c-format

4673 msgid "failed to copy file to '%s'"

4674 msgstr "无法拷贝文件至 '%s'"

4675

4198 -#: builtin/clone.c:377 builtin/clone.c:551

4676 +#: builtin/clone.c:435 builtin/clone.c:619

4677 #, c-format

4678 msgid "done.\n"

4679 msgstr "完成。\n"

4680

4203 -#: builtin/clone.c:389

4681 +#: builtin/clone.c:447

4682 msgid ""

4683 "Clone succeeded, but checkout failed.\n"

4684 "You can inspect what was checked out with 'git status'\n"

@@ -4210,121 +4688,121 @@ msgstr ""

4688 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

4689 "'git checkout -f HEAD' 重试\n"

4690

4213 -#: builtin/clone.c:466

4691 +#: builtin/clone.c:524

4692 #, c-format

4693 msgid "Could not find remote branch %s to clone."

4694 msgstr "不能发现要克隆的远程分支 %s。"

4695

4218 -#: builtin/clone.c:546

4696 +#: builtin/clone.c:614

4697 #, c-format

4698 msgid "Checking connectivity... "

4699 msgstr "检查连接... "

4700

4223 -#: builtin/clone.c:549

4701 +#: builtin/clone.c:617

4702 msgid "remote did not send all necessary objects"

4703 msgstr "远程没有发送所有必须的对象"

4704

4227 -#: builtin/clone.c:613

4705 +#: builtin/clone.c:681

4706 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4707 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

4708

4231 -#: builtin/clone.c:644

4709 +#: builtin/clone.c:712

4710 msgid "unable to checkout working tree"

4711 msgstr "不能检出工作区"

4712

4235 -#: builtin/clone.c:731

4713 +#: builtin/clone.c:799

4714 msgid "cannot repack to clean up"

4715 msgstr "无法执行 repack 来清理"

4716

4239 -#: builtin/clone.c:733

4717 +#: builtin/clone.c:801

4718 msgid "cannot unlink temporary alternates file"

4719 msgstr "无法删除临时的 alternates 文件"

4720

4243 -#: builtin/clone.c:763

4721 +#: builtin/clone.c:831

4722 msgid "Too many arguments."

4723 msgstr "太多参数。"

4724

4247 -#: builtin/clone.c:767

4725 +#: builtin/clone.c:835

4726 msgid "You must specify a repository to clone."

4727 msgstr "您必须指定一个仓库来克隆。"

4728

4251 -#: builtin/clone.c:778

4729 +#: builtin/clone.c:846

4730 #, c-format

4731 msgid "--bare and --origin %s options are incompatible."

4732 msgstr "--bare 和 --origin %s 选项不兼容。"

4733

4256 -#: builtin/clone.c:781

4734 +#: builtin/clone.c:849

4735 msgid "--bare and --separate-git-dir are incompatible."

4736 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

4737

4260 -#: builtin/clone.c:794

4738 +#: builtin/clone.c:862

4739 #, c-format

4740 msgid "repository '%s' does not exist"

4741 msgstr "仓库 '%s' 不存在"

4742

4265 -#: builtin/clone.c:800 builtin/fetch.c:1160

4743 +#: builtin/clone.c:868 builtin/fetch.c:1168

4744 #, c-format

4745 msgid "depth %s is not a positive number"

4746 msgstr "深度 %s 不是一个正数"

4747

4270 -#: builtin/clone.c:810

4748 +#: builtin/clone.c:878

4749 #, c-format

4750 msgid "destination path '%s' already exists and is not an empty directory."

4751 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

4752

4275 -#: builtin/clone.c:820

4753 +#: builtin/clone.c:888

4754 #, c-format

4755 msgid "working tree '%s' already exists."

4756 msgstr "工作区 '%s' 已经存在。"

4757

4280 -#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193

4281 -#: builtin/worktree.c:220

4758 +#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4759 +#: builtin/worktree.c:245

4760 #, c-format

4761 msgid "could not create leading directories of '%s'"

4762 msgstr "不能为 '%s' 创建先导目录"

4763

4286 -#: builtin/clone.c:838

4764 +#: builtin/clone.c:906

4765 #, c-format

4766 msgid "could not create work tree dir '%s'"

4767 msgstr "不能创建工作区目录 '%s'"

4768

4291 -#: builtin/clone.c:856

4769 +#: builtin/clone.c:924

4770 #, c-format

4771 msgid "Cloning into bare repository '%s'...\n"

4772 msgstr "克隆到纯仓库 '%s'...\n"

4773

4296 -#: builtin/clone.c:858

4774 +#: builtin/clone.c:926

4775 #, c-format

4776 msgid "Cloning into '%s'...\n"

4777 msgstr "正克隆到 '%s'...\n"

4778

4301 -#: builtin/clone.c:883

4779 +#: builtin/clone.c:951

4780 msgid "--dissociate given, but there is no --reference"

4781 msgstr "提供了参数 --dissociate，但未提供 --reference"

4782

4305 -#: builtin/clone.c:900

4783 +#: builtin/clone.c:968

4784 msgid "--depth is ignored in local clones; use file:// instead."

4785 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

4786

4309 -#: builtin/clone.c:903

4787 +#: builtin/clone.c:971

4788 msgid "source repository is shallow, ignoring --local"

4789 msgstr "源仓库是浅克隆，忽略 --local"

4790

4313 -#: builtin/clone.c:908

4791 +#: builtin/clone.c:976

4792 msgid "--local is ignored"

4793 msgstr "--local 被忽略"

4794

4317 -#: builtin/clone.c:912

4795 +#: builtin/clone.c:980

4796 #, c-format

4797 msgid "Don't know how to clone %s"

4798 msgstr "不知道如何克隆 %s"

4799

4322 -#: builtin/clone.c:961 builtin/clone.c:969

4800 +#: builtin/clone.c:1029 builtin/clone.c:1037

4801 #, c-format

4802 msgid "Remote branch %s not found in upstream %s"

4803 msgstr "远程分支 %s 在上游 %s 未发现"

4804

4327 -#: builtin/clone.c:972

4805 +#: builtin/clone.c:1040

4806 msgid "You appear to have cloned an empty repository."

4807 msgstr "您似乎克隆了一个空仓库。"

4808

@@ -4462,108 +4940,99 @@ msgstr ""

4940 msgid "failed to unpack HEAD tree object"

4941 msgstr "无法解包 HEAD 树对象"

4942

4465 -#: builtin/commit.c:344

4943 +#: builtin/commit.c:345

4944 msgid "unable to create temporary index"

4945 msgstr "不能创建临时索引"

4946

4469 -#: builtin/commit.c:350

4947 +#: builtin/commit.c:351

4948 msgid "interactive add failed"

4949 msgstr "交互式添加失败"

4950

4473 -#: builtin/commit.c:361

4474 -msgid "unable to write index file"

4475 -msgstr "无法写入索引文件"

4476 -

4477 -#: builtin/commit.c:363

4951 +#: builtin/commit.c:364

4952 msgid "unable to update temporary index"

4953 msgstr "无法更新临时索引"

4954

4481 -#: builtin/commit.c:365

4955 +#: builtin/commit.c:366

4956 msgid "Failed to update main cache tree"

4957 msgstr "不能更新树的主缓存"

4958

4485 -#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463

4959 +#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

4960 msgid "unable to write new_index file"

4961 msgstr "无法写 new_index 文件"

4962

4489 -#: builtin/commit.c:445

4963 +#: builtin/commit.c:444

4964 msgid "cannot do a partial commit during a merge."

4965 msgstr "在合并过程中不能做部分提交。"

4966

4493 -#: builtin/commit.c:447

4967 +#: builtin/commit.c:446

4968 msgid "cannot do a partial commit during a cherry-pick."

4969 msgstr "在拣选过程中不能做部分提交。"

4970

4497 -#: builtin/commit.c:456

4971 +#: builtin/commit.c:455

4972 msgid "cannot read the index"

4973 msgstr "无法读取索引"

4974

4501 -#: builtin/commit.c:475

4975 +#: builtin/commit.c:474

4976 msgid "unable to write temporary index file"

4977 msgstr "无法写临时索引文件"

4978

4505 -#: builtin/commit.c:580

4979 +#: builtin/commit.c:579

4980 #, c-format

4981 msgid "commit '%s' lacks author header"

4982 msgstr "提交 '%s' 缺少作者信息"

4983

4510 -#: builtin/commit.c:582

4984 +#: builtin/commit.c:581

4985 #, c-format

4986 msgid "commit '%s' has malformed author line"

4987 msgstr "提交 '%s' 有非法的作者信息"

4988

4515 -#: builtin/commit.c:601

4989 +#: builtin/commit.c:600

4990 msgid "malformed --author parameter"

4991 msgstr "非法的 --author 参数"

4992

4519 -#: builtin/commit.c:609

4993 +#: builtin/commit.c:608

4994 #, c-format

4995 msgid "invalid date format: %s"

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

4997

4524 -#: builtin/commit.c:653

4998 +#: builtin/commit.c:652

4999 msgid ""

5000 "unable to select a comment character that is not used\n"

5001 "in the current commit message"

5002 msgstr "无法选择一个未被当前提交说明使用的注释字符"

5003

4530 -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5004 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

5005 #, c-format

5006 msgid "could not lookup commit %s"

5007 msgstr "不能查询提交 %s"

5008

4535 -#: builtin/commit.c:702 builtin/shortlog.c:273

5009 +#: builtin/commit.c:701 builtin/shortlog.c:273

5010 #, c-format

5011 msgid "(reading log message from standard input)\n"

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

5013

4540 -#: builtin/commit.c:704

5014 +#: builtin/commit.c:703

5015 msgid "could not read log from standard input"

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

5017

4544 -#: builtin/commit.c:708

5018 +#: builtin/commit.c:707

5019 #, c-format

5020 msgid "could not read log file '%s'"

5021 msgstr "不能读取日志文件 '%s'"

5022

4549 -#: builtin/commit.c:730

5023 +#: builtin/commit.c:729

5024 msgid "could not read MERGE_MSG"

5025 msgstr "不能读取 MERGE_MSG"

5026

4553 -#: builtin/commit.c:734

5027 +#: builtin/commit.c:733

5028 msgid "could not read SQUASH_MSG"

5029 msgstr "不能读取 SQUASH_MSG"

5030

4557 -#: builtin/commit.c:738 builtin/merge.c:1079

4558 -#, c-format

4559 -msgid "could not read '%s'"

4560 -msgstr "不能读取 '%s'"

4561 -

4562 -#: builtin/commit.c:785

5031 +#: builtin/commit.c:784

5032 msgid "could not write commit template"

5033 msgstr "不能写提交模版"

5034

4566 -#: builtin/commit.c:803

5035 +#: builtin/commit.c:802

5036 #, c-format

5037 msgid ""

5038 "\n"

@@ -4577,7 +5046,7 @@ msgstr ""

5046 "\t%s\n"

5047 "然后重试。\n"

5048

4580 -#: builtin/commit.c:808

5049 +#: builtin/commit.c:807

5050 #, c-format

5051 msgid ""

5052 "\n"

@@ -4591,7 +5060,7 @@ msgstr ""

5060 "\t%s\n"

5061 "然后重试。\n"

5062

4594 -#: builtin/commit.c:821

5063 +#: builtin/commit.c:820

5064 #, c-format

5065 msgid ""

5066 "Please enter the commit message for your changes. Lines starting\n"

@@ -4600,7 +5069,7 @@ msgstr ""

5069 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

5070 "说明将会终止提交。\n"

5071

4603 -#: builtin/commit.c:828

5072 +#: builtin/commit.c:827

5073 #, c-format

5074 msgid ""

5075 "Please enter the commit message for your changes. Lines starting\n"

@@ -4611,353 +5080,340 @@ msgstr ""

5080 "也可以删除它们。一个空的提交说明将会终止提交。\n"

5081

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

4614 -#: builtin/commit.c:848

5083 +#: builtin/commit.c:847

5084 #, c-format

5085 msgid "%sAuthor: %.*s <%.*s>"

5086 msgstr "%s作者： %.*s <%.*s>"

5087

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

4620 -#: builtin/commit.c:856

5089 +#: builtin/commit.c:855

5090 #, c-format

5091 msgid "%sDate: %s"

5092 msgstr "%s日期： %s"

5093

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

4626 -#: builtin/commit.c:863

5095 +#: builtin/commit.c:862

5096 #, c-format

5097 msgid "%sCommitter: %.*s <%.*s>"

5098 msgstr "%s提交者：%.*s <%.*s>"

5099

4631 -#: builtin/commit.c:881

5100 +#: builtin/commit.c:880

5101 msgid "Cannot read index"

5102 msgstr "无法读取索引"

5103

4635 -#: builtin/commit.c:938

5104 +#: builtin/commit.c:937

5105 msgid "Error building trees"

5106 msgstr "无法创建树对象"

5107

4639 -#: builtin/commit.c:953 builtin/tag.c:495

5108 +#: builtin/commit.c:952 builtin/tag.c:495

5109 #, c-format

5110 msgid "Please supply the message using either -m or -F option.\n"

5111 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

5112

4644 -#: builtin/commit.c:1055

5113 +#: builtin/commit.c:1054

5114 #, c-format

5115 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5116 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"

5117

4649 -#: builtin/commit.c:1070 builtin/commit.c:1310

5118 +#: builtin/commit.c:1069 builtin/commit.c:1309

5119 #, c-format

5120 msgid "Invalid untracked files mode '%s'"

5121 msgstr "无效的未追踪文件参数 '%s'"

5122

4654 -#: builtin/commit.c:1107

5123 +#: builtin/commit.c:1106

5124 msgid "--long and -z are incompatible"

5125 msgstr "--long 和 -z 选项不兼容"

5126

4658 -#: builtin/commit.c:1137

5127 +#: builtin/commit.c:1136

5128 msgid "Using both --reset-author and --author does not make sense"

5129 msgstr "同时使用 --reset-author 和 --author 没有意义"

5130

4662 -#: builtin/commit.c:1146

5131 +#: builtin/commit.c:1145

5132 msgid "You have nothing to amend."

5133 msgstr "您没有可修补的提交。"

5134

4666 -#: builtin/commit.c:1149

5135 +#: builtin/commit.c:1148

5136 msgid "You are in the middle of a merge -- cannot amend."

5137 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

5138

4670 -#: builtin/commit.c:1151

5139 +#: builtin/commit.c:1150

5140 msgid "You are in the middle of a cherry-pick -- cannot amend."

5141 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

5142

4674 -#: builtin/commit.c:1154

5143 +#: builtin/commit.c:1153

5144 msgid "Options --squash and --fixup cannot be used together"

5145 msgstr "选项 --squash 和 --fixup 不能同时使用"

5146

4678 -#: builtin/commit.c:1164

5147 +#: builtin/commit.c:1163

5148 msgid "Only one of -c/-C/-F/--fixup can be used."

5149 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

5150

4682 -#: builtin/commit.c:1166

5151 +#: builtin/commit.c:1165

5152 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

5153 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

5154

4686 -#: builtin/commit.c:1174

5155 +#: builtin/commit.c:1173

5156 msgid "--reset-author can be used only with -C, -c or --amend."

5157 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

5158

4690 -#: builtin/commit.c:1191

5159 +#: builtin/commit.c:1190

5160 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

5161 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

5162

4694 -#: builtin/commit.c:1193

5163 +#: builtin/commit.c:1192

5164 msgid "No paths with --include/--only does not make sense."

5165 msgstr "参数 --include/--only 不跟路径没有意义。"

5166

4698 -#: builtin/commit.c:1195

5167 +#: builtin/commit.c:1194

5168 msgid "Clever... amending the last one with dirty index."

5169 msgstr "聪明... 用脏索引修补最后一个提交。"

5170

4702 -#: builtin/commit.c:1197

5171 +#: builtin/commit.c:1196

5172 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

5173 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."

5174

4706 -#: builtin/commit.c:1209 builtin/tag.c:728

5175 +#: builtin/commit.c:1208 builtin/tag.c:730

5176 #, c-format

5177 msgid "Invalid cleanup mode %s"

5178 msgstr "无效的清理模式 %s"

5179

4711 -#: builtin/commit.c:1214

5180 +#: builtin/commit.c:1213

5181 msgid "Paths with -a does not make sense."

5182 msgstr "路径和 -a 选项同时使用没有意义。"

5183

4715 -#: builtin/commit.c:1324 builtin/commit.c:1603

5184 +#: builtin/commit.c:1323 builtin/commit.c:1602

5185 msgid "show status concisely"

5186 msgstr "以简洁的格式显示状态"

5187

4719 -#: builtin/commit.c:1326 builtin/commit.c:1605

5188 +#: builtin/commit.c:1325 builtin/commit.c:1604

5189 msgid "show branch information"

5190 msgstr "显示分支信息"

5191

4723 -#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

5192 +#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

5193 msgid "machine-readable output"

5194 msgstr "机器可读的输出"

5195

4727 -#: builtin/commit.c:1331 builtin/commit.c:1609

5196 +#: builtin/commit.c:1330 builtin/commit.c:1608

5197 msgid "show status in long format (default)"

5198 msgstr "以长格式显示状态（默认）"

5199

4731 -#: builtin/commit.c:1334 builtin/commit.c:1612

5200 +#: builtin/commit.c:1333 builtin/commit.c:1611

5201 msgid "terminate entries with NUL"

5202 msgstr "条目以 NUL 字符结尾"

5203

4735 -#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

4736 -#: builtin/fast-export.c:983 builtin/tag.c:603

5204 +#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

5205 +#: builtin/fast-export.c:984 builtin/tag.c:604

5206 msgid "mode"

5207 msgstr "模式"

5208

4740 -#: builtin/commit.c:1337 builtin/commit.c:1615

5209 +#: builtin/commit.c:1336 builtin/commit.c:1614

5210 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

5211 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

5212

4744 -#: builtin/commit.c:1340

5213 +#: builtin/commit.c:1339

5214 msgid "show ignored files"

5215 msgstr "显示忽略的文件"

5216

4748 -#: builtin/commit.c:1341 parse-options.h:152

5217 +#: builtin/commit.c:1340 parse-options.h:155

5218 msgid "when"

5219 msgstr "何时"

5220

4752 -#: builtin/commit.c:1342

5221 +#: builtin/commit.c:1341

5222 msgid ""

5223 "ignore changes to submodules, optional when: all, dirty, untracked. "

5224 "(Default: all)"

5225 msgstr ""

5226 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

5227

4759 -#: builtin/commit.c:1344

5228 +#: builtin/commit.c:1343

5229 msgid "list untracked files in columns"

5230 msgstr "以列的方式显示未跟踪的文件"

5231

4763 -#: builtin/commit.c:1430

5232 +#: builtin/commit.c:1429

5233 msgid "couldn't look up newly created commit"

5234 msgstr "无法找到新创建的提交"

5235

4767 -#: builtin/commit.c:1432

5236 +#: builtin/commit.c:1431

5237 msgid "could not parse newly created commit"

5238 msgstr "不能解析新创建的提交"

5239

4771 -#: builtin/commit.c:1477

5240 +#: builtin/commit.c:1476

5241 msgid "detached HEAD"

5242 msgstr "分离头指针"

5243

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

4776 -#: builtin/commit.c:1480

5245 +#: builtin/commit.c:1479

5246 msgid " (root-commit)"

5247 msgstr "（根提交）"

5248

4780 -#: builtin/commit.c:1573

5249 +#: builtin/commit.c:1572

5250 msgid "suppress summary after successful commit"

5251 msgstr "提交成功后不显示概述信息"

5252

4784 -#: builtin/commit.c:1574

5253 +#: builtin/commit.c:1573

5254 msgid "show diff in commit message template"

5255 msgstr "在提交说明模板里显示差异"

5256

4788 -#: builtin/commit.c:1576

5257 +#: builtin/commit.c:1575

5258 msgid "Commit message options"

5259 msgstr "提交说明选项"

5260

4792 -#: builtin/commit.c:1577 builtin/tag.c:601

5261 +#: builtin/commit.c:1576 builtin/tag.c:602

5262 msgid "read message from file"

5263 msgstr "从文件中读取提交说明"

5264

4796 -#: builtin/commit.c:1578

5265 +#: builtin/commit.c:1577

5266 msgid "author"

5267 msgstr "作者"

5268

4800 -#: builtin/commit.c:1578

5269 +#: builtin/commit.c:1577

5270 msgid "override author for commit"

5271 msgstr "提交时覆盖作者"

5272

4804 -#: builtin/commit.c:1579 builtin/gc.c:280

5273 +#: builtin/commit.c:1578 builtin/gc.c:268

5274 msgid "date"

5275 msgstr "日期"

5276

4808 -#: builtin/commit.c:1579

5277 +#: builtin/commit.c:1578

5278 msgid "override date for commit"

5279 msgstr "提交时覆盖日期"

5280

4812 -#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

4813 -#: builtin/notes.c:554 builtin/tag.c:599

5281 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

5282 +#: builtin/notes.c:555 builtin/tag.c:600

5283 msgid "message"

5284 msgstr "说明"

5285

4817 -#: builtin/commit.c:1580

5286 +#: builtin/commit.c:1579

5287 msgid "commit message"

5288 msgstr "提交说明"

5289

4821 -#: builtin/commit.c:1581

5290 +#: builtin/commit.c:1580

5291 msgid "reuse and edit message from specified commit"

5292 msgstr "重用并编辑指定提交的提交说明"

5293

4825 -#: builtin/commit.c:1582

5294 +#: builtin/commit.c:1581

5295 msgid "reuse message from specified commit"

5296 msgstr "重用指定提交的提交说明"

5297

4829 -#: builtin/commit.c:1583

5298 +#: builtin/commit.c:1582

5299 msgid "use autosquash formatted message to fixup specified commit"

5300 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

5301

4833 -#: builtin/commit.c:1584

5302 +#: builtin/commit.c:1583

5303 msgid "use autosquash formatted message to squash specified commit"

5304 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

5305

4837 -#: builtin/commit.c:1585

5306 +#: builtin/commit.c:1584

5307 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5308 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

5309

4841 -#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

5310 +#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

5311 msgid "add Signed-off-by:"

5312 msgstr "添加 Signed-off-by: 签名"

5313

4845 -#: builtin/commit.c:1587

5314 +#: builtin/commit.c:1586

5315 msgid "use specified template file"

5316 msgstr "使用指定的模板文件"

5317

4849 -#: builtin/commit.c:1588

5318 +#: builtin/commit.c:1587

5319 msgid "force edit of commit"

5320 msgstr "强制编辑提交"

5321

5322 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

4854 -#: builtin/commit.c:1589

5323 +#: builtin/commit.c:1588

5324 msgid "default"

5325 msgstr "default"

5326

4858 -#: builtin/commit.c:1589 builtin/tag.c:604

5327 +#: builtin/commit.c:1588 builtin/tag.c:605

5328 msgid "how to strip spaces and #comments from message"

5329 msgstr "设置如何删除提交说明里的空格和#注释"

5330

4862 -#: builtin/commit.c:1590

5331 +#: builtin/commit.c:1589

5332 msgid "include status in commit message template"

5333 msgstr "在提交说明模板里包含状态信息"

5334

4866 -#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4867 -#: builtin/tag.c:605

4868 -msgid "key-id"

4869 -msgstr "key-id"

4870 -

4871 -#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

5335 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

5336 +#: builtin/revert.c:93

5337 msgid "GPG sign commit"

5338 msgstr "GPG 提交签名"

5339

4875 -#: builtin/commit.c:1595

5340 +#: builtin/commit.c:1594

5341 msgid "Commit contents options"

5342 msgstr "提交内容选项"

5343

4879 -#: builtin/commit.c:1596

5344 +#: builtin/commit.c:1595

5345 msgid "commit all changed files"

5346 msgstr "提交所有改动的文件"

5347

4883 -#: builtin/commit.c:1597

5348 +#: builtin/commit.c:1596

5349 msgid "add specified files to index for commit"

5350 msgstr "添加指定的文件到索引区等待提交"

5351

4887 -#: builtin/commit.c:1598

5352 +#: builtin/commit.c:1597

5353 msgid "interactively add files"

5354 msgstr "交互式添加文件"

5355

4891 -#: builtin/commit.c:1599

5356 +#: builtin/commit.c:1598

5357 msgid "interactively add changes"

5358 msgstr "交互式添加变更"

5359

4895 -#: builtin/commit.c:1600

5360 +#: builtin/commit.c:1599

5361 msgid "commit only specified files"

5362 msgstr "只提交指定的文件"

5363

4899 -#: builtin/commit.c:1601

5364 +#: builtin/commit.c:1600

5365 msgid "bypass pre-commit hook"

5366 msgstr "绕过 pre-commit 钩子"

5367

4903 -#: builtin/commit.c:1602

5368 +#: builtin/commit.c:1601

5369 msgid "show what would be committed"

5370 msgstr "显示将要提交的内容"

5371

4907 -#: builtin/commit.c:1613

5372 +#: builtin/commit.c:1612

5373 msgid "amend previous commit"

5374 msgstr "修改先前的提交"

5375

4911 -#: builtin/commit.c:1614

5376 +#: builtin/commit.c:1613

5377 msgid "bypass post-rewrite hook"

5378 msgstr "绕过 post-rewrite 钩子"

5379

4915 -#: builtin/commit.c:1619

5380 +#: builtin/commit.c:1618

5381 msgid "ok to record an empty change"

5382 msgstr "允许一个空提交"

5383

4919 -#: builtin/commit.c:1621

5384 +#: builtin/commit.c:1620

5385 msgid "ok to record a change with an empty message"

5386 msgstr "允许空的提交说明"

5387

4923 -#: builtin/commit.c:1650

5388 +#: builtin/commit.c:1649

5389 msgid "could not parse HEAD commit"

5390 msgstr "不能解析 HEAD 提交"

5391

4927 -#: builtin/commit.c:1689 builtin/merge.c:1076

4928 -#, c-format

4929 -msgid "could not open '%s' for reading"

4930 -msgstr "不能为读入打开 '%s'"

4931 -

4932 -#: builtin/commit.c:1696

5392 +#: builtin/commit.c:1695

5393 #, c-format

5394 msgid "Corrupt MERGE_HEAD file (%s)"

5395 msgstr "损坏的 MERGE_HEAD 文件（%s）"

5396

4937 -#: builtin/commit.c:1703

5397 +#: builtin/commit.c:1702

5398 msgid "could not read MERGE_MODE"

5399 msgstr "不能读取 MERGE_MODE"

5400

4941 -#: builtin/commit.c:1722

5401 +#: builtin/commit.c:1721

5402 #, c-format

5403 msgid "could not read commit message: %s"

5404 msgstr "不能读取提交说明：%s"

5405

4946 -#: builtin/commit.c:1733

5406 +#: builtin/commit.c:1732

5407 #, c-format

5408 msgid "Aborting commit; you did not edit the message.\n"

5409 msgstr "终止提交；您未更改来自模版的提交说明。\n"

5410

4951 -#: builtin/commit.c:1738

5411 +#: builtin/commit.c:1737

5412 #, c-format

5413 msgid "Aborting commit due to empty commit message.\n"

5414 msgstr "终止提交因为提交说明为空。\n"

5415

4956 -#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

4957 -msgid "failed to write commit object"

4958 -msgstr "无法写提交对象"

4959 -

4960 -#: builtin/commit.c:1786

5416 +#: builtin/commit.c:1785

5417 msgid ""

5418 "Repository has been updated, but unable to write\n"

5419 "new_index file. Check that disk is not full and quota is\n"

@@ -4970,131 +5426,135 @@ msgstr ""

5426 msgid "git config [<options>]"

5427 msgstr "git config [<选项>]"

5428

4973 -#: builtin/config.c:53

5429 +#: builtin/config.c:54

5430 msgid "Config file location"

5431 msgstr "配置文件位置"

5432

4977 -#: builtin/config.c:54

5433 +#: builtin/config.c:55

5434 msgid "use global config file"

5435 msgstr "使用全局配置文件"

5436

4981 -#: builtin/config.c:55

5437 +#: builtin/config.c:56

5438 msgid "use system config file"

5439 msgstr "使用系统级配置文件"

5440

4985 -#: builtin/config.c:56

5441 +#: builtin/config.c:57

5442 msgid "use repository config file"

5443 msgstr "使用仓库级配置文件"

5444

4989 -#: builtin/config.c:57

5445 +#: builtin/config.c:58

5446 msgid "use given config file"

5447 msgstr "使用指定的配置文件"

5448

4993 -#: builtin/config.c:58

5449 +#: builtin/config.c:59

5450 msgid "blob-id"

5451 msgstr "数据对象 ID"

5452

4997 -#: builtin/config.c:58

5453 +#: builtin/config.c:59

5454 msgid "read config from given blob object"

5455 msgstr "从给定的数据对象读取配置"

5456

5001 -#: builtin/config.c:59

5457 +#: builtin/config.c:60

5458 msgid "Action"

5459 msgstr "操作"

5460

5005 -#: builtin/config.c:60

5461 +#: builtin/config.c:61

5462 msgid "get value: name [value-regex]"

5463 msgstr "获取值：name [value-regex]"

5464

5009 -#: builtin/config.c:61

5465 +#: builtin/config.c:62

5466 msgid "get all values: key [value-regex]"

5467 msgstr "获得所有的值：key [value-regex]"

5468

5013 -#: builtin/config.c:62

5469 +#: builtin/config.c:63

5470 msgid "get values for regexp: name-regex [value-regex]"

5471 msgstr "根据正则表达式获得值：name-regex [value-regex]"

5472

5017 -#: builtin/config.c:63

5473 +#: builtin/config.c:64

5474 msgid "get value specific for the URL: section[.var] URL"

5475 msgstr "获得 URL 取值：section[.var] URL"

5476

5021 -#: builtin/config.c:64

5477 +#: builtin/config.c:65

5478 msgid "replace all matching variables: name value [value_regex]"

5479 msgstr "替换所有匹配的变量：name value [value_regex]"

5480

5025 -#: builtin/config.c:65

5481 +#: builtin/config.c:66

5482 msgid "add a new variable: name value"

5483 msgstr "添加一个新的变量：name value"

5484

5029 -#: builtin/config.c:66

5485 +#: builtin/config.c:67

5486 msgid "remove a variable: name [value-regex]"

5487 msgstr "删除一个变量：name [value-regex]"

5488

5033 -#: builtin/config.c:67

5489 +#: builtin/config.c:68

5490 msgid "remove all matches: name [value-regex]"

5491 msgstr "删除所有匹配项：name [value-regex]"

5492

5037 -#: builtin/config.c:68

5493 +#: builtin/config.c:69

5494 msgid "rename section: old-name new-name"

5495 msgstr "重命名小节：old-name new-name"

5496

5041 -#: builtin/config.c:69

5497 +#: builtin/config.c:70

5498 msgid "remove a section: name"

5499 msgstr "删除一个小节：name"

5500

5045 -#: builtin/config.c:70

5501 +#: builtin/config.c:71

5502 msgid "list all"

5503 msgstr "列出所有"

5504

5049 -#: builtin/config.c:71

5505 +#: builtin/config.c:72

5506 msgid "open an editor"

5507 msgstr "打开一个编辑器"

5508

5053 -#: builtin/config.c:72

5509 +#: builtin/config.c:73

5510 msgid "find the color configured: slot [default]"

5511 msgstr "获得配置的颜色：配置 [默认]"

5512

5057 -#: builtin/config.c:73

5513 +#: builtin/config.c:74

5514 msgid "find the color setting: slot [stdout-is-tty]"

5515 msgstr "获得颜色设置：配置 [stdout-is-tty]"

5516

5061 -#: builtin/config.c:74

5517 +#: builtin/config.c:75

5518 msgid "Type"

5519 msgstr "类型"

5520

5065 -#: builtin/config.c:75

5521 +#: builtin/config.c:76

5522 msgid "value is \"true\" or \"false\""

5523 msgstr "值是 \"true\" 或 \"false\""

5524

5069 -#: builtin/config.c:76

5525 +#: builtin/config.c:77

5526 msgid "value is decimal number"

5527 msgstr "值是十进制数"

5528

5073 -#: builtin/config.c:77

5529 +#: builtin/config.c:78

5530 msgid "value is --bool or --int"

5531 msgstr "值是 --bool or --int"

5532

5077 -#: builtin/config.c:78

5533 +#: builtin/config.c:79

5534 msgid "value is a path (file or directory name)"

5535 msgstr "值是一个路径（文件或目录名）"

5536

5081 -#: builtin/config.c:79

5537 +#: builtin/config.c:80

5538 msgid "Other"

5539 msgstr "其它"

5540

5085 -#: builtin/config.c:80

5541 +#: builtin/config.c:81

5542 msgid "terminate values with NUL byte"

5543 msgstr "终止值是 NUL 字节"

5544

5089 -#: builtin/config.c:81

5545 +#: builtin/config.c:82

5546 +msgid "show variable names only"

5547 +msgstr "只显示变量名"

5548 +

5549 +#: builtin/config.c:83

5550 msgid "respect include directives on lookup"

5551 msgstr "查询时参照 include 指令递归查找"

5552

5093 -#: builtin/config.c:316

5553 +#: builtin/config.c:311

5554 msgid "unable to parse default color value"

5555 msgstr "不能解析默认颜色值"

5556

5097 -#: builtin/config.c:457

5557 +#: builtin/config.c:449

5558 #, c-format

5559 msgid ""

5560 "# This is Git's per-user configuration file.\n"

@@ -5109,7 +5569,7 @@ msgstr ""

5569 "#\tname = %s\n"

5570 "#\temail = %s\n"

5571

5112 -#: builtin/config.c:587

5572 +#: builtin/config.c:583

5573 #, c-format

5574 msgid "cannot create configuration file %s"

5575 msgstr "不能创建配置文件 %s"

@@ -5145,7 +5605,7 @@ msgstr "附注标签 %s 没有嵌入名称"

5605 msgid "tag '%s' is really '%s' here"

5606 msgstr "标签 '%s' 的确是在 '%s'"

5607

5148 -#: builtin/describe.c:250 builtin/log.c:452

5608 +#: builtin/describe.c:250 builtin/log.c:459

5609 #, c-format

5610 msgid "Not a valid object name %s"

5611 msgstr "不是一个有效的对象名 %s"

@@ -5291,231 +5751,231 @@ msgstr "提供了超过两个数据对象：'%s'"

5751 msgid "unhandled object '%s' given."

5752 msgstr "无法处理的对象 '%s'。"

5753

5294 -#: builtin/fast-export.c:24

5754 +#: builtin/fast-export.c:25

5755 msgid "git fast-export [rev-list-opts]"

5756 msgstr "git fast-export [rev-list-opts]"

5757

5298 -#: builtin/fast-export.c:979

5758 +#: builtin/fast-export.c:980

5759 msgid "show progress after <n> objects"

5760 msgstr "在 <n> 个对象之后显示进度"

5761

5302 -#: builtin/fast-export.c:981

5762 +#: builtin/fast-export.c:982

5763 msgid "select handling of signed tags"

5764 msgstr "选择如何处理签名标签"

5765

5306 -#: builtin/fast-export.c:984

5766 +#: builtin/fast-export.c:985

5767 msgid "select handling of tags that tag filtered objects"

5768 msgstr "选择当标签指向被过滤对象时该标签的处理方式"

5769

5310 -#: builtin/fast-export.c:987

5770 +#: builtin/fast-export.c:988

5771 msgid "Dump marks to this file"

5772 msgstr "把标记存储到这个文件"

5773

5314 -#: builtin/fast-export.c:989

5774 +#: builtin/fast-export.c:990

5775 msgid "Import marks from this file"

5776 msgstr "从这个文件导入标记"

5777

5318 -#: builtin/fast-export.c:991

5778 +#: builtin/fast-export.c:992

5779 msgid "Fake a tagger when tags lack one"

5780 msgstr "当标签缺少标记者字段时，假装提供一个"

5781

5322 -#: builtin/fast-export.c:993

5782 +#: builtin/fast-export.c:994

5783 msgid "Output full tree for each commit"

5784 msgstr "每次提交都输出整个树"

5785

5326 -#: builtin/fast-export.c:995

5786 +#: builtin/fast-export.c:996

5787 msgid "Use the done feature to terminate the stream"

5788 msgstr "使用 done 功能来终止流"

5789

5330 -#: builtin/fast-export.c:996

5790 +#: builtin/fast-export.c:997

5791 msgid "Skip output of blob data"

5792 msgstr "跳过数据对象的输出"

5793

5334 -#: builtin/fast-export.c:997

5794 +#: builtin/fast-export.c:998

5795 msgid "refspec"

5796 msgstr "引用规格"

5797

5338 -#: builtin/fast-export.c:998

5798 +#: builtin/fast-export.c:999

5799 msgid "Apply refspec to exported refs"

5800 msgstr "对导出的引用应用引用规格"

5801

5342 -#: builtin/fast-export.c:999

5802 +#: builtin/fast-export.c:1000

5803 msgid "anonymize output"

5804 msgstr "匿名输出"

5805

5346 -#: builtin/fetch.c:19

5806 +#: builtin/fetch.c:20

5807 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

5808 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"

5809

5350 -#: builtin/fetch.c:20

5810 +#: builtin/fetch.c:21

5811 msgid "git fetch [<options>] <group>"

5812 msgstr "git fetch [<选项>] <组>"

5813

5354 -#: builtin/fetch.c:21

5814 +#: builtin/fetch.c:22

5815 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

5816 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"

5817

5358 -#: builtin/fetch.c:22

5818 +#: builtin/fetch.c:23

5819 msgid "git fetch --all [<options>]"

5820 msgstr "git fetch --all [<选项>]"

5821

5362 -#: builtin/fetch.c:89

5822 +#: builtin/fetch.c:90 builtin/pull.c:162

5823 msgid "fetch from all remotes"

5824 msgstr "从所有的远程抓取"

5825

5366 -#: builtin/fetch.c:91

5826 +#: builtin/fetch.c:92 builtin/pull.c:165

5827 msgid "append to .git/FETCH_HEAD instead of overwriting"

5828 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

5829

5370 -#: builtin/fetch.c:93

5830 +#: builtin/fetch.c:94 builtin/pull.c:168

5831 msgid "path to upload pack on remote end"

5832 msgstr "上传包到远程的路径"

5833

5374 -#: builtin/fetch.c:94

5834 +#: builtin/fetch.c:95 builtin/pull.c:170

5835 msgid "force overwrite of local branch"

5836 msgstr "强制覆盖本地分支"

5837

5378 -#: builtin/fetch.c:96

5838 +#: builtin/fetch.c:97

5839 msgid "fetch from multiple remotes"

5840 msgstr "从多个远程抓取"

5841

5382 -#: builtin/fetch.c:98

5842 +#: builtin/fetch.c:99 builtin/pull.c:172

5843 msgid "fetch all tags and associated objects"

5844 msgstr "抓取所有的标签和关联对象"

5845

5386 -#: builtin/fetch.c:100

5846 +#: builtin/fetch.c:101

5847 msgid "do not fetch all tags (--no-tags)"

5848 msgstr "不抓取任何标签(--no-tags)"

5849

5390 -#: builtin/fetch.c:102

5850 +#: builtin/fetch.c:103 builtin/pull.c:175

5851 msgid "prune remote-tracking branches no longer on remote"

5852 msgstr "清除远程已经不存在的分支的跟踪分支"

5853

5854 # 译者：可选值，不能翻译

5395 -#: builtin/fetch.c:103

5855 +#: builtin/fetch.c:104 builtin/pull.c:178

5856 msgid "on-demand"

5857 msgstr "on-demand"

5858

5399 -#: builtin/fetch.c:104

5859 +#: builtin/fetch.c:105 builtin/pull.c:179

5860 msgid "control recursive fetching of submodules"

5861 msgstr "控制子模组的递归抓取"

5862

5403 -#: builtin/fetch.c:108

5863 +#: builtin/fetch.c:109 builtin/pull.c:184

5864 msgid "keep downloaded pack"

5865 msgstr "保持下载包"

5866

5407 -#: builtin/fetch.c:110

5867 +#: builtin/fetch.c:111

5868 msgid "allow updating of HEAD ref"

5869 msgstr "允许更新 HEAD 引用"

5870

5411 -#: builtin/fetch.c:113

5871 +#: builtin/fetch.c:114 builtin/pull.c:187

5872 msgid "deepen history of shallow clone"

5873 msgstr "深化浅克隆的历史"

5874

5415 -#: builtin/fetch.c:115

5875 +#: builtin/fetch.c:116 builtin/pull.c:190

5876 msgid "convert to a complete repository"

5877 msgstr "转换为一个完整的仓库"

5878

5419 -#: builtin/fetch.c:117 builtin/log.c:1208

5879 +#: builtin/fetch.c:118 builtin/log.c:1233

5880 msgid "dir"

5881 msgstr "目录"

5882

5423 -#: builtin/fetch.c:118

5883 +#: builtin/fetch.c:119

5884 msgid "prepend this to submodule path output"

5885 msgstr "在子模组路径输出的前面加上此目录"

5886

5427 -#: builtin/fetch.c:121

5887 +#: builtin/fetch.c:122

5888 msgid "default mode for recursion"

5889 msgstr "递归的默认模式"

5890

5431 -#: builtin/fetch.c:123

5891 +#: builtin/fetch.c:124 builtin/pull.c:193

5892 msgid "accept refs that update .git/shallow"

5893 msgstr "接受更新 .git/shallow 的引用"

5894

5435 -#: builtin/fetch.c:124

5895 +#: builtin/fetch.c:125 builtin/pull.c:195

5896 msgid "refmap"

5897 msgstr "引用映射"

5898

5439 -#: builtin/fetch.c:125

5899 +#: builtin/fetch.c:126 builtin/pull.c:196

5900 msgid "specify fetch refmap"

5901 msgstr "指定获取操作的引用映射"

5902

5443 -#: builtin/fetch.c:377

5903 +#: builtin/fetch.c:378

5904 msgid "Couldn't find remote ref HEAD"

5905 msgstr "无法发现远程 HEAD 引用"

5906

5447 -#: builtin/fetch.c:457

5907 +#: builtin/fetch.c:458

5908 #, c-format

5909 msgid "object %s not found"

5910 msgstr "对象 %s 未发现"

5911

5452 -#: builtin/fetch.c:462

5912 +#: builtin/fetch.c:463

5913 msgid "[up to date]"

5914 msgstr "[最新]"

5915

5456 -#: builtin/fetch.c:476

5916 +#: builtin/fetch.c:477

5917 #, c-format

5918 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5919 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

5920

5461 -#: builtin/fetch.c:477 builtin/fetch.c:563

5921 +#: builtin/fetch.c:478 builtin/fetch.c:564

5922 msgid "[rejected]"

5923 msgstr "[已拒绝]"

5924

5465 -#: builtin/fetch.c:488

5925 +#: builtin/fetch.c:489

5926 msgid "[tag update]"

5927 msgstr "[标签更新]"

5928

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

5470 -#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5930 +#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544

5931 msgid " (unable to update local ref)"

5932 msgstr " （不能更新本地引用）"

5933

5474 -#: builtin/fetch.c:508

5934 +#: builtin/fetch.c:509

5935 msgid "[new tag]"

5936 msgstr "[新标签]"

5937

5478 -#: builtin/fetch.c:511

5938 +#: builtin/fetch.c:512

5939 msgid "[new branch]"

5940 msgstr "[新分支]"

5941

5482 -#: builtin/fetch.c:514

5942 +#: builtin/fetch.c:515

5943 msgid "[new ref]"

5944 msgstr "[新引用]"

5945

5486 -#: builtin/fetch.c:559

5946 +#: builtin/fetch.c:560

5947 msgid "unable to update local ref"

5948 msgstr "不能更新本地引用"

5949

5490 -#: builtin/fetch.c:559

5950 +#: builtin/fetch.c:560

5951 msgid "forced update"

5952 msgstr "强制更新"

5953

5494 -#: builtin/fetch.c:565

5954 +#: builtin/fetch.c:566

5955 msgid "(non-fast-forward)"

5956 msgstr "（非快进式）"

5957

5498 -#: builtin/fetch.c:599 builtin/fetch.c:832

5958 +#: builtin/fetch.c:600 builtin/fetch.c:842

5959 #, c-format

5960 msgid "cannot open %s: %s\n"

5961 msgstr "无法打开 %s：%s\n"

5962

5503 -#: builtin/fetch.c:608

5963 +#: builtin/fetch.c:609

5964 #, c-format

5965 msgid "%s did not send all necessary objects\n"

5966 msgstr "%s 未发送所有必须的对象\n"

5967

5508 -#: builtin/fetch.c:626

5968 +#: builtin/fetch.c:627

5969 #, c-format

5970 msgid "reject %s because shallow roots are not allowed to be updated"

5971 msgstr "拒绝 %s 因为浅克隆不允许被更新"

5972

5513 -#: builtin/fetch.c:714 builtin/fetch.c:797

5973 +#: builtin/fetch.c:715 builtin/fetch.c:807

5974 #, c-format

5975 msgid "From %.*s\n"

5976 msgstr "来自 %.*s\n"

5977

5518 -#: builtin/fetch.c:725

5978 +#: builtin/fetch.c:726

5979 #, c-format

5980 msgid ""

5981 "some local refs could not be updated; try running\n"

@@ -5525,275 +5985,264 @@ msgstr ""

5985 " 'git remote prune %s' 来删除旧的、有冲突的分支"

5986

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

5528 -#: builtin/fetch.c:777

5988 +#: builtin/fetch.c:778

5989 #, c-format

5990 msgid " (%s will become dangling)"

5991 msgstr " （%s 将成为摇摆状态）"

5992

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

5534 -#: builtin/fetch.c:778

5994 +#: builtin/fetch.c:779

5995 #, c-format

5996 msgid " (%s has become dangling)"

5997 msgstr " （%s 已成为摇摆状态）"

5998

5539 -#: builtin/fetch.c:802

5999 +#: builtin/fetch.c:811

6000 msgid "[deleted]"

6001 msgstr "[已删除]"

6002

5543 -#: builtin/fetch.c:803 builtin/remote.c:1057

6003 +#: builtin/fetch.c:812 builtin/remote.c:1034

6004 msgid "(none)"

6005 msgstr "（无）"

6006

5547 -#: builtin/fetch.c:822

6007 +#: builtin/fetch.c:832

6008 #, c-format

6009 msgid "Refusing to fetch into current branch %s of non-bare repository"

6010 msgstr "拒绝获取到非纯仓库的当前分支 %s"

6011

5552 -#: builtin/fetch.c:841

6012 +#: builtin/fetch.c:851

6013 #, c-format

6014 msgid "Option \"%s\" value \"%s\" is not valid for %s"

6015 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

6016

5557 -#: builtin/fetch.c:844

6017 +#: builtin/fetch.c:854

6018 #, c-format

6019 msgid "Option \"%s\" is ignored for %s\n"

6020 msgstr "选项 \"%s\" 为 %s 所忽略\n"

6021

5562 -#: builtin/fetch.c:900

6022 +#: builtin/fetch.c:910

6023 #, c-format

6024 msgid "Don't know how to fetch from %s"

6025 msgstr "不知道如何从 %s 获取"

6026

5567 -#: builtin/fetch.c:1063

6027 +#: builtin/fetch.c:1071

6028 #, c-format

6029 msgid "Fetching %s\n"

6030 msgstr "正在获取 %s\n"

6031

5572 -#: builtin/fetch.c:1065 builtin/remote.c:90

6032 +#: builtin/fetch.c:1073 builtin/remote.c:90

6033 #, c-format

6034 msgid "Could not fetch %s"

6035 msgstr "不能获取 %s"

6036

5577 -#: builtin/fetch.c:1083

6037 +#: builtin/fetch.c:1091

6038 msgid ""

6039 "No remote repository specified. Please, specify either a URL or a\n"

6040 "remote name from which new revisions should be fetched."

6041 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"

6042

5583 -#: builtin/fetch.c:1106

6043 +#: builtin/fetch.c:1114

6044 msgid "You need to specify a tag name."

6045 msgstr "您需要指定一个标签名称。"

6046

5587 -#: builtin/fetch.c:1148

6047 +#: builtin/fetch.c:1156

6048 msgid "--depth and --unshallow cannot be used together"

6049 msgstr "--depth 和 --unshallow 不能同时使用"

6050

5591 -#: builtin/fetch.c:1150

6051 +#: builtin/fetch.c:1158

6052 msgid "--unshallow on a complete repository does not make sense"

6053 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"

6054

5595 -#: builtin/fetch.c:1173

6055 +#: builtin/fetch.c:1181

6056 msgid "fetch --all does not take a repository argument"

6057 msgstr "fetch --all 不能带一个仓库参数"

6058

5599 -#: builtin/fetch.c:1175

6059 +#: builtin/fetch.c:1183

6060 msgid "fetch --all does not make sense with refspecs"

6061 msgstr "fetch --all 带引用规格没有任何意义"

6062

5603 -#: builtin/fetch.c:1186

6063 +#: builtin/fetch.c:1194

6064 #, c-format

6065 msgid "No such remote or remote group: %s"

6066 msgstr "没有这样的远程或远程组：%s"

6067

5608 -#: builtin/fetch.c:1194

6068 +#: builtin/fetch.c:1202

6069 msgid "Fetching a group and specifying refspecs does not make sense"

6070 msgstr "获取组并指定引用规格没有意义"

6071

5612 -#: builtin/fmt-merge-msg.c:13

6072 +#: builtin/fmt-merge-msg.c:14

6073 msgid ""

6074 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"

6075 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"

6076

5617 -#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

5618 -#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5619 -#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5620 -#: parse-options.h:131 parse-options.h:238

5621 -msgid "n"

5622 -msgstr "n"

5623 -

5624 -#: builtin/fmt-merge-msg.c:669

6077 +#: builtin/fmt-merge-msg.c:670

6078 msgid "populate log with at most <n> entries from shortlog"

6079 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"

6080

5628 -#: builtin/fmt-merge-msg.c:672

6081 +#: builtin/fmt-merge-msg.c:673

6082 msgid "alias for --log (deprecated)"

6083 msgstr "参数 --log 的别名（已弃用）"

6084

5632 -#: builtin/fmt-merge-msg.c:675

6085 +#: builtin/fmt-merge-msg.c:676

6086 msgid "text"

6087 msgstr "文本"

6088

5636 -#: builtin/fmt-merge-msg.c:676

6089 +#: builtin/fmt-merge-msg.c:677

6090 msgid "use <text> as start of message"

6091 msgstr "使用 <文本> 作为提交说明的开始"

6092

5640 -#: builtin/fmt-merge-msg.c:677

6093 +#: builtin/fmt-merge-msg.c:678

6094 msgid "file to read from"

6095 msgstr "从文件中读取"

6096

5644 -#: builtin/for-each-ref.c:687

5645 -msgid "unable to parse format"

5646 -msgstr "不能解析格式"

5647 -

5648 -#: builtin/for-each-ref.c:1083

6097 +#: builtin/for-each-ref.c:9

6098 msgid "git for-each-ref [<options>] [<pattern>]"

6099 msgstr "git for-each-ref [<选项>] [<模式>]"

6100

5652 -#: builtin/for-each-ref.c:1098

6101 +#: builtin/for-each-ref.c:24

6102 msgid "quote placeholders suitably for shells"

6103 msgstr "引用占位符适用于 shells"

6104

5656 -#: builtin/for-each-ref.c:1100

6105 +#: builtin/for-each-ref.c:26

6106 msgid "quote placeholders suitably for perl"

6107 msgstr "引用占位符适用于 perl"

6108

5660 -#: builtin/for-each-ref.c:1102

6109 +#: builtin/for-each-ref.c:28

6110 msgid "quote placeholders suitably for python"

6111 msgstr "引用占位符适用于 python"

6112

5664 -#: builtin/for-each-ref.c:1104

6113 +#: builtin/for-each-ref.c:30

6114 msgid "quote placeholders suitably for Tcl"

6115 msgstr "引用占位符适用于 Tcl"

6116

5668 -#: builtin/for-each-ref.c:1107

6117 +#: builtin/for-each-ref.c:33

6118 msgid "show only <n> matched refs"

6119 msgstr "只显示 <n> 个匹配的引用"

6120

5672 -#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5673 -msgid "format"

5674 -msgstr "格式"

5675 -

5676 -#: builtin/for-each-ref.c:1108

6121 +#: builtin/for-each-ref.c:34

6122 msgid "format to use for the output"

6123 msgstr "输出格式"

6124

5680 -#: builtin/for-each-ref.c:1109

6125 +#: builtin/for-each-ref.c:35

6126 msgid "key"

6127 msgstr "key"

6128

5684 -#: builtin/for-each-ref.c:1110

6129 +#: builtin/for-each-ref.c:36

6130 msgid "field name to sort on"

6131 msgstr "排序的字段名"

6132

5688 -#: builtin/fsck.c:147 builtin/prune.c:137

6133 +#: builtin/fsck.c:163 builtin/prune.c:137

6134 msgid "Checking connectivity"

6135 msgstr "检查连接中"

6136

5692 -#: builtin/fsck.c:548

6137 +#: builtin/fsck.c:568

6138 msgid "Checking object directories"

6139 msgstr "检查对象目录中"

6140

5696 -#: builtin/fsck.c:611

6141 +#: builtin/fsck.c:631

6142 msgid "git fsck [<options>] [<object>...]"

6143 msgstr "git fsck [<选项>] [<对象>...]"

6144

5700 -#: builtin/fsck.c:617

6145 +#: builtin/fsck.c:637

6146 msgid "show unreachable objects"

6147 msgstr "显示不可达的对象"

6148

5704 -#: builtin/fsck.c:618

6149 +#: builtin/fsck.c:638

6150 msgid "show dangling objects"

6151 msgstr "显示摇摆的对象"

6152

5708 -#: builtin/fsck.c:619

6153 +#: builtin/fsck.c:639

6154 msgid "report tags"

6155 msgstr "报告标签"

6156

5712 -#: builtin/fsck.c:620

6157 +#: builtin/fsck.c:640

6158 msgid "report root nodes"

6159 msgstr "报告根节点"

6160

5716 -#: builtin/fsck.c:621

6161 +#: builtin/fsck.c:641

6162 msgid "make index objects head nodes"

6163 msgstr "将索引亦作为检查的头节点"

6164

5720 -#: builtin/fsck.c:622

6165 +#: builtin/fsck.c:642

6166 msgid "make reflogs head nodes (default)"

6167 msgstr "将引用日志作为检查的头节点（默认）"

6168

5724 -#: builtin/fsck.c:623

6169 +#: builtin/fsck.c:643

6170 msgid "also consider packs and alternate objects"

6171 msgstr "也考虑包和备用对象"

6172

5728 -#: builtin/fsck.c:624

6173 +#: builtin/fsck.c:644

6174 +msgid "check only connectivity"

6175 +msgstr "仅检查连通性"

6176 +

6177 +#: builtin/fsck.c:645

6178 msgid "enable more strict checking"

6179 msgstr "启用更严格的检查"

6180

5732 -#: builtin/fsck.c:626

6181 +#: builtin/fsck.c:647

6182 msgid "write dangling objects in .git/lost-found"

6183 msgstr "将摇摆对象写入 .git/lost-found 中"

6184

5736 -#: builtin/fsck.c:627 builtin/prune.c:107

6185 +#: builtin/fsck.c:648 builtin/prune.c:107

6186 msgid "show progress"

6187 msgstr "显示进度"

6188

5740 -#: builtin/fsck.c:677

6189 +#: builtin/fsck.c:707

6190 msgid "Checking objects"

6191 msgstr "检查对象中"

6192

5744 -#: builtin/gc.c:24

6193 +#: builtin/gc.c:25

6194 msgid "git gc [<options>]"

6195 msgstr "git gc [<选项>]"

6196

5748 -#: builtin/gc.c:67

6197 +#: builtin/gc.c:55

6198 #, c-format

6199 msgid "Invalid %s: '%s'"

6200 msgstr "无效 %s：'%s'"

6201

5753 -#: builtin/gc.c:112

6202 +#: builtin/gc.c:100

6203 #, c-format

6204 msgid "insanely long object directory %.*s"

6205 msgstr "不正常的长对象目录 %.*s"

6206

5758 -#: builtin/gc.c:281

6207 +#: builtin/gc.c:269

6208 msgid "prune unreferenced objects"

6209 msgstr "清除未引用的对象"

6210

5762 -#: builtin/gc.c:283

6211 +#: builtin/gc.c:271

6212 msgid "be more thorough (increased runtime)"

6213 msgstr "更彻底（增加运行时间）"

6214

5766 -#: builtin/gc.c:284

6215 +#: builtin/gc.c:272

6216 msgid "enable auto-gc mode"

6217 msgstr "启用自动垃圾回收模式"

6218

5770 -#: builtin/gc.c:285

6219 +#: builtin/gc.c:273

6220 msgid "force running gc even if there may be another gc running"

6221 msgstr "强制执行 gc 即使另外一个 gc 正在执行"

6222

5774 -#: builtin/gc.c:327

6223 +#: builtin/gc.c:315

6224 #, c-format

6225 msgid "Auto packing the repository in background for optimum performance.\n"

6226 msgstr "自动在后台执行仓库打包以求最佳性能。\n"

6227

5779 -#: builtin/gc.c:329

6228 +#: builtin/gc.c:317

6229 #, c-format

6230 msgid "Auto packing the repository for optimum performance.\n"

6231 msgstr "自动打包仓库以求最佳性能。\n"

6232

5784 -#: builtin/gc.c:330

6233 +#: builtin/gc.c:318

6234 #, c-format

6235 msgid "See \"git help gc\" for manual housekeeping.\n"

6236 msgstr "手工维护参见 \"git help gc\"。\n"

6237

5789 -#: builtin/gc.c:348

6238 +#: builtin/gc.c:336

6239 #, c-format

6240 msgid ""

6241 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

6242 msgstr ""

6243 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"

6244

5796 -#: builtin/gc.c:376

6245 +#: builtin/gc.c:364

6246 msgid ""

6247 "There are too many unreachable loose objects; run 'git prune' to remove them."

6248 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

@@ -6036,7 +6485,7 @@ msgstr ""

6485 msgid "git hash-object --stdin-paths < <list-of-paths>"

6486 msgstr "git hash-object --stdin-paths < <路径列表>"

6487

6039 -#: builtin/hash-object.c:92 builtin/tag.c:612

6488 +#: builtin/hash-object.c:92 builtin/tag.c:614

6489 msgid "type"

6490 msgstr "类型"

6491

@@ -6189,129 +6638,129 @@ msgstr "用法：%s%s"

6638 msgid "`git %s' is aliased to `%s'"

6639 msgstr "`git %s' 是 `%s' 的别名"

6640

6192 -#: builtin/index-pack.c:151

6641 +#: builtin/index-pack.c:152

6642 #, c-format

6643 msgid "unable to open %s"

6644 msgstr "不能打开 %s"

6645

6197 -#: builtin/index-pack.c:201

6646 +#: builtin/index-pack.c:202

6647 #, c-format

6648 msgid "object type mismatch at %s"

6649 msgstr "%s 的对象类型不匹配"

6650

6202 -#: builtin/index-pack.c:221

6651 +#: builtin/index-pack.c:222

6652 #, c-format

6653 msgid "did not receive expected object %s"

6654 msgstr "未能获取期望的对象 %s"

6655

6207 -#: builtin/index-pack.c:224

6656 +#: builtin/index-pack.c:225

6657 #, c-format

6658 msgid "object %s: expected type %s, found %s"

6659 msgstr "对象 %s：期待类型 %s，却是 %s"

6660

6212 -#: builtin/index-pack.c:266

6661 +#: builtin/index-pack.c:267

6662 #, c-format

6663 msgid "cannot fill %d byte"

6664 msgid_plural "cannot fill %d bytes"

6665 msgstr[0] "无法填充 %d 字节"

6666 msgstr[1] "无法填充 %d 字节"

6667

6219 -#: builtin/index-pack.c:276

6668 +#: builtin/index-pack.c:277

6669 msgid "early EOF"

6670 msgstr "过早的文件结束符（EOF）"

6671

6223 -#: builtin/index-pack.c:277

6672 +#: builtin/index-pack.c:278

6673 msgid "read error on input"

6674 msgstr "输入上的读错误"

6675

6227 -#: builtin/index-pack.c:289

6676 +#: builtin/index-pack.c:290

6677 msgid "used more bytes than were available"

6678 msgstr "用掉了超过可用的字节"

6679

6231 -#: builtin/index-pack.c:296

6680 +#: builtin/index-pack.c:297

6681 msgid "pack too large for current definition of off_t"

6682 msgstr "包太大超过了当前 off_t 的定义"

6683

6235 -#: builtin/index-pack.c:312

6684 +#: builtin/index-pack.c:313

6685 #, c-format

6686 msgid "unable to create '%s'"

6687 msgstr "不能创建 '%s'"

6688

6240 -#: builtin/index-pack.c:317

6689 +#: builtin/index-pack.c:318

6690 #, c-format

6691 msgid "cannot open packfile '%s'"

6692 msgstr "无法打开包文件 '%s'"

6693

6245 -#: builtin/index-pack.c:331

6694 +#: builtin/index-pack.c:332

6695 msgid "pack signature mismatch"

6696 msgstr "包签名不匹配"

6697

6249 -#: builtin/index-pack.c:333

6698 +#: builtin/index-pack.c:334

6699 #, c-format

6700 msgid "pack version %<PRIu32> unsupported"

6701 msgstr "不支持包版本 %<PRIu32>"

6702

6254 -#: builtin/index-pack.c:351

6703 +#: builtin/index-pack.c:352

6704 #, c-format

6705 msgid "pack has bad object at offset %lu: %s"

6706 msgstr "包中有错误的对象位于 %lu：%s"

6707

6259 -#: builtin/index-pack.c:472

6708 +#: builtin/index-pack.c:473

6709 #, c-format

6710 msgid "inflate returned %d"

6711 msgstr "解压缩返回 %d"

6712

6264 -#: builtin/index-pack.c:521

6713 +#: builtin/index-pack.c:522

6714 msgid "offset value overflow for delta base object"

6715 msgstr "偏移值覆盖了 delta 基准对象"

6716

6268 -#: builtin/index-pack.c:529

6717 +#: builtin/index-pack.c:530

6718 msgid "delta base offset is out of bound"

6719 msgstr "delta 基准偏移越界"

6720

6272 -#: builtin/index-pack.c:537

6721 +#: builtin/index-pack.c:538

6722 #, c-format

6723 msgid "unknown object type %d"

6724 msgstr "未知对象类型 %d"

6725

6277 -#: builtin/index-pack.c:568

6726 +#: builtin/index-pack.c:569

6727 msgid "cannot pread pack file"

6728 msgstr "无法读取包文件"

6729

6281 -#: builtin/index-pack.c:570

6730 +#: builtin/index-pack.c:571

6731 #, c-format

6732 msgid "premature end of pack file, %lu byte missing"

6733 msgid_plural "premature end of pack file, %lu bytes missing"

6734 msgstr[0] "包文件过早结束，缺少 %lu 字节"

6735 msgstr[1] "包文件过早结束，缺少 %lu 字节"

6736

6288 -#: builtin/index-pack.c:596

6737 +#: builtin/index-pack.c:597

6738 msgid "serious inflate inconsistency"

6739 msgstr "解压缩严重的不一致"

6740

6292 -#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

6293 -#: builtin/index-pack.c:805 builtin/index-pack.c:814

6741 +#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772

6742 +#: builtin/index-pack.c:806 builtin/index-pack.c:815

6743 #, c-format

6744 msgid "SHA1 COLLISION FOUND WITH %s !"

6745 msgstr "发现 %s 出现 SHA1 冲突！"

6746

6298 -#: builtin/index-pack.c:745 builtin/pack-objects.c:162

6747 +#: builtin/index-pack.c:746 builtin/pack-objects.c:162

6748 #: builtin/pack-objects.c:254

6749 #, c-format

6750 msgid "unable to read %s"

6751 msgstr "不能读 %s"

6752

6304 -#: builtin/index-pack.c:811

6753 +#: builtin/index-pack.c:812

6754 #, c-format

6755 msgid "cannot read existing object %s"

6756 msgstr "不能读取现存对象 %s"

6757

6309 -#: builtin/index-pack.c:825

6758 +#: builtin/index-pack.c:826

6759 #, c-format

6760 msgid "invalid blob object %s"

6761 msgstr "无效的数据对象 %s"

6762

6314 -#: builtin/index-pack.c:839

6763 +#: builtin/index-pack.c:840

6764 #, c-format

6765 msgid "invalid %s"

6766 msgstr "无效的 %s"

@@ -6425,7 +6874,7 @@ msgstr "坏的 pack.indexversion=%<PRIu32>"

6874 msgid "invalid number of threads specified (%d)"

6875 msgstr "指定的线程数无效（%d）"

6876

6428 -#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6877 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1663

6878 #, c-format

6879 msgid "no threads support, ignoring %s"

6880 msgstr "没有线程支持，忽略 %s"

@@ -6454,110 +6903,110 @@ msgid_plural "chain length = %d: %lu objects"

6903 msgstr[0] "链长 = %d: %lu 对象"

6904 msgstr[1] "链长 = %d: %lu 对象"

6905

6457 -#: builtin/index-pack.c:1622

6906 +#: builtin/index-pack.c:1623

6907 msgid "Cannot come back to cwd"

6908 msgstr "无法返回当前工作目录"

6909

6461 -#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6462 -#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

6910 +#: builtin/index-pack.c:1675 builtin/index-pack.c:1678

6911 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1694

6912 #, c-format

6913 msgid "bad %s"

6914 msgstr "错误选项 %s"

6915

6467 -#: builtin/index-pack.c:1703

6916 +#: builtin/index-pack.c:1708

6917 msgid "--fix-thin cannot be used without --stdin"

6918 msgstr "--fix-thin 不能和 --stdin 同时使用"

6919

6471 -#: builtin/index-pack.c:1707 builtin/index-pack.c:1716

6920 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1721

6921 #, c-format

6922 msgid "packfile name '%s' does not end with '.pack'"

6923 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"

6924

6476 -#: builtin/index-pack.c:1724

6925 +#: builtin/index-pack.c:1729

6926 msgid "--verify with no packfile name given"

6927 msgstr "--verify 没有提供包文件名参数"

6928

6480 -#: builtin/init-db.c:35

6929 +#: builtin/init-db.c:36

6930 #, c-format

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

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

6933

6485 -#: builtin/init-db.c:62

6934 +#: builtin/init-db.c:63

6935 #, c-format

6936 msgid "insanely long template name %s"

6937 msgstr "太长的模版名 %s"

6938

6490 -#: builtin/init-db.c:67

6939 +#: builtin/init-db.c:68

6940 #, c-format

6941 msgid "cannot stat '%s'"

6942 msgstr "不能枚举 '%s' 状态"

6943

6495 -#: builtin/init-db.c:73

6944 +#: builtin/init-db.c:74

6945 #, c-format

6946 msgid "cannot stat template '%s'"

6947 msgstr "不能枚举模版 '%s' 状态"

6948

l10n: zh_CN: for git v2.6.0 l10n round 1