04cb2f28cc · 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: 2014-11-20 09:42+0800\n"

16 -"PO-Revision-Date: 2014-11-20 16:10+0800\n"

15 +"POT-Creation-Date: 2015-01-13 14:05+0800\n"

16 +"PO-Revision-Date: 2015-01-13 14:21+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"

@@ -53,76 +53,76 @@ msgstr ""

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

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

55

56 -#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

56 +#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

57 #, c-format

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

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

60

61 -#: archive.c:419

61 +#: archive.c:427

62 msgid "fmt"

63 msgstr "格式"

64

65 -#: archive.c:419

65 +#: archive.c:427

66 msgid "archive format"

67 msgstr "归档格式"

68

69 -#: archive.c:420 builtin/log.c:1204

69 +#: archive.c:428 builtin/log.c:1204

70 msgid "prefix"

71 msgstr "前缀"

72

73 -#: archive.c:421

73 +#: archive.c:429

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

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

76

77 -#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517

77 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517

78 #: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986

79 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

80 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411

81 -#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151

80 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394

81 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151

82 msgid "file"

83 msgstr "文件"

84

85 -#: archive.c:423 builtin/archive.c:89

85 +#: archive.c:431 builtin/archive.c:89

86 msgid "write the archive to this file"

87 msgstr "归档写入此文件"

88

89 -#: archive.c:425

89 +#: archive.c:433

90 msgid "read .gitattributes in working directory"

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

92

93 -#: archive.c:426

93 +#: archive.c:434

94 msgid "report archived files on stderr"

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

96

97 -#: archive.c:427

97 +#: archive.c:435

98 msgid "store only"

99 msgstr "只存储"

100

101 -#: archive.c:428

101 +#: archive.c:436

102 msgid "compress faster"

103 msgstr "压缩速度更快"

104

105 -#: archive.c:436

105 +#: archive.c:444

106 msgid "compress better"

107 msgstr "压缩效果更好"

108

109 -#: archive.c:439

109 +#: archive.c:447

110 msgid "list supported archive formats"

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

112

113 -#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85

113 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86

114 msgid "repo"

115 msgstr "版本库"

116

117 -#: archive.c:442 builtin/archive.c:91

117 +#: archive.c:450 builtin/archive.c:91

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

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

120

121 -#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490

121 +#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478

122 msgid "command"

123 msgstr "命令"

124

125 -#: archive.c:444 builtin/archive.c:93

125 +#: archive.c:452 builtin/archive.c:93

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

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

128

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

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

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

253

254 -#: bundle.c:87 builtin/commit.c:788

254 +#: bundle.c:87 builtin/commit.c:770

255 #, c-format

256 msgid "could not open '%s'"

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

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

260 msgid "Repository lacks these prerequisite commits:"

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

262

263 -#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706

264 -#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330

265 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357

263 +#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706

264 +#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330

265 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

266 #: builtin/shortlog.c:158

267 msgid "revision walk setup failed"

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

@@ -320,7 +320,7 @@ msgstr "不能创建 '%s'"

320 msgid "index-pack died"

321 msgstr "index-pack 终止"

322

323 -#: color.c:157

323 +#: color.c:259

324 #, c-format

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

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

@@ -369,25 +369,25 @@ msgstr "错误的 zlib 压缩级别 %d"

369 msgid "invalid mode for object creation: %s"

370 msgstr "无效的对象创建模式：%s"

371

372 -#: config.c:1201

372 +#: config.c:1211

373 msgid "unable to parse command-line config"

374 msgstr "无法解析命令行中的配置"

375

376 -#: config.c:1262

376 +#: config.c:1272

377 msgid "unknown error occured while reading the configuration files"

378 msgstr "在读取配置文件时遇到未知错误"

379

380 -#: config.c:1586

380 +#: config.c:1596

381 #, c-format

382 msgid "unable to parse '%s' from command-line config"

383 msgstr "无法解析命令行配置中的 '%s'"

384

385 -#: config.c:1588

385 +#: config.c:1598

386 #, c-format

387 msgid "bad config variable '%s' in file '%s' at line %d"

388 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

389

390 -#: config.c:1647

390 +#: config.c:1657

391 #, c-format

392 msgid "%s has multiple values"

393 msgstr "%s 有多个取值"

@@ -633,11 +633,11 @@ msgstr[1] ""

633 msgid "%s: %s - %s"

634 msgstr "%s：%s - %s"

635

636 -#: lockfile.c:275

636 +#: lockfile.c:283

637 msgid "BUG: reopen a lockfile that is still open"

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

639

640 -#: lockfile.c:277

640 +#: lockfile.c:285

641 msgid "BUG: reopen a lockfile that has been committed"

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

643

@@ -645,8 +645,8 @@ msgstr "BUG: 重新打开一个已提交的锁文件"

645 msgid "failed to read the cache"

646 msgstr "无法读取缓存"

647

648 -#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562

649 -#: builtin/clone.c:659

648 +#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580

649 +#: builtin/clone.c:662

650 msgid "unable to write new index file"

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

652

@@ -664,64 +664,64 @@ msgstr "为路径 '%s' addinfo_cache 失败"

664 msgid "error building trees"

665 msgstr "无法创建树"

666

667 -#: merge-recursive.c:691

667 +#: merge-recursive.c:688

668 #, c-format

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

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

671

672 -#: merge-recursive.c:702

672 +#: merge-recursive.c:699

673 #, c-format

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

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

676

677 -#: merge-recursive.c:716 merge-recursive.c:737

677 +#: merge-recursive.c:713 merge-recursive.c:734

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

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

680

681 -#: merge-recursive.c:727

681 +#: merge-recursive.c:724

682 #, c-format

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

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

685

686 -#: merge-recursive.c:767

686 +#: merge-recursive.c:764

687 #, c-format

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

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

690

691 -#: merge-recursive.c:769

691 +#: merge-recursive.c:766

692 #, c-format

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

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

695

696 -#: merge-recursive.c:792 builtin/clone.c:318

696 +#: merge-recursive.c:789 builtin/clone.c:321

697 #, c-format

698 msgid "failed to open '%s'"

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

700

701 -#: merge-recursive.c:800

701 +#: merge-recursive.c:797

702 #, c-format

703 msgid "failed to symlink '%s'"

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

705

706 -#: merge-recursive.c:803

706 +#: merge-recursive.c:800

707 #, c-format

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

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

710

711 -#: merge-recursive.c:941

711 +#: merge-recursive.c:938

712 msgid "Failed to execute internal merge"

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

714

715 -#: merge-recursive.c:945

715 +#: merge-recursive.c:942

716 #, c-format

717 msgid "Unable to add %s to database"

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

719

720 -#: merge-recursive.c:961

720 +#: merge-recursive.c:958

721 msgid "unsupported object type in the tree"

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

723

724 -#: merge-recursive.c:1036 merge-recursive.c:1050

724 +#: merge-recursive.c:1033 merge-recursive.c:1047

725 #, c-format

726 msgid ""

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

@@ -730,7 +730,7 @@ msgstr ""

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

731 "的版本被保留。"

732

733 -#: merge-recursive.c:1042 merge-recursive.c:1055

733 +#: merge-recursive.c:1039 merge-recursive.c:1052

734 #, c-format

735 msgid ""

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

@@ -739,20 +739,20 @@ msgstr ""

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

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

741

742 -#: merge-recursive.c:1096

742 +#: merge-recursive.c:1093

743 msgid "rename"

744 msgstr "重命名"

745

746 -#: merge-recursive.c:1096

746 +#: merge-recursive.c:1093

747 msgid "renamed"

748 msgstr "重命名"

749

750 -#: merge-recursive.c:1152

750 +#: merge-recursive.c:1149

751 #, c-format

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

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

754

755 -#: merge-recursive.c:1174

755 +#: merge-recursive.c:1171

756 #, c-format

757 msgid ""

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

@@ -761,144 +761,144 @@ msgstr ""

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

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

763

764 -#: merge-recursive.c:1179

764 +#: merge-recursive.c:1176

765 msgid " (left unresolved)"

766 msgstr "（留下未解决）"

767

768 -#: merge-recursive.c:1233

768 +#: merge-recursive.c:1230

769 #, c-format

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

771 msgstr ""

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

773 "%5$s"

774

775 -#: merge-recursive.c:1263

775 +#: merge-recursive.c:1260

776 #, c-format

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

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

779

780 -#: merge-recursive.c:1462

780 +#: merge-recursive.c:1459

781 #, c-format

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

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

784

785 -#: merge-recursive.c:1472

785 +#: merge-recursive.c:1469

786 #, c-format

787 msgid "Adding merged %s"

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

789

790 -#: merge-recursive.c:1477 merge-recursive.c:1675

790 +#: merge-recursive.c:1474 merge-recursive.c:1672

791 #, c-format

792 msgid "Adding as %s instead"

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

794

795 -#: merge-recursive.c:1528

795 +#: merge-recursive.c:1525

796 #, c-format

797 msgid "cannot read object %s"

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

799

800 -#: merge-recursive.c:1531

800 +#: merge-recursive.c:1528

801 #, c-format

802 msgid "object %s is not a blob"

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

804

805 -#: merge-recursive.c:1579

805 +#: merge-recursive.c:1576

806 msgid "modify"

807 msgstr "修改"

808

809 -#: merge-recursive.c:1579

809 +#: merge-recursive.c:1576

810 msgid "modified"

811 msgstr "修改"

812

813 -#: merge-recursive.c:1589

813 +#: merge-recursive.c:1586

814 msgid "content"

815 msgstr "内容"

816

817 -#: merge-recursive.c:1596

817 +#: merge-recursive.c:1593

818 msgid "add/add"

819 msgstr "添加/添加"

820

821 -#: merge-recursive.c:1630

821 +#: merge-recursive.c:1627

822 #, c-format

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

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

825

826 -#: merge-recursive.c:1644

826 +#: merge-recursive.c:1641

827 #, c-format

828 msgid "Auto-merging %s"

829 msgstr "自动合并 %s"

830

831 -#: merge-recursive.c:1648 git-submodule.sh:1150

831 +#: merge-recursive.c:1645 git-submodule.sh:1150

832 msgid "submodule"

833 msgstr "子模组"

834

835 -#: merge-recursive.c:1649

835 +#: merge-recursive.c:1646

836 #, c-format

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

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

839

840 -#: merge-recursive.c:1735

840 +#: merge-recursive.c:1732

841 #, c-format

842 msgid "Removing %s"

843 msgstr "删除 %s"

844

845 -#: merge-recursive.c:1760

845 +#: merge-recursive.c:1757

846 msgid "file/directory"

847 msgstr "文件/目录"

848

849 -#: merge-recursive.c:1766

849 +#: merge-recursive.c:1763

850 msgid "directory/file"

851 msgstr "目录/文件"

852

853 -#: merge-recursive.c:1771

853 +#: merge-recursive.c:1768

854 #, c-format

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

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

857

858 -#: merge-recursive.c:1781

858 +#: merge-recursive.c:1778

859 #, c-format

860 msgid "Adding %s"

861 msgstr "添加 %s"

862

863 -#: merge-recursive.c:1798

863 +#: merge-recursive.c:1795

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

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

866

867 -#: merge-recursive.c:1817

867 +#: merge-recursive.c:1814

868 msgid "Already up-to-date!"

869 msgstr "已经是最新的！"

870

871 -#: merge-recursive.c:1826

871 +#: merge-recursive.c:1823

872 #, c-format

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

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

875

876 -#: merge-recursive.c:1856

876 +#: merge-recursive.c:1853

877 #, c-format

878 msgid "Unprocessed path??? %s"

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

880

881 -#: merge-recursive.c:1901

881 +#: merge-recursive.c:1898

882 msgid "Merging:"

883 msgstr "合并："

884

885 -#: merge-recursive.c:1914

885 +#: merge-recursive.c:1911

886 #, c-format

887 msgid "found %u common ancestor:"

888 msgid_plural "found %u common ancestors:"

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

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

891

892 -#: merge-recursive.c:1951

892 +#: merge-recursive.c:1948

893 msgid "merge returned no commit"

894 msgstr "合并未返回提交"

895

896 -#: merge-recursive.c:2008

896 +#: merge-recursive.c:2005

897 #, c-format

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

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

900

901 -#: merge-recursive.c:2019 builtin/merge.c:666

901 +#: merge-recursive.c:2016 builtin/merge.c:667

902 msgid "Unable to write index."

903 msgstr "不能写入索引。"

904

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

906 msgid "Cannot commit uninitialized/unreferenced notes tree"

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

908

909 -#: notes-utils.c:83

909 +#: notes-utils.c:82

910 #, c-format

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

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

913

914 -#: notes-utils.c:93

914 +#: notes-utils.c:92

915 #, c-format

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

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

918

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

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

921 -#: notes-utils.c:120

921 +#: notes-utils.c:119

922 #, c-format

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

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

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

1024 msgid "done"

1025 msgstr "完成"

1026

1027 -#: read-cache.c:1261

1027 +#: read-cache.c:1267

1028 #, c-format

1029 msgid ""

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

@@ -1033,7 +1033,7 @@ msgstr ""

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

1034 "使用版本 %i"

1035

1036 -#: read-cache.c:1271

1036 +#: read-cache.c:1277

1037 #, c-format

1038 msgid ""

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

@@ -1061,32 +1061,32 @@ msgstr "%s 同时跟踪 %s 和 %s"

1061 msgid "Internal error"

1062 msgstr "内部错误"

1063

1064 -#: remote.c:1968

1064 +#: remote.c:1980

1065 #, c-format

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

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

1068

1069 -#: remote.c:1972

1069 +#: remote.c:1984

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

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

1072

1073 -#: remote.c:1975

1073 +#: remote.c:1987

1074 #, c-format

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

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

1077

1078 -#: remote.c:1979

1078 +#: remote.c:1991

1079 #, c-format

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

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

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

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

1084

1085 -#: remote.c:1985

1085 +#: remote.c:1997

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

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

1088

1089 -#: remote.c:1988

1089 +#: remote.c:2000

1090 #, c-format

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

1092 msgid_plural ""

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

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

1096

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

1098 -#: remote.c:1996

1098 +#: remote.c:2008

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

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

1101

1102 -#: remote.c:1999

1102 +#: remote.c:2011

1103 #, c-format

1104 msgid ""

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

@@ -1115,7 +1115,7 @@ msgstr[1] ""

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

1116

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

1118 -#: remote.c:2009

1118 +#: remote.c:2021

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

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

1121

@@ -1128,22 +1128,22 @@ msgstr "不能打开 /dev/null"

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

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

1130

1131 -#: send-pack.c:265

1131 +#: send-pack.c:268

1132 msgid "failed to sign the push certificate"

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

1134

1135 -#: send-pack.c:322

1135 +#: send-pack.c:325

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

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

1138

1139 -#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892

1140 -#: builtin/merge.c:1002 builtin/merge.c:1012

1139 +#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1140 +#: builtin/merge.c:1005

1141 #, c-format

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

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

1144

1145 -#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784

1146 -#: builtin/merge.c:1004 builtin/merge.c:1017

1145 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1146 +#: builtin/merge.c:1010

1147 #, c-format

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

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

@@ -1165,7 +1165,7 @@ msgstr ""

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

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

1167

1168 -#: sequencer.c:211 sequencer.c:852 sequencer.c:935

1168 +#: sequencer.c:211 sequencer.c:856 sequencer.c:939

1169 #, c-format

1170 msgid "Could not write to %s"

1171 msgstr "不能写入 %s"

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

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

1189

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

1191 -#: sequencer.c:304

1191 +#: sequencer.c:321

1192 #, c-format

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

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

1195

1196 -#: sequencer.c:335

1196 +#: sequencer.c:339

1197 msgid "Could not resolve HEAD commit\n"

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

1199

1200 -#: sequencer.c:355

1200 +#: sequencer.c:359

1201 msgid "Unable to update cache tree\n"

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

1203

1204 -#: sequencer.c:402

1204 +#: sequencer.c:406

1205 #, c-format

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

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

1208

1209 -#: sequencer.c:407

1209 +#: sequencer.c:411

1210 #, c-format

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

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

1213

1214 -#: sequencer.c:473

1214 +#: sequencer.c:477

1215 msgid "Your index file is unmerged."

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

1217

1218 -#: sequencer.c:492

1218 +#: sequencer.c:496

1219 #, c-format

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

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

1222

1223 -#: sequencer.c:500

1223 +#: sequencer.c:504

1224 #, c-format

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

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

1227

1228 -#: sequencer.c:504

1228 +#: sequencer.c:508

1229 #, c-format

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

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

1232

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

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

1235 -#: sequencer.c:517

1235 +#: sequencer.c:521

1236 #, c-format

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

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

1239

1240 -#: sequencer.c:521

1240 +#: sequencer.c:525

1241 #, c-format

1242 msgid "Cannot get commit message for %s"

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

1244

1245 -#: sequencer.c:607

1245 +#: sequencer.c:611

1246 #, c-format

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

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

1249

1250 -#: sequencer.c:608

1250 +#: sequencer.c:612

1251 #, c-format

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

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

1254

1255 -#: sequencer.c:644

1255 +#: sequencer.c:648

1256 msgid "empty commit set passed"

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

1258

1259 -#: sequencer.c:652

1259 +#: sequencer.c:656

1260 #, c-format

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

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

1263

1264 -#: sequencer.c:656

1264 +#: sequencer.c:660

1265 #, c-format

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

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

1268

1269 -#: sequencer.c:716

1269 +#: sequencer.c:720

1270 #, c-format

1271 msgid "Cannot %s during a %s"

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

1273

1274 -#: sequencer.c:738

1274 +#: sequencer.c:742

1275 #, c-format

1276 msgid "Could not parse line %d."

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

1278

1279 -#: sequencer.c:743

1279 +#: sequencer.c:747

1280 msgid "No commits parsed."

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

1282

1283 -#: sequencer.c:756

1283 +#: sequencer.c:760

1284 #, c-format

1285 msgid "Could not open %s"

1286 msgstr "不能打开 %s"

1287

1288 -#: sequencer.c:760

1288 +#: sequencer.c:764

1289 #, c-format

1290 msgid "Could not read %s."

1291 msgstr "不能读取 %s。"

1292

1293 -#: sequencer.c:767

1293 +#: sequencer.c:771

1294 #, c-format

1295 msgid "Unusable instruction sheet: %s"

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

1297

1298 -#: sequencer.c:797

1298 +#: sequencer.c:801

1299 #, c-format

1300 msgid "Invalid key: %s"

1301 msgstr "无效键名：%s"

1302

1303 -#: sequencer.c:800

1303 +#: sequencer.c:804

1304 #, c-format

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

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

1307

1308 -#: sequencer.c:812

1308 +#: sequencer.c:816

1309 #, c-format

1310 msgid "Malformed options sheet: %s"

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

1312

1313 -#: sequencer.c:833

1313 +#: sequencer.c:837

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

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

1316

1317 -#: sequencer.c:834

1317 +#: sequencer.c:838

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

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

1320

1321 -#: sequencer.c:838

1321 +#: sequencer.c:842

