@matheusbsbs / matheus-bagliano / commits / 7e6630a76d

l10n: zh-CN: v2.34.0 round 1

Reviewed-by: 依云 <lilydjwg@gmail.com> Reviewed-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>

Fangyi Zhou committed Nov 2, 2021 at 18:04 UTC 7e6630a76d068750e6936d0d043547c514fc89de
1 file changed +4574 -4173
po/zh_CN.po
+4574 -4173
@@ -136,228 +136,230 @@
136 # upstream | 上游
137 # upstream branch | 上游分支
138 # working tree | 工作区
139 +# Fangyi Zhou <me@fangyi.io>, 2021.
140 #
141 msgid ""
142 msgstr ""
143 "Project-Id-Version: Git\n"
144 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
144 -"POT-Creation-Date: 2021-08-14 07:56+0800\n"
145 -"PO-Revision-Date: 2021-08-14 17:27+0800\n"
146 -"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
145 +"POT-Creation-Date: 2021-10-30 09:36+0800\n"
146 +"PO-Revision-Date: 2021-11-02 18:03+0000\n"
147 +"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
148 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
149 "Language: zh_CN\n"
150 "MIME-Version: 1.0\n"
151 "Content-Type: text/plain; charset=UTF-8\n"
152 "Content-Transfer-Encoding: 8bit\n"
153 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
154 +"X-Generator: Gtranslator 41.0\n"
155
154 -#: add-interactive.c:376
156 +#: add-interactive.c:380
157 #, c-format
158 msgid "Huh (%s)?"
159 msgstr "嗯（%s）？"
160
159 -#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
160 -#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
161 -#: builtin/rebase.c:1953
161 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3510
162 +#: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233
163 +#: builtin/rebase.c:1642
164 msgid "could not read index"
165 msgstr "不能读取索引"
166
165 -#: add-interactive.c:584 git-add--interactive.perl:269
167 +#: add-interactive.c:588 git-add--interactive.perl:269
168 #: git-add--interactive.perl:294
169 msgid "binary"
170 msgstr "二进制"
171
170 -#: add-interactive.c:642 git-add--interactive.perl:278
172 +#: add-interactive.c:646 git-add--interactive.perl:278
173 #: git-add--interactive.perl:332
174 msgid "nothing"
175 msgstr "无"
176
175 -#: add-interactive.c:643 git-add--interactive.perl:314
177 +#: add-interactive.c:647 git-add--interactive.perl:314
178 #: git-add--interactive.perl:329
179 msgid "unchanged"
180 msgstr "没有修改"
181
180 -#: add-interactive.c:680 git-add--interactive.perl:641
182 +#: add-interactive.c:684 git-add--interactive.perl:641
183 msgid "Update"
184 msgstr "更新"
185
184 -#: add-interactive.c:697 add-interactive.c:885
186 +#: add-interactive.c:701 add-interactive.c:889
187 #, c-format
188 msgid "could not stage '%s'"
189 msgstr "不能暂存 '%s'"
190
189 -#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
191 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3716
192 msgid "could not write index"
193 msgstr "不能写入索引"
194
193 -#: add-interactive.c:706 git-add--interactive.perl:626
195 +#: add-interactive.c:710 git-add--interactive.perl:626
196 #, c-format, perl-format
197 msgid "updated %d path\n"
198 msgid_plural "updated %d paths\n"
199 msgstr[0] "更新了 %d 个路径\n"
200 msgstr[1] "更新了 %d 个路径\n"
201
200 -#: add-interactive.c:724 git-add--interactive.perl:676
202 +#: add-interactive.c:728 git-add--interactive.perl:676
203 #, c-format, perl-format
204 msgid "note: %s is untracked now.\n"
205 msgstr "说明：%s 现已成为未跟踪的。\n"
206
205 -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
206 -#: builtin/reset.c:145
207 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
208 +#: builtin/reset.c:151
209 #, c-format
210 msgid "make_cache_entry failed for path '%s'"
211 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
212
211 -#: add-interactive.c:759 git-add--interactive.perl:653
213 +#: add-interactive.c:763 git-add--interactive.perl:653
214 msgid "Revert"
215 msgstr "还原"
216
215 -#: add-interactive.c:775
217 +#: add-interactive.c:779
218 msgid "Could not parse HEAD^{tree}"
219 msgstr "不能解析 HEAD^{tree}"
220
219 -#: add-interactive.c:813 git-add--interactive.perl:629
221 +#: add-interactive.c:817 git-add--interactive.perl:629
222 #, c-format, perl-format
223 msgid "reverted %d path\n"
224 msgid_plural "reverted %d paths\n"
225 msgstr[0] "还原了 %d 个路径\n"
226 msgstr[1] "还原了 %d 个路径\n"
227
226 -#: add-interactive.c:864 git-add--interactive.perl:693
228 +#: add-interactive.c:868 git-add--interactive.perl:693
229 #, c-format
230 msgid "No untracked files.\n"
231 msgstr "没有未跟踪的文件。\n"
232
231 -#: add-interactive.c:868 git-add--interactive.perl:687
233 +#: add-interactive.c:872 git-add--interactive.perl:687
234 msgid "Add untracked"
235 msgstr "添加未跟踪的"
236
235 -#: add-interactive.c:895 git-add--interactive.perl:623
237 +#: add-interactive.c:899 git-add--interactive.perl:623
238 #, c-format, perl-format
239 msgid "added %d path\n"
240 msgid_plural "added %d paths\n"
241 msgstr[0] "增加了 %d 个路径\n"
242 msgstr[1] "增加了 %d 个路径\n"
243
242 -#: add-interactive.c:925
244 +#: add-interactive.c:929
245 #, c-format
246 msgid "ignoring unmerged: %s"
247 msgstr "忽略未合入的：%s"
248
247 -#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
249 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
250 #, c-format
251 msgid "Only binary files changed.\n"
252 msgstr "只有二进制文件被修改。\n"
253
252 -#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
254 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
255 #, c-format
256 msgid "No changes.\n"
257 msgstr "没有修改。\n"
258
257 -#: add-interactive.c:943 git-add--interactive.perl:1379
259 +#: add-interactive.c:947 git-add--interactive.perl:1379
260 msgid "Patch update"
261 msgstr "补丁更新"
262
261 -#: add-interactive.c:982 git-add--interactive.perl:1792
263 +#: add-interactive.c:986 git-add--interactive.perl:1792
264 msgid "Review diff"
265 msgstr "检视 diff"
266
265 -#: add-interactive.c:1010
267 +#: add-interactive.c:1014
268 msgid "show paths with changes"
269 msgstr "显示含变更的路径"
270
269 -#: add-interactive.c:1012
271 +#: add-interactive.c:1016
272 msgid "add working tree state to the staged set of changes"
273 msgstr "将工作区状态添加到暂存区修改集中"
274
273 -#: add-interactive.c:1014
275 +#: add-interactive.c:1018
276 msgid "revert staged set of changes back to the HEAD version"
277 msgstr "将暂存的修改集恢复为 HEAD 版本"
278
277 -#: add-interactive.c:1016
279 +#: add-interactive.c:1020
280 msgid "pick hunks and update selectively"
281 msgstr "挑选数据块并有选择地更新"
282
281 -#: add-interactive.c:1018
283 +#: add-interactive.c:1022
284 msgid "view diff between HEAD and index"
285 msgstr "显示 HEAD 和索引的差异"
286
285 -#: add-interactive.c:1020
287 +#: add-interactive.c:1024
288 msgid "add contents of untracked files to the staged set of changes"
289 msgstr "将未跟踪文件的内容添加到暂存区修改集中"
290
289 -#: add-interactive.c:1028 add-interactive.c:1077
291 +#: add-interactive.c:1032 add-interactive.c:1081
292 msgid "Prompt help:"
293 msgstr "帮助："
294
293 -#: add-interactive.c:1030
295 +#: add-interactive.c:1034
296 msgid "select a single item"
297 msgstr "选择一个条目"
298
297 -#: add-interactive.c:1032
299 +#: add-interactive.c:1036
300 msgid "select a range of items"
301 msgstr "选择一系列条目"
302
301 -#: add-interactive.c:1034
303 +#: add-interactive.c:1038
304 msgid "select multiple ranges"
305 msgstr "选择多个范围"
306
305 -#: add-interactive.c:1036 add-interactive.c:1081
307 +#: add-interactive.c:1040 add-interactive.c:1085
308 msgid "select item based on unique prefix"
309 msgstr "基于唯一前缀选择条目"
310
309 -#: add-interactive.c:1038
311 +#: add-interactive.c:1042
312 msgid "unselect specified items"
313 msgstr "反选指定的条目"
314
313 -#: add-interactive.c:1040
315 +#: add-interactive.c:1044
316 msgid "choose all items"
317 msgstr "选择所有条目"
318
317 -#: add-interactive.c:1042
319 +#: add-interactive.c:1046
320 msgid "(empty) finish selecting"
321 msgstr "（空）结束选择"
322
321 -#: add-interactive.c:1079
323 +#: add-interactive.c:1083
324 msgid "select a numbered item"
325 msgstr "选择一个编号条目"
326
325 -#: add-interactive.c:1083
327 +#: add-interactive.c:1087
328 msgid "(empty) select nothing"
329 msgstr "（空）不选择任何内容"
330
329 -#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
331 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
332 msgid "*** Commands ***"
333 msgstr "*** 命令 ***"
334
333 -#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
335 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
336 msgid "What now"
337 msgstr "请选择"
338
337 -#: add-interactive.c:1144 git-add--interactive.perl:213
339 +#: add-interactive.c:1148 git-add--interactive.perl:213
340 msgid "staged"
341 msgstr "缓存"
342
341 -#: add-interactive.c:1144 git-add--interactive.perl:213
343 +#: add-interactive.c:1148 git-add--interactive.perl:213
344 msgid "unstaged"
345 msgstr "未缓存"
346
345 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
346 -#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
347 -#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
348 -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
349 -#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
350 -#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
351 -#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
347 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
348 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
349 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
350 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
351 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
352 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
353 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
354 #: git-add--interactive.perl:213
355 msgid "path"
356 msgstr "路径"
357
356 -#: add-interactive.c:1151
358 +#: add-interactive.c:1155
359 msgid "could not refresh index"
360 msgstr "不能刷新索引"
361
360 -#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
362 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
363 #, c-format
364 msgid "Bye.\n"
365 msgstr "再见。\n"
@@ -855,7 +857,7 @@ msgstr "对不起，不能编辑这个块"
857 msgid "'git apply' failed"
858 msgstr "'git apply' 失败"
859
858 -#: advice.c:145
860 +#: advice.c:78
861 #, c-format
862 msgid ""
863 "\n"
@@ -864,37 +866,37 @@ msgstr ""
866 "\n"
867 "使用 \"git config advice.%s false\" 来关闭此消息"
868
867 -#: advice.c:161
869 +#: advice.c:94
870 #, c-format
871 msgid "%shint: %.*s%s\n"
872 msgstr "%s提示：%.*s%s\n"
873
872 -#: advice.c:252
874 +#: advice.c:178
875 msgid "Cherry-picking is not possible because you have unmerged files."
876 msgstr "无法拣选，因为您有未合并的文件。"
877
876 -#: advice.c:254
878 +#: advice.c:180
879 msgid "Committing is not possible because you have unmerged files."
880 msgstr "无法提交，因为您有未合并的文件。"
881
880 -#: advice.c:256
882 +#: advice.c:182
883 msgid "Merging is not possible because you have unmerged files."
884 msgstr "无法合并，因为您有未合并的文件。"
885
884 -#: advice.c:258
886 +#: advice.c:184
887 msgid "Pulling is not possible because you have unmerged files."
888 msgstr "无法拉取，因为您有未合并的文件。"
889
888 -#: advice.c:260
890 +#: advice.c:186
891 msgid "Reverting is not possible because you have unmerged files."
892 msgstr "无法回退，因为您有未合并的文件。"
893
892 -#: advice.c:262
894 +#: advice.c:188
895 #, c-format
896 msgid "It is not possible to %s because you have unmerged files."
897 msgstr "无法 %s，因为您有未合并的文件。"
898
897 -#: advice.c:270
899 +#: advice.c:196
900 msgid ""
901 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
902 "as appropriate to mark resolution and make a commit."
@@ -902,37 +904,47 @@ msgstr ""
904 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
905 "解决方案并提交。"
906
905 -#: advice.c:278
907 +#: advice.c:204
908 msgid "Exiting because of an unresolved conflict."
909 msgstr "因为存在未解决的冲突而退出。"
910
909 -#: advice.c:283 builtin/merge.c:1375
911 +#: advice.c:209 builtin/merge.c:1379
912 msgid "You have not concluded your merge (MERGE_HEAD exists)."
913 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
914
913 -#: advice.c:285
915 +#: advice.c:211
916 msgid "Please, commit your changes before merging."
917 msgstr "请在合并前先提交您的修改。"
918
917 -#: advice.c:286
919 +#: advice.c:212
920 msgid "Exiting because of unfinished merge."
921 msgstr "因为存在未完成的合并而退出。"
922
921 -#: advice.c:296
923 +#: advice.c:217
924 +msgid "Not possible to fast-forward, aborting."
925 +msgstr "无法快进，终止。"
926 +
927 +#: advice.c:227
928 #, c-format
929 msgid ""
924 -"The following pathspecs didn't match any eligible path, but they do match "
925 -"index\n"
926 -"entries outside the current sparse checkout:\n"
930 +"The following paths and/or pathspecs matched paths that exist\n"
931 +"outside of your sparse-checkout definition, so will not be\n"
932 +"updated in the index:\n"
933 msgstr ""
928 -"以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n"
934 +"下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n"
935 +"所以不会在索引中更新：\n"
936
930 -#: advice.c:303
937 +#: advice.c:234
938 msgid ""
932 -"Disable or modify the sparsity rules if you intend to update such entries."
933 -msgstr "如果您打算更新此类条目，请禁用或修改稀疏规则。"
939 +"If you intend to update such entries, try one of the following:\n"
940 +"* Use the --sparse option.\n"
941 +"* Disable or modify the sparsity rules."
942 +msgstr ""
943 +"如果您意图更新这些条目，请尝试下列其中之一：\n"
944 +"* 使用 --sparse 选项。\n"
945 +"* 禁用或者修改稀疏规则。"
946
935 -#: advice.c:310
947 +#: advice.c:242
948 #, c-format
949 msgid ""
950 "Note: switching to '%s'.\n"
@@ -1104,49 +1116,49 @@ msgstr "删除的文件 %s 仍有内容"
1116 msgid "** warning: file %s becomes empty but is not deleted"
1117 msgstr "** 警告：文件 %s 成为空文件但并未删除"
1118
1107 -#: apply.c:1977
1119 +#: apply.c:1978
1120 #, c-format
1121 msgid "corrupt binary patch at line %d: %.*s"
1122 msgstr "二进制补丁在第 %d 行损坏：%.*s"
1123
1112 -#: apply.c:2014
1124 +#: apply.c:2015
1125 #, c-format
1126 msgid "unrecognized binary patch at line %d"
1127 msgstr "未能识别的二进制补丁位于第 %d 行"
1128
1117 -#: apply.c:2176
1129 +#: apply.c:2177
1130 #, c-format
1131 msgid "patch with only garbage at line %d"
1132 msgstr "补丁文件的第 %d 行只有垃圾数据"
1133
1122 -#: apply.c:2262
1134 +#: apply.c:2263
1135 #, c-format
1136 msgid "unable to read symlink %s"
1137 msgstr "无法读取符号链接 %s"
1138
1127 -#: apply.c:2266
1139 +#: apply.c:2267
1140 #, c-format
1141 msgid "unable to open or read %s"
1142 msgstr "不能打开或读取 %s"
1143
1132 -#: apply.c:2935
1144 +#: apply.c:2936
1145 #, c-format
1146 msgid "invalid start of line: '%c'"
1147 msgstr "无效的行首字符：'%c'"
1148
1137 -#: apply.c:3056
1149 +#: apply.c:3057
1150 #, c-format
1151 msgid "Hunk #%d succeeded at %d (offset %d line)."
1152 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1153 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
1154 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
1155
1144 -#: apply.c:3068
1156 +#: apply.c:3069
1157 #, c-format
1158 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1159 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
1160
1149 -#: apply.c:3074
1161 +#: apply.c:3075
1162 #, c-format
1163 msgid ""
1164 "while searching for:\n"
@@ -1155,438 +1167,439 @@ msgstr ""
1167 "当查询：\n"
1168 "%.*s"
1169
1158 -#: apply.c:3096
1170 +#: apply.c:3097
1171 #, c-format
1172 msgid "missing binary patch data for '%s'"
1173 msgstr "缺失 '%s' 的二进制补丁数据"
1174
1163 -#: apply.c:3104
1175 +#: apply.c:3105
1176 #, c-format
1177 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1178 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
1179
1168 -#: apply.c:3151
1180 +#: apply.c:3152
1181 #, c-format
1182 msgid "cannot apply binary patch to '%s' without full index line"
1183 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
1184
1173 -#: apply.c:3162
1185 +#: apply.c:3163
1186 #, c-format
1187 msgid ""
1188 "the patch applies to '%s' (%s), which does not match the current contents."
1189 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
1190
1179 -#: apply.c:3170
1191 +#: apply.c:3171
1192 #, c-format
1193 msgid "the patch applies to an empty '%s' but it is not empty"
1194 msgstr "补丁应用到空文件 '%s'，但其并非空文件"
1195
1184 -#: apply.c:3188
1196 +#: apply.c:3189
1197 #, c-format
1198 msgid "the necessary postimage %s for '%s' cannot be read"
1199 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
1200
1189 -#: apply.c:3201
1201 +#: apply.c:3202
1202 #, c-format
1203 msgid "binary patch does not apply to '%s'"
1204 msgstr "二进制补丁未应用到 '%s'"
1205
1194 -#: apply.c:3208
1206 +#: apply.c:3209
1207 #, c-format
1208 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1209 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
1210
1199 -#: apply.c:3229
1211 +#: apply.c:3230
1212 #, c-format
1213 msgid "patch failed: %s:%ld"
1214 msgstr "打补丁失败：%s:%ld"
1215
1204 -#: apply.c:3352
1216 +#: apply.c:3353
1217 #, c-format
1218 msgid "cannot checkout %s"
1219 msgstr "不能检出 %s"
1220
1209 -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
1221 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
1222 #: setup.c:308
1223 #, c-format
1224 msgid "failed to read %s"
1225 msgstr "无法读取 %s"
1226
1215 -#: apply.c:3412
1227 +#: apply.c:3413
1228 #, c-format
1229 msgid "reading from '%s' beyond a symbolic link"
1230 msgstr "读取位于符号链接中的 '%s'"
1231
1220 -#: apply.c:3441 apply.c:3687
1232 +#: apply.c:3442 apply.c:3709
1233 #, c-format
1234 msgid "path %s has been renamed/deleted"
1235 msgstr "路径 %s 已经被重命名/删除"
1236
1225 -#: apply.c:3527 apply.c:3702
1237 +#: apply.c:3549 apply.c:3724
1238 #, c-format
1239 msgid "%s: does not exist in index"
1240 msgstr "%s：不存在于索引中"
1241
1230 -#: apply.c:3536 apply.c:3710 apply.c:3954
1242 +#: apply.c:3558 apply.c:3732 apply.c:3976
1243 #, c-format
1244 msgid "%s: does not match index"
1245 msgstr "%s：和索引不匹配"
1246
1235 -#: apply.c:3571
1247 +#: apply.c:3593
1248 msgid "repository lacks the necessary blob to perform 3-way merge."
1249 msgstr "仓库缺乏执行三方合并所必需的数据对象。"
1250
1239 -#: apply.c:3574
1251 +#: apply.c:3596
1252 #, c-format
1253 msgid "Performing three-way merge...\n"
1254 msgstr "执行三方合并...\n"
1255
1244 -#: apply.c:3590 apply.c:3594
1256 +#: apply.c:3612 apply.c:3616
1257 #, c-format
1258 msgid "cannot read the current contents of '%s'"
1259 msgstr "无法读取 '%s' 的当前内容"
1260
1249 -#: apply.c:3606
1261 +#: apply.c:3628
1262 #, c-format
1263 msgid "Failed to perform three-way merge...\n"
1264 msgstr "无法执行三方合并...\n"
1265
1254 -#: apply.c:3620
1266 +#: apply.c:3642
1267 #, c-format
1268 msgid "Applied patch to '%s' with conflicts.\n"
1269 msgstr "应用补丁到 '%s' 存在冲突。\n"
1270
1259 -#: apply.c:3625
1271 +#: apply.c:3647
1272 #, c-format
1273 msgid "Applied patch to '%s' cleanly.\n"
1274 msgstr "成功应用补丁到 '%s'。\n"
1275
1264 -#: apply.c:3642
1276 +#: apply.c:3664
1277 #, c-format
1278 msgid "Falling back to direct application...\n"
1279 msgstr "回落到直接应用...\n"
1280
1269 -#: apply.c:3654
1281 +#: apply.c:3676
1282 msgid "removal patch leaves file contents"
1283 msgstr "移除补丁仍留下了文件内容"
1284
1273 -#: apply.c:3727
1285 +#: apply.c:3749
1286 #, c-format
1287 msgid "%s: wrong type"
1288 msgstr "%s：错误类型"
1289
1278 -#: apply.c:3729
1290 +#: apply.c:3751
1291 #, c-format
1292 msgid "%s has type %o, expected %o"
1293 msgstr "%s 的类型是 %o，应为 %o"
1294
1283 -#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
1284 -#: read-cache.c:1353
1295 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
1296 +#: read-cache.c:1368
1297 #, c-format
1298 msgid "invalid path '%s'"
1299 msgstr "无效路径 '%s'"
1300
1289 -#: apply.c:3952
1301 +#: apply.c:3974
1302 #, c-format
1303 msgid "%s: already exists in index"
1304 msgstr "%s：已经存在于索引中"
1305
1294 -#: apply.c:3956
1306 +#: apply.c:3978
1307 #, c-format
1308 msgid "%s: already exists in working directory"
1309 msgstr "%s：已经存在于工作区中"
1310
1299 -#: apply.c:3976
1311 +#: apply.c:3998
1312 #, c-format
1313 msgid "new mode (%o) of %s does not match old mode (%o)"
1314 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
1315
1304 -#: apply.c:3981
1316 +#: apply.c:4003
1317 #, c-format
1318 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1319 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
1320
1309 -#: apply.c:4001
1321 +#: apply.c:4023
1322 #, c-format
1323 msgid "affected file '%s' is beyond a symbolic link"
1324 msgstr "受影响的文件 '%s' 位于符号链接中"
1325
1314 -#: apply.c:4005
1326 +#: apply.c:4027
1327 #, c-format
1328 msgid "%s: patch does not apply"
1329 msgstr "%s：补丁未应用"
1330
1319 -#: apply.c:4020
1331 +#: apply.c:4042
1332 #, c-format
1333 msgid "Checking patch %s..."
1334 msgstr "正在检查补丁 %s..."
1335
1324 -#: apply.c:4112
1336 +#: apply.c:4134
1337 #, c-format
1338 msgid "sha1 information is lacking or useless for submodule %s"
1339 msgstr "子模组 %s 的 sha1 信息缺失或无效"
1340
1329 -#: apply.c:4119
1341 +#: apply.c:4141
1342 #, c-format
1343 msgid "mode change for %s, which is not in current HEAD"
1344 msgstr "%s 的模式变更，但它不在当前 HEAD 中"
1345
1334 -#: apply.c:4122
1346 +#: apply.c:4144
1347 #, c-format
1348 msgid "sha1 information is lacking or useless (%s)."
1349 msgstr "sha1 信息缺失或无效（%s）。"
1350
1339 -#: apply.c:4131
1351 +#: apply.c:4153
1352 #, c-format
1353 msgid "could not add %s to temporary index"
1354 msgstr "不能在临时索引中添加 %s"
1355
1344 -#: apply.c:4141
1356 +#: apply.c:4163
1357 #, c-format
1358 msgid "could not write temporary index to %s"
1359 msgstr "不能把临时索引写入到 %s"
1360
1349 -#: apply.c:4279
1361 +#: apply.c:4301
1362 #, c-format
1363 msgid "unable to remove %s from index"
1364 msgstr "不能从索引中移除 %s"
1365
1354 -#: apply.c:4313
1366 +#: apply.c:4335
1367 #, c-format
1368 msgid "corrupt patch for submodule %s"
1369 msgstr "子模组 %s 损坏的补丁"
1370
1359 -#: apply.c:4319
1371 +#: apply.c:4341
1372 #, c-format
1373 msgid "unable to stat newly created file '%s'"
1374 msgstr "不能对新建文件 '%s' 调用 stat"
1375
1364 -#: apply.c:4327
1376 +#: apply.c:4349
1377 #, c-format
1378 msgid "unable to create backing store for newly created file %s"
1379 msgstr "不能为新建文件 %s 创建后端存储"
1380
1369 -#: apply.c:4333 apply.c:4478
1381 +#: apply.c:4355 apply.c:4500
1382 #, c-format
1383 msgid "unable to add cache entry for %s"
1384 msgstr "无法为 %s 添加缓存条目"
1385
1374 -#: apply.c:4376 builtin/bisect--helper.c:525
1386 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242
1387 +#: builtin/gc.c:2277
1388 #, c-format
1389 msgid "failed to write to '%s'"
1390 msgstr "写入 '%s' 失败"
1391
1379 -#: apply.c:4380
1392 +#: apply.c:4402
1393 #, c-format
1394 msgid "closing file '%s'"
1395 msgstr "关闭文件 '%s'"
1396
1384 -#: apply.c:4450
1397 +#: apply.c:4472
1398 #, c-format
1399 msgid "unable to write file '%s' mode %o"
1400 msgstr "不能写文件 '%s' 权限 %o"
1401
1389 -#: apply.c:4548
1402 +#: apply.c:4570
1403 #, c-format
1404 msgid "Applied patch %s cleanly."
1405 msgstr "成功应用补丁 %s。"
1406
1394 -#: apply.c:4556
1407 +#: apply.c:4578
1408 msgid "internal error"
1409 msgstr "内部错误"
1410
1398 -#: apply.c:4559
1411 +#: apply.c:4581
1412 #, c-format
1413 msgid "Applying patch %%s with %d reject..."
1414 msgid_plural "Applying patch %%s with %d rejects..."
1415 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1416 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1417
1405 -#: apply.c:4570
1418 +#: apply.c:4592
1419 #, c-format
1420 msgid "truncating .rej filename to %.*s.rej"
1421 msgstr "截短 .rej 文件名为 %.*s.rej"
1422
1410 -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
1423 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
1424 #, c-format
1425 msgid "cannot open %s"
1426 msgstr "不能打开 %s"
1427
1415 -#: apply.c:4592
1428 +#: apply.c:4614
1429 #, c-format
1430 msgid "Hunk #%d applied cleanly."
1431 msgstr "第 #%d 个片段成功应用。"
1432
1420 -#: apply.c:4596
1433 +#: apply.c:4618
1434 #, c-format
1435 msgid "Rejected hunk #%d."
1436 msgstr "拒绝第 #%d 个片段。"
1437
1425 -#: apply.c:4725
1438 +#: apply.c:4747
1439 #, c-format
1440 msgid "Skipped patch '%s'."
1441 msgstr "略过补丁 '%s'。"
1442
1430 -#: apply.c:4733
1443 +#: apply.c:4755
1444 msgid "unrecognized input"
1445 msgstr "未能识别的输入"
1446
1434 -#: apply.c:4753
1447 +#: apply.c:4775
1448 msgid "unable to read index file"
1449 msgstr "无法读取索引文件"
1450
1438 -#: apply.c:4910
1451 +#: apply.c:4932
1452 #, c-format
1453 msgid "can't open patch '%s': %s"
1454 msgstr "不能打开补丁 '%s'：%s"
1455
1443 -#: apply.c:4937
1456 +#: apply.c:4959
1457 #, c-format
1458 msgid "squelched %d whitespace error"
1459 msgid_plural "squelched %d whitespace errors"
1460 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1461 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1462
1450 -#: apply.c:4943 apply.c:4958
1463 +#: apply.c:4965 apply.c:4980
1464 #, c-format
1465 msgid "%d line adds whitespace errors."
1466 msgid_plural "%d lines add whitespace errors."
1467 msgstr[0] "%d 行新增了空白字符误用。"
1468 msgstr[1] "%d 行新增了空白字符误用。"
1469
1457 -#: apply.c:4951
1470 +#: apply.c:4973
1471 #, c-format
1472 msgid "%d line applied after fixing whitespace errors."
1473 msgid_plural "%d lines applied after fixing whitespace errors."
1474 msgstr[0] "修复空白错误后，应用了 %d 行。"
1475 msgstr[1] "修复空白错误后，应用了 %d 行。"
1476
1464 -#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
1477 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
1478 msgid "Unable to write new index file"
1479 msgstr "无法写入新索引文件"
1480
1468 -#: apply.c:4995
1481 +#: apply.c:5017
1482 msgid "don't apply changes matching the given path"
1483 msgstr "不要应用与给出路径向匹配的变更"
1484
1472 -#: apply.c:4998
1485 +#: apply.c:5020
1486 msgid "apply changes matching the given path"
1487 msgstr "应用与给出路径向匹配的变更"
1488
1476 -#: apply.c:5000 builtin/am.c:2318
1489 +#: apply.c:5022 builtin/am.c:2320
1490 msgid "num"
1491 msgstr "数字"
1492
1480 -#: apply.c:5001
1493 +#: apply.c:5023
1494 msgid "remove <num> leading slashes from traditional diff paths"
1495 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1496
1484 -#: apply.c:5004
1497 +#: apply.c:5026
1498 msgid "ignore additions made by the patch"
1499 msgstr "忽略补丁中的添加的文件"
1500
1488 -#: apply.c:5006
1501 +#: apply.c:5028
1502 msgid "instead of applying the patch, output diffstat for the input"
1503 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1504
1492 -#: apply.c:5010
1505 +#: apply.c:5032
1506 msgid "show number of added and deleted lines in decimal notation"
1507 msgstr "以十进制数显示添加和删除的行数"
1508
1496 -#: apply.c:5012
1509 +#: apply.c:5034
1510 msgid "instead of applying the patch, output a summary for the input"
1511 msgstr "不应用补丁，而是显示输入的概要"
1512
1500 -#: apply.c:5014
1513 +#: apply.c:5036
1514 msgid "instead of applying the patch, see if the patch is applicable"
1515 msgstr "不应用补丁，而是查看补丁是否可应用"
1516
1504 -#: apply.c:5016
1517 +#: apply.c:5038
1518 msgid "make sure the patch is applicable to the current index"
1519 msgstr "确认补丁可以应用到当前索引"
1520
1508 -#: apply.c:5018
1521 +#: apply.c:5040
1522 msgid "mark new files with `git add --intent-to-add`"
1523 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1524
1512 -#: apply.c:5020
1525 +#: apply.c:5042
1526 msgid "apply a patch without touching the working tree"
1527 msgstr "应用补丁而不修改工作区"
1528
1516 -#: apply.c:5022
1529 +#: apply.c:5044
1530 msgid "accept a patch that touches outside the working area"
1531 msgstr "接受修改工作区之外文件的补丁"
1532
1520 -#: apply.c:5025
1533 +#: apply.c:5047
1534 msgid "also apply the patch (use with --stat/--summary/--check)"
1535 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
1536
1524 -#: apply.c:5027
1537 +#: apply.c:5049
1538 msgid "attempt three-way merge, fall back on normal patch if that fails"
1539 msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
1540
1528 -#: apply.c:5029
1541 +#: apply.c:5051
1542 msgid "build a temporary index based on embedded index information"
1543 msgstr "创建一个临时索引基于嵌入的索引信息"
1544
1532 -#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
1545 +#: apply.c:5054 builtin/checkout-index.c:196
1546 msgid "paths are separated with NUL character"
1547 msgstr "路径以 NUL 字符分隔"
1548
1536 -#: apply.c:5034
1549 +#: apply.c:5056
1550 msgid "ensure at least <n> lines of context match"
1551 msgstr "确保至少匹配 <n> 行上下文"
1552
1540 -#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
1553 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
1554 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1542 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
1543 -#: builtin/rebase.c:1347
1555 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
1556 +#: builtin/rebase.c:1051
1557 msgid "action"
1558 msgstr "动作"
1559
1547 -#: apply.c:5036
1560 +#: apply.c:5058
1561 msgid "detect new or modified lines that have whitespace errors"
1562 msgstr "检查新增和修改的行中间的空白字符滥用"
1563
1551 -#: apply.c:5039 apply.c:5042
1564 +#: apply.c:5061 apply.c:5064
1565 msgid "ignore changes in whitespace when finding context"
1566 msgstr "查找上下文时忽略空白字符的变更"
1567
1555 -#: apply.c:5045
1568 +#: apply.c:5067
1569 msgid "apply the patch in reverse"
1570 msgstr "反向应用补丁"
1571
1559 -#: apply.c:5047
1572 +#: apply.c:5069
1573 msgid "don't expect at least one line of context"
1574 msgstr "无需至少一行上下文"
1575
1563 -#: apply.c:5049
1576 +#: apply.c:5071
1577 msgid "leave the rejected hunks in corresponding *.rej files"
1578 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1579
1567 -#: apply.c:5051
1580 +#: apply.c:5073
1581 msgid "allow overlapping hunks"
1582 msgstr "允许重叠的补丁片段"
1583
1571 -#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
1572 -#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
1573 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
1584 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
1585 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
1586 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
1587 msgid "be verbose"
1588 msgstr "冗长输出"
1589
1577 -#: apply.c:5054
1590 +#: apply.c:5076
1591 msgid "tolerate incorrectly detected missing new-line at the end of file"
1592 msgstr "允许不正确的文件末尾换行符"
1593
1581 -#: apply.c:5057
1594 +#: apply.c:5079
1595 msgid "do not trust the line counts in the hunk headers"
1596 msgstr "不信任补丁片段的头信息中的行号"
1597
1585 -#: apply.c:5059 builtin/am.c:2306
1598 +#: apply.c:5081 builtin/am.c:2308
1599 msgid "root"
1600 msgstr "根目录"
1601
1589 -#: apply.c:5060
1602 +#: apply.c:5082
1603 msgid "prepend <root> to all filenames"
1604 msgstr "为所有文件名前添加 <根目录>"
1605
@@ -1657,152 +1670,151 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list"
1670 msgid "cannot read %s"
1671 msgstr "不能读取 %s"
1672
1660 -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
1661 -#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
1662 -#: builtin/merge.c:1144
1673 +#: archive.c:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112
1674 +#: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834
1675 +#: builtin/merge.c:1145
1676 #, c-format
1677 msgid "could not read '%s'"
1678 msgstr "不能读取 '%s'"
1679
1667 -#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
1680 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
1681 #, c-format
1682 msgid "pathspec '%s' did not match any files"
1683 msgstr "路径规格 '%s' 未匹配任何文件"
1684
1672 -#: archive.c:451
1685 +#: archive.c:450
1686 #, c-format
1687 msgid "no such ref: %.*s"
1688 msgstr "无此引用：%.*s"
1689
1677 -#: archive.c:457
1690 +#: archive.c:456
1691 #, c-format
1692 msgid "not a valid object name: %s"
1693 msgstr "不是一个有效的对象名：%s"
1694
1682 -#: archive.c:470
1695 +#: archive.c:469
1696 #, c-format
1697 msgid "not a tree object: %s"
1698 msgstr "不是一个树对象：%s"
1699
1687 -#: archive.c:482
1700 +#: archive.c:481
1701 msgid "current working directory is untracked"
1702 msgstr "当前工作目录未被跟踪"
1703
1691 -#: archive.c:523
1704 +#: archive.c:522
1705 #, c-format
1706 msgid "File not found: %s"
1707 msgstr "文件未找到：%s"
1708
1696 -#: archive.c:525
1709 +#: archive.c:524
1710 #, c-format
1711 msgid "Not a regular file: %s"
1712 msgstr "不是一个常规文件：%s"
1713
1701 -#: archive.c:552
1714 +#: archive.c:551
1715 msgid "fmt"
1716 msgstr "格式"
1717
1705 -#: archive.c:552
1718 +#: archive.c:551
1719 msgid "archive format"
1720 msgstr "归档格式"
1721
1709 -#: archive.c:553 builtin/log.c:1775
1722 +#: archive.c:552 builtin/log.c:1775
1723 msgid "prefix"
1724 msgstr "前缀"
1725
1713 -#: archive.c:554
1726 +#: archive.c:553
1727 msgid "prepend prefix to each pathname in the archive"
1728 msgstr "为归档中每个路径名加上前缀"
1729
1717 -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
1718 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
1719 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
1720 -#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
1721 -#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
1722 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
1730 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
1731 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
1732 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
1733 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
1734 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
1735 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
1736 msgid "file"
1737 msgstr "文件"
1738
1726 -#: archive.c:556
1739 +#: archive.c:555
1740 msgid "add untracked file to archive"
1741 msgstr "将未跟踪文件添加到归档"
1742
1730 -#: archive.c:559 builtin/archive.c:90
1743 +#: archive.c:558 builtin/archive.c:88
1744 msgid "write the archive to this file"
1745 msgstr "归档写入此文件"
1746
1734 -#: archive.c:561
1747 +#: archive.c:560
1748 msgid "read .gitattributes in working directory"
1749 msgstr "读取工作区中的 .gitattributes"
1750
1738 -#: archive.c:562
1751 +#: archive.c:561
1752 msgid "report archived files on stderr"
1753 msgstr "在标准错误上报告归档文件"
1754
1742 -#: archive.c:564
1755 +#: archive.c:563
1756 msgid "set compression level"
1757 msgstr "设置压缩级别"
1758
1746 -#: archive.c:567
1759 +#: archive.c:566
1760 msgid "list supported archive formats"
1761 msgstr "列出支持的归档格式"
1762
1750 -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
1751 -#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
1752 -#: builtin/submodule--helper.c:2902
1763 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
1764 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
1765 msgid "repo"
1766 msgstr "仓库"
1767
1756 -#: archive.c:570 builtin/archive.c:92
1768 +#: archive.c:569 builtin/archive.c:90
1769 msgid "retrieve the archive from remote repository <repo>"
1770 msgstr "从远程仓库（<仓库>）提取归档文件"
1771
1760 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
1761 -#: builtin/notes.c:498
1772 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
1773 +#: builtin/notes.c:496
1774 msgid "command"
1775 msgstr "命令"
1776
1765 -#: archive.c:572 builtin/archive.c:94
1777 +#: archive.c:571 builtin/archive.c:92
1778 msgid "path to the remote git-upload-archive command"
1779 msgstr "远程 git-upload-archive 命令的路径"
1780
1769 -#: archive.c:579
1781 +#: archive.c:578
1782 msgid "Unexpected option --remote"
1783 msgstr "未知参数 --remote"
1784
1773 -#: archive.c:581
1785 +#: archive.c:580
1786 msgid "Option --exec can only be used together with --remote"
1787 msgstr "选项 --exec 只能和 --remote 同时使用"
1788
1777 -#: archive.c:583
1789 +#: archive.c:582
1790 msgid "Unexpected option --output"
1791 msgstr "未知参数 --output"
1792
1781 -#: archive.c:585
1793 +#: archive.c:584
1794 msgid "Options --add-file and --remote cannot be used together"
1795 msgstr "选项 --add-file 和 --remote 不能同时使用"
1796
1785 -#: archive.c:607
1797 +#: archive.c:606
1798 #, c-format
1799 msgid "Unknown archive format '%s'"
1800 msgstr "未知归档格式 '%s'"
1801
1790 -#: archive.c:616
1802 +#: archive.c:615
1803 #, c-format
1804 msgid "Argument not supported for format '%s': -%d"
1805 msgstr "参数不支持此格式 '%s'：-%d"
1806
1795 -#: attr.c:202
1807 +#: attr.c:203
1808 #, c-format
1809 msgid "%.*s is not a valid attribute name"
1810 msgstr "%.*s 不是一个有效的属性名"
1811
1800 -#: attr.c:363
1812 +#: attr.c:364
1813 #, c-format
1814 msgid "%s not allowed: %s:%d"
1815 msgstr "不允许 %s：%s:%d"
1816
1805 -#: attr.c:403
1817 +#: attr.c:404
1818 msgid ""
1819 "Negative patterns are ignored in git attributes\n"
1820 "Use '\\!' for literal leading exclamation."
@@ -1810,22 +1822,22 @@ msgstr ""
1822 "负值模版在 git attributes 中被忽略\n"
1823 "当字符串确实要以感叹号开始时，使用 '\\!'。"
1824
1813 -#: bisect.c:489
1825 +#: bisect.c:488
1826 #, c-format
1827 msgid "Badly quoted content in file '%s': %s"
1828 msgstr "文件 '%s' 包含错误的引用格式：%s"
1829
1818 -#: bisect.c:699
1830 +#: bisect.c:698
1831 #, c-format
1832 msgid "We cannot bisect more!\n"
1833 msgstr "我们无法进行更多的二分查找！\n"
1834
1823 -#: bisect.c:766
1835 +#: bisect.c:764
1836 #, c-format
1837 msgid "Not a valid commit name %s"
1838 msgstr "不是一个有效的提交名 %s"
1839
1828 -#: bisect.c:791
1840 +#: bisect.c:789
1841 #, c-format
1842 msgid ""
1843 "The merge base %s is bad.\n"
@@ -1834,7 +1846,7 @@ msgstr ""
1846 "合并基线 %s 是坏的。\n"
1847 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
1848
1837 -#: bisect.c:796
1849 +#: bisect.c:794
1850 #, c-format
1851 msgid ""
1852 "The merge base %s is new.\n"
@@ -1843,7 +1855,7 @@ msgstr ""
1855 "合并基线 %s 是新的。\n"
1856 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
1857
1846 -#: bisect.c:801
1858 +#: bisect.c:799
1859 #, c-format
1860 msgid ""
1861 "The merge base %s is %s.\n"
@@ -1852,7 +1864,7 @@ msgstr ""
1864 "合并基线 %s 是 %s。\n"
1865 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1866
1855 -#: bisect.c:809
1867 +#: bisect.c:807
1868 #, c-format
1869 msgid ""
1870 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1863,7 +1875,7 @@ msgstr ""
1875 "这种情况下 git 二分查找无法正常工作。\n"
1876 "您可能弄错了 %s 和 %s 版本？\n"
1877
1866 -#: bisect.c:822
1878 +#: bisect.c:820
1879 #, c-format
1880 msgid ""
1881 "the merge base between %s and [%s] must be skipped.\n"
@@ -1874,36 +1886,36 @@ msgstr ""
1886 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1887 "我们仍旧继续。"
1888
1877 -#: bisect.c:861
1889 +#: bisect.c:859
1890 #, c-format
1891 msgid "Bisecting: a merge base must be tested\n"
1892 msgstr "二分查找中：合并基线必须是经过测试的\n"
1893
1882 -#: bisect.c:911
1894 +#: bisect.c:909
1895 #, c-format
1896 msgid "a %s revision is needed"
1897 msgstr "需要一个 %s 版本"
1898
1887 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
1899 +#: bisect.c:939
1900 #, c-format
1901 msgid "could not create file '%s'"
1902 msgstr "不能创建文件 '%s'"
1903
1892 -#: bisect.c:987 builtin/merge.c:153
1904 +#: bisect.c:985 builtin/merge.c:154
1905 #, c-format
1906 msgid "could not read file '%s'"
1907 msgstr "不能读取文件 '%s'"
1908
1897 -#: bisect.c:1027
1909 +#: bisect.c:1025
1910 msgid "reading bisect refs failed"
1911 msgstr "读取二分查找引用失败"
1912
1901 -#: bisect.c:1057
1913 +#: bisect.c:1055
1914 #, c-format
1915 msgid "%s was both %s and %s\n"
1916 msgstr "%s 同时为 %s 和 %s\n"
1917
1906 -#: bisect.c:1066
1918 +#: bisect.c:1064
1919 #, c-format
1920 msgid ""
1921 "No testable commit found.\n"
@@ -1912,7 +1924,7 @@ msgstr ""
1924 "没有发现可测试的提交。\n"
1925 "可能您在运行时使用了错误的路径参数？\n"
1926
1915 -#: bisect.c:1095
1927 +#: bisect.c:1093
1928 #, c-format
1929 msgid "(roughly %d step)"
1930 msgid_plural "(roughly %d steps)"
@@ -1922,7 +1934,7 @@ msgstr[1] "（大概 %d 步）"
1934 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1935 #. steps)" translation.
1936 #.
1925 -#: bisect.c:1101
1937 +#: bisect.c:1099
1938 #, c-format
1939 msgid "Bisecting: %d revision left to test after this %s\n"
1940 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1941,11 +1953,12 @@ msgstr "不能将 --contents 和最终的提交对象名共用"
1953 msgid "--reverse and --first-parent together require specified latest commit"
1954 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1955
1944 -#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
1945 -#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
1946 -#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
1947 -#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
1948 -#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
1956 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
1957 +#: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114
1958 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
1959 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
1960 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
1961 +#: builtin/shortlog.c:255
1962 msgid "revision walk setup failed"
1963 msgstr "版本遍历设置失败"
1964
@@ -2066,7 +2079,7 @@ msgid ""
2079 "\"git push -u\" to set the upstream config as you push."
2080 msgstr ""
2081 "\n"
2069 -"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
2082 +"如果您正计划基于远程一个现存的上游分支开始您的工作，\n"
2083 "您可能需要执行 \"git fetch\" 来获取分支。\n"
2084 "\n"
2085 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
@@ -2117,8 +2130,8 @@ msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
2130 msgid "unrecognized header: %s%s (%d)"
2131 msgstr "未能识别的包头：%s%s (%d)"
2132
2120 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
2121 -#: builtin/commit.c:861
2133 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402
2134 +#: builtin/commit.c:862
2135 #, c-format
2136 msgid "could not open '%s'"
2137 msgstr "不能打开 '%s'"
@@ -2176,7 +2189,7 @@ msgstr "不支持的归档包版本 %d"
2189 msgid "cannot write bundle version %d with algorithm %s"
2190 msgstr "不能写入，归档包版本 %d 不支持算法 %s"
2191
2179 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
2192 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
2193 #, c-format
2194 msgid "unrecognized argument: %s"
2195 msgstr "未能识别的参数：%s"
@@ -2218,7 +2231,7 @@ msgstr "最终块有非零 ID %<PRIx32>"
2231 msgid "invalid color value: %.*s"
2232 msgstr "无效的颜色值：%.*s"
2233
2221 -#: commit-graph.c:204 midx.c:47
2234 +#: commit-graph.c:204 midx.c:51
2235 msgid "invalid hash version"
2236 msgstr "无效的哈希版本"
2237
@@ -2263,217 +2276,217 @@ msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
2276 msgid "unable to find all commit-graph files"
2277 msgstr "无法找到所有提交图形文件"
2278
2266 -#: commit-graph.c:745 commit-graph.c:782
2279 +#: commit-graph.c:746 commit-graph.c:783
2280 msgid "invalid commit position. commit-graph is likely corrupt"
2281 msgstr "无效的提交位置。提交图形可能已损坏"
2282
2270 -#: commit-graph.c:766
2283 +#: commit-graph.c:767
2284 #, c-format
2285 msgid "could not find commit %s"
2286 msgstr "无法找到提交 %s"
2287
2275 -#: commit-graph.c:799
2288 +#: commit-graph.c:800
2289 msgid "commit-graph requires overflow generation data but has none"
2290 msgstr "提交图需要溢出世代数据，但是没有"
2291
2279 -#: commit-graph.c:1075 builtin/am.c:1341
2292 +#: commit-graph.c:1105 builtin/am.c:1342
2293 #, c-format
2294 msgid "unable to parse commit %s"
2295 msgstr "不能解析提交 %s"
2296
2284 -#: commit-graph.c:1337 builtin/pack-objects.c:3057
2297 +#: commit-graph.c:1367 builtin/pack-objects.c:3070
2298 #, c-format
2299 msgid "unable to get type of object %s"
2300 msgstr "无法获得对象 %s 类型"
2301
2289 -#: commit-graph.c:1368
2302 +#: commit-graph.c:1398
2303 msgid "Loading known commits in commit graph"
2304 msgstr "正在加载提交图中的已知提交"
2305
2293 -#: commit-graph.c:1385
2306 +#: commit-graph.c:1415
2307 msgid "Expanding reachable commits in commit graph"
2308 msgstr "正在扩展提交图中的可达提交"
2309
2297 -#: commit-graph.c:1405
2310 +#: commit-graph.c:1435
2311 msgid "Clearing commit marks in commit graph"
2312 msgstr "正在清除提交图中的提交标记"
2313
2301 -#: commit-graph.c:1424
2314 +#: commit-graph.c:1454
2315 msgid "Computing commit graph topological levels"
2316 msgstr "正在计算提交图拓扑级别"
2317
2305 -#: commit-graph.c:1477
2318 +#: commit-graph.c:1507
2319 msgid "Computing commit graph generation numbers"
2320 msgstr "正在计算提交图世代数字"
2321
2309 -#: commit-graph.c:1558
2322 +#: commit-graph.c:1588
2323 msgid "Computing commit changed paths Bloom filters"
2324 msgstr "计算提交变更路径的布隆过滤器"
2325
2313 -#: commit-graph.c:1635
2326 +#: commit-graph.c:1665
2327 msgid "Collecting referenced commits"
2328 msgstr "正在收集引用的提交"
2329
2317 -#: commit-graph.c:1660
2330 +#: commit-graph.c:1690
2331 #, c-format
2332 msgid "Finding commits for commit graph in %d pack"
2333 msgid_plural "Finding commits for commit graph in %d packs"
2334 msgstr[0] "正在 %d 个包中查找提交图的提交"
2335 msgstr[1] "正在 %d 个包中查找提交图的提交"
2336
2324 -#: commit-graph.c:1673
2337 +#: commit-graph.c:1703
2338 #, c-format
2339 msgid "error adding pack %s"
2340 msgstr "添加包 %s 出错"
2341
2329 -#: commit-graph.c:1677
2342 +#: commit-graph.c:1707
2343 #, c-format
2344 msgid "error opening index for %s"
2345 msgstr "为 %s 打开索引出错"
2346
2334 -#: commit-graph.c:1714
2347 +#: commit-graph.c:1744
2348 msgid "Finding commits for commit graph among packed objects"
2349 msgstr "正在打包对象中查找提交图的提交"
2350
2338 -#: commit-graph.c:1732
2351 +#: commit-graph.c:1762
2352 msgid "Finding extra edges in commit graph"
2353 msgstr "正在查找提交图中额外的边"
2354
2342 -#: commit-graph.c:1781
2355 +#: commit-graph.c:1811
2356 msgid "failed to write correct number of base graph ids"
2357 msgstr "无法写入正确数量的基础图形 ID"
2358
2346 -#: commit-graph.c:1812 midx.c:911
2359 +#: commit-graph.c:1842 midx.c:1146
2360 #, c-format
2361 msgid "unable to create leading directories of %s"
2362 msgstr "不能为 %s 创建先导目录"
2363
2351 -#: commit-graph.c:1825
2364 +#: commit-graph.c:1855
2365 msgid "unable to create temporary graph layer"
2366 msgstr "无法创建临时图层"
2367
2355 -#: commit-graph.c:1830
2368 +#: commit-graph.c:1860
2369 #, c-format
2370 msgid "unable to adjust shared permissions for '%s'"
2371 msgstr "无法为 '%s' 调整共享权限"
2372
2360 -#: commit-graph.c:1887
2373 +#: commit-graph.c:1917
2374 #, c-format
2375 msgid "Writing out commit graph in %d pass"
2376 msgid_plural "Writing out commit graph in %d passes"
2377 msgstr[0] "正在用 %d 步写出提交图"
2378 msgstr[1] "正在用 %d 步写出提交图"
2379
2367 -#: commit-graph.c:1923
2380 +#: commit-graph.c:1953
2381 msgid "unable to open commit-graph chain file"
2382 msgstr "无法打开提交图形链文件"
2383
2371 -#: commit-graph.c:1939
2384 +#: commit-graph.c:1969
2385 msgid "failed to rename base commit-graph file"
2386 msgstr "无法重命名基础提交图形文件"
2387
2375 -#: commit-graph.c:1959
2388 +#: commit-graph.c:1989
2389 msgid "failed to rename temporary commit-graph file"
2390 msgstr "无法重命名临时提交图形文件"
2391
2379 -#: commit-graph.c:2092
2392 +#: commit-graph.c:2122
2393 msgid "Scanning merged commits"
2394 msgstr "正在扫描合并提交"
2395
2383 -#: commit-graph.c:2136
2396 +#: commit-graph.c:2166
2397 msgid "Merging commit-graph"
2398 msgstr "正在合并提交图形"
2399
2387 -#: commit-graph.c:2244
2400 +#: commit-graph.c:2274
2401 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2402 msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
2403
2391 -#: commit-graph.c:2351
2404 +#: commit-graph.c:2381
2405 msgid "too many commits to write graph"
2406 msgstr "提交太多不能画图"
2407
2395 -#: commit-graph.c:2449
2408 +#: commit-graph.c:2479
2409 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2410 msgstr "提交图文件的校验码错误，可能已经损坏"
2411
2399 -#: commit-graph.c:2459
2412 +#: commit-graph.c:2489
2413 #, c-format
2414 msgid "commit-graph has incorrect OID order: %s then %s"
2415 msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
2416
2404 -#: commit-graph.c:2469 commit-graph.c:2484
2417 +#: commit-graph.c:2499 commit-graph.c:2514
2418 #, c-format
2419 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2420 msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
2421
2409 -#: commit-graph.c:2476
2422 +#: commit-graph.c:2506
2423 #, c-format
2424 msgid "failed to parse commit %s from commit-graph"
2425 msgstr "无法从提交图形中解析提交 %s"
2426
2414 -#: commit-graph.c:2494
2427 +#: commit-graph.c:2524
2428 msgid "Verifying commits in commit graph"
2429 msgstr "正在校验提交图中的提交"
2430
2418 -#: commit-graph.c:2509
2431 +#: commit-graph.c:2539
2432 #, c-format
2433 msgid "failed to parse commit %s from object database for commit-graph"
2434 msgstr "无法从提交图形的对象库中解析提交 %s"
2435
2423 -#: commit-graph.c:2516
2436 +#: commit-graph.c:2546
2437 #, c-format
2438 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2439 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
2440
2428 -#: commit-graph.c:2526
2441 +#: commit-graph.c:2556
2442 #, c-format
2443 msgid "commit-graph parent list for commit %s is too long"
2444 msgstr "提交 %s 的提交图形父提交列表太长了"
2445
2433 -#: commit-graph.c:2535
2446 +#: commit-graph.c:2565
2447 #, c-format
2448 msgid "commit-graph parent for %s is %s != %s"
2449 msgstr "%s 的提交图形父提交是 %s != %s"
2450
2438 -#: commit-graph.c:2549
2451 +#: commit-graph.c:2579
2452 #, c-format
2453 msgid "commit-graph parent list for commit %s terminates early"
2454 msgstr "提交 %s 的提交图形父提交列表过早终止"
2455
2443 -#: commit-graph.c:2554
2456 +#: commit-graph.c:2584
2457 #, c-format
2458 msgid ""
2459 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2460 msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
2461
2449 -#: commit-graph.c:2558
2462 +#: commit-graph.c:2588
2463 #, c-format
2464 msgid ""
2465 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2466 msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
2467
2455 -#: commit-graph.c:2575
2468 +#: commit-graph.c:2605
2469 #, c-format
2470 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2471 msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
2472
2460 -#: commit-graph.c:2581
2473 +#: commit-graph.c:2611
2474 #, c-format
2475 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2476 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2477
2465 -#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
2466 -#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
2478 +#: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418
2479 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
2480 #, c-format
2481 msgid "could not parse %s"
2482 msgstr "不能解析 %s"
2483
2471 -#: commit.c:54
2484 +#: commit.c:55
2485 #, c-format
2486 msgid "%s %s is not a commit!"
2487 msgstr "%s %s 不是一个提交！"
2488
2476 -#: commit.c:194
2489 +#: commit.c:196
2490 msgid ""
2491 "Support for <GIT_DIR>/info/grafts is deprecated\n"
2492 "and will be removed in a future Git version.\n"
@@ -2493,27 +2506,27 @@ msgstr ""
2506 "设置 \"git config advice.graftFileDeprecated false\"\n"
2507 "可关闭本消息"
2508
2496 -#: commit.c:1237
2509 +#: commit.c:1239
2510 #, c-format
2511 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2512 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2513
2501 -#: commit.c:1241
2514 +#: commit.c:1243
2515 #, c-format
2516 msgid "Commit %s has a bad GPG signature allegedly by %s."
2517 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2518
2506 -#: commit.c:1244
2519 +#: commit.c:1246
2520 #, c-format
2521 msgid "Commit %s does not have a GPG signature."
2522 msgstr "提交 %s 没有 GPG 签名。"
2523
2511 -#: commit.c:1247
2524 +#: commit.c:1249
2525 #, c-format
2526 msgid "Commit %s has a good GPG signature by %s\n"
2527 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2528
2516 -#: commit.c:1501
2529 +#: commit.c:1503
2530 msgid ""
2531 "Warning: commit message did not conform to UTF-8.\n"
2532 "You may want to amend it after fixing the message, or set the config\n"
@@ -2527,7 +2540,7 @@ msgstr ""
2540 msgid "memory exhausted"
2541 msgstr "内存耗尽"
2542
2530 -#: config.c:126
2543 +#: config.c:125
2544 #, c-format
2545 msgid ""
2546 "exceeded maximum include depth (%d) while including\n"
@@ -2542,35 +2555,35 @@ msgstr ""
2555 "\t%2$s\n"
2556 "这可能是因为循环包含。"
2557
2545 -#: config.c:142
2558 +#: config.c:141
2559 #, c-format
2560 msgid "could not expand include path '%s'"
2561 msgstr "无法扩展包含路径 '%s'"
2562
2550 -#: config.c:153
2563 +#: config.c:152
2564 msgid "relative config includes must come from files"
2565 msgstr "相对路径的配置文件引用必须来自于文件"
2566
2554 -#: config.c:199
2567 +#: config.c:201
2568 msgid "relative config include conditionals must come from files"
2569 msgstr "相对路径的配置文件条件引用必须来自于文件"
2570
2558 -#: config.c:396
2571 +#: config.c:398
2572 #, c-format
2573 msgid "invalid config format: %s"
2574 msgstr "无效的配置格式：%s"
2575
2563 -#: config.c:400
2576 +#: config.c:402
2577 #, c-format
2578 msgid "missing environment variable name for configuration '%.*s'"
2579 msgstr "配置 '%.*s' 缺少环境变量名称"
2580
2568 -#: config.c:405
2581 +#: config.c:407
2582 #, c-format
2583 msgid "missing environment variable '%s' for configuration '%.*s'"
2584 msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
2585
2573 -#: config.c:442
2586 +#: config.c:443
2587 #, c-format
2588 msgid "key does not contain a section: %s"
2589 msgstr "键名没有包含一个小节名称：%s"
@@ -2580,295 +2593,295 @@ msgstr "键名没有包含一个小节名称：%s"
2593 msgid "key does not contain variable name: %s"
2594 msgstr "键名没有包含变量名：%s"
2595
2583 -#: config.c:472 sequencer.c:2785
2596 +#: config.c:470 sequencer.c:2802
2597 #, c-format
2598 msgid "invalid key: %s"
2599 msgstr "无效键名：%s"
2600
2588 -#: config.c:478
2601 +#: config.c:475
2602 #, c-format
2603 msgid "invalid key (newline): %s"
2604 msgstr "无效键名（有换行符）：%s"
2605
2593 -#: config.c:511
2606 +#: config.c:495
2607 msgid "empty config key"
2608 msgstr "空的配置键名"
2609
2597 -#: config.c:529 config.c:541
2610 +#: config.c:513 config.c:525
2611 #, c-format
2612 msgid "bogus config parameter: %s"
2613 msgstr "伪配置参数：%s"
2614
2602 -#: config.c:555 config.c:572 config.c:579 config.c:588
2615 +#: config.c:539 config.c:556 config.c:563 config.c:572
2616 #, c-format
2617 msgid "bogus format in %s"
2618 msgstr "%s 中格式错误"
2619
2607 -#: config.c:622
2620 +#: config.c:606
2621 #, c-format
2622 msgid "bogus count in %s"
2623 msgstr "%s 中错误计数"
2624
2612 -#: config.c:626
2625 +#: config.c:610
2626 #, c-format
2627 msgid "too many entries in %s"
2628 msgstr "%s 中太多的条目"
2629
2617 -#: config.c:636
2630 +#: config.c:620
2631 #, c-format
2632 msgid "missing config key %s"
2633 msgstr "缺失配置键名 %s"
2634
2622 -#: config.c:644
2635 +#: config.c:628
2636 #, c-format
2637 msgid "missing config value %s"
2638 msgstr "缺失配置取值 %s"
2639
2627 -#: config.c:995
2640 +#: config.c:979
2641 #, c-format
2642 msgid "bad config line %d in blob %s"
2643 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
2644
2632 -#: config.c:999
2645 +#: config.c:983
2646 #, c-format
2647 msgid "bad config line %d in file %s"
2648 msgstr "文件 %2$s 中错误的配置行 %1$d"
2649
2637 -#: config.c:1003
2650 +#: config.c:987
2651 #, c-format
2652 msgid "bad config line %d in standard input"
2653 msgstr "标准输入中错误的配置行 %d"
2654
2642 -#: config.c:1007
2655 +#: config.c:991
2656 #, c-format
2657 msgid "bad config line %d in submodule-blob %s"
2658 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
2659
2647 -#: config.c:1011
2660 +#: config.c:995
2661 #, c-format
2662 msgid "bad config line %d in command line %s"
2663 msgstr "命令行 %2$s 中错误的配置行 %1$d"
2664
2652 -#: config.c:1015
2665 +#: config.c:999
2666 #, c-format
2667 msgid "bad config line %d in %s"
2668 msgstr "在 %2$s 中错误的配置行 %1$d"
2669
2657 -#: config.c:1152
2670 +#: config.c:1136
2671 msgid "out of range"
2672 msgstr "超出范围"
2673
2661 -#: config.c:1152
2674 +#: config.c:1136
2675 msgid "invalid unit"
2676 msgstr "无效的单位"
2677
2665 -#: config.c:1153
2678 +#: config.c:1137
2679 #, c-format
2680 msgid "bad numeric config value '%s' for '%s': %s"
2681 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
2682
2670 -#: config.c:1163
2683 +#: config.c:1147
2684 #, c-format
2685 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2686 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2687
2675 -#: config.c:1166
2688 +#: config.c:1150
2689 #, c-format
2690 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2691 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2692
2680 -#: config.c:1169
2693 +#: config.c:1153
2694 #, c-format
2695 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2696 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
2697
2685 -#: config.c:1172
2698 +#: config.c:1156
2699 #, c-format
2700 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2701 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2702
2690 -#: config.c:1175
2703 +#: config.c:1159
2704 #, c-format
2705 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2706 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2707
2695 -#: config.c:1178
2708 +#: config.c:1162
2709 #, c-format
2710 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2711 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2712
2700 -#: config.c:1257
2713 +#: config.c:1241
2714 #, c-format
2715 msgid "bad boolean config value '%s' for '%s'"
2716 msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
2717
2705 -#: config.c:1275
2718 +#: config.c:1259
2719 #, c-format
2720 msgid "failed to expand user dir in: '%s'"
2721 msgstr "无法扩展用户目录：'%s'"
2722
2710 -#: config.c:1284
2723 +#: config.c:1268
2724 #, c-format
2725 msgid "'%s' for '%s' is not a valid timestamp"
2726 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2727
2715 -#: config.c:1377
2728 +#: config.c:1361
2729 #, c-format
2730 msgid "abbrev length out of range: %d"
2731 msgstr "缩写长度超出范围：%d"
2732
2720 -#: config.c:1391 config.c:1402
2733 +#: config.c:1375 config.c:1386
2734 #, c-format
2735 msgid "bad zlib compression level %d"
2736 msgstr "错误的 zlib 压缩级别 %d"
2737
2725 -#: config.c:1494
2738 +#: config.c:1476
2739 msgid "core.commentChar should only be one character"
2740 msgstr "core.commentChar 应该是一个字符"
2741
2729 -#: config.c:1527
2742 +#: config.c:1509
2743 #, c-format
2744 msgid "invalid mode for object creation: %s"
2745 msgstr "无效的对象创建模式：%s"
2746
2734 -#: config.c:1599
2747 +#: config.c:1581
2748 #, c-format
2749 msgid "malformed value for %s"
2750 msgstr "%s 的取值格式错误"
2751
2739 -#: config.c:1625
2752 +#: config.c:1607
2753 #, c-format
2754 msgid "malformed value for %s: %s"
2755 msgstr "%s 的取值格式错误：%s"
2756
2744 -#: config.c:1626
2757 +#: config.c:1608
2758 msgid "must be one of nothing, matching, simple, upstream or current"
2759 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
2760
2748 -#: config.c:1687 builtin/pack-objects.c:4084
2761 +#: config.c:1669 builtin/pack-objects.c:4053
2762 #, c-format
2763 msgid "bad pack compression level %d"
2764 msgstr "错误的打包压缩级别 %d"
2765
2753 -#: config.c:1809
2766 +#: config.c:1792
2767 #, c-format
2768 msgid "unable to load config blob object '%s'"
2769 msgstr "无法从数据对象 '%s' 加载配置"
2770
2758 -#: config.c:1812
2771 +#: config.c:1795
2772 #, c-format
2773 msgid "reference '%s' does not point to a blob"
2774 msgstr "引用 '%s' 没有指向一个数据对象"
2775
2763 -#: config.c:1829
2776 +#: config.c:1813
2777 #, c-format
2778 msgid "unable to resolve config blob '%s'"
2779 msgstr "不能解析配置对象 '%s'"
2780
2768 -#: config.c:1874
2781 +#: config.c:1858
2782 #, c-format
2783 msgid "failed to parse %s"
2784 msgstr "解析 %s 失败"
2785
2773 -#: config.c:1930
2786 +#: config.c:1914
2787 msgid "unable to parse command-line config"
2788 msgstr "无法解析命令行中的配置"
2789
2777 -#: config.c:2294
2790 +#: config.c:2282
2791 msgid "unknown error occurred while reading the configuration files"
2792 msgstr "在读取配置文件时遇到未知错误"
2793
2781 -#: config.c:2468
2794 +#: config.c:2456
2795 #, c-format
2796 msgid "Invalid %s: '%s'"
2797 msgstr "无效 %s：'%s'"
2798
2786 -#: config.c:2513
2799 +#: config.c:2501
2800 #, c-format
2801 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2802 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2803
2791 -#: config.c:2559
2804 +#: config.c:2547
2805 #, c-format
2806 msgid "unable to parse '%s' from command-line config"
2807 msgstr "无法解析命令行配置中的 '%s'"
2808
2796 -#: config.c:2561
2809 +#: config.c:2549
2810 #, c-format
2811 msgid "bad config variable '%s' in file '%s' at line %d"
2812 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
2813
2801 -#: config.c:2645
2814 +#: config.c:2633
2815 #, c-format
2816 msgid "invalid section name '%s'"
2817 msgstr "无效的小节名称 '%s'"
2818
2806 -#: config.c:2677
2819 +#: config.c:2665
2820 #, c-format
2821 msgid "%s has multiple values"
2822 msgstr "%s 有多个取值"
2823
2811 -#: config.c:2706
2824 +#: config.c:2694
2825 #, c-format
2826 msgid "failed to write new configuration file %s"
2827 msgstr "写入新的配置文件 %s 失败"
2828
2816 -#: config.c:2958 config.c:3285
2829 +#: config.c:2946 config.c:3273
2830 #, c-format
2831 msgid "could not lock config file %s"
2832 msgstr "不能锁定配置文件 %s"
2833
2821 -#: config.c:2969
2834 +#: config.c:2957
2835 #, c-format
2836 msgid "opening %s"
2837 msgstr "打开 %s"
2838
2826 -#: config.c:3006 builtin/config.c:361
2839 +#: config.c:2994 builtin/config.c:361
2840 #, c-format
2841 msgid "invalid pattern: %s"
2842 msgstr "无效模式：%s"
2843
2831 -#: config.c:3031
2844 +#: config.c:3019
2845 #, c-format
2846 msgid "invalid config file %s"
2847 msgstr "无效的配置文件 %s"
2848
2836 -#: config.c:3044 config.c:3298
2849 +#: config.c:3032 config.c:3286
2850 #, c-format
2851 msgid "fstat on %s failed"
2852 msgstr "对 %s 调用 fstat 失败"
2853
2841 -#: config.c:3055
2854 +#: config.c:3043
2855 #, c-format
2856 msgid "unable to mmap '%s'%s"
2857 msgstr "不能 mmap '%s'%s"
2858
2846 -#: config.c:3065 config.c:3303
2859 +#: config.c:3053 config.c:3291
2860 #, c-format
2861 msgid "chmod on %s failed"
2862 msgstr "对 %s 调用 chmod 失败"
2863
2851 -#: config.c:3150 config.c:3400
2864 +#: config.c:3138 config.c:3388
2865 #, c-format
2866 msgid "could not write config file %s"
2867 msgstr "不能写入配置文件 %s"
2868
2856 -#: config.c:3184
2869 +#: config.c:3172
2870 #, c-format
2871 msgid "could not set '%s' to '%s'"
2872 msgstr "不能设置 '%s' 为 '%s'"
2873
2861 -#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
2874 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
2875 #, c-format
2876 msgid "could not unset '%s'"
2877 msgstr "不能取消设置 '%s'"
2878
2866 -#: config.c:3276
2879 +#: config.c:3264
2880 #, c-format
2881 msgid "invalid section name: %s"
2882 msgstr "无效的小节名称：%s"
2883
2871 -#: config.c:3443
2884 +#: config.c:3431
2885 #, c-format
2886 msgid "missing value for '%s'"
2887 msgstr "%s 的取值缺失"
@@ -2902,72 +2915,72 @@ msgstr "服务器不支持特性 '%s'"
2915 msgid "expected flush after capabilities"
2916 msgstr "在能力之后应为一个 flush 包"
2917
2905 -#: connect.c:263
2918 +#: connect.c:265
2919 #, c-format
2920 msgid "ignoring capabilities after first line '%s'"
2921 msgstr "忽略第一行 '%s' 之后的能力字段"
2922
2910 -#: connect.c:284
2923 +#: connect.c:286
2924 msgid "protocol error: unexpected capabilities^{}"
2925 msgstr "协议错误：意外的 capabilities^{}"
2926
2914 -#: connect.c:306
2927 +#: connect.c:308
2928 #, c-format
2929 msgid "protocol error: expected shallow sha-1, got '%s'"
2930 msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"
2931
2919 -#: connect.c:308
2932 +#: connect.c:310
2933 msgid "repository on the other end cannot be shallow"
2934 msgstr "另一端的仓库不能是浅克隆仓库"
2935
2923 -#: connect.c:347
2936 +#: connect.c:349
2937 msgid "invalid packet"
2938 msgstr "无效数据包"
2939
2927 -#: connect.c:367
2940 +#: connect.c:369
2941 #, c-format
2942 msgid "protocol error: unexpected '%s'"
2943 msgstr "协议错误：意外的 '%s'"
2944
2932 -#: connect.c:497
2945 +#: connect.c:499
2946 #, c-format
2947 msgid "unknown object format '%s' specified by server"
2948 msgstr "服务器给出未知的对象格式 '%s'"
2949
2937 -#: connect.c:526
2950 +#: connect.c:528
2951 #, c-format
2952 msgid "invalid ls-refs response: %s"
2953 msgstr "无效的 ls-refs 响应：%s"
2954
2942 -#: connect.c:530
2955 +#: connect.c:532
2956 msgid "expected flush after ref listing"
2957 msgstr "在引用列表之后应该有一个 flush 包"
2958
2946 -#: connect.c:533
2959 +#: connect.c:535
2960 msgid "expected response end packet after ref listing"
2961 msgstr "在引用列表之后应该有响应结束包"
2962
2950 -#: connect.c:666
2963 +#: connect.c:670
2964 #, c-format
2965 msgid "protocol '%s' is not supported"
2966 msgstr "不支持 '%s' 协议"
2967
2955 -#: connect.c:717
2968 +#: connect.c:721
2969 msgid "unable to set SO_KEEPALIVE on socket"
2970 msgstr "无法为 socket 设置 SO_KEEPALIVE"
2971
2959 -#: connect.c:757 connect.c:820
2972 +#: connect.c:761 connect.c:824
2973 #, c-format
2974 msgid "Looking up %s ... "
2975 msgstr "查找 %s ..."
2976
2964 -#: connect.c:761
2977 +#: connect.c:765
2978 #, c-format
2979 msgid "unable to look up %s (port %s) (%s)"
2980 msgstr "无法查找 %s（端口 %s）（%s）"
2981
2982 #. TRANSLATORS: this is the end of "Looking up %s ... "
2970 -#: connect.c:765 connect.c:836
2983 +#: connect.c:769 connect.c:840
2984 #, c-format
2985 msgid ""
2986 "done.\n"
@@ -2976,7 +2989,7 @@ msgstr ""
2989 "完成。\n"
2990 "连接到 %s（端口 %s）... "
2991
2979 -#: connect.c:787 connect.c:864
2992 +#: connect.c:791 connect.c:868
2993 #, c-format
2994 msgid ""
2995 "unable to connect to %s:\n"
@@ -2986,77 +2999,77 @@ msgstr ""
2999 "%s"
3000
3001 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
2989 -#: connect.c:793 connect.c:870
3002 +#: connect.c:797 connect.c:874
3003 msgid "done."
3004 msgstr "完成。"
3005
2993 -#: connect.c:824
3006 +#: connect.c:828
3007 #, c-format
3008 msgid "unable to look up %s (%s)"
3009 msgstr "无法查找 %s（%s）"
3010
2998 -#: connect.c:830
3011 +#: connect.c:834
3012 #, c-format
3013 msgid "unknown port %s"
3014 msgstr "未知端口 %s"
3015
3003 -#: connect.c:967 connect.c:1299
3016 +#: connect.c:971 connect.c:1303
3017 #, c-format
3018 msgid "strange hostname '%s' blocked"
3019 msgstr "已阻止奇怪的主机名 '%s'"
3020
3008 -#: connect.c:969
3021 +#: connect.c:973
3022 #, c-format
3023 msgid "strange port '%s' blocked"
3024 msgstr "已阻止奇怪的端口号 '%s'"
3025
3013 -#: connect.c:979
3026 +#: connect.c:983
3027 #, c-format
3028 msgid "cannot start proxy %s"
3029 msgstr "不能启动代理 %s"
3030
3018 -#: connect.c:1050
3031 +#: connect.c:1054
3032 msgid "no path specified; see 'git help pull' for valid url syntax"
3033 msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
3034
3022 -#: connect.c:1190
3035 +#: connect.c:1194
3036 msgid "newline is forbidden in git:// hosts and repo paths"
3037 msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
3038
3026 -#: connect.c:1247
3039 +#: connect.c:1251
3040 msgid "ssh variant 'simple' does not support -4"
3041 msgstr "ssh 变体 'simple' 不支持 -4"
3042
3030 -#: connect.c:1259
3043 +#: connect.c:1263
3044 msgid "ssh variant 'simple' does not support -6"
3045 msgstr "ssh 变体 'simple' 不支持 -6"
3046
3034 -#: connect.c:1276
3047 +#: connect.c:1280
3048 msgid "ssh variant 'simple' does not support setting port"
3049 msgstr "ssh 变体 'simple' 不支持设置端口"
3050
3038 -#: connect.c:1388
3051 +#: connect.c:1392
3052 #, c-format
3053 msgid "strange pathname '%s' blocked"
3054 msgstr "已阻止奇怪的路径名 '%s'"
3055
3043 -#: connect.c:1436
3056 +#: connect.c:1440
3057 msgid "unable to fork"
3058 msgstr "无法 fork"
3059
3047 -#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
3060 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
3061 msgid "Checking connectivity"
3062 msgstr "正在检查连通性"
3063
3051 -#: connected.c:120
3064 +#: connected.c:122
3065 msgid "Could not run 'git rev-list'"
3066 msgstr "不能执行 'git rev-list'"
3067
3055 -#: connected.c:144
3068 +#: connected.c:146
3069 msgid "failed write to rev-list"
3070 msgstr "写入 rev-list 失败"
3071
3059 -#: connected.c:149
3072 +#: connected.c:151
3073 msgid "failed to close rev-list's stdin"
3074 msgstr "关闭 rev-list 的标准输入失败"
3075
@@ -3197,17 +3210,17 @@ msgstr "拒绝使用缺少主机字段的凭据"
3210 msgid "refusing to work with credential missing protocol field"
3211 msgstr "拒绝使用缺少协议字段的凭据"
3212
3200 -#: credential.c:394
3213 +#: credential.c:395
3214 #, c-format
3215 msgid "url contains a newline in its %s component: %s"
3216 msgstr "URL 的 %s 组件中包含换行符：%s"
3217
3205 -#: credential.c:438
3218 +#: credential.c:439
3219 #, c-format
3220 msgid "url has no scheme: %s"
3221 msgstr "URL 没有 scheme：%s"
3222
3210 -#: credential.c:511
3223 +#: credential.c:512
3224 #, c-format
3225 msgid "credential url cannot be parsed: %s"
3226 msgstr "不能解析凭据 URL：%s"
@@ -3309,23 +3322,23 @@ msgstr "已标记 %d 个数据岛，结束。\n"
3322 msgid "unknown value for --diff-merges: %s"
3323 msgstr "未知的 --diff-merges 取值：%s"
3324
3312 -#: diff-lib.c:557
3325 +#: diff-lib.c:561
3326 msgid "--merge-base does not work with ranges"
3327 msgstr "--merge-base 不适用于范围"
3328
3316 -#: diff-lib.c:559
3329 +#: diff-lib.c:563
3330 msgid "--merge-base only works with commits"
3331 msgstr "--merge-base 仅适用于提交"
3332
3320 -#: diff-lib.c:576
3333 +#: diff-lib.c:580
3334 msgid "unable to get HEAD"
3335 msgstr "不能解析 HEAD"
3336
3324 -#: diff-lib.c:583
3337 +#: diff-lib.c:587
3338 msgid "no merge base found"
3339 msgstr "未找到合并基线"
3340
3328 -#: diff-lib.c:585
3341 +#: diff-lib.c:589
3342 msgid "multiple merge bases found"
3343 msgstr "找到了多条合并基线"
3344
@@ -3340,18 +3353,18 @@ msgid ""
3353 msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
3354
3355 # 译者：注意保持前导空格
3343 -#: diff.c:156
3356 +#: diff.c:157
3357 #, c-format
3358 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3359 msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
3360
3361 # 译者：注意保持前导空格
3349 -#: diff.c:161
3362 +#: diff.c:162
3363 #, c-format
3364 msgid " Unknown dirstat parameter '%s'\n"
3365 msgstr " 未知的 dirstat 参数 '%s'\n"
3366
3354 -#: diff.c:297
3367 +#: diff.c:298
3368 msgid ""
3369 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3370 "'dimmed-zebra', 'plain'"
@@ -3359,7 +3372,7 @@ msgstr ""
3372 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
3373 "'plain'"
3374
3362 -#: diff.c:325
3375 +#: diff.c:326
3376 #, c-format
3377 msgid ""
3378 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3368,18 +3381,18 @@ msgstr ""
3381 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
3382 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
3383
3371 -#: diff.c:333
3384 +#: diff.c:334
3385 msgid ""
3386 "color-moved-ws: allow-indentation-change cannot be combined with other "
3387 "whitespace modes"
3388 msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
3389
3377 -#: diff.c:410
3390 +#: diff.c:411
3391 #, c-format
3392 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3393 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
3394
3382 -#: diff.c:470
3395 +#: diff.c:471
3396 #, c-format
3397 msgid ""
3398 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3388,46 +3401,46 @@ msgstr ""
3401 "发现配置变量 'diff.dirstat' 中的错误：\n"
3402 "%s"
3403
3391 -#: diff.c:4282
3404 +#: diff.c:4290
3405 #, c-format
3406 msgid "external diff died, stopping at %s"
3407 msgstr "外部 diff 退出，停止在 %s"
3408
3396 -#: diff.c:4634
3409 +#: diff.c:4642
3410 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3411 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3412
3400 -#: diff.c:4637
3413 +#: diff.c:4645
3414 msgid "-G, -S and --find-object are mutually exclusive"
3415 msgstr "-G、-S 和 --find-object 是互斥的"
3416
3404 -#: diff.c:4640
3417 +#: diff.c:4648
3418 msgid ""
3419 "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
3420 msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"
3421
3409 -#: diff.c:4643
3422 +#: diff.c:4651
3423 msgid ""
3424 "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3425 "with -G and -S"
3426 msgstr "---pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
3427
3415 -#: diff.c:4722
3428 +#: diff.c:4730
3429 msgid "--follow requires exactly one pathspec"
3430 msgstr "--follow 明确要求只跟一个路径规格"
3431
3419 -#: diff.c:4770
3432 +#: diff.c:4778
3433 #, c-format
3434 msgid "invalid --stat value: %s"
3435 msgstr "无效的 --stat 值：%s"
3436
3424 -#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
3425 -#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
3437 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
3438 +#: parse-options.c:217 parse-options.c:221
3439 #, c-format
3440 msgid "%s expects a numerical value"
3441 msgstr "%s 期望一个数字值"
3442
3430 -#: diff.c:4807
3443 +#: diff.c:4815
3444 #, c-format
3445 msgid ""
3446 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3436,200 +3449,200 @@ msgstr ""
3449 "无法解析 --dirstat/-X 选项的参数：\n"
3450 "%s"
3451
3439 -#: diff.c:4892
3452 +#: diff.c:4900
3453 #, c-format
3454 msgid "unknown change class '%c' in --diff-filter=%s"
3455 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3456
3444 -#: diff.c:4916
3457 +#: diff.c:4924
3458 #, c-format
3459 msgid "unknown value after ws-error-highlight=%.*s"
3460 msgstr "ws-error-highlight=%.*s 之后未知的值"
3461
3449 -#: diff.c:4930
3462 +#: diff.c:4938
3463 #, c-format
3464 msgid "unable to resolve '%s'"
3465 msgstr "不能解析 '%s'"
3466
3454 -#: diff.c:4980 diff.c:4986
3467 +#: diff.c:4988 diff.c:4994
3468 #, c-format
3469 msgid "%s expects <n>/<m> form"
3470 msgstr "%s 期望 <n>/<m> 格式"
3471
3459 -#: diff.c:4998
3472 +#: diff.c:5006
3473 #, c-format
3474 msgid "%s expects a character, got '%s'"
3475 msgstr "%s 期望一个字符，得到 '%s'"
3476
3464 -#: diff.c:5019
3477 +#: diff.c:5027
3478 #, c-format
3479 msgid "bad --color-moved argument: %s"
3480 msgstr "坏的 --color-moved 参数：%s"
3481
3469 -#: diff.c:5038
3482 +#: diff.c:5046
3483 #, c-format
3484 msgid "invalid mode '%s' in --color-moved-ws"
3485 msgstr "--color-moved-ws 中的无效模式 '%s' "
3486
3474 -#: diff.c:5078
3487 +#: diff.c:5086
3488 msgid ""
3489 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3490 "\"histogram\""
3491 msgstr ""
3492 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3493
3481 -#: diff.c:5114 diff.c:5134
3494 +#: diff.c:5122 diff.c:5142
3495 #, c-format
3496 msgid "invalid argument to %s"
3497 msgstr "%s 的参数无效"
3498
3486 -#: diff.c:5238
3499 +#: diff.c:5246
3500 #, c-format
3501 msgid "invalid regex given to -I: '%s'"
3502 msgstr "选项 -I 的正则表达式无效：'%s'"
3503
3491 -#: diff.c:5287
3504 +#: diff.c:5295
3505 #, c-format
3506 msgid "failed to parse --submodule option parameter: '%s'"
3507 msgstr "无法解析 --submodule 选项的参数：'%s'"
3508
3496 -#: diff.c:5343
3509 +#: diff.c:5351
3510 #, c-format
3511 msgid "bad --word-diff argument: %s"
3512 msgstr "坏的 --word-diff 参数：%s"
3513
3501 -#: diff.c:5379
3514 +#: diff.c:5387
3515 msgid "Diff output format options"
3516 msgstr "差异输出格式化选项"
3517
3505 -#: diff.c:5381 diff.c:5387
3518 +#: diff.c:5389 diff.c:5395
3519 msgid "generate patch"
3520 msgstr "生成补丁"
3521
3509 -#: diff.c:5384 builtin/log.c:179
3522 +#: diff.c:5392 builtin/log.c:179
3523 msgid "suppress diff output"
3524 msgstr "不显示差异输出"
3525
3513 -#: diff.c:5389 diff.c:5503 diff.c:5510
3526 +#: diff.c:5397 diff.c:5511 diff.c:5518
3527 msgid "<n>"
3528 msgstr "<n>"
3529
3517 -#: diff.c:5390 diff.c:5393
3530 +#: diff.c:5398 diff.c:5401
3531 msgid "generate diffs with <n> lines context"
3532 msgstr "生成含 <n> 行上下文的差异"
3533
3521 -#: diff.c:5395
3534 +#: diff.c:5403
3535 msgid "generate the diff in raw format"
3536 msgstr "生成原始格式的差异"
3537
3525 -#: diff.c:5398
3538 +#: diff.c:5406
3539 msgid "synonym for '-p --raw'"
3540 msgstr "和 '-p --raw' 同义"
3541
3529 -#: diff.c:5402
3542 +#: diff.c:5410
3543 msgid "synonym for '-p --stat'"
3544 msgstr "和 '-p --stat' 同义"
3545
3533 -#: diff.c:5406
3546 +#: diff.c:5414
3547 msgid "machine friendly --stat"
3548 msgstr "机器友好的 --stat"
3549
3537 -#: diff.c:5409
3550 +#: diff.c:5417
3551 msgid "output only the last line of --stat"
3552 msgstr "只输出 --stat 的最后一行"
3553
3541 -#: diff.c:5411 diff.c:5419
3554 +#: diff.c:5419 diff.c:5427
3555 msgid "<param1,param2>..."
3556 msgstr "<参数1,参数2>..."
3557
3545 -#: diff.c:5412
3558 +#: diff.c:5420
3559 msgid ""
3560 "output the distribution of relative amount of changes for each sub-directory"
3561 msgstr "输出每个子目录相对变更的分布"
3562
3550 -#: diff.c:5416
3563 +#: diff.c:5424
3564 msgid "synonym for --dirstat=cumulative"
3565 msgstr "和 --dirstat=cumulative 同义"
3566
3554 -#: diff.c:5420
3567 +#: diff.c:5428
3568 msgid "synonym for --dirstat=files,param1,param2..."
3569 msgstr "是 --dirstat=files,param1,param2... 的同义词"
3570
3558 -#: diff.c:5424
3571 +#: diff.c:5432
3572 msgid "warn if changes introduce conflict markers or whitespace errors"
3573 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
3574
3562 -#: diff.c:5427
3575 +#: diff.c:5435
3576 msgid "condensed summary such as creations, renames and mode changes"
3577 msgstr "精简摘要，例如创建、重命名和模式变更"
3578
3566 -#: diff.c:5430
3579 +#: diff.c:5438
3580 msgid "show only names of changed files"
3581 msgstr "只显示变更文件的文件名"
3582
3570 -#: diff.c:5433
3583 +#: diff.c:5441
3584 msgid "show only names and status of changed files"
3585 msgstr "只显示变更文件的文件名和状态"
3586
3574 -#: diff.c:5435
3587 +#: diff.c:5443
3588 msgid "<width>[,<name-width>[,<count>]]"
3589 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3590
3578 -#: diff.c:5436
3591 +#: diff.c:5444
3592 msgid "generate diffstat"
3593 msgstr "生成差异统计（diffstat）"
3594
3582 -#: diff.c:5438 diff.c:5441 diff.c:5444
3595 +#: diff.c:5446 diff.c:5449 diff.c:5452
3596 msgid "<width>"
3597 msgstr "<宽度>"
3598
3586 -#: diff.c:5439
3599 +#: diff.c:5447
3600 msgid "generate diffstat with a given width"
3601 msgstr "使用给定的长度生成差异统计"
3602
3590 -#: diff.c:5442
3603 +#: diff.c:5450
3604 msgid "generate diffstat with a given name width"
3605 msgstr "使用给定的文件名长度生成差异统计"
3606
3594 -#: diff.c:5445
3607 +#: diff.c:5453
3608 msgid "generate diffstat with a given graph width"
3609 msgstr "使用给定的图形长度生成差异统计"
3610
3598 -#: diff.c:5447
3611 +#: diff.c:5455
3612 msgid "<count>"
3613 msgstr "<次数>"
3614
3602 -#: diff.c:5448
3615 +#: diff.c:5456
3616 msgid "generate diffstat with limited lines"
3617 msgstr "生成有限行数的差异统计"
3618
3606 -#: diff.c:5451
3619 +#: diff.c:5459
3620 msgid "generate compact summary in diffstat"
3621 msgstr "生成差异统计的简洁摘要"
3622
3610 -#: diff.c:5454
3623 +#: diff.c:5462
3624 msgid "output a binary diff that can be applied"
3625 msgstr "输出一个可以应用的二进制差异"
3626
3614 -#: diff.c:5457
3627 +#: diff.c:5465
3628 msgid "show full pre- and post-image object names on the \"index\" lines"
3629 msgstr "在 \"index\" 行显示完整的前后对象名称"
3630
3618 -#: diff.c:5459
3631 +#: diff.c:5467
3632 msgid "show colored diff"
3633 msgstr "显示带颜色的差异"
3634
3622 -#: diff.c:5460
3635 +#: diff.c:5468
3636 msgid "<kind>"
3637 msgstr "<类型>"
3638
3626 -#: diff.c:5461
3639 +#: diff.c:5469
3640 msgid ""
3641 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3642 "diff"
3643 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
3644
3632 -#: diff.c:5464
3645 +#: diff.c:5472
3646 msgid ""
3647 "do not munge pathnames and use NULs as output field terminators in --raw or "
3648 "--numstat"
@@ -3637,311 +3650,311 @@ msgstr ""
3650 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3651 "符"
3652
3640 -#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
3653 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
3654 msgid "<prefix>"
3655 msgstr "<前缀>"
3656
3644 -#: diff.c:5468
3657 +#: diff.c:5476
3658 msgid "show the given source prefix instead of \"a/\""
3659 msgstr "显示给定的源前缀取代 \"a/\""
3660
3648 -#: diff.c:5471
3661 +#: diff.c:5479
3662 msgid "show the given destination prefix instead of \"b/\""
3663 msgstr "显示给定的目标前缀取代 \"b/\""
3664
3652 -#: diff.c:5474
3665 +#: diff.c:5482
3666 msgid "prepend an additional prefix to every line of output"
3667 msgstr "输出的每一行附加前缀"
3668
3656 -#: diff.c:5477
3669 +#: diff.c:5485
3670 msgid "do not show any source or destination prefix"
3671 msgstr "不显示任何源和目标前缀"
3672
3660 -#: diff.c:5480
3673 +#: diff.c:5488
3674 msgid "show context between diff hunks up to the specified number of lines"
3675 msgstr "显示指定行数的差异块间的上下文"
3676
3664 -#: diff.c:5484 diff.c:5489 diff.c:5494
3677 +#: diff.c:5492 diff.c:5497 diff.c:5502
3678 msgid "<char>"
3679 msgstr "<字符>"
3680
3668 -#: diff.c:5485
3681 +#: diff.c:5493
3682 msgid "specify the character to indicate a new line instead of '+'"
3683 msgstr "指定一个字符取代 '+' 来表示新的一行"
3684
3672 -#: diff.c:5490
3685 +#: diff.c:5498
3686 msgid "specify the character to indicate an old line instead of '-'"
3687 msgstr "指定一个字符取代 '-' 来表示旧的一行"
3688
3676 -#: diff.c:5495
3689 +#: diff.c:5503
3690 msgid "specify the character to indicate a context instead of ' '"
3691 msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3692
3680 -#: diff.c:5498
3693 +#: diff.c:5506
3694 msgid "Diff rename options"
3695 msgstr "差异重命名选项"
3696
3684 -#: diff.c:5499
3697 +#: diff.c:5507
3698 msgid "<n>[/<m>]"
3699 msgstr "<n>[/<m>]"
3700
3688 -#: diff.c:5500
3701 +#: diff.c:5508
3702 msgid "break complete rewrite changes into pairs of delete and create"
3703 msgstr "将完全重写的变更打破为成对的删除和创建"
3704
3692 -#: diff.c:5504
3705 +#: diff.c:5512
3706 msgid "detect renames"
3707 msgstr "检测重命名"
3708
3696 -#: diff.c:5508
3709 +#: diff.c:5516
3710 msgid "omit the preimage for deletes"
3711 msgstr "省略删除操作的差异输出"
3712
3700 -#: diff.c:5511
3713 +#: diff.c:5519
3714 msgid "detect copies"
3715 msgstr "检测拷贝"
3716
3704 -#: diff.c:5515
3717 +#: diff.c:5523
3718 msgid "use unmodified files as source to find copies"
3719 msgstr "使用未修改的文件做为发现拷贝的源"
3720
3708 -#: diff.c:5517
3721 +#: diff.c:5525
3722 msgid "disable rename detection"
3723 msgstr "禁用重命名探测"
3724
3712 -#: diff.c:5520
3725 +#: diff.c:5528
3726 msgid "use empty blobs as rename source"
3727 msgstr "使用空的数据对象做为重命名的源"
3728
3716 -#: diff.c:5522
3729 +#: diff.c:5530
3730 msgid "continue listing the history of a file beyond renames"
3731 msgstr "继续列出文件重命名以外的历史记录"
3732
3720 -#: diff.c:5525
3733 +#: diff.c:5533
3734 msgid ""
3735 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3736 "given limit"
3737 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
3738
3726 -#: diff.c:5527
3739 +#: diff.c:5535
3740 msgid "Diff algorithm options"
3741 msgstr "差异算法选项"
3742
3730 -#: diff.c:5529
3743 +#: diff.c:5537
3744 msgid "produce the smallest possible diff"
3745 msgstr "生成尽可能小的差异"
3746
3734 -#: diff.c:5532
3747 +#: diff.c:5540
3748 msgid "ignore whitespace when comparing lines"
3749 msgstr "行比较时忽略空白字符"
3750
3738 -#: diff.c:5535
3751 +#: diff.c:5543
3752 msgid "ignore changes in amount of whitespace"
3753 msgstr "忽略空白字符的变更"
3754
3742 -#: diff.c:5538
3755 +#: diff.c:5546
3756 msgid "ignore changes in whitespace at EOL"
3757 msgstr "忽略行尾的空白字符变更"
3758
3746 -#: diff.c:5541
3759 +#: diff.c:5549
3760 msgid "ignore carrier-return at the end of line"
3761 msgstr "忽略行尾的回车符（CR）"
3762
3750 -#: diff.c:5544
3763 +#: diff.c:5552
3764 msgid "ignore changes whose lines are all blank"
3765 msgstr "忽略整行都是空白的变更"
3766
3754 -#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
3767 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
3768 msgid "<regex>"
3769 msgstr "<正则>"
3770
3758 -#: diff.c:5547
3771 +#: diff.c:5555
3772 msgid "ignore changes whose all lines match <regex>"
3773 msgstr "忽略所有行都和正则表达式匹配的变更"
3774
3762 -#: diff.c:5550
3775 +#: diff.c:5558
3776 msgid "heuristic to shift diff hunk boundaries for easy reading"
3777 msgstr "启发式转换差异边界以便阅读"
3778
3766 -#: diff.c:5553
3779 +#: diff.c:5561
3780 msgid "generate diff using the \"patience diff\" algorithm"
3781 msgstr "使用 \"patience diff\" 算法生成差异"
3782
3770 -#: diff.c:5557
3783 +#: diff.c:5565
3784 msgid "generate diff using the \"histogram diff\" algorithm"
3785 msgstr "使用 \"histogram diff\" 算法生成差异"
3786
3774 -#: diff.c:5559
3787 +#: diff.c:5567
3788 msgid "<algorithm>"
3789 msgstr "<算法>"
3790
3778 -#: diff.c:5560
3791 +#: diff.c:5568
3792 msgid "choose a diff algorithm"
3793 msgstr "选择一个差异算法"
3794
3782 -#: diff.c:5562
3795 +#: diff.c:5570
3796 msgid "<text>"
3797 msgstr "<文本>"
3798
3786 -#: diff.c:5563
3799 +#: diff.c:5571
3800 msgid "generate diff using the \"anchored diff\" algorithm"
3801 msgstr "使用 \"anchored diff\" 算法生成差异"
3802
3790 -#: diff.c:5565 diff.c:5574 diff.c:5577
3803 +#: diff.c:5573 diff.c:5582 diff.c:5585
3804 msgid "<mode>"
3805 msgstr "<模式>"
3806
3794 -#: diff.c:5566
3807 +#: diff.c:5574
3808 msgid "show word diff, using <mode> to delimit changed words"
3809 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
3810
3798 -#: diff.c:5569
3811 +#: diff.c:5577
3812 msgid "use <regex> to decide what a word is"
3813 msgstr "使用 <正则表达式> 确定何为一个词"
3814
3802 -#: diff.c:5572
3815 +#: diff.c:5580
3816 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3817 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3818
3806 -#: diff.c:5575
3819 +#: diff.c:5583
3820 msgid "moved lines of code are colored differently"
3821 msgstr "移动的代码行用不同方式着色"
3822
3810 -#: diff.c:5578
3823 +#: diff.c:5586
3824 msgid "how white spaces are ignored in --color-moved"
3825 msgstr "在 --color-moved 下如何忽略空白字符"
3826
3814 -#: diff.c:5581
3827 +#: diff.c:5589
3828 msgid "Other diff options"
3829 msgstr "其它差异选项"
3830
3818 -#: diff.c:5583
3831 +#: diff.c:5591
3832 msgid "when run from subdir, exclude changes outside and show relative paths"
3833 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
3834
3822 -#: diff.c:5587
3835 +#: diff.c:5595
3836 msgid "treat all files as text"
3837 msgstr "把所有文件当做文本处理"
3838
3826 -#: diff.c:5589
3839 +#: diff.c:5597
3840 msgid "swap two inputs, reverse the diff"
3841 msgstr "交换两个输入，反转差异"
3842
3830 -#: diff.c:5591
3843 +#: diff.c:5599
3844 msgid "exit with 1 if there were differences, 0 otherwise"
3845 msgstr "有差异时退出码为 1，否则为 0"
3846
3834 -#: diff.c:5593
3847 +#: diff.c:5601
3848 msgid "disable all output of the program"
3849 msgstr "禁用本程序的所有输出"
3850
3838 -#: diff.c:5595
3851 +#: diff.c:5603
3852 msgid "allow an external diff helper to be executed"
3853 msgstr "允许执行一个外置的差异助手"
3854
3842 -#: diff.c:5597
3855 +#: diff.c:5605
3856 msgid "run external text conversion filters when comparing binary files"
3857 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
3858
3846 -#: diff.c:5599
3859 +#: diff.c:5607
3860 msgid "<when>"
3861 msgstr "<何时>"
3862
3850 -#: diff.c:5600
3863 +#: diff.c:5608
3864 msgid "ignore changes to submodules in the diff generation"
3865 msgstr "在生成差异时，忽略子模组的更改"
3866
3854 -#: diff.c:5603
3867 +#: diff.c:5611
3868 msgid "<format>"
3869 msgstr "<格式>"
3870
3858 -#: diff.c:5604
3871 +#: diff.c:5612
3872 msgid "specify how differences in submodules are shown"
3873 msgstr "指定子模组的差异如何显示"
3874
3862 -#: diff.c:5608
3875 +#: diff.c:5616
3876 msgid "hide 'git add -N' entries from the index"
3877 msgstr "隐藏索引中 'git add -N' 条目"
3878
3866 -#: diff.c:5611
3879 +#: diff.c:5619
3880 msgid "treat 'git add -N' entries as real in the index"
3881 msgstr "将索引中 'git add -N' 条目当做真实的"
3882
3870 -#: diff.c:5613
3883 +#: diff.c:5621
3884 msgid "<string>"
3885 msgstr "<字符串>"
3886
3874 -#: diff.c:5614
3887 +#: diff.c:5622
3888 msgid ""
3889 "look for differences that change the number of occurrences of the specified "
3890 "string"
3891 msgstr "查找改变了指定字符串出现次数的差异"
3892
3880 -#: diff.c:5617
3893 +#: diff.c:5625
3894 msgid ""
3895 "look for differences that change the number of occurrences of the specified "
3896 "regex"
3897 msgstr "查找改变指定正则匹配出现次数的差异"
3898
3886 -#: diff.c:5620
3899 +#: diff.c:5628
3900 msgid "show all changes in the changeset with -S or -G"
3901 msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3902
3890 -#: diff.c:5623
3903 +#: diff.c:5631
3904 msgid "treat <string> in -S as extended POSIX regular expression"
3905 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3906
3894 -#: diff.c:5626
3907 +#: diff.c:5634
3908 msgid "control the order in which files appear in the output"
3909 msgstr "控制输出中的文件显示顺序"
3910
3898 -#: diff.c:5627 diff.c:5630
3911 +#: diff.c:5635 diff.c:5638
3912 msgid "<path>"
3913 msgstr "<路径>"
3914
3902 -#: diff.c:5628
3915 +#: diff.c:5636
3916 msgid "show the change in the specified path first"
3917 msgstr "先显示指定路径的变更"
3918
3906 -#: diff.c:5631
3919 +#: diff.c:5639
3920 msgid "skip the output to the specified path"
3921 msgstr "跳过指定路径的输出"
3922
3910 -#: diff.c:5633
3923 +#: diff.c:5641
3924 msgid "<object-id>"
3925 msgstr "<对象 ID>"
3926
3914 -#: diff.c:5634
3927 +#: diff.c:5642
3928 msgid ""
3929 "look for differences that change the number of occurrences of the specified "
3930 "object"
3931 msgstr "查找改变指定对象出现次数的差异"
3932
3920 -#: diff.c:5636
3933 +#: diff.c:5644
3934 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3935 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3936
3924 -#: diff.c:5637
3937 +#: diff.c:5645
3938 msgid "select files by diff type"
3939 msgstr "通过差异类型选择文件"
3940
3928 -#: diff.c:5639
3941 +#: diff.c:5647
3942 msgid "<file>"
3943 msgstr "<文件>"
3944
3932 -#: diff.c:5640
3945 +#: diff.c:5648
3946 msgid "Output to a specific file"
3947 msgstr "输出到一个指定的文件"
3948
3936 -#: diff.c:6298
3949 +#: diff.c:6306
3950 msgid "exhaustive rename detection was skipped due to too many files."
3951 msgstr "由于文件太多，跳过详尽的重命名检查。"
3952
3940 -#: diff.c:6301
3953 +#: diff.c:6309
3954 msgid "only found copies from modified paths due to too many files."
3955 msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
3956
3944 -#: diff.c:6304
3957 +#: diff.c:6312
3958 #, c-format
3959 msgid ""
3960 "you may want to set your %s variable to at least %d and retry the command."
@@ -3952,7 +3965,7 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令
3965 msgid "failed to read orderfile '%s'"
3966 msgstr "读取排序文件 '%s' 失败"
3967
3955 -#: diffcore-rename.c:1514
3968 +#: diffcore-rename.c:1564
3969 msgid "Performing inexact rename detection"
3970 msgstr "正在进行非精确的重命名探测"
3971
@@ -3990,331 +4003,404 @@ msgstr "禁止 cone 模式匹配"
4003 msgid "cannot use %s as an exclude file"
4004 msgstr "不能将 %s 用作排除文件"
4005
3993 -#: dir.c:2351
4006 +#: dir.c:2464
4007 #, c-format
4008 msgid "could not open directory '%s'"
4009 msgstr "不能打开目录 '%s'"
4010
3998 -#: dir.c:2653
4011 +#: dir.c:2766
4012 msgid "failed to get kernel name and information"
4013 msgstr "无法获得内核名称和信息"
4014
4002 -#: dir.c:2777
4015 +#: dir.c:2890
4016 msgid "untracked cache is disabled on this system or location"
4017 msgstr "缓存未跟踪文件在本系统或位置中被禁用"
4018
4006 -#: dir.c:3610
4019 +#: dir.c:3158
4020 +msgid ""
4021 +"No directory name could be guessed.\n"
4022 +"Please specify a directory on the command line"
4023 +msgstr ""
4024 +"无法猜到目录名。\n"
4025 +"请在命令行指定一个目录"
4026 +
4027 +#: dir.c:3837
4028 #, c-format
4029 msgid "index file corrupt in repo %s"
4030 msgstr "仓库 %s 中的索引文件损坏"
4031
4011 -#: dir.c:3657 dir.c:3662
4032 +#: dir.c:3884 dir.c:3889
4033 #, c-format
4034 msgid "could not create directories for %s"
4035 msgstr "不能为 %s 创建目录"
4036
4016 -#: dir.c:3691
4037 +#: dir.c:3918
4038 #, c-format
4039 msgid "could not migrate git directory from '%s' to '%s'"
4040 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
4041
4021 -#: editor.c:74
4042 +#: editor.c:77
4043 #, c-format
4044 msgid "hint: Waiting for your editor to close the file...%c"
4045 msgstr "提示：等待您的编辑器关闭文件...%c"
4046
4026 -#: entry.c:176
4047 +#: entry.c:177
4048 msgid "Filtering content"
4049 msgstr "过滤内容"
4050
4030 -#: entry.c:497
4051 +#: entry.c:498
4052 #, c-format
4053 msgid "could not stat file '%s'"
4054 msgstr "不能对文件 '%s' 调用 stat"
4055
4035 -#: environment.c:152
4056 +#: environment.c:143
4057 #, c-format
4058 msgid "bad git namespace path \"%s\""
4059 msgstr "错误的 git 名字空间路径 \"%s\""
4060
4040 -#: environment.c:334
4041 -#, c-format
4042 -msgid "could not set GIT_DIR to '%s'"
4043 -msgstr "不能设置 GIT_DIR 为 '%s'"
4044 -
4061 #: exec-cmd.c:363
4062 #, c-format
4063 msgid "too many args to run %s"
4064 msgstr "执行 %s 的参数太多"
4065
4050 -#: fetch-pack.c:182
4066 +#: fetch-pack.c:193
4067 msgid "git fetch-pack: expected shallow list"
4068 msgstr "git fetch-pack：应为 shallow 列表"
4069
4054 -#: fetch-pack.c:185
4070 +#: fetch-pack.c:196
4071 msgid "git fetch-pack: expected a flush packet after shallow list"
4072 msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
4073
4058 -#: fetch-pack.c:196
4074 +#: fetch-pack.c:207
4075 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
4076 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
4077
4062 -#: fetch-pack.c:216
4078 +#: fetch-pack.c:227
4079 #, c-format
4080 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
4081 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
4082
4067 -#: fetch-pack.c:227
4083 +#: fetch-pack.c:238
4084 msgid "unable to write to remote"
4085 msgstr "无法写到远程"
4086
4071 -#: fetch-pack.c:288
4087 +#: fetch-pack.c:299
4088 msgid "--stateless-rpc requires multi_ack_detailed"
4089 msgstr "--stateless-rpc 需要 multi_ack_detailed"
4090
4075 -#: fetch-pack.c:383 fetch-pack.c:1423
4091 +#: fetch-pack.c:394 fetch-pack.c:1434
4092 #, c-format
4093 msgid "invalid shallow line: %s"
4094 msgstr "无效的 shallow 信息：%s"
4095
4080 -#: fetch-pack.c:389 fetch-pack.c:1429
4096 +#: fetch-pack.c:400 fetch-pack.c:1440
4097 #, c-format
4098 msgid "invalid unshallow line: %s"
4099 msgstr "无效的 unshallow 信息：%s"
4100
4085 -#: fetch-pack.c:391 fetch-pack.c:1431
4101 +#: fetch-pack.c:402 fetch-pack.c:1442
4102 #, c-format
4103 msgid "object not found: %s"
4104 msgstr "对象未找到：%s"
4105
4090 -#: fetch-pack.c:394 fetch-pack.c:1434
4106 +#: fetch-pack.c:405 fetch-pack.c:1445
4107 #, c-format
4108 msgid "error in object: %s"
4109 msgstr "对象中出错：%s"
4110
4095 -#: fetch-pack.c:396 fetch-pack.c:1436
4111 +#: fetch-pack.c:407 fetch-pack.c:1447
4112 #, c-format
4113 msgid "no shallow found: %s"
4114 msgstr "未发现 shallow：%s"
4115
4100 -#: fetch-pack.c:399 fetch-pack.c:1440
4116 +#: fetch-pack.c:410 fetch-pack.c:1451
4117 #, c-format
4118 msgid "expected shallow/unshallow, got %s"
4119 msgstr "应为 shallow/unshallow，却得到 %s"
4120
4105 -#: fetch-pack.c:439
4121 +#: fetch-pack.c:450
4122 #, c-format
4123 msgid "got %s %d %s"
4124 msgstr "得到 %s %d %s"
4125
4110 -#: fetch-pack.c:456
4126 +#: fetch-pack.c:467
4127 #, c-format
4128 msgid "invalid commit %s"
4129 msgstr "无效提交 %s"
4130
4115 -#: fetch-pack.c:487
4131 +#: fetch-pack.c:498
4132 msgid "giving up"
4133 msgstr "放弃"
4134
4119 -#: fetch-pack.c:500 progress.c:339
4135 +#: fetch-pack.c:511 progress.c:339
4136 msgid "done"
4137 msgstr "完成"
4138
4123 -#: fetch-pack.c:512
4139 +#: fetch-pack.c:523
4140 #, c-format
4141 msgid "got %s (%d) %s"
4142 msgstr "得到 %s (%d) %s"
4143
4128 -#: fetch-pack.c:548
4144 +#: fetch-pack.c:559
4145 #, c-format
4146 msgid "Marking %s as complete"
4147 msgstr "标记 %s 为完成"
4148
4133 -#: fetch-pack.c:763
4149 +#: fetch-pack.c:774
4150 #, c-format
4151 msgid "already have %s (%s)"
4152 msgstr "已经有 %s（%s）"
4153
4138 -#: fetch-pack.c:849
4154 +#: fetch-pack.c:860
4155 msgid "fetch-pack: unable to fork off sideband demultiplexer"
4156 msgstr "fetch-pack：无法派生 sideband 多路输出"
4157
4142 -#: fetch-pack.c:857
4158 +#: fetch-pack.c:868
4159 msgid "protocol error: bad pack header"
4160 msgstr "协议错误：坏的包头"
4161
4146 -#: fetch-pack.c:951
4162 +#: fetch-pack.c:962
4163 #, c-format
4164 msgid "fetch-pack: unable to fork off %s"
4165 msgstr "fetch-pack：无法派生进程 %s"
4166
4151 -#: fetch-pack.c:957
4167 +#: fetch-pack.c:968
4168 msgid "fetch-pack: invalid index-pack output"
4169 msgstr "fetch-pack：无效的 index-pack 输出"
4170
4155 -#: fetch-pack.c:974
4171 +#: fetch-pack.c:985
4172 #, c-format
4173 msgid "%s failed"
4174 msgstr "%s 失败"
4175
4160 -#: fetch-pack.c:976
4176 +#: fetch-pack.c:987
4177 msgid "error in sideband demultiplexer"
4178 msgstr "sideband 多路输出出错"
4179
4164 -#: fetch-pack.c:1019
4180 +#: fetch-pack.c:1030
4181 #, c-format
4182 msgid "Server version is %.*s"
4183 msgstr "服务器版本 %.*s"
4184
4169 -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
4170 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
4171 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
4172 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
4185 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
4186 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
4187 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
4188 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
4189 #, c-format
4190 msgid "Server supports %s"
4191 msgstr "服务器支持 %s"
4192
4177 -#: fetch-pack.c:1029
4193 +#: fetch-pack.c:1040
4194 msgid "Server does not support shallow clients"
4195 msgstr "服务器不支持浅客户端"
4196
4181 -#: fetch-pack.c:1089
4197 +#: fetch-pack.c:1100
4198 msgid "Server does not support --shallow-since"
4199 msgstr "服务器不支持 --shallow-since"
4200
4185 -#: fetch-pack.c:1094
4201 +#: fetch-pack.c:1105
4202 msgid "Server does not support --shallow-exclude"
4203 msgstr "服务器不支持 --shallow-exclude"
4204
4189 -#: fetch-pack.c:1098
4205 +#: fetch-pack.c:1109
4206 msgid "Server does not support --deepen"
4207 msgstr "服务器不支持 --deepen"
4208
4193 -#: fetch-pack.c:1100
4209 +#: fetch-pack.c:1111
4210 msgid "Server does not support this repository's object format"
4211 msgstr "服务器不支持这个仓库的对象格式"
4212
4197 -#: fetch-pack.c:1113
4213 +#: fetch-pack.c:1124
4214 msgid "no common commits"
4215 msgstr "没有共同的提交"
4216
4201 -#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
4217 +#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
4218 msgid "source repository is shallow, reject to clone."
4219 msgstr "源仓库是浅克隆，拒绝克隆。"
4220
4205 -#: fetch-pack.c:1128 fetch-pack.c:1660
4221 +#: fetch-pack.c:1139 fetch-pack.c:1671
4222 msgid "git fetch-pack: fetch failed."
4223 msgstr "git fetch-pack：获取失败。"
4224
4209 -#: fetch-pack.c:1242
4225 +#: fetch-pack.c:1253
4226 #, c-format
4227 msgid "mismatched algorithms: client %s; server %s"
4228 msgstr "不匹配的算法：客户端 %s，服务端 %s"
4229
4214 -#: fetch-pack.c:1246
4230 +#: fetch-pack.c:1257
4231 #, c-format
4232 msgid "the server does not support algorithm '%s'"
4233 msgstr "服务器不支持算法 '%s'"
4234
4219 -#: fetch-pack.c:1279
4235 +#: fetch-pack.c:1290
4236 msgid "Server does not support shallow requests"
4237 msgstr "服务器不支持浅克隆请求"
4238
4223 -#: fetch-pack.c:1286
4239 +#: fetch-pack.c:1297
4240 msgid "Server supports filter"
4241 msgstr "服务器支持 filter"
4242
4227 -#: fetch-pack.c:1329 fetch-pack.c:2043
4243 +#: fetch-pack.c:1340 fetch-pack.c:2053
4244 msgid "unable to write request to remote"
4245 msgstr "无法将请求写到远程"
4246
4231 -#: fetch-pack.c:1347
4247 +#: fetch-pack.c:1358
4248 #, c-format
4249 msgid "error reading section header '%s'"
4250 msgstr "读取节标题 '%s' 出错"
4251
4236 -#: fetch-pack.c:1353
4252 +#: fetch-pack.c:1364
4253 #, c-format
4254 msgid "expected '%s', received '%s'"
4255 msgstr "预期 '%s'，得到 '%s'"
4256
4241 -#: fetch-pack.c:1387
4257 +#: fetch-pack.c:1398
4258 #, c-format
4259 msgid "unexpected acknowledgment line: '%s'"
4260 msgstr "意外的确认行：'%s'"
4261
4246 -#: fetch-pack.c:1392
4262 +#: fetch-pack.c:1403
4263 #, c-format
4264 msgid "error processing acks: %d"
4265 msgstr "处理 ack 出错：%d"
4266
4251 -#: fetch-pack.c:1402
4267 +#: fetch-pack.c:1413
4268 msgid "expected packfile to be sent after 'ready'"
4269 msgstr "预期在 'ready' 之后发送 packfile"
4270
4255 -#: fetch-pack.c:1404
4271 +#: fetch-pack.c:1415
4272 msgid "expected no other sections to be sent after no 'ready'"
4273 msgstr "在没有 'ready' 不应该发送其它小节"
4274
4259 -#: fetch-pack.c:1445
4275 +#: fetch-pack.c:1456
4276 #, c-format
4277 msgid "error processing shallow info: %d"
4278 msgstr "处理浅克隆信息出错：%d"
4279
4264 -#: fetch-pack.c:1494
4280 +#: fetch-pack.c:1505
4281 #, c-format
4282 msgid "expected wanted-ref, got '%s'"
4283 msgstr "预期 wanted-ref，得到 '%s'"
4284
4269 -#: fetch-pack.c:1499
4285 +#: fetch-pack.c:1510
4286 #, c-format
4287 msgid "unexpected wanted-ref: '%s'"
4288 msgstr "意外的 wanted-ref：'%s'"
4289
4274 -#: fetch-pack.c:1504
4290 +#: fetch-pack.c:1515
4291 #, c-format
4292 msgid "error processing wanted refs: %d"
4293 msgstr "处理要获取的引用出错：%d"
4294
4279 -#: fetch-pack.c:1534
4295 +#: fetch-pack.c:1545
4296 msgid "git fetch-pack: expected response end packet"
4297 msgstr "git fetch-pack：预期响应结束包"
4298
4283 -#: fetch-pack.c:1939
4299 +#: fetch-pack.c:1949
4300 msgid "no matching remote head"
4301 msgstr "没有匹配的远程分支"
4302
4287 -#: fetch-pack.c:1962 builtin/clone.c:697
4303 +#: fetch-pack.c:1972 builtin/clone.c:581
4304 msgid "remote did not send all necessary objects"
4305 msgstr "远程没有发送所有必需的对象"
4306
4291 -#: fetch-pack.c:2065
4307 +#: fetch-pack.c:2075
4308 msgid "unexpected 'ready' from remote"
4309 msgstr "来自远程的意外的 'ready'"
4310
4295 -#: fetch-pack.c:2088
4311 +#: fetch-pack.c:2098
4312 #, c-format
4313 msgid "no such remote ref %s"
4314 msgstr "没有这样的远程引用 %s"
4315
4300 -#: fetch-pack.c:2091
4316 +#: fetch-pack.c:2101
4317 #, c-format
4318 msgid "Server does not allow request for unadvertised object %s"
4319 msgstr "服务器不允许请求未公开的对象 %s"
4320
4305 -#: gpg-interface.c:273
4321 +#: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900
4322 +#: gpg-interface.c:916
4323 msgid "could not create temporary file"
4324 msgstr "不能创建临时文件"
4325
4309 -#: gpg-interface.c:276
4326 +#: gpg-interface.c:332 gpg-interface.c:452
4327 #, c-format
4328 msgid "failed writing detached signature to '%s'"
4329 msgstr "无法将分离式签名写入 '%s'"
4330
4314 -#: gpg-interface.c:470
4331 +#: gpg-interface.c:443
4332 +msgid ""
4333 +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
4334 +"signature verification"
4335 +msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
4336 +
4337 +#: gpg-interface.c:467
4338 +msgid ""
4339 +"ssh-keygen -Y find-principals/verify is needed for ssh signature "
4340 +"verification (available in openssh version 8.2p1+)"
4341 +msgstr ""
4342 +"ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
4343 +"（openssh 8.2p1+ 版本可用）"
4344 +
4345 +#: gpg-interface.c:521
4346 +#, c-format
4347 +msgid "ssh signing revocation file configured but not found: %s"
4348 +msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
4349 +
4350 +#: gpg-interface.c:574
4351 +#, c-format
4352 +msgid "bad/incompatible signature '%s'"
4353 +msgstr "坏的/不兼容的签名 '%s‘"
4354 +
4355 +#: gpg-interface.c:733 gpg-interface.c:738
4356 +#, c-format
4357 +msgid "failed to get the ssh fingerprint for key '%s'"
4358 +msgstr "无法得到密钥 '%s' 的 ssh 指纹"
4359 +
4360 +#: gpg-interface.c:760
4361 +msgid ""
4362 +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
4363 +msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
4364 +
4365 +#: gpg-interface.c:778
4366 +#, c-format
4367 +msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"
4368 +msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"
4369 +
4370 +#: gpg-interface.c:784
4371 +#, c-format
4372 +msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
4373 +msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
4374 +
4375 +#: gpg-interface.c:872
4376 msgid "gpg failed to sign the data"
4377 msgstr "gpg 数据签名失败"
4378
4379 +#: gpg-interface.c:893
4380 +msgid "user.signingkey needs to be set for ssh signing"
4381 +msgstr "ssh 签名需要设置 user.signingkey"
4382 +
4383 +#: gpg-interface.c:904
4384 +#, c-format
4385 +msgid "failed writing ssh signing key to '%s'"
4386 +msgstr "无法将 ssh 签名密钥写入 '%s'"
4387 +
4388 +#: gpg-interface.c:922
4389 +#, c-format
4390 +msgid "failed writing ssh signing key buffer to '%s'"
4391 +msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
4392 +
4393 +#: gpg-interface.c:940
4394 +msgid ""
4395 +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
4396 +"8.2p1+)"
4397 +msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）"
4398 +
4399 +#: gpg-interface.c:952
4400 +#, c-format
4401 +msgid "failed reading ssh signing data buffer from '%s'"
4402 +msgstr "无法从 '%s' 读入 ssh 签名数据"
4403 +
4404 #: graph.c:98
4405 #, c-format
4406 msgid "ignored invalid color '%.*s' in log.graphColors"
@@ -4328,109 +4414,109 @@ msgstr ""
4414 "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
4415 "功能"
4416
4331 -#: grep.c:1895
4417 +#: grep.c:1907
4418 #, c-format
4419 msgid "'%s': unable to read %s"
4420 msgstr "'%s'：无法读取 %s"
4421
4336 -#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
4422 +#: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
4423 #: builtin/rm.c:136
4424 #, c-format
4425 msgid "failed to stat '%s'"
4426 msgstr "对 '%s' 调用 stat 失败"
4427
4342 -#: grep.c:1923
4428 +#: grep.c:1935
4429 #, c-format
4430 msgid "'%s': short read"
4431 msgstr "'%s'：读取不完整"
4432
4347 -#: help.c:23
4433 +#: help.c:24
4434 msgid "start a working area (see also: git help tutorial)"
4435 msgstr "开始一个工作区（参见：git help tutorial）"
4436
4351 -#: help.c:24
4437 +#: help.c:25
4438 msgid "work on the current change (see also: git help everyday)"
4439 msgstr "在当前变更上工作（参见：git help everyday）"
4440
4355 -#: help.c:25
4441 +#: help.c:26
4442 msgid "examine the history and state (see also: git help revisions)"
4443 msgstr "检查历史和状态（参见：git help revisions）"
4444
4359 -#: help.c:26
4445 +#: help.c:27
4446 msgid "grow, mark and tweak your common history"
4447 msgstr "扩展、标记和调校您的历史记录"
4448
4363 -#: help.c:27
4449 +#: help.c:28
4450 msgid "collaborate (see also: git help workflows)"
4451 msgstr "协同（参见：git help workflows）"
4452
4367 -#: help.c:31
4453 +#: help.c:32
4454 msgid "Main Porcelain Commands"
4455 msgstr "主要的上层命令"
4456
4371 -#: help.c:32
4457 +#: help.c:33
4458 msgid "Ancillary Commands / Manipulators"
4459 msgstr "辅助命令/操作者"
4460
4375 -#: help.c:33
4461 +#: help.c:34
4462 msgid "Ancillary Commands / Interrogators"
4463 msgstr "辅助命令/询问者"
4464
4379 -#: help.c:34
4465 +#: help.c:35
4466 msgid "Interacting with Others"
4467 msgstr "与其它系统交互"
4468
4383 -#: help.c:35
4469 +#: help.c:36
4470 msgid "Low-level Commands / Manipulators"
4471 msgstr "低级命令/操作者"
4472
4387 -#: help.c:36
4473 +#: help.c:37
4474 msgid "Low-level Commands / Interrogators"
4475 msgstr "低级命令/询问者"
4476
4391 -#: help.c:37
4477 +#: help.c:38
4478 msgid "Low-level Commands / Syncing Repositories"
4479 msgstr "低级命令/同步仓库"
4480
4395 -#: help.c:38
4481 +#: help.c:39
4482 msgid "Low-level Commands / Internal Helpers"
4483 msgstr "低级命令/内部助手"
4484
4399 -#: help.c:300
4485 +#: help.c:313
4486 #, c-format
4487 msgid "available git commands in '%s'"
4488 msgstr "在 '%s' 下可用的 git 命令"
4489
4404 -#: help.c:307
4490 +#: help.c:320
4491 msgid "git commands available from elsewhere on your $PATH"
4492 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
4493
4408 -#: help.c:316
4494 +#: help.c:329
4495 msgid "These are common Git commands used in various situations:"
4496 msgstr "这些是各种场合常见的 Git 命令："
4497
4412 -#: help.c:365 git.c:100
4498 +#: help.c:378 git.c:100
4499 #, c-format
4500 msgid "unsupported command listing type '%s'"
4501 msgstr "不支持的命令列表类型 '%s'"
4502
4417 -#: help.c:405
4503 +#: help.c:418
4504 msgid "The Git concept guides are:"
4505 msgstr "Git 概念向导有："
4506
4421 -#: help.c:429
4507 +#: help.c:442
4508 msgid "See 'git help <command>' to read about a specific subcommand"
4509 msgstr "执行　'git help <command>' 来查看特定子命令"
4510
4425 -#: help.c:434
4511 +#: help.c:447
4512 msgid "External commands"
4513 msgstr "外部命令"
4514
4429 -#: help.c:449
4515 +#: help.c:462
4516 msgid "Command aliases"
4517 msgstr "命令别名"
4518
4433 -#: help.c:527
4519 +#: help.c:543
4520 #, c-format
4521 msgid ""
4522 "'%s' appears to be a git command, but we were not\n"
@@ -4439,31 +4525,36 @@ msgstr ""
4525 "'%s' 像是一个 git 命令，但却无法运行。\n"
4526 "可能是 git-%s 受损？"
4527
4442 -#: help.c:543 help.c:631
4528 +#: help.c:565 help.c:662
4529 #, c-format
4530 msgid "git: '%s' is not a git command. See 'git --help'."
4531 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
4532
4447 -#: help.c:591
4533 +#: help.c:613
4534 msgid "Uh oh. Your system reports no Git commands at all."
4535 msgstr "唉呀，您的系统中未发现 Git 命令。"
4536
4451 -#: help.c:613
4537 +#: help.c:635
4538 #, c-format
4539 msgid "WARNING: You called a Git command named '%s', which does not exist."
4540 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
4541
4456 -#: help.c:618
4542 +#: help.c:640
4543 #, c-format
4544 msgid "Continuing under the assumption that you meant '%s'."
4459 -msgstr "假定你想要的是 '%s' 并继续。"
4545 +msgstr "假定您想要的是 '%s' 并继续。"
4546 +
4547 +#: help.c:646
4548 +#, c-format
4549 +msgid "Run '%s' instead? (y/N)"
4550 +msgstr "取而代之运行 '%s' ？ (y/N)"
4551
4461 -#: help.c:623
4552 +#: help.c:654
4553 #, c-format
4554 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4464 -msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
4555 +msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
4556
4466 -#: help.c:635
4557 +#: help.c:666
4558 msgid ""
4559 "\n"
4560 "The most similar command is"
@@ -4477,16 +4568,16 @@ msgstr[1] ""
4568 "\n"
4569 "最相似的命令是"
4570
4480 -#: help.c:675
4571 +#: help.c:706
4572 msgid "git version [<options>]"
4573 msgstr "git version [<选项>]"
4574
4484 -#: help.c:730
4575 +#: help.c:761
4576 #, c-format
4577 msgid "%s: %s - %s"
4578 msgstr "%s：%s - %s"
4579
4489 -#: help.c:734
4580 +#: help.c:765
4581 msgid ""
4582 "\n"
4583 "Did you mean this?"
@@ -4500,6 +4591,15 @@ msgstr[1] ""
4591 "\n"
4592 "您指的是这其中的某一个么？"
4593
4594 +#: hook.c:27
4595 +#, c-format
4596 +msgid ""
4597 +"The '%s' hook was ignored because it's not set as executable.\n"
4598 +"You can disable this warning with `git config advice.ignoredHook false`."
4599 +msgstr ""
4600 +"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
4601 +"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
4602 +
4603 #: ident.c:353
4604 msgid "Author identity unknown\n"
4605 msgstr "作者身份未知\n"
@@ -4523,7 +4623,7 @@ msgid ""
4623 "\n"
4624 msgstr ""
4625 "\n"
4526 -"*** 请告诉我你是谁。\n"
4626 +"*** 请告诉我您是谁。\n"
4627 "\n"
4628 "运行\n"
4629 "\n"
@@ -4561,7 +4661,7 @@ msgstr "不允许空的姓名（对于 <%s>）"
4661 msgid "name consists only of disallowed characters: %s"
4662 msgstr "姓名中仅包含禁用字符：%s"
4663
4564 -#: ident.c:454 builtin/commit.c:647
4664 +#: ident.c:454 builtin/commit.c:648
4665 #, c-format
4666 msgid "invalid date format: %s"
4667 msgstr "无效的日期格式：%s"
@@ -4654,7 +4754,12 @@ msgstr "不能创建 '%s.lock'：%s"
4754 msgid "invalid value '%s' for lsrefs.unborn"
4755 msgstr "lsrefs.unborn 的取值 '%s' 无效"
4756
4657 -#: ls-refs.c:167
4757 +#: ls-refs.c:174
4758 +#, c-format
4759 +msgid "unexpected line: '%s'"
4760 +msgstr "意外的行：'%s'"
4761 +
4762 +#: ls-refs.c:178
4763 msgid "expected flush after ls-refs arguments"
4764 msgstr "在 ls-refs 参数后应该有一个 flush 包"
4765
@@ -4662,37 +4767,37 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包"
4767 msgid "quoted CRLF detected"
4768 msgstr "检测到被引用的 CRLF"
4769
4665 -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
4770 +#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
4771 #, c-format
4772 msgid "bad action '%s' for '%s'"
4773 msgstr "'%2$s' 的错误动作 '%1$s'"
4774
4670 -#: merge-ort.c:1569 merge-recursive.c:1201
4775 +#: merge-ort.c:1584 merge-recursive.c:1211
4776 #, c-format
4777 msgid "Failed to merge submodule %s (not checked out)"
4778 msgstr "无法合并子模组 %s （没有检出）"
4779
4675 -#: merge-ort.c:1578 merge-recursive.c:1208
4780 +#: merge-ort.c:1593 merge-recursive.c:1218
4781 #, c-format
4782 msgid "Failed to merge submodule %s (commits not present)"
4783 msgstr "无法合并子模组 %s（提交不存在）"
4784
4680 -#: merge-ort.c:1587 merge-recursive.c:1215
4785 +#: merge-ort.c:1602 merge-recursive.c:1225
4786 #, c-format
4787 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4788 msgstr "无法合并子模组 %s （提交未跟随合并基线）"
4789
4685 -#: merge-ort.c:1597 merge-ort.c:1604
4790 +#: merge-ort.c:1612 merge-ort.c:1620
4791 #, c-format
4792 msgid "Note: Fast-forwarding submodule %s to %s"
4793 msgstr "注意：快进子模组 %s 到 %s"
4794
4690 -#: merge-ort.c:1625
4795 +#: merge-ort.c:1642
4796 #, c-format
4797 msgid "Failed to merge submodule %s"
4798 msgstr "无法合并子模组 %s"
4799
4695 -#: merge-ort.c:1632
4800 +#: merge-ort.c:1649
4801 #, c-format
4802 msgid ""
4803 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4701,7 +4806,7 @@ msgstr ""
4806 "无法合并子模组 %s，但是存在一个可能的合并方案：\n"
4807 "%s\n"
4808
4704 -#: merge-ort.c:1636 merge-recursive.c:1269
4809 +#: merge-ort.c:1653 merge-recursive.c:1281
4810 #, c-format
4811 msgid ""
4812 "If this is correct simply add it to the index for example\n"
@@ -4717,7 +4822,7 @@ msgstr ""
4822 "\n"
4823 "以接受此建议。\n"
4824
4720 -#: merge-ort.c:1649
4825 +#: merge-ort.c:1666
4826 #, c-format
4827 msgid ""
4828 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4726,21 +4831,21 @@ msgstr ""
4831 "无法合并子模组 %s，但是存在多个可能的合并：\n"
4832 "%s"
4833
4729 -#: merge-ort.c:1868 merge-recursive.c:1358
4834 +#: merge-ort.c:1887 merge-recursive.c:1372
4835 msgid "Failed to execute internal merge"
4836 msgstr "无法执行内部合并"
4837
4733 -#: merge-ort.c:1873 merge-recursive.c:1363
4838 +#: merge-ort.c:1892 merge-recursive.c:1377
4839 #, c-format
4840 msgid "Unable to add %s to database"
4841 msgstr "不能添加 %s 至对象库"
4842
4738 -#: merge-ort.c:1880 merge-recursive.c:1396
4843 +#: merge-ort.c:1899 merge-recursive.c:1410
4844 #, c-format
4845 msgid "Auto-merging %s"
4846 msgstr "自动合并 %s"
4847
4743 -#: merge-ort.c:2019 merge-recursive.c:2118
4848 +#: merge-ort.c:2038 merge-recursive.c:2132
4849 #, c-format
4850 msgid ""
4851 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4749,7 +4854,7 @@ msgstr ""
4854 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
4855 "在：%s。"
4856
4752 -#: merge-ort.c:2029 merge-recursive.c:2128
4857 +#: merge-ort.c:2048 merge-recursive.c:2142
4858 #, c-format
4859 msgid ""
4860 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4758,7 +4863,7 @@ msgstr ""
4863 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
4864 "径放置于此：%s"
4865
4761 -#: merge-ort.c:2087
4866 +#: merge-ort.c:2106
4867 #, c-format
4868 msgid ""
4869 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4768,14 +4873,14 @@ msgstr ""
4873 "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
4874 "录中，没有一个目标目录中包含多数文件。"
4875
4771 -#: merge-ort.c:2241 merge-recursive.c:2464
4876 +#: merge-ort.c:2260 merge-recursive.c:2478
4877 #, c-format
4878 msgid ""
4879 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4880 "renamed."
4881 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
4882
4778 -#: merge-ort.c:2385 merge-recursive.c:3247
4883 +#: merge-ort.c:2400 merge-recursive.c:3261
4884 #, c-format
4885 msgid ""
4886 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4783,7 +4888,7 @@ msgid ""
4888 msgstr ""
4889 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
4890
4786 -#: merge-ort.c:2392 merge-recursive.c:3254
4891 +#: merge-ort.c:2407 merge-recursive.c:3268
4892 #, c-format
4893 msgid ""
4894 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4792,7 +4897,7 @@ msgstr ""
4897 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
4898 "动到 %5$s。"
4899
4795 -#: merge-ort.c:2405 merge-recursive.c:3250
4900 +#: merge-ort.c:2420 merge-recursive.c:3264
4901 #, c-format
4902 msgid ""
4903 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4801,7 +4906,7 @@ msgstr ""
4906 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
4907 "到 %s。"
4908
4804 -#: merge-ort.c:2413 merge-recursive.c:3257
4909 +#: merge-ort.c:2428 merge-recursive.c:3271
4910 #, c-format
4911 msgid ""
4912 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4810,13 +4915,13 @@ msgstr ""
4915 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
4916 "建议将其移动到 %5$s。"
4917
4813 -#: merge-ort.c:2569
4918 +#: merge-ort.c:2584
4919 #, c-format
4920 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4921 msgstr ""
4922 "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"
4923
4819 -#: merge-ort.c:2664
4924 +#: merge-ort.c:2679
4925 #, c-format
4926 msgid ""
4927 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4826,29 +4931,29 @@ msgstr ""
4931 "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"
4932 "可能导致嵌套的冲突标签。"
4933
4829 -#: merge-ort.c:2683 merge-ort.c:2707
4934 +#: merge-ort.c:2698 merge-ort.c:2722
4935 #, c-format
4936 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4937 msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"
4938
4834 -#: merge-ort.c:3182 merge-recursive.c:3008
4939 +#: merge-ort.c:3212 merge-recursive.c:3022
4940 #, c-format
4941 msgid "cannot read object %s"
4942 msgstr "不能读取对象 %s"
4943
4839 -#: merge-ort.c:3185 merge-recursive.c:3011
4944 +#: merge-ort.c:3215 merge-recursive.c:3025
4945 #, c-format
4946 msgid "object %s is not a blob"
4947 msgstr "对象 %s 不是一个数据对象"
4948
4844 -#: merge-ort.c:3613
4949 +#: merge-ort.c:3644
4950 #, c-format
4951 msgid ""
4952 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4953 "%s instead."
4954 msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
4955
4851 -#: merge-ort.c:3689
4956 +#: merge-ort.c:3721
4957 #, c-format
4958 msgid ""
4959 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4857,7 +4962,7 @@ msgstr ""
4962 "冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位"
4963 "置。"
4964
4860 -#: merge-ort.c:3696
4965 +#: merge-ort.c:3728
4966 #, c-format
4967 msgid ""
4968 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4866,24 +4971,24 @@ msgstr ""
4971 "冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
4972 "位置。"
4973
4869 -#: merge-ort.c:3796 merge-recursive.c:3087
4974 +#: merge-ort.c:3819 merge-recursive.c:3101
4975 msgid "content"
4976 msgstr "内容"
4977
4873 -#: merge-ort.c:3798 merge-recursive.c:3091
4978 +#: merge-ort.c:3821 merge-recursive.c:3105
4979 msgid "add/add"
4980 msgstr "添加/添加"
4981
4877 -#: merge-ort.c:3800 merge-recursive.c:3136
4982 +#: merge-ort.c:3823 merge-recursive.c:3150
4983 msgid "submodule"
4984 msgstr "子模组"
4985
4881 -#: merge-ort.c:3802 merge-recursive.c:3137
4986 +#: merge-ort.c:3825 merge-recursive.c:3151
4987 #, c-format
4988 msgid "CONFLICT (%s): Merge conflict in %s"
4989 msgstr "冲突（%s）：合并冲突于 %s"
4990
4886 -#: merge-ort.c:3833
4991 +#: merge-ort.c:3856
4992 #, c-format
4993 msgid ""
4994 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4892,7 +4997,7 @@ msgstr ""
4997 "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
4998 "在树中被保留。"
4999
4895 -#: merge-ort.c:4120
5000 +#: merge-ort.c:4152
5001 #, c-format
5002 msgid ""
5003 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4902,12 +5007,12 @@ msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副
5007 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
5008 #. base, and 2-3) the trees for the two trees we're merging.
5009 #.
4905 -#: merge-ort.c:4487
5010 +#: merge-ort.c:4521
5011 #, c-format
5012 msgid "collecting merge info failed for trees %s, %s, %s"
5013 msgstr "无法收集树 %s、%s、%s 的合并信息"
5014
4910 -#: merge-ort-wrappers.c:13 merge-recursive.c:3702
5015 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716
5016 #, c-format
5017 msgid ""
5018 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4916,103 +5021,103 @@ msgstr ""
5021 "您对下列文件的本地修改将被合并操作覆盖：\n"
5022 " %s"
5023
4919 -#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
5024 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
5025 msgid "Already up to date."
5026 msgstr "已经是最新的。"
5027
4923 -#: merge-recursive.c:352
5028 +#: merge-recursive.c:353
5029 msgid "(bad commit)\n"
5030 msgstr "（坏提交）\n"
5031
4927 -#: merge-recursive.c:375
5032 +#: merge-recursive.c:381
5033 #, c-format
5034 msgid "add_cacheinfo failed for path '%s'; merge aborting."
5035 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
5036
4932 -#: merge-recursive.c:384
5037 +#: merge-recursive.c:390
5038 #, c-format
5039 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
5040 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
5041
4937 -#: merge-recursive.c:872
5042 +#: merge-recursive.c:881
5043 #, c-format
5044 msgid "failed to create path '%s'%s"
5045 msgstr "创建路径 '%s'%s 失败"
5046
4942 -#: merge-recursive.c:883
5047 +#: merge-recursive.c:892
5048 #, c-format
5049 msgid "Removing %s to make room for subdirectory\n"
5050 msgstr "删除 %s 以便为子目录留出空间\n"
5051
4947 -#: merge-recursive.c:897 merge-recursive.c:916
5052 +#: merge-recursive.c:906 merge-recursive.c:925
5053 msgid ": perhaps a D/F conflict?"
5054 msgstr "：可能是一个目录/文件冲突？"
5055
4951 -#: merge-recursive.c:906
5056 +#: merge-recursive.c:915
5057 #, c-format
5058 msgid "refusing to lose untracked file at '%s'"
5059 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
5060
4956 -#: merge-recursive.c:947 builtin/cat-file.c:41
5061 +#: merge-recursive.c:956 builtin/cat-file.c:41
5062 #, c-format
5063 msgid "cannot read object %s '%s'"
5064 msgstr "不能读取对象 %s '%s'"
5065
4961 -#: merge-recursive.c:952
5066 +#: merge-recursive.c:961
5067 #, c-format
5068 msgid "blob expected for %s '%s'"
5069 msgstr "%s '%s' 应为数据对象"
5070
4966 -#: merge-recursive.c:977
5071 +#: merge-recursive.c:986
5072 #, c-format
5073 msgid "failed to open '%s': %s"
5074 msgstr "打开 '%s' 失败：%s"
5075
4971 -#: merge-recursive.c:988
5076 +#: merge-recursive.c:997
5077 #, c-format
5078 msgid "failed to symlink '%s': %s"
5079 msgstr "创建符号链接 '%s' 失败：%s"
5080
4976 -#: merge-recursive.c:993
5081 +#: merge-recursive.c:1002
5082 #, c-format
5083 msgid "do not know what to do with %06o %s '%s'"
5084 msgstr "不知道如何处理 %06o %s '%s'"
5085
4981 -#: merge-recursive.c:1223 merge-recursive.c:1235
5086 +#: merge-recursive.c:1233 merge-recursive.c:1246
5087 #, c-format
5088 msgid "Fast-forwarding submodule %s to the following commit:"
5089 msgstr "子模组 %s 快进到如下提交："
5090
4986 -#: merge-recursive.c:1226 merge-recursive.c:1238
5091 +#: merge-recursive.c:1236 merge-recursive.c:1249
5092 #, c-format
5093 msgid "Fast-forwarding submodule %s"
5094 msgstr "快进子模组 %s"
5095
4991 -#: merge-recursive.c:1261
5096 +#: merge-recursive.c:1273
5097 #, c-format
5098 msgid "Failed to merge submodule %s (merge following commits not found)"
5099 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
5100
4996 -#: merge-recursive.c:1265
5101 +#: merge-recursive.c:1277
5102 #, c-format
5103 msgid "Failed to merge submodule %s (not fast-forward)"
5104 msgstr "无法合并子模组 %s（非快进）"
5105
5001 -#: merge-recursive.c:1266
5106 +#: merge-recursive.c:1278
5107 msgid "Found a possible merge resolution for the submodule:\n"
5108 msgstr "找到子模组的一个可能的合并方案：\n"
5109
5005 -#: merge-recursive.c:1278
5110 +#: merge-recursive.c:1290
5111 #, c-format
5112 msgid "Failed to merge submodule %s (multiple merges found)"
5113 msgstr "无法合并子模组 %s （发现多个合并）"
5114
5010 -#: merge-recursive.c:1420
5115 +#: merge-recursive.c:1434
5116 #, c-format
5117 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5118 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
5119
5015 -#: merge-recursive.c:1492
5120 +#: merge-recursive.c:1506
5121 #, c-format
5122 msgid ""
5123 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5021,7 +5126,7 @@ msgstr ""
5126 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5127 "本被保留。"
5128
5024 -#: merge-recursive.c:1497
5129 +#: merge-recursive.c:1511
5130 #, c-format
5131 msgid ""
5132 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5030,7 +5135,7 @@ msgstr ""
5135 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5136 "%7$s 版本被保留。"
5137
5033 -#: merge-recursive.c:1504
5138 +#: merge-recursive.c:1518
5139 #, c-format
5140 msgid ""
5141 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5039,7 +5144,7 @@ msgstr ""
5144 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5145 "本保留在 %8$s 中。"
5146
5042 -#: merge-recursive.c:1509
5147 +#: merge-recursive.c:1523
5148 #, c-format
5149 msgid ""
5150 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5048,40 +5153,40 @@ msgstr ""
5153 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5154 "%7$s 版本保留在 %9$s 中。"
5155
5051 -#: merge-recursive.c:1544
5156 +#: merge-recursive.c:1558
5157 msgid "rename"
5158 msgstr "重命名"
5159
5055 -#: merge-recursive.c:1544
5160 +#: merge-recursive.c:1558
5161 msgid "renamed"
5162 msgstr "重命名"
5163
5059 -#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
5164 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
5165 #, c-format
5166 msgid "Refusing to lose dirty file at %s"
5167 msgstr "拒绝丢失脏文件 '%s'"
5168
5064 -#: merge-recursive.c:1605
5169 +#: merge-recursive.c:1619
5170 #, c-format
5171 msgid "Refusing to lose untracked file at %s, even though it's in the way."
5172 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
5173
5069 -#: merge-recursive.c:1663
5174 +#: merge-recursive.c:1677
5175 #, c-format
5176 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5177 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
5178
5074 -#: merge-recursive.c:1694
5179 +#: merge-recursive.c:1708
5180 #, c-format
5181 msgid "%s is a directory in %s adding as %s instead"
5182 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5183
5079 -#: merge-recursive.c:1699
5184 +#: merge-recursive.c:1713
5185 #, c-format
5186 msgid "Refusing to lose untracked file at %s; adding as %s instead"
5187 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
5188
5084 -#: merge-recursive.c:1726
5189 +#: merge-recursive.c:1740
5190 #, c-format
5191 msgid ""
5192 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5090,18 +5195,18 @@ msgstr ""
5195 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
5196 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5197
5093 -#: merge-recursive.c:1731
5198 +#: merge-recursive.c:1745
5199 msgid " (left unresolved)"
5200 msgstr "（留下未解决）"
5201
5097 -#: merge-recursive.c:1823
5202 +#: merge-recursive.c:1837
5203 #, c-format
5204 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5205 msgstr ""
5206 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
5207 "%5$s"
5208
5104 -#: merge-recursive.c:2086
5209 +#: merge-recursive.c:2100
5210 #, c-format
5211 msgid ""
5212 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5111,7 +5216,7 @@ msgstr ""
5216 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
5217 "其它目录，没有目录包含大部分文件。"
5218
5114 -#: merge-recursive.c:2220
5219 +#: merge-recursive.c:2234
5220 #, c-format
5221 msgid ""
5222 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5120,79 +5225,79 @@ msgstr ""
5225 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
5226 "%4$s->%5$s"
5227
5123 -#: merge-recursive.c:3075
5228 +#: merge-recursive.c:3089
5229 msgid "modify"
5230 msgstr "修改"
5231
5127 -#: merge-recursive.c:3075
5232 +#: merge-recursive.c:3089
5233 msgid "modified"
5234 msgstr "修改"
5235
5131 -#: merge-recursive.c:3114
5236 +#: merge-recursive.c:3128
5237 #, c-format
5238 msgid "Skipped %s (merged same as existing)"
5239 msgstr "略过 %s（已经做过相同合并）"
5240
5136 -#: merge-recursive.c:3167
5241 +#: merge-recursive.c:3181
5242 #, c-format
5243 msgid "Adding as %s instead"
5244 msgstr "而是以 %s 为名添加"
5245
5141 -#: merge-recursive.c:3371
5246 +#: merge-recursive.c:3385
5247 #, c-format
5248 msgid "Removing %s"
5249 msgstr "删除 %s"
5250
5146 -#: merge-recursive.c:3394
5251 +#: merge-recursive.c:3408
5252 msgid "file/directory"
5253 msgstr "文件/目录"
5254
5150 -#: merge-recursive.c:3399
5255 +#: merge-recursive.c:3413
5256 msgid "directory/file"
5257 msgstr "目录/文件"
5258
5154 -#: merge-recursive.c:3406
5259 +#: merge-recursive.c:3420
5260 #, c-format
5261 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5262 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
5263
5159 -#: merge-recursive.c:3415
5264 +#: merge-recursive.c:3429
5265 #, c-format
5266 msgid "Adding %s"
5267 msgstr "添加 %s"
5268
5164 -#: merge-recursive.c:3424
5269 +#: merge-recursive.c:3438
5270 #, c-format
5271 msgid "CONFLICT (add/add): Merge conflict in %s"
5272 msgstr "冲突（add/add）：合并冲突于 %s"
5273
5169 -#: merge-recursive.c:3477
5274 +#: merge-recursive.c:3491
5275 #, c-format
5276 msgid "merging of trees %s and %s failed"
5277 msgstr "无法合并树 %s 和 %s"
5278
5174 -#: merge-recursive.c:3571
5279 +#: merge-recursive.c:3585
5280 msgid "Merging:"
5281 msgstr "合并："
5282
5178 -#: merge-recursive.c:3584
5283 +#: merge-recursive.c:3598
5284 #, c-format
5285 msgid "found %u common ancestor:"
5286 msgid_plural "found %u common ancestors:"
5287 msgstr[0] "发现 %u 个共同祖先："
5288 msgstr[1] "发现 %u 个共同祖先："
5289
5185 -#: merge-recursive.c:3634
5290 +#: merge-recursive.c:3648
5291 msgid "merge returned no commit"
5292 msgstr "合并未返回提交"
5293
5189 -#: merge-recursive.c:3799
5294 +#: merge-recursive.c:3816
5295 #, c-format
5296 msgid "Could not parse object '%s'"
5297 msgstr "不能解析对象 '%s'"
5298
5194 -#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
5195 -#: builtin/stash.c:473
5299 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
5300 +#: builtin/stash.c:489
5301 msgid "Unable to write index."
5302 msgstr "不能写入索引。"
5303
@@ -5200,189 +5305,221 @@ msgstr "不能写入索引。"
5305 msgid "failed to read the cache"
5306 msgstr "读取缓存失败"
5307
5203 -#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
5204 -#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
5205 -#: builtin/stash.c:267
5308 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
5309 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
5310 +#: builtin/stash.c:269
5311 msgid "unable to write new index file"
5312 msgstr "无法写新的索引文件"
5313
5209 -#: midx.c:74
5314 +#: midx.c:78
5315 msgid "multi-pack-index OID fanout is of the wrong size"
5316 msgstr "多包索引的对象ID扇出表大小错误"
5317
5213 -#: midx.c:105
5318 +#: midx.c:109
5319 #, c-format
5320 msgid "multi-pack-index file %s is too small"
5321 msgstr "多包索引文件 %s 太小"
5322
5218 -#: midx.c:121
5323 +#: midx.c:125
5324 #, c-format
5325 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
5326 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
5327
5223 -#: midx.c:126
5328 +#: midx.c:130
5329 #, c-format
5330 msgid "multi-pack-index version %d not recognized"
5331 msgstr "multi-pack-index 版本 %d 不能被识别"
5332
5228 -#: midx.c:131
5333 +#: midx.c:135
5334 #, c-format
5335 msgid "multi-pack-index hash version %u does not match version %u"
5336 msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
5337
5233 -#: midx.c:148
5338 +#: midx.c:152
5339 msgid "multi-pack-index missing required pack-name chunk"
5340 msgstr "多包索引缺少必需的包名块"
5341
5237 -#: midx.c:150
5342 +#: midx.c:154
5343 msgid "multi-pack-index missing required OID fanout chunk"
5344 msgstr "多包索引缺少必需的对象 ID 扇出块"
5345
5241 -#: midx.c:152
5346 +#: midx.c:156
5347 msgid "multi-pack-index missing required OID lookup chunk"
5348 msgstr "多包索引缺少必需的对象 ID 查询块"
5349
5245 -#: midx.c:154
5350 +#: midx.c:158
5351 msgid "multi-pack-index missing required object offsets chunk"
5352 msgstr "多包索引缺少必需的对象偏移块"
5353
5249 -#: midx.c:170
5354 +#: midx.c:174
5355 #, c-format
5356 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
5357 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
5358
5254 -#: midx.c:214
5359 +#: midx.c:221
5360 #, c-format
5361 msgid "bad pack-int-id: %u (%u total packs)"
5362 msgstr "错的 pack-int-id：%u（共有 %u 个包）"
5363
5259 -#: midx.c:264
5364 +#: midx.c:271
5365 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5366 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
5367
5263 -#: midx.c:490
5368 +#: midx.c:502
5369 #, c-format
5370 msgid "failed to add packfile '%s'"
5371 msgstr "添加包文件 '%s' 失败"
5372
5268 -#: midx.c:496
5373 +#: midx.c:508
5374 #, c-format
5375 msgid "failed to open pack-index '%s'"
5376 msgstr "打开包索引 '%s' 失败"
5377
5273 -#: midx.c:564
5378 +#: midx.c:576
5379 #, c-format
5380 msgid "failed to locate object %d in packfile"
5381 msgstr "在包文件中定位对象 %d 失败"
5382
5278 -#: midx.c:880 builtin/index-pack.c:1533
5383 +#: midx.c:892
5384 msgid "cannot store reverse index file"
5385 msgstr "无法存储反向索引文件"
5386
5282 -#: midx.c:920
5387 +#: midx.c:990
5388 +#, c-format
5389 +msgid "could not parse line: %s"
5390 +msgstr "不能解析行： %s"
5391 +
5392 +#: midx.c:992
5393 +#, c-format
5394 +msgid "malformed line: %s"
5395 +msgstr "格式错误的行：%s"
5396 +
5397 +#: midx.c:1159
5398 msgid "ignoring existing multi-pack-index; checksum mismatch"
5399 msgstr "忽略已存在的多包索引，校验码不匹配"
5400
5286 -#: midx.c:943
5287 -msgid "Adding packfiles to multi-pack-index"
5288 -msgstr "添加包文件到多包索引"
5401 +#: midx.c:1184
5402 +msgid "could not load pack"
5403 +msgstr "不能载入包"
5404
5290 -#: midx.c:989
5405 +#: midx.c:1190
5406 #, c-format
5292 -msgid "did not see pack-file %s to drop"
5293 -msgstr "没有看到要丢弃的包文件 %s"
5407 +msgid "could not open index for %s"
5408 +msgstr "不能打开 %s 的索引"
5409
5295 -#: midx.c:1034
5410 +#: midx.c:1201
5411 +msgid "Adding packfiles to multi-pack-index"
5412 +msgstr "添加包文件到多包索引"
5413 +
5414 +#: midx.c:1244
5415 #, c-format
5416 msgid "unknown preferred pack: '%s'"
5417 msgstr "未知的首选包：'%s'"
5418
5300 -#: midx.c:1039
5419 +#: midx.c:1289
5420 +#, c-format
5421 +msgid "cannot select preferred pack %s with no objects"
5422 +msgstr "不能选择没有对象的首选包 %s"
5423 +
5424 +#: midx.c:1321
5425 +#, c-format
5426 +msgid "did not see pack-file %s to drop"
5427 +msgstr "没有看到要丢弃的包文件 %s"
5428 +
5429 +#: midx.c:1367
5430 #, c-format
5431 msgid "preferred pack '%s' is expired"
5432 msgstr "首选包 '%s' 已过期"
5433
5305 -#: midx.c:1055
5434 +#: midx.c:1380
5435 msgid "no pack files to index."
5436 msgstr "没有要索引的包文件。"
5437
5309 -#: midx.c:1135 builtin/clean.c:37
5438 +#: midx.c:1417
5439 +msgid "could not write multi-pack bitmap"
5440 +msgstr "无法写入多包位图"
5441 +
5442 +#: midx.c:1427
5443 +msgid "could not write multi-pack-index"
5444 +msgstr "无法写入多包索引"
5445 +
5446 +#: midx.c:1486 builtin/clean.c:37
5447 #, c-format
5448 msgid "failed to remove %s"
5449 msgstr "删除 %s 失败"
5450
5314 -#: midx.c:1166
5451 +#: midx.c:1517
5452 #, c-format
5453 msgid "failed to clear multi-pack-index at %s"
5454 msgstr "清理位于 %s 的多包索引失败"
5455
5319 -#: midx.c:1225
5456 +#: midx.c:1577
5457 msgid "multi-pack-index file exists, but failed to parse"
5458 msgstr "多包索引文件存在，但无法解析"
5459
5323 -#: midx.c:1233
5460 +#: midx.c:1585
5461 msgid "incorrect checksum"
5462 msgstr "不正确的校验码"
5463
5327 -#: midx.c:1236
5464 +#: midx.c:1588
5465 msgid "Looking for referenced packfiles"
5466 msgstr "正在查找引用的包文件"
5467
5331 -#: midx.c:1251
5468 +#: midx.c:1603
5469 #, c-format
5470 msgid ""
5471 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5472 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5473
5337 -#: midx.c:1256
5474 +#: midx.c:1608
5475 msgid "the midx contains no oid"
5476 msgstr "midx 不包含 oid"
5477
5341 -#: midx.c:1265
5478 +#: midx.c:1617
5479 msgid "Verifying OID order in multi-pack-index"
5480 msgstr "校验多包索引中的 OID 顺序"
5481
5345 -#: midx.c:1274
5482 +#: midx.c:1626
5483 #, c-format
5484 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5485 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
5486
5350 -#: midx.c:1294
5487 +#: midx.c:1646
5488 msgid "Sorting objects by packfile"
5489 msgstr "通过包文件为对象排序"
5490
5354 -#: midx.c:1301
5491 +#: midx.c:1653
5492 msgid "Verifying object offsets"
5493 msgstr "校验对象偏移"
5494
5358 -#: midx.c:1317
5495 +#: midx.c:1669
5496 #, c-format
5497 msgid "failed to load pack entry for oid[%d] = %s"
5498 msgstr "为 oid[%d] = %s 加载包条目失败"
5499
5363 -#: midx.c:1323
5500 +#: midx.c:1675
5501 #, c-format
5502 msgid "failed to load pack-index for packfile %s"
5503 msgstr "为包文件 %s 加载包索引失败"
5504
5368 -#: midx.c:1332
5505 +#: midx.c:1684
5506 #, c-format
5507 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5508 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
5509
5373 -#: midx.c:1357
5510 +#: midx.c:1709
5511 msgid "Counting referenced objects"
5512 msgstr "正在对引用对象计数"
5513
5377 -#: midx.c:1367
5514 +#: midx.c:1719
5515 msgid "Finding and deleting unreferenced packfiles"
5516 msgstr "正在查找和删除未引用的包文件"
5517
5381 -#: midx.c:1558
5518 +#: midx.c:1911
5519 msgid "could not start pack-objects"
5520 msgstr "不能开始 pack-objects"
5521
5385 -#: midx.c:1578
5522 +#: midx.c:1931
5523 msgid "could not finish pack-objects"
5524 msgstr "不能结束 pack-objects"
5525
@@ -5440,257 +5577,257 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
5577 msgid "Bad %s value: '%s'"
5578 msgstr "坏的 %s 值：'%s'"
5579
5443 -#: object-file.c:526
5580 +#: object-file.c:459
5581 #, c-format
5582 msgid "object directory %s does not exist; check .git/objects/info/alternates"
5583 msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
5584
5448 -#: object-file.c:584
5585 +#: object-file.c:517
5586 #, c-format
5587 msgid "unable to normalize alternate object path: %s"
5588 msgstr "无法规范化备用对象路径：%s"
5589
5453 -#: object-file.c:658
5590 +#: object-file.c:591
5591 #, c-format
5592 msgid "%s: ignoring alternate object stores, nesting too deep"
5593 msgstr "%s：忽略备用对象库，嵌套太深"
5594
5458 -#: object-file.c:665
5595 +#: object-file.c:598
5596 #, c-format
5597 msgid "unable to normalize object directory: %s"
5598 msgstr "无法规范化对象目录: %s"
5599
5463 -#: object-file.c:708
5600 +#: object-file.c:641
5601 msgid "unable to fdopen alternates lockfile"
5602 msgstr "无法 fdopen 替换锁文件"
5603
5467 -#: object-file.c:726
5604 +#: object-file.c:659
5605 msgid "unable to read alternates file"
5606 msgstr "无法读取替代文件"
5607
5471 -#: object-file.c:733
5608 +#: object-file.c:666
5609 msgid "unable to move new alternates file into place"
5610 msgstr "无法将新的替代文件移动到位"
5611
5475 -#: object-file.c:768
5612 +#: object-file.c:701
5613 #, c-format
5614 msgid "path '%s' does not exist"
5615 msgstr "路径 '%s' 不存在"
5616
5480 -#: object-file.c:789
5617 +#: object-file.c:722
5618 #, c-format
5619 msgid "reference repository '%s' as a linked checkout is not supported yet."
5620 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
5621
5485 -#: object-file.c:795
5622 +#: object-file.c:728
5623 #, c-format
5624 msgid "reference repository '%s' is not a local repository."
5625 msgstr "参考仓库 '%s' 不是一个本地仓库。"
5626
5490 -#: object-file.c:801
5627 +#: object-file.c:734
5628 #, c-format
5629 msgid "reference repository '%s' is shallow"
5630 msgstr "参考仓库 '%s' 是一个浅克隆"
5631
5495 -#: object-file.c:809
5632 +#: object-file.c:742
5633 #, c-format
5634 msgid "reference repository '%s' is grafted"
5635 msgstr "参考仓库 '%s' 已被移植"
5636
5500 -#: object-file.c:869
5637 +#: object-file.c:773
5638 +#, c-format
5639 +msgid "could not find object directory matching %s"
5640 +msgstr "无法找到和 %s 匹配的对象目录"
5641 +
5642 +#: object-file.c:823
5643 #, c-format
5644 msgid "invalid line while parsing alternate refs: %s"
5645 msgstr "解析备用引用时无效的行：%s"
5646
5505 -#: object-file.c:1019
5647 +#: object-file.c:973
5648 #, c-format
5649 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
5650 msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
5651
5510 -#: object-file.c:1054
5652 +#: object-file.c:1008
5653 #, c-format
5654 msgid "mmap failed%s"
5655 msgstr "mmap 失败%s"
5656
5515 -#: object-file.c:1218
5657 +#: object-file.c:1174
5658 #, c-format
5659 msgid "object file %s is empty"
5660 msgstr "对象文件 %s 为空"
5661
5520 -#: object-file.c:1353 object-file.c:2548
5662 +#: object-file.c:1293 object-file.c:2499
5663 #, c-format
5664 msgid "corrupt loose object '%s'"
5665 msgstr "损坏的松散对象 '%s'"
5666
5525 -#: object-file.c:1355 object-file.c:2552
5667 +#: object-file.c:1295 object-file.c:2503
5668 #, c-format
5669 msgid "garbage at end of loose object '%s'"
5670 msgstr "松散对象 '%s' 后面有垃圾数据"
5671
5530 -#: object-file.c:1397
5672 +#: object-file.c:1417
5673 +#, c-format
5674 +msgid "unable to parse %s header"
5675 +msgstr "无法解析 %s 头部"
5676 +
5677 +#: object-file.c:1419
5678 msgid "invalid object type"
5679 msgstr "无效的对象类型"
5680
5534 -#: object-file.c:1481
5535 -#, c-format
5536 -msgid "unable to unpack %s header with --allow-unknown-type"
5537 -msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
5538 -
5539 -#: object-file.c:1484
5681 +#: object-file.c:1430
5682 #, c-format
5683 msgid "unable to unpack %s header"
5684 msgstr "无法解开 %s 头部"
5685
5544 -#: object-file.c:1490
5686 +#: object-file.c:1434
5687 #, c-format
5546 -msgid "unable to parse %s header with --allow-unknown-type"
5547 -msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
5688 +msgid "header for %s too long, exceeds %d bytes"
5689 +msgstr "%s 的头部太长，超出了 %d 字节"
5690
5549 -#: object-file.c:1493
5550 -#, c-format
5551 -msgid "unable to parse %s header"
5552 -msgstr "无法解析 %s 头部"
5553 -
5554 -#: object-file.c:1717
5691 +#: object-file.c:1664
5692 #, c-format
5693 msgid "failed to read object %s"
5694 msgstr "读取对象 %s 失败"
5695
5559 -#: object-file.c:1721
5696 +#: object-file.c:1668
5697 #, c-format
5698 msgid "replacement %s not found for %s"
5699 msgstr "找不到 %2$s 的替代 %1$s"
5700
5564 -#: object-file.c:1725
5701 +#: object-file.c:1672
5702 #, c-format
5703 msgid "loose object %s (stored in %s) is corrupt"
5704 msgstr "松散对象 %s（保存在 %s）已损坏"
5705
5569 -#: object-file.c:1729
5706 +#: object-file.c:1676
5707 #, c-format
5708 msgid "packed object %s (stored in %s) is corrupt"
5709 msgstr "打包对象 %s（保存在 %s）已损坏"
5710
5574 -#: object-file.c:1834
5711 +#: object-file.c:1781
5712 #, c-format
5713 msgid "unable to write file %s"
5714 msgstr "无法写文件 %s"
5715
5579 -#: object-file.c:1841
5716 +#: object-file.c:1788
5717 #, c-format
5718 msgid "unable to set permission to '%s'"
5719 msgstr "无法为 '%s' 设置权限"
5720
5584 -#: object-file.c:1848
5721 +#: object-file.c:1795
5722 msgid "file write error"
5723 msgstr "文件写错误"
5724
5588 -#: object-file.c:1868
5725 +#: object-file.c:1815
5726 msgid "error when closing loose object file"
5727 msgstr "关闭松散对象文件时出错"
5728
5592 -#: object-file.c:1933
5729 +#: object-file.c:1882
5730 #, c-format
5731 msgid "insufficient permission for adding an object to repository database %s"
5732 msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
5733
5597 -#: object-file.c:1935
5734 +#: object-file.c:1884
5735 msgid "unable to create temporary file"
5736 msgstr "无法创建临时文件"
5737
5601 -#: object-file.c:1959
5738 +#: object-file.c:1908
5739 msgid "unable to write loose object file"
5740 msgstr "不能写松散对象文件"
5741
5605 -#: object-file.c:1965
5742 +#: object-file.c:1914
5743 #, c-format
5744 msgid "unable to deflate new object %s (%d)"
5745 msgstr "不能压缩新对象 %s（%d）"
5746
5610 -#: object-file.c:1969
5747 +#: object-file.c:1918
5748 #, c-format
5749 msgid "deflateEnd on object %s failed (%d)"
5750 msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
5751
5615 -#: object-file.c:1973
5752 +#: object-file.c:1922
5753 #, c-format
5754 msgid "confused by unstable object source data for %s"
5755 msgstr "被 %s 的不稳定对象源数据搞糊涂了"
5756
5620 -#: object-file.c:1983 builtin/pack-objects.c:1237
5757 +#: object-file.c:1933 builtin/pack-objects.c:1243
5758 #, c-format
5759 msgid "failed utime() on %s"
5760 msgstr "在 %s 上调用 utime() 失败"
5761
5625 -#: object-file.c:2060
5762 +#: object-file.c:2011
5763 #, c-format
5764 msgid "cannot read object for %s"
5765 msgstr "不能读取对象 %s"
5766
5630 -#: object-file.c:2111
5767 +#: object-file.c:2062
5768 msgid "corrupt commit"
5769 msgstr "损坏的提交"
5770
5634 -#: object-file.c:2119
5771 +#: object-file.c:2070
5772 msgid "corrupt tag"
5773 msgstr "损坏的标签"
5774
5638 -#: object-file.c:2219
5775 +#: object-file.c:2170
5776 #, c-format
5777 msgid "read error while indexing %s"
5778 msgstr "索引 %s 时读取错误"
5779
5643 -#: object-file.c:2222
5780 +#: object-file.c:2173
5781 #, c-format
5782 msgid "short read while indexing %s"
5783 msgstr "索引 %s 时读入不完整"
5784
5648 -#: object-file.c:2295 object-file.c:2305
5785 +#: object-file.c:2246 object-file.c:2256
5786 #, c-format
5787 msgid "%s: failed to insert into database"
5788 msgstr "%s：插入数据库失败"
5789
5653 -#: object-file.c:2311
5790 +#: object-file.c:2262
5791 #, c-format
5792 msgid "%s: unsupported file type"
5793 msgstr "%s：不支持的文件类型"
5794
5658 -#: object-file.c:2335
5795 +#: object-file.c:2286 builtin/fetch.c:1445
5796 #, c-format
5797 msgid "%s is not a valid object"
5798 msgstr "%s 不是一个有效的对象"
5799
5663 -#: object-file.c:2337
5800 +#: object-file.c:2288
5801 #, c-format
5802 msgid "%s is not a valid '%s' object"
5803 msgstr "%s 不是一个有效的 '%s' 对象"
5804
5668 -#: object-file.c:2364 builtin/index-pack.c:192
5805 +#: object-file.c:2315
5806 #, c-format
5807 msgid "unable to open %s"
5808 msgstr "不能打开 %s"
5809
5673 -#: object-file.c:2559 object-file.c:2612
5810 +#: object-file.c:2510
5811 #, c-format
5812 msgid "hash mismatch for %s (expected %s)"
5813 msgstr "%s 的哈希值不匹配（预期 %s）"
5814
5678 -#: object-file.c:2583
5815 +#: object-file.c:2533
5816 #, c-format
5817 msgid "unable to mmap %s"
5818 msgstr "不能 mmap %s"
5819
5683 -#: object-file.c:2588
5820 +#: object-file.c:2539
5821 #, c-format
5822 msgid "unable to unpack header of %s"
5823 msgstr "无法解压缩 %s 的头部"
5824
5688 -#: object-file.c:2594
5825 +#: object-file.c:2544
5826 #, c-format
5827 msgid "unable to parse header of %s"
5828 msgstr "无法解析 %s 的头部"
5829
5693 -#: object-file.c:2605
5830 +#: object-file.c:2555
5831 #, c-format
5832 msgid "unable to unpack contents of %s"
5833 msgstr "无法解压缩 %s 的内容"
@@ -5816,12 +5953,25 @@ msgstr "不能解析对象：%s"
5953 msgid "hash mismatch %s"
5954 msgstr "哈希值与 %s 不匹配"
5955
5819 -#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
5956 +#: pack-bitmap.c:348
5957 +msgid "multi-pack bitmap is missing required reverse index"
5958 +msgstr "多包位图缺少必需的反向索引"
5959 +
5960 +#: pack-bitmap.c:424
5961 +msgid "load_reverse_index: could not open pack"
5962 +msgstr "load_reverse_index：无法打开包"

This file is too large to show in full.