2e8451e860 · matheusbsbs/matheus-bagliano

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

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2013-04-30 08:25+0800\n"

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

15 +"POT-Creation-Date: 2013-07-26 14:19+0800\n"

16 +"PO-Revision-Date: 2013-08-03 14:13+0800\n"

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

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

19 "Language: zh_CN\n"

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

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

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

24

25 -#: advice.c:53

25 +#: advice.c:57

26 #, c-format

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

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

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

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

32 #. * other commands doing a merge do.

33 #.

34 -#: advice.c:83

34 +#: advice.c:87

35 msgid ""

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

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

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

68 msgid "archive format"

69 msgstr "归档格式"

70

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

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

72 msgid "prefix"

73 msgstr "前缀"

74

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

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

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

78

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

80 -#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665

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

82 -#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536

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

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

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

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

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

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

84 msgid "file"

85 msgstr "文件"

86

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

112 msgid "list supported archive formats"

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

114

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

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

116 msgid "repo"

117 msgstr "版本库"

118

@@ -120,7 +120,7 @@ msgstr "版本库"

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

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

122

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

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

124 msgid "command"

125 msgstr "命令"

126

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

205 msgid "Cannot force update the current branch."

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

207

208 -#: branch.c:201

208 +#: branch.c:216

209 #, c-format

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

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

212

213 -#: branch.c:203

213 +#: branch.c:218

214 #, c-format

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

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

217

218 -#: branch.c:205

218 +#: branch.c:220

219 msgid ""

220 "\n"

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

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

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

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

235

236 -#: branch.c:250

236 +#: branch.c:265

237 #, c-format

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

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

240

241 -#: branch.c:270

241 +#: branch.c:285

242 #, c-format

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

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

245

246 -#: branch.c:275

246 +#: branch.c:290

247 #, c-format

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

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

250

251 -#: branch.c:281

251 +#: branch.c:296

252 msgid "Failed to lock ref for update"

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

254

255 -#: branch.c:299

255 +#: branch.c:314

256 msgid "Failed to write ref"

257 msgstr "不能写引用"

258

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

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

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

268

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

269 +#: bundle.c:89 builtin/commit.c:683

270 #, c-format

271 msgid "could not open '%s'"

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

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

275 msgid "Repository lacks these prerequisite commits:"

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

277

278 -#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300

279 -#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349

280 -#: builtin/shortlog.c:155

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

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

280 +#: builtin/shortlog.c:156

281 msgid "revision walk setup failed"

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

283

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

303 msgid "rev-list died"

304 msgstr "rev-list 终止"

305

306 -#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258

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

307 #, c-format

308 msgid "unrecognized argument: %s"

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

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

334 msgid "index-pack died"

335 msgstr "index-pack 终止"

336

337 -#: commit.c:50

337 +#: commit.c:53

338 #, c-format

339 msgid "could not parse %s"

340 msgstr "不能解析 %s"

341

342 -#: commit.c:52

342 +#: commit.c:55

343 #, c-format

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

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

@@ -348,16 +348,16 @@ msgstr "%s %s 不是一个提交!"

348 msgid "memory exhausted"

349 msgstr "内存耗尽"

350

351 -#: connected.c:39

351 +#: connected.c:60

352 msgid "Could not run 'git rev-list'"

353 msgstr "不能执行 'git rev-list'"

354

355 -#: connected.c:48

355 +#: connected.c:80

356 #, c-format

357 msgid "failed write to rev-list: %s"

358 msgstr "无法写入 rev-list：%s"

359

360 -#: connected.c:56

360 +#: connected.c:88

361 #, c-format

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

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

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

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

456 "%s"

457

458 -#: diff.c:3481

458 +#: diff.c:3487

459 #, c-format

460 msgid ""

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

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

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

465 "%s"

466

467 -#: diff.c:3495

467 +#: diff.c:3501

468 #, c-format

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

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

@@ -506,20 +506,20 @@ msgstr "'%s'：%s"

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

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

508

509 -#: help.c:212

509 +#: help.c:213

510 #, c-format

511 msgid "available git commands in '%s'"

512 msgstr "在 '%s' 下可用的 git 命令"

513

514 -#: help.c:219

514 +#: help.c:220

515 msgid "git commands available from elsewhere on your $PATH"

516 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

517

518 -#: help.c:235

518 +#: help.c:236

519 msgid "The most commonly used git commands are:"

520 msgstr "最常用的 git 命令有："

521

522 -#: help.c:292

522 +#: help.c:293

523 #, c-format

524 msgid ""

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

@@ -528,11 +528,11 @@ msgstr ""

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

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

530

531 -#: help.c:349

531 +#: help.c:350

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

533 msgstr "唉呀，您的系统中未发现 Git 命令。"

534

535 -#: help.c:371

535 +#: help.c:372

536 #, c-format

537 msgid ""

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

@@ -541,17 +541,17 @@ msgstr ""

541 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"

542 "是 '%s'"

543

544 -#: help.c:376

544 +#: help.c:377

545 #, c-format

546 msgid "in %0.1f seconds automatically..."

547 msgstr "在 %0.1f 秒钟后自动运行..."

548

549 -#: help.c:383

549 +#: help.c:384

550 #, c-format

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

552 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

553

554 -#: help.c:387

554 +#: help.c:388 help.c:447

555 msgid ""

556 "\n"

557 "Did you mean this?"

@@ -565,12 +565,17 @@ msgstr[1] ""

565 "\n"

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

567

568 +#: help.c:443

569 +#, c-format

570 +msgid "%s: %s - %s"

571 +msgstr "%s：%s - %s"

572 +

573 #: merge.c:56

574 msgid "failed to read the cache"

575 msgstr "无法读取缓存"

576

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

573 -#: builtin/clone.c:645

578 +#: builtin/clone.c:656

579 msgid "unable to write new index file"

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

581

@@ -584,70 +589,70 @@ msgstr "（坏提交）\n"

589 msgid "addinfo_cache failed for path '%s'"

590 msgstr "为路径 '%s' addinfo_cache 失败"

591

587 -#: merge-recursive.c:268

592 +#: merge-recursive.c:269

593 msgid "error building trees"

594 msgstr "无法创建树"

595

591 -#: merge-recursive.c:672

596 +#: merge-recursive.c:673

597 #, c-format

598 msgid "failed to create path '%s'%s"

599 msgstr "无法创建路径 '%s'%s"

600

596 -#: merge-recursive.c:683

601 +#: merge-recursive.c:684

602 #, c-format

603 msgid "Removing %s to make room for subdirectory\n"

604 msgstr "删除 %s 以便为子目录留出空间\n"

605

606 #. something else exists

607 #. .. but not some other error (who really cares what?)

603 -#: merge-recursive.c:697 merge-recursive.c:718

608 +#: merge-recursive.c:698 merge-recursive.c:719

609 msgid ": perhaps a D/F conflict?"

610 msgstr "：可能是一个目录/文件冲突？"

611

607 -#: merge-recursive.c:708

612 +#: merge-recursive.c:709

613 #, c-format

614 msgid "refusing to lose untracked file at '%s'"

615 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

616

612 -#: merge-recursive.c:748

617 +#: merge-recursive.c:749

618 #, c-format

619 msgid "cannot read object %s '%s'"

620 msgstr "不能读取对象 %s '%s'"

621

617 -#: merge-recursive.c:750

622 +#: merge-recursive.c:751

623 #, c-format

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

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

626

622 -#: merge-recursive.c:773 builtin/clone.c:313

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

628 #, c-format

629 msgid "failed to open '%s'"

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

631

627 -#: merge-recursive.c:781

632 +#: merge-recursive.c:782

633 #, c-format

634 msgid "failed to symlink '%s'"

635 msgstr "无法创建符号链接 '%s'"

636

632 -#: merge-recursive.c:784

637 +#: merge-recursive.c:785

638 #, c-format

639 msgid "do not know what to do with %06o %s '%s'"

640 msgstr "不知道如何处理 %06o %s '%s'"

641

637 -#: merge-recursive.c:922

642 +#: merge-recursive.c:923

643 msgid "Failed to execute internal merge"

644 msgstr "无法执行内部合并"

645

641 -#: merge-recursive.c:926

646 +#: merge-recursive.c:927

647 #, c-format

648 msgid "Unable to add %s to database"

649 msgstr "不能添加 %s 至对象库"

650

646 -#: merge-recursive.c:942

651 +#: merge-recursive.c:943

652 msgid "unsupported object type in the tree"

653 msgstr "在树中有不支持的对象类型"

654

650 -#: merge-recursive.c:1021 merge-recursive.c:1035

655 +#: merge-recursive.c:1022 merge-recursive.c:1036

656 #, c-format

657 msgid ""

658 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -656,7 +661,7 @@ msgstr ""

661 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

662 "的版本被保留。"

663

659 -#: merge-recursive.c:1027 merge-recursive.c:1040

664 +#: merge-recursive.c:1028 merge-recursive.c:1041

665 #, c-format

666 msgid ""

667 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -665,20 +670,20 @@ msgstr ""

670 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

671 "的版本保留于 %8$s 中。"

672

668 -#: merge-recursive.c:1081

673 +#: merge-recursive.c:1082

674 msgid "rename"

675 msgstr "重命名"

676

672 -#: merge-recursive.c:1081

677 +#: merge-recursive.c:1082

678 msgid "renamed"

679 msgstr "重命名"

680

676 -#: merge-recursive.c:1137

681 +#: merge-recursive.c:1138

682 #, c-format

683 msgid "%s is a directory in %s adding as %s instead"

684 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

685

681 -#: merge-recursive.c:1159

686 +#: merge-recursive.c:1160

687 #, c-format

688 msgid ""

689 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -687,148 +692,169 @@ msgstr ""

692 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

693 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

694

690 -#: merge-recursive.c:1164

695 +#: merge-recursive.c:1165

696 msgid " (left unresolved)"

697 msgstr "（留下未解决）"

698

694 -#: merge-recursive.c:1218

699 +#: merge-recursive.c:1219

700 #, c-format

701 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

702 msgstr ""

703 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

704 "%5$s"

705

701 -#: merge-recursive.c:1248

706 +#: merge-recursive.c:1249

707 #, c-format

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

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

710

706 -#: merge-recursive.c:1447

711 +#: merge-recursive.c:1448

712 #, c-format

713 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

714 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

715

711 -#: merge-recursive.c:1457

716 +#: merge-recursive.c:1458

717 #, c-format

718 msgid "Adding merged %s"

719 msgstr "添加合并后的 %s"

720

716 -#: merge-recursive.c:1462 merge-recursive.c:1660

721 +#: merge-recursive.c:1463 merge-recursive.c:1661

722 #, c-format

723 msgid "Adding as %s instead"

724 msgstr "而是以 %s 为名添加"

725

721 -#: merge-recursive.c:1513

726 +#: merge-recursive.c:1514

727 #, c-format

728 msgid "cannot read object %s"

729 msgstr "不能读取对象 %s"

730

726 -#: merge-recursive.c:1516

731 +#: merge-recursive.c:1517

732 #, c-format

733 msgid "object %s is not a blob"

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

735

731 -#: merge-recursive.c:1564

736 +#: merge-recursive.c:1565

737 msgid "modify"

738 msgstr "修改"

739

735 -#: merge-recursive.c:1564

740 +#: merge-recursive.c:1565

741 msgid "modified"

742 msgstr "修改"

743

739 -#: merge-recursive.c:1574

744 +#: merge-recursive.c:1575

745 msgid "content"

746 msgstr "内容"

747

743 -#: merge-recursive.c:1581

748 +#: merge-recursive.c:1582

749 msgid "add/add"

750 msgstr "添加/添加"

751

747 -#: merge-recursive.c:1615

752 +#: merge-recursive.c:1616

753 #, c-format

754 msgid "Skipped %s (merged same as existing)"

755 msgstr "略过 %s（已经做过相同合并）"

756

752 -#: merge-recursive.c:1629

757 +#: merge-recursive.c:1630

758 #, c-format

759 msgid "Auto-merging %s"

760 msgstr "自动合并 %s"

761

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

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

763 msgid "submodule"

764 msgstr "子模组"

765

761 -#: merge-recursive.c:1634

766 +#: merge-recursive.c:1635

767 #, c-format

768 msgid "CONFLICT (%s): Merge conflict in %s"

769 msgstr "冲突（%s）：合并冲突于 %s"

770

766 -#: merge-recursive.c:1724

771 +#: merge-recursive.c:1725

772 #, c-format

773 msgid "Removing %s"

774 msgstr "删除 %s"

775

771 -#: merge-recursive.c:1749

776 +#: merge-recursive.c:1750

777 msgid "file/directory"

778 msgstr "文件/目录"

779

775 -#: merge-recursive.c:1755

780 +#: merge-recursive.c:1756

781 msgid "directory/file"

782 msgstr "目录/文件"

783

779 -#: merge-recursive.c:1760

784 +#: merge-recursive.c:1761

785 #, c-format

786 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

787 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

788

784 -#: merge-recursive.c:1770

789 +#: merge-recursive.c:1771

790 #, c-format

791 msgid "Adding %s"

792 msgstr "添加 %s"

793

789 -#: merge-recursive.c:1787

794 +#: merge-recursive.c:1788

795 msgid "Fatal merge failure, shouldn't happen."

796 msgstr "严重的合并错误，不应发生。"

797

793 -#: merge-recursive.c:1806

798 +#: merge-recursive.c:1807

799 msgid "Already up-to-date!"

800 msgstr "已经是最新的！"

801

797 -#: merge-recursive.c:1815

802 +#: merge-recursive.c:1816

803 #, c-format

804 msgid "merging of trees %s and %s failed"

805 msgstr "无法合并树 %s 和 %s"

806

802 -#: merge-recursive.c:1845

807 +#: merge-recursive.c:1846

808 #, c-format

809 msgid "Unprocessed path??? %s"

810 msgstr "未处理的路径??? %s"

811

807 -#: merge-recursive.c:1890

812 +#: merge-recursive.c:1891

813 msgid "Merging:"

814 msgstr "合并："

815

811 -#: merge-recursive.c:1903

816 +#: merge-recursive.c:1904

817 #, c-format

818 msgid "found %u common ancestor:"

819 msgid_plural "found %u common ancestors:"

820 msgstr[0] "发现 %u 个共同祖先："

821 msgstr[1] "发现 %u 个共同祖先："

822

818 -#: merge-recursive.c:1940

823 +#: merge-recursive.c:1941

824 msgid "merge returned no commit"

825 msgstr "合并未返回提交"

826

822 -#: merge-recursive.c:1997

827 +#: merge-recursive.c:1998

828 #, c-format

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

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

831

827 -#: merge-recursive.c:2009 builtin/merge.c:658

832 +#: merge-recursive.c:2010 builtin/merge.c:672

833 msgid "Unable to write index."

834 msgstr "不能写入索引。"

835

831 -#: object.c:195

836 +#: notes-utils.c:40

837 +msgid "Cannot commit uninitialized/unreferenced notes tree"

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

839 +

840 +#: notes-utils.c:81

841 +#, c-format

842 +msgid "Bad notes.rewriteMode value: '%s'"

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

844 +

845 +#: notes-utils.c:91

846 +#, c-format

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

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

849 +

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

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

852 +#: notes-utils.c:118

853 +#, c-format

854 +msgid "Bad %s value: '%s'"

855 +msgstr "坏的 %s 值：'%s'"

856 +

857 +#: object.c:204

858 #, c-format

859 msgid "unable to parse object: %s"

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

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

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

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

897

872 -#: remote.c:1781

898 +#: remote.c:1788

899 #, c-format

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

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

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

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

904

879 -#: remote.c:1787

905 +#: remote.c:1794

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

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

908

883 -#: remote.c:1790

909 +#: remote.c:1797

910 #, c-format

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

912 msgid_plural ""

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

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

916

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

892 -#: remote.c:1798

918 +#: remote.c:1805

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

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

921

896 -#: remote.c:1801

922 +#: remote.c:1808

923 #, c-format

924 msgid ""

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

@@ -909,18 +935,27 @@ msgstr[1] ""

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

936

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

912 -#: remote.c:1811

938 +#: remote.c:1818

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

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

941

916 -#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999

917 -#: builtin/merge.c:1009

942 +#: run-command.c:80

943 +msgid "open /dev/null failed"

944 +msgstr "不能打开 /dev/null"

945 +

946 +#: run-command.c:82

947 +#, c-format

948 +msgid "dup2(%d,%d) failed"

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

950 +

951 +#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903

952 +#: builtin/merge.c:1013 builtin/merge.c:1023

953 #, c-format

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

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

956

922 -#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779

923 -#: builtin/merge.c:1001 builtin/merge.c:1014

957 +#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793

958 +#: builtin/merge.c:1015 builtin/merge.c:1028

959 #, c-format

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

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

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

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

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

979

945 -#: sequencer.c:245 sequencer.c:859 sequencer.c:942

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

981 #, c-format

982 msgid "Could not write to %s"

983 msgstr "不能写入 %s"

@@ -965,215 +1000,236 @@ msgid "Commit your changes or stash them to proceed."

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

1001

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

968 -#: sequencer.c:319

1003 +#: sequencer.c:324

1004 #, c-format

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

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

1007

973 -#: sequencer.c:350

1008 +#: sequencer.c:355

1009 msgid "Could not resolve HEAD commit\n"

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

1011

977 -#: sequencer.c:371

1012 +#: sequencer.c:377

1013 msgid "Unable to update cache tree\n"

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

1015

981 -#: sequencer.c:416

1016 +#: sequencer.c:422

1017 #, c-format

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

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

1020

986 -#: sequencer.c:421

1021 +#: sequencer.c:427

1022 #, c-format

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

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

1025

991 -#: sequencer.c:487

1026 +#: sequencer.c:493

1027 msgid "Your index file is unmerged."

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

1029

995 -#: sequencer.c:506

1030 +#: sequencer.c:512

1031 #, c-format

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

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

1034

1000 -#: sequencer.c:514

1035 +#: sequencer.c:520

1036 #, c-format

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

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

1039

1005 -#: sequencer.c:518

1040 +#: sequencer.c:524

1041 #, c-format

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

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

1044

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

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

1012 -#: sequencer.c:531

1047 +#: sequencer.c:537

1048 #, c-format

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

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

1051

1017 -#: sequencer.c:535

1052 +#: sequencer.c:541

1053 #, c-format

1054 msgid "Cannot get commit message for %s"

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

1056

1022 -#: sequencer.c:621

1057 +#: sequencer.c:627

1058 #, c-format

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

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

1061

1027 -#: sequencer.c:622

1062 +#: sequencer.c:628

1063 #, c-format

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

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

1066

1032 -#: sequencer.c:654

1067 +#: sequencer.c:664

1068 msgid "empty commit set passed"

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

1070

1036 -#: sequencer.c:662

1071 +#: sequencer.c:672

1072 #, c-format

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

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

1075