1322 #, c-format

1323 msgid "Could not create sequencer directory %s"

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

1325

1326 -#: sequencer.c:854 sequencer.c:939

1326 +#: sequencer.c:858 sequencer.c:943

1327 #, c-format

1328 msgid "Error wrapping up %s."

1329 msgstr "错误收尾 %s。"

1330

1331 -#: sequencer.c:873 sequencer.c:1009

1331 +#: sequencer.c:877 sequencer.c:1013

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

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

1334

1335 -#: sequencer.c:875

1335 +#: sequencer.c:879

1336 msgid "cannot resolve HEAD"

1337 msgstr "不能解析 HEAD"

1338

1339 -#: sequencer.c:877

1339 +#: sequencer.c:881

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

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

1342

1343 -#: sequencer.c:899 builtin/apply.c:4128

1343 +#: sequencer.c:903 builtin/apply.c:4128

1344 #, c-format

1345 msgid "cannot open %s: %s"

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

1347

1348 -#: sequencer.c:902

1348 +#: sequencer.c:906

1349 #, c-format

1350 msgid "cannot read %s: %s"

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

1352

1353 -#: sequencer.c:903

1353 +#: sequencer.c:907

1354 msgid "unexpected end of file"

1355 msgstr "意外的文件结束"

1356

1357 -#: sequencer.c:909

1357 +#: sequencer.c:913

1358 #, c-format

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

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

1361

1362 -#: sequencer.c:932

1362 +#: sequencer.c:936

1363 #, c-format

1364 msgid "Could not format %s."

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

1366

1367 -#: sequencer.c:1077

1367 +#: sequencer.c:1081

1368 #, c-format

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

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

1371

1372 -#: sequencer.c:1080

1372 +#: sequencer.c:1084

1373 #, c-format

1374 msgid "%s: bad revision"

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

1376

1377 -#: sequencer.c:1114

1377 +#: sequencer.c:1118

1378 msgid "Can't revert as initial commit"

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

1380

1381 -#: sequencer.c:1115

1381 +#: sequencer.c:1119

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

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

1384

@@ -1445,7 +1445,7 @@ msgstr "无法移除 %s 的 .gitmodules 条目"

1445 msgid "staging updated .gitmodules failed"

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

1447

1448 -#: submodule.c:1111 builtin/init-db.c:363

1448 +#: submodule.c:1111 builtin/init-db.c:371

1449 #, c-format

1450 msgid "Could not create git link %s"

1451 msgstr "不能创建 git link %s"

@@ -1455,28 +1455,28 @@ msgstr "不能创建 git link %s"

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

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

1457

1458 -#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565

1459 -#: trailer.c:569

1458 +#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1459 +#: trailer.c:570

1460 #, c-format

1461 msgid "unknown value '%s' for key '%s'"

1462 msgstr "键 '%2$s' 的未知取值 '%1$s'"

1463

1464 -#: trailer.c:551 trailer.c:556 builtin/remote.c:288

1464 +#: trailer.c:552 trailer.c:557 builtin/remote.c:288

1465 #, c-format

1466 msgid "more than one %s"

1467 msgstr "多于一个 %s"

1468

1469 -#: trailer.c:589

1469 +#: trailer.c:590

1470 #, c-format

1471 msgid "empty trailer token in trailer '%.*s'"

1472 msgstr "签名 '%.*s' 的键为空"

1473

1474 -#: trailer.c:709

1474 +#: trailer.c:710

1475 #, c-format

1476 msgid "could not read input file '%s'"

1477 msgstr "不能读取输入文件 '%s'"

1478

1479 -#: trailer.c:712

1479 +#: trailer.c:713

1480 msgid "could not read from stdin"

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

1482

@@ -1686,15 +1686,15 @@ msgstr "未跟踪的内容, "

1686 msgid "bug: unhandled diff status %c"

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

1688

1689 -#: wt-status.c:761

1689 +#: wt-status.c:758

1690 msgid "Submodules changed but not updated:"

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

1692

1693 -#: wt-status.c:763

1693 +#: wt-status.c:760

1694 msgid "Submodule changes to be committed:"

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

1696

1697 -#: wt-status.c:842

1697 +#: wt-status.c:839

1698 msgid ""

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

1700 "Everything below will be removed."

@@ -1702,198 +1702,198 @@ msgstr ""

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

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

1704

1705 -#: wt-status.c:933

1705 +#: wt-status.c:930

1706 msgid "You have unmerged paths."

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

1708

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

1710 -#: wt-status.c:936

1710 +#: wt-status.c:933

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

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

1713

1714 -#: wt-status.c:939

1714 +#: wt-status.c:936

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

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

1717

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

1719 -#: wt-status.c:942

1719 +#: wt-status.c:939

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

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

1722

1723 -#: wt-status.c:952

1723 +#: wt-status.c:949

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

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

1726

1727 -#: wt-status.c:955

1727 +#: wt-status.c:952

1728 msgid "The current patch is empty."

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

1730

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

1732 -#: wt-status.c:959

1732 +#: wt-status.c:956

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

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

1735

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

1737 -#: wt-status.c:961

1737 +#: wt-status.c:958

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

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

1740

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

1742 -#: wt-status.c:963

1742 +#: wt-status.c:960

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

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

1745

1746 -#: wt-status.c:1023 wt-status.c:1040

1746 +#: wt-status.c:1020 wt-status.c:1037

1747 #, c-format

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

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

1750

1751 -#: wt-status.c:1028 wt-status.c:1045

1751 +#: wt-status.c:1025 wt-status.c:1042

1752 msgid "You are currently rebasing."

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

1754

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

1756 -#: wt-status.c:1031

1756 +#: wt-status.c:1028

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

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

1759

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

1761 -#: wt-status.c:1033

1761 +#: wt-status.c:1030

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

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

1764

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

1766 -#: wt-status.c:1035

1766 +#: wt-status.c:1032

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

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

1769

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

1771 -#: wt-status.c:1048

1771 +#: wt-status.c:1045

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

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

1774

1775 -#: wt-status.c:1052

1775 +#: wt-status.c:1049

1776 #, c-format

1777 msgid ""

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

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

1780

1781 -#: wt-status.c:1057

1781 +#: wt-status.c:1054

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

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

1784

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

1786 -#: wt-status.c:1060

1786 +#: wt-status.c:1057

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

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

1789

1790 -#: wt-status.c:1064

1790 +#: wt-status.c:1061

1791 #, c-format

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

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

1794

1795 -#: wt-status.c:1069

1795 +#: wt-status.c:1066

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

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

1798

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

1800 -#: wt-status.c:1072

1800 +#: wt-status.c:1069

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

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

1803

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

1805 -#: wt-status.c:1074

1805 +#: wt-status.c:1071

1806 msgid ""

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

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

1809

1810 -#: wt-status.c:1084

1810 +#: wt-status.c:1081

1811 #, c-format

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

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

1814

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

1816 -#: wt-status.c:1089

1816 +#: wt-status.c:1086

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

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

1819

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

1821 -#: wt-status.c:1092

1821 +#: wt-status.c:1089

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

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

1824

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

1826 -#: wt-status.c:1094

1826 +#: wt-status.c:1091

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

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

1829

1830 -#: wt-status.c:1103

1830 +#: wt-status.c:1100

1831 #, c-format

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

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

1834

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

1836 -#: wt-status.c:1108

1836 +#: wt-status.c:1105

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

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

1839

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

1841 -#: wt-status.c:1111

1841 +#: wt-status.c:1108

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

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

1844

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

1846 -#: wt-status.c:1113

1846 +#: wt-status.c:1110

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

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

1849

1850 -#: wt-status.c:1124

1850 +#: wt-status.c:1121

1851 #, c-format

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

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

1854

1855 -#: wt-status.c:1128

1855 +#: wt-status.c:1125

1856 msgid "You are currently bisecting."

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

1858

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

1860 -#: wt-status.c:1131

1860 +#: wt-status.c:1128

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

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

1863

1864 -#: wt-status.c:1306

1864 +#: wt-status.c:1303

1865 msgid "On branch "

1866 msgstr "位于分支 "

1867

1868 -#: wt-status.c:1313

1868 +#: wt-status.c:1310

1869 msgid "rebase in progress; onto "

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

1871

1872 -#: wt-status.c:1320

1872 +#: wt-status.c:1317

1873 msgid "HEAD detached at "

1874 msgstr "头指针分离于 "

1875

1876 -#: wt-status.c:1322

1876 +#: wt-status.c:1319

1877 msgid "HEAD detached from "

1878 msgstr "头指针分离自 "

1879

1880 -#: wt-status.c:1325

1880 +#: wt-status.c:1322

1881 msgid "Not currently on any branch."

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

1883

1884 -#: wt-status.c:1342

1884 +#: wt-status.c:1339

1885 msgid "Initial commit"

1886 msgstr "初始提交"

1887

1888 -#: wt-status.c:1356

1888 +#: wt-status.c:1353

1889 msgid "Untracked files"

1890 msgstr "未跟踪的文件"

1891

1892 -#: wt-status.c:1358

1892 +#: wt-status.c:1355

1893 msgid "Ignored files"

1894 msgstr "忽略的文件"

1895

1896 -#: wt-status.c:1362

1896 +#: wt-status.c:1359

1897 #, c-format

1898 msgid ""

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

@@ -1903,84 +1903,84 @@ msgstr ""

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

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

1905

1906 -#: wt-status.c:1368

1906 +#: wt-status.c:1365

1907 #, c-format

1908 msgid "Untracked files not listed%s"

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

1910

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

1912 -#: wt-status.c:1370

1912 +#: wt-status.c:1367

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

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

1915

1916 -#: wt-status.c:1376

1916 +#: wt-status.c:1373

1917 msgid "No changes"

1918 msgstr "没有修改"

1919

1920 -#: wt-status.c:1381

1920 +#: wt-status.c:1378

1921 #, c-format

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

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

1924

1925 -#: wt-status.c:1384

1925 +#: wt-status.c:1381

1926 #, c-format

1927 msgid "no changes added to commit\n"

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

1929

1930 -#: wt-status.c:1387

1930 +#: wt-status.c:1384

1931 #, c-format

1932 msgid ""

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

1934 "track)\n"

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

1936

1937 -#: wt-status.c:1390

1937 +#: wt-status.c:1387

1938 #, c-format

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

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

1941

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

1943 -#: wt-status.c:1393

1943 +#: wt-status.c:1390

1944 #, c-format

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

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

1947

1948 -#: wt-status.c:1396 wt-status.c:1401

1948 +#: wt-status.c:1393 wt-status.c:1398

1949 #, c-format

1950 msgid "nothing to commit\n"

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

1952

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

1954 -#: wt-status.c:1399

1954 +#: wt-status.c:1396

1955 #, c-format

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

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

1958

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

1960 -#: wt-status.c:1403

1960 +#: wt-status.c:1400

1961 #, c-format

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

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

1964

1965 -#: wt-status.c:1512

1965 +#: wt-status.c:1509

1966 msgid "HEAD (no branch)"

1967 msgstr "HEAD（非分支）"

1968

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

1970 -#: wt-status.c:1518

1970 +#: wt-status.c:1515

1971 msgid "Initial commit on "

1972 msgstr "初始提交于 "

1973

1974 -#: wt-status.c:1550

1974 +#: wt-status.c:1547

1975 msgid "gone"

1976 msgstr "丢失"

1977

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

1979 -#: wt-status.c:1552 wt-status.c:1560

1979 +#: wt-status.c:1549 wt-status.c:1557

1980 msgid "behind "

1981 msgstr "落后 "

1982

1983 -#: compat/precompose_utf8.c:55 builtin/clone.c:357

1983 +#: compat/precompose_utf8.c:55 builtin/clone.c:360

1984 #, c-format

1985 msgid "failed to unlink '%s'"

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

@@ -2039,13 +2039,13 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

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

2040

2041 #: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

2042 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375

2042 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1370

2043 #: builtin/rm.c:269

2044 msgid "dry run"

2045 msgstr "演习"

2046

2047 #: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

2048 -#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608

2048 +#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608

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

2050 msgid "be verbose"

2051 msgstr "冗长输出"

@@ -2054,7 +2054,7 @@ msgstr "冗长输出"

2054 msgid "interactive picking"

2055 msgstr "交互式拣选"

2056

2057 -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286

2057 +#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

2058 msgid "select hunks interactively"

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

2060

@@ -2099,10 +2099,6 @@ msgstr "检查在演习模式下文件（即使不存在）是否被忽略"

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

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

2101

2102 -#: builtin/add.c:287

2103 -msgid "no files added"

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

2105 -

2102 #: builtin/add.c:293

2103 msgid "adding files failed"

2104 msgstr "添加文件失败"

@@ -2377,7 +2373,7 @@ msgstr "%s：补丁未应用"

2373 msgid "Checking patch %s..."

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

2375

2380 -#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135

2376 +#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135

2377 #, c-format

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

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

@@ -2456,7 +2452,7 @@ msgstr "未能识别的输入"

2452 msgid "unable to read index file"

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

2454

2459 -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91

2455 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92

2456 #: builtin/fetch.c:93

2457 msgid "path"

2458 msgstr "路径"

@@ -2997,8 +2993,8 @@ msgid "act on remote-tracking branches"

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

2994

2995 #: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

3000 -#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623

3001 -#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616

2996 +#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587

2997 +#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616

2998 #: builtin/tag.c:622

2999 msgid "commit"

3000 msgstr "提交"

@@ -3044,8 +3040,8 @@ msgid "edit the description for the branch"

3040 msgstr "标记分支的描述"

3041

3042 #: builtin/branch.c:851

3047 -msgid "force creation (when already exists)"

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

3043 +msgid "force creation, move/rename, deletion"

3044 +msgstr "强制创建、移动/重命名、删除"

3045

3046 #: builtin/branch.c:854

3047 msgid "print only not merged branches"

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

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

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

3061

3066 -#: builtin/branch.c:881 builtin/clone.c:634

3062 +#: builtin/branch.c:881 builtin/clone.c:637

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

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

3065

@@ -3071,74 +3067,74 @@ msgstr "HEAD 没有位于 /refs/heads 之下！"

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

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

3069

3074 -#: builtin/branch.c:909 builtin/branch.c:948

3070 +#: builtin/branch.c:914 builtin/branch.c:953

3071 msgid "branch name required"

3072 msgstr "必须提供分支名"

3073

3078 -#: builtin/branch.c:924

3074 +#: builtin/branch.c:929

3075 msgid "Cannot give description to detached HEAD"

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

3077

3082 -#: builtin/branch.c:929

3078 +#: builtin/branch.c:934

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

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

3081

3086 -#: builtin/branch.c:936

3082 +#: builtin/branch.c:941

3083 #, c-format

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

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

3086

3091 -#: builtin/branch.c:939

3087 +#: builtin/branch.c:944

3088 #, c-format

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

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

3091

3096 -#: builtin/branch.c:954

3092 +#: builtin/branch.c:959

3093 msgid "too many branches for a rename operation"

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

3095

3100 -#: builtin/branch.c:959

3096 +#: builtin/branch.c:964

3097 msgid "too many branches to set new upstream"

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

3099

3104 -#: builtin/branch.c:963

3100 +#: builtin/branch.c:968

3101 #, c-format

3102 msgid ""

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

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

3105

3110 -#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009

3106 +#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014

3107 #, c-format

3108 msgid "no such branch '%s'"

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

3110

3115 -#: builtin/branch.c:970

3111 +#: builtin/branch.c:975

3112 #, c-format

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

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

3115

3120 -#: builtin/branch.c:982

3116 +#: builtin/branch.c:987

3117 msgid "too many branches to unset upstream"

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

3119

3124 -#: builtin/branch.c:986

3120 +#: builtin/branch.c:991

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

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

3123

3128 -#: builtin/branch.c:992

3124 +#: builtin/branch.c:997

3125 #, c-format

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

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

3128

3133 -#: builtin/branch.c:1006

3129 +#: builtin/branch.c:1011

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

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

3132

3137 -#: builtin/branch.c:1012

3133 +#: builtin/branch.c:1017

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

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

3136

3141 -#: builtin/branch.c:1015

3137 +#: builtin/branch.c:1020

3138 #, c-format

3139 msgid ""

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

@@ -3146,7 +3142,7 @@ msgid ""

3142 msgstr ""

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

3144

3149 -#: builtin/branch.c:1032

3145 +#: builtin/branch.c:1037

3146 #, c-format

3147 msgid ""

3148 "\n"

@@ -3157,12 +3153,12 @@ msgstr ""

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

3154 "\n"

3155

3160 -#: builtin/branch.c:1033

3156 +#: builtin/branch.c:1038

3157 #, c-format

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

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

3160

3165 -#: builtin/branch.c:1034

3161 +#: builtin/branch.c:1039

3162 #, c-format

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

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

@@ -3244,7 +3240,7 @@ msgstr "从标准输入读出文件名"

3240 msgid "terminate input and output records by a NUL character"

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

3242

3247 -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274

3243 +#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274

3244 msgid "suppress progress reporting"

3245 msgstr "不显示进度报告"

3246

@@ -3349,106 +3345,106 @@ msgstr "git checkout [选项] <分支>"

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

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

3347

3352 -#: builtin/checkout.c:114 builtin/checkout.c:147

3348 +#: builtin/checkout.c:132 builtin/checkout.c:165

3349 #, c-format

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

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

3352

3357 -#: builtin/checkout.c:116 builtin/checkout.c:149

3353 +#: builtin/checkout.c:134 builtin/checkout.c:167

3354 #, c-format

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

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

3357

3362 -#: builtin/checkout.c:132

3358 +#: builtin/checkout.c:150

3359 #, c-format

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

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

3362

3367 -#: builtin/checkout.c:176

3363 +#: builtin/checkout.c:194

3364 #, c-format

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

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

3367

3372 -#: builtin/checkout.c:193

3368 +#: builtin/checkout.c:211

3369 #, c-format

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

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

3372

3377 -#: builtin/checkout.c:210

3373 +#: builtin/checkout.c:228

3374 #, c-format

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

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

3377

3382 -#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237

3383 -#: builtin/checkout.c:240

3378 +#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3379 +#: builtin/checkout.c:258

3380 #, c-format

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

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

3383

3388 -#: builtin/checkout.c:243 builtin/checkout.c:246

3384 +#: builtin/checkout.c:261 builtin/checkout.c:264

3385 #, c-format

3386 msgid "'%s' cannot be used with %s"

3387 msgstr "'%s' 不能和 %s 同时使用"

3388

3393 -#: builtin/checkout.c:249

3389 +#: builtin/checkout.c:267

3390 #, c-format

3391 msgid "Cannot update paths and switch to branch '%s' at the same time."

3392 msgstr "不能同时更新路径并切换到分支'%s'。"

3393

3398 -#: builtin/checkout.c:260 builtin/checkout.c:449

3394 +#: builtin/checkout.c:278 builtin/checkout.c:467

3395 msgid "corrupt index file"

3396 msgstr "损坏的索引文件"

3397

3402 -#: builtin/checkout.c:320 builtin/checkout.c:327

