fd8cb37902 · matheusbsbs/matheus-bagliano

@@ -58,7 +58,7 @@

58 # fork | 派生

59 # Git archive | 仓库（对于 arch 用户）

60 # gitfile | gitfile（仓库链接文件）

61 -# grafts | （提交）嫁接

61 +# grafts | （提交）移植

62 # hash | 哈希值

63 # HEAD | HEAD（头指针，亦即当前分支）

64 # head | 头、分支

@@ -138,8 +138,8 @@ msgid ""

138 msgstr ""

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

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

141 -"POT-Creation-Date: 2018-03-16 07:29+0800\n"

142 -"PO-Revision-Date: 2018-03-25 22:20+0800\n"

141 +"POT-Creation-Date: 2018-06-16 22:06+0800\n"

142 +"PO-Revision-Date: 2018-06-18 00:28+0800\n"

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

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

145 "Language: zh_CN\n"

@@ -148,37 +148,37 @@ msgstr ""

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

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

150

151 -#: advice.c:62

151 +#: advice.c:92

152 #, c-format

153 -msgid "hint: %.*s\n"

154 -msgstr "提示：%.*s\n"

153 +msgid "%shint: %.*s%s\n"

154 +msgstr "%s提示：%.*s%s\n"

155

156 -#: advice.c:90

156 +#: advice.c:137

157 msgid "Cherry-picking is not possible because you have unmerged files."

158 msgstr "无法拣选，因为您有未合并的文件。"

159

160 -#: advice.c:92

160 +#: advice.c:139

161 msgid "Committing is not possible because you have unmerged files."

162 msgstr "无法提交，因为您有未合并的文件。"

163

164 -#: advice.c:94

164 +#: advice.c:141

165 msgid "Merging is not possible because you have unmerged files."

166 msgstr "无法合并，因为您有未合并的文件。"

167

168 -#: advice.c:96

168 +#: advice.c:143

169 msgid "Pulling is not possible because you have unmerged files."

170 msgstr "无法拉取，因为您有未合并的文件。"

171

172 -#: advice.c:98

172 +#: advice.c:145

173 msgid "Reverting is not possible because you have unmerged files."

174 msgstr "无法回退，因为您有未合并的文件。"

175

176 -#: advice.c:100

176 +#: advice.c:147

177 #, c-format

178 msgid "It is not possible to %s because you have unmerged files."

179 msgstr "无法 %s，因为您有未合并的文件。"

180

181 -#: advice.c:108

181 +#: advice.c:155

182 msgid ""

183 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

184 "as appropriate to mark resolution and make a commit."

@@ -186,23 +186,23 @@ msgstr ""

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

187 "解决方案并提交。"

188

189 -#: advice.c:116

189 +#: advice.c:163

190 msgid "Exiting because of an unresolved conflict."

191 msgstr "因为存在未解决的冲突而退出。"

192

193 -#: advice.c:121 builtin/merge.c:1251

193 +#: advice.c:168 builtin/merge.c:1250

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

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

196

197 -#: advice.c:123

197 +#: advice.c:170

198 msgid "Please, commit your changes before merging."

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

200

201 -#: advice.c:124

201 +#: advice.c:171

202 msgid "Exiting because of unfinished merge."

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

204

205 -#: advice.c:130

205 +#: advice.c:177

206 #, c-format

207 msgid ""

208 "Note: checking out '%s'.\n"

@@ -460,7 +460,7 @@ msgstr "打补丁失败：%s:%ld"

460 msgid "cannot checkout %s"

461 msgstr "不能检出 %s"

462

463 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

463 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

464 #, c-format

465 msgid "failed to read %s"

466 msgstr "无法读取 %s"

@@ -659,7 +659,7 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

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

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

661

662 -#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

662 +#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

663 #, c-format

664 msgid "cannot open %s"

665 msgstr "不能打开 %s"

@@ -713,15 +713,15 @@ msgid_plural "%d lines applied after fixing whitespace errors."

713 msgstr[0] "修复空白错误后，应用了 %d 行。"

714 msgstr[1] "修复空白错误后，应用了 %d 行。"

715

716 -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

716 +#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

717 msgid "Unable to write new index file"

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

719

720 #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

721 -#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193

722 -#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197

723 -#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567

724 -#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

721 +#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

722 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

723 +#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

724 +#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

725 #: git-add--interactive.perl:197

726 msgid "path"

727 msgstr "路径"

@@ -796,7 +796,7 @@ msgstr "确保至少匹配 <n> 行上下文"

796

797 #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

798 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

799 -#: builtin/pack-objects.c:3035

799 +#: builtin/pack-objects.c:3177

800 msgid "action"

801 msgstr "动作"

802

@@ -824,9 +824,9 @@ msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

824 msgid "allow overlapping hunks"

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

826

827 -#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21

828 -#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665

829 -#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

827 +#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21

828 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

829 +#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

830 msgid "be verbose"

831 msgstr "冗长输出"

832

@@ -864,98 +864,98 @@ msgstr ""

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

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

866

867 -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

867 +#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

868 #, c-format

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

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

871

872 -#: archive.c:436

872 +#: archive.c:434

873 msgid "fmt"

874 msgstr "格式"

875

876 -#: archive.c:436

876 +#: archive.c:434

877 msgid "archive format"

878 msgstr "归档格式"

879

880 -#: archive.c:437 builtin/log.c:1462

880 +#: archive.c:435 builtin/log.c:1462

881 msgid "prefix"

882 msgstr "前缀"

883

884 -#: archive.c:438

884 +#: archive.c:436

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

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

887

888 -#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62

889 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869

888 +#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

889 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

890 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

891 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

891 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

892 #: parse-options.h:165

893 msgid "file"

894 msgstr "文件"

895

896 -#: archive.c:440 builtin/archive.c:89

896 +#: archive.c:438 builtin/archive.c:89

897 msgid "write the archive to this file"

898 msgstr "归档写入此文件"

899

900 -#: archive.c:442

900 +#: archive.c:440

901 msgid "read .gitattributes in working directory"

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

903

904 -#: archive.c:443

904 +#: archive.c:441

905 msgid "report archived files on stderr"

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

907

908 -#: archive.c:444

908 +#: archive.c:442

909 msgid "store only"

910 msgstr "只存储"

911

912 -#: archive.c:445

912 +#: archive.c:443

913 msgid "compress faster"

914 msgstr "压缩速度更快"

915

916 -#: archive.c:453

916 +#: archive.c:451

917 msgid "compress better"

918 msgstr "压缩效果更好"

919

920 -#: archive.c:456

920 +#: archive.c:454

921 msgid "list supported archive formats"

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

923

924 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111

925 -#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

924 +#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

925 +#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

926 msgid "repo"

927 msgstr "仓库"

928

929 -#: archive.c:459 builtin/archive.c:91

929 +#: archive.c:457 builtin/archive.c:91

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

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

932

933 -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489

933 +#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

934 msgid "command"

935 msgstr "命令"

936

937 -#: archive.c:461 builtin/archive.c:93

937 +#: archive.c:459 builtin/archive.c:93

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

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

940

941 -#: archive.c:468

941 +#: archive.c:466

942 msgid "Unexpected option --remote"

943 msgstr "未知参数 --remote"

944

945 -#: archive.c:470

945 +#: archive.c:468

946 msgid "Option --exec can only be used together with --remote"

947 msgstr "选项 --exec 只能和 --remote 同时使用"

948

949 -#: archive.c:472

949 +#: archive.c:470

950 msgid "Unexpected option --output"

951 msgstr "未知参数 --output"

952

953 -#: archive.c:494

953 +#: archive.c:492

954 #, c-format

955 msgid "Unknown archive format '%s'"

956 msgstr "未知归档格式 '%s'"

957

958 -#: archive.c:501

958 +#: archive.c:499

959 #, c-format

960 msgid "Argument not supported for format '%s': -%d"

961 msgstr "参数不支持此格式 '%s'：-%d"

@@ -973,22 +973,22 @@ msgstr ""

973 "负值模版在 git attributes 中被忽略\n"

974 "当字符串确实要以感叹号开始时，使用 '\\!'。"

975

976 -#: bisect.c:460

976 +#: bisect.c:461

977 #, c-format

978 msgid "Badly quoted content in file '%s': %s"

979 msgstr "文件 '%s' 包含错误的引用格式：%s"

980

981 -#: bisect.c:668

981 +#: bisect.c:669

982 #, c-format

983 msgid "We cannot bisect more!\n"

984 msgstr "我们无法进行更多的二分查找！\n"

985

986 -#: bisect.c:722

986 +#: bisect.c:723

987 #, c-format

988 msgid "Not a valid commit name %s"

989 msgstr "不是一个有效的提交名 %s"

990

991 -#: bisect.c:746

991 +#: bisect.c:747

992 #, c-format

993 msgid ""

994 "The merge base %s is bad.\n"

@@ -997,7 +997,7 @@ msgstr ""

997 "合并基线 %s 是坏的。\n"

998 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

999

1000 -#: bisect.c:751

1000 +#: bisect.c:752

1001 #, c-format

1002 msgid ""

1003 "The merge base %s is new.\n"

@@ -1006,7 +1006,7 @@ msgstr ""

1006 "合并基线 %s 是新的。\n"

1007 "介于 %s 和 [%s] 之间的属性已经被修改。\n"

1008

1009 -#: bisect.c:756

1009 +#: bisect.c:757

1010 #, c-format

1011 msgid ""

1012 "The merge base %s is %s.\n"

@@ -1015,7 +1015,7 @@ msgstr ""

1015 "合并基线 %s 是 %s。\n"

1016 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

1017

1018 -#: bisect.c:764

1018 +#: bisect.c:765

1019 #, c-format

1020 msgid ""

1021 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1026,7 +1026,7 @@ msgstr ""

1026 "这种情况下 git 二分查找无法正常工作。\n"

1027 "您可能弄错了 %s 和 %s 版本？\n"

1028

1029 -#: bisect.c:777

1029 +#: bisect.c:778

1030 #, c-format

1031 msgid ""

1032 "the merge base between %s and [%s] must be skipped.\n"

@@ -1037,36 +1037,36 @@ msgstr ""

1037 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"

1038 "我们仍旧继续。"

1039

1040 -#: bisect.c:810

1040 +#: bisect.c:811

1041 #, c-format

1042 msgid "Bisecting: a merge base must be tested\n"

1043 msgstr "二分查找中：合并基线必须是经过测试的\n"

1044

1045 -#: bisect.c:850

1045 +#: bisect.c:851

1046 #, c-format

1047 msgid "a %s revision is needed"

1048 msgstr "需要一个 %s 版本"

1049

1050 -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

1050 +#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

1051 #, c-format

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

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

1054

1055 -#: bisect.c:920

1055 +#: bisect.c:921

1056 #, c-format

1057 msgid "could not read file '%s'"

1058 msgstr "不能读取文件 '%s'"

1059

1060 -#: bisect.c:950

1060 +#: bisect.c:951

1061 msgid "reading bisect refs failed"

1062 msgstr "读取二分查找引用失败"

1063

1064 -#: bisect.c:969

1064 +#: bisect.c:970

1065 #, c-format

1066 msgid "%s was both %s and %s\n"

1067 msgstr "%s 同时为 %s 和 %s\n"

1068

1069 -#: bisect.c:977

1069 +#: bisect.c:978

1070 #, c-format

1071 msgid ""

1072 "No testable commit found.\n"

@@ -1075,7 +1075,7 @@ msgstr ""

1075 "没有发现可测试的提交。\n"

1076 "可能您在运行时使用了错误的路径参数？\n"

1077

1078 -#: bisect.c:996

1078 +#: bisect.c:997

1079 #, c-format

1080 msgid "(roughly %d step)"

1081 msgid_plural "(roughly %d steps)"

@@ -1085,48 +1085,48 @@ msgstr[1] "（大概 %d 步）"

1085 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1086 #. steps)" translation.

1087 #.

1088 -#: bisect.c:1002

1088 +#: bisect.c:1003

1089 #, c-format

1090 msgid "Bisecting: %d revision left to test after this %s\n"

1091 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1092 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1093 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1094

1095 -#: blame.c:1758

1095 +#: blame.c:1756

1096 msgid "--contents and --reverse do not blend well."

1097 msgstr "--contents 和 --reverse 不能混用。"

1098

1099 -#: blame.c:1769

1099 +#: blame.c:1767

1100 msgid "cannot use --contents with final commit object name"

1101 msgstr "不能将 --contents 和最终的提交对象名共用"

1102

1103 -#: blame.c:1789

1103 +#: blame.c:1787

1104 msgid "--reverse and --first-parent together require specified latest commit"

1105 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

1106

1107 -#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699

1108 -#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920

1109 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

1110 -#: builtin/shortlog.c:191

1107 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861

1108 +#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1109 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

1110 +#: builtin/shortlog.c:192

1111 msgid "revision walk setup failed"

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

1113

1114 -#: blame.c:1816

1114 +#: blame.c:1814

1115 msgid ""

1116 "--reverse --first-parent together require range along first-parent chain"

1117 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"

1118

1119 -#: blame.c:1827

1119 +#: blame.c:1825

1120 #, c-format

1121 msgid "no such path %s in %s"

1122 msgstr "在 %2$s 中无此路径 %1$s"

1123

1124 -#: blame.c:1838

1124 +#: blame.c:1836

1125 #, c-format

1126 msgid "cannot read blob %s for path %s"

1127 msgstr "不能为路径 %2$s 读取数据对象 %1$s"

1128

1129 -#: branch.c:53

1129 +#: branch.c:54

1130 #, c-format

1131 msgid ""

1132 "\n"

@@ -1138,85 +1138,85 @@ msgstr ""

1138 "在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"

1139 "\"git branch --set-upstream-to=%s%s%s\" 。"

1140

1141 -#: branch.c:67

1141 +#: branch.c:68

1142 #, c-format

1143 msgid "Not setting branch %s as its own upstream."

1144 msgstr "未设置分支 %s 作为它自己的上游。"

1145

1146 -#: branch.c:93

1146 +#: branch.c:94

1147 #, c-format

1148 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1149 msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"

1150

1151 -#: branch.c:94

1151 +#: branch.c:95

1152 #, c-format

1153 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1154 msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"

1155

1156 -#: branch.c:98

1156 +#: branch.c:99

1157 #, c-format

1158 msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1159 msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"

1160

1161 -#: branch.c:99

1161 +#: branch.c:100

1162 #, c-format

1163 msgid "Branch '%s' set up to track local branch '%s'."

1164 msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"

1165

1166 -#: branch.c:104

1166 +#: branch.c:105

1167 #, c-format

1168 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1169 msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"

1170

1171 -#: branch.c:105

1171 +#: branch.c:106

1172 #, c-format

1173 msgid "Branch '%s' set up to track remote ref '%s'."

1174 msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"

1175

1176 -#: branch.c:109

1176 +#: branch.c:110

1177 #, c-format

1178 msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1179 msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"

1180

1181 -#: branch.c:110

1181 +#: branch.c:111

1182 #, c-format

1183 msgid "Branch '%s' set up to track local ref '%s'."

1184 msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"

1185

1186 -#: branch.c:119

1186 +#: branch.c:120

1187 msgid "Unable to write upstream branch configuration"

1188 msgstr "无法写入上游分支配置"

1189

1190 -#: branch.c:156

1190 +#: branch.c:157

1191 #, c-format

1192 msgid "Not tracking: ambiguous information for ref %s"

1193 msgstr "未跟踪：引用 %s 有歧义"

1194

1195 -#: branch.c:189

1195 +#: branch.c:190

1196 #, c-format

1197 msgid "'%s' is not a valid branch name."

1198 msgstr "'%s' 不是一个有效的分支名称。"

1199

1200 -#: branch.c:208

1200 +#: branch.c:209

1201 #, c-format

1202 msgid "A branch named '%s' already exists."

1203 msgstr "一个分支名 '%s' 已经存在。"

1204

1205 -#: branch.c:213

1205 +#: branch.c:214

1206 msgid "Cannot force update the current branch."

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

1208

1209 -#: branch.c:233

1209 +#: branch.c:234

1210 #, c-format

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

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

1213

1214 -#: branch.c:235

1214 +#: branch.c:236

1215 #, c-format

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

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

1218

1219 -#: branch.c:237

1219 +#: branch.c:238

1220 msgid ""

1221 "\n"

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

@@ -1234,27 +1234,27 @@ msgstr ""

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

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

1236

1237 -#: branch.c:280

1237 +#: branch.c:281

1238 #, c-format

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

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

1241

1242 -#: branch.c:300

1242 +#: branch.c:301

1243 #, c-format

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

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

1246

1247 -#: branch.c:305

1247 +#: branch.c:306

1248 #, c-format

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

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

1251

1252 -#: branch.c:359

1252 +#: branch.c:360

1253 #, c-format

1254 msgid "'%s' is already checked out at '%s'"

1255 msgstr "'%s' 已经检出到 '%s'"

1256

1257 -#: branch.c:382

1257 +#: branch.c:383

1258 #, c-format

1259 msgid "HEAD of working tree %s is not updated"

1260 msgstr "工作区 %s 的 HEAD 指向没有被更新"

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

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

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

1271

1272 -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

1272 +#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755

1273 #, c-format

1274 msgid "could not open '%s'"

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

@@ -1313,7 +1313,7 @@ msgstr "rev-list 终止"

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

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

1315

1316 -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

1316 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

1317 #, c-format

1318 msgid "unrecognized argument: %s"

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

@@ -1336,18 +1336,39 @@ msgstr "index-pack 终止"

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

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

1338

1339 -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465

1340 -#: builtin/am.c:1436 builtin/am.c:2072

1339 +#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

1340 +#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

1341 +#: builtin/replace.c:448

1342 #, c-format

1343 msgid "could not parse %s"

1344 msgstr "不能解析 %s"

1345

1345 -#: commit.c:43

1346 +#: commit.c:45

1347 #, c-format

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

1349 msgstr "%s %s 不是一个提交！"

1350

1350 -#: commit.c:1506

1351 +#: commit.c:182

1352 +msgid ""

1353 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

1354 +"and will be removed in a future Git version.\n"

1355 +"\n"

1356 +"Please use \"git replace --convert-graft-file\"\n"

1357 +"to convert the grafts into replace refs.\n"

1358 +"\n"

1359 +"Turn this message off by running\n"

1360 +"\"git config advice.graftFileDeprecated false\""

1361 +msgstr ""

1362 +"对 <GIT_DIR>/info/grafts 的支持已被弃用，并将在\n"

1363 +"未来的Git版本中被移除。\n"

1364 +"\n"

1365 +"请使用 \"git replace --convert-graft-file\" 将\n"

1366 +"grafts 转换为替换引用。\n"

1367 +"\n"

1368 +"设置 \"git config advice.graftFileDeprecated false\"\n"

1369 +"可关闭本消息"

1370 +

1371 +#: commit.c:1540

1372 msgid ""

1373 "Warning: commit message did not conform to UTF-8.\n"

1374 "You may want to amend it after fixing the message, or set the config\n"

@@ -1357,170 +1378,184 @@ msgstr ""

1378 "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

1379 "设置为您项目所用的字符编码。\n"

1380

1381 +#: commit-graph.c:669

