8ada95983c · matheusbsbs/matheus-bagliano

@@ -12,7 +12,7 @@ msgid ""

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2012-05-15 06:31+0800\n"

15 +"POT-Creation-Date: 2012-05-21 08:57+0800\n"

16 "PO-Revision-Date: 2012-01-30 00:00+0800\n"

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

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

@@ -42,6 +42,80 @@ msgstr ""

42 "'git add/rm <file>' 标记解决方案，\n"

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

44

45 +#: bundle.c:36

46 +#, c-format

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

48 +msgstr ""

49 +

50 +#: bundle.c:63

51 +#, fuzzy, c-format

52 +msgid "unrecognized header: %s%s (%d)"

53 +msgstr "未识别的参数：%s"

54 +

55 +#: bundle.c:89 builtin/commit.c:697

56 +#, c-format

57 +msgid "could not open '%s'"

58 +msgstr "不能打开 '%s'"

59 +

60 +#: bundle.c:140

61 +msgid "Repository lacks these prerequisite commits:"

62 +msgstr ""

63 +

64 +#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289

65 +#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347

66 +#: builtin/shortlog.c:181

67 +msgid "revision walk setup failed"

68 +msgstr "版本遍历设置失败"

69 +

70 +#: bundle.c:186

71 +#, c-format

72 +msgid "The bundle contains %d ref"

73 +msgid_plural "The bundle contains %d refs"

74 +msgstr[0] ""

75 +

76 +#: bundle.c:192

77 +#, c-format

78 +msgid "The bundle requires this ref"

79 +msgid_plural "The bundle requires these %d refs"

80 +msgstr[0] ""

81 +

82 +#: bundle.c:290

83 +msgid "rev-list died"

84 +msgstr ""

85 +

86 +#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284

87 +#, c-format

88 +msgid "unrecognized argument: %s"

89 +msgstr "未识别的参数：%s"

90 +

91 +#: bundle.c:331

92 +#, c-format

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

94 +msgstr ""

95 +

96 +#: bundle.c:376

97 +#, fuzzy

98 +msgid "Refusing to create empty bundle."

99 +msgstr "不能创建临时索引"

100 +

101 +#: bundle.c:394

102 +#, fuzzy

103 +msgid "Could not spawn pack-objects"

104 +msgstr "不能读取对象 %s"

105 +

106 +#: bundle.c:412

107 +msgid "pack-objects died"

108 +msgstr ""

109 +

110 +#: bundle.c:415

111 +#, fuzzy, c-format

112 +msgid "cannot create '%s'"

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

114 +

115 +#: bundle.c:437

116 +msgid "index-pack died"

117 +msgstr ""

118 +

119 #: commit.c:48

120 #, c-format

121 msgid "could not parse %s"

@@ -70,6 +144,64 @@ msgstr "无法写入 rev-list：%s"

144 msgid "failed to close rev-list's stdin: %s"

145 msgstr "无法关闭 rev-list 的标准输入：%s"

146

147 +#: date.c:95

148 +msgid "in the future"

149 +msgstr ""

150 +

151 +#: date.c:101

152 +#, c-format

153 +msgid "%lu second ago"

154 +msgid_plural "%lu seconds ago"

155 +msgstr[0] ""

156 +

157 +#: date.c:108

158 +#, c-format

159 +msgid "%lu minute ago"

160 +msgid_plural "%lu minutes ago"

161 +msgstr[0] ""

162 +

163 +#: date.c:115

164 +#, c-format

165 +msgid "%lu hour ago"

166 +msgid_plural "%lu hours ago"

167 +msgstr[0] ""

168 +

169 +#: date.c:122

170 +#, c-format

171 +msgid "%lu day ago"

172 +msgid_plural "%lu days ago"

173 +msgstr[0] ""

174 +

175 +#: date.c:128

176 +#, c-format

177 +msgid "%lu week ago"

178 +msgid_plural "%lu weeks ago"

179 +msgstr[0] ""

180 +

181 +#: date.c:135

182 +#, c-format

183 +msgid "%lu month ago"

184 +msgid_plural "%lu months ago"

185 +msgstr[0] ""

186 +

187 +#: date.c:146

188 +#, c-format

189 +msgid "%lu year"

190 +msgid_plural "%lu years"

191 +msgstr[0] ""

192 +

193 +#: date.c:149

194 +#, c-format

195 +msgid "%s, %lu month ago"

196 +msgid_plural "%s, %lu months ago"

197 +msgstr[0] ""

198 +

199 +#: date.c:154 date.c:159

200 +#, c-format

201 +msgid "%lu year ago"

202 +msgid_plural "%lu years ago"

203 +msgstr[0] ""

204 +

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

206 #: diff.c:105

207 #, c-format

@@ -113,7 +245,7 @@ msgid ", %d deletion(-)"

245 msgid_plural ", %d deletions(-)"

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

247

116 -#: diff.c:3439

248 +#: diff.c:3478

249 #, c-format

250 msgid ""

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

@@ -149,7 +281,16 @@ msgstr "'%s'：%s"

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

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

283

152 -#: help.c:287

284 +#: help.c:207

285 +#, fuzzy, c-format

286 +msgid "available git commands in '%s'"

287 +msgstr "无法创建链接 '%s'"

288 +

289 +#: help.c:214

290 +msgid "git commands available from elsewhere on your $PATH"

291 +msgstr ""

292 +

293 +#: help.c:270

294 #, c-format

295 msgid ""

296 "'%s' appears to be a git command, but we were not\n"

@@ -158,6 +299,58 @@ msgstr ""

299 "'%s' 像是一个 git 命令，但却无法运行。\n"

300 "可能是 git-%s 受损？"

301

302 +#: help.c:327

303 +msgid "Uh oh. Your system reports no Git commands at all."

304 +msgstr ""

305 +

306 +#: help.c:349

307 +#, c-format

308 +msgid ""

309 +"WARNING: You called a Git command named '%s', which does not exist.\n"

310 +"Continuing under the assumption that you meant '%s'"

311 +msgstr ""

312 +

313 +#: help.c:354

314 +#, c-format

315 +msgid "in %0.1f seconds automatically..."

316 +msgstr ""

317 +

318 +#: help.c:361

319 +#, c-format

320 +msgid "git: '%s' is not a git command. See 'git --help'."

321 +msgstr ""

322 +

323 +#: help.c:365

324 +msgid ""

325 +"\n"

326 +"Did you mean this?"

327 +msgid_plural ""

328 +"\n"

329 +"Did you mean one of these?"

330 +msgstr[0] ""

331 +

332 +#: parse-options.c:493

333 +msgid "..."

334 +msgstr ""

335 +

336 +#: parse-options.c:511

337 +#, fuzzy, c-format

338 +msgid "usage: %s"

339 +msgstr "'%s'：%s"

340 +

341 +#. TRANSLATORS: the colon here should align with the

342 +#. one in "usage: %s" translation

343 +#: parse-options.c:515

344 +#, fuzzy, c-format

345 +msgid " or: %s"

346 +msgstr "HEAD（非分支）"

347 +

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

349 +#: parse-options.c:518

350 +#, fuzzy, c-format

351 +msgid " %s"

352 +msgstr "删除： %s"

353 +

354 #: remote.c:1607

355 #, c-format

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

@@ -183,19 +376,19 @@ msgstr[0] ""

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

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

378

186 -#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978

379 +#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978

380 #: builtin/merge.c:1088 builtin/merge.c:1098

381 #, c-format

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

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

384

192 -#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868

385 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868

386 #: builtin/merge.c:1090 builtin/merge.c:1103

387 #, c-format

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

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

390

198 -#: sequencer.c:143

391 +#: sequencer.c:144

392 msgid ""

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

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

@@ -203,7 +396,7 @@ msgstr ""

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

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

398

206 -#: sequencer.c:146

399 +#: sequencer.c:147

400 msgid ""

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

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

@@ -212,202 +405,216 @@ msgstr ""

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

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

407

215 -#: sequencer.c:159 sequencer.c:685 sequencer.c:768

408 +#: sequencer.c:160 sequencer.c:741 sequencer.c:824

409 #, c-format

410 msgid "Could not write to %s"

411 msgstr "不能写入 %s"

412

220 -#: sequencer.c:162

413 +#: sequencer.c:163

414 #, c-format

415 msgid "Error wrapping up %s"

416 msgstr "错误收尾 %s"

417

225 -#: sequencer.c:177

418 +#: sequencer.c:178

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

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

421

229 -#: sequencer.c:179

422 +#: sequencer.c:180

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

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

425

233 -#: sequencer.c:182

426 +#: sequencer.c:183

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

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

429

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

238 -#: sequencer.c:232

431 +#: sequencer.c:233

432 #, c-format

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

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

435

243 -#: sequencer.c:298

436 +#: sequencer.c:261

437 +#, fuzzy

438 +msgid "Could not resolve HEAD commit\n"

439 +msgstr "不能解析 HEAD 提交"

440 +

441 +#: sequencer.c:282

442 +#, fuzzy

443 +msgid "Unable to update cache tree\n"

444 +msgstr "不能更新本地引用"

445 +

446 +#: sequencer.c:323

447 +#, fuzzy, c-format

448 +msgid "Could not parse commit %s\n"

449 +msgstr "不能解析 HEAD 提交"

450 +

451 +#: sequencer.c:328

452 +#, fuzzy, c-format

453 +msgid "Could not parse parent commit %s\n"

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

455 +

456 +#: sequencer.c:358

457 msgid "Your index file is unmerged."

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

459

247 -#: sequencer.c:301

460 +#: sequencer.c:361

461 msgid "You do not have a valid HEAD"

462 msgstr "您没有一个有效的 HEAD"

463

251 -#: sequencer.c:316

464 +#: sequencer.c:376

465 #, c-format

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

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

468

256 -#: sequencer.c:324

469 +#: sequencer.c:384

470 #, c-format

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

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

473

261 -#: sequencer.c:328

474 +#: sequencer.c:388

475 #, c-format

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

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

478

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

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

268 -#: sequencer.c:339

481 +#: sequencer.c:399

482 #, c-format

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

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

485

273 -#: sequencer.c:343

486 +#: sequencer.c:403

487 #, c-format

488 msgid "Cannot get commit message for %s"

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

490

278 -#: sequencer.c:427

491 +#: sequencer.c:491

492 #, c-format

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

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

495

283 -#: sequencer.c:428

496 +#: sequencer.c:492

497 #, c-format

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

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

500

288 -#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719

289 -#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347

290 -#: builtin/shortlog.c:181

291 -msgid "revision walk setup failed"

292 -msgstr "版本遍历设置失败"

293 -

294 -#: sequencer.c:453

501 +#: sequencer.c:536

502 msgid "empty commit set passed"

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

504

298 -#: sequencer.c:461

505 +#: sequencer.c:544

506 #, c-format

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

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

509

303 -#: sequencer.c:466

510 +#: sequencer.c:549

511 #, c-format

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

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

514

308 -#: sequencer.c:551

515 +#: sequencer.c:607

516 #, c-format

517 msgid "Cannot %s during a %s"

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

519

313 -#: sequencer.c:573

520 +#: sequencer.c:629

521 #, c-format

522 msgid "Could not parse line %d."

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

524

318 -#: sequencer.c:578

525 +#: sequencer.c:634

526 msgid "No commits parsed."

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

528

322 -#: sequencer.c:591

529 +#: sequencer.c:647

530 #, c-format

531 msgid "Could not open %s"

532 msgstr "不能打开 %s"

533

327 -#: sequencer.c:595

534 +#: sequencer.c:651

535 #, c-format

536 msgid "Could not read %s."

537 msgstr "不能读取 %s。"

538

332 -#: sequencer.c:602

539 +#: sequencer.c:658

540 #, c-format

541 msgid "Unusable instruction sheet: %s"

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

543

337 -#: sequencer.c:630

544 +#: sequencer.c:686

545 #, c-format

546 msgid "Invalid key: %s"

547 msgstr "无效键名：%s"

548

342 -#: sequencer.c:633

549 +#: sequencer.c:689

550 #, c-format

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

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

553

347 -#: sequencer.c:645

554 +#: sequencer.c:701

555 #, c-format

556 msgid "Malformed options sheet: %s"

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

558

352 -#: sequencer.c:666

559 +#: sequencer.c:722

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

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

562

356 -#: sequencer.c:667

563 +#: sequencer.c:723

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

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

566

360 -#: sequencer.c:671

567 +#: sequencer.c:727

568 #, c-format

569 msgid "Could not create sequencer directory %s"

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

571

365 -#: sequencer.c:687 sequencer.c:772

572 +#: sequencer.c:743 sequencer.c:828

573 #, c-format

574 msgid "Error wrapping up %s."

575 msgstr "错误收尾 %s。"

576

370 -#: sequencer.c:706 sequencer.c:840

577 +#: sequencer.c:762 sequencer.c:896

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

579 msgstr "没有拣选或还原操作在进行"

580

374 -#: sequencer.c:708

581 +#: sequencer.c:764

582 msgid "cannot resolve HEAD"

583 msgstr "不能解析 HEAD"

584

378 -#: sequencer.c:710

585 +#: sequencer.c:766

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

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

588

382 -#: sequencer.c:732

589 +#: sequencer.c:788 builtin/apply.c:3689

590 #, c-format

591 msgid "cannot open %s: %s"

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

593

387 -#: sequencer.c:735

594 +#: sequencer.c:791

595 #, c-format

596 msgid "cannot read %s: %s"

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

598

392 -#: sequencer.c:736

599 +#: sequencer.c:792

600 msgid "unexpected end of file"

601 msgstr "未预期的文件结束"

602

396 -#: sequencer.c:742

603 +#: sequencer.c:798

604 #, c-format

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

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

607

401 -#: sequencer.c:765

608 +#: sequencer.c:821

609 #, c-format

610 msgid "Could not format %s."

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

612

406 -#: sequencer.c:927

613 +#: sequencer.c:983

614 msgid "Can't revert as initial commit"

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

616

410 -#: sequencer.c:928

617 +#: sequencer.c:984

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

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

620

@@ -430,261 +637,261 @@ msgstr "尚未给分支 '%s' 设置上游"

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

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

639

433 -#: wt-status.c:134

640 +#: wt-status.c:135

641 msgid "Unmerged paths:"

642 msgstr "未合并的路径："

643

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

438 -#: wt-status.c:140 wt-status.c:157

645 +#: wt-status.c:141 wt-status.c:158

646 #, c-format

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

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

649

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

444 -#: wt-status.c:142 wt-status.c:159

651 +#: wt-status.c:143 wt-status.c:160

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

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

654

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

449 -#: wt-status.c:143

656 +#: wt-status.c:144

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

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

659

453 -#: wt-status.c:151

660 +#: wt-status.c:152