3398 +#: builtin/checkout.c:338 builtin/checkout.c:345

3399 #, c-format

3400 msgid "path '%s' is unmerged"

3401 msgstr "路径 '%s' 未合并"

3402

3407 -#: builtin/checkout.c:471

3403 +#: builtin/checkout.c:489

3404 msgid "you need to resolve your current index first"

3405 msgstr "您需要先解决当前索引的冲突"

3406

3411 -#: builtin/checkout.c:597

3407 +#: builtin/checkout.c:615

3408 #, c-format

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

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

3411

3416 -#: builtin/checkout.c:635

3412 +#: builtin/checkout.c:653

3413 msgid "HEAD is now at"

3414 msgstr "HEAD 目前位于"

3415

3420 -#: builtin/checkout.c:642

3416 +#: builtin/checkout.c:660

3417 #, c-format

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

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

3420

3425 -#: builtin/checkout.c:645

3421 +#: builtin/checkout.c:663

3422 #, c-format

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

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

3425

3430 -#: builtin/checkout.c:649

3426 +#: builtin/checkout.c:667

3427 #, c-format

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

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

3430

3435 -#: builtin/checkout.c:651 builtin/checkout.c:1032

3431 +#: builtin/checkout.c:669 builtin/checkout.c:1050

3432 #, c-format

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

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

3435

3440 -#: builtin/checkout.c:653

3436 +#: builtin/checkout.c:671

3437 #, c-format

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

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

3440

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

3446 -#: builtin/checkout.c:705

3442 +#: builtin/checkout.c:723

3443 #, c-format

3444 msgid " ... and %d more.\n"

3445 msgstr " ... 及其它 %d 个。\n"

3446

3451 -#: builtin/checkout.c:711

3447 +#: builtin/checkout.c:729

3448 #, c-format

3449 msgid ""

3450 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3469,7 +3465,7 @@ msgstr[1] ""

3465 "\n"

3466 "%s\n"

3467

3472 -#: builtin/checkout.c:729

3468 +#: builtin/checkout.c:747

3469 #, c-format

3470 msgid ""

3471 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3484,139 +3480,139 @@ msgstr ""

3480 " git branch new_branch_name %s\n"

3481 "\n"

3482

3487 -#: builtin/checkout.c:759

3483 +#: builtin/checkout.c:777

3484 msgid "internal error in revision walk"

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

3486

3491 -#: builtin/checkout.c:763

3487 +#: builtin/checkout.c:781

3488 msgid "Previous HEAD position was"

3489 msgstr "之前的 HEAD 位置是"

3490

3495 -#: builtin/checkout.c:790 builtin/checkout.c:1027

3491 +#: builtin/checkout.c:808 builtin/checkout.c:1045

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

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

3494

3499 -#: builtin/checkout.c:934

3495 +#: builtin/checkout.c:952

3496 #, c-format

3497 msgid "only one reference expected, %d given."

3498 msgstr "只要一个引用，却给出了 %d 个"

3499

3504 -#: builtin/checkout.c:973

3500 +#: builtin/checkout.c:991

3501 #, c-format

3502 msgid "invalid reference: %s"

3503 msgstr "无效引用：%s"

3504

3509 -#: builtin/checkout.c:1002

3505 +#: builtin/checkout.c:1020

3506 #, c-format

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

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

3509

3514 -#: builtin/checkout.c:1041

3510 +#: builtin/checkout.c:1059

3511 msgid "paths cannot be used with switching branches"

3512 msgstr "路径不能和切换分支同时使用"

3513

3518 -#: builtin/checkout.c:1044 builtin/checkout.c:1048

3514 +#: builtin/checkout.c:1062 builtin/checkout.c:1066

3515 #, c-format

3516 msgid "'%s' cannot be used with switching branches"

3517 msgstr "'%s' 不能和切换分支同时使用"

3518

3523 -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3524 -#: builtin/checkout.c:1063

3519 +#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3520 +#: builtin/checkout.c:1081

3521 #, c-format

3522 msgid "'%s' cannot be used with '%s'"

3523 msgstr "'%s' 不能和 '%s' 同时使用"

3524

3529 -#: builtin/checkout.c:1068

3525 +#: builtin/checkout.c:1086

3526 #, c-format

3527 msgid "Cannot switch branch to a non-commit '%s'"

3528 msgstr "不能切换分支到一个非提交 '%s'"

3529

3534 -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89

3530 +#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

3531 #: builtin/remote.c:159 builtin/remote.c:161

3532 msgid "branch"

3533 msgstr "分支"

3534

3539 -#: builtin/checkout.c:1091

3535 +#: builtin/checkout.c:1109

3536 msgid "create and checkout a new branch"

3537 msgstr "创建并检出一个新的分支"

3538

3543 -#: builtin/checkout.c:1093

3539 +#: builtin/checkout.c:1111

3540 msgid "create/reset and checkout a branch"

3541 msgstr "创建/重置并检出一个分支"

3542

3547 -#: builtin/checkout.c:1094

3543 +#: builtin/checkout.c:1112

3544 msgid "create reflog for new branch"

3545 msgstr "为新的分支创建引用日志"

3546

3551 -#: builtin/checkout.c:1095

3547 +#: builtin/checkout.c:1113

3548 msgid "detach the HEAD at named commit"

3549 msgstr "成为指向该提交的分离头指针"

3550

3555 -#: builtin/checkout.c:1096

3551 +#: builtin/checkout.c:1114

3552 msgid "set upstream info for new branch"

3553 msgstr "为新的分支设置上游信息"

3554

3559 -#: builtin/checkout.c:1098

3555 +#: builtin/checkout.c:1116

3556 msgid "new-branch"

3557 msgstr "新分支"

3558

3563 -#: builtin/checkout.c:1098

3559 +#: builtin/checkout.c:1116

3560 msgid "new unparented branch"

3561 msgstr "新的没有父提交的分支"

3562

3567 -#: builtin/checkout.c:1099

3563 +#: builtin/checkout.c:1117

3564 msgid "checkout our version for unmerged files"

3565 msgstr "对尚未合并的文件检出我们的版本"

3566

3571 -#: builtin/checkout.c:1101

3567 +#: builtin/checkout.c:1119

3568 msgid "checkout their version for unmerged files"

3569 msgstr "对尚未合并的文件检出他们的版本"

3570

3575 -#: builtin/checkout.c:1103

3571 +#: builtin/checkout.c:1121

3572 msgid "force checkout (throw away local modifications)"

3573 msgstr "强制检出（丢弃本地修改）"

3574

3579 -#: builtin/checkout.c:1104

3575 +#: builtin/checkout.c:1122

3576 msgid "perform a 3-way merge with the new branch"

3577 msgstr "和新的分支执行三路合并"

3578

3583 -#: builtin/checkout.c:1105 builtin/merge.c:226

3579 +#: builtin/checkout.c:1123 builtin/merge.c:227

3580 msgid "update ignored files (default)"

3581 msgstr "更新忽略的文件（默认）"

3582

3587 -#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245

3583 +#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245

3584 msgid "style"

3585 msgstr "风格"

3586

3591 -#: builtin/checkout.c:1107

3587 +#: builtin/checkout.c:1125

3588 msgid "conflict style (merge or diff3)"

3589 msgstr "冲突输出风格（merge 或 diff3）"

3590

3595 -#: builtin/checkout.c:1110

3591 +#: builtin/checkout.c:1128

3592 msgid "do not limit pathspecs to sparse entries only"

3593 msgstr "对路径不做稀疏检出的限制"

3594

3599 -#: builtin/checkout.c:1112

3595 +#: builtin/checkout.c:1130

3596 msgid "second guess 'git checkout no-such-branch'"

3597 msgstr "再者猜测'git checkout no-such-branch'"

3598

3603 -#: builtin/checkout.c:1135

3599 +#: builtin/checkout.c:1153

3600 msgid "-b, -B and --orphan are mutually exclusive"

3601 msgstr "-b、-B 和 --orphan 是互斥的"

3602

3607 -#: builtin/checkout.c:1152

3603 +#: builtin/checkout.c:1170

3604 msgid "--track needs a branch name"

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

3606

3611 -#: builtin/checkout.c:1157

3607 +#: builtin/checkout.c:1175

3608 msgid "Missing branch name; try -b"

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

3610

3615 -#: builtin/checkout.c:1194

3611 +#: builtin/checkout.c:1212

3612 msgid "invalid path specification"

3613 msgstr "无效的路径规格"

3614

3619 -#: builtin/checkout.c:1201

3615 +#: builtin/checkout.c:1219

3616 #, c-format

3617 msgid ""

3618 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3625,12 +3621,12 @@ msgstr ""

3621 "不能同时更新路径并切换到分支'%s'。\n"

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

3623

3628 -#: builtin/checkout.c:1206

3624 +#: builtin/checkout.c:1224

3625 #, c-format

3626 msgid "git checkout: --detach does not take a path argument '%s'"

3627 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

3628

3633 -#: builtin/checkout.c:1210

3629 +#: builtin/checkout.c:1228

3630 msgid ""

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

3632 "checking out of the index."

@@ -3819,146 +3815,150 @@ msgstr ""

3815 msgid "git clone [options] [--] <repo> [<dir>]"

3816 msgstr "git clone [选项] [--] <版本库> [<路径>]"

3817

3822 -#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223

3818 +#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224

3819 #: builtin/push.c:514

3820 msgid "force progress reporting"

3821 msgstr "强制显示进度报告"

3822

3827 -#: builtin/clone.c:67

3823 +#: builtin/clone.c:68

3824 msgid "don't create a checkout"

3825 msgstr "不创建一个检出"

3826

3831 -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

3827 +#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496

3828 msgid "create a bare repository"

3829 msgstr "创建一个纯版本库"

3830

3835 -#: builtin/clone.c:72

3831 +#: builtin/clone.c:73

3832 msgid "create a mirror repository (implies bare)"

3833 msgstr "创建一个镜像版本库（也是纯版本库）"

3834

3839 -#: builtin/clone.c:74

3835 +#: builtin/clone.c:75

3836 msgid "to clone from a local repository"

3837 msgstr "从本地版本库克隆"

3838

3843 -#: builtin/clone.c:76

3839 +#: builtin/clone.c:77

3840 msgid "don't use local hardlinks, always copy"

3841 msgstr "不使用本地硬链接，始终复制"

3842

3847 -#: builtin/clone.c:78

3843 +#: builtin/clone.c:79

3844 msgid "setup as shared repository"

3845 msgstr "设置为共享版本库"

3846

3851 -#: builtin/clone.c:80 builtin/clone.c:82

3847 +#: builtin/clone.c:81 builtin/clone.c:83

3848 msgid "initialize submodules in the clone"

3849 msgstr "在克隆时初始化子模组"

3850

3855 -#: builtin/clone.c:83 builtin/init-db.c:485

3851 +#: builtin/clone.c:84 builtin/init-db.c:493

3852 msgid "template-directory"

3853 msgstr "模板目录"

3854

3859 -#: builtin/clone.c:84 builtin/init-db.c:486

3855 +#: builtin/clone.c:85 builtin/init-db.c:494

3856 msgid "directory from which templates will be used"

3857 msgstr "模板目录将被使用"

3858

3863 -#: builtin/clone.c:86

3859 +#: builtin/clone.c:87

3860 msgid "reference repository"

3861 msgstr "参考版本库"

3862

3867 -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3863 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

3864 msgid "name"

3865 msgstr "名称"

3866

3871 -#: builtin/clone.c:88

3867 +#: builtin/clone.c:89

3868 msgid "use <name> instead of 'origin' to track upstream"

3869 msgstr "使用<名称>而不是 'origin' 去跟踪上游"

3870

3875 -#: builtin/clone.c:90

3871 +#: builtin/clone.c:91

3872 msgid "checkout <branch> instead of the remote's HEAD"

3873 msgstr "检出<分支>而不是远程HEAD"

3874

3879 -#: builtin/clone.c:92

3875 +#: builtin/clone.c:93

3876 msgid "path to git-upload-pack on the remote"

3877 msgstr "远程 git-upload-pack 路径"

3878

3883 -#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659

3879 +#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659

3880 msgid "depth"

3881 msgstr "深度"

3882

3887 -#: builtin/clone.c:94

3883 +#: builtin/clone.c:95

3884 msgid "create a shallow clone of that depth"

3885 msgstr "创建一个指定深度的浅克隆"

3886

3891 -#: builtin/clone.c:96

3887 +#: builtin/clone.c:97

3888 msgid "clone only one branch, HEAD or --branch"

3889 msgstr "只克隆一个分支、HEAD 或 --branch"

3890

3895 -#: builtin/clone.c:97 builtin/init-db.c:494

3891 +#: builtin/clone.c:99

3892 +msgid "use --reference only while cloning"

3893 +msgstr "仅在克隆时参考 --reference 指向的本地版本库"

3894 +

3895 +#: builtin/clone.c:100 builtin/init-db.c:502

3896 msgid "gitdir"

3897 msgstr "git目录"

3898

3899 -#: builtin/clone.c:98 builtin/init-db.c:495

3899 +#: builtin/clone.c:101 builtin/init-db.c:503

3900 msgid "separate git dir from working tree"

3901 msgstr "git目录和工作区分离"

3902

3903 -#: builtin/clone.c:99

3903 +#: builtin/clone.c:102

3904 msgid "key=value"

3905 msgstr "key=value"

3906

3907 -#: builtin/clone.c:100

3907 +#: builtin/clone.c:103

3908 msgid "set config inside the new repository"

3909 msgstr "在新版本库中设置配置信息"

3910

3911 -#: builtin/clone.c:253

3911 +#: builtin/clone.c:256

3912 #, c-format

3913 msgid "reference repository '%s' is not a local repository."

3914 msgstr "参考版本库 '%s' 不是一个本地版本库。"

3915

3916 -#: builtin/clone.c:257

3916 +#: builtin/clone.c:260

3917 #, c-format

3918 msgid "reference repository '%s' is shallow"

3919 msgstr "参考版本库 '%s' 是一个浅克隆"

3920

3921 -#: builtin/clone.c:260

3921 +#: builtin/clone.c:263

3922 #, c-format

3923 msgid "reference repository '%s' is grafted"

3924 msgstr "参考版本库 '%s' 已被嫁接"

3925

3926 -#: builtin/clone.c:322

3926 +#: builtin/clone.c:325

3927 #, c-format

3928 msgid "failed to create directory '%s'"

3929 msgstr "无法创建目录 '%s'"

3930

3931 -#: builtin/clone.c:324 builtin/diff.c:84

3931 +#: builtin/clone.c:327 builtin/diff.c:84

3932 #, c-format

3933 msgid "failed to stat '%s'"

3934 msgstr "无法枚举 '%s' 状态"

3935

3936 -#: builtin/clone.c:326

3936 +#: builtin/clone.c:329

3937 #, c-format

3938 msgid "%s exists and is not a directory"

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

3940

3941 -#: builtin/clone.c:340

3941 +#: builtin/clone.c:343

3942 #, c-format

3943 msgid "failed to stat %s\n"

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

3945

3946 -#: builtin/clone.c:362

3946 +#: builtin/clone.c:365

3947 #, c-format

3948 msgid "failed to create link '%s'"

3949 msgstr "无法创建链接 '%s'"

3950

3951 -#: builtin/clone.c:366

3951 +#: builtin/clone.c:369

3952 #, c-format

3953 msgid "failed to copy file to '%s'"

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

3955

3956 -#: builtin/clone.c:389 builtin/clone.c:563

3956 +#: builtin/clone.c:392 builtin/clone.c:566

3957 #, c-format

3958 msgid "done.\n"

3959 msgstr "完成。\n"

3960

3961 -#: builtin/clone.c:401

3961 +#: builtin/clone.c:404

3962 msgid ""

3963 "Clone succeeded, but checkout failed.\n"

3964 "You can inspect what was checked out with 'git status'\n"

@@ -3968,108 +3968,120 @@ msgstr ""

3968 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

3969 "'git checkout -f HEAD' 重试\n"

3970

3971 -#: builtin/clone.c:478

3971 +#: builtin/clone.c:481

3972 #, c-format

3973 msgid "Could not find remote branch %s to clone."

3974 msgstr "不能发现要克隆的远程分支 %s。"

3975

3976 -#: builtin/clone.c:558

3976 +#: builtin/clone.c:561

3977 #, c-format

3978 msgid "Checking connectivity... "

3979 msgstr "检查连接... "

3980

3981 -#: builtin/clone.c:561

3981 +#: builtin/clone.c:564

3982 msgid "remote did not send all necessary objects"

3983 msgstr "远程没有发送所有必须的对象"

3984

3985 -#: builtin/clone.c:625

3985 +#: builtin/clone.c:628

3986 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3987 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

3988

3989 -#: builtin/clone.c:656

3989 +#: builtin/clone.c:659

3990 msgid "unable to checkout working tree"

3991 msgstr "不能检出工作区"

3992

3993 -#: builtin/clone.c:765

3993 +#: builtin/clone.c:746

3994 +msgid "cannot repack to clean up"

3995 +msgstr "无法执行 repack 来清理"

3996 +

3997 +#: builtin/clone.c:748

3998 +msgid "cannot unlink temporary alternates file"

3999 +msgstr "无法删除临时的 alternates 文件"

4000 +

4001 +#: builtin/clone.c:778

4002 msgid "Too many arguments."

4003 msgstr "太多参数。"

4004

3997 -#: builtin/clone.c:769

4005 +#: builtin/clone.c:782

4006 msgid "You must specify a repository to clone."

4007 msgstr "您必须指定一个版本库来克隆。"

4008

4001 -#: builtin/clone.c:780

4009 +#: builtin/clone.c:793

4010 #, c-format

4011 msgid "--bare and --origin %s options are incompatible."

4012 msgstr "--bare 和 --origin %s 选项不兼容。"

4013

4006 -#: builtin/clone.c:783

4014 +#: builtin/clone.c:796

4015 msgid "--bare and --separate-git-dir are incompatible."

4016 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

4017

4010 -#: builtin/clone.c:796

4018 +#: builtin/clone.c:809

4019 #, c-format

4020 msgid "repository '%s' does not exist"

4021 msgstr "版本库 '%s' 不存在"

4022

4015 -#: builtin/clone.c:802 builtin/fetch.c:1155

4023 +#: builtin/clone.c:815 builtin/fetch.c:1155

4024 #, c-format

4025 msgid "depth %s is not a positive number"

4026 msgstr "深度 %s 不是一个正数"

4027

4020 -#: builtin/clone.c:812

4028 +#: builtin/clone.c:825

4029 #, c-format

4030 msgid "destination path '%s' already exists and is not an empty directory."

4031 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

4032

4025 -#: builtin/clone.c:822

4033 +#: builtin/clone.c:835

4034 #, c-format

4035 msgid "working tree '%s' already exists."

4036 msgstr "工作区 '%s' 已经存在。"

4037

4030 -#: builtin/clone.c:835 builtin/clone.c:847

4038 +#: builtin/clone.c:848 builtin/clone.c:860

4039 #, c-format

4040 msgid "could not create leading directories of '%s'"