1041 -#: sequencer.c:667

1076 +#: sequencer.c:677

1077 #, c-format

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

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

1080

1046 -#: sequencer.c:725

1081 +#: sequencer.c:735

1082 #, c-format

1083 msgid "Cannot %s during a %s"

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

1085

1051 -#: sequencer.c:747

1086 +#: sequencer.c:757

1087 #, c-format

1088 msgid "Could not parse line %d."

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

1090

1056 -#: sequencer.c:752

1091 +#: sequencer.c:762

1092 msgid "No commits parsed."

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

1094

1060 -#: sequencer.c:765

1095 +#: sequencer.c:775

1096 #, c-format

1097 msgid "Could not open %s"

1098 msgstr "不能打开 %s"

1099

1065 -#: sequencer.c:769

1100 +#: sequencer.c:779

1101 #, c-format

1102 msgid "Could not read %s."

1103 msgstr "不能读取 %s。"

1104

1070 -#: sequencer.c:776

1105 +#: sequencer.c:786

1106 #, c-format

1107 msgid "Unusable instruction sheet: %s"

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

1109

1075 -#: sequencer.c:804

1110 +#: sequencer.c:814

1111 #, c-format

1112 msgid "Invalid key: %s"

1113 msgstr "无效键名：%s"

1114

1080 -#: sequencer.c:807

1115 +#: sequencer.c:817

1116 #, c-format

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

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

1119

1085 -#: sequencer.c:819

1120 +#: sequencer.c:829

1121 #, c-format

1122 msgid "Malformed options sheet: %s"

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

1124

1090 -#: sequencer.c:840

1125 +#: sequencer.c:850

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

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

1128

1094 -#: sequencer.c:841

1129 +#: sequencer.c:851

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

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

1132

1098 -#: sequencer.c:845

1133 +#: sequencer.c:855

1134 #, c-format

1135 msgid "Could not create sequencer directory %s"

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

1137

1103 -#: sequencer.c:861 sequencer.c:946

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

1139 #, c-format

1140 msgid "Error wrapping up %s."

1141 msgstr "错误收尾 %s。"

1142

1108 -#: sequencer.c:880 sequencer.c:1014

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

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

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

1146

1112 -#: sequencer.c:882

1147 +#: sequencer.c:892

1148 msgid "cannot resolve HEAD"

1149 msgstr "不能解析 HEAD"

1150

1116 -#: sequencer.c:884

1151 +#: sequencer.c:894

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

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

1154

1120 -#: sequencer.c:906 builtin/apply.c:4060

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

1156 #, c-format

1157 msgid "cannot open %s: %s"

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

1159

1125 -#: sequencer.c:909

1160 +#: sequencer.c:919

1161 #, c-format

1162 msgid "cannot read %s: %s"

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

1164

1130 -#: sequencer.c:910

1165 +#: sequencer.c:920

1166 msgid "unexpected end of file"

1167 msgstr "意外的文件结束"

1168

1134 -#: sequencer.c:916

1169 +#: sequencer.c:926

1170 #, c-format

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

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

1173

1139 -#: sequencer.c:939

1174 +#: sequencer.c:949

1175 #, c-format

1176 msgid "Could not format %s."

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

1178

1144 -#: sequencer.c:1083

1179 +#: sequencer.c:1092

1180 #, c-format

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

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

1183

1149 -#: sequencer.c:1085

1184 +#: sequencer.c:1095

1185 #, c-format

1186 msgid "%s: bad revision"

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

1188

1154 -#: sequencer.c:1119

1189 +#: sequencer.c:1129

1190 msgid "Can't revert as initial commit"

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

1192

1158 -#: sequencer.c:1120

1193 +#: sequencer.c:1130

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

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

1196

1162 -#: sha1_name.c:1036

1197 +#: sha1_name.c:440

1198 +msgid ""

1199 +"Git normally never creates a ref that ends with 40 hex characters\n"

1200 +"because it will be ignored when you just specify 40-hex. These refs\n"

1201 +"may be created by mistake. For example,\n"

1202 +"\n"

1203 +" git checkout -b $br $(git rev-parse ...)\n"

1204 +"\n"

1205 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

1206 +"examine these refs and maybe delete them. Turn this message off by\n"

1207 +"running \"git config advice.object_name_warning false\""

1208 +msgstr ""

1209 +"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"

1210 +"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"

1211 +"\n"

1212 +" git checkout -b $br $(git rev-parse ...)\n"

1213 +"\n"

1214 +"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"

1215 +"可能需要删除它们。用 \"git config advice.object_name_warning false\""

1216 +"命令关闭本消息通知。"

1217 +

1218 +#: sha1_name.c:1097

1219 msgid "HEAD does not point to a branch"

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

1221

1166 -#: sha1_name.c:1039

1222 +#: sha1_name.c:1100

1223 #, c-format

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

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

1226

1171 -#: sha1_name.c:1041

1227 +#: sha1_name.c:1102

1228 #, c-format

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

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

1231

1176 -#: sha1_name.c:1044

1232 +#: sha1_name.c:1106

1233 #, c-format

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

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

@@ -1183,181 +1239,181 @@ msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

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

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

1241

1186 -#: wrapper.c:423

1242 +#: wrapper.c:429

1243 #, c-format

1244 msgid "unable to access '%s'"

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

1246

1191 -#: wrapper.c:434

1247 +#: wrapper.c:440

1248 #, c-format

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

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

1251

1196 -#: wrapper.c:435

1252 +#: wrapper.c:441

1253 msgid "no such user"

1254 msgstr "无此用户"

1255

1200 -#: wt-status.c:140

1256 +#: wt-status.c:141

1257 msgid "Unmerged paths:"

1258 msgstr "未合并的路径："

1259

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

1205 -#: wt-status.c:167 wt-status.c:194

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

1262 #, c-format

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

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

1265

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

1211 -#: wt-status.c:169 wt-status.c:196

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

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

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

1270

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

1216 -#: wt-status.c:173

1272 +#: wt-status.c:174

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

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

1275

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

1221 -#: wt-status.c:175 wt-status.c:179

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

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

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

1280

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

1226 -#: wt-status.c:177

1282 +#: wt-status.c:178

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

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

1285

1230 -#: wt-status.c:188

1286 +#: wt-status.c:189

1287 msgid "Changes to be committed:"

1288 msgstr "要提交的变更："

1289

1234 -#: wt-status.c:206

1290 +#: wt-status.c:207

1291 msgid "Changes not staged for commit:"

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

1293

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

1239 -#: wt-status.c:210

1295 +#: wt-status.c:211

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

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

1298

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

1244 -#: wt-status.c:212

1300 +#: wt-status.c:213

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

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

1303

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

1249 -#: wt-status.c:213

1305 +#: wt-status.c:214

1306 msgid ""

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

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

1309

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

1255 -#: wt-status.c:215

1311 +#: wt-status.c:216

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

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

1314

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

1260 -#: wt-status.c:227

1316 +#: wt-status.c:228

1317 #, c-format

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

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

1320

1265 -#: wt-status.c:244

1321 +#: wt-status.c:245

1322 msgid "bug"

1323 msgstr "bug"

1324

1269 -#: wt-status.c:249

1325 +#: wt-status.c:250

1326 msgid "both deleted:"

1327 msgstr "双方删除："

1328

1273 -#: wt-status.c:250

1329 +#: wt-status.c:251

1330 msgid "added by us:"

1331 msgstr "由我们添加："

1332

1277 -#: wt-status.c:251

1333 +#: wt-status.c:252

1334 msgid "deleted by them:"

1335 msgstr "由他们删除："

1336

1281 -#: wt-status.c:252

1337 +#: wt-status.c:253

1338 msgid "added by them:"

1339 msgstr "由他们添加："

1340

1285 -#: wt-status.c:253

1341 +#: wt-status.c:254

1342 msgid "deleted by us:"

1343 msgstr "由我们删除："

1344

1289 -#: wt-status.c:254

1345 +#: wt-status.c:255

1346 msgid "both added:"

1347 msgstr "双方添加："

1348

1293 -#: wt-status.c:255

1349 +#: wt-status.c:256

1350 msgid "both modified:"

1351 msgstr "双方修改："

1352

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

1298 -#: wt-status.c:285

1354 +#: wt-status.c:286

1355 msgid "new commits, "

1356 msgstr "新提交, "

1357

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

1303 -#: wt-status.c:287

1359 +#: wt-status.c:288

1360 msgid "modified content, "

1361 msgstr "修改的内容, "

1362

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

1308 -#: wt-status.c:289

1364 +#: wt-status.c:290

1365 msgid "untracked content, "

1366 msgstr "未跟踪的内容, "

1367

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

1313 -#: wt-status.c:306

1369 +#: wt-status.c:307

1370 #, c-format

1371 msgid "new file: %s"

1372 msgstr "新文件： %s"

1373

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

1319 -#: wt-status.c:309

1375 +#: wt-status.c:310

1376 #, c-format

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

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

1379

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

1325 -#: wt-status.c:312

1381 +#: wt-status.c:313

1382 #, c-format

1383 msgid "deleted: %s"

1384 msgstr "删除： %s"

1385

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

1331 -#: wt-status.c:315

1387 +#: wt-status.c:316

1388 #, c-format

1389 msgid "modified: %s"

1390 msgstr "修改： %s"

1391

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

1337 -#: wt-status.c:318

1393 +#: wt-status.c:319

1394 #, c-format

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

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

1397

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

1343 -#: wt-status.c:321

1399 +#: wt-status.c:322

1400 #, c-format

1401 msgid "typechange: %s"

1402 msgstr "类型变更： %s"

1403

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

1349 -#: wt-status.c:324

1405 +#: wt-status.c:325

1406 #, c-format

1407 msgid "unknown: %s"

1408 msgstr "未知： %s"

1409

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

1355 -#: wt-status.c:327

1411 +#: wt-status.c:328

1412 #, c-format

1413 msgid "unmerged: %s"

1414 msgstr "未合并： %s"

1415

1360 -#: wt-status.c:330

1416 +#: wt-status.c:331

1417 #, c-format

1418 msgid "bug: unhandled diff status %c"

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

@@ -1367,7 +1423,7 @@ msgid "You have unmerged paths."

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

1424

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

1370 -#: wt-status.c:806 wt-status.c:958

1426 +#: wt-status.c:806

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

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

1429

@@ -1390,8 +1446,8 @@ msgstr "当前的补丁为空。"

1446

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

1448 #: wt-status.c:829

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

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

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

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

1451

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

1453 #: wt-status.c:831

@@ -1471,42 +1527,52 @@ msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

1527 msgid "You are currently cherry-picking."

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

1529

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

1531 +#: wt-status.c:958

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

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

1534 +

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

1536 #: wt-status.c:961

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

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

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

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

1539

1479 -#: wt-status.c:970

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

1541 +#: wt-status.c:963

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

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

1544 +

1545 +#: wt-status.c:972

1546 #, c-format

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

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

1549

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

1485 -#: wt-status.c:975

1551 +#: wt-status.c:977

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

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

1554

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

1490 -#: wt-status.c:978

1556 +#: wt-status.c:980

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

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

1559

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

1495 -#: wt-status.c:980

1561 +#: wt-status.c:982

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

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

1564

1499 -#: wt-status.c:991

1565 +#: wt-status.c:993

1566 #, c-format

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

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

1569

1504 -#: wt-status.c:995

1570 +#: wt-status.c:997

1571 msgid "You are currently bisecting."

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

1573

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

1509 -#: wt-status.c:998

1575 +#: wt-status.c:1000

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

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

1578

@@ -1514,31 +1580,35 @@ msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

1580 msgid "On branch "

1581 msgstr "位于分支 "

1582

1517 -#: wt-status.c:1184

1583 +#: wt-status.c:1180

1584 +msgid "rebase in progress; onto "

1585 +msgstr "变基正在进行中；至 "

1586 +

1587 +#: wt-status.c:1187

1588 msgid "HEAD detached at "

1589 msgstr "头指针分离于 "

1590

1521 -#: wt-status.c:1186

1591 +#: wt-status.c:1189

1592 msgid "HEAD detached from "

1593 msgstr "头指针分离自 "

1594

1525 -#: wt-status.c:1189

1595 +#: wt-status.c:1192

1596 msgid "Not currently on any branch."

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

1598

1529 -#: wt-status.c:1206

1599 +#: wt-status.c:1209

1600 msgid "Initial commit"

1601 msgstr "初始提交"

1602

1533 -#: wt-status.c:1220

1603 +#: wt-status.c:1223

1604 msgid "Untracked files"

1605 msgstr "未跟踪的文件"

1606

1537 -#: wt-status.c:1222

1607 +#: wt-status.c:1225

1608 msgid "Ignored files"

1609 msgstr "忽略的文件"

1610

1541 -#: wt-status.c:1226

1611 +#: wt-status.c:1229

1612 #, c-format

1613 msgid ""

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

@@ -1548,90 +1618,90 @@ msgstr ""

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

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

1620

1551 -#: wt-status.c:1232

1621 +#: wt-status.c:1235

1622 #, c-format

1623 msgid "Untracked files not listed%s"

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

1625

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

1557 -#: wt-status.c:1234

1627 +#: wt-status.c:1237

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

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

1630

1561 -#: wt-status.c:1240

1631 +#: wt-status.c:1243

1632 msgid "No changes"

1633 msgstr "没有修改"

1634

1565 -#: wt-status.c:1245

1635 +#: wt-status.c:1248

1636 #, c-format

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

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

1639

1570 -#: wt-status.c:1248

1640 +#: wt-status.c:1251

1641 #, c-format

1642 msgid "no changes added to commit\n"

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

1644

1575 -#: wt-status.c:1251

1645 +#: wt-status.c:1254

1646 #, c-format

1647 msgid ""

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

1649 "track)\n"

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

1651

1582 -#: wt-status.c:1254

1652 +#: wt-status.c:1257

1653 #, c-format

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

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

1656

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

1588 -#: wt-status.c:1257

1658 +#: wt-status.c:1260

1659 #, c-format

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

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

1662

1593 -#: wt-status.c:1260 wt-status.c:1265

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

1664 #, c-format

1665 msgid "nothing to commit\n"

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

1667

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

1599 -#: wt-status.c:1263

1669 +#: wt-status.c:1266

1670 #, c-format

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

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

1673

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

1605 -#: wt-status.c:1267

1675 +#: wt-status.c:1270

1676 #, c-format

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

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

1679

1610 -#: wt-status.c:1375

1680 +#: wt-status.c:1378

1681 msgid "HEAD (no branch)"

1682 msgstr "HEAD（非分支）"

1683

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

1615 -#: wt-status.c:1381

1685 +#: wt-status.c:1384

1686 msgid "Initial commit on "

1687 msgstr "初始提交于 "

1688

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

1620 -#: wt-status.c:1396

1690 +#: wt-status.c:1399

1691 msgid "behind "

1692 msgstr "落后 "

1693

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

1625 -#: wt-status.c:1399 wt-status.c:1402

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

1696 msgid "ahead "

1697 msgstr "领先 "

1698

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

1630 -#: wt-status.c:1404

1700 +#: wt-status.c:1407

1701 msgid ", behind "

1702 msgstr "，落后 "

1703

1634 -#: compat/precompose_utf8.c:58 builtin/clone.c:352

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

1705 #, c-format

1706 msgid "failed to unlink '%s'"

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

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

1786 msgid "unexpected diff status %c"

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

1788

1719 -#: builtin/add.c:149 builtin/commit.c:233

1789 +#: builtin/add.c:149 builtin/commit.c:238

1790 msgid "updating files failed"

1791 msgstr "更新文件失败"

1792

@@ -1729,7 +1799,7 @@ msgstr "删除 '%s'\n"

1799 msgid "Unstaged changes after refreshing the index:"

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

1801

1732 -#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275

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

1803 #, c-format

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

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

@@ -1738,127 +1808,127 @@ msgstr "路径 '%s' 未匹配任何文件"

1808 msgid "Could not read the index"

1809 msgstr "不能读取索引"

1810

1741 -#: builtin/add.c:349

1811 +#: builtin/add.c:350

1812 #, c-format

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

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

1815

1746 -#: builtin/add.c:353

1816 +#: builtin/add.c:354

1817 msgid "Could not write patch"

1818 msgstr "不能生成补丁"

1819

1750 -#: builtin/add.c:358

1820 +#: builtin/add.c:359

1821 #, c-format

1822 msgid "Could not stat '%s'"

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

1824

1755 -#: builtin/add.c:360

1825 +#: builtin/add.c:361

1826 msgid "Empty patch. Aborted."

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

1828

1759 -#: builtin/add.c:366

1829 +#: builtin/add.c:367

1830 #, c-format

1831 msgid "Could not apply '%s'"

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

1833

1764 -#: builtin/add.c:376

1834 +#: builtin/add.c:377

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

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

1837

1768 -#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1769 -#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253

1770 -#: builtin/rm.c:206

1838 +#: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63

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

1840 +#: builtin/rm.c:268

1841 msgid "dry run"

1842 msgstr "演习"

1843

1774 -#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19

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

1776 -#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112

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

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

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

1847 msgid "be verbose"

1848 msgstr "冗长输出"

1849

1780 -#: builtin/add.c:396

1850 +#: builtin/add.c:397

1851 msgid "interactive picking"

1852 msgstr "交互式拣选"

1853

1784 -#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258

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

1855 msgid "select hunks interactively"

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

1857

1788 -#: builtin/add.c:398

1858 +#: builtin/add.c:399

1859 msgid "edit current diff and apply"

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

1861

1792 -#: builtin/add.c:399

1862 +#: builtin/add.c:400

1863 msgid "allow adding otherwise ignored files"

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

1865

1796 -#: builtin/add.c:400

1866 +#: builtin/add.c:401

1867 msgid "update tracked files"

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

1869

1800 -#: builtin/add.c:401

1870 +#: builtin/add.c:402

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

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

1873

1804 -#: builtin/add.c:402

1874 +#: builtin/add.c:403

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

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

1877

1878 #. takes no arguments

1809 -#: builtin/add.c:405

1879 +#: builtin/add.c:406

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

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

1882

1813 -#: builtin/add.c:407

1883 +#: builtin/add.c:408

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

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

1886

1817 -#: builtin/add.c:408

1887 +#: builtin/add.c:409

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

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

1890

1821 -#: builtin/add.c:409

1891 +#: builtin/add.c:410

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

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

1894

1825 -#: builtin/add.c:431

1895 +#: builtin/add.c:432

1896 #, c-format

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

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

1899

1830 -#: builtin/add.c:432

1900 +#: builtin/add.c:433

1901 msgid "no files added"

1902 msgstr "没有文件被添加"

1903

1834 -#: builtin/add.c:438

1904 +#: builtin/add.c:439

1905 msgid "adding files failed"

1906 msgstr "添加文件失败"

1907

1838 -#: builtin/add.c:477

1908 +#: builtin/add.c:478

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

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

1911