1382 +#, c-format

1383 +msgid "the commit graph format cannot write %d commits"

1384 +msgstr "提交图形格式不能写入 %d 个提交"

1385 +

1386 +#: commit-graph.c:696

1387 +msgid "too many commits to write graph"

1388 +msgstr "提交太多不能画图"

1389 +

1390 +#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1391 +#, c-format

1392 +msgid "cannot mkdir %s"

1393 +msgstr "不能创建目录 %s"

1394 +

1395 #: compat/obstack.c:405 compat/obstack.c:407

1396 msgid "memory exhausted"

1397 msgstr "内存耗尽"

1398

1364 -#: config.c:186

1399 +#: config.c:187

1400 msgid "relative config include conditionals must come from files"

1401 msgstr "包含相对路径的条件引用必须来自于文件"

1402

1368 -#: config.c:720

1403 +#: config.c:788

1404 #, c-format

1405 msgid "bad config line %d in blob %s"

1406 msgstr "数据对象 %2$s 中错误的配置行 %1$d"

1407

1373 -#: config.c:724

1408 +#: config.c:792

1409 #, c-format

1410 msgid "bad config line %d in file %s"

1411 msgstr "文件 %2$s 中错误的配置行 %1$d"

1412

1378 -#: config.c:728

1413 +#: config.c:796

1414 #, c-format

1415 msgid "bad config line %d in standard input"

1416 msgstr "标准输入中错误的配置行 %d"

1417

1383 -#: config.c:732

1418 +#: config.c:800

1419 #, c-format

1420 msgid "bad config line %d in submodule-blob %s"

1421 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"

1422

1388 -#: config.c:736

1423 +#: config.c:804

1424 #, c-format

1425 msgid "bad config line %d in command line %s"

1426 msgstr "命令行 %2$s 中错误的配置行 %1$d"

1427

1393 -#: config.c:740

1428 +#: config.c:808

1429 #, c-format

1430 msgid "bad config line %d in %s"

1431 msgstr "在 %2$s 中错误的配置行 %1$d"

1432

1398 -#: config.c:868

1433 +#: config.c:936

1434 msgid "out of range"

1435 msgstr "超出范围"

1436

1402 -#: config.c:868

1437 +#: config.c:936

1438 msgid "invalid unit"

1439 msgstr "无效的单位"

1440

1406 -#: config.c:874

1441 +#: config.c:942

1442 #, c-format

1443 msgid "bad numeric config value '%s' for '%s': %s"

1444 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"

1445

1411 -#: config.c:879

1446 +#: config.c:947

1447 #, c-format

1448 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1449 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1450

1416 -#: config.c:882

1451 +#: config.c:950

1452 #, c-format

1453 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1454 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1455

1421 -#: config.c:885

1456 +#: config.c:953

1457 #, c-format

1458 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1459 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"

1460

1426 -#: config.c:888

1461 +#: config.c:956

1462 #, c-format

1463 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1464 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1465

1431 -#: config.c:891

1466 +#: config.c:959

1467 #, c-format

1468 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1469 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1470

1436 -#: config.c:894

1471 +#: config.c:962

1472 #, c-format

1473 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1474 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1475

1441 -#: config.c:989

1476 +#: config.c:1057

1477 #, c-format

1478 msgid "failed to expand user dir in: '%s'"

1479 msgstr "无法扩展 '%s' 中的用户目录"

1480

1446 -#: config.c:998

1481 +#: config.c:1066

1482 #, c-format

1483 msgid "'%s' for '%s' is not a valid timestamp"

1484 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"

1485

1451 -#: config.c:1094 config.c:1105

1486 +#: config.c:1171 config.c:1182

1487 #, c-format

1488 msgid "bad zlib compression level %d"

1489 msgstr "错误的 zlib 压缩级别 %d"

1490

1456 -#: config.c:1225

1491 +#: config.c:1307

1492 #, c-format

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

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

1495

1461 -#: config.c:1386

1496 +#: config.c:1473

1497 #, c-format

1498 msgid "bad pack compression level %d"

1499 msgstr "错误的打包压缩级别 %d"

1500

1466 -#: config.c:1582

1501 +#: config.c:1681

1502 msgid "unable to parse command-line config"

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

1504

1470 -#: config.c:1914

1505 +#: config.c:2013

1506 msgid "unknown error occurred while reading the configuration files"

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

1508

1474 -#: config.c:2101

1509 +#: config.c:2200

1510 #, c-format

1511 msgid "Invalid %s: '%s'"

1512 msgstr "无效 %s：'%s'"

1513

1479 -#: config.c:2144

1514 +#: config.c:2243

1515 #, c-format

1516 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1517 msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"

1518

1484 -#: config.c:2170

1519 +#: config.c:2269

1520 #, c-format

1521 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1522 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

1523

1489 -#: config.c:2195

1524 +#: config.c:2294

1525 #, c-format

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

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

1528

1494 -#: config.c:2197

1529 +#: config.c:2296

1530 #, c-format

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

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

1533

1499 -#: config.c:2256

1534 +#: config.c:2402

1535 #, c-format

1536 msgid "%s has multiple values"

1537 msgstr "%s 有多个取值"

1538

1504 -#: config.c:2599 config.c:2816

1539 +#: config.c:2766 config.c:3019

1540 #, c-format

1541 msgid "fstat on %s failed"

1542 msgstr "对 %s 调用 fstat 失败"

1543

1509 -#: config.c:2706

1544 +#: config.c:2905

1545 #, c-format

1546 msgid "could not set '%s' to '%s'"

1547 msgstr "不能设置 '%s' 为 '%s'"

1548

1514 -#: config.c:2708 builtin/remote.c:776

1549 +#: config.c:2907 builtin/remote.c:779

1550 #, c-format

1551 msgid "could not unset '%s'"

1552 msgstr "不能取消设置 '%s'"

1553

1519 -#: connect.c:52

1554 +#: connect.c:61

1555 msgid "The remote end hung up upon initial contact"

1556 msgstr "远端在连接发起时即挂断"

1557

1523 -#: connect.c:54

1558 +#: connect.c:63

1559 msgid ""

1560 "Could not read from remote repository.\n"

1561 "\n"

@@ -1531,7 +1566,7 @@ msgstr ""

1566 "\n"

1567 "请确认您有正确的访问权限并且仓库存在。"

1568

1534 -#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

1569 +#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1570 msgid "Checking connectivity"

1571 msgstr "检查连接中"

1572

@@ -1547,12 +1582,12 @@ msgstr "无法写入 rev-list"

1582 msgid "failed to close rev-list's stdin"

1583 msgstr "无法关闭 rev-list 的标准输入"

1584

1550 -#: convert.c:205

1585 +#: convert.c:206

1586 #, c-format

1587 msgid "CRLF would be replaced by LF in %s."

1588 msgstr "文件 %s 中的 CRLF 将被 LF 替换。"

1589

1555 -#: convert.c:207

1590 +#: convert.c:208

1591 #, c-format

1592 msgid ""

1593 "CRLF will be replaced by LF in %s.\n"

@@ -1561,12 +1596,12 @@ msgstr ""

1596 "文件 %s 中的 CRLF 将被 LF 替换。\n"

1597 "在工作区中该文件仍保持原有的换行符。"

1598

1564 -#: convert.c:215

1599 +#: convert.c:216

1600 #, c-format

1601 msgid "LF would be replaced by CRLF in %s"

1602 msgstr "文件 %s 中的 LF 将被 CRLF 替换"

1603

1569 -#: convert.c:217

1604 +#: convert.c:218

1605 #, c-format

1606 msgid ""

1607 "LF will be replaced by CRLF in %s.\n"

@@ -1575,6 +1610,46 @@ msgstr ""

1610 "文件 %s 中的 LF 将被 CRLF 替换。\n"

1611 "在工作区中该文件仍保持原有的换行符。"

1612

1613 +#: convert.c:279

1614 +#, c-format

1615 +msgid "BOM is prohibited in '%s' if encoded as %s"

1616 +msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"

1617 +

1618 +#: convert.c:286

1619 +#, c-format

1620 +msgid ""

1621 +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

1622 +"tree-encoding."

1623 +msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。"

1624 +

1625 +#: convert.c:304

1626 +#, c-format

1627 +msgid "BOM is required in '%s' if encoded as %s"

1628 +msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"

1629 +

1630 +#: convert.c:306

1631 +#, c-format

1632 +msgid ""

1633 +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

1634 +"%sLE (depending on the byte order) as working-tree-encoding."

1635 +msgstr ""

1636 +"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"

1637 +"节序）作为工作区编码。"

1638 +

1639 +#: convert.c:424

1640 +#, c-format

1641 +msgid "failed to encode '%s' from %s to %s"

1642 +msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"

1643 +

1644 +#: convert.c:467

1645 +#, c-format

1646 +msgid "encoding '%s' from %s to %s and back is not the same"

1647 +msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"

1648 +

1649 +#: convert.c:1225

1650 +msgid "true/false are no valid working-tree-encodings"

1651 +msgstr "true/false 不是有效的工作区编码"

1652 +

1653 #: date.c:116

1654 msgid "in the future"

1655 msgstr "在将来"

@@ -1690,24 +1765,24 @@ msgstr ""

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

1766 "%s"

1767

1693 -#: diff.c:3822

1768 +#: diff.c:3823

1769 #, c-format

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

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

1772

1698 -#: diff.c:4146

1773 +#: diff.c:4153

1774 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1775 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

1776

1702 -#: diff.c:4149

1777 +#: diff.c:4156

1778 msgid "-G, -S and --find-object are mutually exclusive"

1779 msgstr "-G、-S 和 --find-object 是互斥的"

1780

1706 -#: diff.c:4237

1781 +#: diff.c:4244

1782 msgid "--follow requires exactly one pathspec"

1783 msgstr "--follow 明确要求只跟一个路径规格"

1784

1710 -#: diff.c:4403

1785 +#: diff.c:4410

1786 #, c-format

1787 msgid ""

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

@@ -1716,44 +1791,44 @@ msgstr ""

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

1792 "%s"

1793

1719 -#: diff.c:4417

1794 +#: diff.c:4424

1795 #, c-format

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

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

1798

1724 -#: diff.c:5493

1799 +#: diff.c:5500

1800 msgid "inexact rename detection was skipped due to too many files."

1801 msgstr "因为文件太多，略过不严格的重命名检查。"

1802

1728 -#: diff.c:5496

1803 +#: diff.c:5503

1804 msgid "only found copies from modified paths due to too many files."

1805 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

1806

1732 -#: diff.c:5499

1807 +#: diff.c:5506

1808 #, c-format

1809 msgid ""

1810 "you may want to set your %s variable to at least %d and retry the command."

1811 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

1812

1738 -#: dir.c:1866

1813 +#: dir.c:1867

1814 #, c-format

1815 msgid "could not open directory '%s'"

1816 msgstr "不能打开目录 '%s'"

1817

1743 -#: dir.c:2108

1818 +#: dir.c:2109

1819 msgid "failed to get kernel name and information"

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

1821

1747 -#: dir.c:2232

1822 +#: dir.c:2233

1823 msgid "Untracked cache is disabled on this system or location."

1824 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"

1825

1751 -#: dir.c:3024 dir.c:3029

1826 +#: dir.c:3075 dir.c:3080

1827 #, c-format

1828 msgid "could not create directories for %s"

1829 msgstr "不能为 %s 创建目录"

1830

1756 -#: dir.c:3054

1831 +#: dir.c:3109

1832 #, c-format

1833 msgid "could not migrate git directory from '%s' to '%s'"

1834 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -1776,201 +1851,205 @@ msgstr "不能对文件 '%s' 调用 stat"

1851 msgid "Remote with no URL"

1852 msgstr "远程未设置 URL"

1853

1779 -#: fetch-pack.c:253

1854 +#: fetch-pack.c:254

1855 msgid "git fetch-pack: expected shallow list"

1856 msgstr "git fetch-pack：应为 shallow 列表"

1857

1783 -#: fetch-pack.c:265

1858 +#: fetch-pack.c:266

1859 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

1860 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

1861

1787 -#: fetch-pack.c:284 builtin/archive.c:63

1862 +#: fetch-pack.c:285 builtin/archive.c:63

1863 #, c-format

1864 msgid "remote error: %s"

1865 msgstr "远程错误：%s"

1866

1792 -#: fetch-pack.c:285

1867 +#: fetch-pack.c:286

1868 #, c-format

1869 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1870 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

1871

1797 -#: fetch-pack.c:337

1872 +#: fetch-pack.c:338

1873 msgid "--stateless-rpc requires multi_ack_detailed"

1874 msgstr "--stateless-rpc 需要 multi_ack_detailed"

1875

1801 -#: fetch-pack.c:428

1876 +#: fetch-pack.c:429 fetch-pack.c:1310

1877 #, c-format

1878 msgid "invalid shallow line: %s"

1879 msgstr "无效的 shallow 信息：%s"

1880

1806 -#: fetch-pack.c:434

1881 +#: fetch-pack.c:435 fetch-pack.c:1316

1882 #, c-format

1883 msgid "invalid unshallow line: %s"

1884 msgstr "无效的 unshallow 信息：%s"

1885

1811 -#: fetch-pack.c:436

1886 +#: fetch-pack.c:437 fetch-pack.c:1318

1887 #, c-format

1888 msgid "object not found: %s"

1889 msgstr "对象未找到：%s"

1890

1816 -#: fetch-pack.c:439

1891 +#: fetch-pack.c:440 fetch-pack.c:1321

1892 #, c-format

1893 msgid "error in object: %s"

1894 msgstr "对象中出错：%s"

1895

1821 -#: fetch-pack.c:441

1896 +#: fetch-pack.c:442 fetch-pack.c:1323

1897 #, c-format

1898 msgid "no shallow found: %s"

1899 msgstr "未发现 shallow：%s"

1900

1826 -#: fetch-pack.c:444

1901 +#: fetch-pack.c:445 fetch-pack.c:1326

1902 #, c-format

1903 msgid "expected shallow/unshallow, got %s"

1904 msgstr "应为 shallow/unshallow，却得到 %s"

1905

1831 -#: fetch-pack.c:485

1906 +#: fetch-pack.c:486

1907 #, c-format

1908 msgid "got %s %d %s"

1909 msgstr "得到 %s %d %s"

1910

1836 -#: fetch-pack.c:499

1911 +#: fetch-pack.c:500

1912 #, c-format

1913 msgid "invalid commit %s"

1914 msgstr "无效提交 %s"

1915

1841 -#: fetch-pack.c:532

1916 +#: fetch-pack.c:533

1917 msgid "giving up"

1918 msgstr "放弃"

1919

1845 -#: fetch-pack.c:542 progress.c:229

1920 +#: fetch-pack.c:543 progress.c:229

1921 msgid "done"

1922 msgstr "完成"

1923

1849 -#: fetch-pack.c:554

1924 +#: fetch-pack.c:555

1925 #, c-format

1926 msgid "got %s (%d) %s"

1927 msgstr "得到 %s (%d) %s"

1928

1854 -#: fetch-pack.c:600

1929 +#: fetch-pack.c:601

1930 #, c-format

1931 msgid "Marking %s as complete"

1932 msgstr "标记 %s 为完成"

1933

1859 -#: fetch-pack.c:788

1934 +#: fetch-pack.c:828

1935 #, c-format

1936 msgid "already have %s (%s)"

1937 msgstr "已经有 %s（%s）"

1938

1864 -#: fetch-pack.c:829

1939 +#: fetch-pack.c:869

1940 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1941 msgstr "fetch-pack：无法派生 sideband 多路输出"

1942

1868 -#: fetch-pack.c:837

1943 +#: fetch-pack.c:877

1944 msgid "protocol error: bad pack header"

1945 msgstr "协议错误：坏的包头"

1946

1872 -#: fetch-pack.c:895

1947 +#: fetch-pack.c:944

1948 #, c-format

1949 msgid "fetch-pack: unable to fork off %s"

1950 msgstr "fetch-pack：无法派生进程 %s"

1951

1877 -#: fetch-pack.c:911

1952 +#: fetch-pack.c:960

1953 #, c-format

1954 msgid "%s failed"

1955 msgstr "%s 失败"

1956

1882 -#: fetch-pack.c:913

1957 +#: fetch-pack.c:962

1958 msgid "error in sideband demultiplexer"

1959 msgstr "sideband 多路输出出错"

1960

1886 -#: fetch-pack.c:940

1961 +#: fetch-pack.c:989

1962 msgid "Server does not support shallow clients"

1963 msgstr "服务器不支持 shalllow 客户端"

1964

1890 -#: fetch-pack.c:944

1965 +#: fetch-pack.c:993

1966 msgid "Server supports multi_ack_detailed"

1967 msgstr "服务器支持 multi_ack_detailed"

1968

1894 -#: fetch-pack.c:947

1969 +#: fetch-pack.c:996

1970 msgid "Server supports no-done"

1971 msgstr "服务器支持 no-done"

1972

1898 -#: fetch-pack.c:953

1973 +#: fetch-pack.c:1002

1974 msgid "Server supports multi_ack"

1975 msgstr "服务器支持 multi_ack"

1976

1902 -#: fetch-pack.c:957

1977 +#: fetch-pack.c:1006

1978 msgid "Server supports side-band-64k"

1979 msgstr "服务器支持 side-band-64k"

1980

1906 -#: fetch-pack.c:961

1981 +#: fetch-pack.c:1010

1982 msgid "Server supports side-band"

1983 msgstr "服务器支持 side-band"

1984

1910 -#: fetch-pack.c:965

1985 +#: fetch-pack.c:1014

1986 msgid "Server supports allow-tip-sha1-in-want"

1987 msgstr "服务器支持 allow-tip-sha1-in-want"

1988

1914 -#: fetch-pack.c:969

1989 +#: fetch-pack.c:1018

1990 msgid "Server supports allow-reachable-sha1-in-want"

1991 msgstr "服务器支持 allow-reachable-sha1-in-want"

1992

1918 -#: fetch-pack.c:979

1993 +#: fetch-pack.c:1028

1994 msgid "Server supports ofs-delta"

1995 msgstr "服务器支持 ofs-delta"

1996

1922 -#: fetch-pack.c:985

1997 +#: fetch-pack.c:1034 fetch-pack.c:1204

1998 msgid "Server supports filter"

1999 msgstr "服务器支持 filter"

2000

1926 -#: fetch-pack.c:993

2001 +#: fetch-pack.c:1042

2002 #, c-format

2003 msgid "Server version is %.*s"

2004 msgstr "服务器版本 %.*s"

2005

1931 -#: fetch-pack.c:999

2006 +#: fetch-pack.c:1048

2007 msgid "Server does not support --shallow-since"

2008 msgstr "服务器不支持 --shallow-since"

2009

1935 -#: fetch-pack.c:1003

2010 +#: fetch-pack.c:1052

2011 msgid "Server does not support --shallow-exclude"

2012 msgstr "服务器不支持 --shallow-exclude"

2013

1939 -#: fetch-pack.c:1005

2014 +#: fetch-pack.c:1054

2015 msgid "Server does not support --deepen"

2016 msgstr "服务器不支持 --deepen"

2017

1943 -#: fetch-pack.c:1016

2018 +#: fetch-pack.c:1065