4041 msgstr "不能为 '%s' 创建先导目录"

4042

4035 -#: builtin/clone.c:838

4043 +#: builtin/clone.c:851

4044 #, c-format

4045 msgid "could not create work tree dir '%s'."

4046 msgstr "不能为 '%s' 创建工作区目录。"

4047

4040 -#: builtin/clone.c:857

4048 +#: builtin/clone.c:870

4049 #, c-format

4050 msgid "Cloning into bare repository '%s'...\n"

4051 msgstr "克隆到纯版本库 '%s'...\n"

4052

4045 -#: builtin/clone.c:859

4053 +#: builtin/clone.c:872

4054 #, c-format

4055 msgid "Cloning into '%s'...\n"

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

4057

4050 -#: builtin/clone.c:895

4058 +#: builtin/clone.c:897

4059 +msgid "--dissociate given, but there is no --reference"

4060 +msgstr "提供了参数 --dissociate，但未提供 --reference"

4061 +

4062 +#: builtin/clone.c:912

4063 msgid "--depth is ignored in local clones; use file:// instead."

4064 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

4065

4054 -#: builtin/clone.c:898

4066 +#: builtin/clone.c:915

4067 msgid "source repository is shallow, ignoring --local"

4068 msgstr "源版本库是浅克隆，忽略 --local"

4069

4058 -#: builtin/clone.c:903

4070 +#: builtin/clone.c:920

4071 msgid "--local is ignored"

4072 msgstr "--local 被忽略"

4073

4062 -#: builtin/clone.c:907

4074 +#: builtin/clone.c:924

4075 #, c-format

4076 msgid "Don't know how to clone %s"

4077 msgstr "不知道如何克隆 %s"

4078

4067 -#: builtin/clone.c:958 builtin/clone.c:966

4079 +#: builtin/clone.c:975 builtin/clone.c:983

4080 #, c-format

4081 msgid "Remote branch %s not found in upstream %s"

4082 msgstr "远程分支 %s 在上游 %s 未发现"

4083

4072 -#: builtin/clone.c:969

4084 +#: builtin/clone.c:986

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

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

4087

@@ -4247,73 +4259,68 @@ msgstr "无法读取索引"

4259 msgid "unable to write temporary index file"

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

4261

4250 -#: builtin/commit.c:592

4262 +#: builtin/commit.c:584

4263 #, c-format

4264 msgid "commit '%s' lacks author header"

4265 msgstr "提交 '%s' 缺少作者信息"

4266

4255 -#: builtin/commit.c:594

4267 +#: builtin/commit.c:586

4268 #, c-format

4269 msgid "commit '%s' has malformed author line"

4270 msgstr "提交 '%s' 有非法的作者信息"

4271

4260 -#: builtin/commit.c:613

4272 +#: builtin/commit.c:605

4273 msgid "malformed --author parameter"

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

4275

4264 -#: builtin/commit.c:621

4276 +#: builtin/commit.c:613

4277 #, c-format

4278 msgid "invalid date format: %s"

4279 msgstr "无效的日期格式：%s"

4280

4269 -#: builtin/commit.c:642

4270 -#, c-format

4271 -msgid "Malformed ident string: '%s'"

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

4273 -

4274 -#: builtin/commit.c:675

4281 +#: builtin/commit.c:657

4282 msgid ""

4283 "unable to select a comment character that is not used\n"

4284 "in the current commit message"

4285 msgstr "无法选择一个未被当前提交说明使用的注释字符"

4286

4280 -#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120

4287 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084

4288 #, c-format

4289 msgid "could not lookup commit %s"

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

4291

4285 -#: builtin/commit.c:724 builtin/shortlog.c:273

4292 +#: builtin/commit.c:706 builtin/shortlog.c:273

4293 #, c-format

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

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

4296

4290 -#: builtin/commit.c:726

4297 +#: builtin/commit.c:708

4298 msgid "could not read log from standard input"

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

4300

4294 -#: builtin/commit.c:730

4301 +#: builtin/commit.c:712

4302 #, c-format

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

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

4305

4299 -#: builtin/commit.c:752

4306 +#: builtin/commit.c:734

4307 msgid "could not read MERGE_MSG"

4308 msgstr "不能读取 MERGE_MSG"

4309

4303 -#: builtin/commit.c:756

4310 +#: builtin/commit.c:738

4311 msgid "could not read SQUASH_MSG"

4312 msgstr "不能读取 SQUASH_MSG"

4313

4307 -#: builtin/commit.c:760

4314 +#: builtin/commit.c:742

4315 #, c-format

4316 msgid "could not read '%s'"

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

4318

4312 -#: builtin/commit.c:831

4319 +#: builtin/commit.c:789

4320 msgid "could not write commit template"

4321 msgstr "不能写提交模版"

4322

4316 -#: builtin/commit.c:849

4323 +#: builtin/commit.c:807

4324 #, c-format

4325 msgid ""

4326 "\n"

@@ -4327,7 +4334,7 @@ msgstr ""

4334 "\t%s\n"

4335 "然后重试。\n"

4336

4330 -#: builtin/commit.c:854

4337 +#: builtin/commit.c:812

4338 #, c-format

4339 msgid ""

4340 "\n"

@@ -4341,7 +4348,7 @@ msgstr ""

4348 "\t%s\n"

4349 "然后重试。\n"

4350

4344 -#: builtin/commit.c:867

4351 +#: builtin/commit.c:825

4352 #, c-format

4353 msgid ""

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

@@ -4350,7 +4357,7 @@ msgstr ""

4357 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

4358 "说明将会终止提交。\n"

4359

4353 -#: builtin/commit.c:874

4360 +#: builtin/commit.c:832

4361 #, c-format

4362 msgid ""

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

@@ -4361,353 +4368,353 @@ msgstr ""

4368 "也可以删除它们。一个空的提交说明将会终止提交。\n"

4369

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

4364 -#: builtin/commit.c:888

4371 +#: builtin/commit.c:852

4372 #, c-format

4373 msgid "%sAuthor: %.*s <%.*s>"

4374 msgstr "%s作者： %.*s <%.*s>"

4375

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

4370 -#: builtin/commit.c:896

4377 +#: builtin/commit.c:860

4378 #, c-format

4379 msgid "%sDate: %s"

4380 msgstr "%s日期： %s"

4381

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

4376 -#: builtin/commit.c:903

4383 +#: builtin/commit.c:867

4384 #, c-format

4385 msgid "%sCommitter: %.*s <%.*s>"

4386 msgstr "%s提交者：%.*s <%.*s>"

4387

4381 -#: builtin/commit.c:921

4388 +#: builtin/commit.c:885

4389 msgid "Cannot read index"

4390 msgstr "无法读取索引"

4391

4385 -#: builtin/commit.c:978

4392 +#: builtin/commit.c:942

4393 msgid "Error building trees"

4394 msgstr "无法创建树对象"

4395

4389 -#: builtin/commit.c:993 builtin/tag.c:495

4396 +#: builtin/commit.c:957 builtin/tag.c:495

4397 #, c-format

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

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

4400

4394 -#: builtin/commit.c:1095

4401 +#: builtin/commit.c:1059

4402 #, c-format

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

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

4405

4399 -#: builtin/commit.c:1110 builtin/commit.c:1350

4406 +#: builtin/commit.c:1074 builtin/commit.c:1314

4407 #, c-format

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

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

4410

4404 -#: builtin/commit.c:1147

4411 +#: builtin/commit.c:1111

4412 msgid "--long and -z are incompatible"

4413 msgstr "--long 和 -z 选项不兼容"

4414

4408 -#: builtin/commit.c:1177

4415 +#: builtin/commit.c:1141

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

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

4418

4412 -#: builtin/commit.c:1186

4419 +#: builtin/commit.c:1150

4420 msgid "You have nothing to amend."

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

4422

4416 -#: builtin/commit.c:1189

4423 +#: builtin/commit.c:1153

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

4425 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

4426

4420 -#: builtin/commit.c:1191

4427 +#: builtin/commit.c:1155

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

4429 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

4430

4424 -#: builtin/commit.c:1194

4431 +#: builtin/commit.c:1158

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

4433 msgstr "选项 --squash 和 --fixup 不能同时使用"

4434

4428 -#: builtin/commit.c:1204

4435 +#: builtin/commit.c:1168

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

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

4438

4432 -#: builtin/commit.c:1206

4439 +#: builtin/commit.c:1170

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

4441 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

4442

4436 -#: builtin/commit.c:1214

4443 +#: builtin/commit.c:1178

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

4445 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

4446

4440 -#: builtin/commit.c:1231

4447 +#: builtin/commit.c:1195

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

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

4450

4444 -#: builtin/commit.c:1233

4451 +#: builtin/commit.c:1197

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

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

4454

4448 -#: builtin/commit.c:1235

4455 +#: builtin/commit.c:1199

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

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

4458

4452 -#: builtin/commit.c:1237

4459 +#: builtin/commit.c:1201

4460 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

4462

4456 -#: builtin/commit.c:1249 builtin/tag.c:728

4463 +#: builtin/commit.c:1213 builtin/tag.c:728

4464 #, c-format

4465 msgid "Invalid cleanup mode %s"

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

4467

4461 -#: builtin/commit.c:1254

4468 +#: builtin/commit.c:1218

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

4470 msgstr "路径和 -a 选项同时使用没有意义。"

4471

4465 -#: builtin/commit.c:1364 builtin/commit.c:1644

4472 +#: builtin/commit.c:1328 builtin/commit.c:1608

4473 msgid "show status concisely"

4474 msgstr "以简洁的格式显示状态"

4475

4469 -#: builtin/commit.c:1366 builtin/commit.c:1646

4476 +#: builtin/commit.c:1330 builtin/commit.c:1610

4477 msgid "show branch information"

4478 msgstr "显示分支信息"

4479

4473 -#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500

4480 +#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500

4481 msgid "machine-readable output"

4482 msgstr "机器可读的输出"

4483

4477 -#: builtin/commit.c:1371 builtin/commit.c:1650

4484 +#: builtin/commit.c:1335 builtin/commit.c:1614

4485 msgid "show status in long format (default)"

4486 msgstr "以长格式显示状态（默认）"

4487

4481 -#: builtin/commit.c:1374 builtin/commit.c:1653

4488 +#: builtin/commit.c:1338 builtin/commit.c:1617

4489 msgid "terminate entries with NUL"

4490 msgstr "条目以NUL字符结尾"

4491

4485 -#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980

4492 +#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980

4493 #: builtin/fast-export.c:983 builtin/tag.c:603

4494 msgid "mode"

4495 msgstr "模式"

4496

4490 -#: builtin/commit.c:1377 builtin/commit.c:1656

4497 +#: builtin/commit.c:1341 builtin/commit.c:1620

4498 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4499 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

4500

4494 -#: builtin/commit.c:1380

4501 +#: builtin/commit.c:1344

4502 msgid "show ignored files"

4503 msgstr "显示忽略的文件"

4504

4498 -#: builtin/commit.c:1381 parse-options.h:153

4505 +#: builtin/commit.c:1345 parse-options.h:153

4506 msgid "when"

4507 msgstr "何时"

4508

4502 -#: builtin/commit.c:1382

4509 +#: builtin/commit.c:1346

4510 msgid ""

4511 "ignore changes to submodules, optional when: all, dirty, untracked. "

4512 "(Default: all)"

4513 msgstr ""

4514 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

4515

4509 -#: builtin/commit.c:1384

4516 +#: builtin/commit.c:1348

4517 msgid "list untracked files in columns"

4518 msgstr "以列的方式显示未跟踪的文件"

4519

4513 -#: builtin/commit.c:1471

4520 +#: builtin/commit.c:1435

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

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

4523

4517 -#: builtin/commit.c:1473

4524 +#: builtin/commit.c:1437

4525 msgid "could not parse newly created commit"

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

4527

4521 -#: builtin/commit.c:1518

4528 +#: builtin/commit.c:1482

4529 msgid "detached HEAD"

4530 msgstr "分离头指针"

4531

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

4526 -#: builtin/commit.c:1521

4533 +#: builtin/commit.c:1485

4534 msgid " (root-commit)"

4535 msgstr "（根提交）"

4536

4530 -#: builtin/commit.c:1614

4537 +#: builtin/commit.c:1578

4538 msgid "suppress summary after successful commit"

4539 msgstr "提交成功后不显示概述信息"

4540

4534 -#: builtin/commit.c:1615

4541 +#: builtin/commit.c:1579

4542 msgid "show diff in commit message template"

4543 msgstr "在提交说明模板里显示差异"

4544

4538 -#: builtin/commit.c:1617

4545 +#: builtin/commit.c:1581

4546 msgid "Commit message options"

4547 msgstr "提交说明选项"

4548

4542 -#: builtin/commit.c:1618 builtin/tag.c:601

4549 +#: builtin/commit.c:1582 builtin/tag.c:601

4550 msgid "read message from file"

4551 msgstr "从文件中读取提交说明"

4552

4546 -#: builtin/commit.c:1619

4553 +#: builtin/commit.c:1583

4554 msgid "author"

4555 msgstr "作者"

4556

4550 -#: builtin/commit.c:1619

4557 +#: builtin/commit.c:1583

4558 msgid "override author for commit"

4559 msgstr "提交时覆盖作者"

4560

4554 -#: builtin/commit.c:1620 builtin/gc.c:275

4561 +#: builtin/commit.c:1584 builtin/gc.c:275

4562 msgid "date"

4563 msgstr "日期"

4564

4558 -#: builtin/commit.c:1620

4565 +#: builtin/commit.c:1584

4566 msgid "override date for commit"

4567 msgstr "提交时覆盖日期"

4568

4562 -#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408

4563 -#: builtin/notes.c:565 builtin/tag.c:599

4569 +#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391

4570 +#: builtin/notes.c:554 builtin/tag.c:599

4571 msgid "message"

4572 msgstr "说明"

4573

4567 -#: builtin/commit.c:1621

4574 +#: builtin/commit.c:1585

4575 msgid "commit message"

4576 msgstr "提交说明"

4577

4571 -#: builtin/commit.c:1622

4578 +#: builtin/commit.c:1586

4579 msgid "reuse and edit message from specified commit"

4580 msgstr "重用并编辑指定提交的提交说明"

4581

4575 -#: builtin/commit.c:1623

4582 +#: builtin/commit.c:1587

4583 msgid "reuse message from specified commit"

4584 msgstr "重用指定提交的提交说明"

4585

4579 -#: builtin/commit.c:1624

4586 +#: builtin/commit.c:1588

4587 msgid "use autosquash formatted message to fixup specified commit"

4588 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

4589

4583 -#: builtin/commit.c:1625

4590 +#: builtin/commit.c:1589

4591 msgid "use autosquash formatted message to squash specified commit"

4592 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

4593

4587 -#: builtin/commit.c:1626

4594 +#: builtin/commit.c:1590

4595 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4596 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

4597

4591 -#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86

4598 +#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86

4599 msgid "add Signed-off-by:"

4600 msgstr "添加 Signed-off-by: 签名"

4601

4595 -#: builtin/commit.c:1628

4602 +#: builtin/commit.c:1592

4603 msgid "use specified template file"

4604 msgstr "使用指定的模板文件"

4605

4599 -#: builtin/commit.c:1629

4606 +#: builtin/commit.c:1593

4607 msgid "force edit of commit"

4608 msgstr "强制编辑提交"

4609

4610 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

4604 -#: builtin/commit.c:1630

4611 +#: builtin/commit.c:1594

4612 msgid "default"

4613 msgstr "default"

4614

4608 -#: builtin/commit.c:1630 builtin/tag.c:604

4615 +#: builtin/commit.c:1594 builtin/tag.c:604

4616 msgid "how to strip spaces and #comments from message"

4617 msgstr "设置如何删除提交说明里的空格和#注释"

4618

4612 -#: builtin/commit.c:1631

4619 +#: builtin/commit.c:1595

4620 msgid "include status in commit message template"

4621 msgstr "在提交说明模板里包含状态信息"

4622

4616 -#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92

4623 +#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92

4624 #: builtin/tag.c:605

4625 msgid "key-id"

4626 msgstr "key-id"

4627

4621 -#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93

4628 +#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93

4629 msgid "GPG sign commit"

4630 msgstr "GPG 提交签名"

4631

4625 -#: builtin/commit.c:1636

4632 +#: builtin/commit.c:1600

4633 msgid "Commit contents options"

4634 msgstr "提交内容选项"

4635

4629 -#: builtin/commit.c:1637

4636 +#: builtin/commit.c:1601

4637 msgid "commit all changed files"

4638 msgstr "提交所有改动的文件"

4639

4633 -#: builtin/commit.c:1638

4640 +#: builtin/commit.c:1602

4641 msgid "add specified files to index for commit"

4642 msgstr "添加指定的文件到索引区等待提交"

4643

4637 -#: builtin/commit.c:1639

4644 +#: builtin/commit.c:1603

4645 msgid "interactively add files"

4646 msgstr "交互式添加文件"

4647

4641 -#: builtin/commit.c:1640

4648 +#: builtin/commit.c:1604

4649 msgid "interactively add changes"

4650 msgstr "交互式添加变更"

4651

4645 -#: builtin/commit.c:1641

4652 +#: builtin/commit.c:1605

4653 msgid "commit only specified files"

4654 msgstr "只提交指定的文件"

4655

4649 -#: builtin/commit.c:1642

4656 +#: builtin/commit.c:1606

4657 msgid "bypass pre-commit hook"

4658 msgstr "绕过 pre-commit 钩子"

4659

4653 -#: builtin/commit.c:1643

4660 +#: builtin/commit.c:1607

4661 msgid "show what would be committed"

4662 msgstr "显示将要提交的内容"

4663

4657 -#: builtin/commit.c:1654

4664 +#: builtin/commit.c:1618

4665 msgid "amend previous commit"

4666 msgstr "修改先前的提交"

4667

4661 -#: builtin/commit.c:1655

4668 +#: builtin/commit.c:1619

4669 msgid "bypass post-rewrite hook"

4670 msgstr "绕过 post-rewrite 钩子"

4671

4665 -#: builtin/commit.c:1660

4672 +#: builtin/commit.c:1624

4673 msgid "ok to record an empty change"

4674 msgstr "允许一个空提交"

4675

4669 -#: builtin/commit.c:1662

4676 +#: builtin/commit.c:1626

4677 msgid "ok to record a change with an empty message"

4678 msgstr "允许空的提交说明"

4679

4673 -#: builtin/commit.c:1691

4680 +#: builtin/commit.c:1655

4681 msgid "could not parse HEAD commit"

4682 msgstr "不能解析 HEAD 提交"

4683

4677 -#: builtin/commit.c:1730 builtin/merge.c:518

4684 +#: builtin/commit.c:1694 builtin/merge.c:519

4685 #, c-format

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

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

4688

4682 -#: builtin/commit.c:1737

4689 +#: builtin/commit.c:1701

4690 #, c-format

4691 msgid "Corrupt MERGE_HEAD file (%s)"

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

4693

4687 -#: builtin/commit.c:1744

4694 +#: builtin/commit.c:1708