1842 -#: builtin/add.c:495

1912 +#: builtin/add.c:496

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

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

1915

1846 -#: builtin/add.c:525

1916 +#: builtin/add.c:526

1917 #, c-format

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

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

1920

1851 -#: builtin/add.c:526

1921 +#: builtin/add.c:527

1922 #, c-format

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

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

1925

1856 -#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204

1857 -#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

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

1927 +#: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297

1928 msgid "index file corrupt"

1929 msgstr "索引文件损坏"

1930

1861 -#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

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

1932 msgid "Unable to write new index file"

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

1934

@@ -2037,293 +2107,293 @@ msgstr "打补丁失败：%s:%ld"

2107 msgid "cannot checkout %s"

2108 msgstr "不能检出 %s"

2109

2040 -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193

2110 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194

2111 #, c-format

2112 msgid "read of %s failed"

2113 msgstr "读取 %s 失败"

2114

2045 -#: builtin/apply.c:3173 builtin/apply.c:3395

2115 +#: builtin/apply.c:3174 builtin/apply.c:3396

2116 #, c-format

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

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

2119

2050 -#: builtin/apply.c:3254 builtin/apply.c:3409

2120 +#: builtin/apply.c:3255 builtin/apply.c:3410

2121 #, c-format

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

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

2124

2055 -#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423

2125 +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424

2126 #, c-format

2127 msgid "%s: %s"

2128 msgstr "%s：%s"

2129

2060 -#: builtin/apply.c:3263 builtin/apply.c:3417

2130 +#: builtin/apply.c:3264 builtin/apply.c:3418

2131 #, c-format

2132 msgid "%s: does not match index"

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

2134

2065 -#: builtin/apply.c:3365

2135 +#: builtin/apply.c:3366

2136 msgid "removal patch leaves file contents"

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

2138

2069 -#: builtin/apply.c:3434

2139 +#: builtin/apply.c:3435

2140 #, c-format

2141 msgid "%s: wrong type"

2142 msgstr "%s：错误类型"

2143

2074 -#: builtin/apply.c:3436

2144 +#: builtin/apply.c:3437

2145 #, c-format

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

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

2148

2079 -#: builtin/apply.c:3537

2149 +#: builtin/apply.c:3538

2150 #, c-format

2151 msgid "%s: already exists in index"

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

2153

2084 -#: builtin/apply.c:3540

2154 +#: builtin/apply.c:3541

2155 #, c-format

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

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

2158

2089 -#: builtin/apply.c:3560

2159 +#: builtin/apply.c:3561

2160 #, c-format

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

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

2163

2094 -#: builtin/apply.c:3565

2164 +#: builtin/apply.c:3566

2165 #, c-format

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

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

2168

2099 -#: builtin/apply.c:3573

2169 +#: builtin/apply.c:3574

2170 #, c-format

2171 msgid "%s: patch does not apply"

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

2173

2104 -#: builtin/apply.c:3586

2174 +#: builtin/apply.c:3587

2175 #, c-format

2176 msgid "Checking patch %s..."

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

2178

2109 -#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124

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

2180 #, c-format

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

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

2183

2114 -#: builtin/apply.c:3822

2184 +#: builtin/apply.c:3823

2185 #, c-format

2186 msgid "unable to remove %s from index"

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

2188

2119 -#: builtin/apply.c:3850

2189 +#: builtin/apply.c:3851

2190 #, c-format

2121 -msgid "corrupt patch for subproject %s"

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

2191 +msgid "corrupt patch for submodule %s"

2192 +msgstr "子模组 %s 损坏的补丁"

2193

2124 -#: builtin/apply.c:3854

2194 +#: builtin/apply.c:3855

2195 #, c-format

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

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

2198

2129 -#: builtin/apply.c:3859

2199 +#: builtin/apply.c:3860

2200 #, c-format

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

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

2203

2134 -#: builtin/apply.c:3862 builtin/apply.c:3970

2204 +#: builtin/apply.c:3863 builtin/apply.c:3971

2205 #, c-format

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

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

2208

2139 -#: builtin/apply.c:3895

2209 +#: builtin/apply.c:3896

2210 #, c-format

2211 msgid "closing file '%s'"

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

2213

2144 -#: builtin/apply.c:3944

2214 +#: builtin/apply.c:3945

2215 #, c-format

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

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

2218

2149 -#: builtin/apply.c:4031

2219 +#: builtin/apply.c:4032

2220 #, c-format

2221 msgid "Applied patch %s cleanly."

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

2223

2154 -#: builtin/apply.c:4039

2224 +#: builtin/apply.c:4040

2225 msgid "internal error"

2226 msgstr "内部错误"

2227

2228 #. Say this even without --verbose

2159 -#: builtin/apply.c:4042

2229 +#: builtin/apply.c:4043

2230 #, c-format

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

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

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

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

2235

2166 -#: builtin/apply.c:4052

2236 +#: builtin/apply.c:4053

2237 #, c-format

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

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

2240

2171 -#: builtin/apply.c:4073

2241 +#: builtin/apply.c:4074

2242 #, c-format

2243 msgid "Hunk #%d applied cleanly."

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

2245

2176 -#: builtin/apply.c:4076

2246 +#: builtin/apply.c:4077

2247 #, c-format

2248 msgid "Rejected hunk #%d."

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

2250

2181 -#: builtin/apply.c:4226

2251 +#: builtin/apply.c:4227

2252 msgid "unrecognized input"

2253 msgstr "未能识别的输入"

2254

2185 -#: builtin/apply.c:4237

2255 +#: builtin/apply.c:4238

2256 msgid "unable to read index file"

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

2258

2189 -#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92

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

2260 #: builtin/fetch.c:63

2261 msgid "path"

2262 msgstr "路径"

2263

2194 -#: builtin/apply.c:4357

2264 +#: builtin/apply.c:4358

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

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

2267

2198 -#: builtin/apply.c:4360

2268 +#: builtin/apply.c:4361

2269 msgid "apply changes matching the given path"

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

2271

2202 -#: builtin/apply.c:4362

2272 +#: builtin/apply.c:4363

2273 msgid "num"

2274 msgstr "数字"

2275

2206 -#: builtin/apply.c:4363

2276 +#: builtin/apply.c:4364

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

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

2279

2210 -#: builtin/apply.c:4366

2280 +#: builtin/apply.c:4367

2281 msgid "ignore additions made by the patch"

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

2283

2214 -#: builtin/apply.c:4368

2284 +#: builtin/apply.c:4369

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

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

2287

2218 -#: builtin/apply.c:4372

2288 +#: builtin/apply.c:4373

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

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

2291

2222 -#: builtin/apply.c:4374

2292 +#: builtin/apply.c:4375

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

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

2295

2226 -#: builtin/apply.c:4376

2296 +#: builtin/apply.c:4377

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

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

2299

2230 -#: builtin/apply.c:4378

2300 +#: builtin/apply.c:4379

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

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

2303

2234 -#: builtin/apply.c:4380

2304 +#: builtin/apply.c:4381

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

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

2307

2238 -#: builtin/apply.c:4382

2308 +#: builtin/apply.c:4383

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

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

2311

2242 -#: builtin/apply.c:4384

2312 +#: builtin/apply.c:4385

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

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

2315

2246 -#: builtin/apply.c:4386

2316 +#: builtin/apply.c:4387

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

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

2319

2250 -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456

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

2321 msgid "paths are separated with NUL character"

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

2323

2254 -#: builtin/apply.c:4391

2324 +#: builtin/apply.c:4392

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

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

2327

2258 -#: builtin/apply.c:4392

2328 +#: builtin/apply.c:4393

2329 msgid "action"

2330 msgstr "动作"

2331

2262 -#: builtin/apply.c:4393

2332 +#: builtin/apply.c:4394

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

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

2335

2266 -#: builtin/apply.c:4396 builtin/apply.c:4399

2336 +#: builtin/apply.c:4397 builtin/apply.c:4400

2337 msgid "ignore changes in whitespace when finding context"

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

2339

2270 -#: builtin/apply.c:4402

2340 +#: builtin/apply.c:4403

2341 msgid "apply the patch in reverse"

2342 msgstr "反向应用补丁"

2343

2274 -#: builtin/apply.c:4404

2344 +#: builtin/apply.c:4405

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

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

2347

2278 -#: builtin/apply.c:4406

2348 +#: builtin/apply.c:4407

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

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

2351

2282 -#: builtin/apply.c:4408

2352 +#: builtin/apply.c:4409

2353 msgid "allow overlapping hunks"

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

2355

2286 -#: builtin/apply.c:4411

2356 +#: builtin/apply.c:4412

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

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

2359

2290 -#: builtin/apply.c:4414

2360 +#: builtin/apply.c:4415

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

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

2363

2294 -#: builtin/apply.c:4416

2364 +#: builtin/apply.c:4417

2365 msgid "root"

2366 msgstr "根目录"

2367

2298 -#: builtin/apply.c:4417

2368 +#: builtin/apply.c:4418

2369 msgid "prepend <root> to all filenames"

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

2371

2302 -#: builtin/apply.c:4439

2372 +#: builtin/apply.c:4440

2373 msgid "--3way outside a repository"

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

2375

2306 -#: builtin/apply.c:4447

2376 +#: builtin/apply.c:4448

2377 msgid "--index outside a repository"

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

2379

2310 -#: builtin/apply.c:4450

2380 +#: builtin/apply.c:4451

2381 msgid "--cached outside a repository"

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

2383

2314 -#: builtin/apply.c:4466

2384 +#: builtin/apply.c:4467

2385 #, c-format

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

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

2388

2319 -#: builtin/apply.c:4480

2389 +#: builtin/apply.c:4481

2390 #, c-format

2391 msgid "squelched %d whitespace error"

2392 msgid_plural "squelched %d whitespace errors"

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

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

2395

2326 -#: builtin/apply.c:4486 builtin/apply.c:4496

2396 +#: builtin/apply.c:4487 builtin/apply.c:4497

2397 #, c-format

2398 msgid "%d line adds whitespace errors."

2399 msgid_plural "%d lines add whitespace errors."

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

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

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

2449

2380 -#: builtin/blame.c:25

2450 +#: builtin/blame.c:26

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

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

2453

2384 -#: builtin/blame.c:30

2454 +#: builtin/blame.c:31

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

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

2457

2388 -#: builtin/blame.c:2355

2458 +#: builtin/blame.c:2276

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

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

2461

2392 -#: builtin/blame.c:2356

2462 +#: builtin/blame.c:2277

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

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

2465

2396 -#: builtin/blame.c:2357

2466 +#: builtin/blame.c:2278

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

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

2469

2400 -#: builtin/blame.c:2358

2470 +#: builtin/blame.c:2279

2471 msgid "Show work cost statistics"

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

2473

2404 -#: builtin/blame.c:2359

2474 +#: builtin/blame.c:2280

2475 msgid "Show output score for blame entries"

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

2477

2408 -#: builtin/blame.c:2360

2478 +#: builtin/blame.c:2281

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

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

2481

2412 -#: builtin/blame.c:2361

2482 +#: builtin/blame.c:2282

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

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

2485

2416 -#: builtin/blame.c:2362

2486 +#: builtin/blame.c:2283

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

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

2489

2420 -#: builtin/blame.c:2363

2490 +#: builtin/blame.c:2284

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

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

2493

2424 -#: builtin/blame.c:2364

2494 +#: builtin/blame.c:2285

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

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

2497

2428 -#: builtin/blame.c:2365

2498 +#: builtin/blame.c:2286

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

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

2501

2432 -#: builtin/blame.c:2366

2502 +#: builtin/blame.c:2287

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

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

2505

2436 -#: builtin/blame.c:2367

2506 +#: builtin/blame.c:2288

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

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

2509

2440 -#: builtin/blame.c:2368

2510 +#: builtin/blame.c:2289

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

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

2513

2444 -#: builtin/blame.c:2369

2514 +#: builtin/blame.c:2290

2515 msgid "Ignore whitespace differences"

2516 msgstr "忽略空白差异"

2517

2448 -#: builtin/blame.c:2370

2518 +#: builtin/blame.c:2291

2519 msgid "Spend extra cycles to find better match"

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

2521

2452 -#: builtin/blame.c:2371

2522 +#: builtin/blame.c:2292

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

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

2525

2456 -#: builtin/blame.c:2372

2526 +#: builtin/blame.c:2293

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

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

2529

2460 -#: builtin/blame.c:2373 builtin/blame.c:2374

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

2531 msgid "score"

2532 msgstr "得分"

2533

2464 -#: builtin/blame.c:2373

2534 +#: builtin/blame.c:2294

2535 msgid "Find line copies within and across files"

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

2537

2468 -#: builtin/blame.c:2374

2538 +#: builtin/blame.c:2295

2539 msgid "Find line movements within and across files"

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

2541

2472 -#: builtin/blame.c:2375

2542 +#: builtin/blame.c:2296

2543 msgid "n,m"

2544 msgstr "n,m"

2545

2476 -#: builtin/blame.c:2375

2546 +#: builtin/blame.c:2296

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

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

2549

@@ -2707,8 +2777,8 @@ msgid "act on remote-tracking branches"

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

2778

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

2710 -#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369

2711 -#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2780 +#: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415

2781 +#: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468

2782 msgid "commit"

2783 msgstr "提交"

2784

@@ -2772,7 +2842,7 @@ msgstr "以列的方式显示分支"

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

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

2844

2775 -#: builtin/branch.c:860 builtin/clone.c:619

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

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

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

2848

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

2959 msgid "Need a repository to unbundle."

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

2961

2892 -#: builtin/cat-file.c:176

2962 +#: builtin/cat-file.c:303

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

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

2965

2896 -#: builtin/cat-file.c:177

2966 +#: builtin/cat-file.c:304

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

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

2969

2900 -#: builtin/cat-file.c:195

2970 +#: builtin/cat-file.c:341

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

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

2973

2904 -#: builtin/cat-file.c:196

2974 +#: builtin/cat-file.c:342

2975 msgid "show object type"

2976 msgstr "显示对象类型"

2977

2908 -#: builtin/cat-file.c:197

2978 +#: builtin/cat-file.c:343

2979 msgid "show object size"

2980 msgstr "显示对象大小"

2981

2912 -#: builtin/cat-file.c:199

2982 +#: builtin/cat-file.c:345

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

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

2985

2916 -#: builtin/cat-file.c:200

2986 +#: builtin/cat-file.c:346

2987 msgid "pretty-print object's content"

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

2989

2920 -#: builtin/cat-file.c:202

2990 +#: builtin/cat-file.c:348

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

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

2993

2924 -#: builtin/cat-file.c:204

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

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

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

2997

2928 -#: builtin/cat-file.c:207

2998 +#: builtin/cat-file.c:353

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

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

3001

@@ -2953,30 +3023,55 @@ msgstr "从标准输入读出文件名"

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

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

3025

2956 -#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177

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

3027 msgid "suppress progress reporting"

3028 msgstr "不显示进度报告"

3029

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

3030 +#: builtin/check-ignore.c:26

3031 +msgid "show non-matching input paths"

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

3033 +

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

3035 msgid "cannot specify pathnames with --stdin"

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

3037

2964 -#: builtin/check-ignore.c:149

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

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

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

3041

2968 -#: builtin/check-ignore.c:151

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

3043 msgid "no path specified"

3044 msgstr "未指定路径"

3045

2972 -#: builtin/check-ignore.c:155

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

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

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

3049

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

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

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

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

3053

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

3055 +msgid "--non-matching is only valid with --verbose"

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

3057 +

3058 +#: builtin/check-mailmap.c:8

3059 +msgid "git check-mailmap [options] <contact>..."

3060 +msgstr "git check-mailmap [选项] <联系地址>..."

3061 +

3062 +#: builtin/check-mailmap.c:13

3063 +msgid "also read contacts from stdin"

3064 +msgstr "还从标准输入读取联系地址"

3065 +

3066 +#: builtin/check-mailmap.c:24

3067 +#, c-format

3068 +msgid "unable to parse contact: %s"

3069 +msgstr "不能解析联系地址：%s"

3070 +

3071 +#: builtin/check-mailmap.c:47

3072 +msgid "no contacts specified"

3073 +msgstr "未指定联系地址"

3074 +

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

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

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

@@ -3093,43 +3188,43 @@ msgstr "您需要先解决当前索引的冲突"

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

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

3190

3096 -#: builtin/checkout.c:634

3191 +#: builtin/checkout.c:639

3192 msgid "HEAD is now at"

3193 msgstr "HEAD 目前位于"

3194

3100 -#: builtin/checkout.c:641

3195 +#: builtin/checkout.c:646

3196 #, c-format

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

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

3199

3105 -#: builtin/checkout.c:644

3200 +#: builtin/checkout.c:649

3201 #, c-format

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

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

3204

3110 -#: builtin/checkout.c:648

3205 +#: builtin/checkout.c:653

3206 #, c-format

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

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

3209

3115 -#: builtin/checkout.c:650 builtin/checkout.c:987

3210 +#: builtin/checkout.c:655 builtin/checkout.c:997

3211 #, c-format

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

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

3214

3120 -#: builtin/checkout.c:652

3215 +#: builtin/checkout.c:657

3216 #, c-format

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

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

3219

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

3126 -#: builtin/checkout.c:708

3221 +#: builtin/checkout.c:713

3222 #, c-format

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

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

3225

3226 #. The singular version

3132 -#: builtin/checkout.c:714

3227 +#: builtin/checkout.c:719

3228 #, c-format

3229 msgid ""

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

@@ -3150,7 +3245,7 @@ msgstr[1] ""

3245 "\n"

3246 "%s\n"

3247

3153 -#: builtin/checkout.c:732

3248 +#: builtin/checkout.c:737

3249 #, c-format

3250 msgid ""

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

@@ -3165,136 +3260,136 @@ msgstr ""

3260 " git branch new_branch_name %s\n"

3261 "\n"

3262

3168 -#: builtin/checkout.c:762

3263 +#: builtin/checkout.c:767

3264 msgid "internal error in revision walk"

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

3266

3172 -#: builtin/checkout.c:766

3267 +#: builtin/checkout.c:771

3268 msgid "Previous HEAD position was"

3269 msgstr "之前的 HEAD 位置是"

3270

3176 -#: builtin/checkout.c:793 builtin/checkout.c:982

3271 +#: builtin/checkout.c:798 builtin/checkout.c:992

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

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

3274

3275 #. case (1)

3181 -#: builtin/checkout.c:918

3276 +#: builtin/checkout.c:928

3277 #, c-format

3278 msgid "invalid reference: %s"

3279 msgstr "无效引用：%s"

3280

3281 #. case (1): want a tree

3187 -#: builtin/checkout.c:957

3282 +#: builtin/checkout.c:967

3283 #, c-format

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

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

3286

3192 -#: builtin/checkout.c:996

3287 +#: builtin/checkout.c:1006

3288 msgid "paths cannot be used with switching branches"

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