2019 msgid "no common commits"

2020 msgstr "没有共同的提交"

2021

1947 -#: fetch-pack.c:1028

2022 +#: fetch-pack.c:1077 fetch-pack.c:1414

2023 msgid "git fetch-pack: fetch failed."

2024 msgstr "git fetch-pack：获取失败。"

2025

1951 -#: fetch-pack.c:1190

2026 +#: fetch-pack.c:1199

2027 +msgid "Server does not support shallow requests"

2028 +msgstr "服务器不支持 shalllow 请求"

2029 +

2030 +#: fetch-pack.c:1584

2031 msgid "no matching remote head"

2032 msgstr "没有匹配的远程分支"

2033

1955 -#: fetch-pack.c:1212

2034 +#: fetch-pack.c:1610

2035 #, c-format

2036 msgid "no such remote ref %s"

2037 msgstr "没有这样的远程引用 %s"

2038

1960 -#: fetch-pack.c:1215

2039 +#: fetch-pack.c:1613

2040 #, c-format

2041 msgid "Server does not allow request for unadvertised object %s"

2042 msgstr "服务器不允许请求未公开的对象 %s"

2043

1965 -#: gpg-interface.c:181

2044 +#: gpg-interface.c:185

2045 msgid "gpg failed to sign the data"

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

2047

1969 -#: gpg-interface.c:211

2048 +#: gpg-interface.c:210

2049 msgid "could not create temporary file"

2050 msgstr "不能创建临时文件"

2051

1973 -#: gpg-interface.c:214

2052 +#: gpg-interface.c:213

2053 #, c-format

2054 msgid "failed writing detached signature to '%s'"

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

@@ -1980,36 +2059,97 @@ msgstr "无法将分离式签名写入 '%s'"

2059 msgid "ignore invalid color '%.*s' in log.graphColors"

2060 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

2061

1983 -#: grep.c:2022

2062 +#: grep.c:2020

2063 #, c-format

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

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

2066

1988 -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81

2067 +#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

2068 #: builtin/rm.c:134

2069 #, c-format

2070 msgid "failed to stat '%s'"

2071 msgstr "对 '%s' 调用 stat 失败"

2072

1994 -#: grep.c:2050

2073 +#: grep.c:2048

2074 #, c-format

2075 msgid "'%s': short read"

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

2077

1999 -#: help.c:179

2078 +#: help.c:23

2079 +msgid "start a working area (see also: git help tutorial)"

2080 +msgstr "开始一个工作区（参见：git help tutorial）"

2081 +

2082 +#: help.c:24

2083 +msgid "work on the current change (see also: git help everyday)"

2084 +msgstr "在当前变更上工作（参见：git help everyday）"

2085 +

2086 +#: help.c:25

2087 +msgid "examine the history and state (see also: git help revisions)"

2088 +msgstr "检查历史和状态（参见：git help revisions）"

2089 +

2090 +#: help.c:26

2091 +msgid "grow, mark and tweak your common history"

2092 +msgstr "扩展、标记和调校您的历史记录"

2093 +

2094 +#: help.c:27

2095 +msgid "collaborate (see also: git help workflows)"

2096 +msgstr "协同（参见：git help workflows）"

2097 +

2098 +#: help.c:31

2099 +msgid "Main Porcelain Commands"

2100 +msgstr "主要的上层命令"

2101 +

2102 +#: help.c:32

2103 +msgid "Ancillary Commands / Manipulators"

2104 +msgstr "辅助命令/操作者"

2105 +

2106 +#: help.c:33

2107 +msgid "Ancillary Commands / Interrogators"

2108 +msgstr "辅助命令/询问者"

2109 +

2110 +#: help.c:34

2111 +msgid "Interacting with Others"

2112 +msgstr "与其它系统交互"

2113 +

2114 +#: help.c:35

2115 +msgid "Low-level Commands / Manipulators"

2116 +msgstr "低级命令/操作者"

2117 +

2118 +#: help.c:36

2119 +msgid "Low-level Commands / Interrogators"

2120 +msgstr "低级命令/询问者"

2121 +

2122 +#: help.c:37

2123 +msgid "Low-level Commands / Synching Repositories"

2124 +msgstr "低级命令/同步仓库"

2125 +

2126 +#: help.c:38

2127 +msgid "Low-level Commands / Internal Helpers"

2128 +msgstr "低级命令/内部助手"

2129 +

2130 +#: help.c:293

2131 #, c-format

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

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

2134

2004 -#: help.c:186

2135 +#: help.c:300

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

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

2138

2008 -#: help.c:217

2139 +#: help.c:309

2140 msgid "These are common Git commands used in various situations:"

2141 msgstr "这些是各种场合常见的 Git 命令："

2142

2012 -#: help.c:281

2143 +#: help.c:358 git.c:90

2144 +#, c-format

2145 +msgid "unsupported command listing type '%s'"

2146 +msgstr "不支持的命令列表类型 '%s'"

2147 +

2148 +#: help.c:405

2149 +msgid "The common Git guides are:"

2150 +msgstr "最常用的 Git 向导有："

2151 +

2152 +#: help.c:467

2153 #, c-format

2154 msgid ""

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

@@ -2018,31 +2158,31 @@ msgstr ""

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

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

2160

2021 -#: help.c:336

2161 +#: help.c:526

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

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

2164

2025 -#: help.c:358

2165 +#: help.c:548

2166 #, c-format

2167 msgid "WARNING: You called a Git command named '%s', which does not exist."

2168 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"

2169

2030 -#: help.c:363

2170 +#: help.c:553

2171 #, c-format

2172 msgid "Continuing under the assumption that you meant '%s'."

2173 msgstr "假定你想要的是 '%s' 并继续。"

2174

2035 -#: help.c:368

2175 +#: help.c:558

2176 #, c-format

2177 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2178 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"

2179

2040 -#: help.c:376

2180 +#: help.c:566

2181 #, c-format

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

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

2184

2045 -#: help.c:380

2185 +#: help.c:570

2186 msgid ""

2187 "\n"

2188 "The most similar command is"

@@ -2056,16 +2196,16 @@ msgstr[1] ""

2196 "\n"

2197 "最相似的命令是"

2198

2059 -#: help.c:395

2199 +#: help.c:585

2200 msgid "git version [<options>]"

2201 msgstr "git version [<选项>]"

2202

2063 -#: help.c:462

2203 +#: help.c:652

2204 #, c-format

2205 msgid "%s: %s - %s"

2206 msgstr "%s：%s - %s"

2207

2068 -#: help.c:466

2208 +#: help.c:656

2209 msgid ""

2210 "\n"

2211 "Did you mean this?"

@@ -2132,7 +2272,7 @@ msgstr "不允许空的姓名（对于 <%s>）"

2272 msgid "name consists only of disallowed characters: %s"

2273 msgstr "姓名中仅包含禁用字符：%s"

2274

2135 -#: ident.c:416 builtin/commit.c:582

2275 +#: ident.c:416 builtin/commit.c:587

2276 #, c-format

2277 msgid "invalid date format: %s"

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

@@ -2168,82 +2308,157 @@ msgstr ""

2308 msgid "Unable to create '%s.lock': %s"

2309 msgstr "不能创建 '%s.lock'：%s"

2310

2171 -#: merge.c:74

2311 +#: merge.c:71

2312 msgid "failed to read the cache"

2313 msgstr "无法读取缓存"

2314

2175 -#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2176 -#: builtin/checkout.c:599 builtin/clone.c:759

2315 +#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2316 +#: builtin/checkout.c:606 builtin/clone.c:761

2317 msgid "unable to write new index file"

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

2319

2180 -#: merge-recursive.c:235

2320 +#: merge-recursive.c:298

2321 msgid "(bad commit)\n"

2322 msgstr "（坏提交）\n"

2323

2184 -#: merge-recursive.c:257 merge-recursive.c:265

2324 +#: merge-recursive.c:320

2325 #, c-format

2186 -msgid "addinfo_cache failed for path '%s'"

2187 -msgstr "为路径 '%s' addinfo_cache 失败"

2326 +msgid "add_cacheinfo failed for path '%s'; merge aborting."

2327 +msgstr "addinfo_cache 对路径 '%s' 执行失败，合并终止。"

2328

2189 -#: merge-recursive.c:329

2329 +#: merge-recursive.c:328

2330 +#, c-format

2331 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2332 +msgstr "addinfo_cache 无法刷新路径 '%s'，合并终止。"

2333 +

2334 +#: merge-recursive.c:410

2335 msgid "error building trees"

2336 msgstr "无法创建树"

2337

2193 -#: merge-recursive.c:771

2338 +#: merge-recursive.c:881

2339 #, c-format

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

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

2342

2198 -#: merge-recursive.c:782

2343 +#: merge-recursive.c:892

2344 #, c-format

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

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

2347

2203 -#: merge-recursive.c:796 merge-recursive.c:815

2348 +#: merge-recursive.c:906 merge-recursive.c:925

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

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

2351

2207 -#: merge-recursive.c:805

2352 +#: merge-recursive.c:915

2353 #, c-format

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

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

2356

2212 -#: merge-recursive.c:847 builtin/cat-file.c:37

2357 +#: merge-recursive.c:957 builtin/cat-file.c:37

2358 #, c-format

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

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

2361

2217 -#: merge-recursive.c:849

2362 +#: merge-recursive.c:959

2363 #, c-format

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

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

2366

2222 -#: merge-recursive.c:873

2367 +#: merge-recursive.c:983

2368 #, c-format

2369 msgid "failed to open '%s': %s"

2370 msgstr "无法打开 '%s'：%s"

2371

2227 -#: merge-recursive.c:884

2372 +#: merge-recursive.c:994

2373 #, c-format

2374 msgid "failed to symlink '%s': %s"

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

2376

2232 -#: merge-recursive.c:889

2377 +#: merge-recursive.c:999

2378 #, c-format

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

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

2381

2237 -#: merge-recursive.c:1029

2382 +#: merge-recursive.c:1186

2383 +#, c-format

2384 +msgid "Failed to merge submodule %s (not checked out)"

2385 +msgstr "无法合并子模组 %s （没有检出）"

2386 +

2387 +#: merge-recursive.c:1193

2388 +#, c-format

2389 +msgid "Failed to merge submodule %s (commits not present)"

2390 +msgstr "无法合并子模组 %s（提交不存在）"

2391 +

2392 +#: merge-recursive.c:1200

2393 +#, c-format

2394 +msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2395 +msgstr "无法合并子模组 %s （提交未跟随合并基线）"

2396 +

2397 +#: merge-recursive.c:1208 merge-recursive.c:1220

2398 +#, c-format

2399 +msgid "Fast-forwarding submodule %s to the following commit:"

2400 +msgstr "子模组 %s 快进到如下提交："

2401 +

2402 +#: merge-recursive.c:1211 merge-recursive.c:1223

2403 +#, c-format

2404 +msgid "Fast-forwarding submodule %s"

2405 +msgstr "快进子模组 %s"

2406 +

2407 +#: merge-recursive.c:1245

2408 +#, c-format

2409 +msgid "Failed to merge submodule %s (merge following commits not found)"

2410 +msgstr "无法合并子模组 %s （没发现合并跟随的提交）"

2411 +

2412 +#: merge-recursive.c:1249

2413 +#, c-format

2414 +msgid "Failed to merge submodule %s (not fast-forward)"

2415 +msgstr "无法合并子模组 %s（非快进）"

2416 +

2417 +#: merge-recursive.c:1250

2418 +msgid "Found a possible merge resolution for the submodule:\n"

2419 +msgstr "找到子模组的一个可能的合并方案：\n"

2420 +

2421 +#: merge-recursive.c:1253

2422 +#, c-format

2423 +msgid ""

2424 +"If this is correct simply add it to the index for example\n"

2425 +"by using:\n"

2426 +"\n"

2427 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2428 +"\n"

2429 +"which will accept this suggestion.\n"

2430 +msgstr ""

2431 +"如果这个正确，将其添加到索引，例如使用命令：\n"

2432 +"\n"

2433 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2434 +"\n"

2435 +"以接受此建议。\n"

2436 +

2437 +#: merge-recursive.c:1262

2438 +#, c-format

2439 +msgid "Failed to merge submodule %s (multiple merges found)"

2440 +msgstr "无法合并子模组 %s （发现多个合并）"

2441 +

2442 +#: merge-recursive.c:1321

2443 msgid "Failed to execute internal merge"

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

2445

2241 -#: merge-recursive.c:1034

2446 +#: merge-recursive.c:1326

2447 #, c-format

2448 msgid "Unable to add %s to database"

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

2450

2246 -#: merge-recursive.c:1146

2451 +#: merge-recursive.c:1358

2452 +#, c-format

2453 +msgid "Auto-merging %s"

2454 +msgstr "自动合并 %s"

2455 +

2456 +#: merge-recursive.c:1423

2457 +#, c-format

2458 +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2459 +msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

2460 +

2461 +#: merge-recursive.c:1475

2462 #, c-format

2463 msgid ""

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

@@ -2252,7 +2467,7 @@ msgstr ""

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

2468 "本被保留。"

2469

2255 -#: merge-recursive.c:1151

2470 +#: merge-recursive.c:1480

2471 #, c-format

2472 msgid ""

2473 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2261,7 +2476,7 @@ msgstr ""

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

2477 "%7$s 版本被保留。"

2478

2264 -#: merge-recursive.c:1158

2479 +#: merge-recursive.c:1487

2480 #, c-format

2481 msgid ""

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

@@ -2270,7 +2485,7 @@ msgstr ""

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

2486 "本保留在 %8$s 中。"

2487

2273 -#: merge-recursive.c:1163

2488 +#: merge-recursive.c:1492

2489 #, c-format

2490 msgid ""

2491 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2279,20 +2494,31 @@ msgstr ""

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

2495 "%7$s 版本保留在 %9$s 中。"

2496

2282 -#: merge-recursive.c:1197

2497 +#: merge-recursive.c:1526

2498 msgid "rename"

2499 msgstr "重命名"

2500

2286 -#: merge-recursive.c:1197

2501 +#: merge-recursive.c:1526

2502 msgid "renamed"

2503 msgstr "重命名"

2504

2290 -#: merge-recursive.c:1254

2505 +#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2506 +#: merge-recursive.c:3086

2507 +#, c-format

2508 +msgid "Refusing to lose dirty file at %s"

2509 +msgstr "拒绝丢失脏文件 '%s'"

2510 +

2511 +#: merge-recursive.c:1594

2512 #, c-format

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

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

2515

2295 -#: merge-recursive.c:1279

2516 +#: merge-recursive.c:1599

2517 +#, c-format

2518 +msgid "Refusing to lose untracked file at %s; adding as %s instead"

2519 +msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

2520 +

2521 +#: merge-recursive.c:1625

2522 #, c-format

2523 msgid ""

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

@@ -2301,140 +2527,184 @@ msgstr ""

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

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

2529

2304 -#: merge-recursive.c:1284

2530 +#: merge-recursive.c:1630

2531 msgid " (left unresolved)"

2532 msgstr "（留下未解决）"

2533

2308 -#: merge-recursive.c:1346

2534 +#: merge-recursive.c:1694

2535 #, c-format

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

2537 msgstr ""

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

2539 "%5$s"

2540

2315 -#: merge-recursive.c:1379

2541 +#: merge-recursive.c:1733

2542 #, c-format

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

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

2545

2320 -#: merge-recursive.c:1582

2546 +#: merge-recursive.c:1745

2547 +#, c-format

2548 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

2549 +msgstr "拒绝丢失未跟踪文件 '%s'，即使它妨碍了。"

2550 +

2551 +#: merge-recursive.c:1951

2552 +#, c-format

2553 +msgid ""

2554 +"CONFLICT (directory rename split): Unclear where to place %s because "

2555 +"directory %s was renamed to multiple other directories, with no destination "

2556 +"getting a majority of the files."

2557 +msgstr ""

2558 +"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

2559 +"其它目录，没有一个目录包含主要的文件。"

2560 +

2561 +#: merge-recursive.c:1983

2562 +#, c-format

2563 +msgid ""

2564 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

2565 +"implicit directory rename(s) putting the following path(s) there: %s."

2566 +msgstr ""

2567 +"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

2568 +"在：%s。"

2569 +

2570 +#: merge-recursive.c:1993

2571 +#, c-format

2572 +msgid ""

2573 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

2574 +"implicit directory renames tried to put these paths there: %s"

2575 +msgstr ""

2576 +"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

2577 +"径放置于此：%s"

2578 +

2579 +#: merge-recursive.c:2085

2580 +#, c-format

2581 +msgid ""

2582 +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

2583 +">%s in %s"

2584 +msgstr ""

2585 +"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "

2586 +"%4$s->%5$s"

2587 +

2588 +#: merge-recursive.c:2330

2589 +#, c-format

2590 +msgid ""

2591 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

2592 +"renamed."

2593 +msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

2594 +

2595 +#: merge-recursive.c:2736

2596 #, c-format

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

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

2599

2325 -#: merge-recursive.c:1597

2600 +#: merge-recursive.c:2751

2601 #, c-format

2602 msgid "Adding merged %s"

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

2604

2330 -#: merge-recursive.c:1604 merge-recursive.c:1834

2605 +#: merge-recursive.c:2758 merge-recursive.c:3089

2606 #, c-format

2607 msgid "Adding as %s instead"

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

2609

2335 -#: merge-recursive.c:1661

2610 +#: merge-recursive.c:2914

2611 #, c-format

2612 msgid "cannot read object %s"

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

2614

2340 -#: merge-recursive.c:1664

2615 +#: merge-recursive.c:2917

2616 #, c-format

2617 msgid "object %s is not a blob"

2618 msgstr "对象 %s 不是一个数据对象"

2619

2345 -#: merge-recursive.c:1733

2620 +#: merge-recursive.c:2986

2621 msgid "modify"

2622 msgstr "修改"

2623

2349 -#: merge-recursive.c:1733

2624 +#: merge-recursive.c:2986

2625 msgid "modified"

2626 msgstr "修改"

2627

2353 -#: merge-recursive.c:1743

2628 +#: merge-recursive.c:2997

2629 msgid "content"

2630 msgstr "内容"

2631

2357 -#: merge-recursive.c:1750

2632 +#: merge-recursive.c:3004

2633 msgid "add/add"

2634 msgstr "添加/添加"

2635

2361 -#: merge-recursive.c:1786

2636 +#: merge-recursive.c:3046

2637 #, c-format

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

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

2640

2366 -#: merge-recursive.c:1800

2367 -#, c-format

2368 -msgid "Auto-merging %s"

2369 -msgstr "自动合并 %s"

2370 -

2371 -#: merge-recursive.c:1804 git-submodule.sh:879

2641 +#: merge-recursive.c:3055 git-submodule.sh:895

2642 msgid "submodule"

2643 msgstr "子模组"

2644

2375 -#: merge-recursive.c:1805

2645 +#: merge-recursive.c:3056

2646 #, c-format

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

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

2649

2380 -#: merge-recursive.c:1899

2650 +#: merge-recursive.c:3178

2651 #, c-format

2652 msgid "Removing %s"

2653 msgstr "删除 %s"

2654

2385 -#: merge-recursive.c:1925

2655 +#: merge-recursive.c:3204