4695 msgid "could not read MERGE_MODE"

4696 msgstr "不能读取 MERGE_MODE"

4697

4691 -#: builtin/commit.c:1763

4698 +#: builtin/commit.c:1727

4699 #, c-format

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

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

4702

4696 -#: builtin/commit.c:1774

4703 +#: builtin/commit.c:1738

4704 #, c-format

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

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

4707

4701 -#: builtin/commit.c:1779

4708 +#: builtin/commit.c:1743

4709 #, c-format

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

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

4712

4706 -#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875

4713 +#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876

4714 msgid "failed to write commit object"

4715 msgstr "无法写提交对象"

4716

4710 -#: builtin/commit.c:1827

4717 +#: builtin/commit.c:1791

4718 msgid ""

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

4720 "new_index file. Check that disk is not full and quota is\n"

@@ -4800,17 +4807,13 @@ msgstr "列出所有"

4807 msgid "open an editor"

4808 msgstr "打开一个编辑器"

4809

4803 -#: builtin/config.c:72 builtin/config.c:73

4804 -msgid "slot"

4805 -msgstr "slot"

4806 -

4810 #: builtin/config.c:72

4808 -msgid "find the color configured: [default]"

4809 -msgstr "找到配置的颜色：[默认]"

4811 +msgid "find the color configured: slot [default]"

4812 +msgstr "获得配置的颜色：配置 [默认]"

4813

4814 #: builtin/config.c:73

4812 -msgid "find the color setting: [stdout-is-tty]"

4813 -msgstr "找到颜色设置：[stdout-is-tty]"

4815 +msgid "find the color setting: slot [stdout-is-tty]"

4816 +msgstr "获得颜色设置：配置 [stdout-is-tty]"

4817

4818 #: builtin/config.c:74

4819 msgid "Type"

@@ -4844,11 +4847,11 @@ msgstr "终止值是NUL字节"

4847 msgid "respect include directives on lookup"

4848 msgstr "查询时参照 include 指令递归查找"

4849

4847 -#: builtin/config.c:315

4850 +#: builtin/config.c:316

4851 msgid "unable to parse default color value"

4852 msgstr "不能解析缺省的颜色值"

4853

4851 -#: builtin/config.c:455

4854 +#: builtin/config.c:457

4855 #, c-format

4856 msgid ""

4857 "# This is Git's per-user configuration file.\n"

@@ -4863,7 +4866,7 @@ msgstr ""

4866 "#\tuser = %s\n"

4867 "#\temail = %s\n"

4868

4866 -#: builtin/config.c:590

4869 +#: builtin/config.c:589

4870 #, c-format

4871 msgid "cannot create configuration file %s"

4872 msgstr "不能创建配置文件 %s"

@@ -5294,7 +5297,7 @@ msgstr " （%s 已成为摇摆状态）"

5297 msgid "[deleted]"

5298 msgstr "[已删除]"

5299

5297 -#: builtin/fetch.c:799 builtin/remote.c:1063

5300 +#: builtin/fetch.c:799 builtin/remote.c:1058

5301 msgid "(none)"

5302 msgstr "（无）"

5303

@@ -5368,30 +5371,30 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5371 msgstr ""

5372 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5373

5371 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5372 -#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183

5374 +#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5375 +#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5376 #: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590

5377 #: parse-options.h:132 parse-options.h:239

5378 msgid "n"

5379 msgstr "n"

5380

5378 -#: builtin/fmt-merge-msg.c:664

5381 +#: builtin/fmt-merge-msg.c:663

5382 msgid "populate log with at most <n> entries from shortlog"

5383 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"

5384

5382 -#: builtin/fmt-merge-msg.c:667

5385 +#: builtin/fmt-merge-msg.c:666

5386 msgid "alias for --log (deprecated)"

5387 msgstr "参数 --log 的别名（已弃用）"

5388

5386 -#: builtin/fmt-merge-msg.c:670

5389 +#: builtin/fmt-merge-msg.c:669

5390 msgid "text"

5391 msgstr "文本"

5392

5390 -#: builtin/fmt-merge-msg.c:671

5393 +#: builtin/fmt-merge-msg.c:670

5394 msgid "use <text> as start of message"

5395 msgstr "使用 <文本> 作为提交说明的开始"

5396

5394 -#: builtin/fmt-merge-msg.c:672

5397 +#: builtin/fmt-merge-msg.c:671

5398 msgid "file to read from"

5399 msgstr "从文件中读取"

5400

@@ -5416,8 +5419,8 @@ msgid "quote placeholders suitably for python"

5419 msgstr "引用占位符适用于 python"

5420

5421 #: builtin/for-each-ref.c:1078

5419 -msgid "quote placeholders suitably for tcl"

5420 -msgstr "引用占位符适用于 tcl"

5422 +msgid "quote placeholders suitably for Tcl"

5423 +msgstr "引用占位符适用于 Tcl"

5424

5425 #: builtin/for-each-ref.c:1081

5426 msgid "show only <n> matched refs"

@@ -5884,61 +5887,61 @@ msgstr ""

5887 "'%s': 支持的 man 手册查看器命令。\n"

5888 "请使用 'man.<tool>.path'。"

5889

5887 -#: builtin/help.c:352

5890 +#: builtin/help.c:354

5891 #, c-format

5892 msgid "'%s': unknown man viewer."

5893 msgstr "'%s'：未知的 man 查看器。"

5894

5892 -#: builtin/help.c:369

5895 +#: builtin/help.c:371

5896 msgid "no man viewer handled the request"

5897 msgstr "没有 man 查看器处理此请求"

5898

5896 -#: builtin/help.c:377

5899 +#: builtin/help.c:379

5900 msgid "no info viewer handled the request"

5901 msgstr "没有 info 查看器处理此请求"

5902

5900 -#: builtin/help.c:423

5903 +#: builtin/help.c:428

5904 msgid "Defining attributes per path"

5905 msgstr "定义路径的属性"

5906

5904 -#: builtin/help.c:424

5907 +#: builtin/help.c:429

5908 msgid "Everyday Git With 20 Commands Or So"

5909 msgstr "每一天 Git 常用的约 20 条命令"

5910

5908 -#: builtin/help.c:425

5911 +#: builtin/help.c:430

5912 msgid "A Git glossary"

5913 msgstr "Git 词汇表"

5914

5912 -#: builtin/help.c:426

5915 +#: builtin/help.c:431

5916 msgid "Specifies intentionally untracked files to ignore"

5917 msgstr "忽略指定的未跟踪文件"

5918

5916 -#: builtin/help.c:427

5919 +#: builtin/help.c:432

5920 msgid "Defining submodule properties"

5921 msgstr "定义子模组属性"

5922

5920 -#: builtin/help.c:428

5923 +#: builtin/help.c:433

5924 msgid "Specifying revisions and ranges for Git"

5925 msgstr "指定 Git 的版本和版本范围"

5926

5924 -#: builtin/help.c:429

5927 +#: builtin/help.c:434

5928 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5929 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"

5930

5928 -#: builtin/help.c:430

5931 +#: builtin/help.c:435

5932 msgid "An overview of recommended workflows with Git"

5933 msgstr "Git 推荐的工作流概览"

5934

5932 -#: builtin/help.c:442

5935 +#: builtin/help.c:447

5936 msgid "The common Git guides are:\n"

5937 msgstr "最常用的 Git 向导有：\n"

5938

5936 -#: builtin/help.c:463 builtin/help.c:480

5939 +#: builtin/help.c:468 builtin/help.c:485

5940 #, c-format

5941 msgid "usage: %s%s"

5942 msgstr "用法：%s%s"

5943

5941 -#: builtin/help.c:496

5944 +#: builtin/help.c:501

5945 #, c-format

5946 msgid "`git %s' is aliased to `%s'"

5947 msgstr "`git %s' 是 `%s' 的别名"

@@ -6281,37 +6284,37 @@ msgstr "不能拷贝 '%s' 至 '%s'"

6284 msgid "ignoring template %s"

6285 msgstr "忽略模版 %s"

6286

6284 -#: builtin/init-db.c:133

6287 +#: builtin/init-db.c:136

6288 #, c-format

6289 msgid "insanely long template path %s"

6290 msgstr "太长的模版路径 %s"

6291

6289 -#: builtin/init-db.c:141

6292 +#: builtin/init-db.c:144

6293 #, c-format

6294 msgid "templates not found %s"

6295 msgstr "模版未找到 %s"

6296

6294 -#: builtin/init-db.c:154

6297 +#: builtin/init-db.c:157

6298 #, c-format

6299 msgid "not copying templates of a wrong format version %d from '%s'"

6300 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"

6301

6299 -#: builtin/init-db.c:192

6302 +#: builtin/init-db.c:197

6303 #, c-format

6304 msgid "insane git directory %s"

6305 msgstr "不正常的 git 目录 %s"

6306

6304 -#: builtin/init-db.c:323 builtin/init-db.c:326

6307 +#: builtin/init-db.c:331 builtin/init-db.c:334

6308 #, c-format

6309 msgid "%s already exists"

6310 msgstr "%s 已经存在"

6311

6309 -#: builtin/init-db.c:355

6312 +#: builtin/init-db.c:363

6313 #, c-format

6314 msgid "unable to handle file type %d"

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

6316

6314 -#: builtin/init-db.c:358

6317 +#: builtin/init-db.c:366

6318 #, c-format

6319 msgid "unable to move %s to %s"

6320 msgstr "不能移动 %s 至 %s"

@@ -6319,25 +6322,25 @@ msgstr "不能移动 %s 至 %s"

6322 #. TRANSLATORS: The first '%s' is either "Reinitialized

6323 #. existing" or "Initialized empty", the second " shared" or

6324 #. "", and the last '%s%s' is the verbatim directory name.

6322 -#: builtin/init-db.c:418

6325 +#: builtin/init-db.c:426

6326 #, c-format

6327 msgid "%s%s Git repository in %s%s\n"

6328 msgstr "%s%s Git 版本库于 %s%s\n"

6329

6327 -#: builtin/init-db.c:419

6330 +#: builtin/init-db.c:427

6331 msgid "Reinitialized existing"

6332 msgstr "重新初始化现存的"

6333

6331 -#: builtin/init-db.c:419

6334 +#: builtin/init-db.c:427

6335 msgid "Initialized empty"

6336 msgstr "初始化空的"

6337

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

6336 -#: builtin/init-db.c:420

6339 +#: builtin/init-db.c:428

6340 msgid " shared"

6341 msgstr "共享"

6342

6340 -#: builtin/init-db.c:467

6343 +#: builtin/init-db.c:475

6344 msgid ""

6345 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6346 "shared[=<permissions>]] [directory]"

@@ -6345,29 +6348,29 @@ msgstr ""

6348 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "

6349 "[目录]"

6350

6348 -#: builtin/init-db.c:490

6351 +#: builtin/init-db.c:498

6352 msgid "permissions"

6353 msgstr "权限"

6354

6352 -#: builtin/init-db.c:491

6355 +#: builtin/init-db.c:499

6356 msgid "specify that the git repository is to be shared amongst several users"

6357 msgstr "指定 git 版本库是多个用户之间共享的"

6358

6356 -#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172

6359 +#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6360 msgid "be quiet"

6361 msgstr "保持安静"

6362

6360 -#: builtin/init-db.c:525 builtin/init-db.c:530

6363 +#: builtin/init-db.c:533 builtin/init-db.c:538

6364 #, c-format

6365 msgid "cannot mkdir %s"

6366 msgstr "不能创建目录 %s"

6367

6365 -#: builtin/init-db.c:534

6368 +#: builtin/init-db.c:542

6369 #, c-format

6370 msgid "cannot chdir to %s"

6371 msgstr "不能切换目录到 %s"

6372

6370 -#: builtin/init-db.c:555

6373 +#: builtin/init-db.c:563

6374 #, c-format

6375 msgid ""

6376 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6376,7 +6379,7 @@ msgstr ""

6379 "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"

6380 "dir=<directory>）"

6381

6379 -#: builtin/init-db.c:583

6382 +#: builtin/init-db.c:591

6383 #, c-format

6384 msgid "Cannot access work tree '%s'"

6385 msgstr "不能访问工作区 '%s'"

@@ -6778,212 +6781,212 @@ msgstr "显示调试数据"

6781 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

6782 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"

6783

6781 -#: builtin/ls-tree.c:126

6784 +#: builtin/ls-tree.c:127

6785 msgid "only show trees"

6786 msgstr "只显示树"

6787

6785 -#: builtin/ls-tree.c:128

6788 +#: builtin/ls-tree.c:129

6789 msgid "recurse into subtrees"

6790 msgstr "递归到子树"

6791

6789 -#: builtin/ls-tree.c:130

6792 +#: builtin/ls-tree.c:131

6793 msgid "show trees when recursing"

6794 msgstr "当递归时显示树"

6795

6793 -#: builtin/ls-tree.c:133

6796 +#: builtin/ls-tree.c:134

6797 msgid "terminate entries with NUL byte"

6798 msgstr "条目以NUL字符终止"

6799

6797 -#: builtin/ls-tree.c:134

6800 +#: builtin/ls-tree.c:135

6801 msgid "include object size"

6802 msgstr "包括对象大小"

6803

6801 -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138

6804 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139

6805 msgid "list only filenames"

6806 msgstr "只列出文件名"

6807

6805 -#: builtin/ls-tree.c:141

6808 +#: builtin/ls-tree.c:142

6809 msgid "use full path names"

6810 msgstr "使用文件的全路径"

6811

6809 -#: builtin/ls-tree.c:143

6812 +#: builtin/ls-tree.c:144

6813 msgid "list entire tree; not just current directory (implies --full-name)"

6814 msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"

6815

6813 -#: builtin/merge.c:44

6816 +#: builtin/merge.c:45

6817 msgid "git merge [options] [<commit>...]"

6818 msgstr "git merge [选项] [<提交>...]"

6819

6817 -#: builtin/merge.c:45

6820 +#: builtin/merge.c:46

6821 msgid "git merge [options] <msg> HEAD <commit>"

6822 msgstr "git merge [选项] <说明> HEAD <提交>"

6823

6821 -#: builtin/merge.c:46

6824 +#: builtin/merge.c:47

6825 msgid "git merge --abort"

6826 msgstr "git merge --abort"

6827

6825 -#: builtin/merge.c:99

6828 +#: builtin/merge.c:100

6829 msgid "switch `m' requires a value"

6830 msgstr "开关 `m' 需要一个值"

6831

6829 -#: builtin/merge.c:136

6832 +#: builtin/merge.c:137

6833 #, c-format

6834 msgid "Could not find merge strategy '%s'.\n"

6835 msgstr "不能找到合并策略 '%s'。\n"

6836

6834 -#: builtin/merge.c:137

6837 +#: builtin/merge.c:138

6838 #, c-format

6839 msgid "Available strategies are:"

6840 msgstr "可用的策略有："

6841

6839 -#: builtin/merge.c:142

6842 +#: builtin/merge.c:143

6843 #, c-format

6844 msgid "Available custom strategies are:"

6845 msgstr "可用的自定义策略有："

6846

6844 -#: builtin/merge.c:192

6847 +#: builtin/merge.c:193

6848 msgid "do not show a diffstat at the end of the merge"

6849 msgstr "在合并的最后不显示差异统计"

6850

6848 -#: builtin/merge.c:195

6851 +#: builtin/merge.c:196

6852 msgid "show a diffstat at the end of the merge"

6853 msgstr "在合并的最后显示差异统计"

6854

6852 -#: builtin/merge.c:196

6855 +#: builtin/merge.c:197

6856 msgid "(synonym to --stat)"

6857 msgstr "（和 --stat 同义）"

6858

6856 -#: builtin/merge.c:198

6859 +#: builtin/merge.c:199

6860 msgid "add (at most <n>) entries from shortlog to merge commit message"

6861 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"

6862

6860 -#: builtin/merge.c:201

6863 +#: builtin/merge.c:202

6864 msgid "create a single commit instead of doing a merge"

6865 msgstr "创建一个单独的提交而不是做一次合并"

6866

6864 -#: builtin/merge.c:203

6867 +#: builtin/merge.c:204

6868 msgid "perform a commit if the merge succeeds (default)"

6869 msgstr "如果合并成功，执行一次提交（默认）"

6870

6868 -#: builtin/merge.c:205

6871 +#: builtin/merge.c:206

6872 msgid "edit message before committing"

6873 msgstr "在提交前编辑提交说明"

6874

6872 -#: builtin/merge.c:206

6875 +#: builtin/merge.c:207

6876 msgid "allow fast-forward (default)"

6877 msgstr "允许快进（默认）"

6878

6876 -#: builtin/merge.c:208

6879 +#: builtin/merge.c:209

6880 msgid "abort if fast-forward is not possible"

6881 msgstr "如果不能快进就放弃合并"

6882

6880 -#: builtin/merge.c:212

6883 +#: builtin/merge.c:213

6884 msgid "Verify that the named commit has a valid GPG signature"

6885 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"

6886

6884 -#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89

6887 +#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89

6888 msgid "strategy"

6889 msgstr "策略"

6890

6888 -#: builtin/merge.c:214

6891 +#: builtin/merge.c:215

6892 msgid "merge strategy to use"

6893 msgstr "要使用的合并策略"

6894

6892 -#: builtin/merge.c:215

6895 +#: builtin/merge.c:216

6896 msgid "option=value"

6897 msgstr "option=value"

6898

6896 -#: builtin/merge.c:216

6899 +#: builtin/merge.c:217

6900 msgid "option for selected merge strategy"

6901 msgstr "所选的合并策略的选项"

6902

6900 -#: builtin/merge.c:218

6903 +#: builtin/merge.c:219

6904 msgid "merge commit message (for a non-fast-forward merge)"

6905 msgstr "合并的提交说明（针对非快进式合并）"

6906

6904 -#: builtin/merge.c:222

6907 +#: builtin/merge.c:223

6908 msgid "abort the current in-progress merge"

6909 msgstr "放弃当前正在进行的合并"

6910

6908 -#: builtin/merge.c:250

6911 +#: builtin/merge.c:251

6912 msgid "could not run stash."

6913 msgstr "不能进行进度保存。"

6914

6912 -#: builtin/merge.c:255

6915 +#: builtin/merge.c:256

6916 msgid "stash failed"

6917 msgstr "进度保存失败"

6918

6916 -#: builtin/merge.c:260

6919 +#: builtin/merge.c:261

6920 #, c-format

6921 msgid "not a valid object: %s"

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

6923

6921 -#: builtin/merge.c:279 builtin/merge.c:296

6924 +#: builtin/merge.c:280 builtin/merge.c:297

6925 msgid "read-tree failed"

6926 msgstr "读取树失败"

6927

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

6926 -#: builtin/merge.c:326

6929 +#: builtin/merge.c:327

6930 msgid " (nothing to squash)"

6931 msgstr " （无可压缩）"

6932

6930 -#: builtin/merge.c:339

6933 +#: builtin/merge.c:340

6934 #, c-format

6935 msgid "Squash commit -- not updating HEAD\n"

6936 msgstr "压缩提交 -- 未更新 HEAD\n"