3290

3196 -#: builtin/checkout.c:999 builtin/checkout.c:1003

3291 +#: builtin/checkout.c:1009 builtin/checkout.c:1013

3292 #, c-format

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

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

3295

3201 -#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015

3202 -#: builtin/checkout.c:1018

3296 +#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025

3297 +#: builtin/checkout.c:1028

3298 #, c-format

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

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

3301

3207 -#: builtin/checkout.c:1023

3302 +#: builtin/checkout.c:1033

3303 #, c-format

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

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

3306

3212 -#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90

3307 +#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89

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

3309 msgid "branch"

3310 msgstr "分支"

3311

3217 -#: builtin/checkout.c:1046

3312 +#: builtin/checkout.c:1056

3313 msgid "create and checkout a new branch"

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

3315

3221 -#: builtin/checkout.c:1048

3316 +#: builtin/checkout.c:1058

3317 msgid "create/reset and checkout a branch"

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

3319

3225 -#: builtin/checkout.c:1049

3320 +#: builtin/checkout.c:1059

3321 msgid "create reflog for new branch"

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

3323

3229 -#: builtin/checkout.c:1050

3324 +#: builtin/checkout.c:1060

3325 msgid "detach the HEAD at named commit"

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

3327

3233 -#: builtin/checkout.c:1051

3328 +#: builtin/checkout.c:1061

3329 msgid "set upstream info for new branch"

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

3331

3237 -#: builtin/checkout.c:1053

3332 +#: builtin/checkout.c:1063

3333 msgid "new branch"

3334 msgstr "新分支"

3335

3241 -#: builtin/checkout.c:1053

3336 +#: builtin/checkout.c:1063

3337 msgid "new unparented branch"

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

3339

3245 -#: builtin/checkout.c:1054

3340 +#: builtin/checkout.c:1064

3341 msgid "checkout our version for unmerged files"

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

3343

3249 -#: builtin/checkout.c:1056

3344 +#: builtin/checkout.c:1066

3345 msgid "checkout their version for unmerged files"

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

3347

3253 -#: builtin/checkout.c:1058

3348 +#: builtin/checkout.c:1068

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

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

3351

3257 -#: builtin/checkout.c:1059

3352 +#: builtin/checkout.c:1069

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

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

3355

3261 -#: builtin/checkout.c:1060 builtin/merge.c:217

3356 +#: builtin/checkout.c:1070 builtin/merge.c:232

3357 msgid "update ignored files (default)"

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

3359

3265 -#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245

3360 +#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249

3361 msgid "style"

3362 msgstr "风格"

3363

3269 -#: builtin/checkout.c:1062

3364 +#: builtin/checkout.c:1072

3365 msgid "conflict style (merge or diff3)"

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

3367

3273 -#: builtin/checkout.c:1065

3368 +#: builtin/checkout.c:1075

3369 msgid "do not limit pathspecs to sparse entries only"

3370 msgstr "对路径不做稀疏检出的限制"

3371

3277 -#: builtin/checkout.c:1067

3372 +#: builtin/checkout.c:1077

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

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

3375

3281 -#: builtin/checkout.c:1091

3376 +#: builtin/checkout.c:1101

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

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

3379

3285 -#: builtin/checkout.c:1108

3380 +#: builtin/checkout.c:1118

3381 msgid "--track needs a branch name"

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

3383

3289 -#: builtin/checkout.c:1115

3384 +#: builtin/checkout.c:1125

3385 msgid "Missing branch name; try -b"

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

3387

3293 -#: builtin/checkout.c:1150

3388 +#: builtin/checkout.c:1160

3389 msgid "invalid path specification"

3390 msgstr "无效的路径规格"

3391

3297 -#: builtin/checkout.c:1157

3392 +#: builtin/checkout.c:1167

3393 #, c-format

3394 msgid ""

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

@@ -3303,227 +3398,330 @@ msgstr ""

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

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

3400

3306 -#: builtin/checkout.c:1162

3401 +#: builtin/checkout.c:1172

3402 #, c-format

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

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

3405

3311 -#: builtin/checkout.c:1166

3406 +#: builtin/checkout.c:1176

3407 msgid ""

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

3409 "checking out of the index."

3410 msgstr ""

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

3412

3318 -#: builtin/clean.c:20

3319 -msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

3320 -msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."

3413 +#: builtin/clean.c:25

3414 +msgid ""

3415 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

3416 +msgstr ""

3417 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."

3418

3322 -#: builtin/clean.c:24

3419 +#: builtin/clean.c:29

3420 #, c-format

3421 msgid "Removing %s\n"

3422 msgstr "正删除 %s\n"

3423

3327 -#: builtin/clean.c:25

3424 +#: builtin/clean.c:30

3425 #, c-format

3426 msgid "Would remove %s\n"

3427 msgstr "将删除 %s\n"

3428

3332 -#: builtin/clean.c:26

3429 +#: builtin/clean.c:31

3430 #, c-format

3431 msgid "Skipping repository %s\n"

3432 msgstr "忽略版本库 %s\n"

3433

3337 -#: builtin/clean.c:27

3434 +#: builtin/clean.c:32

3435 #, c-format

3436 msgid "Would skip repository %s\n"

3437 msgstr "将忽略版本库 %s\n"

3438

3342 -#: builtin/clean.c:28

3439 +#: builtin/clean.c:33

3440 #, c-format

3441 msgid "failed to remove %s"

3442 msgstr "无法删除 %s"

3443

3347 -#: builtin/clean.c:160

3444 +#: builtin/clean.c:293

3445 +msgid ""

3446 +"Prompt help:\n"

3447 +"1 - select a numbered item\n"

3448 +"foo - select item based on unique prefix\n"

3449 +" - (empty) select nothing"

3450 +msgstr ""

3451 +"帮助：\n"

3452 +"1 - 通过编号选择一个选项\n"

3453 +"foo - 通过标题选择一个选项\n"

3454 +" - （空）什么也不选择"

3455 +

3456 +#: builtin/clean.c:297

3457 +msgid ""

3458 +"Prompt help:\n"

3459 +"1 - select a single item\n"

3460 +"3-5 - select a range of items\n"

3461 +"2-3,6-9 - select multiple ranges\n"

3462 +"foo - select item based on unique prefix\n"

3463 +"-... - unselect specified items\n"

3464 +"* - choose all items\n"

3465 +" - (empty) finish selecting"

3466 +msgstr ""

3467 +"帮助：\n"

3468 +"1 - 选择一个选项\n"

3469 +"3-5 - 选择一个范围内的所有选项\n"

3470 +"2-3,6-9 - 选择多个范围内的所有选项\n"

3471 +"foo - 通过标题选择一个选项\n"

3472 +"-... - 反选特定的选项\n"

3473 +"* - 选择所有选项\n"

3474 +" - （空）结束选择"

3475 +

3476 +#: builtin/clean.c:491

3477 +#, c-format

3478 +msgid "Huh (%s)?"

3479 +msgstr "嗯（%s）？"

3480 +

3481 +#: builtin/clean.c:634

3482 +#, c-format

3483 +msgid "Input ignore patterns>> "

3484 +msgstr "输入模版以排除条目>> "

3485 +

3486 +#: builtin/clean.c:671

3487 +#, c-format

3488 +msgid "WARNING: Cannot find items matched by: %s"

3489 +msgstr "警告：无法找到和 %s 匹配的条目"

3490 +

3491 +#: builtin/clean.c:692

3492 +msgid "Select items to delete"

3493 +msgstr "选择要删除的条目"

3494 +

3495 +#: builtin/clean.c:732

3496 +#, c-format

3497 +msgid "remove %s? "

3498 +msgstr "删除 %s？"

3499 +

3500 +#: builtin/clean.c:757

3501 +msgid "Bye."

3502 +msgstr "再见。"

3503 +

3504 +#: builtin/clean.c:765

3505 +msgid ""

3506 +"clean - start cleaning\n"

3507 +"filter by pattern - exclude items from deletion\n"

3508 +"select by numbers - select items to be deleted by numbers\n"

3509 +"ask each - confirm each deletion (like \"rm -i\")\n"

3510 +"quit - stop cleaning\n"

3511 +"help - this screen\n"

3512 +"? - help for prompt selection"

3513 +msgstr ""

3514 +"clean - 开始清理\n"

3515 +"filter by pattern - 通过模版排除要删除的条目\n"

3516 +"select by numbers - 通过数字选择要删除的条目\n"

3517 +"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n"

3518 +"quit - 停止删除并退出\n"

3519 +"help - 显示本帮助\n"

3520 +"? - 显示如何在提示符下选择的帮助"

3521 +

3522 +#: builtin/clean.c:792

3523 +msgid "*** Commands ***"

3524 +msgstr "*** 命令 ***"

3525 +

3526 +#: builtin/clean.c:793

3527 +msgid "What now"

3528 +msgstr "请选择"

3529 +

3530 +#: builtin/clean.c:801

3531 +msgid "Would remove the following item:"

3532 +msgid_plural "Would remove the following items:"

3533 +msgstr[0] "将删除如下条目："

3534 +msgstr[1] "将删除如下条目："

3535 +

3536 +#: builtin/clean.c:818

3537 +msgid "No more files to clean, exiting."

3538 +msgstr "没有要清理的文件，退出。"

3539 +

3540 +#: builtin/clean.c:850

3541 msgid "do not print names of files removed"

3542 msgstr "不打印删除文件的名称"

3543

3351 -#: builtin/clean.c:162

3544 +#: builtin/clean.c:852

3545 msgid "force"

3546 msgstr "强制"

3547

3355 -#: builtin/clean.c:164

3548 +#: builtin/clean.c:853

3549 +msgid "interactive cleaning"

3550 +msgstr "交互式清除"

3551 +

3552 +#: builtin/clean.c:855

3553 msgid "remove whole directories"

3554 msgstr "删除整个目录"

3555

3359 -#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3360 -#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182

3556 +#: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716

3557 +#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186

3558 msgid "pattern"

3559 msgstr "模式"

3560

3364 -#: builtin/clean.c:166

3561 +#: builtin/clean.c:857

3562 msgid "add <pattern> to ignore rules"

3563 msgstr "添加<模式>到忽略规则"

3564

3368 -#: builtin/clean.c:167

3565 +#: builtin/clean.c:858

3566 msgid "remove ignored files, too"

3567 msgstr "也删除忽略的文件"

3568

3372 -#: builtin/clean.c:169

3569 +#: builtin/clean.c:860

3570 msgid "remove only ignored files"

3571 msgstr "只删除忽略的文件"

3572

3376 -#: builtin/clean.c:187

3573 +#: builtin/clean.c:878

3574 msgid "-x and -X cannot be used together"

3575 msgstr "-x 和 -X 不能同时使用"

3576

3380 -#: builtin/clean.c:191

3577 +#: builtin/clean.c:882

3578 msgid ""

3382 -"clean.requireForce set to true and neither -n nor -f given; refusing to clean"

3579 +"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "

3580 +"clean"

3581 msgstr ""

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

3582 +"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

3583

3386 -#: builtin/clean.c:194

3584 +#: builtin/clean.c:885

3585 msgid ""

3388 -"clean.requireForce defaults to true and neither -n nor -f given; refusing to "

3389 -"clean"

3586 +"clean.requireForce defaults to true and neither -i, -n nor -f given; "

3587 +"refusing to clean"

3588 msgstr ""

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

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

3590

3393 -#: builtin/clone.c:37

3591 +#: builtin/clone.c:36

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

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

3594

3397 -#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214

3398 -#: builtin/push.c:436

3595 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229

3596 +#: builtin/push.c:462

3597 msgid "force progress reporting"

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

3599

3402 -#: builtin/clone.c:67

3600 +#: builtin/clone.c:66

3601 msgid "don't create a checkout"

3602 msgstr "不创建一个检出"

3603

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

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

3605 msgid "create a bare repository"

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

3607

3410 -#: builtin/clone.c:73

3608 +#: builtin/clone.c:72

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

3610 msgstr "创建一个镜像版本库（也是裸版本库）"

3611

3414 -#: builtin/clone.c:75

3612 +#: builtin/clone.c:74

3613 msgid "to clone from a local repository"

3614 msgstr "从本地版本库克隆"

3615

3418 -#: builtin/clone.c:77

3616 +#: builtin/clone.c:76

3617 msgid "don't use local hardlinks, always copy"

3618 msgstr "不使用本地硬链接，始终复制"

3619

3422 -#: builtin/clone.c:79

3620 +#: builtin/clone.c:78

3621 msgid "setup as shared repository"

3622 msgstr "设置为共享版本库"

3623

3426 -#: builtin/clone.c:81 builtin/clone.c:83

3624 +#: builtin/clone.c:80 builtin/clone.c:82

3625 msgid "initialize submodules in the clone"

3626 msgstr "在克隆时初始化子模组"

3627

3430 -#: builtin/clone.c:84 builtin/init-db.c:485

3628 +#: builtin/clone.c:83 builtin/init-db.c:485

3629 msgid "template-directory"

3630 msgstr "模板目录"

3631

3434 -#: builtin/clone.c:85 builtin/init-db.c:486

3632 +#: builtin/clone.c:84 builtin/init-db.c:486

3633 msgid "directory from which templates will be used"

3634 msgstr "模板目录将被使用"

3635

3438 -#: builtin/clone.c:87

3636 +#: builtin/clone.c:86

3637 msgid "reference repository"

3638 msgstr "引用版本库"

3639

3442 -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

3640 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3641 msgid "name"

3642 msgstr "名称"

3643

3446 -#: builtin/clone.c:89

3644 +#: builtin/clone.c:88

3645 msgid "use <name> instead of 'origin' to track upstream"

3646 msgstr "使用<名称>而不是 'origin' 去跟踪上游"

3647

3450 -#: builtin/clone.c:91

3648 +#: builtin/clone.c:90

3649 msgid "checkout <branch> instead of the remote's HEAD"

3650 msgstr "检出<分支>而不是远程HEAD"

3651

3454 -#: builtin/clone.c:93

3652 +#: builtin/clone.c:92

3653 msgid "path to git-upload-pack on the remote"

3654 msgstr "远程 git-upload-pack 路径"

3655

3458 -#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662

3656 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661

3657 msgid "depth"

3658 msgstr "深度"

3659

3462 -#: builtin/clone.c:95

3660 +#: builtin/clone.c:94

3661 msgid "create a shallow clone of that depth"

3662 msgstr "创建一个指定深度的浅克隆"

3663

3466 -#: builtin/clone.c:97

3664 +#: builtin/clone.c:96

3665 msgid "clone only one branch, HEAD or --branch"

3666 msgstr "只克隆一个分支、HEAD 或 --branch"

3667

3470 -#: builtin/clone.c:98 builtin/init-db.c:494

3668 +#: builtin/clone.c:97 builtin/init-db.c:494

3669 msgid "gitdir"

3670 msgstr "git目录"

3671

3474 -#: builtin/clone.c:99 builtin/init-db.c:495

3672 +#: builtin/clone.c:98 builtin/init-db.c:495

3673 msgid "separate git dir from working tree"

3674 msgstr "git目录和工作区分离"

3675

3478 -#: builtin/clone.c:100

3676 +#: builtin/clone.c:99

3677 msgid "key=value"

3678 msgstr "key=value"

3679

3482 -#: builtin/clone.c:101

3680 +#: builtin/clone.c:100

3681 msgid "set config inside the new repository"

3682 msgstr "在新版本库中设置配置信息"

3683

3486 -#: builtin/clone.c:254

3684 +#: builtin/clone.c:253

3685 #, c-format

3686 msgid "reference repository '%s' is not a local repository."

3687 msgstr "引用版本库 '%s' 不是一个本地版本库。"

3688

3491 -#: builtin/clone.c:317

3689 +#: builtin/clone.c:316

3690 #, c-format

3691 msgid "failed to create directory '%s'"

3692 msgstr "无法创建目录 '%s'"

3693

3496 -#: builtin/clone.c:319 builtin/diff.c:77

3694 +#: builtin/clone.c:318 builtin/diff.c:77

3695 #, c-format

3696 msgid "failed to stat '%s'"

3697 msgstr "无法枚举 '%s' 状态"

3698

3501 -#: builtin/clone.c:321

3699 +#: builtin/clone.c:320

3700 #, c-format

3701 msgid "%s exists and is not a directory"

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

3703

3506 -#: builtin/clone.c:335

3704 +#: builtin/clone.c:334

3705 #, c-format

3706 msgid "failed to stat %s\n"

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

3708

3511 -#: builtin/clone.c:357

3709 +#: builtin/clone.c:356

3710 #, c-format

3711 msgid "failed to create link '%s'"

3712 msgstr "无法创建链接 '%s'"

3713

3516 -#: builtin/clone.c:361

3714 +#: builtin/clone.c:360

3715 #, c-format

3716 msgid "failed to copy file to '%s'"

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

3718

3521 -#: builtin/clone.c:384

3719 +#: builtin/clone.c:383

3720 #, c-format

3721 msgid "done.\n"

3722 msgstr "完成。\n"

3723

3526 -#: builtin/clone.c:397

3724 +#: builtin/clone.c:396

3725 msgid ""

3726 "Clone succeeded, but checkout failed.\n"

3727 "You can inspect what was checked out with 'git status'\n"

@@ -3533,90 +3731,104 @@ msgstr ""

3731 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

3732 "'git checkout -f HEAD' 重试\n"

3733

3536 -#: builtin/clone.c:476

3734 +#: builtin/clone.c:475

3735 #, c-format

3736 msgid "Could not find remote branch %s to clone."

3737 msgstr "不能发现要克隆的远程分支 %s。"

3738

3541 -#: builtin/clone.c:550

3739 +#: builtin/clone.c:555

3740 +#, c-format

3741 +msgid "Checking connectivity... "

3742 +msgstr "检查连接... "

3743 +

3744 +#: builtin/clone.c:558

3745 msgid "remote did not send all necessary objects"

3746 msgstr "远程没有发送所有必须的对象"

3747

3545 -#: builtin/clone.c:610

3748 +#: builtin/clone.c:560

3749 +#, c-format

3750 +msgid "done\n"

3751 +msgstr "完成\n"

3752 +

3753 +#: builtin/clone.c:621

3754 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3755 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

3756

3549 -#: builtin/clone.c:641

3757 +#: builtin/clone.c:652

3758 msgid "unable to checkout working tree"

3759 msgstr "不能检出工作区"

3760

3553 -#: builtin/clone.c:749

3761 +#: builtin/clone.c:760

3762 msgid "Too many arguments."

3763 msgstr "太多参数。"

3764

3557 -#: builtin/clone.c:753

3765 +#: builtin/clone.c:764

3766 msgid "You must specify a repository to clone."

3767 msgstr "您必须指定一个版本库来克隆。"

3768

3561 -#: builtin/clone.c:764

3769 +#: builtin/clone.c:775

3770 #, c-format

3771 msgid "--bare and --origin %s options are incompatible."