661 msgid "Changes to be committed:"

662 msgstr "要提交的变更："

663

457 -#: wt-status.c:169

664 +#: wt-status.c:170

665 msgid "Changes not staged for commit:"

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

667

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

462 -#: wt-status.c:173

669 +#: wt-status.c:174

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

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

672

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

467 -#: wt-status.c:175

674 +#: wt-status.c:176

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

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

677

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

472 -#: wt-status.c:176

679 +#: wt-status.c:177

680 msgid ""

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

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

683

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

478 -#: wt-status.c:178

685 +#: wt-status.c:179

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

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

688

482 -#: wt-status.c:187

689 +#: wt-status.c:188

690 #, c-format

691 msgid "%s files:"

692 msgstr "%s文件："

693

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

488 -#: wt-status.c:190

695 +#: wt-status.c:191

696 #, c-format

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

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

699

493 -#: wt-status.c:207

700 +#: wt-status.c:208

701 msgid "bug"

702 msgstr "bug"

703

497 -#: wt-status.c:212

704 +#: wt-status.c:213

705 msgid "both deleted:"

706 msgstr "双方删除："

707

501 -#: wt-status.c:213

708 +#: wt-status.c:214

709 msgid "added by us:"

710 msgstr "由我们添加："

711

505 -#: wt-status.c:214

712 +#: wt-status.c:215

713 msgid "deleted by them:"

714 msgstr "由他们删除："

715

509 -#: wt-status.c:215

716 +#: wt-status.c:216

717 msgid "added by them:"

718 msgstr "由他们添加："

719

513 -#: wt-status.c:216

720 +#: wt-status.c:217

721 msgid "deleted by us:"

722 msgstr "由我们删除："

723

517 -#: wt-status.c:217

724 +#: wt-status.c:218

725 msgid "both added:"

726 msgstr "双方添加："

727

521 -#: wt-status.c:218

728 +#: wt-status.c:219

729 msgid "both modified:"

730 msgstr "双方修改："

731

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

526 -#: wt-status.c:248

733 +#: wt-status.c:249

734 msgid "new commits, "

735 msgstr "新提交, "

736

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

531 -#: wt-status.c:250

738 +#: wt-status.c:251

739 msgid "modified content, "

740 msgstr "修改的内容, "

741

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

536 -#: wt-status.c:252

743 +#: wt-status.c:253

744 msgid "untracked content, "

745 msgstr "未跟踪的内容, "

746

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

541 -#: wt-status.c:266

748 +#: wt-status.c:267

749 #, c-format

750 msgid "new file: %s"

751 msgstr "新文件： %s"

752

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

547 -#: wt-status.c:269

754 +#: wt-status.c:270

755 #, c-format

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

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

758

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

553 -#: wt-status.c:272

760 +#: wt-status.c:273

761 #, c-format

762 msgid "deleted: %s"

763 msgstr "删除： %s"

764

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

559 -#: wt-status.c:275

766 +#: wt-status.c:276

767 #, c-format

768 msgid "modified: %s"

769 msgstr "修改： %s"

770

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

565 -#: wt-status.c:278

772 +#: wt-status.c:279

773 #, c-format

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

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

776

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

571 -#: wt-status.c:281

778 +#: wt-status.c:282

779 #, c-format

780 msgid "typechange: %s"

781 msgstr "类型变更： %s"

782

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

577 -#: wt-status.c:284

784 +#: wt-status.c:285

785 #, c-format

786 msgid "unknown: %s"

787 msgstr "未知： %s"

788

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

583 -#: wt-status.c:287

790 +#: wt-status.c:288

791 #, c-format

792 msgid "unmerged: %s"

793 msgstr "未合并： %s"

794

588 -#: wt-status.c:290

795 +#: wt-status.c:291

796 #, c-format

797 msgid "bug: unhandled diff status %c"

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

799

593 -#: wt-status.c:713

800 +#: wt-status.c:737

801 msgid "On branch "

802 msgstr "位于分支 "

803

597 -#: wt-status.c:720

804 +#: wt-status.c:744

805 msgid "Not currently on any branch."

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

807

601 -#: wt-status.c:731

808 +#: wt-status.c:755

809 msgid "Initial commit"

810 msgstr "初始提交"

811

605 -#: wt-status.c:745

812 +#: wt-status.c:769

813 msgid "Untracked"

814 msgstr "未跟踪的"

815

609 -#: wt-status.c:747

816 +#: wt-status.c:771

817 msgid "Ignored"

818 msgstr "忽略的"

819

613 -#: wt-status.c:749

820 +#: wt-status.c:773

821 #, c-format

822 msgid "Untracked files not listed%s"

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

824

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

619 -#: wt-status.c:751

826 +#: wt-status.c:775

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

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

829

623 -#: wt-status.c:757

830 +#: wt-status.c:781

831 msgid "No changes"

832 msgstr "没有修改"

833

627 -#: wt-status.c:761

834 +#: wt-status.c:785

835 #, c-format

836 msgid "no changes added to commit%s\n"

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

838

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

633 -#: wt-status.c:763

840 +#: wt-status.c:787

841 msgid " (use \"git add\" and/or \"git commit -a\")"

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

843

637 -#: wt-status.c:765

844 +#: wt-status.c:789

845 #, c-format

846 msgid "nothing added to commit but untracked files present%s\n"

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

848

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

643 -#: wt-status.c:767

850 +#: wt-status.c:791

851 msgid " (use \"git add\" to track)"

852 msgstr "（使用 \"git add\" 建立跟踪）"

853

647 -#: wt-status.c:769 wt-status.c:772 wt-status.c:775

854 +#: wt-status.c:793 wt-status.c:796 wt-status.c:799

855 #, c-format

856 msgid "nothing to commit%s\n"

857 msgstr "无须提交%s\n"

858

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

653 -#: wt-status.c:770

860 +#: wt-status.c:794

861 msgid " (create/copy files and use \"git add\" to track)"

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

863

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

658 -#: wt-status.c:773

865 +#: wt-status.c:797

866 msgid " (use -u to show untracked files)"

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

868

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

663 -#: wt-status.c:776

870 +#: wt-status.c:800

871 msgid " (working directory clean)"

872 msgstr "（干净的工作区）"

873

667 -#: wt-status.c:884

874 +#: wt-status.c:908

875 msgid "HEAD (no branch)"

876 msgstr "HEAD（非分支）"

877

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

672 -#: wt-status.c:890

879 +#: wt-status.c:914

880 msgid "Initial commit on "

881 msgstr "初始提交于 "

882

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

677 -#: wt-status.c:905

884 +#: wt-status.c:929

885 msgid "behind "

886 msgstr "落后 "

887

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

682 -#: wt-status.c:908 wt-status.c:911

889 +#: wt-status.c:932 wt-status.c:935

890 msgid "ahead "

891 msgstr "领先 "

892

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

687 -#: wt-status.c:913

894 +#: wt-status.c:937

895 msgid ", behind "

896 msgstr "，落后 "

897

@@ -693,7 +900,7 @@ msgstr "，落后 "

900 msgid "unexpected diff status %c"

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

902

696 -#: builtin/add.c:67 builtin/commit.c:298

903 +#: builtin/add.c:67 builtin/commit.c:226

904 msgid "updating files failed"

905 msgstr "更新文件失败"

906

@@ -743,54 +950,514 @@ msgstr "不能查看文件状态 '%s'"

950 msgid "Empty patch. Aborted."

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

952

746 -#: builtin/add.c:303

747 -#, c-format

748 -msgid "Could not apply '%s'"

749 -msgstr "不能应用 '%s'"

953 +#: builtin/add.c:303

954 +#, c-format

955 +msgid "Could not apply '%s'"

956 +msgstr "不能应用 '%s'"

957 +

958 +#: builtin/add.c:312

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

960 +msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"

961 +

962 +#: builtin/add.c:352

963 +#, c-format

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

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

966 +

967 +#: builtin/add.c:353

968 +msgid "no files added"

969 +msgstr "没有文件被添加"

970 +

971 +#: builtin/add.c:359

972 +msgid "adding files failed"

973 +msgstr "添加文件失败"

974 +

975 +#: builtin/add.c:391

976 +msgid "-A and -u are mutually incompatible"

977 +msgstr "-A 和 -u 选项互斥"

978 +

979 +#: builtin/add.c:393

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

981 +msgstr "选项 --ignore-missing 只能和 --dry-run 共用"

982 +

983 +#: builtin/add.c:413

984 +#, c-format

985 +msgid "Nothing specified, nothing added.\n"

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

987 +

988 +#: builtin/add.c:414

989 +#, c-format

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

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

992 +

993 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82

994 +#: builtin/rm.c:162

995 +msgid "index file corrupt"

996 +msgstr "索引文件损坏"

997 +

998 +#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260

999 +msgid "Unable to write new index file"

1000 +msgstr "无法写入新索引文件"

1001 +

1002 +#: builtin/apply.c:53

1003 +msgid "git apply [options] [<patch>...]"

1004 +msgstr ""

1005 +

1006 +#: builtin/apply.c:106

1007 +#, fuzzy, c-format

1008 +msgid "unrecognized whitespace option '%s'"

1009 +msgstr "未识别的选项：'$arg'"

1010 +

1011 +#: builtin/apply.c:121

1012 +#, fuzzy, c-format

1013 +msgid "unrecognized whitespace ignore option '%s'"

1014 +msgstr "未识别的选项：'$arg'"

1015 +

1016 +#: builtin/apply.c:815

1017 +#, c-format

1018 +msgid "Cannot prepare timestamp regexp %s"

1019 +msgstr ""

1020 +

1021 +#: builtin/apply.c:824

1022 +#, c-format

1023 +msgid "regexec returned %d for input: %s"

1024 +msgstr ""

1025 +

1026 +#: builtin/apply.c:905

1027 +#, fuzzy, c-format

1028 +msgid "unable to find filename in patch at line %d"

1029 +msgstr "不能处理 %d 类型的文件"

1030 +

1031 +#: builtin/apply.c:937

1032 +#, c-format

1033 +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

1034 +msgstr ""

1035 +

1036 +#: builtin/apply.c:941

1037 +#, c-format

1038 +msgid "git apply: bad git-diff - inconsistent new filename on line %d"

1039 +msgstr ""

1040 +

1041 +#: builtin/apply.c:942

1042 +#, c-format

1043 +msgid "git apply: bad git-diff - inconsistent old filename on line %d"

1044 +msgstr ""

1045 +

1046 +#: builtin/apply.c:949

1047 +#, c-format

1048 +msgid "git apply: bad git-diff - expected /dev/null on line %d"

1049 +msgstr ""

1050 +

1051 +#: builtin/apply.c:1394

1052 +#, c-format

1053 +msgid "recount: unexpected line: %.*s"

1054 +msgstr ""

1055 +

1056 +#: builtin/apply.c:1451

1057 +#, c-format

1058 +msgid "patch fragment without header at line %d: %.*s"

1059 +msgstr ""

1060 +

1061 +#: builtin/apply.c:1468

1062 +#, c-format

1063 +msgid ""

1064 +"git diff header lacks filename information when removing %d leading pathname "

1065 +"component (line %d)"

1066 +msgid_plural ""

1067 +"git diff header lacks filename information when removing %d leading pathname "

1068 +"components (line %d)"

1069 +msgstr[0] ""

1070 +

1071 +#: builtin/apply.c:1628

1072 +msgid "new file depends on old contents"

1073 +msgstr ""

1074 +

1075 +#: builtin/apply.c:1630

1076 +msgid "deleted file still has contents"

1077 +msgstr ""

1078 +

1079 +#: builtin/apply.c:1656

1080 +#, c-format

1081 +msgid "corrupt patch at line %d"

1082 +msgstr ""

1083 +

1084 +#: builtin/apply.c:1692

1085 +#, c-format

1086 +msgid "new file %s depends on old contents"

1087 +msgstr ""

1088 +

1089 +#: builtin/apply.c:1694

1090 +#, c-format

1091 +msgid "deleted file %s still has contents"

1092 +msgstr ""

1093 +

1094 +#: builtin/apply.c:1697

1095 +#, c-format

1096 +msgid "** warning: file %s becomes empty but is not deleted"

1097 +msgstr ""

1098 +

1099 +#: builtin/apply.c:1843

1100 +#, c-format

1101 +msgid "corrupt binary patch at line %d: %.*s"

1102 +msgstr ""

1103 +

1104 +#. there has to be one hunk (forward hunk)

1105 +#: builtin/apply.c:1872

1106 +#, c-format

1107 +msgid "unrecognized binary patch at line %d"

1108 +msgstr ""

1109 +

1110 +#: builtin/apply.c:1958

1111 +#, c-format

1112 +msgid "patch with only garbage at line %d"

1113 +msgstr ""

1114 +

1115 +#: builtin/apply.c:2048

1116 +#, fuzzy, c-format

1117 +msgid "unable to read symlink %s"

1118 +msgstr "无法读取树（%s）"

1119 +

1120 +#: builtin/apply.c:2052

1121 +#, fuzzy, c-format

1122 +msgid "unable to open or read %s"

1123 +msgstr "不能打开或读取 '%s'"

1124 +

1125 +#: builtin/apply.c:2123

1126 +msgid "oops"

1127 +msgstr ""

1128 +

1129 +#: builtin/apply.c:2645

1130 +#, fuzzy, c-format

1131 +msgid "invalid start of line: '%c'"

1132 +msgstr "无效引用：%s"

1133 +

1134 +#: builtin/apply.c:2763

1135 +#, c-format

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

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

1138 +msgstr[0] ""

1139 +

1140 +#: builtin/apply.c:2775

1141 +#, c-format

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

1143 +msgstr ""

1144 +

1145 +#: builtin/apply.c:2781

1146 +#, c-format

1147 +msgid ""

1148 +"while searching for:\n"

1149 +"%.*s"

1150 +msgstr ""

1151 +

1152 +#: builtin/apply.c:2800

1153 +#, c-format

1154 +msgid "missing binary patch data for '%s'"

1155 +msgstr ""

1156 +

1157 +#: builtin/apply.c:2903

1158 +#, c-format

1159 +msgid "binary patch does not apply to '%s'"

1160 +msgstr ""

1161 +

1162 +#: builtin/apply.c:2909

1163 +#, c-format

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

1165 +msgstr ""

1166 +

1167 +#: builtin/apply.c:2930

1168 +#, c-format

1169 +msgid "patch failed: %s:%ld"

1170 +msgstr ""

1171 +

1172 +#: builtin/apply.c:3045

1173 +#, c-format

1174 +msgid "patch %s has been renamed/deleted"

1175 +msgstr ""

1176 +

1177 +#: builtin/apply.c:3052 builtin/apply.c:3069

1178 +#, fuzzy, c-format

1179 +msgid "read of %s failed"