6937

6935 -#: builtin/merge.c:371

6938 +#: builtin/merge.c:372

6939 msgid "Writing SQUASH_MSG"

6940 msgstr "写入 SQUASH_MSG"

6941

6939 -#: builtin/merge.c:373

6942 +#: builtin/merge.c:374

6943 msgid "Finishing SQUASH_MSG"

6944 msgstr "完成 SQUASH_MSG"

6945

6943 -#: builtin/merge.c:396

6946 +#: builtin/merge.c:397

6947 #, c-format

6948 msgid "No merge message -- not updating HEAD\n"

6949 msgstr "无合并信息 -- 未更新 HEAD\n"

6950

6948 -#: builtin/merge.c:446

6951 +#: builtin/merge.c:447

6952 #, c-format

6953 msgid "'%s' does not point to a commit"

6954 msgstr "'%s' 没有指向一个提交"

6955

6953 -#: builtin/merge.c:558

6956 +#: builtin/merge.c:559

6957 #, c-format

6958 msgid "Bad branch.%s.mergeoptions string: %s"

6959 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"

6960

6958 -#: builtin/merge.c:653

6961 +#: builtin/merge.c:654

6962 msgid "git write-tree failed to write a tree"

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

6964

6962 -#: builtin/merge.c:677

6965 +#: builtin/merge.c:678

6966 msgid "Not handling anything other than two heads merge."

6967 msgstr "不能处理两个头合并之外的任何操作。"

6968

6966 -#: builtin/merge.c:691

6969 +#: builtin/merge.c:692

6970 #, c-format

6971 msgid "Unknown option for merge-recursive: -X%s"

6972 msgstr "merge-recursive 的未知选项：-X%s"

6973

6971 -#: builtin/merge.c:704

6974 +#: builtin/merge.c:705

6975 #, c-format

6976 msgid "unable to write %s"

6977 msgstr "不能写 %s"

6978

6976 -#: builtin/merge.c:793

6979 +#: builtin/merge.c:794

6980 #, c-format

6981 msgid "Could not read from '%s'"

6982 msgstr "不能从 '%s' 读取"

6983

6981 -#: builtin/merge.c:802

6984 +#: builtin/merge.c:803

6985 #, c-format

6986 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6987 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

6988

6986 -#: builtin/merge.c:808

6989 +#: builtin/merge.c:809

6990 #, c-format

6991 msgid ""

6992 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6997,47 +7000,47 @@ msgstr ""

7000 "\n"

7001 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

7002

7000 -#: builtin/merge.c:832

7003 +#: builtin/merge.c:833

7004 msgid "Empty commit message."

7005 msgstr "空提交信息。"

7006

7004 -#: builtin/merge.c:844

7007 +#: builtin/merge.c:845

7008 #, c-format

7009 msgid "Wonderful.\n"

7010 msgstr "太棒了。\n"

7011

7009 -#: builtin/merge.c:907

7012 +#: builtin/merge.c:900

7013 #, c-format

7014 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

7015 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

7016

7014 -#: builtin/merge.c:923

7017 +#: builtin/merge.c:916

7018 #, c-format

7019 msgid "'%s' is not a commit"

7020 msgstr "'%s' 不是一个提交"

7021

7019 -#: builtin/merge.c:964

7022 +#: builtin/merge.c:957

7023 msgid "No current branch."

7024 msgstr "没有当前分支。"

7025

7023 -#: builtin/merge.c:966

7026 +#: builtin/merge.c:959

7027 msgid "No remote for the current branch."

7028 msgstr "当前分支没有对应的远程版本库。"

7029

7027 -#: builtin/merge.c:968

7030 +#: builtin/merge.c:961

7031 msgid "No default upstream defined for the current branch."

7032 msgstr "当前分支没有定义默认的上游分支。"

7033

7031 -#: builtin/merge.c:973

7034 +#: builtin/merge.c:966

7035 #, c-format

7036 msgid "No remote-tracking branch for %s from %s"

7037 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"

7038

7036 -#: builtin/merge.c:1129

7039 +#: builtin/merge.c:1122

7040 msgid "There is no merge to abort (MERGE_HEAD missing)."

7041 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"

7042

7040 -#: builtin/merge.c:1145

7043 +#: builtin/merge.c:1138

7044 msgid ""

7045 "You have not concluded your merge (MERGE_HEAD exists).\n"

7046 "Please, commit your changes before you merge."

@@ -7045,11 +7048,11 @@ msgstr ""

7048 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"

7049 "请在合并前先提交您的修改。"

7050

7048 -#: builtin/merge.c:1148 git-pull.sh:34

7051 +#: builtin/merge.c:1141 git-pull.sh:34

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

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

7054

7052 -#: builtin/merge.c:1152

7055 +#: builtin/merge.c:1145

7056 msgid ""

7057 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

7058 "Please, commit your changes before you merge."

@@ -7057,100 +7060,100 @@ msgstr ""

7060 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

7061 "请在合并前先提交您的修改。"

7062

7060 -#: builtin/merge.c:1155

7063 +#: builtin/merge.c:1148

7064 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

7065 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

7066

7064 -#: builtin/merge.c:1164

7067 +#: builtin/merge.c:1157

7068 msgid "You cannot combine --squash with --no-ff."

7069 msgstr "您不能将 --squash 与 --no-ff 同时使用。"

7070

7068 -#: builtin/merge.c:1173

7071 +#: builtin/merge.c:1166

7072 msgid "No commit specified and merge.defaultToUpstream not set."

7073 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"

7074

7072 -#: builtin/merge.c:1205

7075 +#: builtin/merge.c:1198

7076 msgid "Can merge only exactly one commit into empty head"

7077 msgstr "只能将一个提交合并到空分支上"

7078

7076 -#: builtin/merge.c:1208

7079 +#: builtin/merge.c:1201

7080 msgid "Squash commit into empty head not supported yet"

7081 msgstr "尚不支持到空分支的压缩提交"

7082

7080 -#: builtin/merge.c:1210

7083 +#: builtin/merge.c:1203

7084 msgid "Non-fast-forward commit does not make sense into an empty head"

7085 msgstr "到空分支的非快进式提交没有意义"

7086

7084 -#: builtin/merge.c:1215

7087 +#: builtin/merge.c:1208

7088 #, c-format

7089 msgid "%s - not something we can merge"

7090 msgstr "%s - 不能被合并"

7091

7089 -#: builtin/merge.c:1266

7092 +#: builtin/merge.c:1259

7093 #, c-format

7094 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

7095 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

7096

7094 -#: builtin/merge.c:1269

7097 +#: builtin/merge.c:1262

7098 #, c-format

7099 msgid "Commit %s has a bad GPG signature allegedly by %s."

7100 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

7101

7099 -#: builtin/merge.c:1272

7102 +#: builtin/merge.c:1265

7103 #, c-format

7104 msgid "Commit %s does not have a GPG signature."

7105 msgstr "提交 %s 没有一个 GPG 签名。"

7106

7104 -#: builtin/merge.c:1275

7107 +#: builtin/merge.c:1268

7108 #, c-format

7109 msgid "Commit %s has a good GPG signature by %s\n"

7110 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

7111

7109 -#: builtin/merge.c:1356

7112 +#: builtin/merge.c:1349

7113 #, c-format

7114 msgid "Updating %s..%s\n"

7115 msgstr "更新 %s..%s\n"

7116

7114 -#: builtin/merge.c:1395

7117 +#: builtin/merge.c:1388

7118 #, c-format

7119 msgid "Trying really trivial in-index merge...\n"

7120 msgstr "尝试非常小的索引内合并...\n"

7121

7119 -#: builtin/merge.c:1402

7122 +#: builtin/merge.c:1395

7123 #, c-format

7124 msgid "Nope.\n"

7125 msgstr "无。\n"

7126

7124 -#: builtin/merge.c:1434

7127 +#: builtin/merge.c:1427

7128 msgid "Not possible to fast-forward, aborting."

7129 msgstr "无法快进，终止。"

7130

7128 -#: builtin/merge.c:1457 builtin/merge.c:1536

7131 +#: builtin/merge.c:1450 builtin/merge.c:1529

7132 #, c-format

7133 msgid "Rewinding the tree to pristine...\n"

7134 msgstr "将树回滚至原始状态...\n"

7135

7133 -#: builtin/merge.c:1461

7136 +#: builtin/merge.c:1454

7137 #, c-format

7138 msgid "Trying merge strategy %s...\n"

7139 msgstr "尝试合并策略 %s...\n"

7140

7138 -#: builtin/merge.c:1527

7141 +#: builtin/merge.c:1520

7142 #, c-format

7143 msgid "No merge strategy handled the merge.\n"

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

7145

7143 -#: builtin/merge.c:1529

7146 +#: builtin/merge.c:1522

7147 #, c-format

7148 msgid "Merge with strategy %s failed.\n"

7149 msgstr "使用策略 %s 合并失败。\n"

7150

7148 -#: builtin/merge.c:1538

7151 +#: builtin/merge.c:1531

7152 #, c-format

7153 msgid "Using the %s to prepare resolving by hand.\n"

7154 msgstr "使用 %s 以准备手工解决。\n"

7155

7153 -#: builtin/merge.c:1550

7156 +#: builtin/merge.c:1543

7157 #, c-format

7158 msgid "Automatic merge went well; stopped before committing as requested\n"

7159 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -7337,7 +7340,7 @@ msgstr "%s，源=%s，目标=%s"

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

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

7342

7340 -#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358

7343 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355

7344 #, c-format

7345 msgid "renaming '%s' failed"

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

@@ -7388,11 +7391,11 @@ msgstr "git notes [--ref <注解引用>] [list [<对象>]]"

7391

7392 #: builtin/notes.c:25

7393 msgid ""

7391 -"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "

7392 -"<object>] [<object>]"

7394 +"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7395 +"| (-c | -C) <object>] [<object>]"

7396 msgstr ""

7394 -"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"

7395 -"象>] [<对象>]"

7397 +"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "

7398 +"| (-c | -C) <对象>] [<对象>]"

7399

7400 #: builtin/notes.c:26

7401 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

@@ -7400,15 +7403,15 @@ msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"

7403

7404 #: builtin/notes.c:27

7405 msgid ""

7403 -"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "

7404 -"<object>] [<object>]"

7406 +"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7407 +"(-c | -C) <object>] [<object>]"

7408 msgstr ""

7406 -"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"

7407 -">] [<对象>]"

7409 +"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "

7410 +"(-c | -C) <对象>] [<对象>]"

7411

7412 #: builtin/notes.c:28

7410 -msgid "git notes [--ref <notes_ref>] edit [<object>]"

7411 -msgstr "git notes [--ref <注解引用>] edit [<对象>]"

7413 +msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"

7414 +msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"

7415

7416 #: builtin/notes.c:29

7417 msgid "git notes [--ref <notes_ref>] show [<object>]"

@@ -7491,154 +7494,158 @@ msgstr "git notes prune [<选项>]"

7494 msgid "git notes get-ref"

7495 msgstr "git notes get-ref"

7496

7494 -#: builtin/notes.c:136

7497 +#: builtin/notes.c:146

7498 #, c-format

7499 msgid "unable to start 'show' for object '%s'"

7500 msgstr "不能为对象 '%s' 开始 'show'"

7501

7499 -#: builtin/notes.c:140

7502 +#: builtin/notes.c:150

7503 msgid "could not read 'show' output"

7504 msgstr "不能读取 'show' 的输出"

7505

7503 -#: builtin/notes.c:148

7506 +#: builtin/notes.c:158

7507 #, c-format

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

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

7510

7508 -#: builtin/notes.c:166 builtin/tag.c:477

7511 +#: builtin/notes.c:173 builtin/tag.c:477

7512 #, c-format

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

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

7515

7513 -#: builtin/notes.c:185

7516 +#: builtin/notes.c:192

7517 msgid "Please supply the note contents using either -m or -F option"

7518 msgstr "请通过 -m 或 -F 选项为注解提供内容"

7519

7517 -#: builtin/notes.c:206 builtin/notes.c:847

7518 -#, c-format

7519 -msgid "Removing note for object %s\n"

7520 -msgstr "删除对象 %s 的注解\n"

7521 -

7522 -#: builtin/notes.c:211

7520 +#: builtin/notes.c:201

7521 msgid "unable to write note object"

7522 msgstr "不能写注解对象"

7523

7526 -#: builtin/notes.c:213

7524 +#: builtin/notes.c:203

7525 #, c-format

7526 msgid "The note contents have been left in %s"

7527 msgstr "注解内容被留在 %s 中"

7528

7531 -#: builtin/notes.c:247 builtin/tag.c:693

7529 +#: builtin/notes.c:231 builtin/tag.c:693

7530 #, c-format

7531 msgid "cannot read '%s'"

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

7533

7536 -#: builtin/notes.c:249 builtin/tag.c:696

7534 +#: builtin/notes.c:233 builtin/tag.c:696

7535 #, c-format

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

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

7538

7541 -#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321

7542 -#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518

7543 -#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640

7544 -#: builtin/notes.c:842 builtin/tag.c:709

7539 +#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305

7540 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506

7541 +#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652

7542 +#: builtin/notes.c:854 builtin/tag.c:709

7543 #, c-format

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

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

7546

7549 -#: builtin/notes.c:271

7547 +#: builtin/notes.c:255

7548 #, c-format

7549 msgid "Failed to read object '%s'."

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

7551

7554 -#: builtin/notes.c:275

7552 +#: builtin/notes.c:259

7553 #, c-format

7554 msgid "Cannot read note data from non-blob object '%s'."

7555 msgstr "不能从非数据对象 '%s' 中读取注解数据"

7556

7559 -#: builtin/notes.c:315

7557 +#: builtin/notes.c:299

7558 #, c-format

7559 msgid "Malformed input line: '%s'."

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

7561

7564 -#: builtin/notes.c:330

7562 +#: builtin/notes.c:314

7563 #, c-format

7564 msgid "Failed to copy notes from '%s' to '%s'"

7565 msgstr "无法从 '%s' 到 '%s' 拷贝注解"

7566

7569 -#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501

7570 -#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633

7571 -#: builtin/notes.c:907

7567 +#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489

7568 +#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645

7569 +#: builtin/notes.c:919

7570 msgid "too many parameters"

7571 msgstr "参数太多"

7572

7575 -#: builtin/notes.c:387 builtin/notes.c:646

7573 +#: builtin/notes.c:371 builtin/notes.c:658

7574 #, c-format

7575 msgid "No note found for object %s."

7576 msgstr "未发现对象 %s 的注解。"

7577

7580 -#: builtin/notes.c:409 builtin/notes.c:566

7578 +#: builtin/notes.c:392 builtin/notes.c:555

7579 msgid "note contents as a string"

7580 msgstr "注解内容作为一个字符串"

7581

7584 -#: builtin/notes.c:412 builtin/notes.c:569

7582 +#: builtin/notes.c:395 builtin/notes.c:558

7583 msgid "note contents in a file"

7584 msgstr "注解内容到一个文件中"

7585

7588 -#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571

7589 -#: builtin/notes.c:574 builtin/tag.c:628

7586 +#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560

7587 +#: builtin/notes.c:563 builtin/tag.c:628

7588 msgid "object"

7589 msgstr "对象"

7590

7593 -#: builtin/notes.c:415 builtin/notes.c:572

7591 +#: builtin/notes.c:398 builtin/notes.c:561

7592 msgid "reuse and edit specified note object"

7593 msgstr "重用和编辑指定的注解对象"

7594

7597 -#: builtin/notes.c:418 builtin/notes.c:575

7595 +#: builtin/notes.c:401 builtin/notes.c:564

7596 msgid "reuse specified note object"

7597 msgstr "重用指定的注解对象"

7598

7601 -#: builtin/notes.c:420 builtin/notes.c:488

7599 +#: builtin/notes.c:404 builtin/notes.c:567

7600 +msgid "allow storing empty note"

7601 +msgstr "允许保存空白注释"

7602 +

7603 +#: builtin/notes.c:405 builtin/notes.c:476

7604 msgid "replace existing notes"

7605 msgstr "替换已存在的注解"

7606

7605 -#: builtin/notes.c:454

7607 +#: builtin/notes.c:430

7608 #, c-format

7609 msgid ""

7610 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

7611 "existing notes"

7612 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

7613

7612 -#: builtin/notes.c:459 builtin/notes.c:536

7614 +#: builtin/notes.c:445 builtin/notes.c:524

7615 #, c-format

7616 msgid "Overwriting existing notes for object %s\n"

7617 msgstr "覆盖对象 %s 现存注解\n"

7618

7617 -#: builtin/notes.c:489

7619 +#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859

7620 +#, c-format

7621 +msgid "Removing note for object %s\n"

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

7623 +

7624 +#: builtin/notes.c:477

7625 msgid "read objects from stdin"

7626 msgstr "从标准输入读取对象"

7627

7621 -#: builtin/notes.c:491

7628 +#: builtin/notes.c:479

7629 msgid "load rewriting config for <command> (implies --stdin)"

7630 msgstr "重新加载 <命令> 的配置（隐含 --stdin）"

7631

7625 -#: builtin/notes.c:509

7632 +#: builtin/notes.c:497

7633 msgid "too few parameters"

7634 msgstr "参数太少"

7635

7629 -#: builtin/notes.c:530

7636 +#: builtin/notes.c:518

7637 #, c-format

7638 msgid ""

7639 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

7640 "existing notes"

7641 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

7642

7636 -#: builtin/notes.c:542

7643 +#: builtin/notes.c:530

7644 #, c-format

7645 msgid "Missing notes on source object %s. Cannot copy."

7646 msgstr "源对象 %s 缺少注解。不能拷贝。"

7647

7641 -#: builtin/notes.c:591

7648 +#: builtin/notes.c:582

7649 #, c-format

7650 msgid ""

7651 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -7647,58 +7654,58 @@ msgstr ""

7654 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"

7655 "请换用 'git notes add -f -m/-F/-c/-C'。\n"

7656

7650 -#: builtin/notes.c:738

7657 +#: builtin/notes.c:750

7658 msgid "General options"

7659 msgstr "通用选项"

7660

7654 -#: builtin/notes.c:740

7661 +#: builtin/notes.c:752

7662 msgid "Merge options"

7663 msgstr "合并选项"

7664

7658 -#: builtin/notes.c:742

7665 +#: builtin/notes.c:754

7666 msgid ""

7667 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

7668 "cat_sort_uniq)"

7669 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"

7670

7664 -#: builtin/notes.c:744

7671 +#: builtin/notes.c:756

7672 msgid "Committing unmerged notes"

7673 msgstr "提交未合并的注解"

7674

7668 -#: builtin/notes.c:746

7675 +#: builtin/notes.c:758

7676 msgid "finalize notes merge by committing unmerged notes"

7677 msgstr "通过提交未合并的注解来完成注解合并"

7678

7672 -#: builtin/notes.c:748

7679 +#: builtin/notes.c:760

7680 msgid "Aborting notes merge resolution"

7681 msgstr "中止注解合并的方案"

7682

7676 -#: builtin/notes.c:750