3772 msgstr "--bare 和 --origin %s 选项不兼容。"

3773

3566 -#: builtin/clone.c:767

3774 +#: builtin/clone.c:778

3775 msgid "--bare and --separate-git-dir are incompatible."

3776 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

3777

3570 -#: builtin/clone.c:780

3778 +#: builtin/clone.c:791

3779 #, c-format

3780 msgid "repository '%s' does not exist"

3781 msgstr "版本库 '%s' 不存在"

3782

3575 -#: builtin/clone.c:785

3783 +#: builtin/clone.c:796

3784 msgid "--depth is ignored in local clones; use file:// instead."

3785 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

3786

3579 -#: builtin/clone.c:795

3787 +#: builtin/clone.c:798

3788 +msgid "--local is ignored"

3789 +msgstr "--local 被忽略"

3790 +

3791 +#: builtin/clone.c:808

3792 #, c-format

3793 msgid "destination path '%s' already exists and is not an empty directory."

3794 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

3795

3584 -#: builtin/clone.c:805

3796 +#: builtin/clone.c:818

3797 #, c-format

3798 msgid "working tree '%s' already exists."

3799 msgstr "工作区 '%s' 已经存在。"

3800

3589 -#: builtin/clone.c:818 builtin/clone.c:830

3801 +#: builtin/clone.c:831 builtin/clone.c:843

3802 #, c-format

3803 msgid "could not create leading directories of '%s'"

3804 msgstr "不能为 '%s' 创建先导目录"

3805

3594 -#: builtin/clone.c:821

3806 +#: builtin/clone.c:834

3807 #, c-format

3808 msgid "could not create work tree dir '%s'."

3809 msgstr "不能为 '%s' 创建工作区目录。"

3810

3599 -#: builtin/clone.c:840

3811 +#: builtin/clone.c:853

3812 #, c-format

3813 msgid "Cloning into bare repository '%s'...\n"

3814 msgstr "克隆到裸版本库 '%s'...\n"

3815

3604 -#: builtin/clone.c:842

3816 +#: builtin/clone.c:855

3817 #, c-format

3818 msgid "Cloning into '%s'...\n"

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

3820

3609 -#: builtin/clone.c:877

3821 +#: builtin/clone.c:890

3822 #, c-format

3823 msgid "Don't know how to clone %s"

3824 msgstr "不知道如何克隆 %s"

3825

3614 -#: builtin/clone.c:926

3826 +#: builtin/clone.c:942

3827 #, c-format

3828 msgid "Remote branch %s not found in upstream %s"

3829 msgstr "远程分支 %s 在上游 %s 未发现"

3830

3619 -#: builtin/clone.c:933

3831 +#: builtin/clone.c:949

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

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

3834

@@ -3652,15 +3864,15 @@ msgstr "两列之间的填充空间"

3864 msgid "--command must be the first argument"

3865 msgstr "--command 必须是第一个参数"

3866

3655 -#: builtin/commit.c:34

3867 +#: builtin/commit.c:35

3868 msgid "git commit [options] [--] <pathspec>..."

3869 msgstr "git commit [选项] [--] <路径匹配>..."

3870

3659 -#: builtin/commit.c:39

3871 +#: builtin/commit.c:40

3872 msgid "git status [options] [--] <pathspec>..."

3873 msgstr "git status [选项] [--] <路径匹配>..."

3874

3663 -#: builtin/commit.c:44

3875 +#: builtin/commit.c:45

3876 msgid ""

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

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

@@ -3683,7 +3895,7 @@ msgstr ""

3895 "\n"

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

3897

3686 -#: builtin/commit.c:56

3898 +#: builtin/commit.c:57

3899 msgid ""

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

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

@@ -3692,7 +3904,7 @@ msgstr ""

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

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

3906

3695 -#: builtin/commit.c:61

3907 +#: builtin/commit.c:62

3908 msgid ""

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

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

@@ -3708,93 +3920,93 @@ msgstr ""

3920 "\n"

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

3922

3711 -#: builtin/commit.c:260

3923 +#: builtin/commit.c:265

3924 msgid "failed to unpack HEAD tree object"

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

3926

3715 -#: builtin/commit.c:302

3927 +#: builtin/commit.c:307

3928 msgid "unable to create temporary index"

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

3930

3719 -#: builtin/commit.c:308

3931 +#: builtin/commit.c:313

3932 msgid "interactive add failed"

3933 msgstr "交互式添加失败"

3934

3723 -#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412

3935 +#: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417

3936 msgid "unable to write new_index file"

3937 msgstr "无法写 new_index 文件"

3938

3727 -#: builtin/commit.c:393

3939 +#: builtin/commit.c:398

3940 msgid "cannot do a partial commit during a merge."

3941 msgstr "在合并过程中不能做部分提交。"

3942

3731 -#: builtin/commit.c:395

3943 +#: builtin/commit.c:400

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

3945 msgstr "在拣选过程中不能做部分提交。"

3946

3735 -#: builtin/commit.c:405

3947 +#: builtin/commit.c:410

3948 msgid "cannot read the index"

3949 msgstr "无法读取索引"

3950

3739 -#: builtin/commit.c:425

3951 +#: builtin/commit.c:430

3952 msgid "unable to write temporary index file"

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

3954

3743 -#: builtin/commit.c:513 builtin/commit.c:519

3955 +#: builtin/commit.c:521 builtin/commit.c:527

3956 #, c-format

3957 msgid "invalid commit: %s"

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

3959

3748 -#: builtin/commit.c:542

3960 +#: builtin/commit.c:549

3961 msgid "malformed --author parameter"

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

3963

3752 -#: builtin/commit.c:562

3964 +#: builtin/commit.c:569

3965 #, c-format

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

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

3968

3757 -#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956

3969 +#: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963

3970 #, c-format

3971 msgid "could not lookup commit %s"

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

3973

3762 -#: builtin/commit.c:612 builtin/shortlog.c:270

3974 +#: builtin/commit.c:619 builtin/shortlog.c:271

3975 #, c-format

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

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

3978

3767 -#: builtin/commit.c:614

3979 +#: builtin/commit.c:621

3980 msgid "could not read log from standard input"

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

3982

3771 -#: builtin/commit.c:618

3983 +#: builtin/commit.c:625

3984 #, c-format

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

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

3987

3776 -#: builtin/commit.c:624

3988 +#: builtin/commit.c:631

3989 msgid "commit has empty message"

3990 msgstr "提交说明为空"

3991

3780 -#: builtin/commit.c:640

3992 +#: builtin/commit.c:647

3993 msgid "could not read MERGE_MSG"

3994 msgstr "不能读取 MERGE_MSG"

3995

3784 -#: builtin/commit.c:644

3996 +#: builtin/commit.c:651

3997 msgid "could not read SQUASH_MSG"

3998 msgstr "不能读取 SQUASH_MSG"

3999

3788 -#: builtin/commit.c:648

4000 +#: builtin/commit.c:655

4001 #, c-format

4002 msgid "could not read '%s'"

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

4004

3793 -#: builtin/commit.c:709

4005 +#: builtin/commit.c:716

4006 msgid "could not write commit template"

4007 msgstr "不能写提交模版"

4008

3797 -#: builtin/commit.c:720

4009 +#: builtin/commit.c:727

4010 #, c-format

4011 msgid ""

4012 "\n"

@@ -3808,7 +4020,7 @@ msgstr ""

4020 "\t%s\n"

4021 "然后重试。\n"

4022

3811 -#: builtin/commit.c:725

4023 +#: builtin/commit.c:732

4024 #, c-format

4025 msgid ""

4026 "\n"

@@ -3822,7 +4034,7 @@ msgstr ""

4034 "\t%s\n"

4035 "然后重试。\n"

4036

3825 -#: builtin/commit.c:737

4037 +#: builtin/commit.c:744

4038 #, c-format

4039 msgid ""

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

@@ -3831,7 +4043,7 @@ msgstr ""

4043 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

4044 "说明将会终止提交。\n"

4045

3834 -#: builtin/commit.c:742

4046 +#: builtin/commit.c:749

4047 #, c-format

4048 msgid ""

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

@@ -3842,355 +4054,355 @@ msgstr ""

4054 "也可以删除它们。一个空的提交说明将会终止提交。\n"

4055

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

3845 -#: builtin/commit.c:755

4057 +#: builtin/commit.c:762

4058 #, c-format

4059 msgid "%sAuthor: %s"

4060 msgstr "%s作者： %s"

4061

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

3851 -#: builtin/commit.c:762

4063 +#: builtin/commit.c:769

4064 #, c-format

4065 msgid "%sCommitter: %s"

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

4067

3856 -#: builtin/commit.c:782

4068 +#: builtin/commit.c:789

4069 msgid "Cannot read index"

4070 msgstr "无法读取索引"

4071

3860 -#: builtin/commit.c:819

4072 +#: builtin/commit.c:826

4073 msgid "Error building trees"

4074 msgstr "无法创建树对象"

4075

3864 -#: builtin/commit.c:834 builtin/tag.c:359

4076 +#: builtin/commit.c:841 builtin/tag.c:359

4077 #, c-format

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

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

4080

3869 -#: builtin/commit.c:931

4081 +#: builtin/commit.c:938

4082 #, c-format

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

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

4085

3874 -#: builtin/commit.c:946 builtin/commit.c:1140

4086 +#: builtin/commit.c:953 builtin/commit.c:1189

4087 #, c-format

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

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

4090

3879 -#: builtin/commit.c:976

4091 +#: builtin/commit.c:990

4092 +msgid "--long and -z are incompatible"

4093 +msgstr "--long 和 -z 选项不兼容"

4094 +

4095 +#: builtin/commit.c:1020

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

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

4098

3883 -#: builtin/commit.c:987

4099 +#: builtin/commit.c:1031

4100 msgid "You have nothing to amend."

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

4102

3887 -#: builtin/commit.c:990

4103 +#: builtin/commit.c:1034

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

4105 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

4106

3891 -#: builtin/commit.c:992

4107 +#: builtin/commit.c:1036

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

4109 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

4110

3895 -#: builtin/commit.c:995

4111 +#: builtin/commit.c:1039

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

4113 msgstr "选项 --squash 和 --fixup 不能同时使用"

4114

3899 -#: builtin/commit.c:1005

4115 +#: builtin/commit.c:1049

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

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

4118

3903 -#: builtin/commit.c:1007

4119 +#: builtin/commit.c:1051

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

4121 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

4122

3907 -#: builtin/commit.c:1015

4123 +#: builtin/commit.c:1059

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

4125 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

4126

3911 -#: builtin/commit.c:1032

4127 +#: builtin/commit.c:1076

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

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

4130

3915 -#: builtin/commit.c:1034

4131 +#: builtin/commit.c:1078

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

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

4134

3919 -#: builtin/commit.c:1036

4135 +#: builtin/commit.c:1080

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

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

4138

3923 -#: builtin/commit.c:1038

4139 +#: builtin/commit.c:1082

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

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

4142

3927 -#: builtin/commit.c:1048 builtin/tag.c:575

4143 +#: builtin/commit.c:1092 builtin/tag.c:575

4144 #, c-format

4145 msgid "Invalid cleanup mode %s"

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

4147

3932 -#: builtin/commit.c:1053

4148 +#: builtin/commit.c:1097

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

4150 msgstr "路径和 -a 选项同时使用没有意义。"

4151

3936 -#: builtin/commit.c:1059 builtin/commit.c:1194

3937 -msgid "--long and -z are incompatible"

3938 -msgstr "--long 和 -z 选项不兼容"

3939 -

3940 -#: builtin/commit.c:1154 builtin/commit.c:1390

4152 +#: builtin/commit.c:1203 builtin/commit.c:1436

4153 msgid "show status concisely"

4154 msgstr "以简洁的格式显示状态"

4155

3944 -#: builtin/commit.c:1156 builtin/commit.c:1392

4156 +#: builtin/commit.c:1205 builtin/commit.c:1438

4157 msgid "show branch information"

4158 msgstr "显示分支信息"

4159

3948 -#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426

4160 +#: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452

4161 msgid "machine-readable output"

4162 msgstr "机器可读的输出"

4163

3952 -#: builtin/commit.c:1161 builtin/commit.c:1396

4164 +#: builtin/commit.c:1210 builtin/commit.c:1442

4165 msgid "show status in long format (default)"

4166 msgstr "以长格式显示状态（默认）"

4167

3956 -#: builtin/commit.c:1164 builtin/commit.c:1399

4168 +#: builtin/commit.c:1213 builtin/commit.c:1445

4169 msgid "terminate entries with NUL"

4170 msgstr "条目以NUL字符结尾"

4171

3960 -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659

3961 -#: builtin/fast-export.c:662 builtin/tag.c:459

4172 +#: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667

4173 +#: builtin/fast-export.c:670 builtin/tag.c:459

4174 msgid "mode"

4175 msgstr "模式"

4176

3965 -#: builtin/commit.c:1167 builtin/commit.c:1402

4177 +#: builtin/commit.c:1216 builtin/commit.c:1448

4178 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4179 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

4180

3969 -#: builtin/commit.c:1170

4181 +#: builtin/commit.c:1219

4182 msgid "show ignored files"

4183 msgstr "显示忽略的文件"

4184

3973 -#: builtin/commit.c:1171 parse-options.h:151

4185 +#: builtin/commit.c:1220 parse-options.h:154

4186 msgid "when"

4187 msgstr "何时"

4188

3977 -#: builtin/commit.c:1172

4189 +#: builtin/commit.c:1221

4190 msgid ""

4191 "ignore changes to submodules, optional when: all, dirty, untracked. "

4192 "(Default: all)"

4193 msgstr ""

4194 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

4195

3984 -#: builtin/commit.c:1174

4196 +#: builtin/commit.c:1223

4197 msgid "list untracked files in columns"

4198 msgstr "以列的方式显示未跟踪的文件"

4199

3988 -#: builtin/commit.c:1248

4200 +#: builtin/commit.c:1294

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

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

4203

3992 -#: builtin/commit.c:1250

4204 +#: builtin/commit.c:1296

4205 msgid "could not parse newly created commit"

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

4207

3996 -#: builtin/commit.c:1291

4208 +#: builtin/commit.c:1337

4209 msgid "detached HEAD"

4210 msgstr "分离头指针"

4211

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

4001 -#: builtin/commit.c:1293

4213 +#: builtin/commit.c:1339

4214 msgid " (root-commit)"

4215 msgstr "（根提交）"

4216

4005 -#: builtin/commit.c:1360

4217 +#: builtin/commit.c:1406

4218 msgid "suppress summary after successful commit"

4219 msgstr "提交成功后不显示概述信息"

4220

4009 -#: builtin/commit.c:1361

4221 +#: builtin/commit.c:1407

4222 msgid "show diff in commit message template"

4223 msgstr "在提交说明模板里显示差异"

4224

4013 -#: builtin/commit.c:1363

4225 +#: builtin/commit.c:1409

4226 msgid "Commit message options"

4227 msgstr "提交说明选项"

4228

4017 -#: builtin/commit.c:1364 builtin/tag.c:457

4229 +#: builtin/commit.c:1410 builtin/tag.c:457

4230 msgid "read message from file"

4231 msgstr "从文件中读取提交说明"

4232

4021 -#: builtin/commit.c:1365

4233 +#: builtin/commit.c:1411

4234 msgid "author"

4235 msgstr "作者"

4236

4025 -#: builtin/commit.c:1365

4237 +#: builtin/commit.c:1411

4238 msgid "override author for commit"

4239 msgstr "提交时覆盖作者"

4240

4029 -#: builtin/commit.c:1366 builtin/gc.c:178

4241 +#: builtin/commit.c:1412 builtin/gc.c:178

4242 msgid "date"

4243 msgstr "日期"

4244

4033 -#: builtin/commit.c:1366

4245 +#: builtin/commit.c:1412

4246 msgid "override date for commit"

4247 msgstr "提交时覆盖日期"

4248

4037 -#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533

4038 -#: builtin/notes.c:690 builtin/tag.c:455

4249 +#: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405

4250 +#: builtin/notes.c:562 builtin/tag.c:455

4251 msgid "message"

4252 msgstr "说明"

4253

4042 -#: builtin/commit.c:1367

4254 +#: builtin/commit.c:1413

4255 msgid "commit message"

4256 msgstr "提交说明"

4257

4046 -#: builtin/commit.c:1368

4258 +#: builtin/commit.c:1414

4259 msgid "reuse and edit message from specified commit"

4260 msgstr "重用并编辑指定提交的提交说明"

4261

4050 -#: builtin/commit.c:1369

4262 +#: builtin/commit.c:1415

4263 msgid "reuse message from specified commit"

4264 msgstr "重用指定提交的提交说明"

4265

4054 -#: builtin/commit.c:1370

4266 +#: builtin/commit.c:1416

4267 msgid "use autosquash formatted message to fixup specified commit"

4268 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

4269

4058 -#: builtin/commit.c:1371

4270 +#: builtin/commit.c:1417

4271 msgid "use autosquash formatted message to squash specified commit"

4272 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

4273

4062 -#: builtin/commit.c:1372

4274 +#: builtin/commit.c:1418

4275 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4276 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

4277

4066 -#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109

4278 +#: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111

4279 msgid "add Signed-off-by:"

4280 msgstr "添加 Signed-off-by: 签名"

4281

4070 -#: builtin/commit.c:1374

4282 +#: builtin/commit.c:1420

4283 msgid "use specified template file"

4284 msgstr "使用指定的模板文件"

4285

4074 -#: builtin/commit.c:1375

4286 +#: builtin/commit.c:1421

4287 msgid "force edit of commit"

4288 msgstr "强制编辑提交"

4289

4290 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

4079 -#: builtin/commit.c:1376

4291 +#: builtin/commit.c:1422

4292 msgid "default"

4293 msgstr "default"

4294

4083 -#: builtin/commit.c:1376 builtin/tag.c:460

4295 +#: builtin/commit.c:1422 builtin/tag.c:460

4296 msgid "how to strip spaces and #comments from message"

4297 msgstr "设置如何删除提交说明里的空格和#注释"

4298

4087 -#: builtin/commit.c:1377

4299 +#: builtin/commit.c:1423

4300 msgid "include status in commit message template"

4301 msgstr "在提交说明模板里包含状态信息"

4302

4091 -#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461

4303 +#: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461

4304 msgid "key id"

4305 msgstr "key id"

4306

4095 -#: builtin/commit.c:1379 builtin/merge.c:216

4307 +#: builtin/commit.c:1425 builtin/merge.c:231

4308 msgid "GPG sign commit"

4309 msgstr "GPG 提交签名"

4310

4311 #. end commit message options

4100 -#: builtin/commit.c:1382

4312 +#: builtin/commit.c:1428

4313 msgid "Commit contents options"

4314 msgstr "提交内容选项"

4315

4104 -#: builtin/commit.c:1383

4316 +#: builtin/commit.c:1429