1180 +msgstr "重命名 '%s' 失败"

1181 +

1182 +#: builtin/apply.c:3084

1183 +msgid "removal patch leaves file contents"

1184 +msgstr ""

1185 +

1186 +#: builtin/apply.c:3105

1187 +#, fuzzy, c-format

1188 +msgid "%s: already exists in working directory"

1189 +msgstr "%s 存在且不是一个目录"

1190 +

1191 +#: builtin/apply.c:3143

1192 +#, c-format

1193 +msgid "%s: has been deleted/renamed"

1194 +msgstr ""

1195 +

1196 +#: builtin/apply.c:3148 builtin/apply.c:3179

1197 +#, fuzzy, c-format

1198 +msgid "%s: %s"

1199 +msgstr "'%s'：%s"

1200 +

1201 +#: builtin/apply.c:3159

1202 +#, c-format

1203 +msgid "%s: does not exist in index"

1204 +msgstr ""

1205 +

1206 +#: builtin/apply.c:3173

1207 +#, fuzzy, c-format

1208 +msgid "%s: does not match index"

1209 +msgstr "不能读取索引"

1210 +

1211 +#: builtin/apply.c:3190

1212 +#, c-format

1213 +msgid "%s: wrong type"

1214 +msgstr ""

1215 +

1216 +#: builtin/apply.c:3192

1217 +#, c-format

1218 +msgid "%s has type %o, expected %o"

1219 +msgstr ""

1220 +

1221 +#: builtin/apply.c:3247

1222 +#, fuzzy, c-format

1223 +msgid "%s: already exists in index"

1224 +msgstr "%s 已经存在"

1225 +

1226 +#: builtin/apply.c:3266

1227 +#, c-format

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

1229 +msgstr ""

1230 +

1231 +#: builtin/apply.c:3272

1232 +#, c-format

1233 +msgid "%s: patch does not apply"

1234 +msgstr ""

1235 +

1236 +#: builtin/apply.c:3285

1237 +#, c-format

1238 +msgid "Checking patch %s..."

1239 +msgstr ""

1240 +

1241 +#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158

1242 +#, c-format

1243 +msgid "make_cache_entry failed for path '%s'"

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

1245 +

1246 +#: builtin/apply.c:3483

1247 +#, fuzzy, c-format

1248 +msgid "unable to remove %s from index"

1249 +msgstr "不能移动 %s 至 %s"

1250 +

1251 +#: builtin/apply.c:3510

1252 +#, c-format

1253 +msgid "corrupt patch for subproject %s"

1254 +msgstr ""

1255 +

1256 +#: builtin/apply.c:3514

1257 +#, fuzzy, c-format

1258 +msgid "unable to stat newly created file '%s'"

1259 +msgstr "不能创建文件 '%s'"

1260 +

1261 +#: builtin/apply.c:3519

1262 +#, c-format

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

1264 +msgstr ""

1265 +

1266 +#: builtin/apply.c:3522

1267 +#, fuzzy, c-format

1268 +msgid "unable to add cache entry for %s"

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

1270 +

1271 +#: builtin/apply.c:3555

1272 +#, fuzzy, c-format

1273 +msgid "closing file '%s'"

1274 +msgstr "正克隆到 '%s'...\n"

1275 +

1276 +#: builtin/apply.c:3604

1277 +#, fuzzy, c-format

1278 +msgid "unable to write file '%s' mode %o"

1279 +msgstr "不能写 %s"

1280 +

1281 +#: builtin/apply.c:3660

1282 +#, c-format

1283 +msgid "Applied patch %s cleanly."

1284 +msgstr ""

1285 +

1286 +#: builtin/apply.c:3668

1287 +#, fuzzy

1288 +msgid "internal error"

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

1290 +

1291 +#. Say this even without --verbose

1292 +#: builtin/apply.c:3671

1293 +#, c-format

1294 +msgid "Applying patch %%s with %d reject..."

1295 +msgid_plural "Applying patch %%s with %d rejects..."

1296 +msgstr[0] ""

1297 +

1298 +#: builtin/apply.c:3681

1299 +#, c-format

1300 +msgid "truncating .rej filename to %.*s.rej"

1301 +msgstr ""

1302 +

1303 +#: builtin/apply.c:3702

1304 +#, c-format

1305 +msgid "Hunk #%d applied cleanly."

1306 +msgstr ""

1307 +

1308 +#: builtin/apply.c:3705

1309 +#, c-format

1310 +msgid "Rejected hunk #%d."

1311 +msgstr ""

1312 +

1313 +#: builtin/apply.c:3836

1314 +#, fuzzy

1315 +msgid "unrecognized input"

1316 +msgstr "未识别的参数：%s"

1317 +

1318 +#: builtin/apply.c:3847

1319 +#, fuzzy

1320 +msgid "unable to read index file"

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

1322 +

1323 +#: builtin/apply.c:3962 builtin/apply.c:3965

1324 +msgid "path"

1325 +msgstr ""

1326 +

1327 +#: builtin/apply.c:3963

1328 +msgid "don't apply changes matching the given path"

1329 +msgstr ""

1330 +

1331 +#: builtin/apply.c:3966

1332 +msgid "apply changes matching the given path"

1333 +msgstr ""

1334 +

1335 +#: builtin/apply.c:3968

1336 +msgid "num"

1337 +msgstr ""

1338 +

1339 +#: builtin/apply.c:3969

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

1341 +msgstr ""

1342 +

1343 +#: builtin/apply.c:3972

1344 +msgid "ignore additions made by the patch"

1345 +msgstr ""

1346 +

1347 +#: builtin/apply.c:3974

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

1349 +msgstr ""

1350 +

1351 +#: builtin/apply.c:3978

1352 +msgid "shows number of added and deleted lines in decimal notation"

1353 +msgstr ""

1354 +

1355 +#: builtin/apply.c:3980

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

1357 +msgstr ""

1358 +

1359 +#: builtin/apply.c:3982

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

1361 +msgstr ""

1362 +

1363 +#: builtin/apply.c:3984

1364 +msgid "make sure the patch is applicable to the current index"

1365 +msgstr ""

1366 +

1367 +#: builtin/apply.c:3986

1368 +msgid "apply a patch without touching the working tree"

1369 +msgstr ""

1370 +

1371 +#: builtin/apply.c:3988

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

1373 +msgstr ""

1374 +

1375 +#: builtin/apply.c:3990

1376 +msgid "build a temporary index based on embedded index information"

1377 +msgstr ""

1378 +

1379 +#: builtin/apply.c:3992

1380 +msgid "paths are separated with NUL character"

1381 +msgstr ""

1382 +

1383 +#: builtin/apply.c:3995

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

1385 +msgstr ""

1386 +

1387 +#: builtin/apply.c:3996

1388 +msgid "action"

1389 +msgstr ""

1390 +

1391 +#: builtin/apply.c:3997

1392 +msgid "detect new or modified lines that have whitespace errors"

1393 +msgstr ""

1394 +

1395 +#: builtin/apply.c:4000 builtin/apply.c:4003

1396 +msgid "ignore changes in whitespace when finding context"

1397 +msgstr ""

1398 +

1399 +#: builtin/apply.c:4006

1400 +msgid "apply the patch in reverse"

1401 +msgstr ""

1402 +

1403 +#: builtin/apply.c:4008

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

1405 +msgstr ""

1406 +

1407 +#: builtin/apply.c:4010

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

1409 +msgstr ""

1410 +

1411 +#: builtin/apply.c:4012

1412 +msgid "allow overlapping hunks"

1413 +msgstr ""

1414 +

1415 +#: builtin/apply.c:4013

1416 +msgid "be verbose"

1417 +msgstr ""

1418

751 -#: builtin/add.c:312

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

753 -msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"

1419 +#: builtin/apply.c:4015

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

1421 +msgstr ""

1422

755 -#: builtin/add.c:352

756 -#, c-format

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

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

1423 +#: builtin/apply.c:4018

1424 +msgid "do not trust the line counts in the hunk headers"

1425 +msgstr ""

1426

760 -#: builtin/add.c:353

761 -msgid "no files added"

762 -msgstr "没有文件被添加"

1427 +#: builtin/apply.c:4020

1428 +msgid "root"

1429 +msgstr ""

1430

764 -#: builtin/add.c:359

765 -msgid "adding files failed"

766 -msgstr "添加文件失败"

1431 +#: builtin/apply.c:4021

1432 +msgid "prepend <root> to all filenames"

1433 +msgstr ""

1434

768 -#: builtin/add.c:391

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

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

1435 +#: builtin/apply.c:4042

1436 +#, fuzzy

1437 +msgid "--index outside a repository"

1438 +msgstr "不是一个 git 版本库"

1439

772 -#: builtin/add.c:393

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

774 -msgstr "选项 --ignore-missing 只能和 --dry-run 共用"

1440 +#: builtin/apply.c:4045

1441 +#, fuzzy

1442 +msgid "--cached outside a repository"

1443 +msgstr "不是一个 git 版本库"

1444

776 -#: builtin/add.c:413

777 -#, c-format

778 -msgid "Nothing specified, nothing added.\n"

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

1445 +#: builtin/apply.c:4061

1446 +#, fuzzy, c-format

1447 +msgid "can't open patch '%s'"

1448 +msgstr "不能打开 '%s'"

1449

781 -#: builtin/add.c:414

1450 +#: builtin/apply.c:4075

1451 #, c-format

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

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

785 -

786 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82

787 -#: builtin/rm.c:162

788 -msgid "index file corrupt"

789 -msgstr "索引文件损坏"

1452 +msgid "squelched %d whitespace error"

1453 +msgid_plural "squelched %d whitespace errors"

1454 +msgstr[0] ""

1455

791 -#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260

792 -msgid "Unable to write new index file"

793 -msgstr "无法写入新索引文件"

1456 +#: builtin/apply.c:4081 builtin/apply.c:4091

1457 +#, c-format

1458 +msgid "%d line adds whitespace errors."

1459 +msgid_plural "%d lines add whitespace errors."

1460 +msgstr[0] ""

1461

1462 #: builtin/archive.c:17

1463 #, c-format

@@ -828,7 +1495,7 @@ msgid "git archive: expected a flush"

1495 msgstr "git archive：预期一个刷新"

1496

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

831 -#: builtin/branch.c:137

1498 +#: builtin/branch.c:144

1499 #, c-format

1500 msgid ""

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

@@ -838,7 +1505,7 @@ msgstr ""

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

1506

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

841 -#: builtin/branch.c:141

1508 +#: builtin/branch.c:148

1509 #, c-format

1510 msgid ""

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

@@ -847,36 +1514,35 @@ msgstr ""

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

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

1516

850 -# 译者：汉字之间无空格，故删除尾部空格

851 -#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"

852 -#: builtin/branch.c:164

853 -msgid "remote "

854 -msgstr "远程"

855 -

856 -#: builtin/branch.c:172

1517 +#: builtin/branch.c:180

1518 msgid "cannot use -a with -d"

1519 msgstr "不能将 -a 和 -d 共用"

1520

860 -#: builtin/branch.c:178

1521 +#: builtin/branch.c:186

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

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

1524

864 -#: builtin/branch.c:183

1525 +#: builtin/branch.c:191

1526 #, c-format

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

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

1529

869 -#: builtin/branch.c:193

870 -#, c-format

871 -msgid "%sbranch '%s' not found."

1530 +#: builtin/branch.c:202

1531 +#, fuzzy, c-format

1532 +msgid "remote branch '%s' not found."

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

1534

874 -#: builtin/branch.c:201

1535 +#: builtin/branch.c:203

1536 +#, fuzzy, c-format

1537 +msgid "branch '%s' not found."

1538 +msgstr "%s分支 '%s' 未发现。"

1539 +

1540 +#: builtin/branch.c:210

1541 #, c-format

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

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

1544

879 -#: builtin/branch.c:207

1545 +#: builtin/branch.c:216

1546 #, c-format

1547 msgid ""

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

@@ -885,97 +1551,130 @@ msgstr ""

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

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

1553

888 -#: builtin/branch.c:215

889 -#, c-format

890 -msgid "Error deleting %sbranch '%s'"

1554 +#: builtin/branch.c:225

1555 +#, fuzzy, c-format

1556 +msgid "Error deleting remote branch '%s'"

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

1558

893 -#: builtin/branch.c:221

894 -#, c-format

895 -msgid "Deleted %sbranch %s (was %s).\n"

1559 +#: builtin/branch.c:226

1560 +#, fuzzy, c-format

1561 +msgid "Error deleting branch '%s'"

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

1563 +

1564 +#: builtin/branch.c:233

1565 +#, fuzzy, c-format

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

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

1568

898 -#: builtin/branch.c:226

1569 +#: builtin/branch.c:234

1570 +#, fuzzy, c-format

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

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

1573 +

1574 +#: builtin/branch.c:239

1575 msgid "Update of config-file failed"

1576 msgstr "无法更新 config 文件"

1577

902 -#: builtin/branch.c:324

1578 +#: builtin/branch.c:337

1579 #, c-format

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

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

1582

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

908 -#: builtin/branch.c:396

909 -#, c-format

910 -msgid "behind %d] "

1584 +#: builtin/branch.c:409

1585 +#, fuzzy, c-format

1586 +msgid "[%s: behind %d]"

1587 msgstr "落后 %d] "

1588

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

914 -#: builtin/branch.c:398

915 -#, c-format

916 -msgid "ahead %d] "

1590 +#: builtin/branch.c:411

1591 +#, fuzzy, c-format

1592 +msgid "[behind %d]"

1593 +msgstr "落后 %d] "

1594 +

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

1596 +#: builtin/branch.c:415

1597 +#, fuzzy, c-format

1598 +msgid "[%s: ahead %d]"

1599 msgstr "领先 %d] "

1600

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

920 -#: builtin/branch.c:400

921 -#, c-format

922 -msgid "ahead %d, behind %d] "

1602 +#: builtin/branch.c:417

1603 +#, fuzzy, c-format

1604 +msgid "[ahead %d]"

1605 +msgstr "领先 %d] "

1606 +

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

1608 +#: builtin/branch.c:420

1609 +#, fuzzy, c-format

1610 +msgid "[%s: ahead %d, behind %d]"

1611 +msgstr "领先 %d，落后 %d] "

1612 +

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

1614 +#: builtin/branch.c:423

1615 +#, fuzzy, c-format

1616 +msgid "[ahead %d, behind %d]"

1617 msgstr "领先 %d，落后 %d] "

1618

925 -#: builtin/branch.c:503

1619 +#: builtin/branch.c:535

1620 msgid "(no branch)"

1621 msgstr "（非分支）"

1622

929 -#: builtin/branch.c:568

1623 +#: builtin/branch.c:600

1624 msgid "some refs could not be read"

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