2656 msgid "file/directory"

2657 msgstr "文件/目录"

2658

2389 -#: merge-recursive.c:1931

2659 +#: merge-recursive.c:3210

2660 msgid "directory/file"

2661 msgstr "目录/文件"

2662

2393 -#: merge-recursive.c:1938

2663 +#: merge-recursive.c:3217

2664 #, c-format

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

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

2667

2398 -#: merge-recursive.c:1947

2668 +#: merge-recursive.c:3226

2669 #, c-format

2670 msgid "Adding %s"

2671 msgstr "添加 %s"

2672

2403 -#: merge-recursive.c:1987

2673 +#: merge-recursive.c:3267

2674 #, c-format

2675 msgid "Dirty index: cannot merge (dirty: %s)"

2676 msgstr "脏索引：不能合并（脏文件：%s）"

2677

2408 -#: merge-recursive.c:1991

2678 +#: merge-recursive.c:3271

2679 msgid "Already up to date!"

2680 msgstr "已经是最新的！"

2681

2412 -#: merge-recursive.c:2000

2682 +#: merge-recursive.c:3280

2683 #, c-format

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

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

2686

2417 -#: merge-recursive.c:2097

2687 +#: merge-recursive.c:3379

2688 msgid "Merging:"

2689 msgstr "合并："

2690

2421 -#: merge-recursive.c:2110

2691 +#: merge-recursive.c:3392

2692 #, c-format

2693 msgid "found %u common ancestor:"

2694 msgid_plural "found %u common ancestors:"

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

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

2697

2428 -#: merge-recursive.c:2149

2698 +#: merge-recursive.c:3431

2699 msgid "merge returned no commit"

2700 msgstr "合并未返回提交"

2701

2432 -#: merge-recursive.c:2212

2702 +#: merge-recursive.c:3495

2703 #, c-format

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

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

2706

2437 -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

2707 +#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

2708 msgid "Unable to write index."

2709 msgstr "不能写入索引。"

2710

@@ -2477,30 +2747,30 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

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

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

2749

2480 -#: object.c:239

2750 +#: object.c:242

2751 #, c-format

2752 msgid "unable to parse object: %s"

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

2754

2485 -#: packfile.c:561

2755 +#: packfile.c:563

2756 msgid "offset before end of packfile (broken .idx?)"

2757 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

2758

2489 -#: packfile.c:1694

2759 +#: packfile.c:1742

2760 #, c-format

2761 msgid "offset before start of pack index for %s (corrupt index?)"

2762 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

2763

2494 -#: packfile.c:1698

2764 +#: packfile.c:1746

2765 #, c-format

2766 msgid "offset beyond end of pack index for %s (truncated index?)"

2767 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

2768

2499 -#: parse-options.c:619

2769 +#: parse-options.c:621

2770 msgid "..."

2771 msgstr "..."

2772

2503 -#: parse-options.c:638

2773 +#: parse-options.c:640

2774 #, c-format

2775 msgid "usage: %s"

2776 msgstr "用法：%s"

@@ -2508,27 +2778,32 @@ msgstr "用法：%s"

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

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

2780 #.

2511 -#: parse-options.c:644

2781 +#: parse-options.c:646

2782 #, c-format

2783 msgid " or: %s"

2784 msgstr " 或：%s"

2785

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

2517 -#: parse-options.c:647

2787 +#: parse-options.c:649

2788 #, c-format

2789 msgid " %s"

2790 msgstr " %s"

2791

2522 -#: parse-options.c:686

2792 +#: parse-options.c:688

2793 msgid "-NUM"

2794 msgstr "-数字"

2795

2526 -#: parse-options-cb.c:108

2796 +#: parse-options-cb.c:44

2797 +#, c-format

2798 +msgid "malformed expiration date '%s'"

2799 +msgstr "格式错误的到期时间：'%s'"

2800 +

2801 +#: parse-options-cb.c:112

2802 #, c-format

2803 msgid "malformed object name '%s'"

2529 -msgstr "非法的对象名 '%s'"

2804 +msgstr "格式错误的对象名 '%s'"

2805

2531 -#: path.c:891

2806 +#: path.c:892

2807 #, c-format

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

2809 msgstr "不能设置 %s 为组可写"

@@ -2608,7 +2883,7 @@ msgstr "路径规格 '%s' 位于符号链接中"

2883 msgid "unable to parse --pretty format"

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

2885

2611 -#: read-cache.c:1473

2886 +#: read-cache.c:1500

2887 #, c-format

2888 msgid ""

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

@@ -2617,7 +2892,7 @@ msgstr ""

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

2893 "使用版本 %i"

2894

2620 -#: read-cache.c:1483

2895 +#: read-cache.c:1510

2896 #, c-format

2897 msgid ""

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

@@ -2626,52 +2901,53 @@ msgstr ""

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

2902 "使用版本 %i"

2903

2629 -#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

2904 +#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

2905 #, c-format

2906 msgid "could not close '%s'"

2907 msgstr "不能关闭 '%s'"

2908

2634 -#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

2909 +#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

2910 #, c-format

2911 msgid "could not stat '%s'"

2912 msgstr "不能对 '%s' 调用 stat"

2913

2639 -#: read-cache.c:2461

2914 +#: read-cache.c:2490

2915 #, c-format

2916 msgid "unable to open git dir: %s"

2917 msgstr "不能打开 git 目录：%s"

2918

2644 -#: read-cache.c:2473

2919 +#: read-cache.c:2502

2920 #, c-format

2921 msgid "unable to unlink: %s"

2922 msgstr "无法删除：%s"

2923

2649 -#: refs.c:706

2924 +#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

2925 +#: builtin/am.c:779

2926 #, c-format

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

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

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

2929

2654 -#: refs.c:1850

2930 +#: refs.c:1880

2931 msgid "ref updates forbidden inside quarantine environment"

2932 msgstr "在隔离环境中禁止更新引用"

2933

2658 -#: refs/files-backend.c:1189

2934 +#: refs/files-backend.c:1191

2935 #, c-format

2936 msgid "could not remove reference %s"

2937 msgstr "无法删除引用 %s"

2938

2663 -#: refs/files-backend.c:1203 refs/packed-backend.c:1528

2664 -#: refs/packed-backend.c:1538

2939 +#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2940 +#: refs/packed-backend.c:1541

2941 #, c-format

2942 msgid "could not delete reference %s: %s"

2943 msgstr "无法删除引用 %s：%s"

2944

2669 -#: refs/files-backend.c:1206 refs/packed-backend.c:1541

2945 +#: refs/files-backend.c:1208 refs/packed-backend.c:1544

2946 #, c-format

2947 msgid "could not delete references: %s"

2948 msgstr "无法删除引用：%s"

2949

2674 -#: ref-filter.c:35 wt-status.c:1842

2950 +#: ref-filter.c:35 wt-status.c:1850

2951 msgid "gone"

2952 msgstr "丢失"

2953

@@ -2690,157 +2966,162 @@ msgstr "落后 %d"

2966 msgid "ahead %d, behind %d"

2967 msgstr "领先 %d，落后 %d"

2968

2693 -#: ref-filter.c:107

2969 +#: ref-filter.c:121

2970 #, c-format

2971 msgid "expected format: %%(color:<color>)"

2972 msgstr "期望的格式：%%(color:<颜色>)"

2973

2698 -#: ref-filter.c:109

2974 +#: ref-filter.c:123

2975 #, c-format

2976 msgid "unrecognized color: %%(color:%s)"

2977 msgstr "未能识别的颜色：%%(color:%s)"

2978

2703 -#: ref-filter.c:129

2979 +#: ref-filter.c:145

2980 #, c-format

2981 msgid "Integer value expected refname:lstrip=%s"

2982 msgstr "期望整数值 refname:lstrip=%s"

2983

2708 -#: ref-filter.c:133

2984 +#: ref-filter.c:149

2985 #, c-format

2986 msgid "Integer value expected refname:rstrip=%s"

2987 msgstr "期望整数值 refname:rstrip=%s"

2988

2713 -#: ref-filter.c:135

2989 +#: ref-filter.c:151

2990 #, c-format

2991 msgid "unrecognized %%(%s) argument: %s"

2992 msgstr "未能识别的 %%(%s) 参数：%s"

2993

2718 -#: ref-filter.c:184

2994 +#: ref-filter.c:206

2995 #, c-format

2996 msgid "%%(body) does not take arguments"

2997 msgstr "%%(body) 不带参数"

2998

2723 -#: ref-filter.c:191

2999 +#: ref-filter.c:215

3000 #, c-format

3001 msgid "%%(subject) does not take arguments"

3002 msgstr "%%(subject) 不带参数"

3003

2728 -#: ref-filter.c:209

3004 +#: ref-filter.c:235

3005 #, c-format

3006 msgid "unknown %%(trailers) argument: %s"

3007 msgstr "未知的 %%(trailers) 参数：%s"

3008

2733 -#: ref-filter.c:232

3009 +#: ref-filter.c:264

3010 #, c-format

3011 msgid "positive value expected contents:lines=%s"

3012 msgstr "期望一个正数 contents:lines=%s"

3013

2738 -#: ref-filter.c:234

3014 +#: ref-filter.c:266

3015 #, c-format

3016 msgid "unrecognized %%(contents) argument: %s"

3017 msgstr "未能识别的 %%(contents) 参数：%s"

3018

2743 -#: ref-filter.c:247

3019 +#: ref-filter.c:281

3020 #, c-format

3021 msgid "positive value expected objectname:short=%s"

3022 msgstr "期望一个正数 objectname:short=%s"

3023

2748 -#: ref-filter.c:251

3024 +#: ref-filter.c:285

3025 #, c-format

3026 msgid "unrecognized %%(objectname) argument: %s"

3027 msgstr "未能识别的 %%(objectname) 参数：%s"

3028

2753 -#: ref-filter.c:278

3029 +#: ref-filter.c:315

3030 #, c-format

3031 msgid "expected format: %%(align:<width>,<position>)"

3032 msgstr "期望的格式：%%(align:<宽度>,<位置>)"

3033

2758 -#: ref-filter.c:290

3034 +#: ref-filter.c:327

3035 #, c-format

3036 msgid "unrecognized position:%s"

3037 msgstr "未能识别的位置：%s"

3038

2763 -#: ref-filter.c:294

3039 +#: ref-filter.c:334

3040 #, c-format

3041 msgid "unrecognized width:%s"

3042 msgstr "未能识别的宽度：%s"

3043

2768 -#: ref-filter.c:300

3044 +#: ref-filter.c:343

3045 #, c-format

3046 msgid "unrecognized %%(align) argument: %s"

3047 msgstr "未能识别的 %%(align) 参数：%s"

3048

2773 -#: ref-filter.c:304

3049 +#: ref-filter.c:351

3050 #, c-format

3051 msgid "positive width expected with the %%(align) atom"

3052 msgstr "元素 %%(align) 需要一个正数的宽度"

3053

2778 -#: ref-filter.c:319

3054 +#: ref-filter.c:369

3055 #, c-format

3056 msgid "unrecognized %%(if) argument: %s"

3057 msgstr "未能识别的 %%(if) 参数：%s"

3058

2783 -#: ref-filter.c:409

3059 +#: ref-filter.c:464

3060 #, c-format

3061 msgid "malformed field name: %.*s"

2786 -msgstr "非法的字段名：%.*s"

3062 +msgstr "格式错误的字段名：%.*s"

3063

2788 -#: ref-filter.c:435

3064 +#: ref-filter.c:491

3065 #, c-format

3066 msgid "unknown field name: %.*s"

3067 msgstr "未知的字段名：%.*s"

3068

2793 -#: ref-filter.c:547

3069 +#: ref-filter.c:608

3070 #, c-format

3071 msgid "format: %%(if) atom used without a %%(then) atom"

3072 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

3073

2798 -#: ref-filter.c:607

3074 +#: ref-filter.c:671

3075 #, c-format

3076 msgid "format: %%(then) atom used without an %%(if) atom"

3077 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

3078

2803 -#: ref-filter.c:609

3079 +#: ref-filter.c:673

3080 #, c-format

3081 msgid "format: %%(then) atom used more than once"

3082 msgstr "格式：%%(then) 元素用了多次"

3083

2808 -#: ref-filter.c:611

3084 +#: ref-filter.c:675

3085 #, c-format

3086 msgid "format: %%(then) atom used after %%(else)"

3087 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

3088

2813 -#: ref-filter.c:637

3089 +#: ref-filter.c:703

3090 #, c-format

3091 msgid "format: %%(else) atom used without an %%(if) atom"

3092 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

3093

2818 -#: ref-filter.c:639

3094 +#: ref-filter.c:705

3095 #, c-format

3096 msgid "format: %%(else) atom used without a %%(then) atom"

3097 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

3098

2823 -#: ref-filter.c:641

3099 +#: ref-filter.c:707

3100 #, c-format

3101 msgid "format: %%(else) atom used more than once"

3102 msgstr "格式：%%(else) 元素用了多次"

3103

2828 -#: ref-filter.c:654

3104 +#: ref-filter.c:722

3105 #, c-format

3106 msgid "format: %%(end) atom used without corresponding atom"

3107 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

3108

2833 -#: ref-filter.c:709

3109 +#: ref-filter.c:779

3110 #, c-format

3111 msgid "malformed format string %s"

2836 -msgstr "非法的格式化字符串 %s"

3112 +msgstr "错误的格式化字符串 %s"

3113

2838 -#: ref-filter.c:1313

3114 +#: ref-filter.c:1387

3115 #, c-format

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

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

3118

2843 -#: ref-filter.c:1316

3119 +#: ref-filter.c:1390

3120 +#, c-format

3121 +msgid "(no branch, rebasing detached HEAD %s)"

3122 +msgstr "（非分支，正变基分离头指针 %s）"

3123 +

3124 +#: ref-filter.c:1393

3125 #, c-format

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

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

@@ -2848,7 +3129,7 @@ msgstr "（非分支，二分查找开始于 %s）"

3129 #. TRANSLATORS: make sure this matches "HEAD

3130 #. detached at " in wt-status.c

3131 #.

2851 -#: ref-filter.c:1324

3132 +#: ref-filter.c:1401

3133 #, c-format

3134 msgid "(HEAD detached at %s)"

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

@@ -2856,147 +3137,147 @@ msgstr "（头指针分离于 %s）"

3137 #. TRANSLATORS: make sure this matches "HEAD

3138 #. detached from " in wt-status.c

3139 #.

2859 -#: ref-filter.c:1331

3140 +#: ref-filter.c:1408

3141 #, c-format

3142 msgid "(HEAD detached from %s)"

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

3144

2864 -#: ref-filter.c:1335

3145 +#: ref-filter.c:1412

3146 msgid "(no branch)"

3147 msgstr "（非分支）"

3148

2868 -#: ref-filter.c:1364

3149 +#: ref-filter.c:1442

3150 #, c-format

3151 msgid "missing object %s for %s"

3152 msgstr "缺失 %2$s 的对象 %1$s"

3153

2873 -#: ref-filter.c:1367

3154 +#: ref-filter.c:1445

3155 #, c-format

3156 msgid "parse_object_buffer failed on %s for %s"

3157 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

3158

2878 -#: ref-filter.c:1819

3159 +#: ref-filter.c:1902

3160 #, c-format

3161 msgid "malformed object at '%s'"

2881 -msgstr "非法的对象于 '%s'"

3162 +msgstr "格式错误的对象 '%s'"

3163

2883 -#: ref-filter.c:1886

3164 +#: ref-filter.c:1984

3165 #, c-format

3166 msgid "ignoring ref with broken name %s"

3167 msgstr "忽略带有错误名称 %s 的引用"

3168

2888 -#: ref-filter.c:1891

3169 +#: ref-filter.c:1989

3170 #, c-format

3171 msgid "ignoring broken ref %s"

3172 msgstr "忽略损坏的引用 %s"

3173

2893 -#: ref-filter.c:2152

3174 +#: ref-filter.c:2261

3175 #, c-format

3176 msgid "format: %%(end) atom missing"

3177 msgstr "格式：缺少 %%(end) 元素"

3178

2898 -#: ref-filter.c:2246

3179 +#: ref-filter.c:2365

3180 #, c-format

3181 msgid "malformed object name %s"

2901 -msgstr "非法的对象名 %s"

3182 +msgstr "格式错误的对象名 %s"

3183

2903 -#: remote.c:795

3184 +#: remote.c:605

3185 #, c-format

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

3187 msgstr "不能同时获取 %s 和 %s 至 %s"

3188

2908 -#: remote.c:799

3189 +#: remote.c:609

3190 #, c-format

3191 msgid "%s usually tracks %s, not %s"

3192 msgstr "%s 通常跟踪 %s，而非 %s"

3193

2913 -#: remote.c:803

3194 +#: remote.c:613

3195 #, c-format

3196 msgid "%s tracks both %s and %s"

3197 msgstr "%s 同时跟踪 %s 和 %s"

3198

2918 -#: remote.c:811

3199 +#: remote.c:621

3200 msgid "Internal error"

3201 msgstr "内部错误"

3202

2922 -#: remote.c:1726 remote.c:1828

3203 +#: remote.c:1534 remote.c:1635

3204 msgid "HEAD does not point to a branch"

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

3206

2926 -#: remote.c:1735

3207 +#: remote.c:1543

3208 #, c-format

3209 msgid "no such branch: '%s'"

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

3211

2931 -#: remote.c:1738

3212 +#: remote.c:1546

3213 #, c-format

3214 msgid "no upstream configured for branch '%s'"

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

3216

2936 -#: remote.c:1744

3217 +#: remote.c:1552

3218 #, c-format

3219 msgid "upstream branch '%s' not stored as a remote-tracking branch"

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

3221

2941 -#: remote.c:1759

3222 +#: remote.c:1567

3223 #, c-format

3224 msgid "push destination '%s' on remote '%s' has no local tracking branch"

3225 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

3226

2946 -#: remote.c:1771

3227 +#: remote.c:1579

3228 #, c-format

3229 msgid "branch '%s' has no remote for pushing"

3230 msgstr "分支 '%s' 没有设置要推送的远程服务器"

3231

2951 -#: remote.c:1782

3232 +#: remote.c:1589

3233 #, c-format

3234 msgid "push refspecs for '%s' do not include '%s'"

3235 msgstr "向 '%s' 推送引用规格未包含 '%s'"

3236

2956 -#: remote.c:1795

3237 +#: remote.c:1602

3238 msgid "push has no destination (push.default is 'nothing')"

3239 msgstr "推送无目标（push.default 是 'nothing'）"

3240

2960 -#: remote.c:1817

3241 +#: remote.c:1624

3242 msgid "cannot resolve 'simple' push to a single destination"

3243 msgstr "无法解析 'simple' 推送至一个单独的目标"

3244

2964 -#: remote.c:2132

3245 +#: remote.c:1939

3246 #, c-format

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

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

3249

2969 -#: remote.c:2136

3250 +#: remote.c:1943

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

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

3253

2973 -#: remote.c:2139

3254 +#: remote.c:1946

3255 #, c-format

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

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

3258

2978 -#: remote.c:2143

3259 +#: remote.c:1950

3260 #, c-format

3261 msgid "Your branch and '%s' refer to different commits.\n"