4317 msgid "commit all changed files"

4318 msgstr "提交所有改动的文件"

4319

4108 -#: builtin/commit.c:1384

4320 +#: builtin/commit.c:1430

4321 msgid "add specified files to index for commit"

4322 msgstr "添加指定的文件到索引区等待提交"

4323

4112 -#: builtin/commit.c:1385

4324 +#: builtin/commit.c:1431

4325 msgid "interactively add files"

4326 msgstr "交互式添加文件"

4327

4116 -#: builtin/commit.c:1386

4328 +#: builtin/commit.c:1432

4329 msgid "interactively add changes"

4330 msgstr "交互式添加变更"

4331

4120 -#: builtin/commit.c:1387

4332 +#: builtin/commit.c:1433

4333 msgid "commit only specified files"

4334 msgstr "只提交指定的文件"

4335

4124 -#: builtin/commit.c:1388

4336 +#: builtin/commit.c:1434

4337 msgid "bypass pre-commit hook"

4338 msgstr "绕过 pre-commit 钩子"

4339

4128 -#: builtin/commit.c:1389

4340 +#: builtin/commit.c:1435

4341 msgid "show what would be committed"

4342 msgstr "显示将要提交的内容"

4343

4132 -#: builtin/commit.c:1400

4344 +#: builtin/commit.c:1446

4345 msgid "amend previous commit"

4346 msgstr "修改先前的提交"

4347

4136 -#: builtin/commit.c:1401

4348 +#: builtin/commit.c:1447

4349 msgid "bypass post-rewrite hook"

4350 msgstr "绕过 post-rewrite 钩子"

4351

4140 -#: builtin/commit.c:1406

4352 +#: builtin/commit.c:1452

4353 msgid "ok to record an empty change"

4354 msgstr "允许一个空提交"

4355

4144 -#: builtin/commit.c:1409

4356 +#: builtin/commit.c:1455

4357 msgid "ok to record a change with an empty message"

4358 msgstr "允许空的提交说明"

4359

4148 -#: builtin/commit.c:1441

4360 +#: builtin/commit.c:1488

4361 msgid "could not parse HEAD commit"

4362 msgstr "不能解析 HEAD 提交"

4363

4152 -#: builtin/commit.c:1479 builtin/merge.c:510

4364 +#: builtin/commit.c:1526 builtin/merge.c:525

4365 #, c-format

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

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

4368

4157 -#: builtin/commit.c:1486

4369 +#: builtin/commit.c:1533

4370 #, c-format

4371 msgid "Corrupt MERGE_HEAD file (%s)"

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

4373

4162 -#: builtin/commit.c:1493

4374 +#: builtin/commit.c:1540

4375 msgid "could not read MERGE_MODE"

4376 msgstr "不能读取 MERGE_MODE"

4377

4166 -#: builtin/commit.c:1512

4378 +#: builtin/commit.c:1559

4379 #, c-format

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

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

4382

4171 -#: builtin/commit.c:1526

4383 +#: builtin/commit.c:1573

4384 #, c-format

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

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

4387

4176 -#: builtin/commit.c:1531

4388 +#: builtin/commit.c:1578

4389 #, c-format

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

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

4392

4181 -#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872

4393 +#: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886

4394 msgid "failed to write commit object"

4395 msgstr "无法写提交对象"

4396

4185 -#: builtin/commit.c:1567

4397 +#: builtin/commit.c:1614

4398 msgid "cannot lock HEAD ref"

4399 msgstr "无法锁定 HEAD 引用"

4400

4189 -#: builtin/commit.c:1571

4401 +#: builtin/commit.c:1618

4402 msgid "cannot update HEAD ref"

4403 msgstr "无法更新 HEAD 引用"

4404

4193 -#: builtin/commit.c:1582

4405 +#: builtin/commit.c:1629

4406 msgid ""

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

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

@@ -4203,115 +4415,123 @@ msgstr ""

4415 msgid "git config [options]"

4416 msgstr "git config [选项]"

4417

4206 -#: builtin/config.c:51

4418 +#: builtin/config.c:52

4419 msgid "Config file location"

4420 msgstr "配置文件位置"

4421

4210 -#: builtin/config.c:52

4422 +#: builtin/config.c:53

4423 msgid "use global config file"

4424 msgstr "使用全局配置文件"

4425

4214 -#: builtin/config.c:53

4426 +#: builtin/config.c:54

4427 msgid "use system config file"

4428 msgstr "使用系统级配置文件"

4429

4218 -#: builtin/config.c:54

4430 +#: builtin/config.c:55

4431 msgid "use repository config file"

4432 msgstr "使用版本库级配置文件"

4433

4222 -#: builtin/config.c:55

4434 +#: builtin/config.c:56

4435 msgid "use given config file"

4436 msgstr "使用指定的配置文件"

4437

4226 -#: builtin/config.c:56

4438 +#: builtin/config.c:57

4439 +msgid "blob-id"

4440 +msgstr "数据对象ID"

4441 +

4442 +#: builtin/config.c:57

4443 +msgid "read config from given blob object"

4444 +msgstr "从给定的数据对象读取配置"

4445 +

4446 +#: builtin/config.c:58

4447 msgid "Action"

4448 msgstr "操作"

4449

4230 -#: builtin/config.c:57

4450 +#: builtin/config.c:59

4451 msgid "get value: name [value-regex]"

4452 msgstr "获取值：name [value-regex]"

4453

4234 -#: builtin/config.c:58

4454 +#: builtin/config.c:60

4455 msgid "get all values: key [value-regex]"

4456 msgstr "获得所有的值：key [value-regex]"

4457

4238 -#: builtin/config.c:59

4458 +#: builtin/config.c:61

4459 msgid "get values for regexp: name-regex [value-regex]"

4460 msgstr "根据正则表达式获得值：name-regex [value-regex]"

4461

4242 -#: builtin/config.c:60

4462 +#: builtin/config.c:62

4463 msgid "replace all matching variables: name value [value_regex]"

4464 msgstr "替换所有匹配的变量：name value [value_regex]"

4465

4246 -#: builtin/config.c:61

4466 +#: builtin/config.c:63

4467 msgid "add a new variable: name value"

4468 msgstr "添加一个新的变量：name value"

4469

4250 -#: builtin/config.c:62

4470 +#: builtin/config.c:64

4471 msgid "remove a variable: name [value-regex]"

4472 msgstr "删除一个变量：name [value-regex]"

4473

4254 -#: builtin/config.c:63

4474 +#: builtin/config.c:65

4475 msgid "remove all matches: name [value-regex]"

4476 msgstr "删除所有匹配项：name [value-regex]"

4477

4258 -#: builtin/config.c:64

4478 +#: builtin/config.c:66

4479 msgid "rename section: old-name new-name"

4480 msgstr "重命名小节：old-name new-name"

4481

4262 -#: builtin/config.c:65

4482 +#: builtin/config.c:67

4483 msgid "remove a section: name"

4484 msgstr "删除一个小节：name"

4485

4266 -#: builtin/config.c:66

4486 +#: builtin/config.c:68

4487 msgid "list all"

4488 msgstr "列出所有"

4489

4270 -#: builtin/config.c:67

4490 +#: builtin/config.c:69

4491 msgid "open an editor"

4492 msgstr "打开一个编辑器"

4493

4274 -#: builtin/config.c:68 builtin/config.c:69

4494 +#: builtin/config.c:70 builtin/config.c:71

4495 msgid "slot"

4496 msgstr "slot"

4497

4278 -#: builtin/config.c:68

4498 +#: builtin/config.c:70

4499 msgid "find the color configured: [default]"

4500 msgstr "找到配置的颜色：[默认]"

4501

4282 -#: builtin/config.c:69

4502 +#: builtin/config.c:71

4503 msgid "find the color setting: [stdout-is-tty]"

4504 msgstr "找到颜色设置：[stdout-is-tty]"

4505

4286 -#: builtin/config.c:70

4506 +#: builtin/config.c:72

4507 msgid "Type"

4508 msgstr "类型"

4509

4290 -#: builtin/config.c:71

4510 +#: builtin/config.c:73

4511 msgid "value is \"true\" or \"false\""

4512 msgstr "值是 \"true\" 或 \"false\""

4513

4294 -#: builtin/config.c:72

4514 +#: builtin/config.c:74

4515 msgid "value is decimal number"

4516 msgstr "值是十进制数"

4517

4298 -#: builtin/config.c:73

4518 +#: builtin/config.c:75

4519 msgid "value is --bool or --int"

4520 msgstr "值是 --bool or --int"

4521

4302 -#: builtin/config.c:74

4522 +#: builtin/config.c:76

4523 msgid "value is a path (file or directory name)"

4524 msgstr "值是一个路径（文件或目录名）"

4525

4306 -#: builtin/config.c:75

4526 +#: builtin/config.c:77

4527 msgid "Other"

4528 msgstr "其它"

4529

4310 -#: builtin/config.c:76

4530 +#: builtin/config.c:78

4531 msgid "terminate values with NUL byte"

4532 msgstr "终止值是NUL字节"

4533

4314 -#: builtin/config.c:77

4534 +#: builtin/config.c:79

4535 msgid "respect include directives on lookup"

4536 msgstr "查询时参照 include 指令递归查找"

4537

@@ -4323,55 +4543,55 @@ msgstr "git count-objects [-v] [-H | --human-readable]"

4543 msgid "print sizes in human readable format"

4544 msgstr "以用户可读的格式显示大小"

4545

4326 -#: builtin/describe.c:15

4546 +#: builtin/describe.c:16

4547 msgid "git describe [options] <committish>*"

4548 msgstr "git describe [选项] <提交号>*"

4549

4330 -#: builtin/describe.c:16

4550 +#: builtin/describe.c:17

4551 msgid "git describe [options] --dirty"

4552 msgstr "git describe [选项] --dirty"

4553

4334 -#: builtin/describe.c:233

4554 +#: builtin/describe.c:237

4555 #, c-format

4556 msgid "annotated tag %s not available"

4557 msgstr "注释 tag %s 无效"

4558

4339 -#: builtin/describe.c:237

4559 +#: builtin/describe.c:241

4560 #, c-format

4561 msgid "annotated tag %s has no embedded name"

4562 msgstr "注释 tag %s 没有嵌入名称"

4563

4344 -#: builtin/describe.c:239

4564 +#: builtin/describe.c:243

4565 #, c-format

4566 msgid "tag '%s' is really '%s' here"

4567 msgstr "tag '%s' 的确是在 '%s'"

4568

4349 -#: builtin/describe.c:266

4569 +#: builtin/describe.c:270

4570 #, c-format

4571 msgid "Not a valid object name %s"

4572 msgstr "不是一个有效的对象名 %s"

4573

4354 -#: builtin/describe.c:269

4574 +#: builtin/describe.c:273

4575 #, c-format

4576 msgid "%s is not a valid '%s' object"

4577 msgstr "%s 不是一个有效的 '%s' 对象"

4578

4359 -#: builtin/describe.c:286

4579 +#: builtin/describe.c:290

4580 #, c-format

4581 msgid "no tag exactly matches '%s'"

4582 msgstr "没有 tag 准确匹配 '%s'"

4583

4364 -#: builtin/describe.c:288

4584 +#: builtin/describe.c:292

4585 #, c-format

4586 msgid "searching to describe %s\n"

4587 msgstr "搜索描述 %s\n"

4588

4369 -#: builtin/describe.c:328

4589 +#: builtin/describe.c:332

4590 #, c-format

4591 msgid "finished search at %s\n"

4592 msgstr "完成搜索 %s\n"

4593

4374 -#: builtin/describe.c:352

4594 +#: builtin/describe.c:359

4595 #, c-format

4596 msgid ""

4597 "No annotated tags can describe '%s'.\n"

@@ -4380,7 +4600,7 @@ msgstr ""

4600 "没有注释 tag 能描述 '%s'。\n"

4601 "然而，有非注释 tag：尝试 --tags。"

4602

4383 -#: builtin/describe.c:356

4603 +#: builtin/describe.c:363

4604 #, c-format

4605 msgid ""

4606 "No tags can describe '%s'.\n"

@@ -4389,12 +4609,12 @@ msgstr ""

4609 "没有注释 tag 能描述 '%s'。\n"

4610 "尝试 --always，或者创建一些 tag。"

4611

4392 -#: builtin/describe.c:377

4612 +#: builtin/describe.c:384

4613 #, c-format

4614 msgid "traversed %lu commits\n"

4615 msgstr "已遍历 %lu 个提交\n"

4616

4397 -#: builtin/describe.c:380

4617 +#: builtin/describe.c:387

4618 #, c-format

4619 msgid ""

4620 "more than %i tags found; listed %i most recent\n"

@@ -4403,59 +4623,63 @@ msgstr ""

4623 "发现多于 %i 个 tag，列出最近的 %i 个\n"

4624 "在 %s 放弃搜索\n"

4625

4406 -#: builtin/describe.c:402

4626 +#: builtin/describe.c:409

4627 msgid "find the tag that comes after the commit"

4628 msgstr "寻找提交之后的 tag（用于描述提交）"

4629

4410 -#: builtin/describe.c:403

4630 +#: builtin/describe.c:410

4631 msgid "debug search strategy on stderr"

4632 msgstr "在标准错误上调试搜索策略"

4633

4414 -#: builtin/describe.c:404

4634 +#: builtin/describe.c:411

4635 msgid "use any ref"

4636 msgstr "使用任意引用"

4637

4418 -#: builtin/describe.c:405

4638 +#: builtin/describe.c:412

4639 msgid "use any tag, even unannotated"

4640 msgstr "使用任意 tag，即使未带注解"

4641

4422 -#: builtin/describe.c:406

4642 +#: builtin/describe.c:413

4643 msgid "always use long format"

4644 msgstr "始终使用长提交号格式"

4645

4426 -#: builtin/describe.c:409

4646 +#: builtin/describe.c:414

4647 +msgid "only follow first parent"

4648 +msgstr "只跟随第一个父提交"

4649 +

4650 +#: builtin/describe.c:417

4651 msgid "only output exact matches"

4652 msgstr "只输出精确匹配"

4653

4430 -#: builtin/describe.c:411

4654 +#: builtin/describe.c:419

4655 msgid "consider <n> most recent tags (default: 10)"

4656 msgstr "考虑最近 <n> 个 tags（默认：10）"

4657

4434 -#: builtin/describe.c:413

4658 +#: builtin/describe.c:421

4659 msgid "only consider tags matching <pattern>"

4660 msgstr "只考虑匹配 <模式> 的 tags"

4661

4438 -#: builtin/describe.c:415 builtin/name-rev.c:238

4662 +#: builtin/describe.c:423 builtin/name-rev.c:322

4663 msgid "show abbreviated commit object as fallback"

4664 msgstr "显示简写的提交号作为后备"

4665

4442 -#: builtin/describe.c:416

4666 +#: builtin/describe.c:424

4667 msgid "mark"

4668 msgstr "标记"

4669

4446 -#: builtin/describe.c:417

4670 +#: builtin/describe.c:425

4671 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4672 msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"

4673

4450 -#: builtin/describe.c:435

4674 +#: builtin/describe.c:443

4675 msgid "--long is incompatible with --abbrev=0"

4676 msgstr "--long 与 --abbrev=0 不兼容"

4677

4454 -#: builtin/describe.c:461

4678 +#: builtin/describe.c:469

4679 msgid "No names found, cannot describe anything."

4680 msgstr "没有发现名称，无法描述任何东西。"

4681

4458 -#: builtin/describe.c:481

4682 +#: builtin/describe.c:489

4683 msgid "--dirty is incompatible with committishes"

4684 msgstr "--dirty 不能与提交同时使用"

4685

@@ -4464,31 +4688,26 @@ msgstr "--dirty 不能与提交同时使用"

4688 msgid "'%s': not a regular file or symlink"

4689 msgstr "'%s'：不是一个正规文件或符号链接"

4690

4467 -#: builtin/diff.c:228

4691 +#: builtin/diff.c:230

4692 #, c-format

4693 msgid "invalid option: %s"

4694 msgstr "无效选项：%s"

4695

4472 -#: builtin/diff.c:305

4696 +#: builtin/diff.c:307

4697 msgid "Not a git repository"

4698 msgstr "不是一个 git 版本库"

4699

4476 -#: builtin/diff.c:348

4700 +#: builtin/diff.c:350

4701 #, c-format

4702 msgid "invalid object '%s' given."

4703 msgstr "提供了无效对象 '%s'。"

4704

4481 -#: builtin/diff.c:353

4482 -#, c-format

4483 -msgid "more than %d trees given: '%s'"

4484 -msgstr "提供了超过 %d 个树对象：'%s'"

4485 -

4486 -#: builtin/diff.c:363

4705 +#: builtin/diff.c:359

4706 #, c-format

4707 msgid "more than two blobs given: '%s'"

4708 msgstr "提供了超过两个数据（blob）对象：'%s'"

4709

4491 -#: builtin/diff.c:371

4710 +#: builtin/diff.c:366

4711 #, c-format

4712 msgid "unhandled object '%s' given."

4713 msgstr "提供了无法处理的对象 '%s'。"

@@ -4497,39 +4716,39 @@ msgstr "提供了无法处理的对象 '%s'。"

4716 msgid "git fast-export [rev-list-opts]"

4717 msgstr "git fast-export [rev-list-opts]"

4718

4500 -#: builtin/fast-export.c:658

4719 +#: builtin/fast-export.c:666

4720 msgid "show progress after <n> objects"

4721 msgstr "在 <n> 个对象之后显示进度"

4722

4504 -#: builtin/fast-export.c:660

4723 +#: builtin/fast-export.c:668

4724 msgid "select handling of signed tags"

4725 msgstr "选择如何处理签名 tags"

4726

4508 -#: builtin/fast-export.c:663

4727 +#: builtin/fast-export.c:671

4728 msgid "select handling of tags that tag filtered objects"

4729 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"

4730

4512 -#: builtin/fast-export.c:666

4731 +#: builtin/fast-export.c:674

4732 msgid "Dump marks to this file"

4733 msgstr "把标记存储到这个文件"

4734

4516 -#: builtin/fast-export.c:668

4735 +#: builtin/fast-export.c:676

4736 msgid "Import marks from this file"

4737 msgstr "从这个文件导入标记"

4738

4520 -#: builtin/fast-export.c:670

4739 +#: builtin/fast-export.c:678

4740 msgid "Fake a tagger when tags lack one"

4741 msgstr "当 tags 缺少标记者字段时，假装提供一个"

4742

4524 -#: builtin/fast-export.c:672

4743 +#: builtin/fast-export.c:680

4744 msgid "Output full tree for each commit"

4745 msgstr "每次提交都输出整个树"

4746

4528 -#: builtin/fast-export.c:674

4747 +#: builtin/fast-export.c:682

4748 msgid "Use the done feature to terminate the stream"

4749 msgstr "使用 done 功能来终止流"

4750