1626

933 -#: builtin/branch.c:581

1627 +#: builtin/branch.c:613

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

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

1630

937 -#: builtin/branch.c:591

1631 +#: builtin/branch.c:623

1632 #, c-format

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

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

1635

942 -#: builtin/branch.c:606

1636 +#: builtin/branch.c:638

1637 msgid "Branch rename failed"

1638 msgstr "分支重命名失败"

1639

946 -#: builtin/branch.c:610

1640 +#: builtin/branch.c:642

1641 #, c-format

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

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

1644

951 -#: builtin/branch.c:614

1645 +#: builtin/branch.c:646

1646 #, c-format

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

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

1649

956 -#: builtin/branch.c:621

1650 +#: builtin/branch.c:653

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

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

1653

960 -#: builtin/branch.c:636

1654 +#: builtin/branch.c:668

1655 #, c-format

1656 msgid "malformed object name %s"

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

1658

965 -#: builtin/branch.c:660

966 -#, c-format

967 -msgid "could not write branch description template: %s\n"

1659 +#: builtin/branch.c:692

1660 +#, fuzzy, c-format

1661 +msgid "could not write branch description template: %s"

1662 msgstr "不能写分支描述模版：%s\n"

1663

970 -#: builtin/branch.c:750

1664 +#: builtin/branch.c:783

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

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

1667

974 -#: builtin/branch.c:755 builtin/clone.c:558

1668 +#: builtin/branch.c:788 builtin/clone.c:558

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

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

1671

978 -#: builtin/branch.c:813

1672 +#: builtin/branch.c:808

1673 +#, fuzzy

1674 +msgid "--column and --verbose are incompatible"

1675 +msgstr "--all 和 --mirror 不兼容"

1676 +

1677 +#: builtin/branch.c:857

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

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

1680

@@ -1022,11 +1721,6 @@ msgstr "path '%s'：无法合并"

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

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

1723

1025 -#: builtin/checkout.c:212 builtin/reset.c:158

1026 -#, c-format

1027 -msgid "make_cache_entry failed for path '%s'"

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

1029 -

1724 #: builtin/checkout.c:234 builtin/checkout.c:392

1725 msgid "corrupt index file"

1726 msgstr "损坏的索引文件"

@@ -1122,71 +1816,71 @@ msgstr ""

1816 " git branch new_branch_name %s\n"

1817 "\n"

1818

1125 -#: builtin/checkout.c:693

1819 +#: builtin/checkout.c:694

1820 msgid "internal error in revision walk"

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

1822

1129 -#: builtin/checkout.c:697

1823 +#: builtin/checkout.c:698

1824 msgid "Previous HEAD position was"

1825 msgstr "之前的 HEAD 位置是"

1826

1133 -#: builtin/checkout.c:723

1827 +#: builtin/checkout.c:724

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

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

1830

1831 #. case (1)

1138 -#: builtin/checkout.c:854

1832 +#: builtin/checkout.c:855

1833 #, c-format

1834 msgid "invalid reference: %s"

1835 msgstr "无效引用：%s"

1836

1837 #. case (1): want a tree

1144 -#: builtin/checkout.c:893

1838 +#: builtin/checkout.c:894

1839 #, c-format

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

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

1842

1149 -#: builtin/checkout.c:973

1843 +#: builtin/checkout.c:974

1844 msgid "-B cannot be used with -b"

1845 msgstr "-B 不能和 -b 共用"

1846

1153 -#: builtin/checkout.c:982

1847 +#: builtin/checkout.c:983

1848 msgid "--patch is incompatible with all other options"

1849 msgstr "--patch 选项和其他选项不兼容"

1850

1157 -#: builtin/checkout.c:985

1851 +#: builtin/checkout.c:986

1852 msgid "--detach cannot be used with -b/-B/--orphan"

1853 msgstr "--detach 不能和 -b/-B/--orphan 共用"

1854

1161 -#: builtin/checkout.c:987

1855 +#: builtin/checkout.c:988

1856 msgid "--detach cannot be used with -t"

1857 msgstr "--detach 不能和 -t 共用"

1858

1165 -#: builtin/checkout.c:993

1859 +#: builtin/checkout.c:994

1860 msgid "--track needs a branch name"

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

1862

1169 -#: builtin/checkout.c:1000

1863 +#: builtin/checkout.c:1001

1864 msgid "Missing branch name; try -b"

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

1866

1173 -#: builtin/checkout.c:1006

1867 +#: builtin/checkout.c:1007

1868 msgid "--orphan and -b|-B are mutually exclusive"

1869 msgstr "--orphan 和 -b|-B 互斥"

1870

1177 -#: builtin/checkout.c:1008

1871 +#: builtin/checkout.c:1009

1872 msgid "--orphan cannot be used with -t"

1873 msgstr "--orphan 不能和 -t 共用"

1874

1181 -#: builtin/checkout.c:1018

1875 +#: builtin/checkout.c:1019

1876 msgid "git checkout: -f and -m are incompatible"

1877 msgstr "git checkout：-f 和 -m 不兼容"

1878

1185 -#: builtin/checkout.c:1052

1879 +#: builtin/checkout.c:1053

1880 msgid "invalid path specification"

1881 msgstr "无效的路径规格"

1882

1189 -#: builtin/checkout.c:1060

1883 +#: builtin/checkout.c:1061

1884 #, c-format

1885 msgid ""

1886 "git checkout: updating paths is incompatible with switching branches.\n"

@@ -1195,26 +1889,26 @@ msgstr ""

1889 "git checkout：更新路径和切换分支不兼容。\n"

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

1891

1198 -#: builtin/checkout.c:1062

1892 +#: builtin/checkout.c:1063

1893 msgid "git checkout: updating paths is incompatible with switching branches."

1894 msgstr "git checkout：更新路径和切换分支不兼容。"

1895

1202 -#: builtin/checkout.c:1067

1896 +#: builtin/checkout.c:1068

1897 msgid "git checkout: --detach does not take a path argument"

1898 msgstr "git checkout：--detach 不跟路径参数"

1899

1206 -#: builtin/checkout.c:1070

1900 +#: builtin/checkout.c:1071

1901 msgid ""

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

1903 "checking out of the index."

1904 msgstr ""

1905 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"

1906

1213 -#: builtin/checkout.c:1089

1907 +#: builtin/checkout.c:1090

1908 msgid "Cannot switch branch to a non-commit."

1909 msgstr "无法切换分支到一个非提交。"

1910

1217 -#: builtin/checkout.c:1092

1911 +#: builtin/checkout.c:1093

1912 msgid "--ours/--theirs is incompatible with switching branches."

1913 msgstr "--ours/--theirs 和切换分支不兼容。"

1914

@@ -1385,7 +2079,11 @@ msgstr "远程分支 %s 在上游 %s 未发现"

2079 msgid "You appear to have cloned an empty repository."

2080 msgstr "您似乎克隆了一个空版本库。"

2081

1388 -#: builtin/commit.c:42

2082 +#: builtin/column.c:51

2083 +msgid "--command must be the first argument"

2084 +msgstr ""

2085 +

2086 +#: builtin/commit.c:43

2087 msgid ""

2088 "Your name and email address were configured automatically based\n"

2089 "on your username and hostname. Please check that they are accurate.\n"

@@ -1408,7 +2106,7 @@ msgstr ""

2106 "\n"

2107 " git commit --amend --reset-author\n"

2108

1411 -#: builtin/commit.c:54

2109 +#: builtin/commit.c:55

2110 msgid ""

2111 "You asked to amend the most recent commit, but doing so would make\n"

2112 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -1417,7 +2115,7 @@ msgstr ""

2115 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"

2116 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"

2117

1420 -#: builtin/commit.c:59

2118 +#: builtin/commit.c:60

2119 msgid ""

2120 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

2121 "If you wish to commit it anyway, use:\n"

@@ -1433,109 +2131,102 @@ msgstr ""

2131 "\n"

2132 "否则，请使用命令 'git reset'\n"

2133

1436 -#: builtin/commit.c:205 builtin/reset.c:33

1437 -msgid "merge"

1438 -msgstr "合并"

1439 -

1440 -#: builtin/commit.c:208

1441 -msgid "cherry-pick"

1442 -msgstr "拣选"

1443 -

1444 -#: builtin/commit.c:325

2134 +#: builtin/commit.c:253

2135 msgid "failed to unpack HEAD tree object"

2136 msgstr "无法解包 HEAD 树对象"

2137

1448 -#: builtin/commit.c:367

2138 +#: builtin/commit.c:295

2139 msgid "unable to create temporary index"

2140 msgstr "不能创建临时索引"

2141

1452 -#: builtin/commit.c:373

2142 +#: builtin/commit.c:301

2143 msgid "interactive add failed"

2144 msgstr "交互式添加失败"

2145

1456 -#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473

2146 +#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405

2147 msgid "unable to write new_index file"

2148 msgstr "无法写 new_index 文件"

2149

2150 # 译者：%s若翻为中文，前后不需要空格

1461 -#: builtin/commit.c:457

1462 -#, c-format

1463 -msgid "cannot do a partial commit during a %s."

2151 +#: builtin/commit.c:386

2152 +#, fuzzy

2153 +msgid "cannot do a partial commit during a merge."

2154 msgstr "在%s过程中不能做部分提交。"

2155

1466 -#: builtin/commit.c:466

2156 +# 译者：%s若翻为中文，前后不需要空格

2157 +#: builtin/commit.c:388

2158 +#, fuzzy

2159 +msgid "cannot do a partial commit during a cherry-pick."

2160 +msgstr "在%s过程中不能做部分提交。"

2161 +

2162 +#: builtin/commit.c:398

2163 msgid "cannot read the index"

2164 msgstr "无法读取索引"

2165

1470 -#: builtin/commit.c:486

2166 +#: builtin/commit.c:418

2167 msgid "unable to write temporary index file"

2168 msgstr "无法写临时索引文件"

2169

1474 -#: builtin/commit.c:561 builtin/commit.c:567

2170 +#: builtin/commit.c:493 builtin/commit.c:499

2171 #, c-format

2172 msgid "invalid commit: %s"

2173 msgstr "无效的提交：%s"

2174

1479 -#: builtin/commit.c:590

2175 +#: builtin/commit.c:522

2176 msgid "malformed --author parameter"

2177 msgstr "非法的 --author 参数"

2178

1483 -#: builtin/commit.c:651

2179 +#: builtin/commit.c:583

2180 #, c-format

2181 msgid "Malformed ident string: '%s'"

2182 msgstr "非法的身份字符串：'%s'"

2183

1488 -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033

2184 +#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968

2185 #, c-format

2186 msgid "could not lookup commit %s"

2187 msgstr "不能查询提交 %s"

2188

1493 -#: builtin/commit.c:701 builtin/shortlog.c:296

2189 +#: builtin/commit.c:633 builtin/shortlog.c:296

2190 #, c-format

2191 msgid "(reading log message from standard input)\n"

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

2193

1498 -#: builtin/commit.c:703

2194 +#: builtin/commit.c:635

2195 msgid "could not read log from standard input"

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

2197

1502 -#: builtin/commit.c:707

2198 +#: builtin/commit.c:639

2199 #, c-format

2200 msgid "could not read log file '%s'"

2201 msgstr "不能读取日志文件 '%s'"

2202

1507 -#: builtin/commit.c:713

2203 +#: builtin/commit.c:645

2204 msgid "commit has empty message"

2205 msgstr "提交说明为空"

2206

1511 -#: builtin/commit.c:729

2207 +#: builtin/commit.c:661

2208 msgid "could not read MERGE_MSG"

2209 msgstr "不能读取 MERGE_MSG"

2210

1515 -#: builtin/commit.c:733

2211 +#: builtin/commit.c:665

2212 msgid "could not read SQUASH_MSG"

2213 msgstr "不能读取 SQUASH_MSG"

2214

1519 -#: builtin/commit.c:737

2215 +#: builtin/commit.c:669

2216 #, c-format

2217 msgid "could not read '%s'"

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

2219

1524 -#: builtin/commit.c:765

1525 -#, c-format

1526 -msgid "could not open '%s'"

1527 -msgstr "不能打开 '%s'"

1528 -

1529 -#: builtin/commit.c:789

2220 +#: builtin/commit.c:721

2221 msgid "could not write commit template"

2222 msgstr "不能写提交模版"

2223

2224 # 译者：%s若翻为中文，前后不需要空格

1534 -#: builtin/commit.c:799

1535 -#, c-format

2225 +#: builtin/commit.c:732

2226 +#, fuzzy, c-format

2227 msgid ""

2228 "\n"

1538 -"It looks like you may be committing a %s.\n"

2229 +"It looks like you may be committing a merge.\n"

2230 "If this is not correct, please remove the file\n"

2231 "\t%s\n"

2232 "and try again.\n"

@@ -1546,23 +2237,37 @@ msgstr ""

2237 "\t%s\n"

2238 "然后重试。\n"

2239

1549 -#: builtin/commit.c:812

1550 -msgid "Please enter the commit message for your changes."

1551 -msgstr "请为您的修改输入提交说明。"

2240 +# 译者：%s若翻为中文，前后不需要空格

2241 +#: builtin/commit.c:737

2242 +#, fuzzy, c-format

2243 +msgid ""

2244 +"\n"

2245 +"It looks like you may be committing a cherry-pick.\n"

2246 +"If this is not correct, please remove the file\n"

2247 +"\t%s\n"

2248 +"and try again.\n"

2249 +msgstr ""

2250 +"\n"

2251 +"看起来您正在提交一个%s。\n"

2252 +"如果不是这样，请删除文件\n"

2253 +"\t%s\n"

2254 +"然后重试。\n"

2255

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

1554 -#: builtin/commit.c:815

2257 +#: builtin/commit.c:749

2258 +#, fuzzy

2259 msgid ""

1556 -" Lines starting\n"

2260 +"Please enter the commit message for your changes. Lines starting\n"

2261 "with '#' will be ignored, and an empty message aborts the commit.\n"

2262 msgstr ""

2263 "以 '#' 开头\n"

2264 "的行将被忽略，并且空的提交说明将会中止提交。\n"

2265

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

1563 -#: builtin/commit.c:820

2267 +#: builtin/commit.c:754

2268 +#, fuzzy

2269 msgid ""

1565 -" Lines starting\n"

2270 +"Please enter the commit message for your changes. Lines starting\n"

2271 "with '#' will be kept; you may remove them yourself if you want to.\n"

2272 "An empty message aborts the commit.\n"

2273 msgstr ""

@@ -1571,158 +2276,164 @@ msgstr ""

2276 "中止提交。\n"

2277

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

1574 -#: builtin/commit.c:832

2279 +#: builtin/commit.c:767

2280 #, c-format

2281 msgid "%sAuthor: %s"