3262 msgstr "您的分支和 '%s' 指向不同的提交。\n"

3263

2983 -#: remote.c:2146

3264 +#: remote.c:1953

3265 #, c-format

3266 msgid " (use \"%s\" for details)\n"

3267 msgstr " （使用 \"%s\" 查看详情）\n"

3268

2988 -#: remote.c:2150

3269 +#: remote.c:1957

3270 #, c-format

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

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

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

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

3275

2995 -#: remote.c:2156

3276 +#: remote.c:1963

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

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

3279

2999 -#: remote.c:2159

3280 +#: remote.c:1966

3281 #, c-format

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

3283 msgid_plural ""

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

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

3287

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

3008 -#: remote.c:2167

3289 +#: remote.c:1974

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

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

3292

3012 -#: remote.c:2170

3293 +#: remote.c:1977

3294 #, c-format

3295 msgid ""

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

@@ -3025,28 +3306,28 @@ msgstr[1] ""

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

3307

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

3028 -#: remote.c:2180

3309 +#: remote.c:1987

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

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

3312

3032 -#: revision.c:2277

3313 +#: revision.c:2289

3314 msgid "your current branch appears to be broken"

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

3316

3036 -#: revision.c:2280

3317 +#: revision.c:2292

3318 #, c-format

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

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

3321

3041 -#: revision.c:2477

3322 +#: revision.c:2489

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

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

3325

3045 -#: run-command.c:731

3326 +#: run-command.c:728

3327 msgid "open /dev/null failed"

3328 msgstr "不能打开 /dev/null"

3329

3049 -#: run-command.c:1274

3330 +#: run-command.c:1271

3331 #, c-format

3332 msgid ""

3333 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -3091,29 +3372,34 @@ msgstr "接收端不支持原子推送"

3372 msgid "the receiving end does not support push options"

3373 msgstr "接收端不支持推送选项"

3374

3094 -#: sequencer.c:158

3375 +#: sequencer.c:175

3376 #, c-format

3377 msgid "invalid commit message cleanup mode '%s'"

3378 msgstr "无效的提交信息清理模式 '%s'"

3379

3099 -#: sequencer.c:267

3380 +#: sequencer.c:275

3381 +#, c-format

3382 +msgid "could not delete '%s'"

3383 +msgstr "无法删除 '%s'"

3384 +

3385 +#: sequencer.c:301

3386 msgid "revert"

3387 msgstr "还原"

3388

3103 -#: sequencer.c:269

3389 +#: sequencer.c:303

3390 msgid "cherry-pick"

3391 msgstr "拣选"

3392

3107 -#: sequencer.c:271

3393 +#: sequencer.c:305

3394 msgid "rebase -i"

3395 msgstr "rebase -i"

3396

3111 -#: sequencer.c:273

3397 +#: sequencer.c:307

3398 #, c-format

3399 msgid "Unknown action: %d"

3400 msgstr "未知动作：%d"

3401

3116 -#: sequencer.c:330

3402 +#: sequencer.c:364

3403 msgid ""

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

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

@@ -3121,7 +3407,7 @@ msgstr ""

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

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

3409

3124 -#: sequencer.c:333

3410 +#: sequencer.c:367

3411 msgid ""

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

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

@@ -3130,43 +3416,45 @@ msgstr ""

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

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

3418

3133 -#: sequencer.c:346 sequencer.c:2245

3419 +#: sequencer.c:380 sequencer.c:2468

3420 #, c-format

3421 msgid "could not lock '%s'"

3422 msgstr "不能锁定 '%s'"

3423

3138 -#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264

3139 -#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

3424 +#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486

3425 +#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

3426 #, c-format

3427 msgid "could not write to '%s'"

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

3429

3144 -#: sequencer.c:353

3430 +#: sequencer.c:387

3431 #, c-format

3432 msgid "could not write eol to '%s'"

3433 msgstr "不能将换行符写入 '%s'"

3434

3149 -#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

3435 +#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488

3436 +#: sequencer.c:2702

3437 #, c-format

3438 msgid "failed to finalize '%s'"

3439 msgstr "无法完成 '%s'"

3440

3154 -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259

3155 -#: builtin/commit.c:722 builtin/merge.c:1047

3441 +#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371

3442 +#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727

3443 +#: builtin/merge.c:1046

3444 #, c-format

3445 msgid "could not read '%s'"

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

3447

3160 -#: sequencer.c:405

3448 +#: sequencer.c:441

3449 #, c-format

3450 msgid "your local changes would be overwritten by %s."

3451 msgstr "您的本地修改将被%s覆盖。"

3452

3165 -#: sequencer.c:409

3453 +#: sequencer.c:445

3454 msgid "commit your changes or stash them to proceed."

3455 msgstr "提交您的修改或贮藏后再继续。"

3456

3169 -#: sequencer.c:438

3457 +#: sequencer.c:474

3458 #, c-format

3459 msgid "%s: fast-forward"

3460 msgstr "%s：快进"

@@ -3174,20 +3462,20 @@ msgstr "%s：快进"

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

3463 #. "rebase -i".

3464 #.

3177 -#: sequencer.c:526

3465 +#: sequencer.c:563

3466 #, c-format

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

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

3469

3182 -#: sequencer.c:542

3183 -msgid "could not resolve HEAD commit"

3184 -msgstr "不能解析 HEAD 提交"

3185 -

3186 -#: sequencer.c:562

3470 +#: sequencer.c:579

3471 msgid "unable to update cache tree"

3472 msgstr "不能更新缓存树"

3473

3190 -#: sequencer.c:658

3474 +#: sequencer.c:592

3475 +msgid "could not resolve HEAD commit"

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

3477 +

3478 +#: sequencer.c:749

3479 #, c-format

3480 msgid ""

3481 "you have staged changes in your working tree\n"

@@ -3216,11 +3504,15 @@ msgstr ""

3504 "\n"

3505 " git rebase --continue\n"

3506

3219 -#: sequencer.c:915

3507 +#: sequencer.c:818

3508 +msgid "writing root commit"

3509 +msgstr "写根提交"

3510 +

3511 +#: sequencer.c:1043

3512 msgid "'prepare-commit-msg' hook failed"

3513 msgstr "'prepare-commit-msg' 钩子失败"

3514

3223 -#: sequencer.c:922

3515 +#: sequencer.c:1050

3516 msgid ""

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

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

@@ -3244,7 +3536,7 @@ msgstr ""

3536 "\n"

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

3538

3247 -#: sequencer.c:935

3539 +#: sequencer.c:1063

3540 msgid ""

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

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

@@ -3267,329 +3559,315 @@ msgstr ""

3559 "\n"

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

3561

3270 -#: sequencer.c:975

3562 +#: sequencer.c:1103

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

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

3565

3274 -#: sequencer.c:977

3566 +#: sequencer.c:1105

3567 msgid "could not parse newly created commit"

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

3569

3278 -#: sequencer.c:1023

3570 +#: sequencer.c:1151

3571 msgid "unable to resolve HEAD after creating commit"

3572 msgstr "创建提交后，不能解析 HEAD"

3573

3282 -#: sequencer.c:1025

3574 +#: sequencer.c:1153

3575 msgid "detached HEAD"

3576 msgstr "分离头指针"

3577

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

3287 -#: sequencer.c:1029

3579 +#: sequencer.c:1157

3580 msgid " (root-commit)"

3581 msgstr "（根提交）"

3582

3291 -#: sequencer.c:1050

3583 +#: sequencer.c:1178

3584 msgid "could not parse HEAD"

3585 msgstr "不能解析 HEAD"

3586

3295 -#: sequencer.c:1052

3587 +#: sequencer.c:1180

3588 #, c-format

3589 msgid "HEAD %s is not a commit!"

3590 msgstr "HEAD %s 不是一个提交！"

3591

3300 -#: sequencer.c:1056 builtin/commit.c:1491

3592 +#: sequencer.c:1184 builtin/commit.c:1528

3593 msgid "could not parse HEAD commit"

3594 msgstr "不能解析 HEAD 提交"

3595

3304 -#: sequencer.c:1107 sequencer.c:1673

3596 +#: sequencer.c:1235 sequencer.c:1832

3597 msgid "unable to parse commit author"

3598 msgstr "不能解析提交作者"

3599

3308 -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643

3600 +#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645

3601 msgid "git write-tree failed to write a tree"

3602 msgstr "git write-tree 无法写入树对象"

3603

3312 -#: sequencer.c:1134 sequencer.c:1186

3604 +#: sequencer.c:1262 sequencer.c:1317

3605 #, c-format

3606 msgid "unable to read commit message from '%s'"

3607 msgstr "不能从 '%s' 读取提交说明"

3608

3317 -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826

3318 -#: builtin/merge.c:851

3609 +#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825

3610 +#: builtin/merge.c:850

3611 msgid "failed to write commit object"

3612 msgstr "无法写提交对象"

3613

3322 -#: sequencer.c:1213

3614 +#: sequencer.c:1344

3615 #, c-format

3616 msgid "could not parse commit %s"

3617 msgstr "不能解析提交 %s"

3618

3327 -#: sequencer.c:1218

3619 +#: sequencer.c:1349

3620 #, c-format

3621 msgid "could not parse parent commit %s"

3622 msgstr "不能解析父提交 %s"

3623

3332 -#: sequencer.c:1347

3333 -#, c-format

3334 -msgid ""

3335 -"unexpected 1st line of squash message:\n"

3336 -"\n"

3337 -"\t%.*s"

3338 -msgstr ""

3339 -"意外的压缩提交首行提交信息：\n"

3340 -"\n"

3341 -"\t%.*s"

3342 -

3343 -#: sequencer.c:1353

3344 -#, c-format

3345 -msgid ""

3346 -"invalid 1st line of squash message:\n"

3347 -"\n"

3348 -"\t%.*s"

3349 -msgstr ""

3350 -"压缩提交的首行提交信息无效：\n"

3351 -"\n"

3352 -"\t%.*s"

3353 -

3354 -#: sequencer.c:1359 sequencer.c:1384

3624 +#: sequencer.c:1500 sequencer.c:1525

3625 #, c-format

3626 msgid "This is a combination of %d commits."

3627 msgstr "这是一个 %d 个提交的组合。"

3628

3359 -#: sequencer.c:1368 sequencer.c:3265

3629 +#: sequencer.c:1510 sequencer.c:4355

3630 msgid "need a HEAD to fixup"

3631 msgstr "需要一个 HEAD 来修复"

3632

3363 -#: sequencer.c:1370

3633 +#: sequencer.c:1512 sequencer.c:2729

3634 msgid "could not read HEAD"

3635 msgstr "不能读取 HEAD"

3636

3367 -#: sequencer.c:1372

3637 +#: sequencer.c:1514

3638 msgid "could not read HEAD's commit message"

3639 msgstr "不能读取 HEAD 的提交说明"

3640

3371 -#: sequencer.c:1378

3641 +#: sequencer.c:1520

3642 #, c-format

3643 msgid "cannot write '%s'"

3644 msgstr "不能写 '%s'"

3645

3376 -#: sequencer.c:1387 git-rebase--interactive.sh:452

3646 +#: sequencer.c:1527 git-rebase--interactive.sh:457

3647 msgid "This is the 1st commit message:"

3648 msgstr "这是第一个提交说明："

3649

3380 -#: sequencer.c:1395

3650 +#: sequencer.c:1535

3651 #, c-format

3652 msgid "could not read commit message of %s"

3653 msgstr "不能读取 %s 的提交说明"

3654

3385 -#: sequencer.c:1402

3655 +#: sequencer.c:1542

3656 #, c-format

3657 msgid "This is the commit message #%d:"

3658 msgstr "这是提交说明 #%d："

3659

3390 -#: sequencer.c:1407

3660 +#: sequencer.c:1548

3661 #, c-format

3662 msgid "The commit message #%d will be skipped:"

3663 msgstr "提交说明 #%d 将被跳过："

3664

3395 -#: sequencer.c:1412

3665 +#: sequencer.c:1553

3666 #, c-format

3667 msgid "unknown command: %d"

3668 msgstr "未知命令：%d"

3669

3400 -#: sequencer.c:1479

3670 +#: sequencer.c:1631

3671 msgid "your index file is unmerged."

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

3673

3404 -#: sequencer.c:1498

3674 +#: sequencer.c:1638

3675 +msgid "cannot fixup root commit"

3676 +msgstr "不能修复根提交"

3677 +

3678 +#: sequencer.c:1657

3679 #, c-format

3680 msgid "commit %s is a merge but no -m option was given."

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

3682

3409 -#: sequencer.c:1506

3683 +#: sequencer.c:1665

3684 #, c-format

3685 msgid "commit %s does not have parent %d"

3686 msgstr "提交 %s 没有第 %d 个父提交"

3687

3414 -#: sequencer.c:1510

3688 +#: sequencer.c:1669

3689 #, c-format

3690 msgid "mainline was specified but commit %s is not a merge."

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

3692

3419 -#: sequencer.c:1516

3693 +#: sequencer.c:1675

3694 #, c-format

3695 msgid "cannot get commit message for %s"

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

3697

3698 #. TRANSLATORS: The first %s will be a "todo" command like

3699 #. "revert" or "pick", the second %s a SHA1.

3426 -#: sequencer.c:1535

3700 +#: sequencer.c:1694

3701 #, c-format

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

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

3704

3431 -#: sequencer.c:1600 sequencer.c:2397

3705 +#: sequencer.c:1759

3706 #, c-format

3707 msgid "could not rename '%s' to '%s'"

3708 msgstr "不能将 '%s' 重命名为 '%s'"

3709

3436 -#: sequencer.c:1654

3710 +#: sequencer.c:1813

3711 #, c-format

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

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

3714

3441 -#: sequencer.c:1655

3715 +#: sequencer.c:1814

3716 #, c-format

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

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

3719

3446 -#: sequencer.c:1702

3720 +#: sequencer.c:1864

3721 msgid "empty commit set passed"

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

3723

3450 -#: sequencer.c:1712

3724 +#: sequencer.c:1874

3725 #, c-format

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

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

3728

3455 -#: sequencer.c:1718

3729 +#: sequencer.c:1881

3730 #, c-format

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

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

3733

3460 -#: sequencer.c:1792

3734 +#: sequencer.c:1961

3735 #, c-format

3736 msgid "%s does not accept arguments: '%s'"

3737 msgstr "%s 不接受参数：'%s'"

3738

3465 -#: sequencer.c:1801

3739 +#: sequencer.c:1970

3740 #, c-format

3741 msgid "missing arguments for %s"

3742 msgstr "缺少 %s 的参数"

3743

3470 -#: sequencer.c:1844

3744 +#: sequencer.c:2029

3745 #, c-format

3746 msgid "invalid line %d: %.*s"

3747 msgstr "无效行 %d：%.*s"

3748

3475 -#: sequencer.c:1852

3749 +#: sequencer.c:2037

3750 #, c-format

3751 msgid "cannot '%s' without a previous commit"

3752 msgstr "没有父提交的情况下不能 '%s'"

3753

3480 -#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

3754 +#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

3755 #, c-format

3756 msgid "could not read '%s'."

3757 msgstr "不能读取 '%s'。"

3758

3485 -#: sequencer.c:1906

3759 +#: sequencer.c:2108

3760 msgid "please fix this using 'git rebase --edit-todo'."

3761 msgstr "请用 'git rebase --edit-todo' 来修改。"

3762

3489 -#: sequencer.c:1908

3763 +#: sequencer.c:2110

3764 #, c-format

3765 msgid "unusable instruction sheet: '%s'"

3766 msgstr "不可用的指令清单：'%s'"

3767

3494 -#: sequencer.c:1913

3768 +#: sequencer.c:2115

3769 msgid "no commits parsed."

3770 msgstr "没有解析提交。"

3771

3498 -#: sequencer.c:1924

3772 +#: sequencer.c:2126

3773 msgid "cannot cherry-pick during a revert."

3774 msgstr "不能在回退中执行拣选。"

3775

3502 -#: sequencer.c:1926

3776 +#: sequencer.c:2128

3777 msgid "cannot revert during a cherry-pick."

3778 msgstr "不能在拣选中执行回退。"

3779

3506 -#: sequencer.c:1993

3780 +#: sequencer.c:2195

3781 #, c-format

3782 msgid "invalid key: %s"

3783 msgstr "无效键名：%s"

3784

3511 -#: sequencer.c:1996

3785 +#: sequencer.c:2198

3786 #, c-format

3787 msgid "invalid value for %s: %s"

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

3789

3516 -#: sequencer.c:2062

3790 +#: sequencer.c:2269

3791 +msgid "unusable squash-onto"

3792 +msgstr "不可用的 squash-onto"

3793 +

3794 +#: sequencer.c:2285

3795 #, c-format

3796 msgid "malformed options sheet: '%s'"

3519 -msgstr "非法的选项清单：'%s'"

3797 +msgstr "格式错误的选项清单：'%s'"

3798

3521 -#: sequencer.c:2100

3799 +#: sequencer.c:2323

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

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

3802

3525 -#: sequencer.c:2101

3803 +#: sequencer.c:2324

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

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

3806

3529 -#: sequencer.c:2104

3807 +#: sequencer.c:2327

3808 #, c-format

3809 msgid "could not create sequencer directory '%s'"

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

3811

3534 -#: sequencer.c:2118

3812 +#: sequencer.c:2341

3813 msgid "could not lock HEAD"

3814 msgstr "不能锁定 HEAD"

3815

3538 -#: sequencer.c:2173 sequencer.c:2761

3816 +#: sequencer.c:2396 sequencer.c:3403

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

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

3819

3542 -#: sequencer.c:2175

3820 +#: sequencer.c:2398

3821 msgid "cannot resolve HEAD"

3822 msgstr "不能解析 HEAD"

3823

3546 -#: sequencer.c:2177 sequencer.c:2212

3824 +#: sequencer.c:2400 sequencer.c:2435

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

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

3827

3550 -#: sequencer.c:2198 builtin/grep.c:720

3828 +#: sequencer.c:2421 builtin/grep.c:720

3829 #, c-format

3830 msgid "cannot open '%s'"

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

3832

3555 -#: sequencer.c:2200

3833 +#: sequencer.c:2423

3834 #, c-format

3835 msgid "cannot read '%s': %s"

3836 msgstr "不能读取 '%s'：%s"

3837

3560 -#: sequencer.c:2201

3838 +#: sequencer.c:2424

3839 msgid "unexpected end of file"

3840 msgstr "意外的文件结束"

3841

3564 -#: sequencer.c:2207

3842 +#: sequencer.c:2430

3843 #, c-format

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

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

3846

3569 -#: sequencer.c:2218

3847 +#: sequencer.c:2441

3848 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3849 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

3850

3573 -#: sequencer.c:2324 sequencer.c:2679

3851 +#: sequencer.c:2545 sequencer.c:3321

3852 #, c-format

3853 msgid "could not update %s"

3854 msgstr "不能更新 %s"

3855

3578 -#: sequencer.c:2362 sequencer.c:2659

3856 +#: sequencer.c:2583 sequencer.c:3301

3857 msgid "cannot read HEAD"

3858 msgstr "不能读取 HEAD"

3859

3582 -#: sequencer.c:2402 builtin/difftool.c:639

3860 +#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639

3861 #, c-format