4532 -#: builtin/fast-export.c:675

4751 +#: builtin/fast-export.c:683

4752 msgid "Skip output of blob data"

4753 msgstr "跳过数据对象的输出"

4754

@@ -4606,7 +4825,7 @@ msgstr "深化浅克隆的历史"

4825 msgid "convert to a complete repository"

4826 msgstr "转换为一个完整的版本库"

4827

4609 -#: builtin/fetch.c:88 builtin/log.c:1130

4828 +#: builtin/fetch.c:88 builtin/log.c:1177

4829 msgid "dir"

4830 msgstr "目录"

4831

@@ -4618,77 +4837,77 @@ msgstr "在子模组路径输出的前面加上此目录"

4837 msgid "default mode for recursion"

4838 msgstr "递归的默认模式"

4839

4621 -#: builtin/fetch.c:204

4840 +#: builtin/fetch.c:220

4841 msgid "Couldn't find remote ref HEAD"

4842 msgstr "无法发现远程 HEAD 引用"

4843

4625 -#: builtin/fetch.c:257

4844 +#: builtin/fetch.c:273

4845 #, c-format

4846 msgid "object %s not found"

4847 msgstr "对象 %s 未发现"

4848

4630 -#: builtin/fetch.c:262

4849 +#: builtin/fetch.c:278

4850 msgid "[up to date]"

4851 msgstr "[最新]"

4852

4634 -#: builtin/fetch.c:276

4853 +#: builtin/fetch.c:292

4854 #, c-format

4855 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

4856 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

4857

4639 -#: builtin/fetch.c:277 builtin/fetch.c:363

4858 +#: builtin/fetch.c:293 builtin/fetch.c:379

4859 msgid "[rejected]"

4860 msgstr "[已拒绝]"

4861

4643 -#: builtin/fetch.c:288

4862 +#: builtin/fetch.c:304

4863 msgid "[tag update]"

4864 msgstr "[tag更新]"

4865

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

4648 -#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343

4867 +#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359

4868 msgid " (unable to update local ref)"

4869 msgstr " （不能更新本地引用）"

4870

4652 -#: builtin/fetch.c:308

4871 +#: builtin/fetch.c:324

4872 msgid "[new tag]"

4873 msgstr "[新tag]"

4874

4656 -#: builtin/fetch.c:311

4875 +#: builtin/fetch.c:327

4876 msgid "[new branch]"

4877 msgstr "[新分支]"

4878

4660 -#: builtin/fetch.c:314

4879 +#: builtin/fetch.c:330

4880 msgid "[new ref]"

4881 msgstr "[新引用]"

4882

4664 -#: builtin/fetch.c:359

4883 +#: builtin/fetch.c:375

4884 msgid "unable to update local ref"

4885 msgstr "不能更新本地引用"

4886

4668 -#: builtin/fetch.c:359

4887 +#: builtin/fetch.c:375

4888 msgid "forced update"

4889 msgstr "强制更新"

4890

4672 -#: builtin/fetch.c:365

4891 +#: builtin/fetch.c:381

4892 msgid "(non-fast-forward)"

4893 msgstr "（非快进式）"

4894

4676 -#: builtin/fetch.c:396 builtin/fetch.c:688

4895 +#: builtin/fetch.c:412 builtin/fetch.c:718

4896 #, c-format

4897 msgid "cannot open %s: %s\n"

4898 msgstr "无法打开 %s：%s\n"

4899

4681 -#: builtin/fetch.c:405

4900 +#: builtin/fetch.c:421

4901 #, c-format

4902 msgid "%s did not send all necessary objects\n"

4903 msgstr "%s 未发送所有必须的对象\n"

4904

4686 -#: builtin/fetch.c:491

4905 +#: builtin/fetch.c:520

4906 #, c-format

4907 msgid "From %.*s\n"

4908 msgstr "来自 %.*s\n"

4909

4691 -#: builtin/fetch.c:502

4910 +#: builtin/fetch.c:531

4911 #, c-format

4912 msgid ""

4913 "some local refs could not be updated; try running\n"

@@ -4698,87 +4917,87 @@ msgstr ""

4917 " 'git remote prune %s' 来删除旧的、有冲突的分支"

4918

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

4701 -#: builtin/fetch.c:552

4920 +#: builtin/fetch.c:581

4921 #, c-format

4922 msgid " (%s will become dangling)"

4923 msgstr " （%s 将成为摇摆状态）"

4924

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

4707 -#: builtin/fetch.c:553

4926 +#: builtin/fetch.c:582

4927 #, c-format

4928 msgid " (%s has become dangling)"

4929 msgstr " （%s 已成为摇摆状态）"

4930

4712 -#: builtin/fetch.c:560

4931 +#: builtin/fetch.c:589

4932 msgid "[deleted]"

4933 msgstr "[已删除]"

4934

4716 -#: builtin/fetch.c:561 builtin/remote.c:1055

4935 +#: builtin/fetch.c:590 builtin/remote.c:1055

4936 msgid "(none)"

4937 msgstr "（无）"

4938

4720 -#: builtin/fetch.c:678

4939 +#: builtin/fetch.c:708

4940 #, c-format

4941 msgid "Refusing to fetch into current branch %s of non-bare repository"

4942 msgstr "拒绝获取到非裸版本库的当前分支 %s"

4943

4725 -#: builtin/fetch.c:712

4944 +#: builtin/fetch.c:742

4945 #, c-format

4946 msgid "Don't know how to fetch from %s"

4947 msgstr "不知道如何从 %s 获取"

4948

4730 -#: builtin/fetch.c:789

4949 +#: builtin/fetch.c:823

4950 #, c-format

4951 msgid "Option \"%s\" value \"%s\" is not valid for %s"

4952 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

4953

4735 -#: builtin/fetch.c:792

4954 +#: builtin/fetch.c:826

4955 #, c-format

4956 msgid "Option \"%s\" is ignored for %s\n"

4957 msgstr "选项 \"%s\" 为 %s 所忽略\n"

4958

4740 -#: builtin/fetch.c:894

4959 +#: builtin/fetch.c:928

4960 #, c-format

4961 msgid "Fetching %s\n"

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

4963

4745 -#: builtin/fetch.c:896 builtin/remote.c:100

4964 +#: builtin/fetch.c:930 builtin/remote.c:100

4965 #, c-format

4966 msgid "Could not fetch %s"

4967 msgstr "不能获取 %s"

4968

4750 -#: builtin/fetch.c:915

4969 +#: builtin/fetch.c:949

4970 msgid ""

4971 "No remote repository specified. Please, specify either a URL or a\n"

4972 "remote name from which new revisions should be fetched."

4973 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

4974

4756 -#: builtin/fetch.c:935

4975 +#: builtin/fetch.c:969

4976 msgid "You need to specify a tag name."

4977 msgstr "您需要指定一个 tag 名称。"

4978

4760 -#: builtin/fetch.c:981

4979 +#: builtin/fetch.c:1015

4980 msgid "--depth and --unshallow cannot be used together"

4981 msgstr "--depth 和 --unshallow 不能同时使用"

4982

4764 -#: builtin/fetch.c:983

4983 +#: builtin/fetch.c:1017

4984 msgid "--unshallow on a complete repository does not make sense"

4985 msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"

4986

4768 -#: builtin/fetch.c:1002

4987 +#: builtin/fetch.c:1036

4988 msgid "fetch --all does not take a repository argument"

4989 msgstr "fetch --all 不能带一个版本库参数"

4990

4772 -#: builtin/fetch.c:1004

4991 +#: builtin/fetch.c:1038

4992 msgid "fetch --all does not make sense with refspecs"

4993 msgstr "fetch --all 带引用表达式没有任何意义"

4994

4776 -#: builtin/fetch.c:1015

4995 +#: builtin/fetch.c:1049

4996 #, c-format

4997 msgid "No such remote or remote group: %s"

4998 msgstr "没有这样的远程或远程组：%s"

4999

4781 -#: builtin/fetch.c:1023

5000 +#: builtin/fetch.c:1057

5001 msgid "Fetching a group and specifying refspecs does not make sense"

5002 msgstr "获取组并指定引用表达式没有意义"

5003

@@ -4787,9 +5006,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5006 msgstr ""

5007 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5008

4790 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701

4791 -#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175

4792 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239

5009 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5010 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179

5011 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243

5012 msgid "n"

5013 msgstr "n"

5014

@@ -4946,221 +5165,221 @@ msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"

5165 msgid "grep: failed to create thread: %s"

5166 msgstr "grep：无法创建线程：%s"

5167

4949 -#: builtin/grep.c:365

5168 +#: builtin/grep.c:364

5169 #, c-format

5170 msgid "Failed to chdir: %s"

5171 msgstr "无法切换目录：%s"

5172

4954 -#: builtin/grep.c:443 builtin/grep.c:478

5173 +#: builtin/grep.c:442 builtin/grep.c:477

5174 #, c-format

5175 msgid "unable to read tree (%s)"

5176 msgstr "无法读取树（%s）"

5177

4959 -#: builtin/grep.c:493

5178 +#: builtin/grep.c:492

5179 #, c-format

5180 msgid "unable to grep from object of type %s"

5181 msgstr "无法抓取来自于 %s 类型的对象"

5182

4964 -#: builtin/grep.c:551

5183 +#: builtin/grep.c:550

5184 #, c-format

5185 msgid "switch `%c' expects a numerical value"

5186 msgstr "开关 `%c' 期望一个数字值"

5187

4969 -#: builtin/grep.c:568

5188 +#: builtin/grep.c:567

5189 #, c-format

5190 msgid "cannot open '%s'"

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

5192

4974 -#: builtin/grep.c:643

5193 +#: builtin/grep.c:642

5194 msgid "search in index instead of in the work tree"

5195 msgstr "在索引区搜索而不是在工作区"

5196

4978 -#: builtin/grep.c:645

5197 +#: builtin/grep.c:644

5198 msgid "find in contents not managed by git"

5199 msgstr "在未被 git 管理的内容中查找"

5200

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

4983 -#: builtin/grep.c:647

5202 +#: builtin/grep.c:646

5203 msgid "search in both tracked and untracked files"

5204 msgstr "在跟踪和未跟踪的文件中搜索"

5205

4987 -#: builtin/grep.c:649

5206 +#: builtin/grep.c:648

5207 msgid "search also in ignored files"

5208 msgstr "也在忽略的文件中搜索"

5209

4991 -#: builtin/grep.c:652

5210 +#: builtin/grep.c:651

5211 msgid "show non-matching lines"

5212 msgstr "显示未匹配的行"

5213

4995 -#: builtin/grep.c:654

5214 +#: builtin/grep.c:653

5215 msgid "case insensitive matching"

5216 msgstr "不区分大小写匹配"

5217

4999 -#: builtin/grep.c:656

5218 +#: builtin/grep.c:655

5219 msgid "match patterns only at word boundaries"

5220 msgstr "只在单词边界匹配模式"

5221

5003 -#: builtin/grep.c:658

5222 +#: builtin/grep.c:657

5223 msgid "process binary files as text"

5224 msgstr "把二进制文件当做文本处理"

5225

5007 -#: builtin/grep.c:660

5226 +#: builtin/grep.c:659

5227 msgid "don't match patterns in binary files"

5228 msgstr "不在二进制文件中匹配模式"

5229

5011 -#: builtin/grep.c:663

5230 +#: builtin/grep.c:662

5231 msgid "descend at most <depth> levels"

5232 msgstr "最多以指定的深度向下寻找"

5233

5015 -#: builtin/grep.c:667

5234 +#: builtin/grep.c:666

5235 msgid "use extended POSIX regular expressions"

5236 msgstr "使用扩展的 POSIX 正则表达式"

5237

5019 -#: builtin/grep.c:670

5238 +#: builtin/grep.c:669

5239 msgid "use basic POSIX regular expressions (default)"

5240 msgstr "使用基本的 POSIX 正则表达式（默认）"

5241

5023 -#: builtin/grep.c:673

5242 +#: builtin/grep.c:672

5243 msgid "interpret patterns as fixed strings"

5244 msgstr "把模式解析为固定的字符串"

5245

5027 -#: builtin/grep.c:676

5246 +#: builtin/grep.c:675

5247 msgid "use Perl-compatible regular expressions"

5248 msgstr "使用 Perl 兼容的正则表达式"

5249

5031 -#: builtin/grep.c:679

5250 +#: builtin/grep.c:678

5251 msgid "show line numbers"

5252 msgstr "显示行号"

5253

5035 -#: builtin/grep.c:680

5254 +#: builtin/grep.c:679

5255 msgid "don't show filenames"

5256 msgstr "不显示文件名"

5257

5039 -#: builtin/grep.c:681

5258 +#: builtin/grep.c:680

5259 msgid "show filenames"

5260 msgstr "显示文件名"

5261

5043 -#: builtin/grep.c:683

5262 +#: builtin/grep.c:682

5263 msgid "show filenames relative to top directory"

5264 msgstr "显示相对于顶级目录的文件名"

5265

5047 -#: builtin/grep.c:685

5266 +#: builtin/grep.c:684

5267 msgid "show only filenames instead of matching lines"

5268 msgstr "只显示文件名而不显示匹配的行"

5269

5051 -#: builtin/grep.c:687

5270 +#: builtin/grep.c:686

5271 msgid "synonym for --files-with-matches"

5272 msgstr "和 --files-with-matches 同义"

5273

5055 -#: builtin/grep.c:690

5274 +#: builtin/grep.c:689

5275 msgid "show only the names of files without match"

5276 msgstr "只显示未匹配的文件名"

5277

5059 -#: builtin/grep.c:692

5278 +#: builtin/grep.c:691

5279 msgid "print NUL after filenames"

5280 msgstr "在文件名后输出 NUL 字符"

5281

5063 -#: builtin/grep.c:694

5282 +#: builtin/grep.c:693

5283 msgid "show the number of matches instead of matching lines"

5284 msgstr "显示总匹配行数，而不显示匹配的行"

5285

5067 -#: builtin/grep.c:695

5286 +#: builtin/grep.c:694

5287 msgid "highlight matches"

5288 msgstr "高亮显示匹配项"

5289

5071 -#: builtin/grep.c:697

5290 +#: builtin/grep.c:696

5291 msgid "print empty line between matches from different files"

5292 msgstr "在不同文件的匹配项之间打印空行"

5293

5075 -#: builtin/grep.c:699

5294 +#: builtin/grep.c:698

5295 msgid "show filename only once above matches from same file"

5296 msgstr "只在同一文件的匹配项的上面显示一次文件名"

5297

5079 -#: builtin/grep.c:702

5298 +#: builtin/grep.c:701

5299 msgid "show <n> context lines before and after matches"

5300 msgstr "显示匹配项前后的 <n> 行上下文"

5301

5083 -#: builtin/grep.c:705

5302 +#: builtin/grep.c:704

5303 msgid "show <n> context lines before matches"

5304 msgstr "显示匹配项前 <n> 行上下文"

5305

5087 -#: builtin/grep.c:707

5306 +#: builtin/grep.c:706

5307 msgid "show <n> context lines after matches"

5308 msgstr "显示匹配项后 <n> 行上下文"

5309

5091 -#: builtin/grep.c:708

5310 +#: builtin/grep.c:707

5311 msgid "shortcut for -C NUM"

5312 msgstr "快捷键 -C 数字"

5313

5095 -#: builtin/grep.c:711

5314 +#: builtin/grep.c:710

5315 msgid "show a line with the function name before matches"

5316 msgstr "在匹配的前面显示一行函数名"

5317

5099 -#: builtin/grep.c:713

5318 +#: builtin/grep.c:712

5319 msgid "show the surrounding function"

5320 msgstr "显示所在函数的前后内容"

5321

5103 -#: builtin/grep.c:716

5322 +#: builtin/grep.c:715

5323 msgid "read patterns from file"

5324 msgstr "从文件读取模式"

5325

5107 -#: builtin/grep.c:718

5326 +#: builtin/grep.c:717

5327 msgid "match <pattern>"

5328 msgstr "匹配 <模式>"

5329

5111 -#: builtin/grep.c:720

5330 +#: builtin/grep.c:719

5331 msgid "combine patterns specified with -e"

5332 msgstr "组合用 -e 参数设定的模式"

5333

5115 -#: builtin/grep.c:732

5334 +#: builtin/grep.c:731

5335 msgid "indicate hit with exit status without output"

5336 msgstr "不输出，而用退出码标识命中状态"

5337

5119 -#: builtin/grep.c:734

5338 +#: builtin/grep.c:733

5339 msgid "show only matches from files that match all patterns"

5340 msgstr "只显示匹配所有模式的文件中的匹配"

5341

5123 -#: builtin/grep.c:736

5342 +#: builtin/grep.c:735

5343 msgid "show parse tree for grep expression"

5344 msgstr "显示 grep 表达式的解析树"

5345

5127 -#: builtin/grep.c:740

5346 +#: builtin/grep.c:739

5347 msgid "pager"

5348 msgstr "分页"

5349

5131 -#: builtin/grep.c:740

5350 +#: builtin/grep.c:739

5351 msgid "show matching files in the pager"

5352 msgstr "分页显示匹配的文件"

5353

5135 -#: builtin/grep.c:743

5354 +#: builtin/grep.c:742

5355 msgid "allow calling of grep(1) (ignored by this build)"

5356 msgstr "允许调用 grep(1)（本次构建忽略）"

5357

5139 -#: builtin/grep.c:744 builtin/show-ref.c:184

5358 +#: builtin/grep.c:743 builtin/show-ref.c:188

5359 msgid "show usage"

5360 msgstr "显示用法"

5361

5143 -#: builtin/grep.c:811

5362 +#: builtin/grep.c:810

5363 msgid "no pattern given."

5364 msgstr "未提供模式匹配。"

5365

5147 -#: builtin/grep.c:866

5366 +#: builtin/grep.c:865

5367 msgid "--open-files-in-pager only works on the worktree"

5368 msgstr "--open-files-in-pager 仅用于工作区"

5369

5151 -#: builtin/grep.c:889

5370 +#: builtin/grep.c:888

5371 msgid "--cached or --untracked cannot be used with --no-index."

5372 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

5373

5155 -#: builtin/grep.c:894

5374 +#: builtin/grep.c:893

5375 msgid "--no-index or --untracked cannot be used with revs."

5376 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

5377

5159 -#: builtin/grep.c:897

5378 +#: builtin/grep.c:896

5379 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5380 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

5381

5163 -#: builtin/grep.c:905

5382 +#: builtin/grep.c:904

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

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

5385

@@ -5200,54 +5419,54 @@ msgstr "原样存储文件不使用过滤器"

5419 msgid "process file as it were from this path"

5420 msgstr "处理文件并假设其来自于此路径"

5421

5203 -#: builtin/help.c:43

5422 +#: builtin/help.c:41

5423 msgid "print all available commands"

5424 msgstr "打印所有可用的命令"

5425