2282 msgstr "%s作者： %s"

2283

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

1580 -#: builtin/commit.c:839

2285 +#: builtin/commit.c:774

2286 #, c-format

2287 msgid "%sCommitter: %s"

2288 msgstr "%s提交者： %s"

2289

1585 -#: builtin/commit.c:859

2290 +#: builtin/commit.c:794

2291 msgid "Cannot read index"

2292 msgstr "无法读取索引"

2293

1589 -#: builtin/commit.c:896

2294 +#: builtin/commit.c:831

2295 msgid "Error building trees"

2296 msgstr "无法创建树对象"

2297

1593 -#: builtin/commit.c:911 builtin/tag.c:357

2298 +#: builtin/commit.c:846 builtin/tag.c:361

2299 #, c-format

2300 msgid "Please supply the message using either -m or -F option.\n"

2301 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"

2302

1598 -#: builtin/commit.c:1008

2303 +#: builtin/commit.c:943

2304 #, c-format

2305 msgid "No existing author found with '%s'"

2306 msgstr "没有找到匹配 '%s' 的作者"

2307

1603 -#: builtin/commit.c:1023 builtin/commit.c:1217

2308 +#: builtin/commit.c:958 builtin/commit.c:1158

2309 #, c-format

2310 msgid "Invalid untracked files mode '%s'"

2311 msgstr "无效的未追踪文件参数 '%s'"

2312

1608 -#: builtin/commit.c:1063

2313 +#: builtin/commit.c:998

2314 msgid "Using both --reset-author and --author does not make sense"

2315 msgstr "同时使用 --reset-author 和 --author 没有意义"

2316

1612 -#: builtin/commit.c:1074

2317 +#: builtin/commit.c:1009

2318 msgid "You have nothing to amend."

2319 msgstr "您没有可修补的提交。"

2320

2321 # 译者：%s若翻为中文，前后不需要空格

1617 -#: builtin/commit.c:1076

1618 -#, c-format

1619 -msgid "You are in the middle of a %s -- cannot amend."

2322 +#: builtin/commit.c:1012

2323 +#, fuzzy

2324 +msgid "You are in the middle of a merge -- cannot amend."

2325 +msgstr "您正处于一个%s的过程中 -- 无法修补提交。"

2326 +

2327 +# 译者：%s若翻为中文，前后不需要空格

2328 +#: builtin/commit.c:1014

2329 +#, fuzzy

2330 +msgid "You are in the middle of a cherry-pick -- cannot amend."

2331 msgstr "您正处于一个%s的过程中 -- 无法修补提交。"

2332

1622 -#: builtin/commit.c:1078

2333 +#: builtin/commit.c:1017

2334 msgid "Options --squash and --fixup cannot be used together"

2335 msgstr "选项 --squash 和 --fixup 不能共用"

2336

1626 -#: builtin/commit.c:1088

2337 +#: builtin/commit.c:1027

2338 msgid "Only one of -c/-C/-F/--fixup can be used."

2339 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

2340

1630 -#: builtin/commit.c:1090

2341 +#: builtin/commit.c:1029

2342 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

2343 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"

2344

1634 -#: builtin/commit.c:1098

2345 +#: builtin/commit.c:1037

2346 msgid "--reset-author can be used only with -C, -c or --amend."

2347 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"

2348

1638 -#: builtin/commit.c:1115

2349 +#: builtin/commit.c:1054

2350 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

2351 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

2352

1642 -#: builtin/commit.c:1117

2353 +#: builtin/commit.c:1056

2354 msgid "No paths with --include/--only does not make sense."

2355 msgstr "参数 --include/--only 不跟路径没有意义。"

2356

1646 -#: builtin/commit.c:1119

2357 +#: builtin/commit.c:1058

2358 msgid "Clever... amending the last one with dirty index."

2359 msgstr "聪明... 在索引不干净下修补最后的提交。"

2360

1650 -#: builtin/commit.c:1121

2361 +#: builtin/commit.c:1060

2362 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

2363 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

2364

1654 -#: builtin/commit.c:1131 builtin/tag.c:556

2365 +#: builtin/commit.c:1070 builtin/tag.c:577

2366 #, c-format

2367 msgid "Invalid cleanup mode %s"

2368 msgstr "无效的清理模式 %s"

2369

1659 -#: builtin/commit.c:1136

2370 +#: builtin/commit.c:1075

2371 msgid "Paths with -a does not make sense."

2372 msgstr "路径和 -a 选项共用没有意义。"

2373

1663 -#: builtin/commit.c:1315

2374 +#: builtin/commit.c:1258

2375 msgid "couldn't look up newly created commit"

2376 msgstr "无法找到新创建的提交"

2377

1667 -#: builtin/commit.c:1317

2378 +#: builtin/commit.c:1260

2379 msgid "could not parse newly created commit"

2380 msgstr "不能解析新创建的提交"

2381

1671 -#: builtin/commit.c:1358

2382 +#: builtin/commit.c:1301

2383 msgid "detached HEAD"

2384 msgstr "分离头指针"

2385

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

1676 -#: builtin/commit.c:1360

2387 +#: builtin/commit.c:1303

2388 msgid " (root-commit)"

2389 msgstr "（根提交）"

2390

1680 -#: builtin/commit.c:1450

2391 +#: builtin/commit.c:1447

2392 msgid "could not parse HEAD commit"

2393 msgstr "不能解析 HEAD 提交"

2394

1684 -#: builtin/commit.c:1487 builtin/merge.c:509

2395 +#: builtin/commit.c:1485 builtin/merge.c:509

2396 #, c-format

2397 msgid "could not open '%s' for reading"

2398 msgstr "不能为读入打开 '%s'"

2399

1689 -#: builtin/commit.c:1494

2400 +#: builtin/commit.c:1492

2401 #, c-format

2402 msgid "Corrupt MERGE_HEAD file (%s)"

2403 msgstr "损坏的 MERGE_HEAD 文件（%s）"

2404

1694 -#: builtin/commit.c:1501

2405 +#: builtin/commit.c:1499

2406 msgid "could not read MERGE_MODE"

2407 msgstr "不能读取 MERGE_MODE"

2408

1698 -#: builtin/commit.c:1520

2409 +#: builtin/commit.c:1518

2410 #, c-format

2411 msgid "could not read commit message: %s"

2412 msgstr "不能读取提交说明：%s"

2413

1703 -#: builtin/commit.c:1534

2414 +#: builtin/commit.c:1532

2415 #, c-format

2416 msgid "Aborting commit; you did not edit the message.\n"

2417 msgstr "终止提交；您未更改来自模版的提交说明。\n"

2418

1708 -#: builtin/commit.c:1539

2419 +#: builtin/commit.c:1537

2420 #, c-format

2421 msgid "Aborting commit due to empty commit message.\n"

2422 msgstr "终止提交因为提交说明为空。\n"

2423

1713 -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961

2424 +#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961

2425 msgid "failed to write commit object"

2426 msgstr "无法写提交对象"

2427

1717 -#: builtin/commit.c:1575

2428 +#: builtin/commit.c:1573

2429 msgid "cannot lock HEAD ref"

2430 msgstr "无法锁定 HEAD 引用"

2431

1721 -#: builtin/commit.c:1579

2432 +#: builtin/commit.c:1577

2433 msgid "cannot update HEAD ref"

2434 msgstr "无法更新 HEAD 引用"

2435

1725 -#: builtin/commit.c:1590

2436 +#: builtin/commit.c:1588

2437 msgid ""

2438 "Repository has been updated, but unable to write\n"

2439 "new_index file. Check that disk is not full or quota is\n"

@@ -1930,21 +2641,21 @@ msgstr ""

2641

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

2643 #: builtin/fetch.c:549

1933 -#, c-format

1934 -msgid " (%s will become dangling)\n"

2644 +#, fuzzy, c-format

2645 +msgid " (%s will become dangling)"

2646 msgstr " （%s 将成为悬空状态）\n"

2647

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

2649 #: builtin/fetch.c:550

1939 -#, c-format

1940 -msgid " (%s has become dangling)\n"

2650 +#, fuzzy, c-format

2651 +msgid " (%s has become dangling)"

2652 msgstr " （%s 已成为悬空状态）\n"

2653

2654 #: builtin/fetch.c:557

2655 msgid "[deleted]"

2656 msgstr "[已删除]"

2657

1947 -#: builtin/fetch.c:558

2658 +#: builtin/fetch.c:558 builtin/remote.c:1055

2659 msgid "(none)"

2660 msgstr "（无）"

2661

@@ -1973,7 +2684,7 @@ msgstr "选项 \"%s\" 对于 %s 被忽略\n"

2684 msgid "Fetching %s\n"

2685 msgstr "正在获取 %s\n"

2686

1976 -#: builtin/fetch.c:890

2687 +#: builtin/fetch.c:890 builtin/remote.c:100

2688 #, c-format

2689 msgid "Could not fetch %s"

2690 msgstr "不能获取 %s"

@@ -2093,6 +2804,313 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

2804 msgid "both --cached and trees are given."

2805 msgstr "同时给出了 --cached 和树对象。"

2806

2807 +#: builtin/help.c:59

2808 +#, fuzzy, c-format

2809 +msgid "unrecognized help format '%s'"

2810 +msgstr "未识别的参数：%s"

2811 +

2812 +#: builtin/help.c:87

2813 +#, fuzzy

2814 +msgid "Failed to start emacsclient."

2815 +msgstr "无法枚举 %s 状态\n"

2816 +

2817 +#: builtin/help.c:100

2818 +#, fuzzy

2819 +msgid "Failed to parse emacsclient version."

2820 +msgstr "无法读取对象 '%s'。"

2821 +

2822 +#: builtin/help.c:108

2823 +#, c-format

2824 +msgid "emacsclient version '%d' too old (< 22)."

2825 +msgstr ""

2826 +

2827 +#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171

2828 +#, fuzzy, c-format

2829 +msgid "failed to exec '%s': %s"

2830 +msgstr "无法打开 '%s'"

2831 +

2832 +#: builtin/help.c:211

2833 +#, c-format

2834 +msgid ""

2835 +"'%s': path for unsupported man viewer.\n"

2836 +"Please consider using 'man.<tool>.cmd' instead."

2837 +msgstr ""

2838 +

2839 +#: builtin/help.c:223

2840 +#, c-format

2841 +msgid ""

2842 +"'%s': cmd for supported man viewer.\n"

2843 +"Please consider using 'man.<tool>.path' instead."

2844 +msgstr ""

2845 +

2846 +#: builtin/help.c:287

2847 +msgid "The most commonly used git commands are:"

2848 +msgstr ""

2849 +

2850 +#: builtin/help.c:355

2851 +#, c-format

2852 +msgid "'%s': unknown man viewer."

2853 +msgstr ""

2854 +

2855 +#: builtin/help.c:372

2856 +#, fuzzy

2857 +msgid "no man viewer handled the request"

2858 +msgstr "没有合并策略处理此合并。\n"

2859 +

2860 +#: builtin/help.c:380

2861 +msgid "no info viewer handled the request"

2862 +msgstr ""

2863 +

2864 +#: builtin/help.c:391

2865 +#, fuzzy, c-format

2866 +msgid "'%s': not a documentation directory."

2867 +msgstr "不能访问当前工作目录"

2868 +

2869 +#: builtin/help.c:432 builtin/help.c:439

2870 +#, c-format

2871 +msgid "usage: %s%s"

2872 +msgstr ""

2873 +

2874 +#: builtin/help.c:453

2875 +#, c-format

2876 +msgid "`git %s' is aliased to `%s'"

2877 +msgstr ""

2878 +

2879 +#: builtin/index-pack.c:169

2880 +#, c-format

2881 +msgid "object type mismatch at %s"

2882 +msgstr ""

2883 +

2884 +#: builtin/index-pack.c:189

2885 +msgid "object of unexpected type"

2886 +msgstr ""

2887 +

2888 +#: builtin/index-pack.c:226

2889 +#, fuzzy, c-format

2890 +msgid "cannot fill %d byte"

2891 +msgid_plural "cannot fill %d bytes"

2892 +msgstr[0] "无法获知当前路径"

2893 +

2894 +#: builtin/index-pack.c:236

2895 +msgid "early EOF"

2896 +msgstr ""

2897 +

2898 +#: builtin/index-pack.c:237

2899 +msgid "read error on input"

2900 +msgstr ""

2901 +

2902 +#: builtin/index-pack.c:249

2903 +msgid "used more bytes than were available"

2904 +msgstr ""

2905 +

2906 +#: builtin/index-pack.c:256

2907 +msgid "pack too large for current definition of off_t"

2908 +msgstr ""

2909 +

2910 +#: builtin/index-pack.c:272

2911 +#, fuzzy, c-format

2912 +msgid "unable to create '%s'"

2913 +msgstr "不能写 %s"

2914 +

2915 +#: builtin/index-pack.c:277

2916 +#, fuzzy, c-format

2917 +msgid "cannot open packfile '%s'"

2918 +msgstr "无法打开补丁文件 %s"

2919 +

2920 +#: builtin/index-pack.c:291

2921 +msgid "pack signature mismatch"

2922 +msgstr ""

2923 +

2924 +#: builtin/index-pack.c:311

2925 +#, c-format

2926 +msgid "pack has bad object at offset %lu: %s"

2927 +msgstr ""

2928 +

2929 +#: builtin/index-pack.c:405

2930 +#, c-format

2931 +msgid "inflate returned %d"

2932 +msgstr ""

2933 +

2934 +#: builtin/index-pack.c:450

2935 +msgid "offset value overflow for delta base object"

2936 +msgstr ""

2937 +

2938 +#: builtin/index-pack.c:458

2939 +msgid "delta base offset is out of bound"

2940 +msgstr ""

2941 +

2942 +#: builtin/index-pack.c:466

2943 +#, fuzzy, c-format

2944 +msgid "unknown object type %d"

2945 +msgstr "未知类型：%d"

2946 +

2947 +#: builtin/index-pack.c:495

2948 +#, fuzzy

2949 +msgid "cannot pread pack file"

2950 +msgstr "无法打开补丁文件 %s"

2951 +

2952 +#: builtin/index-pack.c:497

2953 +#, c-format

2954 +msgid "premature end of pack file, %lu byte missing"

2955 +msgid_plural "premature end of pack file, %lu bytes missing"

2956 +msgstr[0] ""

2957 +

2958 +#: builtin/index-pack.c:510

2959 +msgid "serious inflate inconsistency"

2960 +msgstr ""

2961 +

2962 +#: builtin/index-pack.c:583

2963 +#, fuzzy, c-format

2964 +msgid "cannot read existing object %s"

2965 +msgstr "不能读取对象 %s"

2966 +

2967 +#: builtin/index-pack.c:586

2968 +#, c-format