3862 msgid "could not copy '%s' to '%s'"

3863 msgstr "不能拷贝 '%s' 至 '%s'"

3864

3587 -#: sequencer.c:2421

3865 +#: sequencer.c:2641

3866 msgid "could not read index"

3867 msgstr "不能读取索引"

3868

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

3592 -#: sequencer.c:2426

3870 +#: sequencer.c:2646

3871 #, c-format

3872 msgid ""

3873 "execution failed: %s\n"

@@ -3604,11 +3882,11 @@ msgstr ""

3882 " git rebase --continue\n"

3883 "\n"

3884

3607 -#: sequencer.c:2432

3885 +#: sequencer.c:2652

3886 msgid "and made changes to the index and/or the working tree\n"

3887 msgstr "并且修改索引和/或工作区\n"

3888

3611 -#: sequencer.c:2438

3889 +#: sequencer.c:2658

3890 #, c-format

3891 msgid ""

3892 "execution succeeded: %s\n"

@@ -3625,17 +3903,62 @@ msgstr ""

3903 " git rebase --continue\n"

3904 "\n"

3905

3628 -#: sequencer.c:2497

3906 +#: sequencer.c:2771

3907 +msgid "writing fake root commit"

3908 +msgstr "写伪根提交"

3909 +

3910 +#: sequencer.c:2776

3911 +msgid "writing squash-onto"

3912 +msgstr "写入 squash-onto"

3913 +

3914 +#: sequencer.c:2811

3915 +#, c-format

3916 +msgid "failed to find tree of %s"

3917 +msgstr "无法找到 %s 指向的树。"

3918 +

3919 +#: sequencer.c:2829

3920 +msgid "could not write index"

3921 +msgstr "不能写入索引"

3922 +

3923 +#: sequencer.c:2861

3924 +msgid "cannot merge without a current revision"

3925 +msgstr "没有当前版本不能合并"

3926 +

3927 +#: sequencer.c:2884

3928 +#, c-format

3929 +msgid "could not resolve '%s'"

3930 +msgstr "无法解析 '%s'"

3931 +

3932 +#: sequencer.c:2906

3933 +#, c-format

3934 +msgid "could not get commit message of '%s'"

3935 +msgstr "不能获取 '%s' 的提交说明"

3936 +

3937 +#: sequencer.c:2916 sequencer.c:2941

3938 +#, c-format

3939 +msgid "could not write '%s'"

3940 +msgstr "不能写入 '%s'"

3941 +

3942 +#: sequencer.c:3005

3943 +#, c-format

3944 +msgid "could not even attempt to merge '%.*s'"

3945 +msgstr "甚至不能尝试合并 '%.*s'"

3946 +

3947 +#: sequencer.c:3021

3948 +msgid "merge: Unable to write new index file"

3949 +msgstr "合并：无法写入新索引文件"

3950 +

3951 +#: sequencer.c:3088

3952 #, c-format

3953 msgid "Applied autostash.\n"

3954 msgstr "已应用 autostash。\n"

3955

3633 -#: sequencer.c:2509

3956 +#: sequencer.c:3100

3957 #, c-format

3958 msgid "cannot store %s"

3959 msgstr "不能存储 %s"

3960

3638 -#: sequencer.c:2512 git-rebase.sh:178

3961 +#: sequencer.c:3103 git-rebase.sh:188

3962 #, c-format

3963 msgid ""

3964 "Applying autostash resulted in conflicts.\n"

@@ -3646,52 +3969,68 @@ msgstr ""

3969 "您的修改安全地保存在贮藏区中。\n"

3970 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

3971

3649 -#: sequencer.c:2595

3972 +#: sequencer.c:3134

3973 +#, c-format

3974 +msgid ""

3975 +"Could not execute the todo command\n"

3976 +"\n"

3977 +" %.*s\n"

3978 +"It has been rescheduled; To edit the command before continuing, please\n"

3979 +"edit the todo list first:\n"

3980 +"\n"

3981 +" git rebase --edit-todo\n"

3982 +" git rebase --continue\n"

3983 +msgstr ""

3984 +"无法执行待办命令\n"

3985 +"\n"

3986 +" %.*s\n"

3987 +"已被重新安排，在继续之前编辑命令，请先编辑待办列表：\n"

3988 +"\n"

3989 +" git rebase --edit-todo\n"

3990 +" git rebase --continue\n"

3991 +

3992 +#: sequencer.c:3202

3993 #, c-format

3994 msgid "Stopped at %s... %.*s\n"

3995 msgstr "停止在 %s... %.*s\n"

3996

3654 -#: sequencer.c:2637

3997 +#: sequencer.c:3264

3998 #, c-format

3999 msgid "unknown command %d"

4000 msgstr "未知命令 %d"

4001

3659 -#: sequencer.c:2667

4002 +#: sequencer.c:3309

4003 msgid "could not read orig-head"

4004 msgstr "不能读取 orig-head"

4005

3663 -#: sequencer.c:2672 sequencer.c:3262

4006 +#: sequencer.c:3314 sequencer.c:4352

4007 msgid "could not read 'onto'"

4008 msgstr "不能读取 'onto'"

4009

3667 -#: sequencer.c:2686

4010 +#: sequencer.c:3328

4011 #, c-format

4012 msgid "could not update HEAD to %s"

4013 msgstr "不能更新 HEAD 为 %s"

4014

3672 -#: sequencer.c:2770

4015 +#: sequencer.c:3414

4016 msgid "cannot rebase: You have unstaged changes."

4017 msgstr "不能变基：您有未暂存的变更。"

4018

3676 -#: sequencer.c:2775

3677 -msgid "could not remove CHERRY_PICK_HEAD"

3678 -msgstr "不能删除 CHERRY_PICK_HEAD"

3679 -

3680 -#: sequencer.c:2784

4019 +#: sequencer.c:3423

4020 msgid "cannot amend non-existing commit"

4021 msgstr "不能修补不存在的提交"

4022

3684 -#: sequencer.c:2786

4023 +#: sequencer.c:3425

4024 #, c-format

4025 msgid "invalid file: '%s'"

4026 msgstr "无效文件：'%s'"

4027

3689 -#: sequencer.c:2788

4028 +#: sequencer.c:3427

4029 #, c-format

4030 msgid "invalid contents: '%s'"

4031 msgstr "无效内容：'%s'"

4032

3694 -#: sequencer.c:2791

4033 +#: sequencer.c:3430

4034 msgid ""

4035 "\n"

4036 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3700,44 +4039,53 @@ msgstr ""

4039 "\n"

4040 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

4041

3703 -#: sequencer.c:2801

4042 +#: sequencer.c:3455 sequencer.c:3493

4043 +#, c-format

4044 +msgid "could not write file: '%s'"

4045 +msgstr "不能写入文件：'%s'"

4046 +

4047 +#: sequencer.c:3508

4048 +msgid "could not remove CHERRY_PICK_HEAD"

4049 +msgstr "不能删除 CHERRY_PICK_HEAD"

4050 +

4051 +#: sequencer.c:3515

4052 msgid "could not commit staged changes."

4053 msgstr "不能提交暂存的修改。"

4054

3707 -#: sequencer.c:2881

4055 +#: sequencer.c:3612

4056 #, c-format

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

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

4059

3712 -#: sequencer.c:2885

4060 +#: sequencer.c:3616

4061 #, c-format

4062 msgid "%s: bad revision"

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

4064

3717 -#: sequencer.c:2918

4065 +#: sequencer.c:3649

4066 msgid "can't revert as initial commit"

4067 msgstr "不能作为初始提交回退"

4068

3721 -#: sequencer.c:3023

4069 +#: sequencer.c:4098

4070 msgid "make_script: unhandled options"

4071 msgstr "make_script：有未能处理的选项"

4072

3725 -#: sequencer.c:3026

4073 +#: sequencer.c:4101

4074 msgid "make_script: error preparing revisions"

4075 msgstr "make_script：准备版本时错误"

4076

3729 -#: sequencer.c:3060 sequencer.c:3095

4077 +#: sequencer.c:4142 sequencer.c:4177

4078 #, c-format

4079 msgid "unusable todo list: '%s'"

4080 msgstr "不可用的待办列表：'%s'"

4081

3734 -#: sequencer.c:3146

4082 +#: sequencer.c:4236

4083 #, c-format

4084 msgid ""

4085 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4086 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

4087

3740 -#: sequencer.c:3212

4088 +#: sequencer.c:4302

4089 #, c-format

4090 msgid ""

4091 "Warning: some commits may have been dropped accidentally.\n"

@@ -3746,7 +4094,7 @@ msgstr ""

4094 "警告：一些提交可能被意外丢弃。\n"

4095 "丢弃的提交（从新到旧）：\n"

4096

3749 -#: sequencer.c:3219

4097 +#: sequencer.c:4309

4098 #, c-format

4099 msgid ""

4100 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3762,7 +4110,7 @@ msgstr ""

4110 "可选值有：ignore、warn、error。\n"

4111 "\n"

4112

3765 -#: sequencer.c:3231

4113 +#: sequencer.c:4321

4114 #, c-format

4115 msgid ""

4116 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3772,27 +4120,21 @@ msgstr ""

4120 "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

4121 "或者您可以用 'git rebase --abort' 终止变基。\n"

4122

3775 -#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

3776 -#: builtin/am.c:779

3777 -#, c-format

3778 -msgid "could not open '%s' for writing"

3779 -msgstr "无法打开 '%s' 进行写入"

3780 -

3781 -#: sequencer.c:3285

4123 +#: sequencer.c:4375

4124 #, c-format

4125 msgid "could not parse commit '%s'"

4126 msgstr "不能解析提交 '%s'"

4127

3786 -#: sequencer.c:3401

4128 +#: sequencer.c:4490

4129 msgid "the script was already rearranged."

4130 msgstr "脚本已经重新编排。"

4131

3790 -#: setup.c:122

4132 +#: setup.c:123

4133 #, c-format

4134 msgid "'%s' is outside repository"

4135 msgstr "'%s' 在仓库之外"

4136

3795 -#: setup.c:171

4137 +#: setup.c:172

4138 #, c-format

4139 msgid ""

4140 "%s: no such path in the working tree.\n"

@@ -3801,7 +4143,7 @@ msgstr ""

4143 "%s：工作区中无此路径。\n"

4144 "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"

4145

3804 -#: setup.c:184

4146 +#: setup.c:185

4147 #, c-format

4148 msgid ""

4149 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3812,12 +4154,12 @@ msgstr ""

4154 "使用 '--' 来分隔版本和路径，例如：\n"

4155 "'git <命令> [<版本>...] -- [<文件>...]'"

4156

3815 -#: setup.c:233

4157 +#: setup.c:234

4158 #, c-format

4159 msgid "option '%s' must come before non-option arguments"

4160 msgstr "选项 '%s' 必须在其他非选项参数之前"

4161

3820 -#: setup.c:252

4162 +#: setup.c:253

4163 #, c-format

4164 msgid ""

4165 "ambiguous argument '%s': both revision and filename\n"

@@ -3828,92 +4170,92 @@ msgstr ""

4170 "使用 '--' 来分隔版本和路径，例如：\n"

4171 "'git <命令> [<版本>...] -- [<文件>...]'"

4172

3831 -#: setup.c:388

4173 +#: setup.c:389

4174 msgid "unable to set up work tree using invalid config"

4175 msgstr "无法使用无效配置来创建工作区"

4176

3835 -#: setup.c:395

4177 +#: setup.c:393

4178 msgid "this operation must be run in a work tree"

4179 msgstr "该操作必须在一个工作区中运行"

4180

3839 -#: setup.c:506

4181 +#: setup.c:503

4182 #, c-format

4183 msgid "Expected git repo version <= %d, found %d"

4184 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

4185

3844 -#: setup.c:514

4186 +#: setup.c:511

4187 msgid "unknown repository extensions found:"

4188 msgstr "发现未知的仓库扩展："

4189

3848 -#: setup.c:533

4190 +#: setup.c:530

4191 #, c-format

4192 msgid "error opening '%s'"

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

4194

3853 -#: setup.c:535

4195 +#: setup.c:532

4196 #, c-format

4197 msgid "too large to be a .git file: '%s'"

4198 msgstr "文件太大，无法作为 .git 文件：'%s'"

4199

3858 -#: setup.c:537

4200 +#: setup.c:534

4201 #, c-format

4202 msgid "error reading %s"

4203 msgstr "无法读取 %s"

4204

3863 -#: setup.c:539

4205 +#: setup.c:536

4206 #, c-format

4207 msgid "invalid gitfile format: %s"

4208 msgstr "无效的 gitfile 格式：%s"

4209

3868 -#: setup.c:541

4210 +#: setup.c:538

4211 #, c-format

4212 msgid "no path in gitfile: %s"

4213 msgstr "在 gitfile 中没有路径：%s"

4214

3873 -#: setup.c:543

4215 +#: setup.c:540

4216 #, c-format

4217 msgid "not a git repository: %s"

4218 msgstr "不是一个 git 仓库：%s"

4219

3878 -#: setup.c:642

4220 +#: setup.c:639

4221 #, c-format

4222 msgid "'$%s' too big"

4223 msgstr "'$%s' 太大"

4224

3883 -#: setup.c:656

4225 +#: setup.c:653

4226 #, c-format

4227 msgid "not a git repository: '%s'"

4228 msgstr "不是一个 git 仓库：'%s'"

4229

3888 -#: setup.c:685 setup.c:687 setup.c:718

4230 +#: setup.c:682 setup.c:684 setup.c:715

4231 #, c-format

4232 msgid "cannot chdir to '%s'"

4233 msgstr "不能切换目录到 '%s'"

4234

3893 -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

4235 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

4236 msgid "cannot come back to cwd"

4237 msgstr "无法返回当前工作目录"

4238

3897 -#: setup.c:816

4239 +#: setup.c:813

4240 #, c-format

4241 msgid "not a git repository (or any of the parent directories): %s"

4242 msgstr "不是一个 git 仓库（或者任何父目录）：%s"

4243

3902 -#: setup.c:827

4244 +#: setup.c:824

4245 #, c-format

4246 msgid "failed to stat '%*s%s%s'"

4247 msgstr "无法获取 '%*s%s%s' 状态（stat）"

4248

3907 -#: setup.c:1057

4249 +#: setup.c:1054

4250 msgid "Unable to read current working directory"

4251 msgstr "不能读取当前工作目录"

4252

3911 -#: setup.c:1069 setup.c:1075

4253 +#: setup.c:1066 setup.c:1072

4254 #, c-format

4255 msgid "cannot change to '%s'"

4256 msgstr "不能切换到 '%s'"

4257

3916 -#: setup.c:1088

4258 +#: setup.c:1085

4259 #, c-format

4260 msgid ""

4261 "not a git repository (or any parent up to mount point %s)\n"

@@ -3922,7 +4264,7 @@ msgstr ""

4264 "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"

4265 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

4266

3925 -#: setup.c:1172

4267 +#: setup.c:1168

4268 #, c-format

4269 msgid ""

4270 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3931,53 +4273,53 @@ msgstr ""

4273 "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"

4274 "文件属主必须始终拥有读写权限。"

4275

3934 -#: setup.c:1215

4276 +#: setup.c:1211

4277 msgid "open /dev/null or dup failed"

4278 msgstr "不能打开或者复制 /dev/null"

4279

3938 -#: setup.c:1230

4280 +#: setup.c:1226

4281 msgid "fork failed"

4282 msgstr "fork 失败"

4283

3942 -#: setup.c:1235

4284 +#: setup.c:1231

4285 msgid "setsid failed"

4286 msgstr "setsid 失败"

4287

3946 -#: sha1_file.c:592

4288 +#: sha1-file.c:625

4289 #, c-format

4290 msgid "path '%s' does not exist"

4291 msgstr "路径 '%s' 不存在"

4292

3951 -#: sha1_file.c:618

4293 +#: sha1-file.c:651

4294 #, c-format

4295 msgid "reference repository '%s' as a linked checkout is not supported yet."

4296 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

4297

3956 -#: sha1_file.c:624

4298 +#: sha1-file.c:657

4299 #, c-format

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

4301 msgstr "参考仓库 '%s' 不是一个本地仓库。"

4302

3961 -#: sha1_file.c:630

4303 +#: sha1-file.c:663

4304 #, c-format

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

4306 msgstr "参考仓库 '%s' 是一个浅克隆"

4307

3966 -#: sha1_file.c:638

4308 +#: sha1-file.c:671

4309 #, c-format

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

3969 -msgstr "参考仓库 '%s' 已被嫁接"

4311 +msgstr "参考仓库 '%s' 已被移植"

4312

3971 -#: sha1_name.c:422

4313 +#: sha1-name.c:442

4314 #, c-format

4315 msgid "short SHA1 %s is ambiguous"

4316 msgstr "短 SHA1 %s 存在歧义"

4317

3976 -#: sha1_name.c:433

4318 +#: sha1-name.c:453

4319 msgid "The candidates are:"

4320 msgstr "候选者有："

4321

3980 -#: sha1_name.c:693

4322 +#: sha1-name.c:695

4323 msgid ""

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

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

@@ -3998,86 +4340,86 @@ msgstr ""

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

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

4342

4001 -#: submodule.c:96 submodule.c:130

4343 +#: submodule.c:97 submodule.c:131

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

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

4346

4005 -#: submodule.c:100 submodule.c:134

4347 +#: submodule.c:101 submodule.c:135

4348 #, c-format

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

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

4351

4010 -#: submodule.c:108

4352 +#: submodule.c:109

4353 #, c-format

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

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

4356

4015 -#: submodule.c:141

4357 +#: submodule.c:142

4358 #, c-format

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

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

4361

4020 -#: submodule.c:152

4362 +#: submodule.c:153

4363 msgid "staging updated .gitmodules failed"

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

4365

4024 -#: submodule.c:312

4366 +#: submodule.c:315

4367 #, c-format

4368 msgid "in unpopulated submodule '%s'"

4369 msgstr "位于未检出的子模组 '%s'"

4370

4029 -#: submodule.c:343

4371 +#: submodule.c:346

4372 #, c-format

4373 msgid "Pathspec '%s' is in submodule '%.*s'"

4374 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

4375

4034 -#: submodule.c:833

4376 +#: submodule.c:837

4377 #, c-format

4378 msgid "submodule entry '%s' (%s) is a %s, not a commit"

4379 msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"

4380

4039 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

4381 +#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743

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

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

4384

4043 -#: submodule.c:1370

4385 +#: submodule.c:1375

4386 #, c-format

4387 msgid "'%s' not recognized as a git repository"

4388 msgstr "无法将 '%s' 识别为一个 git 仓库"

4389

4048 -#: submodule.c:1508

4390 +#: submodule.c:1513

4391 #, c-format

4392 msgid "could not start 'git status' in submodule '%s'"

4393 msgstr "无法在子模组 '%s' 中启动 'git status'"

4394

4053 -#: submodule.c:1521

4395 +#: submodule.c:1526

4396 #, c-format

4397 msgid "could not run 'git status' in submodule '%s'"

4398 msgstr "无法在子模组 '%s' 中执行 'git status'"

4399

4058 -#: submodule.c:1614

4400 +#: submodule.c:1619

4401 #, c-format

4402 msgid "submodule '%s' has dirty index"