5207 -#: builtin/help.c:44

5426 +#: builtin/help.c:42

5427 msgid "print list of useful guides"

5428 msgstr "显示有用的指南列表"

5429

5211 -#: builtin/help.c:45

5430 +#: builtin/help.c:43

5431 msgid "show man page"

5432 msgstr "显示 man 手册"

5433

5215 -#: builtin/help.c:46

5434 +#: builtin/help.c:44

5435 msgid "show manual in web browser"

5436 msgstr "在 web 浏览器中显示手册"

5437

5219 -#: builtin/help.c:48

5438 +#: builtin/help.c:46

5439 msgid "show info page"

5440 msgstr "显示 info 手册"

5441

5223 -#: builtin/help.c:54

5442 +#: builtin/help.c:52

5443 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

5444 msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"

5445

5227 -#: builtin/help.c:66

5446 +#: builtin/help.c:64

5447 #, c-format

5448 msgid "unrecognized help format '%s'"

5449 msgstr "未能识别的帮助格式 '%s'"

5450

5232 -#: builtin/help.c:94

5451 +#: builtin/help.c:92

5452 msgid "Failed to start emacsclient."

5453 msgstr "无法启动 emacsclient。"

5454

5236 -#: builtin/help.c:107

5455 +#: builtin/help.c:105

5456 msgid "Failed to parse emacsclient version."

5457 msgstr "无法解析 emacsclient 版本。"

5458

5240 -#: builtin/help.c:115

5459 +#: builtin/help.c:113

5460 #, c-format

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

5462 msgstr "emacsclient 版本 '%d' 太老（< 22）。"

5463

5245 -#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178

5464 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

5465 #, c-format

5466 msgid "failed to exec '%s': %s"

5467 msgstr "无法执行 '%s'：%s"

5468

5250 -#: builtin/help.c:218

5469 +#: builtin/help.c:216

5470 #, c-format

5471 msgid ""

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

@@ -5256,7 +5475,7 @@ msgstr ""

5475 "'%s'：不支持的 man 手册查看器的路径。\n"

5476 "请使用 'man.<tool>.cmd'。"

5477

5259 -#: builtin/help.c:230

5478 +#: builtin/help.c:228

5479 #, c-format

5480 msgid ""

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

@@ -5265,335 +5484,335 @@ msgstr ""

5484 "'%s': 支持的 man 手册查看器命令。\n"

5485 "请使用 'man.<tool>.path'。"

5486

5268 -#: builtin/help.c:351

5487 +#: builtin/help.c:349

5488 #, c-format

5489 msgid "'%s': unknown man viewer."

5490 msgstr "'%s'：未知的 man 查看器。"

5491

5273 -#: builtin/help.c:368

5492 +#: builtin/help.c:366

5493 msgid "no man viewer handled the request"

5494 msgstr "没有 man 查看器处理此请求"

5495

5277 -#: builtin/help.c:376

5496 +#: builtin/help.c:374

5497 msgid "no info viewer handled the request"

5498 msgstr "没有 info 查看器处理此请求"

5499

5281 -#: builtin/help.c:422

5500 +#: builtin/help.c:420

5501 msgid "Defining attributes per path"

5502 msgstr "定义路径的属性"

5503

5285 -#: builtin/help.c:423

5504 +#: builtin/help.c:421

5505 msgid "A Git glossary"

5506 msgstr "Git 词汇表"

5507

5289 -#: builtin/help.c:424

5508 +#: builtin/help.c:422

5509 msgid "Specifies intentionally untracked files to ignore"

5510 msgstr "忽略指定的未跟踪文件"

5511

5293 -#: builtin/help.c:425

5512 +#: builtin/help.c:423

5513 msgid "Defining submodule properties"

5514 msgstr "定义子模组属性"

5515

5297 -#: builtin/help.c:426

5516 +#: builtin/help.c:424

5517 msgid "Specifying revisions and ranges for Git"

5518 msgstr "指定 Git 的版本和版本范围"

5519

5301 -#: builtin/help.c:427

5520 +#: builtin/help.c:425

5521 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5522 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"

5523

5305 -#: builtin/help.c:428

5524 +#: builtin/help.c:426

5525 msgid "An overview of recommended workflows with Git"

5526 msgstr "Git 推荐的工作流概览"

5527

5309 -#: builtin/help.c:440

5528 +#: builtin/help.c:438

5529 msgid "The common Git guides are:\n"

5530 msgstr "最常用的 Git 向导有：\n"

5531

5313 -#: builtin/help.c:462 builtin/help.c:478

5532 +#: builtin/help.c:460 builtin/help.c:476

5533 #, c-format

5534 msgid "usage: %s%s"

5535 msgstr "用法：%s%s"

5536

5318 -#: builtin/help.c:494

5537 +#: builtin/help.c:492

5538 #, c-format

5539 msgid "`git %s' is aliased to `%s'"

5540 msgstr "`git %s' 是 `%s' 的别名"

5541

5323 -#: builtin/index-pack.c:182

5542 +#: builtin/index-pack.c:184

5543 #, c-format

5544 msgid "object type mismatch at %s"

5545 msgstr "%s 的对象类型不匹配"

5546

5328 -#: builtin/index-pack.c:202

5547 +#: builtin/index-pack.c:204

5548 msgid "object of unexpected type"

5549 msgstr "意外的类型的对象"

5550

5332 -#: builtin/index-pack.c:239

5551 +#: builtin/index-pack.c:244

5552 #, c-format

5553 msgid "cannot fill %d byte"

5554 msgid_plural "cannot fill %d bytes"

5555 msgstr[0] "无法填充 %d 字节"

5556 msgstr[1] "无法填充 %d 字节"

5557

5339 -#: builtin/index-pack.c:249

5558 +#: builtin/index-pack.c:254

5559 msgid "early EOF"

5560 msgstr "过早的文件结束符（EOF）"

5561

5343 -#: builtin/index-pack.c:250

5562 +#: builtin/index-pack.c:255

5563 msgid "read error on input"

5564 msgstr "输入上的读错误"

5565

5347 -#: builtin/index-pack.c:262

5566 +#: builtin/index-pack.c:267

5567 msgid "used more bytes than were available"

5568 msgstr "用掉了超过可用的字节"

5569

5351 -#: builtin/index-pack.c:269

5570 +#: builtin/index-pack.c:274

5571 msgid "pack too large for current definition of off_t"

5572 msgstr "包太大超过了当前 off_t 的定义"

5573

5355 -#: builtin/index-pack.c:285

5574 +#: builtin/index-pack.c:290

5575 #, c-format

5576 msgid "unable to create '%s'"

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

5578

5360 -#: builtin/index-pack.c:290

5579 +#: builtin/index-pack.c:295

5580 #, c-format

5581 msgid "cannot open packfile '%s'"

5582 msgstr "无法打开包文件 '%s'"

5583

5365 -#: builtin/index-pack.c:304

5584 +#: builtin/index-pack.c:309

5585 msgid "pack signature mismatch"

5586 msgstr "包签名不匹配"

5587

5369 -#: builtin/index-pack.c:306

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

5589 #, c-format

5590 msgid "pack version %<PRIu32> unsupported"

5591 msgstr "不支持包版本 %<PRIu32>"

5592

5374 -#: builtin/index-pack.c:324

5593 +#: builtin/index-pack.c:329

5594 #, c-format

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

5596 msgstr "包中有错误的对象位于 %lu：%s"

5597

5379 -#: builtin/index-pack.c:446

5598 +#: builtin/index-pack.c:451

5599 #, c-format

5600 msgid "inflate returned %d"

5601 msgstr "解压缩返回 %d"

5602

5384 -#: builtin/index-pack.c:495

5603 +#: builtin/index-pack.c:500

5604 msgid "offset value overflow for delta base object"

5605 msgstr "偏移值覆盖了 delta 基准对象"

5606

5388 -#: builtin/index-pack.c:503

5607 +#: builtin/index-pack.c:508

5608 msgid "delta base offset is out of bound"

5609 msgstr "delta 基准偏移越界"

5610

5392 -#: builtin/index-pack.c:511

5611 +#: builtin/index-pack.c:516

5612 #, c-format

5613 msgid "unknown object type %d"

5614 msgstr "未知对象类型 %d"

5615

5397 -#: builtin/index-pack.c:542

5616 +#: builtin/index-pack.c:547

5617 msgid "cannot pread pack file"

5618 msgstr "无法读取包文件"

5619

5401 -#: builtin/index-pack.c:544

5620 +#: builtin/index-pack.c:549

5621 #, c-format

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

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

5624 msgstr[0] "包文件过早结束，缺少 %lu 字节"

5625 msgstr[1] "包文件过早结束，缺少 %lu 字节"

5626

5408 -#: builtin/index-pack.c:570

5627 +#: builtin/index-pack.c:575

5628 msgid "serious inflate inconsistency"

5629 msgstr "解压缩严重的不一致"

5630

5412 -#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690

5413 -#: builtin/index-pack.c:724 builtin/index-pack.c:733

5631 +#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695

5632 +#: builtin/index-pack.c:729 builtin/index-pack.c:738

5633 #, c-format

5634 msgid "SHA1 COLLISION FOUND WITH %s !"

5635 msgstr "发现 %s 出现 SHA1 冲突！"

5636

5418 -#: builtin/index-pack.c:664 builtin/pack-objects.c:170

5637 +#: builtin/index-pack.c:669 builtin/pack-objects.c:170

5638 #: builtin/pack-objects.c:262

5639 #, c-format

5640 msgid "unable to read %s"

5641 msgstr "不能读 %s"

5642

5424 -#: builtin/index-pack.c:730

5643 +#: builtin/index-pack.c:735

5644 #, c-format

5645 msgid "cannot read existing object %s"

5646 msgstr "不能读取现存对象 %s"

5647

5429 -#: builtin/index-pack.c:744

5648 +#: builtin/index-pack.c:749

5649 #, c-format

5650 msgid "invalid blob object %s"

5651 msgstr "无效的数据（blob）对象 %s"

5652

5434 -#: builtin/index-pack.c:759

5653 +#: builtin/index-pack.c:763

5654 #, c-format

5655 msgid "invalid %s"

5656 msgstr "无效的 %s"

5657

5439 -#: builtin/index-pack.c:761

5658 +#: builtin/index-pack.c:766

5659 msgid "Error in object"

5660 msgstr "对象中出错"

5661

5443 -#: builtin/index-pack.c:763

5662 +#: builtin/index-pack.c:768

5663 #, c-format

5664 msgid "Not all child objects of %s are reachable"

5665 msgstr "%s 的所有子对象并非都可达"

5666

5448 -#: builtin/index-pack.c:833 builtin/index-pack.c:863

5667 +#: builtin/index-pack.c:838 builtin/index-pack.c:868

5668 msgid "failed to apply delta"

5669 msgstr "无法应用 delta"

5670

5452 -#: builtin/index-pack.c:1004

5671 +#: builtin/index-pack.c:1009

5672 msgid "Receiving objects"

5673 msgstr "接收对象中"

5674

5456 -#: builtin/index-pack.c:1004

5675 +#: builtin/index-pack.c:1009

5676 msgid "Indexing objects"

5677 msgstr "索引对象中"

5678

5460 -#: builtin/index-pack.c:1030

5679 +#: builtin/index-pack.c:1035

5680 msgid "pack is corrupted (SHA1 mismatch)"

5681 msgstr "包冲突（SHA1 不匹配）"

5682

5464 -#: builtin/index-pack.c:1035

5683 +#: builtin/index-pack.c:1040

5684 msgid "cannot fstat packfile"

5685 msgstr "不能枚举包文件状态"

5686

5468 -#: builtin/index-pack.c:1038

5687 +#: builtin/index-pack.c:1043

5688 msgid "pack has junk at the end"

5689 msgstr "包的结尾有垃圾数据"

5690

5472 -#: builtin/index-pack.c:1049

5691 +#: builtin/index-pack.c:1054

5692 msgid "confusion beyond insanity in parse_pack_objects()"

5693 msgstr "parse_pack_objects() 中遇到不可理喻的问题"

5694

5476 -#: builtin/index-pack.c:1072

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

5696 msgid "Resolving deltas"

5697 msgstr "处理 delta 中"

5698

5480 -#: builtin/index-pack.c:1082

5699 +#: builtin/index-pack.c:1087

5700 #, c-format

5701 msgid "unable to create thread: %s"

5702 msgstr "不能创建线程：%s"

5703

5485 -#: builtin/index-pack.c:1124

5704 +#: builtin/index-pack.c:1129

5705 msgid "confusion beyond insanity"

5706 msgstr "不可理喻"

5707

5489 -#: builtin/index-pack.c:1132

5708 +#: builtin/index-pack.c:1137

5709 #, c-format

5710 msgid "completed with %d local objects"

5711 msgstr "完成 %d 个本地对象"

5712

5494 -#: builtin/index-pack.c:1142

5713 +#: builtin/index-pack.c:1147

5714 #, c-format

5715 msgid "Unexpected tail checksum for %s (disk corruption?)"

5716 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"

5717

5499 -#: builtin/index-pack.c:1146

5718 +#: builtin/index-pack.c:1151

5719 #, c-format

5720 msgid "pack has %d unresolved delta"

5721 msgid_plural "pack has %d unresolved deltas"

5722 msgstr[0] "包有 %d 个未解决的 delta"

5723 msgstr[1] "包有 %d 个未解决的 delta"

5724

5506 -#: builtin/index-pack.c:1171

5725 +#: builtin/index-pack.c:1176

5726 #, c-format

5727 msgid "unable to deflate appended object (%d)"

5728 msgstr "不能压缩附加对象（%d）"

5729

5511 -#: builtin/index-pack.c:1250

5730 +#: builtin/index-pack.c:1255

5731 #, c-format

5732 msgid "local object %s is corrupt"

5733 msgstr "本地对象 %s 已损坏"

5734

5516 -#: builtin/index-pack.c:1274

5735 +#: builtin/index-pack.c:1279

5736 msgid "error while closing pack file"

5737 msgstr "关闭包文件时出错"

5738

5520 -#: builtin/index-pack.c:1287

5739 +#: builtin/index-pack.c:1292

5740 #, c-format

5741 msgid "cannot write keep file '%s'"

5742 msgstr "无法写保留文件 '%s'"

5743

5525 -#: builtin/index-pack.c:1295

5744 +#: builtin/index-pack.c:1300

5745 #, c-format

5746 msgid "cannot close written keep file '%s'"

5747 msgstr "无法关闭保留文件 '%s'"

5748

5530 -#: builtin/index-pack.c:1308

5749 +#: builtin/index-pack.c:1313

5750 msgid "cannot store pack file"

5751 msgstr "无法存储包文件"

5752

5534 -#: builtin/index-pack.c:1319

5753 +#: builtin/index-pack.c:1324

5754 msgid "cannot store index file"

5755 msgstr "无法存储索引文件"

5756

5538 -#: builtin/index-pack.c:1352

5757 +#: builtin/index-pack.c:1357

5758 #, c-format

5759 msgid "bad pack.indexversion=%<PRIu32>"

5760 msgstr "坏的 pack.indexversion=%<PRIu32>"

5761

5543 -#: builtin/index-pack.c:1358

5762 +#: builtin/index-pack.c:1363

5763 #, c-format

5764 msgid "invalid number of threads specified (%d)"

5765 msgstr "指定的线程数无效（%d）"

5766

5548 -#: builtin/index-pack.c:1362 builtin/index-pack.c:1535

5767 +#: builtin/index-pack.c:1367 builtin/index-pack.c:1545

5768 #, c-format

5769 msgid "no threads support, ignoring %s"

5770 msgstr "没有线程支持，忽略 %s"

5771

5553 -#: builtin/index-pack.c:1420

5772 +#: builtin/index-pack.c:1425

5773 #, c-format

5774 msgid "Cannot open existing pack file '%s'"

5775 msgstr "无法打开现存包文件 '%s'"

5776

5558 -#: builtin/index-pack.c:1422

5777 +#: builtin/index-pack.c:1427

5778 #, c-format

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

5780 msgstr "无法为 %s 打开包索引文件"

5781

5563 -#: builtin/index-pack.c:1469

5782 +#: builtin/index-pack.c:1474

5783 #, c-format

5784 msgid "non delta: %d object"

5785 msgid_plural "non delta: %d objects"

5786 msgstr[0] "非 delta：%d 个对象"

5787 msgstr[1] "非 delta：%d 个对象"

5788

5570 -#: builtin/index-pack.c:1476

5789 +#: builtin/index-pack.c:1481

5790 #, c-format

5791 msgid "chain length = %d: %lu object"

5792 msgid_plural "chain length = %d: %lu objects"

5793 msgstr[0] "链长 = %d: %lu 对象"

5794 msgstr[1] "链长 = %d: %lu 对象"

5795

5577 -#: builtin/index-pack.c:1503

5796 +#: builtin/index-pack.c:1509

5797 msgid "Cannot come back to cwd"

5798 msgstr "无法返回当前工作目录"

5799

5581 -#: builtin/index-pack.c:1547 builtin/index-pack.c:1550

5582 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1566

5800 +#: builtin/index-pack.c:1557 builtin/index-pack.c:1560

5801 +#: builtin/index-pack.c:1572 builtin/index-pack.c:1576

5802 #, c-format

5803 msgid "bad %s"

5804 msgstr "错误选项 %s"

5805

5587 -#: builtin/index-pack.c:1580

5806 +#: builtin/index-pack.c:1590

5807 msgid "--fix-thin cannot be used without --stdin"

5808 msgstr "--fix-thin 不能和 --stdin 同时使用"

5809

5591 -#: builtin/index-pack.c:1584 builtin/index-pack.c:1594

5810 +#: builtin/index-pack.c:1594 builtin/index-pack.c:1604

5811 #, c-format

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

5813 msgstr "包名 '%s' 没有以 '.pack' 结尾"

5814

5596 -#: builtin/index-pack.c:1603

5815 +#: builtin/index-pack.c:1613

5816 msgid "--verify with no packfile name given"

5817 msgstr "--verify 没有提供包名参数"

5818

@@ -5730,7 +5949,7 @@ msgstr "权限"

5949 msgid "specify that the git repository is to be shared amongst several users"

5950 msgstr "指定 git 版本库是多个用户之间共享的"

5951

5733 -#: builtin/init-db.c:493 builtin/prune-packed.c:77

5952 +#: builtin/init-db.c:493 builtin/prune-packed.c:75

5953 msgid "be quiet"

5954 msgstr "保持安静"

5955

@@ -5762,340 +5981,353 @@ msgstr "不能访问当前工作目录"

5981 msgid "Cannot access work tree '%s'"

5982 msgstr "不能访问工作区 '%s'"

5983

5765 -#: builtin/log.c:40

5984 +#: builtin/log.c:41

5985 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"

5986 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"

5987

5769 -#: builtin/log.c:41

l10n: zh_CN.po: translate 99 messages (2133t0f0u)