2969 +msgid "SHA1 COLLISION FOUND WITH %s !"

2970 +msgstr ""

2971 +

2972 +#: builtin/index-pack.c:598

2973 +#, fuzzy, c-format

2974 +msgid "invalid blob object %s"

2975 +msgstr "不是一个有效对象：%s"

2976 +

2977 +#: builtin/index-pack.c:610

2978 +#, fuzzy, c-format

2979 +msgid "invalid %s"

2980 +msgstr "无效键名：%s"

2981 +

2982 +#: builtin/index-pack.c:612

2983 +msgid "Error in object"

2984 +msgstr ""

2985 +

2986 +#: builtin/index-pack.c:614

2987 +#, c-format

2988 +msgid "Not all child objects of %s are reachable"

2989 +msgstr ""

2990 +

2991 +#: builtin/index-pack.c:687 builtin/index-pack.c:713

2992 +#, fuzzy

2993 +msgid "failed to apply delta"

2994 +msgstr "无法拷贝文件至 '%s'"

2995 +

2996 +#: builtin/index-pack.c:850

2997 +#, fuzzy

2998 +msgid "Receiving objects"

2999 +msgstr "删除对象 %s 的注解\n"

3000 +

3001 +#: builtin/index-pack.c:850

3002 +#, fuzzy

3003 +msgid "Indexing objects"

3004 +msgstr "坏对象 %s"

3005 +

3006 +#: builtin/index-pack.c:872

3007 +msgid "pack is corrupted (SHA1 mismatch)"

3008 +msgstr ""

3009 +

3010 +#: builtin/index-pack.c:877

3011 +#, fuzzy

3012 +msgid "cannot fstat packfile"

3013 +msgstr "不能枚举模版 '%s' 状态"

3014 +

3015 +#: builtin/index-pack.c:880

3016 +msgid "pack has junk at the end"

3017 +msgstr ""

3018 +

3019 +#: builtin/index-pack.c:903

3020 +#, fuzzy

3021 +msgid "Resolving deltas"

3022 +msgstr "正删除 %s\n"

3023 +

3024 +#: builtin/index-pack.c:954

3025 +msgid "confusion beyond insanity"

3026 +msgstr ""

3027 +

3028 +#: builtin/index-pack.c:973

3029 +#, c-format

3030 +msgid "pack has %d unresolved delta"

3031 +msgid_plural "pack has %d unresolved deltas"

3032 +msgstr[0] ""

3033 +

3034 +#: builtin/index-pack.c:998

3035 +#, fuzzy, c-format

3036 +msgid "unable to deflate appended object (%d)"

3037 +msgstr "不能写注解对象"

3038 +

3039 +#: builtin/index-pack.c:1077

3040 +#, c-format

3041 +msgid "local object %s is corrupt"

3042 +msgstr ""

3043 +

3044 +#: builtin/index-pack.c:1101

3045 +msgid "error while closing pack file"

3046 +msgstr ""

3047 +

3048 +#: builtin/index-pack.c:1114

3049 +#, fuzzy, c-format

3050 +msgid "cannot write keep file '%s'"

3051 +msgstr "不能枚举模版 '%s' 状态"

3052 +

3053 +#: builtin/index-pack.c:1122

3054 +#, fuzzy, c-format

3055 +msgid "cannot close written keep file '%s'"

3056 +msgstr "不能枚举模版 '%s' 状态"

3057 +

3058 +#: builtin/index-pack.c:1135

3059 +#, fuzzy

3060 +msgid "cannot store pack file"

3061 +msgstr "无法打开补丁文件 %s"

3062 +

3063 +#: builtin/index-pack.c:1146

3064 +#, fuzzy

3065 +msgid "cannot store index file"

3066 +msgstr "无法读取索引"

3067 +

3068 +#: builtin/index-pack.c:1247

3069 +#, fuzzy, c-format

3070 +msgid "Cannot open existing pack file '%s'"

3071 +msgstr "无法打开补丁文件 %s"

3072 +

3073 +#: builtin/index-pack.c:1249

3074 +#, fuzzy, c-format

3075 +msgid "Cannot open existing pack idx file for '%s'"

3076 +msgstr "无法打开补丁文件 %s"

3077 +

3078 +#: builtin/index-pack.c:1296

3079 +#, fuzzy, c-format

3080 +msgid "non delta: %d object"

3081 +msgid_plural "non delta: %d objects"

3082 +msgstr[0] "不是一个有效对象：%s"

3083 +

3084 +#: builtin/index-pack.c:1303

3085 +#, c-format

3086 +msgid "chain length = %d: %lu object"

3087 +msgid_plural "chain length = %d: %lu objects"

3088 +msgstr[0] ""

3089 +

3090 +#: builtin/index-pack.c:1330

3091 +msgid "Cannot come back to cwd"

3092 +msgstr ""

3093 +

3094 +#: builtin/index-pack.c:1374 builtin/index-pack.c:1377

3095 +#: builtin/index-pack.c:1389 builtin/index-pack.c:1393

3096 +#, fuzzy, c-format

3097 +msgid "bad %s"

3098 +msgstr "坏对象 %s"

3099 +

3100 +#: builtin/index-pack.c:1407

3101 +#, fuzzy

3102 +msgid "--fix-thin cannot be used without --stdin"

3103 +msgstr "--orphan 不能和 -t 共用"

3104 +

3105 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1421

3106 +#, c-format

3107 +msgid "packfile name '%s' does not end with '.pack'"

3108 +msgstr ""

3109 +

3110 +#: builtin/index-pack.c:1430

3111 +msgid "--verify with no packfile name given"

3112 +msgstr ""

3113 +

3114 #: builtin/init-db.c:35

3115 #, c-format

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

@@ -2304,11 +3322,6 @@ msgstr "-n 和 -k 互斥。"

3322 msgid "--subject-prefix and -k are mutually exclusive."

3323 msgstr "--subject-prefix 和 -k 互斥。"

3324

2307 -#: builtin/log.c:1231 builtin/shortlog.c:284

2308 -#, c-format

2309 -msgid "unrecognized argument: %s"

2310 -msgstr "未识别的参数：%s"

2311 -

3325 #: builtin/log.c:1234

3326 msgid "--name-only does not make sense"

3327 msgstr "--name-only 无意义"

@@ -2662,7 +3675,7 @@ msgstr "%s，源=%s，目标=%s"

3675 msgid "Renaming %s to %s\n"

3676 msgstr "重命名 %s 至 %s\n"

3677

2665 -#: builtin/mv.c:215

3678 +#: builtin/mv.c:215 builtin/remote.c:731

3679 #, c-format

3680 msgid "renaming '%s' failed"

3681 msgstr "重命名 '%s' 失败"

@@ -2686,7 +3699,7 @@ msgstr "无法为对象 '%s' 的 'show' 关闭管道"

3699 msgid "failed to finish 'show' for object '%s'"

3700 msgstr "无法为对象 '%s' 完成 'show'"

3701

2689 -#: builtin/notes.c:175 builtin/tag.c:343

3702 +#: builtin/notes.c:175 builtin/tag.c:347

3703 #, c-format

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

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

@@ -2709,12 +3722,12 @@ msgstr "不能写注解对象"

3722 msgid "The note contents has been left in %s"

3723 msgstr "注解内容被留在文件 %s 中"

3724

2712 -#: builtin/notes.c:251 builtin/tag.c:521

3725 +#: builtin/notes.c:251 builtin/tag.c:542

3726 #, c-format

3727 msgid "cannot read '%s'"

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

3729

2717 -#: builtin/notes.c:253 builtin/tag.c:524

3730 +#: builtin/notes.c:253 builtin/tag.c:545

3731 #, c-format

3732 msgid "could not open or read '%s'"

3733 msgstr "不能打开或读取 '%s'"

@@ -2722,7 +3735,7 @@ msgstr "不能打开或读取 '%s'"

3735 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

3736 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

3737 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

2725 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537

3738 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558

3739 #, c-format

3740 msgid "Failed to resolve '%s' as a valid ref."

3741 msgstr "无法解析 '%s' 为一个有效引用。"

@@ -2816,7 +3829,7 @@ msgstr ""

3829 msgid "Object %s has no note\n"

3830 msgstr "对象 %s 没有注解\n"

3831

2819 -#: builtin/notes.c:1103

3832 +#: builtin/notes.c:1103 builtin/remote.c:1598

3833 #, c-format

3834 msgid "Unknown subcommand: %s"

3835 msgstr "未知子命令：%s"

@@ -2849,7 +3862,28 @@ msgstr "tag 简写没有跟 <tag> 参数"

3862 msgid "--delete only accepts plain target ref names"

3863 msgstr "--delete 只接受简单的目标引用名"

3864

2852 -#: builtin/push.c:84

3865 +#: builtin/push.c:99

3866 +msgid ""

3867 +"\n"

3868 +"To choose either option permanently, see push.default in 'git help config'."

3869 +msgstr ""

3870 +

3871 +#: builtin/push.c:102

3872 +#, c-format

3873 +msgid ""

3874 +"The upstream branch of your current branch does not match\n"

3875 +"the name of your current branch. To push to the upstream branch\n"

3876 +"on the remote, use\n"

3877 +"\n"

3878 +" git push %s HEAD:%s\n"

3879 +"\n"

3880 +"To push to the branch of the same name on the remote, use\n"

3881 +"\n"

3882 +" git push %s %s\n"

3883 +"%s"

3884 +msgstr ""

3885 +

3886 +#: builtin/push.c:121

3887 #, c-format

3888 msgid ""

3889 "You are not currently on a branch.\n"

@@ -2863,7 +3897,7 @@ msgstr ""

3897 "\n"

3898 " git push %s HEAD:<name-of-remote-branch>\n"

3899

2866 -#: builtin/push.c:91

3900 +#: builtin/push.c:128

3901 #, c-format

3902 msgid ""

3903 "The current branch %s has no upstream branch.\n"

@@ -2876,12 +3910,12 @@ msgstr ""

3910 "\n"

3911 " git push --set-upstream %s %s\n"

3912

2879 -#: builtin/push.c:99

3913 +#: builtin/push.c:136

3914 #, c-format

3915 msgid "The current branch %s has multiple upstream branches, refusing to push."

3916 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"

3917

2884 -#: builtin/push.c:102

3918 +#: builtin/push.c:139

3919 #, c-format

3920 msgid ""

3921 "You are pushing to remote '%s', which is not the upstream of\n"

@@ -2891,12 +3925,12 @@ msgstr ""

3925 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"

3926 "而没有告诉我要推送什么、更新哪个远程分支。"

3927

2894 -#: builtin/push.c:131

3928 +#: builtin/push.c:174

3929 msgid ""

3930 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

3931 msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"

3932

2899 -#: builtin/push.c:138

3933 +#: builtin/push.c:181

3934 msgid ""

3935 "Updates were rejected because the tip of your current branch is behind\n"

3936 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"

@@ -2907,7 +3941,7 @@ msgstr ""

3941 "再次推送前，先与远程变更合并（如 'git pull'）。详见\n"

3942 "'git push --help' 中的 'Note about fast-forwards' 小节。"

3943

2910 -#: builtin/push.c:144

3944 +#: builtin/push.c:187

3945 msgid ""

3946 "Updates were rejected because a pushed branch tip is behind its remote\n"

3947 "counterpart. If you did not intend to push that branch, you may want to\n"

@@ -2916,10 +3950,9 @@ msgid ""

3950 msgstr ""

3951 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"

3952 "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"

2919 -"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送"

2920 -"当前分支。"

3953 +"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"

3954

2922 -#: builtin/push.c:150

3955 +#: builtin/push.c:193

3956 msgid ""

3957 "Updates were rejected because a pushed branch tip is behind its remote\n"

3958 "counterpart. Check out this branch and merge the remote changes\n"

@@ -2930,22 +3963,22 @@ msgstr ""

3963 "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"

3964 "'git push --help' 中的 'Note about fast-forwards' 小节。"

3965

2933 -#: builtin/push.c:190

3966 +#: builtin/push.c:233

3967 #, c-format

3968 msgid "Pushing to %s\n"

3969 msgstr "推送到 %s\n"

3970

2938 -#: builtin/push.c:194

3971 +#: builtin/push.c:237

3972 #, c-format

3973 msgid "failed to push some refs to '%s'"

3974 msgstr "无法推送一些引用到 '%s'"

3975

2943 -#: builtin/push.c:226

3976 +#: builtin/push.c:269

3977 #, c-format

3978 msgid "bad repository '%s'"

3979 msgstr "坏的版本库 '%s'"

3980

2948 -#: builtin/push.c:227

3981 +#: builtin/push.c:270

3982 msgid ""

3983 "No configured push destination.\n"

3984 "Either specify the URL from the command-line or configure a remote "

@@ -2966,34 +3999,384 @@ msgstr ""

3999 "\n"

4000 " git push <name>\n"

4001

2969 -#: builtin/push.c:242

4002 +#: builtin/push.c:285

4003 msgid "--all and --tags are incompatible"

4004 msgstr "--all 和 --tags 不兼容"

4005

2973 -#: builtin/push.c:243

4006 +#: builtin/push.c:286

4007 msgid "--all can't be combined with refspecs"

4008 msgstr "--all 不能和引用表达式共用"

4009

2977 -#: builtin/push.c:248

4010 +#: builtin/push.c:291

4011 msgid "--mirror and --tags are incompatible"

4012 msgstr "--mirror 和 --tags 不兼容"

4013

2981 -#: builtin/push.c:249

4014 +#: builtin/push.c:292

4015 msgid "--mirror can't be combined with refspecs"

4016 msgstr "--mirror 不能和引用表达式共用"

4017

2985 -#: builtin/push.c:254

4018 +#: builtin/push.c:297

4019 msgid "--all and --mirror are incompatible"

4020 msgstr "--all 和 --mirror 不兼容"

4021

2989 -#: builtin/push.c:334

4022 +#: builtin/push.c:385

4023 msgid "--delete is incompatible with --all, --mirror and --tags"

4024 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

4025

2993 -#: builtin/push.c:336

4026 +#: builtin/push.c:387

4027 msgid "--delete doesn't make sense without any refs"

4028 msgstr "--delete 未接任何引用没有意义"

4029

4030 +#: builtin/remote.c:98

4031 +#, fuzzy, c-format

4032 +msgid "Updating %s"

4033 +msgstr "更新 %s..%s\n"

4034 +

4035 +#: builtin/remote.c:130

4036 +msgid ""

4037 +"--mirror is dangerous and deprecated; please\n"

4038 +"\t use --mirror=fetch or --mirror=push instead"

4039 +msgstr ""

4040 +

4041 +#: builtin/remote.c:147

4042 +#, fuzzy, c-format

4043 +msgid "unknown mirror argument: %s"