7683 +#: builtin/notes.c:762

7684 msgid "abort notes merge"

7685 msgstr "中止注解合并"

7686

7680 -#: builtin/notes.c:845

7687 +#: builtin/notes.c:857

7688 #, c-format

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

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

7691

7685 -#: builtin/notes.c:857

7692 +#: builtin/notes.c:869

7693 msgid "attempt to remove non-existent note is not an error"

7694 msgstr "尝试删除不存在的注解不是一个错误"

7695

7689 -#: builtin/notes.c:860

7696 +#: builtin/notes.c:872

7697 msgid "read object names from the standard input"

7698 msgstr "从标准输入读取对象名称"

7699

7693 -#: builtin/notes.c:941

7700 +#: builtin/notes.c:953

7701 msgid "notes-ref"

7702 msgstr "注解引用"

7703

7697 -#: builtin/notes.c:942

7704 +#: builtin/notes.c:954

7705 msgid "use notes from <notes_ref>"

7706 msgstr "从 <注解引用> 使用注解"

7707

7701 -#: builtin/notes.c:977 builtin/remote.c:1624

7708 +#: builtin/notes.c:989 builtin/remote.c:1619

7709 #, c-format

7710 msgid "Unknown subcommand: %s"

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

@@ -7748,139 +7755,143 @@ msgstr "选项 %s 不接受否定格式"

7755 msgid "unable to parse value '%s' for option %s"

7756 msgstr "不能解析选项 %1$s 的值 '%2$s'"

7757

7751 -#: builtin/pack-objects.c:2622

7758 +#: builtin/pack-objects.c:2623

7759 msgid "do not show progress meter"

7760 msgstr "不显示进度表"

7761

7755 -#: builtin/pack-objects.c:2624

7762 +#: builtin/pack-objects.c:2625

7763 msgid "show progress meter"

7764 msgstr "显示进度表"

7765

7759 -#: builtin/pack-objects.c:2626

7766 +#: builtin/pack-objects.c:2627

7767 msgid "show progress meter during object writing phase"

7768 msgstr "在对象写入阶段显示进度表"

7769

7763 -#: builtin/pack-objects.c:2629

7770 +#: builtin/pack-objects.c:2630

7771 msgid "similar to --all-progress when progress meter is shown"

7772 msgstr "当进度表显示时类似于 --all-progress"

7773

7767 -#: builtin/pack-objects.c:2630

7774 +#: builtin/pack-objects.c:2631

7775 msgid "version[,offset]"

7776 msgstr "版本[,偏移]"

7777

7771 -#: builtin/pack-objects.c:2631

7778 +#: builtin/pack-objects.c:2632

7779 msgid "write the pack index file in the specified idx format version"

7780 msgstr "用指定的 idx 格式版本来写包索引文件"

7781

7775 -#: builtin/pack-objects.c:2634

7782 +#: builtin/pack-objects.c:2635

7783 msgid "maximum size of each output pack file"

7784 msgstr "每个输出包的最大尺寸"

7785

7779 -#: builtin/pack-objects.c:2636

7786 +#: builtin/pack-objects.c:2637

7787 msgid "ignore borrowed objects from alternate object store"

7788 msgstr "忽略从替代对象存储里借用对象"

7789

7783 -#: builtin/pack-objects.c:2638

7790 +#: builtin/pack-objects.c:2639

7791 msgid "ignore packed objects"

7792 msgstr "忽略包对象"

7793

7787 -#: builtin/pack-objects.c:2640

7794 +#: builtin/pack-objects.c:2641

7795 msgid "limit pack window by objects"

7796 msgstr "限制打包窗口的对象数"

7797

7791 -#: builtin/pack-objects.c:2642

7798 +#: builtin/pack-objects.c:2643

7799 msgid "limit pack window by memory in addition to object limit"

7800 msgstr "除对象数量限制外设置打包窗口的内存限制"

7801

7795 -#: builtin/pack-objects.c:2644

7802 +#: builtin/pack-objects.c:2645

7803 msgid "maximum length of delta chain allowed in the resulting pack"

7804 msgstr "打包允许的 delta 链的最大长度"

7805

7799 -#: builtin/pack-objects.c:2646

7806 +#: builtin/pack-objects.c:2647

7807 msgid "reuse existing deltas"

7808 msgstr "重用已存在的 deltas"

7809

7803 -#: builtin/pack-objects.c:2648

7810 +#: builtin/pack-objects.c:2649

7811 msgid "reuse existing objects"

7812 msgstr "重用已存在的对象"

7813

7807 -#: builtin/pack-objects.c:2650

7814 +#: builtin/pack-objects.c:2651

7815 msgid "use OFS_DELTA objects"

7816 msgstr "使用 OFS_DELTA 对象"

7817

7811 -#: builtin/pack-objects.c:2652

7818 +#: builtin/pack-objects.c:2653

7819 msgid "use threads when searching for best delta matches"

7820 msgstr "使用线程查询最佳 delta 匹配"

7821

7815 -#: builtin/pack-objects.c:2654

7822 +#: builtin/pack-objects.c:2655

7823 msgid "do not create an empty pack output"

7824 msgstr "不创建空的包输出"

7825

7819 -#: builtin/pack-objects.c:2656

7826 +#: builtin/pack-objects.c:2657

7827 msgid "read revision arguments from standard input"

7828 msgstr "从标准输入读取修订号参数"

7829

7823 -#: builtin/pack-objects.c:2658

7830 +#: builtin/pack-objects.c:2659

7831 msgid "limit the objects to those that are not yet packed"

7832 msgstr "限制那些尚未打包的对象"

7833

7827 -#: builtin/pack-objects.c:2661

7834 +#: builtin/pack-objects.c:2662

7835 msgid "include objects reachable from any reference"

7836 msgstr "包括可以从任何引用访问到的对象"

7837

7831 -#: builtin/pack-objects.c:2664

7838 +#: builtin/pack-objects.c:2665

7839 msgid "include objects referred by reflog entries"

7840 msgstr "包括被引用日志引用到的对象"

7841

7835 -#: builtin/pack-objects.c:2667

7842 +#: builtin/pack-objects.c:2668

7843 msgid "include objects referred to by the index"

7844 msgstr "包括被索引引用到的对象"

7845

7839 -#: builtin/pack-objects.c:2670

7846 +#: builtin/pack-objects.c:2671

7847 msgid "output pack to stdout"

7848 msgstr "输出包到标准输出"

7849

7843 -#: builtin/pack-objects.c:2672

7850 +#: builtin/pack-objects.c:2673

7851 msgid "include tag objects that refer to objects to be packed"

7852 msgstr "包括引用了打包对象的 tag"

7853

7847 -#: builtin/pack-objects.c:2674

7854 +#: builtin/pack-objects.c:2675

7855 msgid "keep unreachable objects"

7856 msgstr "维持不可达的对象"

7857

7851 -#: builtin/pack-objects.c:2675 parse-options.h:140

7858 +#: builtin/pack-objects.c:2676 parse-options.h:140

7859 msgid "time"

7860 msgstr "时间"

7861

7855 -#: builtin/pack-objects.c:2676

7862 +#: builtin/pack-objects.c:2677

7863 msgid "unpack unreachable objects newer than <time>"

7864 msgstr "将比给定 <时间> 新的无法访问的对象解包"

7865

7859 -#: builtin/pack-objects.c:2679

7866 +#: builtin/pack-objects.c:2680

7867 msgid "create thin packs"

7868 msgstr "创建精简包"

7869

7863 -#: builtin/pack-objects.c:2681

7870 +#: builtin/pack-objects.c:2682

7871 +msgid "create packs suitable for shallow fetches"

7872 +msgstr "创建适合浅克隆版本库获取的包"

7873 +

7874 +#: builtin/pack-objects.c:2684

7875 msgid "ignore packs that have companion .keep file"

7876 msgstr "忽略配有 .keep 文件的包"

7877

7867 -#: builtin/pack-objects.c:2683

7878 +#: builtin/pack-objects.c:2686

7879 msgid "pack compression level"

7880 msgstr "打包压缩级别"

7881

7871 -#: builtin/pack-objects.c:2685

7882 +#: builtin/pack-objects.c:2688

7883 msgid "do not hide commits by grafts"

7884 msgstr "显示被嫁接隐藏的提交"

7885

7875 -#: builtin/pack-objects.c:2687

7886 +#: builtin/pack-objects.c:2690

7887 msgid "use a bitmap index if available to speed up counting objects"

7888 msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"

7889

7879 -#: builtin/pack-objects.c:2689

7890 +#: builtin/pack-objects.c:2692

7891 msgid "write a bitmap index together with the pack index"

7892 msgstr "在建立包索引的同时创建 bitmap 索引"

7893

7883 -#: builtin/pack-objects.c:2778

7894 +#: builtin/pack-objects.c:2783

7895 msgid "Counting objects"

7896 msgstr "对象计数中"

7897

@@ -8483,7 +8494,7 @@ msgstr "（删除）"

8494 msgid "Could not append '%s' to '%s'"

8495 msgstr "不能添加 '%s' 至 '%s'"

8496

8486 -#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898

8497 +#: builtin/remote.c:634 builtin/remote.c:793 builtin/remote.c:893

8498 #, c-format

8499 msgid "No such remote: %s"

8500 msgstr "没有这样的远程：%s"

@@ -8493,7 +8504,7 @@ msgstr "没有这样的远程：%s"

8504 msgid "Could not rename config section '%s' to '%s'"

8505 msgstr "不能重命名配置小节 '%s' 到 '%s'"

8506

8496 -#: builtin/remote.c:657 builtin/remote.c:850

8507 +#: builtin/remote.c:657 builtin/remote.c:845

8508 #, c-format

8509 msgid "Could not remove config section '%s'"

8510 msgstr "不能移除配置小节 '%s'"

@@ -8529,12 +8540,12 @@ msgstr "删除 '%s' 失败"

8540 msgid "creating '%s' failed"

8541 msgstr "创建 '%s' 失败"

8542

8532 -#: builtin/remote.c:769

8543 +#: builtin/remote.c:764

8544 #, c-format

8545 msgid "Could not remove branch %s"

8546 msgstr "无法移除分支 %s"

8547

8537 -#: builtin/remote.c:836

8548 +#: builtin/remote.c:831

8549 msgid ""

8550 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

8551 "to delete it, use:"

@@ -8544,126 +8555,126 @@ msgid_plural ""

8555 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："

8556 msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："

8557

8547 -#: builtin/remote.c:951

8558 +#: builtin/remote.c:946

8559 #, c-format

8560 msgid " new (next fetch will store in remotes/%s)"

8561 msgstr " 新的（下一次获取将存储于 remotes/%s）"

8562

8552 -#: builtin/remote.c:954

8563 +#: builtin/remote.c:949

8564 msgid " tracked"

8565 msgstr " 已跟踪"

8566

8556 -#: builtin/remote.c:956

8567 +#: builtin/remote.c:951

8568 msgid " stale (use 'git remote prune' to remove)"

8569 msgstr " 过时（使用 'git remote prune' 来移除）"

8570

8560 -#: builtin/remote.c:958

8571 +#: builtin/remote.c:953

8572 msgid " ???"

8573 msgstr " ???"

8574

8564 -#: builtin/remote.c:999

8575 +#: builtin/remote.c:994

8576 #, c-format

8577 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

8578 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"

8579

8569 -#: builtin/remote.c:1006

8580 +#: builtin/remote.c:1001

8581 #, c-format

8582 msgid "rebases onto remote %s"

8583 msgstr "变基到远程 %s"

8584

8574 -#: builtin/remote.c:1009

8585 +#: builtin/remote.c:1004

8586 #, c-format

8587 msgid " merges with remote %s"

8588 msgstr " 与远程 %s 合并"

8589

8579 -#: builtin/remote.c:1010

8590 +#: builtin/remote.c:1005

8591 msgid " and with remote"

8592 msgstr " 且有远程"

8593

8583 -#: builtin/remote.c:1012

8594 +#: builtin/remote.c:1007

8595 #, c-format

8596 msgid "merges with remote %s"

8597 msgstr "与远程 %s 合并"

8598

8588 -#: builtin/remote.c:1013

8599 +#: builtin/remote.c:1008

8600 msgid " and with remote"

8601 msgstr " 且有远程"

8602

8592 -#: builtin/remote.c:1059

8603 +#: builtin/remote.c:1054

8604 msgid "create"

8605 msgstr "创建"

8606

8596 -#: builtin/remote.c:1062

8607 +#: builtin/remote.c:1057

8608 msgid "delete"

8609 msgstr "删除"

8610

8600 -#: builtin/remote.c:1066

8611 +#: builtin/remote.c:1061

8612 msgid "up to date"

8613 msgstr "最新"

8614

8604 -#: builtin/remote.c:1069

8615 +#: builtin/remote.c:1064

8616 msgid "fast-forwardable"

8617 msgstr "可快进"

8618

8608 -#: builtin/remote.c:1072

8619 +#: builtin/remote.c:1067

8620 msgid "local out of date"

8621 msgstr "本地已过时"

8622

8612 -#: builtin/remote.c:1079

8623 +#: builtin/remote.c:1074

8624 #, c-format

8625 msgid " %-*s forces to %-*s (%s)"

8626 msgstr " %-*s 强制推送至 %-*s (%s)"

8627

8617 -#: builtin/remote.c:1082

8628 +#: builtin/remote.c:1077

8629 #, c-format

8630 msgid " %-*s pushes to %-*s (%s)"

8631 msgstr " %-*s 推送至 %-*s (%s)"

8632

8622 -#: builtin/remote.c:1086

8633 +#: builtin/remote.c:1081

8634 #, c-format

8635 msgid " %-*s forces to %s"

8636 msgstr " %-*s 强制推送至 %s"

8637

8627 -#: builtin/remote.c:1089

8638 +#: builtin/remote.c:1084

8639 #, c-format

8640 msgid " %-*s pushes to %s"

8641 msgstr " %-*s 推送至 %s"

8642

8632 -#: builtin/remote.c:1157

8643 +#: builtin/remote.c:1152

8644 msgid "do not query remotes"

8645 msgstr "不查询远程"

8646

8636 -#: builtin/remote.c:1184

8647 +#: builtin/remote.c:1179

8648 #, c-format

8649 msgid "* remote %s"

8650 msgstr "* 远程 %s"

8651

8641 -#: builtin/remote.c:1185

8652 +#: builtin/remote.c:1180

8653 #, c-format

8654 msgid " Fetch URL: %s"

8655 msgstr " 获取地址：%s"

8656

8646 -#: builtin/remote.c:1186 builtin/remote.c:1333

8657 +#: builtin/remote.c:1181 builtin/remote.c:1332

8658 msgid "(no URL)"

8659 msgstr "(无 URL)"

8660

8650 -#: builtin/remote.c:1195 builtin/remote.c:1197

8661 +#: builtin/remote.c:1190 builtin/remote.c:1192

8662 #, c-format

8663 msgid " Push URL: %s"

8664 msgstr " 推送地址：%s"

8665

8655 -#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203

8666 +#: builtin/remote.c:1194 builtin/remote.c:1196 builtin/remote.c:1198

8667 #, c-format

8668 msgid " HEAD branch: %s"

8669 msgstr " HEAD分支：%s"

8670

8660 -#: builtin/remote.c:1205

8671 +#: builtin/remote.c:1200

8672 #, c-format

8673 msgid ""

8674 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

8675 msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"

8676

8666 -#: builtin/remote.c:1217

8677 +#: builtin/remote.c:1212

8678 #, c-format

8679 msgid " Remote branch:%s"

8680 msgid_plural " Remote branches:%s"

@@ -8671,138 +8682,138 @@ msgstr[0] " 远程分支：%s"

8682 msgstr[1] " 远程分支：%s"

8683

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

8674 -#: builtin/remote.c:1220 builtin/remote.c:1247

8685 +#: builtin/remote.c:1215 builtin/remote.c:1242

8686 msgid " (status not queried)"

8687 msgstr "（状态未查询）"

8688

8678 -#: builtin/remote.c:1229

8689 +#: builtin/remote.c:1224

8690 msgid " Local branch configured for 'git pull':"

8691 msgid_plural " Local branches configured for 'git pull':"

8692 msgstr[0] " 为 'git pull' 配置的本地分支："

8693 msgstr[1] " 为 'git pull' 配置的本地分支："

8694

8684 -#: builtin/remote.c:1237

8695 +#: builtin/remote.c:1232

8696 msgid " Local refs will be mirrored by 'git push'"

8697 msgstr " 本地引用将在 'git push' 时被镜像"

8698

8688 -#: builtin/remote.c:1244

8699 +#: builtin/remote.c:1239

8700 #, c-format

8701 msgid " Local ref configured for 'git push'%s:"

8702 msgid_plural " Local refs configured for 'git push'%s:"

8703 msgstr[0] " 为 'git push' 配置的本地引用%s："

8704 msgstr[1] " 为 'git push' 配置的本地引用%s："

8705

8695 -#: builtin/remote.c:1265

8706 +#: builtin/remote.c:1260

8707 msgid "set refs/remotes/<name>/HEAD according to remote"

8708 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"

8709

8699 -#: builtin/remote.c:1267

8710 +#: builtin/remote.c:1262

8711 msgid "delete refs/remotes/<name>/HEAD"

8712 msgstr "删除 refs/remotes/<名称>/HEAD"

8713

8703 -#: builtin/remote.c:1282

8714 +#: builtin/remote.c:1277

8715 msgid "Cannot determine remote HEAD"

8716 msgstr "无法确定远程 HEAD"

8717

8707 -#: builtin/remote.c:1284

8718 +#: builtin/remote.c:1279

8719 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

8720 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："

8721

8711 -#: builtin/remote.c:1294

8722 +#: builtin/remote.c:1289

8723 #, c-format

8724 msgid "Could not delete %s"

8725 msgstr "无法删除 %s"

8726

8716 -#: builtin/remote.c:1302

8727 +#: builtin/remote.c:1297

8728 #, c-format

8729 msgid "Not a valid ref: %s"

8730 msgstr "不是一个有效引用：%s"

8731

8721 -#: builtin/remote.c:1304

8732 +#: builtin/remote.c:1299

8733 #, c-format

8734 msgid "Could not setup %s"

8735 msgstr "不能设置 %s"

8736

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

8727 -#: builtin/remote.c:1322

8738 +#: builtin/remote.c:1317

8739 #, c-format

8740 msgid " %s will become dangling!"

8741 msgstr " %s 将成为摇摆状态！"

8742

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

8733 -#: builtin/remote.c:1323

8744 +#: builtin/remote.c:1318

8745 #, c-format

8746 msgid " %s has become dangling!"

8747 msgstr " %s 已成为摇摆状态！"

8748

8738 -#: builtin/remote.c:1329

8749 +#: builtin/remote.c:1328

8750 #, c-format

8751 msgid "Pruning %s"

8752 msgstr "修剪 %s"

8753

8743 -#: builtin/remote.c:1330

8754 +#: builtin/remote.c:1329

8755 #, c-format

8756 msgid "URL: %s"