4403 msgstr "子模组 '%s' 中有脏索引"

4404

4063 -#: submodule.c:1878

4405 +#: submodule.c:1718

4406 #, c-format

4407 msgid ""

4408 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

4409 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"

4410

4069 -#: submodule.c:1890 submodule.c:1946

4411 +#: submodule.c:1730 submodule.c:1786

4412 #, c-format

4413 msgid "could not lookup name for submodule '%s'"

4414 msgstr "不能查询子模组 '%s' 的名称"

4415

4074 -#: submodule.c:1894 builtin/submodule--helper.c:1246

4075 -#: builtin/submodule--helper.c:1256

4416 +#: submodule.c:1734 builtin/submodule--helper.c:1261

4417 +#: builtin/submodule--helper.c:1271

4418 #, c-format

4419 msgid "could not create directory '%s'"

4420 msgstr "不能创建目录 '%s'"

4421

4080 -#: submodule.c:1897

4422 +#: submodule.c:1737

4423 #, c-format

4424 msgid ""

4425 "Migrating git directory of '%s%s' from\n"

@@ -4088,29 +4430,30 @@ msgstr ""

4430 "'%s' 迁移至\n"

4431 "'%s'\n"

4432

4091 -#: submodule.c:1981

4433 +#: submodule.c:1821

4434 #, c-format

4435 msgid "could not recurse into submodule '%s'"

4436 msgstr "无法递归进子模组路径 '%s'"

4437

4096 -#: submodule.c:2025

4438 +#: submodule.c:1865

4439 msgid "could not start ls-files in .."

4440 msgstr "无法在 .. 中启动 ls-files"

4441

4100 -#: submodule.c:2045

4101 -msgid "BUG: returned path string doesn't match cwd?"

4102 -msgstr "BUG：返回的路径和当前路径不匹配？"

4103 -

4104 -#: submodule.c:2064

4442 +#: submodule.c:1904

4443 #, c-format

4444 msgid "ls-tree returned unexpected return code %d"

4445 msgstr "ls-tree 返回未知返回值 %d"

4446

4109 -#: submodule-config.c:263

4447 +#: submodule-config.c:230

4448 +#, c-format

4449 +msgid "ignoring suspicious submodule name: %s"

4450 +msgstr "忽略可疑的子模组名称：%s"

4451 +

4452 +#: submodule-config.c:294

4453 msgid "negative values not allowed for submodule.fetchjobs"

4454 msgstr "submodule.fetchjobs 不允许为负值"

4455

4113 -#: submodule-config.c:436

4456 +#: submodule-config.c:467

4457 #, c-format

4458 msgid "invalid value for %s"

4459 msgstr "%s 的值无效"

@@ -4126,7 +4469,7 @@ msgstr "执行 trailer 命令 '%s' 失败"

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

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

4471

4129 -#: trailer.c:539 trailer.c:544 builtin/remote.c:290

4472 +#: trailer.c:539 trailer.c:544 builtin/remote.c:293

4473 #, c-format

4474 msgid "more than one %s"

4475 msgstr "多于一个 %s"

@@ -4169,24 +4512,28 @@ msgstr "不能打开临时文件"

4512 msgid "could not rename temporary file to %s"

4513 msgstr "不能重命名临时文件为 %s"

4514

4172 -#: transport.c:63

4515 +#: transport.c:116

4516 #, c-format

4517 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

4518 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

4519

4177 -#: transport.c:152

4520 +#: transport.c:208

4521 #, c-format

4522 msgid "transport: invalid depth option '%s'"

4523 msgstr "传输：无效的深度选项 '%s'"

4524

4182 -#: transport.c:916

4525 +#: transport.c:584

4526 +msgid "could not parse transport.color.* config"

4527 +msgstr "不能解析 transport.color.* 配置"

4528 +

4529 +#: transport.c:996

4530 #, c-format

4531 msgid ""

4532 "The following submodule paths contain changes that can\n"

4533 "not be found on any remote:\n"

4534 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

4535

4189 -#: transport.c:920

4536 +#: transport.c:1000

4537 #, c-format

4538 msgid ""

4539 "\n"

@@ -4213,11 +4560,11 @@ msgstr ""

4560 "以推送至远程。\n"

4561 "\n"

4562

4216 -#: transport.c:928

4563 +#: transport.c:1008

4564 msgid "Aborting."

4565 msgstr "正在终止。"

4566

4220 -#: transport-helper.c:1079

4567 +#: transport-helper.c:1087

4568 #, c-format

4569 msgid "Could not read ref %s"

4570 msgstr "不能读取引用 %s"

@@ -4234,11 +4581,11 @@ msgstr "树对象中的条目模式错误"

4581 msgid "empty filename in tree entry"

4582 msgstr "树对象条目中空的文件名"

4583

4237 -#: tree-walk.c:114

4584 +#: tree-walk.c:113

4585 msgid "too-short tree file"

4586 msgstr "太短的树文件"

4587

4241 -#: unpack-trees.c:108

4588 +#: unpack-trees.c:111

4589 #, c-format

4590 msgid ""

4591 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4247,7 +4594,7 @@ msgstr ""

4594 "您对下列文件的本地修改将被检出操作覆盖：\n"

4595 "%%s请在切换分支前提交或贮藏您的修改。"

4596

4250 -#: unpack-trees.c:110

4597 +#: unpack-trees.c:113

4598 #, c-format

4599 msgid ""

4600 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4256,7 +4603,7 @@ msgstr ""

4603 "您对下列文件的本地修改将被检出操作覆盖：\n"

4604 "%%s"

4605

4259 -#: unpack-trees.c:113

4606 +#: unpack-trees.c:116

4607 #, c-format

4608 msgid ""

4609 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4265,7 +4612,7 @@ msgstr ""

4612 "您对下列文件的本地修改将被合并操作覆盖：\n"

4613 "%%s请在合并前提交或贮藏您的修改。"

4614

4268 -#: unpack-trees.c:115

4615 +#: unpack-trees.c:118

4616 #, c-format

4617 msgid ""

4618 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4274,7 +4621,7 @@ msgstr ""

4621 "您对下列文件的本地修改将被合并操作覆盖：\n"

4622 "%%s"

4623

4277 -#: unpack-trees.c:118

4624 +#: unpack-trees.c:121

4625 #, c-format

4626 msgid ""

4627 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4283,7 +4630,7 @@ msgstr ""

4630 "您对下列文件的本地修改将被 %s 覆盖：\n"

4631 "%%s请在 %s 之前提交或贮藏您的修改。"

4632

4286 -#: unpack-trees.c:120

4633 +#: unpack-trees.c:123

4634 #, c-format

4635 msgid ""

4636 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4292,7 +4639,7 @@ msgstr ""

4639 "您对下列文件的本地修改将被 %s 覆盖：\n"

4640 "%%s"

4641

4295 -#: unpack-trees.c:125

4642 +#: unpack-trees.c:128

4643 #, c-format

4644 msgid ""

4645 "Updating the following directories would lose untracked files in them:\n"

@@ -4301,7 +4648,7 @@ msgstr ""

4648 "更新如下目录将会丢失其中未跟踪的文件：\n"

4649 "%s"

4650

4304 -#: unpack-trees.c:129

4651 +#: unpack-trees.c:132

4652 #, c-format

4653 msgid ""

4654 "The following untracked working tree files would be removed by checkout:\n"

@@ -4310,7 +4657,7 @@ msgstr ""

4657 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

4658 "%%s请在切换分支之前移动或删除。"

4659

4313 -#: unpack-trees.c:131

4660 +#: unpack-trees.c:134

4661 #, c-format

4662 msgid ""

4663 "The following untracked working tree files would be removed by checkout:\n"

@@ -4319,7 +4666,7 @@ msgstr ""

4666 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

4667 "%%s"

4668

4322 -#: unpack-trees.c:134

4669 +#: unpack-trees.c:137

4670 #, c-format

4671 msgid ""

4672 "The following untracked working tree files would be removed by merge:\n"

@@ -4328,7 +4675,7 @@ msgstr ""

4675 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

4676 "%%s请在合并前移动或删除。"

4677

4331 -#: unpack-trees.c:136

4678 +#: unpack-trees.c:139

4679 #, c-format

4680 msgid ""

4681 "The following untracked working tree files would be removed by merge:\n"

@@ -4337,7 +4684,7 @@ msgstr ""

4684 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

4685 "%%s"

4686

4340 -#: unpack-trees.c:139

4687 +#: unpack-trees.c:142

4688 #, c-format

4689 msgid ""

4690 "The following untracked working tree files would be removed by %s:\n"

@@ -4346,7 +4693,7 @@ msgstr ""

4693 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

4694 "%%s请在 %s 前移动或删除。"

4695

4349 -#: unpack-trees.c:141

4696 +#: unpack-trees.c:144

4697 #, c-format

4698 msgid ""

4699 "The following untracked working tree files would be removed by %s:\n"

@@ -4355,7 +4702,7 @@ msgstr ""

4702 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

4703 "%%s"

4704

4358 -#: unpack-trees.c:146

4705 +#: unpack-trees.c:150

4706 #, c-format

4707 msgid ""

4708 "The following untracked working tree files would be overwritten by "

@@ -4365,7 +4712,7 @@ msgstr ""

4712 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

4713 "%%s请在切换分支前移动或删除。"

4714

4368 -#: unpack-trees.c:148

4715 +#: unpack-trees.c:152

4716 #, c-format

4717 msgid ""

4718 "The following untracked working tree files would be overwritten by "

@@ -4375,7 +4722,7 @@ msgstr ""

4722 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

4723 "%%s"

4724

4378 -#: unpack-trees.c:151

4725 +#: unpack-trees.c:155

4726 #, c-format

4727 msgid ""

4728 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4384,7 +4731,7 @@ msgstr ""

4731 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

4732 "%%s请在合并前移动或删除。"

4733

4387 -#: unpack-trees.c:153

4734 +#: unpack-trees.c:157

4735 #, c-format

4736 msgid ""

4737 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4393,7 +4740,7 @@ msgstr ""

4740 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

4741 "%%s"

4742

4396 -#: unpack-trees.c:156

4743 +#: unpack-trees.c:160

4744 #, c-format

4745 msgid ""

4746 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4402,7 +4749,7 @@ msgstr ""

4749 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

4750 "%%s请在 %s 前移动或删除。"

4751

4405 -#: unpack-trees.c:158

4752 +#: unpack-trees.c:162

4753 #, c-format

4754 msgid ""

4755 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4411,12 +4758,12 @@ msgstr ""

4758 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

4759 "%%s"

4760

4414 -#: unpack-trees.c:165

4761 +#: unpack-trees.c:170

4762 #, c-format

4763 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4764 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

4765

4419 -#: unpack-trees.c:168

4766 +#: unpack-trees.c:173

4767 #, c-format

4768 msgid ""

4769 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4425,7 +4772,7 @@ msgstr ""

4772 "无法更新稀疏检出：如下条目不是最新：\n"

4773 "%s"

4774

4428 -#: unpack-trees.c:170

4775 +#: unpack-trees.c:175

4776 #, c-format

4777 msgid ""

4778 "The following working tree files would be overwritten by sparse checkout "

@@ -4435,7 +4782,7 @@ msgstr ""

4782 "工作区中下列文件将被稀疏检出更新所覆盖：\n"

4783 "%s"

4784

4438 -#: unpack-trees.c:172

4785 +#: unpack-trees.c:177

4786 #, c-format

4787 msgid ""

4788 "The following working tree files would be removed by sparse checkout "

@@ -4445,7 +4792,7 @@ msgstr ""

4792 "工作区中下列文件将被稀疏检出更新所删除：\n"

4793 "%s"

4794

4448 -#: unpack-trees.c:174

4795 +#: unpack-trees.c:179

4796 #, c-format

4797 msgid ""

4798 "Cannot update submodule:\n"

@@ -4454,12 +4801,12 @@ msgstr ""

4801 "无法更新子模组：\n"

4802 "%s"

4803

4457 -#: unpack-trees.c:251

4804 +#: unpack-trees.c:262

4805 #, c-format

4806 msgid "Aborting\n"

4807 msgstr "终止中\n"

4808

4462 -#: unpack-trees.c:333

4809 +#: unpack-trees.c:344

4810 msgid "Checking out files"

4811 msgstr "正在检出文件"

4812

@@ -4528,7 +4875,7 @@ msgid "could not open '%s' for reading and writing"

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

4876

4877 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4531 -#: builtin/am.c:862 builtin/merge.c:1044

4878 +#: builtin/am.c:862 builtin/merge.c:1043

4879 #, c-format

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

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

@@ -4542,162 +4889,162 @@ msgstr "不能访问 '%s'"

4889 msgid "unable to get current working directory"

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

4891

4545 -#: wt-status.c:151

4892 +#: wt-status.c:154

4893 msgid "Unmerged paths:"

4894 msgstr "未合并的路径："

4895

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

4550 -#: wt-status.c:178 wt-status.c:205

4897 +#: wt-status.c:181 wt-status.c:208

4898 #, c-format

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

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

4901

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

4556 -#: wt-status.c:180 wt-status.c:207

4903 +#: wt-status.c:183 wt-status.c:210

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

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

4906

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

4561 -#: wt-status.c:184

4908 +#: wt-status.c:187

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

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

4911

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

4566 -#: wt-status.c:186 wt-status.c:190

4913 +#: wt-status.c:189 wt-status.c:193

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

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

4916

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

4571 -#: wt-status.c:188

4918 +#: wt-status.c:191

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

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

4921

4575 -#: wt-status.c:199 wt-status.c:1007

4922 +#: wt-status.c:202 wt-status.c:1015

4923 msgid "Changes to be committed:"

4924 msgstr "要提交的变更："

4925

4579 -#: wt-status.c:217 wt-status.c:1016

4926 +#: wt-status.c:220 wt-status.c:1024

4927 msgid "Changes not staged for commit:"

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

4929

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

4584 -#: wt-status.c:221

4931 +#: wt-status.c:224

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

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

4934

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

4589 -#: wt-status.c:223

4936 +#: wt-status.c:226

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

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

4939

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

4594 -#: wt-status.c:224

4941 +#: wt-status.c:227

4942 msgid ""

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

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

4945

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

4600 -#: wt-status.c:226

4947 +#: wt-status.c:229

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

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

4950

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

4605 -#: wt-status.c:238

4952 +#: wt-status.c:241

4953 #, c-format

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

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

4956

4610 -#: wt-status.c:253

4957 +#: wt-status.c:256

4958 msgid "both deleted:"

4959 msgstr "双方删除："

4960

4614 -#: wt-status.c:255

4961 +#: wt-status.c:258

4962 msgid "added by us:"

4963 msgstr "由我们添加："

4964

4618 -#: wt-status.c:257

4965 +#: wt-status.c:260

4966 msgid "deleted by them:"

4967 msgstr "由他们删除："

4968

4622 -#: wt-status.c:259

4969 +#: wt-status.c:262

4970 msgid "added by them:"

4971 msgstr "由他们添加："

4972

4626 -#: wt-status.c:261

4973 +#: wt-status.c:264

4974 msgid "deleted by us:"

4975 msgstr "由我们删除："

4976

4630 -#: wt-status.c:263

4977 +#: wt-status.c:266

4978 msgid "both added:"

4979 msgstr "双方添加："

4980

4634 -#: wt-status.c:265

4981 +#: wt-status.c:268

4982 msgid "both modified:"

4983 msgstr "双方修改："

4984

4638 -#: wt-status.c:275

4985 +#: wt-status.c:278

4986 msgid "new file:"

4987 msgstr "新文件："

4988

4642 -#: wt-status.c:277

4989 +#: wt-status.c:280

4990 msgid "copied:"

4991 msgstr "拷贝："

4992

4646 -#: wt-status.c:279

4993 +#: wt-status.c:282

4994 msgid "deleted:"

4995 msgstr "删除："

4996

4650 -#: wt-status.c:281

4997 +#: wt-status.c:284

4998 msgid "modified:"

4999 msgstr "修改："

5000

4654 -#: wt-status.c:283

5001 +#: wt-status.c:286

5002 msgid "renamed:"

5003 msgstr "重命名："

5004

4658 -#: wt-status.c:285

5005 +#: wt-status.c:288

5006 msgid "typechange:"

5007 msgstr "类型变更："

5008

4662 -#: wt-status.c:287

5009 +#: wt-status.c:290

5010 msgid "unknown:"

5011 msgstr "未知："

5012

4666 -#: wt-status.c:289

5013 +#: wt-status.c:292

5014 msgid "unmerged:"

5015 msgstr "未合并："

5016

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

4671 -#: wt-status.c:369

5018 +#: wt-status.c:372

5019 msgid "new commits, "

5020 msgstr "新提交, "

5021

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

4676 -#: wt-status.c:371

5023 +#: wt-status.c:374

5024 msgid "modified content, "

5025 msgstr "修改的内容, "

5026

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

4681 -#: wt-status.c:373

5028 +#: wt-status.c:376

5029 msgid "untracked content, "

5030 msgstr "未跟踪的内容, "

5031

4685 -#: wt-status.c:847

5032 +#: wt-status.c:853

5033 #, c-format

5034 msgid "Your stash currently has %d entry"

5035 msgid_plural "Your stash currently has %d entries"

5036 msgstr[0] "您的贮藏区当前有 %d 条记录"

5037 msgstr[1] "您的贮藏区当前有 %d 条记录"

5038

4692 -#: wt-status.c:879

5039 +#: wt-status.c:885

5040 msgid "Submodules changed but not updated:"

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

5042

4696 -#: wt-status.c:881

5043 +#: wt-status.c:887

5044 msgid "Submodule changes to be committed:"

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

5046

4700 -#: wt-status.c:963

5047 +#: wt-status.c:969

5048 msgid ""

5049 "Do not modify or remove the line above.\n"

5050 "Everything below it will be ignored."

@@ -4705,77 +5052,77 @@ msgstr ""

5052 "不要改动或删除上面的一行。\n"

5053 "其下所有内容都将被忽略。"

5054

4708 -#: wt-status.c:1076

5055 +#: wt-status.c:1084

5056 msgid "You have unmerged paths."

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

5058

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

4713 -#: wt-status.c:1079

5060 +#: wt-status.c:1087

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

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

5063

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

4718 -#: wt-status.c:1081

5065 +#: wt-status.c:1089

5066 msgid " (use \"git merge --abort\" to abort the merge)"

5067 msgstr " （使用 \"git merge --abort\" 终止合并）"

5068

4722 -#: wt-status.c:1086

5069 +#: wt-status.c:1094

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

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

5072

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

4727 -#: wt-status.c:1089

5074 +#: wt-status.c:1097

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

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

5077

4731 -#: wt-status.c:1099

5078 +#: wt-status.c:1107

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

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

5081

4735 -#: wt-status.c:1102

5082 +#: wt-status.c:1110

5083 msgid "The current patch is empty."

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

5085

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

4740 -#: wt-status.c:1106

5087 +#: wt-status.c:1114

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

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

5090

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

4745 -#: wt-status.c:1108

5092 +#: wt-status.c:1116

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

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

5095

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

4750 -#: wt-status.c:1110

5097 +#: wt-status.c:1118

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

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

5100

4754 -#: wt-status.c:1242