4044 +msgstr "未识别的参数：%s"

4045 +

4046 +#: builtin/remote.c:185

4047 +msgid "specifying a master branch makes no sense with --mirror"

4048 +msgstr ""

4049 +

4050 +#: builtin/remote.c:187

4051 +msgid "specifying branches to track makes sense only with fetch mirrors"

4052 +msgstr ""

4053 +

4054 +#: builtin/remote.c:195 builtin/remote.c:646

4055 +#, fuzzy, c-format

4056 +msgid "remote %s already exists."

4057 +msgstr "%s 已经存在"

4058 +

4059 +#: builtin/remote.c:199 builtin/remote.c:650

4060 +#, fuzzy, c-format

4061 +msgid "'%s' is not a valid remote name"

4062 +msgstr "'%s' 不是一个有效的tag名称。"

4063 +

4064 +#: builtin/remote.c:243

4065 +#, fuzzy, c-format

4066 +msgid "Could not setup master '%s'"

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

4068 +

4069 +#: builtin/remote.c:299

4070 +#, fuzzy, c-format

4071 +msgid "more than one %s"

4072 +msgstr "提供了超过两个 blob 对象：'%s'"

4073 +

4074 +#: builtin/remote.c:339

4075 +#, fuzzy, c-format

4076 +msgid "Could not get fetch map for refspec %s"

4077 +msgstr "不能获取 %s"

4078 +

4079 +#: builtin/remote.c:440 builtin/remote.c:448

4080 +msgid "(matching)"

4081 +msgstr ""

4082 +

4083 +#: builtin/remote.c:452

4084 +#, fuzzy

4085 +msgid "(delete)"

4086 +msgstr "[已删除]"

4087 +

4088 +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607

4089 +#, fuzzy, c-format

4090 +msgid "Could not append '%s' to '%s'"

4091 +msgstr "不能应用 '%s'"

4092 +

4093 +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890

4094 +#, fuzzy, c-format

4095 +msgid "No such remote: %s"

4096 +msgstr "没有这样的远程或远程组：%s"

4097 +

4098 +#: builtin/remote.c:656

4099 +#, fuzzy, c-format

4100 +msgid "Could not rename config section '%s' to '%s'"

4101 +msgstr "不能创建目录 '%s'"

4102 +

4103 +#: builtin/remote.c:662 builtin/remote.c:799

4104 +#, fuzzy, c-format

4105 +msgid "Could not remove config section '%s'"

4106 +msgstr "不能创建目录 '%s'"

4107 +

4108 +#: builtin/remote.c:677

4109 +#, c-format

4110 +msgid ""

4111 +"Not updating non-default fetch respec\n"

4112 +"\t%s\n"

4113 +"\tPlease update the configuration manually if necessary."

4114 +msgstr ""

4115 +

4116 +#: builtin/remote.c:683

4117 +#, fuzzy, c-format

4118 +msgid "Could not append '%s'"

4119 +msgstr "不能应用 '%s'"

4120 +

4121 +#: builtin/remote.c:694

4122 +#, fuzzy, c-format

4123 +msgid "Could not set '%s'"

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

4125 +

4126 +#: builtin/remote.c:716

4127 +#, fuzzy, c-format

4128 +msgid "deleting '%s' failed"

4129 +msgstr "重命名 '%s' 失败"

4130 +

4131 +#: builtin/remote.c:750

4132 +#, fuzzy, c-format

4133 +msgid "creating '%s' failed"

4134 +msgstr "重命名 '%s' 失败"

4135 +

4136 +#: builtin/remote.c:764

4137 +#, fuzzy, c-format

4138 +msgid "Could not remove branch %s"

4139 +msgstr "不会删除 %s\n"

4140 +

4141 +#: builtin/remote.c:834

4142 +msgid ""

4143 +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

4144 +"to delete it, use:"

4145 +msgid_plural ""

4146 +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"

4147 +"to delete them, use:"

4148 +msgstr[0] ""

4149 +

4150 +#: builtin/remote.c:943

4151 +#, c-format

4152 +msgid " new (next fetch will store in remotes/%s)"

4153 +msgstr ""

4154 +

4155 +#: builtin/remote.c:946

4156 +#, fuzzy

4157 +msgid " tracked"

4158 +msgstr "未跟踪的"

4159 +

4160 +#: builtin/remote.c:948

4161 +msgid " stale (use 'git remote prune' to remove)"

4162 +msgstr ""

4163 +

4164 +#: builtin/remote.c:950

4165 +msgid " ???"

4166 +msgstr ""

4167 +

4168 +#: builtin/remote.c:991

4169 +#, c-format

4170 +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

4171 +msgstr ""

4172 +

4173 +#: builtin/remote.c:998

4174 +#, fuzzy, c-format

4175 +msgid "rebases onto remote %s"

4176 +msgstr "无法删除 %s"

4177 +

4178 +#: builtin/remote.c:1001

4179 +#, fuzzy, c-format

4180 +msgid " merges with remote %s"

4181 +msgstr "使用策略 %s 合并失败。\n"

4182 +

4183 +#: builtin/remote.c:1002

4184 +msgid " and with remote"

4185 +msgstr ""

4186 +

4187 +#: builtin/remote.c:1004

4188 +#, fuzzy, c-format

4189 +msgid "merges with remote %s"

4190 +msgstr "使用策略 %s 合并失败。\n"

4191 +

4192 +#: builtin/remote.c:1005

4193 +msgid " and with remote"

4194 +msgstr ""

4195 +

4196 +#: builtin/remote.c:1051

4197 +msgid "create"

4198 +msgstr ""

4199 +

4200 +#: builtin/remote.c:1054

4201 +#, fuzzy

4202 +msgid "delete"

4203 +msgstr "[已删除]"

4204 +

4205 +#: builtin/remote.c:1058

4206 +#, fuzzy

4207 +msgid "up to date"

4208 +msgstr "[最新]"

4209 +

4210 +#: builtin/remote.c:1061

4211 +#, fuzzy

4212 +msgid "fast-forwardable"

4213 +msgstr "（非快进式）"

4214 +

4215 +#: builtin/remote.c:1064

4216 +msgid "local out of date"

4217 +msgstr ""

4218 +

4219 +#: builtin/remote.c:1071

4220 +#, c-format

4221 +msgid " %-*s forces to %-*s (%s)"

4222 +msgstr ""

4223 +

4224 +#: builtin/remote.c:1074

4225 +#, c-format

4226 +msgid " %-*s pushes to %-*s (%s)"

4227 +msgstr ""

4228 +

4229 +#: builtin/remote.c:1078

4230 +#, c-format

4231 +msgid " %-*s forces to %s"

4232 +msgstr ""

4233 +

4234 +#: builtin/remote.c:1081

4235 +#, c-format

4236 +msgid " %-*s pushes to %s"

4237 +msgstr ""

4238 +

4239 +# 译者：汉字之间无空格，故删除尾部空格

4240 +#: builtin/remote.c:1118

4241 +#, fuzzy, c-format

4242 +msgid "* remote %s"

4243 +msgstr "远程"

4244 +

4245 +#: builtin/remote.c:1119

4246 +#, c-format

4247 +msgid " Fetch URL: %s"

4248 +msgstr ""

4249 +

4250 +#: builtin/remote.c:1120 builtin/remote.c:1285

4251 +msgid "(no URL)"

4252 +msgstr ""

4253 +

4254 +#: builtin/remote.c:1129 builtin/remote.c:1131

4255 +#, c-format

4256 +msgid " Push URL: %s"

4257 +msgstr ""

4258 +

4259 +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137

4260 +#, fuzzy, c-format

4261 +msgid " HEAD branch: %s"

4262 +msgstr "HEAD（非分支）"

4263 +

4264 +#: builtin/remote.c:1139

4265 +#, c-format

4266 +msgid ""

4267 +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

4268 +msgstr ""

4269 +

4270 +#: builtin/remote.c:1151

4271 +#, fuzzy, c-format

4272 +msgid " Remote branch:%s"

4273 +msgid_plural " Remote branches:%s"

4274 +msgstr[0] "重置分支 '%s'\n"

4275 +

4276 +#: builtin/remote.c:1154 builtin/remote.c:1181

4277 +msgid " (status not queried)"

4278 +msgstr ""

4279 +

4280 +#: builtin/remote.c:1163

4281 +msgid " Local branch configured for 'git pull':"

4282 +msgid_plural " Local branches configured for 'git pull':"

4283 +msgstr[0] ""

4284 +

4285 +#: builtin/remote.c:1171

4286 +msgid " Local refs will be mirrored by 'git push'"

4287 +msgstr ""

4288 +

4289 +#: builtin/remote.c:1178

4290 +#, fuzzy, c-format

4291 +msgid " Local ref configured for 'git push'%s:"

4292 +msgid_plural " Local refs configured for 'git push'%s:"

4293 +msgstr[0] "尚未给分支 '%s' 设置上游"

4294 +

4295 +#: builtin/remote.c:1216

4296 +#, fuzzy

4297 +msgid "Cannot determine remote HEAD"

4298 +msgstr "不能解析 HEAD"

4299 +

4300 +#: builtin/remote.c:1218

4301 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

4302 +msgstr ""

4303 +

4304 +#: builtin/remote.c:1228

4305 +#, fuzzy, c-format

4306 +msgid "Could not delete %s"

4307 +msgstr "不能获取 %s"

4308 +

4309 +#: builtin/remote.c:1236

4310 +#, fuzzy, c-format

4311 +msgid "Not a valid ref: %s"

4312 +msgstr "不是一个有效对象：%s"

4313 +

4314 +#: builtin/remote.c:1238

4315 +#, fuzzy, c-format

4316 +msgid "Could not setup %s"

4317 +msgstr "不能获取 %s"

4318 +

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

4320 +#: builtin/remote.c:1274

4321 +#, fuzzy, c-format

4322 +msgid " %s will become dangling!"

4323 +msgstr " （%s 将成为悬空状态）\n"

4324 +

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

4326 +#: builtin/remote.c:1275

4327 +#, fuzzy, c-format

4328 +msgid " %s has become dangling!"

4329 +msgstr " （%s 已成为悬空状态）\n"

4330 +

4331 +#: builtin/remote.c:1281

4332 +#, fuzzy, c-format

4333 +msgid "Pruning %s"

4334 +msgstr "推送到 %s\n"

4335 +

4336 +#: builtin/remote.c:1282

4337 +#, c-format

4338 +msgid "URL: %s"

4339 +msgstr ""

4340 +

4341 +#: builtin/remote.c:1295

4342 +#, c-format

4343 +msgid " * [would prune] %s"

4344 +msgstr ""

4345 +

4346 +#: builtin/remote.c:1298

4347 +#, c-format

4348 +msgid " * [pruned] %s"

4349 +msgstr ""

4350 +

4351 +#: builtin/remote.c:1387 builtin/remote.c:1461

4352 +#, fuzzy, c-format

4353 +msgid "No such remote '%s'"

4354 +msgstr "没有此分支：'%s'"

4355 +

4356 +#: builtin/remote.c:1414

4357 +#, fuzzy

4358 +msgid "no remote specified"

4359 +msgstr "未指定分支名"

4360 +

4361 +#: builtin/remote.c:1447

4362 +#, fuzzy

4363 +msgid "--add --delete doesn't make sense"

4364 +msgstr "--name-only 无意义"

4365 +

4366 +#: builtin/remote.c:1487

4367 +#, fuzzy, c-format

4368 +msgid "Invalid old URL pattern: %s"

4369 +msgstr "无效选项：%s"

4370 +

4371 +#: builtin/remote.c:1495

4372 +#, fuzzy, c-format

4373 +msgid "No such URL found: %s"

4374 +msgstr "没有此分支：'%s'"

4375 +

4376 +#: builtin/remote.c:1497

4377 +msgid "Will not delete all non-push URLs"

4378 +msgstr ""

4379 +

4380 #: builtin/reset.c:33

4381 msgid "mixed"

4382 msgstr "混杂"

@@ -3006,6 +4389,10 @@ msgstr "软性"

4389 msgid "hard"

4390 msgstr "硬性"

4391

4392 +#: builtin/reset.c:33

4393 +msgid "merge"

4394 +msgstr "合并"

4395 +

4396 #: builtin/reset.c:33

4397 msgid "keep"

4398 msgstr "保持"

@@ -3081,15 +4468,15 @@ msgstr "不能重置索引文件至版本 '%s'。"

4468 msgid "%s: %s cannot be used with %s"

4469 msgstr "%s：%s 不能和 %s 共用"

4470

3084 -#: builtin/revert.c:127

4471 +#: builtin/revert.c:131

4472 msgid "program error"

4473 msgstr "程序错误"

4474

3088 -#: builtin/revert.c:213

4475 +#: builtin/revert.c:221

4476 msgid "revert failed"

4477 msgstr "还原失败"

4478

3092 -#: builtin/revert.c:228

4479 +#: builtin/revert.c:236

4480 msgid "cherry-pick failed"

4481 msgstr "拣选失败"

4482

@@ -3135,32 +4522,32 @@ msgstr "git rm：不能删除 %s"

4522 msgid "Missing author: %s"

4523 msgstr "缺少作者：%s"

4524

3138 -#: builtin/tag.c:58

4525 +#: builtin/tag.c:60

4526 #, c-format

4527 msgid "malformed object at '%s'"

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

4529

3143 -#: builtin/tag.c:205

4530 +#: builtin/tag.c:207

4531 #, c-format

4532 msgid "tag name too long: %.*s..."

4533 msgstr "tag 名字太长：%.*s..."

4534

3148 -#: builtin/tag.c:210

4535 +#: builtin/tag.c:212

4536 #, c-format

4537 msgid "tag '%s' not found."

4538 msgstr "tag '%s' 未发现。"

4539

3153 -#: builtin/tag.c:225

4540 +#: builtin/tag.c:227

4541 #, c-format

4542 msgid "Deleted tag '%s' (was %s)\n"

4543 msgstr "已删除 tag '%s'（曾为 %s）\n"

4544

3158 -#: builtin/tag.c:237

4545 +#: builtin/tag.c:239

4546 #, c-format

4547 msgid "could not verify the tag '%s'"

4548 msgstr "不能校验 tag '%s'"

4549

3163 -#: builtin/tag.c:247

4550 +#: builtin/tag.c:249

4551 msgid ""

4552 "\n"

4553 "#\n"

@@ -3174,7 +4561,7 @@ msgstr ""

4561 "# 以 '#' 开头的行将被忽略。\n"

4562 "#\n"

4563

3177 -#: builtin/tag.c:254

4564 +#: builtin/tag.c:256

4565 msgid ""

4566 "\n"

4567 "#\n"

@@ -3189,85 +4576,216 @@ msgstr ""

4576 "# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"

4577 "#\n"