8757 msgstr "URL：%s"

8758

8748 -#: builtin/remote.c:1357

8759 +#: builtin/remote.c:1352

8760 #, c-format

8761 msgid " * [would prune] %s"

8762 msgstr " * [将删除] %s"

8763

8753 -#: builtin/remote.c:1360

8764 +#: builtin/remote.c:1355

8765 #, c-format

8766 msgid " * [pruned] %s"

8767 msgstr " * [已删除] %s"

8768

8758 -#: builtin/remote.c:1405

8769 +#: builtin/remote.c:1400

8770 msgid "prune remotes after fetching"

8771 msgstr "抓取后清除远程"

8772

8762 -#: builtin/remote.c:1471 builtin/remote.c:1545

8773 +#: builtin/remote.c:1466 builtin/remote.c:1540

8774 #, c-format

8775 msgid "No such remote '%s'"

8776 msgstr "没有此远程 '%s'"

8777

8767 -#: builtin/remote.c:1491

8778 +#: builtin/remote.c:1486

8779 msgid "add branch"

8780 msgstr "添加分支"

8781

8771 -#: builtin/remote.c:1498

8782 +#: builtin/remote.c:1493

8783 msgid "no remote specified"

8784 msgstr "未指定远程"

8785

8775 -#: builtin/remote.c:1520

8786 +#: builtin/remote.c:1515

8787 msgid "manipulate push URLs"

8788 msgstr "操作推送 URLS"

8789

8779 -#: builtin/remote.c:1522

8790 +#: builtin/remote.c:1517

8791 msgid "add URL"

8792 msgstr "添加 URL"

8793

8783 -#: builtin/remote.c:1524

8794 +#: builtin/remote.c:1519

8795 msgid "delete URLs"

8796 msgstr "删除 URLS"

8797

8787 -#: builtin/remote.c:1531

8798 +#: builtin/remote.c:1526

8799 msgid "--add --delete doesn't make sense"

8800 msgstr "--add --delete 无意义"

8801

8791 -#: builtin/remote.c:1571

8802 +#: builtin/remote.c:1566

8803 #, c-format

8804 msgid "Invalid old URL pattern: %s"

8805 msgstr "无效的旧URL匹配模版：%s"

8806

8796 -#: builtin/remote.c:1579

8807 +#: builtin/remote.c:1574

8808 #, c-format

8809 msgid "No such URL found: %s"

8810 msgstr "未找到此URL：%s"

8811

8801 -#: builtin/remote.c:1581

8812 +#: builtin/remote.c:1576

8813 msgid "Will not delete all non-push URLs"

8814 msgstr "将不会删除所有非推送URL地址"

8815

8805 -#: builtin/remote.c:1595

8816 +#: builtin/remote.c:1590

8817 msgid "be verbose; must be placed before a subcommand"

8818 msgstr "冗长输出；必须置于子命令之前"

8819

@@ -8810,71 +8821,71 @@ msgstr "冗长输出；必须置于子命令之前"

8821 msgid "git repack [options]"

8822 msgstr "git repack [选项]"

8823

8813 -#: builtin/repack.c:160

8824 +#: builtin/repack.c:159

8825 msgid "pack everything in a single pack"

8826 msgstr "所有内容打包到一个包文件中"

8827

8817 -#: builtin/repack.c:162

8828 +#: builtin/repack.c:161

8829 msgid "same as -a, and turn unreachable objects loose"

8830 msgstr "和 -a 相同，并将不可达的对象设为松散对象"

8831

8821 -#: builtin/repack.c:165

8832 +#: builtin/repack.c:164

8833 msgid "remove redundant packs, and run git-prune-packed"

8834 msgstr "删除多余的包，运行 git-prune-packed"

8835

8825 -#: builtin/repack.c:167

8836 +#: builtin/repack.c:166

8837 msgid "pass --no-reuse-delta to git-pack-objects"

8838 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"

8839

8829 -#: builtin/repack.c:169

8840 +#: builtin/repack.c:168

8841 msgid "pass --no-reuse-object to git-pack-objects"

8842 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"

8843

8833 -#: builtin/repack.c:171

8844 +#: builtin/repack.c:170

8845 msgid "do not run git-update-server-info"

8846 msgstr "不运行 git-update-server-info"

8847

8837 -#: builtin/repack.c:174

8848 +#: builtin/repack.c:173

8849 msgid "pass --local to git-pack-objects"

8850 msgstr "向 git-pack-objects 传递参数 --local"

8851

8841 -#: builtin/repack.c:176

8852 +#: builtin/repack.c:175

8853 msgid "write bitmap index"

8854 msgstr "写 bitmap 索引"

8855

8845 -#: builtin/repack.c:177

8856 +#: builtin/repack.c:176

8857 msgid "approxidate"

8858 msgstr "近似日期"

8859

8849 -#: builtin/repack.c:178

8860 +#: builtin/repack.c:177

8861 msgid "with -A, do not loosen objects older than this"

8862 msgstr "使用 -A，不要将早于给定时间的对象过期"

8863

8853 -#: builtin/repack.c:180

8864 +#: builtin/repack.c:179

8865 msgid "size of the window used for delta compression"

8866 msgstr "用于增量压缩的窗口值"

8867

8857 -#: builtin/repack.c:181 builtin/repack.c:185

8868 +#: builtin/repack.c:180 builtin/repack.c:184

8869 msgid "bytes"

8870 msgstr "字节"

8871

8861 -#: builtin/repack.c:182

8872 +#: builtin/repack.c:181

8873 msgid "same as the above, but limit memory size instead of entries count"

8874 msgstr "和上面的相似，但限制内存大小而非条目数"

8875

8865 -#: builtin/repack.c:184

8876 +#: builtin/repack.c:183

8877 msgid "limits the maximum delta depth"

8878 msgstr "限制最大增量深度"

8879

8869 -#: builtin/repack.c:186

8880 +#: builtin/repack.c:185

8881 msgid "maximum size of each packfile"

8882 msgstr "每个包的最大尺寸"

8883

8873 -#: builtin/repack.c:188

8884 +#: builtin/repack.c:187

8885 msgid "repack objects in packs marked with .keep"

8886 msgstr "对标记为 .keep 的包中的对象重新打包"

8887

8877 -#: builtin/repack.c:374

8888 +#: builtin/repack.c:371

8889 #, c-format

8890 msgid "removing '%s' failed"

8891 msgstr "删除 '%s' 失败"

@@ -9490,11 +9501,11 @@ msgstr "删除符号引用"

9501 msgid "shorten ref output"

9502 msgstr "简短的引用输出"

9503

9493 -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

9504 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358

9505 msgid "reason"

9506 msgstr "原因"

9507

9497 -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

9508 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358

9509 msgid "reason of the update"

9510 msgstr "更新的原因"

9511

@@ -9850,19 +9861,19 @@ msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"

9861 msgid "git update-ref [options] --stdin [-z]"

9862 msgstr "git update-ref [选项] --stdin [-z]"

9863

9853 -#: builtin/update-ref.c:363

9864 +#: builtin/update-ref.c:359

9865 msgid "delete the reference"

9866 msgstr "删除引用"

9867

9857 -#: builtin/update-ref.c:365

9868 +#: builtin/update-ref.c:361

9869 msgid "update <refname> not the one it points to"

9870 msgstr "更新 <引用名> 本身而不是它指向的引用"

9871

9861 -#: builtin/update-ref.c:366

9872 +#: builtin/update-ref.c:362

9873 msgid "stdin has NUL-terminated arguments"

9874 msgstr "标准输入有以 NUL 字符终止的参数"

9875

9865 -#: builtin/update-ref.c:367

9876 +#: builtin/update-ref.c:363

9877 msgid "read updates from stdin"

9878 msgstr "从标准输入读取更新"

9879

@@ -10040,17 +10051,17 @@ msgstr "用 <n> 位数字显示 SHA-1 哈希值"

10051 msgid "update the index with reused conflict resolution if possible"

10052 msgstr "如果可能，重用冲突解决更新索引"

10053

10043 -#: git-am.sh:52

10054 +#: git-am.sh:53

10055 msgid "You need to set your committer info first"

10056 msgstr "您需要先设置你的提交者信息"

10057

10047 -#: git-am.sh:97

10058 +#: git-am.sh:98

10059 msgid ""

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

10061 "Not rewinding to ORIG_HEAD"

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

10063

10053 -#: git-am.sh:107

10064 +#: git-am.sh:108

10065 #, sh-format

10066 msgid ""

10067 "When you have resolved this problem, run \"$cmdline --continue\".\n"

@@ -10061,19 +10072,19 @@ msgstr ""

10072 "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"

10073 "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"

10074

10064 -#: git-am.sh:123

10075 +#: git-am.sh:124

10076 msgid "Cannot fall back to three-way merge."

10077 msgstr "无法求助于三路合并。"

10078

10068 -#: git-am.sh:139

10079 +#: git-am.sh:140

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

10081 msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。"

10082

10072 -#: git-am.sh:141

10083 +#: git-am.sh:142

10084 msgid "Using index info to reconstruct a base tree..."

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

10086

10076 -#: git-am.sh:156

10087 +#: git-am.sh:157

10088 msgid ""

10089 "Did you hand edit your patch?\n"

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

@@ -10081,28 +10092,28 @@ msgstr ""

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

10093 "无法应用补丁到索引中的数据（blob）对象上。"

10094

10084 -#: git-am.sh:165

10095 +#: git-am.sh:166

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

10097 msgstr "转而在基础版本上打补丁及进行三路合并..."

10098

10088 -#: git-am.sh:181

10099 +#: git-am.sh:182

10100 msgid "Failed to merge in the changes."

10101 msgstr "无法合并变更。"

10102

10092 -#: git-am.sh:276

10103 +#: git-am.sh:277

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

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

10106

10096 -#: git-am.sh:363

10107 +#: git-am.sh:364

10108 #, sh-format

10109 msgid "Patch format $patch_format is not supported."

10110 msgstr "不支持 $patch_format 补丁格式。"

10111

10101 -#: git-am.sh:365

10112 +#: git-am.sh:366

10113 msgid "Patch format detection failed."

10114 msgstr "补丁格式检测失败。"

10115

10105 -#: git-am.sh:392

10116 +#: git-am.sh:398

10117 msgid ""

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

10119 "it will be removed. Please do not use it anymore."

@@ -10110,16 +10121,16 @@ msgstr ""

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

10122 "请不要再使用它了。"

10123

10113 -#: git-am.sh:486

10124 +#: git-am.sh:496

10125 #, sh-format

10126 msgid "previous rebase directory $dotest still exists but mbox given."

10127 msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。"

10128

10118 -#: git-am.sh:491

10129 +#: git-am.sh:501

10130 msgid "Please make up your mind. --skip or --abort?"

10131 msgstr "请下决心。--skip 或是 --abort ？"

10132

10122 -#: git-am.sh:527

10133 +#: git-am.sh:537

10134 #, sh-format

10135 msgid ""

10136 "Stray $dotest directory found.\n"

@@ -10128,16 +10139,16 @@ msgstr ""

10139 "发现了错误的 $dotest 目录。\n"

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

10141

10131 -#: git-am.sh:535

10142 +#: git-am.sh:545

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

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

10145

10135 -#: git-am.sh:601

10146 +#: git-am.sh:612

10147 #, sh-format

10148 msgid "Dirty index: cannot apply patches (dirty: $files)"

10149 msgstr "脏的索引：不能应用补丁（脏文件：$files）"

10150

10140 -#: git-am.sh:705

10151 +#: git-am.sh:722

10152 #, sh-format

10153 msgid ""

10154 "Patch is empty. Was it split wrong?\n"

@@ -10148,15 +10159,15 @@ msgstr ""

10159 "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"

10160 "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"

10161

10151 -#: git-am.sh:732

10162 +#: git-am.sh:749

10163 msgid "Patch does not have a valid e-mail address."

10164 msgstr "补丁中没有一个有效的邮件地址。"

10165

10155 -#: git-am.sh:779

10166 +#: git-am.sh:796

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

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

10169

10159 -#: git-am.sh:783

10170 +#: git-am.sh:800

10171 msgid "Commit Body is:"

10172 msgstr "提交内容为："

10173

@@ -10164,16 +10175,16 @@ msgstr "提交内容为："

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

10176 #. in your translation. The program will only accept English

10177 #. input at this point.

10167 -#: git-am.sh:790

10178 +#: git-am.sh:807

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

10180 msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

10181

10171 -#: git-am.sh:826

10182 +#: git-am.sh:843

10183 #, sh-format

10184 msgid "Applying: $FIRSTLINE"

10185 msgstr "正应用：$FIRSTLINE"

10186

10176 -#: git-am.sh:847

10187 +#: git-am.sh:864

10188 msgid ""

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

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

@@ -10183,22 +10194,22 @@ msgstr ""

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

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

10196

10186 -#: git-am.sh:855

10197 +#: git-am.sh:872

10198 msgid ""

10199 "You still have unmerged paths in your index\n"

10200 "did you forget to use 'git add'?"

10201 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"

10202

10192 -#: git-am.sh:871

10203 +#: git-am.sh:888

10204 msgid "No changes -- Patch already applied."

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

10206

10196 -#: git-am.sh:881

10207 +#: git-am.sh:898

10208 #, sh-format

10209 msgid "Patch failed at $msgnum $FIRSTLINE"

10210 msgstr "补丁失败于 $msgnum $FIRSTLINE"

10211

10201 -#: git-am.sh:884

10212 +#: git-am.sh:901

10213 #, sh-format

10214 msgid ""

10215 "The copy of the patch that failed is found in:\n"

@@ -10207,7 +10218,7 @@ msgstr ""

10218 "失败的补丁文件副本位于：\n"

10219 " $dotest/patch"

10220

10210 -#: git-am.sh:902

10221 +#: git-am.sh:919

10222 msgid "applying to an empty history"

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

10224

@@ -10270,11 +10281,11 @@ msgstr "请在调用 'bisect_state' 时跟至少一个参数。"

10281 msgid "Bad rev input: $rev"

10282 msgstr "输入坏的版本：$rev"

10283

10273 -#: git-bisect.sh:250

10284 +#: git-bisect.sh:253

10285 msgid "'git bisect bad' can take only one argument."

10286 msgstr "'git bisect bad' 只能带一个参数。"

10287

10277 -#: git-bisect.sh:273

10288 +#: git-bisect.sh:276

10289 msgid "Warning: bisecting only with a bad commit."

10290 msgstr "警告：在仅有一个坏提交下进行二分查找。"

10291

@@ -10282,11 +10293,11 @@ msgstr "警告：在仅有一个坏提交下进行二分查找。"

10293 #. TRANSLATORS: Make sure to include [Y] and [n] in your

10294 #. translation. The program will only accept English input

10295 #. at this point.

10285 -#: git-bisect.sh:279

10296 +#: git-bisect.sh:282

10297 msgid "Are you sure [Y/n]? "

10298 msgstr "您确认么[Y/n]？ "

10299

10289 -#: git-bisect.sh:289

10300 +#: git-bisect.sh:292

10301 msgid ""

10302 "You need to give me at least one good and one bad revision.\n"

10303 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"

@@ -10294,7 +10305,7 @@ msgstr ""

10305 "您需要给我至少一个好版本和一个坏版本。\n"

10306 "（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）"

10307

10297 -#: git-bisect.sh:292

10308 +#: git-bisect.sh:295

10309 msgid ""

10310 "You need to start by \"git bisect start\".\n"

10311 "You then need to give me at least one good and one bad revision.\n"

@@ -10304,16 +10315,16 @@ msgstr ""

10315 "然后需要提供我至少一个好版本和一个坏版本。\n"

10316 "（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）"

10317

10307 -#: git-bisect.sh:363 git-bisect.sh:490

10318 +#: git-bisect.sh:366 git-bisect.sh:493

10319 msgid "We are not bisecting."

10320 msgstr "我们没有在二分查找。"

10321

10311 -#: git-bisect.sh:370

10322 +#: git-bisect.sh:373

10323 #, sh-format

10324 msgid "'$invalid' is not a valid commit"

10325 msgstr "'$invalid' 不是一个有效的提交"

10326

10316 -#: git-bisect.sh:379

10327 +#: git-bisect.sh:382

10328 #, sh-format

10329 msgid ""

10330 "Could not check out original HEAD '$branch'.\n"

@@ -10322,25 +10333,25 @@ msgstr ""

10333 "不能检出原始 HEAD '$branch'。\n"

10334 "尝试 'git bisect reset <提交>'。"

10335

10325 -#: git-bisect.sh:406

10336 +#: git-bisect.sh:409

10337 msgid "No logfile given"

10338 msgstr "未提供日志文件"

10339

10329 -#: git-bisect.sh:407

10340 +#: git-bisect.sh:410

10341 #, sh-format

10342 msgid "cannot read $file for replaying"

10343 msgstr "不能读取 $file 来重放"

10344

10334 -#: git-bisect.sh:424

10345 +#: git-bisect.sh:427

10346 msgid "?? what are you talking about?"

10347 msgstr "?? 您在说什么?"

10348

10338 -#: git-bisect.sh:436

10349 +#: git-bisect.sh:439

10350 #, sh-format

10351 msgid "running $command"

10352 msgstr "运行 $command"

10353

10343 -#: git-bisect.sh:443

10354 +#: git-bisect.sh:446

10355 #, sh-format

10356 msgid ""

10357 "bisect run failed:\n"

@@ -10349,11 +10360,11 @@ msgstr ""

10360 "二分查找运行失败：\n"

10361 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"

10362

10352 -#: git-bisect.sh:469

10363 +#: git-bisect.sh:472

10364 msgid "bisect run cannot continue any more"

10365 msgstr "二分查找不能继续运行"

10366

10356 -#: git-bisect.sh:475

10367 +#: git-bisect.sh:478

10368 #, sh-format

10369 msgid ""

10370 "bisect run failed:\n"

@@ -10362,7 +10373,7 @@ msgstr ""

10373 "二分查找运行失败：\n"

10374 "'bisect_state $state' 退出码为 $res"

10375

10365 -#: git-bisect.sh:482

10376 +#: git-bisect.sh:485

10377 msgid "bisect run success"

10378 msgstr "二分查找运行成功"

10379

@@ -10974,6 +10985,18 @@ msgstr "无法递归进子模组路径 '$sm_path'"

10985 msgid "Synchronizing submodule url for '$displaypath'"

10986 msgstr "为 '$displaypath' 同步子模组 url"

10987

10988 +#~ msgid "no files added"

10989 +#~ msgstr "没有文件被添加"

10990 +

10991 +#~ msgid "force creation (when already exists)"

10992 +#~ msgstr "强制创建（当已经存在）"

10993 +

10994 +#~ msgid "Malformed ident string: '%s'"

10995 +#~ msgstr "非法的身份字符串：'%s'"

10996 +

10997 +#~ msgid "slot"

10998 +#~ msgstr "slot"

10999 +

11000 #~ msgid "Failed to lock ref for update"

11001 #~ msgstr "无法为更新锁定引用"

11002

l10n: zh_CN: translations for git v2.3.0-rc0