5101 +#: wt-status.c:1250

5102 msgid "git-rebase-todo is missing."

5103 msgstr "git-rebase-todo 丢失。"

5104

4758 -#: wt-status.c:1244

5105 +#: wt-status.c:1252

5106 msgid "No commands done."

5107 msgstr "没有命令被执行。"

5108

4762 -#: wt-status.c:1247

5109 +#: wt-status.c:1255

5110 #, c-format

5111 msgid "Last command done (%d command done):"

5112 msgid_plural "Last commands done (%d commands done):"

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

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

5115

4769 -#: wt-status.c:1258

5116 +#: wt-status.c:1266

5117 #, c-format

5118 msgid " (see more in file %s)"

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

5120

4774 -#: wt-status.c:1263

5121 +#: wt-status.c:1271

5122 msgid "No commands remaining."

5123 msgstr "未剩下任何命令。"

5124

4778 -#: wt-status.c:1266

5125 +#: wt-status.c:1274

5126 #, c-format

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

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

@@ -4783,169 +5130,169 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："

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

5131

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

4786 -#: wt-status.c:1274

5133 +#: wt-status.c:1282

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

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

5136

4790 -#: wt-status.c:1287

5137 +#: wt-status.c:1295

5138 #, c-format

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

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

5141

4795 -#: wt-status.c:1292

5142 +#: wt-status.c:1300

5143 msgid "You are currently rebasing."

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

5145

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

4800 -#: wt-status.c:1306

5147 +#: wt-status.c:1314

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

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

5150

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

4805 -#: wt-status.c:1308

5152 +#: wt-status.c:1316

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

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

5155

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

4810 -#: wt-status.c:1310

5157 +#: wt-status.c:1318

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

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

5160

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

4815 -#: wt-status.c:1316

5162 +#: wt-status.c:1324

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

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

5165

4819 -#: wt-status.c:1320

5166 +#: wt-status.c:1328

5167 #, c-format

5168 msgid ""

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

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

5171

4825 -#: wt-status.c:1325

5172 +#: wt-status.c:1333

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

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

5175

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

4830 -#: wt-status.c:1328

5177 +#: wt-status.c:1336

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

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

5180

4834 -#: wt-status.c:1332

5181 +#: wt-status.c:1340

5182 #, c-format

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

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

5185

4839 -#: wt-status.c:1337

5186 +#: wt-status.c:1345

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

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

5189

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

4844 -#: wt-status.c:1340

5191 +#: wt-status.c:1348

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

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

5194

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

4849 -#: wt-status.c:1342

5196 +#: wt-status.c:1350

5197 msgid ""

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

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

5200

4854 -#: wt-status.c:1352

5201 +#: wt-status.c:1360

5202 #, c-format

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

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

5205

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

4860 -#: wt-status.c:1357

5207 +#: wt-status.c:1365

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

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

5210

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

4865 -#: wt-status.c:1360

5212 +#: wt-status.c:1368

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

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

5215

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

4870 -#: wt-status.c:1362

5217 +#: wt-status.c:1370

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

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

5220

4874 -#: wt-status.c:1371

5221 +#: wt-status.c:1379

5222 #, c-format

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

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

5225

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

4880 -#: wt-status.c:1376

5227 +#: wt-status.c:1384

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

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

5230

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

4885 -#: wt-status.c:1379

5232 +#: wt-status.c:1387

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

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

5235

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

4890 -#: wt-status.c:1381

5237 +#: wt-status.c:1389

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

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

5240

4894 -#: wt-status.c:1392

5241 +#: wt-status.c:1400

5242 #, c-format

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

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

5245

4899 -#: wt-status.c:1396

5246 +#: wt-status.c:1404

5247 msgid "You are currently bisecting."

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

5249

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

4904 -#: wt-status.c:1399

5251 +#: wt-status.c:1407

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

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

5254

4908 -#: wt-status.c:1596

5255 +#: wt-status.c:1604

5256 msgid "On branch "

5257 msgstr "位于分支 "

5258

4912 -#: wt-status.c:1602

5259 +#: wt-status.c:1610

5260 msgid "interactive rebase in progress; onto "

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

5262

4916 -#: wt-status.c:1604

5263 +#: wt-status.c:1612

5264 msgid "rebase in progress; onto "

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

5266

4920 -#: wt-status.c:1609

5267 +#: wt-status.c:1617

5268 msgid "HEAD detached at "

5269 msgstr "头指针分离于 "

5270

4924 -#: wt-status.c:1611

5271 +#: wt-status.c:1619

5272 msgid "HEAD detached from "

5273 msgstr "头指针分离自 "

5274

4928 -#: wt-status.c:1614

5275 +#: wt-status.c:1622

5276 msgid "Not currently on any branch."

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

5278

4932 -#: wt-status.c:1634

5279 +#: wt-status.c:1642

5280 msgid "Initial commit"

5281 msgstr "初始提交"

5282

4936 -#: wt-status.c:1635

5283 +#: wt-status.c:1643

5284 msgid "No commits yet"

5285 msgstr "尚无提交"

5286

4940 -#: wt-status.c:1649

5287 +#: wt-status.c:1657

5288 msgid "Untracked files"

5289 msgstr "未跟踪的文件"

5290

4944 -#: wt-status.c:1651

5291 +#: wt-status.c:1659

5292 msgid "Ignored files"

5293 msgstr "忽略的文件"

5294

4948 -#: wt-status.c:1655

5295 +#: wt-status.c:1663

5296 #, c-format

5297 msgid ""

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

@@ -4955,102 +5302,102 @@ msgstr ""

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

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

5304

4958 -#: wt-status.c:1661

5305 +#: wt-status.c:1669

5306 #, c-format

5307 msgid "Untracked files not listed%s"

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

5309

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

4964 -#: wt-status.c:1663

5311 +#: wt-status.c:1671

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

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

5314

4968 -#: wt-status.c:1669

5315 +#: wt-status.c:1677

5316 msgid "No changes"

5317 msgstr "没有修改"

5318

4972 -#: wt-status.c:1674

5319 +#: wt-status.c:1682

5320 #, c-format

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

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

5323

4977 -#: wt-status.c:1677

5324 +#: wt-status.c:1685

5325 #, c-format

5326 msgid "no changes added to commit\n"

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

5328

4982 -#: wt-status.c:1680

5329 +#: wt-status.c:1688

5330 #, c-format

5331 msgid ""

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

5333 "track)\n"

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

5335

4989 -#: wt-status.c:1683

5336 +#: wt-status.c:1691

5337 #, c-format

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

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

5340

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

4995 -#: wt-status.c:1686

5342 +#: wt-status.c:1694

5343 #, c-format

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

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

5346

5000 -#: wt-status.c:1689 wt-status.c:1694

5347 +#: wt-status.c:1697 wt-status.c:1702

5348 #, c-format

5349 msgid "nothing to commit\n"

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

5351

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

5006 -#: wt-status.c:1692

5353 +#: wt-status.c:1700

5354 #, c-format

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

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

5357

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

5012 -#: wt-status.c:1696

5359 +#: wt-status.c:1704

5360 #, c-format

5361 msgid "nothing to commit, working tree clean\n"

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

5363

5017 -#: wt-status.c:1809

5364 +#: wt-status.c:1817

5365 msgid "No commits yet on "

5366 msgstr "尚无提交在 "

5367

5021 -#: wt-status.c:1813

5368 +#: wt-status.c:1821

5369 msgid "HEAD (no branch)"

5370 msgstr "HEAD（非分支）"

5371

5025 -#: wt-status.c:1844

5372 +#: wt-status.c:1852

5373 msgid "different"

5374 msgstr "不同"

5375

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

5030 -#: wt-status.c:1846 wt-status.c:1854

5377 +#: wt-status.c:1854 wt-status.c:1862

5378 msgid "behind "

5379 msgstr "落后 "

5380

5034 -#: wt-status.c:1849 wt-status.c:1852

5381 +#: wt-status.c:1857 wt-status.c:1860

5382 msgid "ahead "

5383 msgstr "领先 "

5384

5385 #. TRANSLATORS: the action is e.g. "pull with rebase"

5039 -#: wt-status.c:2358

5386 +#: wt-status.c:2366

5387 #, c-format

5388 msgid "cannot %s: You have unstaged changes."

5389 msgstr "不能%s：您有未暂存的变更。"

5390

5044 -#: wt-status.c:2364

5391 +#: wt-status.c:2372

5392 msgid "additionally, your index contains uncommitted changes."

5393 msgstr "另外，您的索引中包含未提交的变更。"

5394

5048 -#: wt-status.c:2366

5395 +#: wt-status.c:2374

5396 #, c-format

5397 msgid "cannot %s: Your index contains uncommitted changes."

5398 msgstr "不能%s：您的索引中包含未提交的变更。"

5399

5053 -#: compat/precompose_utf8.c:58 builtin/clone.c:440

5400 +#: compat/precompose_utf8.c:58 builtin/clone.c:442

5401 #, c-format

5402 msgid "failed to unlink '%s'"

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

@@ -5064,7 +5411,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."

5411 msgid "unexpected diff status %c"

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

5413

5067 -#: builtin/add.c:88 builtin/commit.c:257

5414 +#: builtin/add.c:88 builtin/commit.c:266

5415 msgid "updating files failed"

5416 msgstr "更新文件失败"

5417

@@ -5077,7 +5424,7 @@ msgstr "删除 '%s'\n"

5424 msgid "Unstaged changes after refreshing the index:"

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

5426

5080 -#: builtin/add.c:233 builtin/rev-parse.c:888

5427 +#: builtin/add.c:233 builtin/rev-parse.c:892

5428 msgid "Could not read the index"

5429 msgstr "不能读取索引"

5430

@@ -5108,77 +5455,77 @@ msgstr "空补丁。异常终止。"

5455 msgid "Could not apply '%s'"

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

5457

5111 -#: builtin/add.c:271

5458 +#: builtin/add.c:269

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

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

5461

5115 -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

5116 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

5117 -#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

5462 +#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123

5463 +#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557

5464 +#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165

5465 msgid "dry run"

5466 msgstr "演习"

5467

5121 -#: builtin/add.c:294

5468 +#: builtin/add.c:292

5469 msgid "interactive picking"

5470 msgstr "交互式拣选"

5471

5125 -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

5472 +#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302

5473 msgid "select hunks interactively"

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

5475

5129 -#: builtin/add.c:296

5476 +#: builtin/add.c:294

5477 msgid "edit current diff and apply"

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

5479

5133 -#: builtin/add.c:297

5480 +#: builtin/add.c:295

5481 msgid "allow adding otherwise ignored files"

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

5483

5137 -#: builtin/add.c:298

5484 +#: builtin/add.c:296

5485 msgid "update tracked files"

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

5487

5141 -#: builtin/add.c:299

5488 +#: builtin/add.c:297

5489 msgid "renormalize EOL of tracked files (implies -u)"

5490 msgstr "对已跟踪文件（暗含 -u）重新归一换行符"

5491

5145 -#: builtin/add.c:300

5492 +#: builtin/add.c:298

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

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

5495

5149 -#: builtin/add.c:301

5496 +#: builtin/add.c:299

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

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

5499

5153 -#: builtin/add.c:304

5500 +#: builtin/add.c:302

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

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

5503

5157 -#: builtin/add.c:306

5504 +#: builtin/add.c:304

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

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

5507

5161 -#: builtin/add.c:307

5508 +#: builtin/add.c:305

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

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

5511

5165 -#: builtin/add.c:308

5512 +#: builtin/add.c:306

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

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

5515

5169 -#: builtin/add.c:309 builtin/update-index.c:964

5516 +#: builtin/add.c:307 builtin/update-index.c:974

5517 msgid "(+/-)x"

5518 msgstr "(+/-)x"

5519

5173 -#: builtin/add.c:309 builtin/update-index.c:965

5520 +#: builtin/add.c:307 builtin/update-index.c:975

5521 msgid "override the executable bit of the listed files"

5522 msgstr "覆盖列表里文件的可执行位"

5523

5177 -#: builtin/add.c:311

5524 +#: builtin/add.c:309

5525 msgid "warn when adding an embedded repository"

5526 msgstr "创建一个嵌入式仓库时给予警告"

5527

5181 -#: builtin/add.c:326

5528 +#: builtin/add.c:324

5529 #, c-format

5530 msgid ""

5531 "You've added another git repository inside your current repository.\n"

@@ -5207,47 +5554,47 @@ msgstr ""

5554 "\n"

5555 "参见 \"git help submodule\" 获取更多信息。"

5556

5210 -#: builtin/add.c:354

5557 +#: builtin/add.c:352

5558 #, c-format

5559 msgid "adding embedded git repository: %s"

5560 msgstr "正在添加嵌入式 git 仓库：%s"

5561

5215 -#: builtin/add.c:372

5562 +#: builtin/add.c:370

5563 #, c-format

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

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

5566

5220 -#: builtin/add.c:380

5567 +#: builtin/add.c:378

5568 msgid "adding files failed"

5569 msgstr "添加文件失败"

5570

5224 -#: builtin/add.c:417

5571 +#: builtin/add.c:416

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

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

5574

5228 -#: builtin/add.c:424

5575 +#: builtin/add.c:423

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

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

5578

5232 -#: builtin/add.c:428

5579 +#: builtin/add.c:427

5580 #, c-format

5581 msgid "--chmod param '%s' must be either -x or +x"

5582 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"

5583

5237 -#: builtin/add.c:443

5584 +#: builtin/add.c:442

5585 #, c-format

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

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

5588

5242 -#: builtin/add.c:444

5589 +#: builtin/add.c:443

5590 #, c-format

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

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

5593

5247 -#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280

5248 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316

5594 +#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280

5595 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325

5596 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

5250 -#: builtin/rm.c:271 builtin/submodule--helper.c:326

5597 +#: builtin/rm.c:270 builtin/submodule--helper.c:328

5598 msgid "index file corrupt"

5599 msgstr "索引文件损坏"

5600

@@ -5299,7 +5646,7 @@ msgstr "无效的时区偏移值"

5646 msgid "Patch format detection failed."

5647 msgstr "补丁格式探测失败。"

5648

5302 -#: builtin/am.c:1013 builtin/clone.c:405

5649 +#: builtin/am.c:1013 builtin/clone.c:407

5650 #, c-format

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

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

@@ -5308,7 +5655,7 @@ msgstr "无法创建目录 '%s'"

5655 msgid "Failed to split patches."

5656 msgstr "无法拆分补丁。"

5657

5311 -#: builtin/am.c:1148 builtin/commit.c:342

5658 +#: builtin/am.c:1148 builtin/commit.c:351

5659 msgid "unable to write index file"

5660 msgstr "无法写入索引文件"

5661

@@ -5477,7 +5824,7 @@ msgid "allow fall back on 3way merging if needed"

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

5825

5826 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5480 -#: builtin/repack.c:182

5827 +#: builtin/repack.c:192

5828 msgid "be quiet"

5829 msgstr "静默模式"

5830

@@ -5519,16 +5866,17 @@ msgstr "丢弃裁切线前的所有内容"

5866 msgid "pass it through git-apply"

5867 msgstr "传递给 git-apply"

5868

5522 -#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5523 -#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203

5524 -#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197

5525 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382

5526 -#: parse-options.h:144 parse-options.h:146 parse-options.h:257

5869 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665

5870 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208

5871 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201

5872 +#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631

5873 +#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144

5874 +#: parse-options.h:146 parse-options.h:258

5875 msgid "n"

5876 msgstr "n"

5877

5530 -#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38

5531 -#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

5878 +#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38

5879 +#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39

5880 msgid "format"

5881 msgstr "格式"

5882

@@ -5572,8 +5920,8 @@ msgstr "将作者日期作为提交日期"

5920 msgid "use current timestamp for author date"

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

5922

5575 -#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237

5576 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

5923 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239

5924 +#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

5925 msgid "key-id"

5926 msgstr "key-id"

5927

@@ -5712,115 +6060,141 @@ msgstr "--write-terms 需要两个参数"

6060 msgid "--bisect-clean-state requires no arguments"

6061 msgstr "--bisect-clean-state 不需要参数"

6062

5715 -#: builtin/blame.c:27

6063 +#: builtin/blame.c:29

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

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

6066

5719 -#: builtin/blame.c:32

6067 +#: builtin/blame.c:34

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

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

6070

5723 -#: builtin/blame.c:677

6071 +#: builtin/blame.c:404

6072 +#, c-format

6073 +msgid "expecting a color: %s"

6074 +msgstr "期望一个颜色：%s"

6075 +

6076 +#: builtin/blame.c:411

6077 +msgid "must end with a color"

6078 +msgstr "必须以一个颜色结尾"

6079 +

6080 +#: builtin/blame.c:697

6081 +#, c-format

6082 +msgid "invalid color '%s' in color.blame.repeatedLines"

6083 +msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"

6084 +

6085 +#: builtin/blame.c:715

6086 +msgid "invalid value for blame.coloring"

6087 +msgstr "设置 blame.coloring 中的无效取值"

6088 +

6089 +#: builtin/blame.c:786

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

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

6092

5727 -#: builtin/blame.c:678

6093 +#: builtin/blame.c:787

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

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

6096

5731 -#: builtin/blame.c:679

6097 +#: builtin/blame.c:788

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

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

6100

5735 -#: builtin/blame.c:680

6101 +#: builtin/blame.c:789

6102 msgid "Show work cost statistics"

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

6104

5739 -#: builtin/blame.c:681

6105 +#: builtin/blame.c:790

6106 msgid "Force progress reporting"

6107 msgstr "强制进度显示"

6108

5743 -#: builtin/blame.c:682

6109 +#: builtin/blame.c:791

6110 msgid "Show output score for blame entries"

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

6112

5747 -#: builtin/blame.c:683

6113 +#: builtin/blame.c:792

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

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

6116

5751 -#: builtin/blame.c:684

6117 +#: builtin/blame.c:793

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

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

6120

5755 -#: builtin/blame.c:685

6121 +#: builtin/blame.c:794

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

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

6124

5759 -#: builtin/blame.c:686

6125 +#: builtin/blame.c:795

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

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

6128

5763 -#: builtin/blame.c:687

6129 +#: builtin/blame.c:796

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

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

6132

5767 -#: builtin/blame.c:688

6133 +#: builtin/blame.c:797

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

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

6136

5771 -#: builtin/blame.c:689

6137 +#: builtin/blame.c:798

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

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

6140

5775 -#: builtin/blame.c:690

6141 +#: builtin/blame.c:799

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

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

6144

5779 -#: builtin/blame.c:691

6145 +#: builtin/blame.c:800

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

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

6148

5783 -#: builtin/blame.c:692

6149 +#: builtin/blame.c:801

6150 msgid "Ignore whitespace differences"

6151 msgstr "忽略空白差异"

6152

5787 -#: builtin/blame.c:699

6153 +#: builtin/blame.c:802

6154 +msgid "color redundant metadata from previous line differently"

6155 +msgstr "使用颜色间隔输出与前一行不同的重复元信息"

6156 +

6157 +#: builtin/blame.c:803

6158 +msgid "color lines by age"

6159 +msgstr "依据时间着色"

6160 +

6161 +#: builtin/blame.c:810

l10n: zh_CN: for git v2.18.0 l10n round 1 to 3