4578

3192 -#: builtin/tag.c:294

4579 +#: builtin/tag.c:298

4580 msgid "unable to sign the tag"

4581 msgstr "无法签署 tag"

4582

3196 -#: builtin/tag.c:296

4583 +#: builtin/tag.c:300

4584 msgid "unable to write tag file"

4585 msgstr "无法写 tag 文件"

4586

3200 -#: builtin/tag.c:321

4587 +#: builtin/tag.c:325

4588 msgid "bad object type."

4589 msgstr "坏的对象类型。"

4590

3204 -#: builtin/tag.c:334

4591 +#: builtin/tag.c:338

4592 msgid "tag header too big."

4593 msgstr "tag 头信息太大。"

4594

3208 -#: builtin/tag.c:366

4595 +#: builtin/tag.c:370

4596 msgid "no tag message?"

4597 msgstr "无 tag 说明？"

4598

3212 -#: builtin/tag.c:372

4599 +#: builtin/tag.c:376

4600 #, c-format

4601 msgid "The tag message has been left in %s\n"

4602 msgstr "tag 说明被保留在 %s\n"

4603

3217 -#: builtin/tag.c:421

4604 +#: builtin/tag.c:425

4605 msgid "switch 'points-at' requires an object"

4606 msgstr "开关 'points-at' 需要一个对象"

4607

3221 -#: builtin/tag.c:423

4608 +#: builtin/tag.c:427

4609 #, c-format

4610 msgid "malformed object name '%s'"

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

4612

3226 -#: builtin/tag.c:502

4613 +#: builtin/tag.c:506

4614 +#, fuzzy

4615 +msgid "--column and -n are incompatible"

4616 +msgstr "--all 和 --tags 不兼容"

4617 +

4618 +#: builtin/tag.c:523

4619 msgid "-n option is only allowed with -l."

4620 msgstr "-n 选项只允许和 -l 共用。"

4621

3230 -#: builtin/tag.c:504

4622 +#: builtin/tag.c:525

4623 msgid "--contains option is only allowed with -l."

4624 msgstr "--contains 选项只允许和 -l 共用。"

4625

3234 -#: builtin/tag.c:506

4626 +#: builtin/tag.c:527

4627 msgid "--points-at option is only allowed with -l."

4628 msgstr "--points-at 选项只允许和 -l 共用。"

4629

3238 -#: builtin/tag.c:514

4630 +#: builtin/tag.c:535

4631 msgid "only one -F or -m option is allowed."

4632 msgstr "只允许一个 -F 或 -m 选项。"

4633

3242 -#: builtin/tag.c:534

4634 +#: builtin/tag.c:555

4635 msgid "too many params"

4636 msgstr "太多参数"

4637

3246 -#: builtin/tag.c:540

4638 +#: builtin/tag.c:561

4639 #, c-format

4640 msgid "'%s' is not a valid tag name."

4641 msgstr "'%s' 不是一个有效的tag名称。"

4642

3251 -#: builtin/tag.c:545

4643 +#: builtin/tag.c:566

4644 #, c-format

4645 msgid "tag '%s' already exists"

4646 msgstr "tag '%s' 已存在"

4647

3256 -#: builtin/tag.c:563

4648 +#: builtin/tag.c:584

4649 #, c-format

4650 msgid "%s: cannot lock the ref"

4651 msgstr "%s：不能锁定引用"

4652

3261 -#: builtin/tag.c:565

4653 +#: builtin/tag.c:586

4654 #, c-format

4655 msgid "%s: cannot update the ref"

4656 msgstr "%s：不能更新引用"

4657

3266 -#: builtin/tag.c:567

4658 +#: builtin/tag.c:588

4659 #, c-format

4660 msgid "Updated tag '%s' (was %s)\n"

4661 msgstr "已更新tag '%s'（曾为 %s）\n"

4662

4663 +#: git.c:16

4664 +msgid "See 'git help <command>' for more information on a specific command."

4665 +msgstr ""

4666 +

4667 +#: parse-options.h:133 parse-options.h:235

4668 +msgid "n"

4669 +msgstr ""

4670 +

4671 +#: parse-options.h:141

4672 +msgid "time"

4673 +msgstr ""

4674 +

4675 +#: parse-options.h:149

4676 +#, fuzzy

4677 +msgid "file"

4678 +msgstr "%s文件："

4679 +

4680 +#: parse-options.h:151

4681 +msgid "when"

4682 +msgstr ""

4683 +

4684 +#: parse-options.h:156

4685 +msgid "no-op (backward compatibility)"

4686 +msgstr ""

4687 +

4688 +#: parse-options.h:228

4689 +msgid "be more verbose"

4690 +msgstr ""

4691 +

4692 +#: parse-options.h:230

4693 +msgid "be more quiet"

4694 +msgstr ""

4695 +

4696 +#: parse-options.h:236

4697 +msgid "use <n> digits to display SHA-1s"

4698 +msgstr ""

4699 +

4700 +#: common-cmds.h:8

4701 +msgid "Add file contents to the index"

4702 +msgstr ""

4703 +

4704 +#: common-cmds.h:9

4705 +msgid "Find by binary search the change that introduced a bug"

4706 +msgstr ""

4707 +

4708 +#: common-cmds.h:10

4709 +#, fuzzy

4710 +msgid "List, create, or delete branches"

4711 +msgstr "无法变基到多个分支"

4712 +

4713 +#: common-cmds.h:11

4714 +msgid "Checkout a branch or paths to the working tree"

4715 +msgstr ""

4716 +

4717 +#: common-cmds.h:12

4718 +#, fuzzy

4719 +msgid "Clone a repository into a new directory"

4720 +msgstr "引用版本库 '%s' 不是一个本地目录。"

4721 +

4722 +#: common-cmds.h:13

4723 +#, fuzzy

4724 +msgid "Record changes to the repository"

4725 +msgstr "不是一个 git 版本库"

4726 +

4727 +#: common-cmds.h:14

4728 +msgid "Show changes between commits, commit and working tree, etc"

4729 +msgstr ""

4730 +

4731 +#: common-cmds.h:15

4732 +msgid "Download objects and refs from another repository"

4733 +msgstr ""

4734 +

4735 +#: common-cmds.h:16

4736 +msgid "Print lines matching a pattern"

4737 +msgstr ""

4738 +

4739 +#: common-cmds.h:17

4740 +msgid "Create an empty git repository or reinitialize an existing one"

4741 +msgstr ""

4742 +

4743 +#: common-cmds.h:18

4744 +#, fuzzy

4745 +msgid "Show commit logs"

4746 +msgstr "未知提交 %s"

4747 +

4748 +#: common-cmds.h:19

4749 +msgid "Join two or more development histories together"

4750 +msgstr ""

4751 +

4752 +#: common-cmds.h:20

4753 +msgid "Move or rename a file, a directory, or a symlink"

4754 +msgstr ""

4755 +

4756 +#: common-cmds.h:21

4757 +msgid "Fetch from and merge with another repository or a local branch"

4758 +msgstr ""

4759 +

4760 +#: common-cmds.h:22

4761 +msgid "Update remote refs along with associated objects"

4762 +msgstr ""

4763 +

4764 +#: common-cmds.h:23

4765 +msgid "Forward-port local commits to the updated upstream head"

4766 +msgstr ""

4767 +

4768 +#: common-cmds.h:24

4769 +msgid "Reset current HEAD to the specified state"

4770 +msgstr ""

4771 +

4772 +#: common-cmds.h:25

4773 +msgid "Remove files from the working tree and from the index"

4774 +msgstr ""

4775 +

4776 +#: common-cmds.h:26

4777 +msgid "Show various types of objects"

4778 +msgstr ""

4779 +

4780 +#: common-cmds.h:27

4781 +#, fuzzy

4782 +msgid "Show the working tree status"

4783 +msgstr "不能记录工作区状态"

4784 +

4785 +#: common-cmds.h:28

4786 +msgid "Create, list, delete or verify a tag object signed with GPG"

4787 +msgstr ""

4788 +

4789 #: git-am.sh:50

4790 msgid "You need to set your committer info first"

4791 msgstr "您需要先设置你的提交者信息"

@@ -3598,67 +5116,67 @@ msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"

5116 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

5117 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"

5118

3601 -#: git-submodule.sh:248

5119 +#: git-submodule.sh:249

5120 #, sh-format

5121 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

5122 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"

5123

3606 -#: git-submodule.sh:265

5124 +#: git-submodule.sh:266

5125 #, sh-format

5126 msgid "'$sm_path' already exists in the index"

5127 msgstr "'$sm_path' 已经存在于索引中"

5128

3611 -#: git-submodule.sh:282

5129 +#: git-submodule.sh:283

5130 #, sh-format

5131 msgid "'$sm_path' already exists and is not a valid git repo"

5132 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"

5133

3616 -#: git-submodule.sh:296

5134 +#: git-submodule.sh:297

5135 #, sh-format

5136 msgid "Unable to checkout submodule '$sm_path'"

5137 msgstr "不能检出子模组 '$sm_path'"

5138

3621 -#: git-submodule.sh:301

5139 +#: git-submodule.sh:302

5140 #, sh-format

5141 msgid "Failed to add submodule '$sm_path'"

5142 msgstr "无法添加子模组 '$sm_path'"

5143

3626 -#: git-submodule.sh:306

5144 +#: git-submodule.sh:307

5145 #, sh-format

5146 msgid "Failed to register submodule '$sm_path'"

5147 msgstr "无法注册子模组 '$sm_path'"

5148

3631 -#: git-submodule.sh:348

5149 +#: git-submodule.sh:349

5150 #, sh-format

5151 msgid "Entering '$prefix$sm_path'"

5152 msgstr "正在进入 '$prefix$sm_path'"

5153

3636 -#: git-submodule.sh:360

5154 +#: git-submodule.sh:363

5155 #, sh-format

5156 msgid "Stopping at '$sm_path'; script returned non-zero status."

5157 msgstr "停止于 '$sm_path'，脚本返回非零值。"

5158

3641 -#: git-submodule.sh:402

5159 +#: git-submodule.sh:405

5160 #, sh-format

5161 msgid "No url found for submodule path '$sm_path' in .gitmodules"

5162 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"

5163

3646 -#: git-submodule.sh:411

5164 +#: git-submodule.sh:414

5165 #, sh-format

5166 msgid "Failed to register url for submodule path '$sm_path'"

5167 msgstr "无法为子模组路径 '$sm_path' 注册 url"

5168

3651 -#: git-submodule.sh:419

5169 +#: git-submodule.sh:422

5170 #, sh-format

5171 msgid "Failed to register update mode for submodule path '$sm_path'"

5172 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"

5173

3656 -#: git-submodule.sh:421

5174 +#: git-submodule.sh:424

5175 #, sh-format

5176 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

5177 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"

5178

3661 -#: git-submodule.sh:520

5179 +#: git-submodule.sh:523

5180 #, sh-format

5181 msgid ""

5182 "Submodule path '$sm_path' not initialized\n"

@@ -3667,85 +5185,91 @@ msgstr ""

5185 "子模组路径 '$sm_path' 没有初始化\n"

5186 "也许您想用 'update --init'？"

5187

3670 -#: git-submodule.sh:533

5188 +#: git-submodule.sh:536

5189 #, sh-format

5190 msgid "Unable to find current revision in submodule path '$sm_path'"

5191 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"

5192

3675 -#: git-submodule.sh:552

5193 +#: git-submodule.sh:555

5194 #, sh-format

5195 msgid "Unable to fetch in submodule path '$sm_path'"

5196 msgstr "无法在子模组路径 '$sm_path' 中获取"

5197

3680 -#: git-submodule.sh:566

5198 +#: git-submodule.sh:569

5199 #, sh-format

5200 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

5201 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"

5202

3685 -#: git-submodule.sh:567

5203 +#: git-submodule.sh:570

5204 #, sh-format

5205 msgid "Submodule path '$sm_path': rebased into '$sha1'"

5206 msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"

5207

3690 -#: git-submodule.sh:572

5208 +#: git-submodule.sh:575

5209 #, sh-format

5210 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

5211 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"

5212

3695 -#: git-submodule.sh:573

5213 +#: git-submodule.sh:576

5214 #, sh-format

5215 msgid "Submodule path '$sm_path': merged in '$sha1'"

5216 msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"

5217

3700 -#: git-submodule.sh:578

5218 +#: git-submodule.sh:581

5219 #, sh-format

5220 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

5221 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"

5222

3705 -#: git-submodule.sh:579

5223 +#: git-submodule.sh:582

5224 #, sh-format

5225 msgid "Submodule path '$sm_path': checked out '$sha1'"

5226 msgstr "子模组路径 '$sm_path'：检出 '$sha1'"

5227

3710 -#: git-submodule.sh:601 git-submodule.sh:924

5228 +#: git-submodule.sh:604 git-submodule.sh:927

5229 #, sh-format

5230 msgid "Failed to recurse into submodule path '$sm_path'"

5231 msgstr "无法递归进子模组路径 '$sm_path'"

5232

3715 -#: git-submodule.sh:709

5233 +#: git-submodule.sh:712

5234 msgid "--"

5235 msgstr "--"

5236

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

3720 -#: git-submodule.sh:767

5238 +#: git-submodule.sh:770

5239 #, sh-format

5240 msgid " Warn: $name doesn't contain commit $sha1_src"

5241 msgstr " 警告：$name 未包含提交 $sha1_src"

5242

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

3726 -#: git-submodule.sh:770

5244 +#: git-submodule.sh:773

5245 #, sh-format

5246 msgid " Warn: $name doesn't contain commit $sha1_dst"

5247 msgstr " 警告：$name 未包含提交 $sha1_dst"

5248

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

3732 -#: git-submodule.sh:773

5250 +#: git-submodule.sh:776

5251 #, sh-format

5252 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

5253 msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"

5254

3737 -#: git-submodule.sh:798

5255 +#: git-submodule.sh:801

5256 msgid "blob"

5257 msgstr "blob"

5258

3741 -#: git-submodule.sh:799

5259 +#: git-submodule.sh:802

5260 msgid "submodule"

5261 msgstr "子模组"

5262

3745 -#: git-submodule.sh:970

5263 +#: git-submodule.sh:973

5264 #, sh-format

5265 msgid "Synchronizing submodule url for '$name'"

5266 msgstr "为 '$name' 同步子模组 url"

5267

5268 +#~ msgid "cherry-pick"

5269 +#~ msgstr "拣选"

5270 +

5271 +#~ msgid "Please enter the commit message for your changes."

5272 +#~ msgstr "请为您的修改输入提交说明。"

5273 +

5274 #~ msgid "Too many options specified"

5275 #~ msgstr "指定了太多的选项"

l10n: zh.CN.po: update by msgmerge git.pot