@matheusbsbs / matheus-bagliano / commits / db2558009c

l10n: zh_CN: v2.37.0 round 1

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

Fangyi Zhou committed Jun 22, 2022 at 10:28 UTC db2558009cfcb71d411d63bb604f722e64af6698
1 file changed +18580 -18318
po/zh_CN.po
+18580 -18318
@@ -144,8 +144,8 @@ msgid ""
144 msgstr ""
145 "Project-Id-Version: Git\n"
146 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
147 -"POT-Creation-Date: 2022-04-13 14:52+0800\n"
148 -"PO-Revision-Date: 2022-04-14 15:39+0100\n"
147 +"POT-Creation-Date: 2022-06-22 10:25+0100\n"
148 +"PO-Revision-Date: 2022-06-14 20:52+0100\n"
149 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
150 "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"
151 "Language: zh_CN\n"
@@ -155,243 +155,233 @@ msgstr ""
155 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
156 "X-Generator: Gtranslator 40.0\n"
157
158 -#: add-interactive.c:382
158 +#: add-interactive.c
159 #, c-format
160 msgid "Huh (%s)?"
161 msgstr "嗯（%s）？"
162
163 -#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
164 -#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
165 -#: builtin/rebase.c:1671
163 +#: add-interactive.c builtin/rebase.c reset.c sequencer.c
164 msgid "could not read index"
165 msgstr "不能读取索引"
166
169 -#: add-interactive.c:590 git-add--interactive.perl:269
170 -#: git-add--interactive.perl:294
167 +#: add-interactive.c git-add--interactive.perl
168 msgid "binary"
169 msgstr "二进制"
170
174 -#: add-interactive.c:648 git-add--interactive.perl:278
175 -#: git-add--interactive.perl:332
171 +#: add-interactive.c git-add--interactive.perl
172 msgid "nothing"
173 msgstr "无"
174
179 -#: add-interactive.c:649 git-add--interactive.perl:314
180 -#: git-add--interactive.perl:329
175 +#: add-interactive.c git-add--interactive.perl
176 msgid "unchanged"
177 msgstr "没有修改"
178
184 -#: add-interactive.c:686 git-add--interactive.perl:641
179 +#: add-interactive.c git-add--interactive.perl
180 msgid "Update"
181 msgstr "更新"
182
188 -#: add-interactive.c:703 add-interactive.c:891
183 +#: add-interactive.c
184 #, c-format
185 msgid "could not stage '%s'"
186 msgstr "不能暂存 '%s'"
187
193 -#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
188 +#: add-interactive.c builtin/stash.c reset.c sequencer.c
189 msgid "could not write index"
190 msgstr "不能写入索引"
191
197 -#: add-interactive.c:712 git-add--interactive.perl:626
192 +#: add-interactive.c git-add--interactive.perl
193 #, c-format, perl-format
194 msgid "updated %d path\n"
195 msgid_plural "updated %d paths\n"
196 msgstr[0] "更新了 %d 个路径\n"
197 msgstr[1] "更新了 %d 个路径\n"
198
204 -#: add-interactive.c:730 git-add--interactive.perl:676
199 +#: add-interactive.c git-add--interactive.perl
200 #, c-format, perl-format
201 msgid "note: %s is untracked now.\n"
202 msgstr "说明：%s 现已成为未跟踪的。\n"
203
209 -#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
210 -#: builtin/reset.c:167
204 +#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c
205 #, c-format
206 msgid "make_cache_entry failed for path '%s'"
207 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
208
215 -#: add-interactive.c:765 git-add--interactive.perl:653
209 +#: add-interactive.c git-add--interactive.perl
210 msgid "Revert"
211 msgstr "还原"
212
219 -#: add-interactive.c:781
213 +#: add-interactive.c
214 msgid "Could not parse HEAD^{tree}"
215 msgstr "不能解析 HEAD^{tree}"
216
223 -#: add-interactive.c:819 git-add--interactive.perl:629
217 +#: add-interactive.c git-add--interactive.perl
218 #, c-format, perl-format
219 msgid "reverted %d path\n"
220 msgid_plural "reverted %d paths\n"
221 msgstr[0] "还原了 %d 个路径\n"
222 msgstr[1] "还原了 %d 个路径\n"
223
230 -#: add-interactive.c:870 git-add--interactive.perl:693
224 +#: add-interactive.c git-add--interactive.perl
225 #, c-format
226 msgid "No untracked files.\n"
227 msgstr "没有未跟踪的文件。\n"
228
235 -#: add-interactive.c:874 git-add--interactive.perl:687
229 +#: add-interactive.c git-add--interactive.perl
230 msgid "Add untracked"
231 msgstr "添加未跟踪的"
232
239 -#: add-interactive.c:901 git-add--interactive.perl:623
233 +#: add-interactive.c git-add--interactive.perl
234 #, c-format, perl-format
235 msgid "added %d path\n"
236 msgid_plural "added %d paths\n"
237 msgstr[0] "增加了 %d 个路径\n"
238 msgstr[1] "增加了 %d 个路径\n"
239
246 -#: add-interactive.c:931
240 +#: add-interactive.c
241 #, c-format
242 msgid "ignoring unmerged: %s"
243 msgstr "忽略未合入的：%s"
244
251 -#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
245 +#: add-interactive.c add-patch.c git-add--interactive.perl
246 #, c-format
247 msgid "Only binary files changed.\n"
248 msgstr "只有二进制文件被修改。\n"
249
256 -#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
250 +#: add-interactive.c add-patch.c git-add--interactive.perl
251 #, c-format
252 msgid "No changes.\n"
253 msgstr "没有修改。\n"
254
261 -#: add-interactive.c:949 git-add--interactive.perl:1381
255 +#: add-interactive.c git-add--interactive.perl
256 msgid "Patch update"
257 msgstr "补丁更新"
258
265 -#: add-interactive.c:988 git-add--interactive.perl:1794
259 +#: add-interactive.c git-add--interactive.perl
260 msgid "Review diff"
261 msgstr "检视 diff"
262
269 -#: add-interactive.c:1016
263 +#: add-interactive.c
264 msgid "show paths with changes"
265 msgstr "显示含变更的路径"
266
273 -#: add-interactive.c:1018
267 +#: add-interactive.c
268 msgid "add working tree state to the staged set of changes"
269 msgstr "将工作区状态添加到暂存区修改集中"
270
277 -#: add-interactive.c:1020
271 +#: add-interactive.c
272 msgid "revert staged set of changes back to the HEAD version"
273 msgstr "将暂存的修改集恢复为 HEAD 版本"
274
281 -#: add-interactive.c:1022
275 +#: add-interactive.c
276 msgid "pick hunks and update selectively"
277 msgstr "挑选数据块并有选择地更新"
278
285 -#: add-interactive.c:1024
279 +#: add-interactive.c
280 msgid "view diff between HEAD and index"
281 msgstr "显示 HEAD 和索引的差异"
282
289 -#: add-interactive.c:1026
283 +#: add-interactive.c
284 msgid "add contents of untracked files to the staged set of changes"
285 msgstr "将未跟踪文件的内容添加到暂存区修改集中"
286
293 -#: add-interactive.c:1034 add-interactive.c:1083
287 +#: add-interactive.c
288 msgid "Prompt help:"
289 msgstr "帮助："
290
297 -#: add-interactive.c:1036
291 +#: add-interactive.c
292 msgid "select a single item"
293 msgstr "选择一个条目"
294
301 -#: add-interactive.c:1038
295 +#: add-interactive.c
296 msgid "select a range of items"
297 msgstr "选择一系列条目"
298
305 -#: add-interactive.c:1040
299 +#: add-interactive.c
300 msgid "select multiple ranges"
301 msgstr "选择多个范围"
302
309 -#: add-interactive.c:1042 add-interactive.c:1087
303 +#: add-interactive.c
304 msgid "select item based on unique prefix"
305 msgstr "基于唯一前缀选择条目"
306
313 -#: add-interactive.c:1044
307 +#: add-interactive.c
308 msgid "unselect specified items"
309 msgstr "反选指定的条目"
310
317 -#: add-interactive.c:1046
311 +#: add-interactive.c
312 msgid "choose all items"
313 msgstr "选择所有条目"
314
321 -#: add-interactive.c:1048
315 +#: add-interactive.c
316 msgid "(empty) finish selecting"
317 msgstr "（空）结束选择"
318
325 -#: add-interactive.c:1085
319 +#: add-interactive.c
320 msgid "select a numbered item"
321 msgstr "选择一个编号条目"
322
329 -#: add-interactive.c:1089
323 +#: add-interactive.c
324 msgid "(empty) select nothing"
325 msgstr "（空）不选择任何内容"
326
333 -#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
327 +#: add-interactive.c builtin/clean.c git-add--interactive.perl
328 msgid "*** Commands ***"
329 msgstr "*** 命令 ***"
330
337 -#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
331 +#: add-interactive.c builtin/clean.c git-add--interactive.perl
332 msgid "What now"
333 msgstr "请选择"
334
341 -#: add-interactive.c:1150 git-add--interactive.perl:213
335 +#: add-interactive.c git-add--interactive.perl
336 msgid "staged"
337 msgstr "缓存"
338
345 -#: add-interactive.c:1150 git-add--interactive.perl:213
339 +#: add-interactive.c git-add--interactive.perl
340 msgid "unstaged"
341 msgstr "未缓存"
342
349 -#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
350 -#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
351 -#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
352 -#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
353 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
354 -#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
355 -#: git-add--interactive.perl:213
343 +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
344 +#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c
345 +#: git-add--interactive.perl
346 msgid "path"
347 msgstr "路径"
348
359 -#: add-interactive.c:1157
349 +#: add-interactive.c
350 msgid "could not refresh index"
351 msgstr "不能刷新索引"
352
363 -#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
353 +#: add-interactive.c builtin/clean.c git-add--interactive.perl
354 #, c-format
355 msgid "Bye.\n"
356 msgstr "再见。\n"
357
368 -#: add-patch.c:34 git-add--interactive.perl:1433
358 +#: add-patch.c git-add--interactive.perl
359 #, c-format, perl-format
360 msgid "Stage mode change [y,n,q,a,d%s,?]? "
361 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
362
373 -#: add-patch.c:35 git-add--interactive.perl:1434
363 +#: add-patch.c git-add--interactive.perl
364 #, c-format, perl-format
365 msgid "Stage deletion [y,n,q,a,d%s,?]? "
366 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
367
378 -#: add-patch.c:36 git-add--interactive.perl:1435
368 +#: add-patch.c git-add--interactive.perl
369 #, c-format, perl-format
370 msgid "Stage addition [y,n,q,a,d%s,?]? "
371 msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
372
383 -#: add-patch.c:37 git-add--interactive.perl:1436
373 +#: add-patch.c git-add--interactive.perl
374 #, c-format, perl-format
375 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
376 msgstr "暂存该块 [y,n,q,a,d%s,?]? "
377
388 -#: add-patch.c:39
378 +#: add-patch.c
379 msgid ""
380 "If the patch applies cleanly, the edited hunk will immediately be marked for "
381 "staging."
382 msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。"
383
394 -#: add-patch.c:42
384 +#: add-patch.c
385 msgid ""
386 "y - stage this hunk\n"
387 "n - do not stage this hunk\n"
@@ -405,33 +395,33 @@ msgstr ""
395 "a - 暂存该块和本文件中后面的全部块\n"
396 "d - 不暂存该块和本文件中后面的全部块\n"
397
408 -#: add-patch.c:56 git-add--interactive.perl:1439
398 +#: add-patch.c git-add--interactive.perl
399 #, c-format, perl-format
400 msgid "Stash mode change [y,n,q,a,d%s,?]? "
401 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
402
413 -#: add-patch.c:57 git-add--interactive.perl:1440
403 +#: add-patch.c git-add--interactive.perl
404 #, c-format, perl-format
405 msgid "Stash deletion [y,n,q,a,d%s,?]? "
406 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
407
418 -#: add-patch.c:58 git-add--interactive.perl:1441
408 +#: add-patch.c git-add--interactive.perl
409 #, c-format, perl-format
410 msgid "Stash addition [y,n,q,a,d%s,?]? "
411 msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
412
423 -#: add-patch.c:59 git-add--interactive.perl:1442
413 +#: add-patch.c git-add--interactive.perl
414 #, c-format, perl-format
415 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
416 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
417
428 -#: add-patch.c:61
418 +#: add-patch.c
419 msgid ""
420 "If the patch applies cleanly, the edited hunk will immediately be marked for "
421 "stashing."
422 msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。"
423
434 -#: add-patch.c:64
424 +#: add-patch.c
425 msgid ""
426 "y - stash this hunk\n"
427 "n - do not stash this hunk\n"
@@ -445,33 +435,33 @@ msgstr ""
435 "a - 贮藏该块和本文件中后面的全部块\n"
436 "d - 不贮藏该块和本文件中后面的全部块\n"
437
448 -#: add-patch.c:80 git-add--interactive.perl:1445
438 +#: add-patch.c git-add--interactive.perl
439 #, c-format, perl-format
440 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
441 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
442
453 -#: add-patch.c:81 git-add--interactive.perl:1446
443 +#: add-patch.c git-add--interactive.perl
444 #, c-format, perl-format
445 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
446 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
447
458 -#: add-patch.c:82 git-add--interactive.perl:1447
448 +#: add-patch.c git-add--interactive.perl
449 #, c-format, perl-format
450 msgid "Unstage addition [y,n,q,a,d%s,?]? "
451 msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
452
463 -#: add-patch.c:83 git-add--interactive.perl:1448
453 +#: add-patch.c git-add--interactive.perl
454 #, c-format, perl-format
455 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
456 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
457
468 -#: add-patch.c:85
458 +#: add-patch.c
459 msgid ""
460 "If the patch applies cleanly, the edited hunk will immediately be marked for "
461 "unstaging."
462 msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。"
463
474 -#: add-patch.c:88
464 +#: add-patch.c
465 msgid ""
466 "y - unstage this hunk\n"
467 "n - do not unstage this hunk\n"
@@ -485,33 +475,33 @@ msgstr ""
475 "a - 取消暂存该块和本文件中后面的全部块\n"
476 "d - 不要取消暂存该块和本文件中后面的全部块\n"
477
488 -#: add-patch.c:103 git-add--interactive.perl:1451
478 +#: add-patch.c git-add--interactive.perl
479 #, c-format, perl-format
480 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
481 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
482
493 -#: add-patch.c:104 git-add--interactive.perl:1452
483 +#: add-patch.c git-add--interactive.perl
484 #, c-format, perl-format
485 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
486 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
487
498 -#: add-patch.c:105 git-add--interactive.perl:1453
488 +#: add-patch.c git-add--interactive.perl
489 #, c-format, perl-format
490 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
491 msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
492
503 -#: add-patch.c:106 git-add--interactive.perl:1454
493 +#: add-patch.c git-add--interactive.perl
494 #, c-format, perl-format
495 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
496 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
497
508 -#: add-patch.c:108 add-patch.c:176 add-patch.c:221
498 +#: add-patch.c
499 msgid ""
500 "If the patch applies cleanly, the edited hunk will immediately be marked for "
501 "applying."
502 msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。"
503
514 -#: add-patch.c:111
504 +#: add-patch.c
505 msgid ""
506 "y - apply this hunk to index\n"
507 "n - do not apply this hunk to index\n"
@@ -525,37 +515,33 @@ msgstr ""
515 "a - 应用该块和本文件中后面的全部块\n"
516 "d - 不要应用该块和本文件中后面的全部块\n"
517
528 -#: add-patch.c:126 git-add--interactive.perl:1457
529 -#: git-add--interactive.perl:1475
518 +#: add-patch.c git-add--interactive.perl
519 #, c-format, perl-format
520 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
521 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
522
534 -#: add-patch.c:127 git-add--interactive.perl:1458
535 -#: git-add--interactive.perl:1476
523 +#: add-patch.c git-add--interactive.perl
524 #, c-format, perl-format
525 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
526 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
527
540 -#: add-patch.c:128 git-add--interactive.perl:1459
541 -#: git-add--interactive.perl:1477
528 +#: add-patch.c git-add--interactive.perl
529 #, c-format, perl-format
530 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
531 msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
532
546 -#: add-patch.c:129 git-add--interactive.perl:1460
547 -#: git-add--interactive.perl:1478
533 +#: add-patch.c git-add--interactive.perl
534 #, c-format, perl-format
535 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
536 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
537
552 -#: add-patch.c:131 add-patch.c:154 add-patch.c:199
538 +#: add-patch.c
539 msgid ""
540 "If the patch applies cleanly, the edited hunk will immediately be marked for "
541 "discarding."
542 msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。"
543
558 -#: add-patch.c:134 add-patch.c:202
544 +#: add-patch.c
545 msgid ""
546 "y - discard this hunk from worktree\n"
547 "n - do not discard this hunk from worktree\n"
@@ -569,27 +555,27 @@ msgstr ""
555 "a - 丢弃该块和本文件中后面的全部块\n"
556 "d - 不要丢弃该块和本文件中后面的全部块\n"
557
572 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
558 +#: add-patch.c git-add--interactive.perl
559 #, c-format, perl-format
560 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
561 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
562
577 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
563 +#: add-patch.c git-add--interactive.perl
564 #, c-format, perl-format
565 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
566 msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
567
582 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
568 +#: add-patch.c git-add--interactive.perl
569 #, c-format, perl-format
570 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
571 msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
572
587 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
573 +#: add-patch.c git-add--interactive.perl
574 #, c-format, perl-format
575 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
576 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
577
592 -#: add-patch.c:157
578 +#: add-patch.c
579 msgid ""
580 "y - discard this hunk from index and worktree\n"
581 "n - do not discard this hunk from index and worktree\n"
@@ -603,27 +589,27 @@ msgstr ""
589 "a - 丢弃该块和本文件中后面的全部块\n"
590 "d - 不要丢弃该块和本文件中后面的全部块\n"
591
606 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
592 +#: add-patch.c git-add--interactive.perl
593 #, c-format, perl-format
594 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
595 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
596
611 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
597 +#: add-patch.c git-add--interactive.perl
598 #, c-format, perl-format
599 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
600 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
601
616 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
602 +#: add-patch.c git-add--interactive.perl
603 #, c-format, perl-format
604 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
605 msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
606
621 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
607 +#: add-patch.c git-add--interactive.perl
608 #, c-format, perl-format
609 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
610 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
611
626 -#: add-patch.c:179
612 +#: add-patch.c
613 msgid ""
614 "y - apply this hunk to index and worktree\n"
615 "n - do not apply this hunk to index and worktree\n"
@@ -637,7 +623,7 @@ msgstr ""
623 "a - 应用该块和本文件中后面的全部块\n"
624 "d - 不要应用该块和本文件中后面的全部块\n"
625
640 -#: add-patch.c:224
626 +#: add-patch.c
627 msgid ""
628 "y - apply this hunk to worktree\n"
629 "n - do not apply this hunk to worktree\n"
@@ -651,40 +637,40 @@ msgstr ""
637 "a - 应用该块和本文件中后面的全部块\n"
638 "d - 不要应用该块和本文件中后面的全部块\n"
639
654 -#: add-patch.c:343
640 +#: add-patch.c
641 #, c-format
642 msgid "could not parse hunk header '%.*s'"
643 msgstr "无法解析数据块头信息 '%.*s'"
644
659 -#: add-patch.c:362 add-patch.c:366
645 +#: add-patch.c
646 #, c-format
647 msgid "could not parse colored hunk header '%.*s'"
648 msgstr "无法解析彩色数据块头信息 '%.*s'"
649
664 -#: add-patch.c:431
650 +#: add-patch.c
651 msgid "could not parse diff"
652 msgstr "不能解析差异信息"
653
668 -#: add-patch.c:450
654 +#: add-patch.c
655 msgid "could not parse colored diff"
656 msgstr "不能解析彩色差异信息"
657
672 -#: add-patch.c:464
658 +#: add-patch.c
659 #, c-format
660 msgid "failed to run '%s'"
661 msgstr "无法运行 '%s'"
662
677 -#: add-patch.c:618
663 +#: add-patch.c
664 msgid "mismatched output from interactive.diffFilter"
665 msgstr "interactive.diffFilter 的输出不匹配"
666
681 -#: add-patch.c:619
667 +#: add-patch.c
668 msgid ""
669 "Your filter must maintain a one-to-one correspondence\n"
670 "between its input and output lines."
671 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
672
687 -#: add-patch.c:797
673 +#: add-patch.c
674 #, c-format
675 msgid ""
676 "expected context line #%d in\n"
@@ -693,7 +679,7 @@ msgstr ""
679 "预期上下文行 #%d 于\n"
680 "%.*s"
681
696 -#: add-patch.c:812
682 +#: add-patch.c
683 #, c-format
684 msgid ""
685 "hunks do not overlap:\n"
@@ -706,11 +692,11 @@ msgstr ""
692 "\t不是结尾于：\n"
693 "%.*s"
694
709 -#: add-patch.c:1088 git-add--interactive.perl:1115
695 +#: add-patch.c git-add--interactive.perl
696 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
697 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
698
713 -#: add-patch.c:1092
699 +#: add-patch.c
700 #, c-format
701 msgid ""
702 "---\n"
@@ -723,8 +709,9 @@ msgstr ""
709 "要删除 '%c' 开始的行，删除它们。\n"
710 "以 %c 开始的行将被删除。\n"
711
712 +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
713 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
727 -#: add-patch.c:1106 git-add--interactive.perl:1129
714 +#: add-patch.c git-add--interactive.perl
715 msgid ""
716 "If it does not apply cleanly, you will be given an opportunity to\n"
717 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -733,44 +720,46 @@ msgstr ""
720 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
721 "此次编辑被终止，该块不会被修改。\n"
722
736 -#: add-patch.c:1139
723 +#: add-patch.c
724 msgid "could not parse hunk header"
725 msgstr "无法解析数据块头信息"
726
740 -#: add-patch.c:1184
727 +#: add-patch.c
728 msgid "'git apply --cached' failed"
729 msgstr "'git apply --cached' 失败"
730
731 +#. #-#-#-#-# add-patch.c.po #-#-#-#-#
732 #. TRANSLATORS: do not translate [y/n]
733 #. The program will only accept that input at this point.
734 #. Consider translating (saying "no" discards!) as
735 #. (saying "n" for "no" discards!) if the translation
736 #. of the word "no" does not start with n.
737 #.
738 +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
739 #. TRANSLATORS: do not translate [y/n]
740 #. The program will only accept that input
741 #. at this point.
742 #. Consider translating (saying "no" discards!) as
743 #. (saying "n" for "no" discards!) if the translation
744 #. of the word "no" does not start with n.
756 -#: add-patch.c:1253 git-add--interactive.perl:1244
745 +#: add-patch.c git-add--interactive.perl
746 msgid ""
747 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
748 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
749
761 -#: add-patch.c:1296
750 +#: add-patch.c
751 msgid "The selected hunks do not apply to the index!"
752 msgstr "选中的块不能应用到索引！"
753
765 -#: add-patch.c:1297 git-add--interactive.perl:1348
754 +#: add-patch.c git-add--interactive.perl
755 msgid "Apply them to the worktree anyway? "
756 msgstr "无论如何都要应用到工作区么？"
757
769 -#: add-patch.c:1304 git-add--interactive.perl:1351
758 +#: add-patch.c git-add--interactive.perl
759 msgid "Nothing was applied.\n"
760 msgstr "未应用。\n"
761
773 -#: add-patch.c:1361
762 +#: add-patch.c
763 msgid ""
764 "j - leave this hunk undecided, see next undecided hunk\n"
765 "J - leave this hunk undecided, see next hunk\n"
@@ -792,73 +781,73 @@ msgstr ""
781 "e - 手动编辑当前块\n"
782 "? - 显示帮助\n"
783
795 -#: add-patch.c:1523 add-patch.c:1533
784 +#: add-patch.c
785 msgid "No previous hunk"
786 msgstr "没有前一个块"
787
799 -#: add-patch.c:1528 add-patch.c:1538
788 +#: add-patch.c
789 msgid "No next hunk"
790 msgstr "没有下一个块"
791
803 -#: add-patch.c:1544
792 +#: add-patch.c
793 msgid "No other hunks to goto"
794 msgstr "没有其它可供跳转的块"
795
807 -#: add-patch.c:1555 git-add--interactive.perl:1608
796 +#: add-patch.c git-add--interactive.perl
797 msgid "go to which hunk (<ret> to see more)? "
798 msgstr "跳转到哪个块（<回车> 查看更多）？ "
799
811 -#: add-patch.c:1556 git-add--interactive.perl:1610
800 +#: add-patch.c git-add--interactive.perl
801 msgid "go to which hunk? "
802 msgstr "跳转到哪个块？"
803
815 -#: add-patch.c:1567
804 +#: add-patch.c
805 #, c-format
806 msgid "Invalid number: '%s'"
807 msgstr "无效数字：'%s'"
808
820 -#: add-patch.c:1572
809 +#: add-patch.c
810 #, c-format
811 msgid "Sorry, only %d hunk available."
812 msgid_plural "Sorry, only %d hunks available."
813 msgstr[0] "对不起，只有 %d 个可用块。"
814 msgstr[1] "对不起，只有 %d 个可用块。"
815
827 -#: add-patch.c:1581
816 +#: add-patch.c
817 msgid "No other hunks to search"
818 msgstr "没有其它可供查找的块"
819
831 -#: add-patch.c:1587 git-add--interactive.perl:1663
820 +#: add-patch.c git-add--interactive.perl
821 msgid "search for regex? "
822 msgstr "使用正则表达式搜索？"
823
835 -#: add-patch.c:1602
824 +#: add-patch.c
825 #, c-format
826 msgid "Malformed search regexp %s: %s"
827 msgstr "错误的正则表达式 %s：%s"
828
840 -#: add-patch.c:1619
829 +#: add-patch.c
830 msgid "No hunk matches the given pattern"
831 msgstr "没有和给定模式相匹配的块"
832
844 -#: add-patch.c:1626
833 +#: add-patch.c
834 msgid "Sorry, cannot split this hunk"
835 msgstr "对不起，不能拆分这个块"
836
848 -#: add-patch.c:1630
837 +#: add-patch.c
838 #, c-format
839 msgid "Split into %d hunks."
840 msgstr "拆分为 %d 块。"
841
853 -#: add-patch.c:1634
842 +#: add-patch.c
843 msgid "Sorry, cannot edit this hunk"
844 msgstr "对不起，不能编辑这个块"
845
857 -#: add-patch.c:1686
846 +#: add-patch.c
847 msgid "'git apply' failed"
848 msgstr "'git apply' 失败"
849
861 -#: advice.c:81
850 +#: advice.c
851 #, c-format
852 msgid ""
853 "\n"
@@ -867,37 +856,37 @@ msgstr ""
856 "\n"
857 "使用 \"git config advice.%s false\" 来关闭此消息"
858
870 -#: advice.c:97
859 +#: advice.c
860 #, c-format
861 msgid "%shint: %.*s%s\n"
862 msgstr "%s提示：%.*s%s\n"
863
875 -#: advice.c:181
864 +#: advice.c
865 msgid "Cherry-picking is not possible because you have unmerged files."
866 msgstr "无法拣选，因为您有未合并的文件。"
867
879 -#: advice.c:183
868 +#: advice.c
869 msgid "Committing is not possible because you have unmerged files."
870 msgstr "无法提交，因为您有未合并的文件。"
871
883 -#: advice.c:185
872 +#: advice.c
873 msgid "Merging is not possible because you have unmerged files."
874 msgstr "无法合并，因为您有未合并的文件。"
875
887 -#: advice.c:187
876 +#: advice.c
877 msgid "Pulling is not possible because you have unmerged files."
878 msgstr "无法拉取，因为您有未合并的文件。"
879
891 -#: advice.c:189
880 +#: advice.c
881 msgid "Reverting is not possible because you have unmerged files."
882 msgstr "无法回退，因为您有未合并的文件。"
883
895 -#: advice.c:191
884 +#: advice.c
885 #, c-format
886 msgid "It is not possible to %s because you have unmerged files."
887 msgstr "无法 %s，因为您有未合并的文件。"
888
900 -#: advice.c:199
889 +#: advice.c
890 msgid ""
891 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
892 "as appropriate to mark resolution and make a commit."
@@ -905,27 +894,27 @@ msgstr ""
894 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
895 "解决方案并提交。"
896
908 -#: advice.c:207
897 +#: advice.c
898 msgid "Exiting because of an unresolved conflict."
899 msgstr "因为存在未解决的冲突而退出。"
900
912 -#: advice.c:212 builtin/merge.c:1388
901 +#: advice.c builtin/merge.c
902 msgid "You have not concluded your merge (MERGE_HEAD exists)."
903 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
904
916 -#: advice.c:214
905 +#: advice.c
906 msgid "Please, commit your changes before merging."
907 msgstr "请在合并前先提交您的修改。"
908
920 -#: advice.c:215
909 +#: advice.c
910 msgid "Exiting because of unfinished merge."
911 msgstr "因为存在未完成的合并而退出。"
912
924 -#: advice.c:220
913 +#: advice.c
914 msgid "Not possible to fast-forward, aborting."
915 msgstr "无法快进，终止。"
916
928 -#: advice.c:230
917 +#: advice.c
918 #, c-format
919 msgid ""
920 "The following paths and/or pathspecs matched paths that exist\n"
@@ -935,7 +924,7 @@ msgstr ""
924 "下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n"
925 "所以不会在索引中更新：\n"
926
938 -#: advice.c:237
927 +#: advice.c
928 msgid ""
929 "If you intend to update such entries, try one of the following:\n"
930 "* Use the --sparse option.\n"
@@ -945,7 +934,7 @@ msgstr ""
934 "* 使用 --sparse 选项。\n"
935 "* 禁用或者修改稀疏规则。"
936
948 -#: advice.c:245
937 +#: advice.c
938 #, c-format
939 msgid ""
940 "Note: switching to '%s'.\n"
@@ -984,101 +973,87 @@ msgstr ""
973 "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
974 "\n"
975
987 -#: alias.c:50
976 +#: alias.c
977 msgid "cmdline ends with \\"
978 msgstr "命令行以 \\ 结尾"
979
991 -#: alias.c:51
980 +#: alias.c
981 msgid "unclosed quote"
982 msgstr "未关闭的引号"
983
995 -#: apply.c:70
984 +#: apply.c
985 #, c-format
986 msgid "unrecognized whitespace option '%s'"
987 msgstr "未能识别的空白字符选项 '%s'"
988
1000 -#: apply.c:86
989 +#: apply.c
990 #, c-format
991 msgid "unrecognized whitespace ignore option '%s'"
992 msgstr "未能识别的空白字符忽略选项 '%s'"
993
1005 -#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
1006 -#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
1007 -#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
1008 -#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
1009 -#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
1010 -#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
1011 -#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
1012 -#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
1013 -#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
1014 -#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
1015 -#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
1016 -#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
1017 -#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
1018 -#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
1019 -#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
1020 -#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
1021 -#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
1022 -#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
1023 -#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
1024 -#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
1025 -#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
1026 -#: builtin/worktree.c:779
994 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c
995 +#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c
996 +#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c
997 +#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c
998 +#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c
999 +#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c
1000 +#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
1001 +#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
1002 #, c-format
1003 msgid "options '%s' and '%s' cannot be used together"
1004 msgstr "选项 '%s' 和 '%s' 不能同时使用"
1005
1031 -#: apply.c:141 apply.c:152 apply.c:155
1006 +#: apply.c
1007 #, c-format
1008 msgid "'%s' outside a repository"
1009 msgstr "'%s' 在仓库之外"
1010
1036 -#: apply.c:807
1011 +#: apply.c
1012 #, c-format
1013 msgid "Cannot prepare timestamp regexp %s"
1014 msgstr "无法准备时间戳正则表达式 %s"
1015
1041 -#: apply.c:816
1016 +#: apply.c
1017 #, c-format
1018 msgid "regexec returned %d for input: %s"
1019 msgstr "regexec 返回 %d，输入为：%s"
1020
1046 -#: apply.c:890
1021 +#: apply.c
1022 #, c-format
1023 msgid "unable to find filename in patch at line %d"
1024 msgstr "不能在补丁的第 %d 行找到文件名"
1025
1051 -#: apply.c:928
1026 +#: apply.c
1027 #, c-format
1028 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1029 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
1030
1056 -#: apply.c:934
1031 +#: apply.c
1032 #, c-format
1033 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1034 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
1035
1061 -#: apply.c:935
1036 +#: apply.c
1037 #, c-format
1038 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1039 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
1040
1066 -#: apply.c:940
1041 +#: apply.c
1042 #, c-format
1043 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1044 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
1045
1071 -#: apply.c:969
1046 +#: apply.c
1047 #, c-format
1048 msgid "invalid mode on line %d: %s"
1049 msgstr "第 %d 行包含无效文件模式：%s"
1050
1076 -#: apply.c:1288
1051 +#: apply.c
1052 #, c-format
1053 msgid "inconsistent header lines %d and %d"
1054 msgstr "不一致的文件头，%d 行和 %d 行"
1055
1081 -#: apply.c:1378
1056 +#: apply.c
1057 #, c-format
1058 msgid ""
1059 "git diff header lacks filename information when removing %d leading pathname "
@@ -1089,92 +1064,92 @@ msgid_plural ""
1064 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1065 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1066
1092 -#: apply.c:1391
1067 +#: apply.c
1068 #, c-format
1069 msgid "git diff header lacks filename information (line %d)"
1070 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
1071
1097 -#: apply.c:1487
1072 +#: apply.c
1073 #, c-format
1074 msgid "recount: unexpected line: %.*s"
1075 msgstr "recount：意外的行：%.*s"
1076
1102 -#: apply.c:1556
1077 +#: apply.c
1078 #, c-format
1079 msgid "patch fragment without header at line %d: %.*s"
1080 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
1081
1107 -#: apply.c:1759
1082 +#: apply.c
1083 msgid "new file depends on old contents"
1084 msgstr "新文件依赖旧内容"
1085
1111 -#: apply.c:1761
1086 +#: apply.c
1087 msgid "deleted file still has contents"
1088 msgstr "删除的文件仍有内容"
1089
1115 -#: apply.c:1795
1090 +#: apply.c
1091 #, c-format
1092 msgid "corrupt patch at line %d"
1093 msgstr "补丁在第 %d 行损坏"
1094
1120 -#: apply.c:1832
1095 +#: apply.c
1096 #, c-format
1097 msgid "new file %s depends on old contents"
1098 msgstr "新文件 %s 依赖旧内容"
1099
1125 -#: apply.c:1834
1100 +#: apply.c
1101 #, c-format
1102 msgid "deleted file %s still has contents"
1103 msgstr "删除的文件 %s 仍有内容"
1104
1130 -#: apply.c:1837
1105 +#: apply.c
1106 #, c-format
1107 msgid "** warning: file %s becomes empty but is not deleted"
1108 msgstr "** 警告：文件 %s 成为空文件但并未删除"
1109
1135 -#: apply.c:1985
1110 +#: apply.c
1111 #, c-format
1112 msgid "corrupt binary patch at line %d: %.*s"
1113 msgstr "二进制补丁在第 %d 行损坏：%.*s"
1114
1140 -#: apply.c:2022
1115 +#: apply.c
1116 #, c-format
1117 msgid "unrecognized binary patch at line %d"
1118 msgstr "未能识别的二进制补丁位于第 %d 行"
1119
1145 -#: apply.c:2184
1120 +#: apply.c
1121 #, c-format
1122 msgid "patch with only garbage at line %d"
1123 msgstr "补丁文件的第 %d 行只有垃圾数据"
1124
1150 -#: apply.c:2270
1125 +#: apply.c
1126 #, c-format
1127 msgid "unable to read symlink %s"
1128 msgstr "无法读取符号链接 %s"
1129
1155 -#: apply.c:2274
1130 +#: apply.c
1131 #, c-format
1132 msgid "unable to open or read %s"
1133 msgstr "不能打开或读取 %s"
1134
1160 -#: apply.c:2943
1135 +#: apply.c
1136 #, c-format
1137 msgid "invalid start of line: '%c'"
1138 msgstr "无效的行首字符：'%c'"
1139
1165 -#: apply.c:3064
1140 +#: apply.c
1141 #, c-format
1142 msgid "Hunk #%d succeeded at %d (offset %d line)."
1143 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1144 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
1145 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
1146
1172 -#: apply.c:3076
1147 +#: apply.c
1148 #, c-format
1149 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1150 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
1151
1177 -#: apply.c:3082
1152 +#: apply.c
1153 #, c-format
1154 msgid ""
1155 "while searching for:\n"
@@ -1183,645 +1158,650 @@ msgstr ""
1158 "当查询：\n"
1159 "%.*s"
1160
1186 -#: apply.c:3104
1161 +#: apply.c
1162 #, c-format
1163 msgid "missing binary patch data for '%s'"
1164 msgstr "缺失 '%s' 的二进制补丁数据"
1165
1191 -#: apply.c:3112
1166 +#: apply.c
1167 #, c-format
1168 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1169 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
1170
1196 -#: apply.c:3159
1171 +#: apply.c
1172 #, c-format
1173 msgid "cannot apply binary patch to '%s' without full index line"
1174 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
1175
1201 -#: apply.c:3170
1176 +#: apply.c
1177 #, c-format
1178 msgid ""
1179 "the patch applies to '%s' (%s), which does not match the current contents."
1180 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
1181
1207 -#: apply.c:3178
1182 +#: apply.c
1183 #, c-format
1184 msgid "the patch applies to an empty '%s' but it is not empty"
1185 msgstr "补丁应用到空文件 '%s'，但其并非空文件"
1186
1212 -#: apply.c:3196
1187 +#: apply.c
1188 #, c-format
1189 msgid "the necessary postimage %s for '%s' cannot be read"
1190 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
1191
1217 -#: apply.c:3209
1192 +#: apply.c
1193 #, c-format
1194 msgid "binary patch does not apply to '%s'"
1195 msgstr "二进制补丁未应用到 '%s'"
1196
1222 -#: apply.c:3216
1197 +#: apply.c
1198 #, c-format
1199 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1200 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
1201
1227 -#: apply.c:3237
1202 +#: apply.c
1203 #, c-format
1204 msgid "patch failed: %s:%ld"
1205 msgstr "打补丁失败：%s:%ld"
1206
1232 -#: apply.c:3360
1207 +#: apply.c
1208 #, c-format
1209 msgid "cannot checkout %s"
1210 msgstr "不能检出 %s"
1211
1237 -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
1238 -#: setup.c:310
1212 +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c
1213 #, c-format
1214 msgid "failed to read %s"
1215 msgstr "无法读取 %s"
1216
1243 -#: apply.c:3420
1217 +#: apply.c
1218 #, c-format
1219 msgid "reading from '%s' beyond a symbolic link"
1220 msgstr "读取位于符号链接中的 '%s'"
1221
1248 -#: apply.c:3449 apply.c:3721
1222 +#: apply.c
1223 #, c-format
1224 msgid "path %s has been renamed/deleted"
1225 msgstr "路径 %s 已经被重命名/删除"
1226
1253 -#: apply.c:3559 apply.c:3736
1227 +#: apply.c
1228 #, c-format
1229 msgid "%s: does not exist in index"
1230 msgstr "%s：不存在于索引中"
1231
1258 -#: apply.c:3568 apply.c:3744 apply.c:3960
1232 +#: apply.c
1233 #, c-format
1234 msgid "%s: does not match index"
1235 msgstr "%s：和索引不匹配"
1236
1263 -#: apply.c:3605
1237 +#: apply.c
1238 msgid "repository lacks the necessary blob to perform 3-way merge."
1239 msgstr "仓库缺乏执行三方合并所必需的数据对象。"
1240
1267 -#: apply.c:3608
1241 +#: apply.c
1242 #, c-format
1243 msgid "Performing three-way merge...\n"
1244 msgstr "执行三方合并...\n"
1245
1272 -#: apply.c:3624 apply.c:3628
1246 +#: apply.c
1247 #, c-format
1248 msgid "cannot read the current contents of '%s'"
1249 msgstr "无法读取 '%s' 的当前内容"
1250
1277 -#: apply.c:3640
1251 +#: apply.c
1252 #, c-format
1253 msgid "Failed to perform three-way merge...\n"
1254 msgstr "无法执行三方合并...\n"
1255
1282 -#: apply.c:3654
1256 +#: apply.c
1257 #, c-format
1258 msgid "Applied patch to '%s' with conflicts.\n"
1259 msgstr "应用补丁到 '%s' 存在冲突。\n"
1260
1287 -#: apply.c:3659
1261 +#: apply.c
1262 #, c-format
1263 msgid "Applied patch to '%s' cleanly.\n"
1264 msgstr "成功应用补丁到 '%s'。\n"
1265
1292 -#: apply.c:3676
1266 +#: apply.c
1267 #, c-format
1268 msgid "Falling back to direct application...\n"
1269 msgstr "回落到直接应用...\n"
1270
1297 -#: apply.c:3688
1271 +#: apply.c
1272 msgid "removal patch leaves file contents"
1273 msgstr "移除补丁仍留下了文件内容"
1274
1301 -#: apply.c:3761
1275 +#: apply.c
1276 #, c-format
1277 msgid "%s: wrong type"
1278 msgstr "%s：错误类型"
1279
1306 -#: apply.c:3763
1280 +#: apply.c
1281 #, c-format
1282 msgid "%s has type %o, expected %o"
1283 msgstr "%s 的类型是 %o，应为 %o"
1284
1311 -#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
1312 -#: read-cache.c:1399
1285 +#: apply.c read-cache.c
1286 #, c-format
1287 msgid "invalid path '%s'"
1288 msgstr "无效路径 '%s'"
1289
1317 -#: apply.c:3958
1290 +#: apply.c
1291 #, c-format
1292 msgid "%s: already exists in index"
1293 msgstr "%s：已经存在于索引中"
1294
1322 -#: apply.c:3962
1295 +#: apply.c
1296 #, c-format
1297 msgid "%s: already exists in working directory"
1298 msgstr "%s：已经存在于工作区中"
1299
1327 -#: apply.c:3982
1300 +#: apply.c
1301 #, c-format
1302 msgid "new mode (%o) of %s does not match old mode (%o)"
1303 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
1304
1332 -#: apply.c:3987
1305 +#: apply.c
1306 #, c-format
1307 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1308 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
1309
1337 -#: apply.c:4007
1310 +#: apply.c
1311 #, c-format
1312 msgid "affected file '%s' is beyond a symbolic link"
1313 msgstr "受影响的文件 '%s' 位于符号链接中"
1314
1342 -#: apply.c:4011
1315 +#: apply.c
1316 #, c-format
1317 msgid "%s: patch does not apply"
1318 msgstr "%s：补丁未应用"
1319
1347 -#: apply.c:4026
1320 +#: apply.c
1321 #, c-format
1322 msgid "Checking patch %s..."
1323 msgstr "正在检查补丁 %s..."
1324
1352 -#: apply.c:4118
1325 +#: apply.c
1326 #, c-format
1327 msgid "sha1 information is lacking or useless for submodule %s"
1328 msgstr "子模组 %s 的 sha1 信息缺失或无效"
1329
1357 -#: apply.c:4125
1330 +#: apply.c
1331 #, c-format
1332 msgid "mode change for %s, which is not in current HEAD"
1333 msgstr "%s 的模式变更，但它不在当前 HEAD 中"
1334
1362 -#: apply.c:4128
1335 +#: apply.c
1336 #, c-format
1337 msgid "sha1 information is lacking or useless (%s)."
1338 msgstr "sha1 信息缺失或无效（%s）。"
1339
1367 -#: apply.c:4137
1340 +#: apply.c
1341 #, c-format
1342 msgid "could not add %s to temporary index"
1343 msgstr "不能在临时索引中添加 %s"
1344
1372 -#: apply.c:4147
1345 +#: apply.c
1346 #, c-format
1347 msgid "could not write temporary index to %s"
1348 msgstr "不能把临时索引写入到 %s"
1349
1377 -#: apply.c:4285
1350 +#: apply.c
1351 #, c-format
1352 msgid "unable to remove %s from index"
1353 msgstr "不能从索引中移除 %s"
1354
1382 -#: apply.c:4319
1355 +#: apply.c
1356 #, c-format
1357 msgid "corrupt patch for submodule %s"
1358 msgstr "子模组 %s 损坏的补丁"
1359
1387 -#: apply.c:4325
1360 +#: apply.c
1361 #, c-format
1362 msgid "unable to stat newly created file '%s'"
1363 msgstr "不能对新建文件 '%s' 调用 stat"
1364
1392 -#: apply.c:4333
1365 +#: apply.c
1366 #, c-format
1367 msgid "unable to create backing store for newly created file %s"
1368 msgstr "不能为新建文件 %s 创建后端存储"
1369
1397 -#: apply.c:4339 apply.c:4484
1370 +#: apply.c
1371 #, c-format
1372 msgid "unable to add cache entry for %s"
1373 msgstr "无法为 %s 添加缓存条目"
1374
1402 -#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
1403 -#: builtin/gc.c:2293
1375 +#: apply.c builtin/bisect--helper.c builtin/gc.c
1376 #, c-format
1377 msgid "failed to write to '%s'"
1378 msgstr "无法写入 '%s'"
1379
1408 -#: apply.c:4386
1380 +#: apply.c
1381 #, c-format
1382 msgid "closing file '%s'"
1383 msgstr "关闭文件 '%s'"
1384
1413 -#: apply.c:4456
1385 +#: apply.c
1386 #, c-format
1387 msgid "unable to write file '%s' mode %o"
1388 msgstr "不能写文件 '%s' 权限 %o"
1389
1418 -#: apply.c:4554
1390 +#: apply.c
1391 #, c-format
1392 msgid "Applied patch %s cleanly."
1393 msgstr "成功应用补丁 %s。"
1394
1423 -#: apply.c:4562
1395 +#: apply.c
1396 msgid "internal error"
1397 msgstr "内部错误"
1398
1427 -#: apply.c:4565
1399 +#: apply.c
1400 #, c-format
1401 msgid "Applying patch %%s with %d reject..."
1402 msgid_plural "Applying patch %%s with %d rejects..."
1403 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1404 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1405
1434 -#: apply.c:4576
1406 +#: apply.c
1407 #, c-format
1408 msgid "truncating .rej filename to %.*s.rej"
1409 msgstr "截短 .rej 文件名为 %.*s.rej"
1410
1439 -#: apply.c:4584
1411 +#: apply.c
1412 #, c-format
1413 msgid "cannot open %s"
1414 msgstr "不能打开 %s"
1415
1444 -#: apply.c:4598
1416 +#: apply.c
1417 #, c-format
1418 msgid "Hunk #%d applied cleanly."
1419 msgstr "第 #%d 个片段成功应用。"
1420
1449 -#: apply.c:4602
1421 +#: apply.c
1422 #, c-format
1423 msgid "Rejected hunk #%d."
1424 msgstr "拒绝第 #%d 个片段。"
1425
1454 -#: apply.c:4731
1426 +#: apply.c
1427 #, c-format
1428 msgid "Skipped patch '%s'."
1429 msgstr "略过补丁 '%s'。"
1430
1459 -#: apply.c:4740
1431 +#: apply.c
1432 msgid "No valid patches in input (allow with \"--allow-empty\")"
1433 msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）"
1434
1463 -#: apply.c:4761
1435 +#: apply.c
1436 msgid "unable to read index file"
1437 msgstr "无法读取索引文件"
1438
1467 -#: apply.c:4918
1439 +#: apply.c
1440 #, c-format
1441 msgid "can't open patch '%s': %s"
1442 msgstr "不能打开补丁 '%s'：%s"
1443
1472 -#: apply.c:4945
1444 +#: apply.c
1445 #, c-format
1446 msgid "squelched %d whitespace error"
1447 msgid_plural "squelched %d whitespace errors"
1448 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1449 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1450
1479 -#: apply.c:4951 apply.c:4966
1451 +#: apply.c
1452 #, c-format
1453 msgid "%d line adds whitespace errors."
1454 msgid_plural "%d lines add whitespace errors."
1455 msgstr[0] "%d 行新增了空白字符误用。"
1456 msgstr[1] "%d 行新增了空白字符误用。"
1457
1486 -#: apply.c:4959
1458 +#: apply.c
1459 #, c-format
1460 msgid "%d line applied after fixing whitespace errors."
1461 msgid_plural "%d lines applied after fixing whitespace errors."
1462 msgstr[0] "修复空白错误后，应用了 %d 行。"
1463 msgstr[1] "修复空白错误后，应用了 %d 行。"
1464
1493 -#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
1465 +#: apply.c builtin/add.c builtin/mv.c builtin/rm.c
1466 msgid "Unable to write new index file"
1467 msgstr "无法写入新索引文件"
1468
1497 -#: apply.c:5003
1469 +#: apply.c
1470 msgid "don't apply changes matching the given path"
1471 msgstr "不要应用与给出路径向匹配的变更"
1472
1501 -#: apply.c:5006
1473 +#: apply.c
1474 msgid "apply changes matching the given path"
1475 msgstr "应用与给出路径向匹配的变更"
1476
1505 -#: apply.c:5008 builtin/am.c:2379
1477 +#: apply.c builtin/am.c
1478 msgid "num"
1479 msgstr "数字"
1480
1509 -#: apply.c:5009
1481 +#: apply.c
1482 msgid "remove <num> leading slashes from traditional diff paths"
1483 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1484
1513 -#: apply.c:5012
1485 +#: apply.c
1486 msgid "ignore additions made by the patch"
1487 msgstr "忽略补丁中的添加的文件"
1488
1517 -#: apply.c:5014
1489 +#: apply.c
1490 msgid "instead of applying the patch, output diffstat for the input"
1491 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1492
1521 -#: apply.c:5018
1493 +#: apply.c
1494 msgid "show number of added and deleted lines in decimal notation"
1495 msgstr "以十进制数显示添加和删除的行数"
1496
1525 -#: apply.c:5020
1497 +#: apply.c
1498 msgid "instead of applying the patch, output a summary for the input"
1499 msgstr "不应用补丁，而是显示输入的概要"
1500
1529 -#: apply.c:5022
1501 +#: apply.c
1502 msgid "instead of applying the patch, see if the patch is applicable"
1503 msgstr "不应用补丁，而是查看补丁是否可应用"
1504
1533 -#: apply.c:5024
1505 +#: apply.c
1506 msgid "make sure the patch is applicable to the current index"
1507 msgstr "确认补丁可以应用到当前索引"
1508
1537 -#: apply.c:5026
1509 +#: apply.c
1510 msgid "mark new files with `git add --intent-to-add`"
1511 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1512
1541 -#: apply.c:5028
1513 +#: apply.c
1514 msgid "apply a patch without touching the working tree"
1515 msgstr "应用补丁而不修改工作区"
1516
1545 -#: apply.c:5030
1517 +#: apply.c
1518 msgid "accept a patch that touches outside the working area"
1519 msgstr "接受修改工作区之外文件的补丁"
1520
1549 -#: apply.c:5033
1521 +#: apply.c
1522 msgid "also apply the patch (use with --stat/--summary/--check)"
1523 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
1524
1553 -#: apply.c:5035
1525 +#: apply.c
1526 msgid "attempt three-way merge, fall back on normal patch if that fails"
1527 msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
1528
1557 -#: apply.c:5037
1529 +#: apply.c
1530 msgid "build a temporary index based on embedded index information"
1531 msgstr "创建一个临时索引基于嵌入的索引信息"
1532
1561 -#: apply.c:5040 builtin/checkout-index.c:230
1533 +#: apply.c builtin/checkout-index.c
1534 msgid "paths are separated with NUL character"
1535 msgstr "路径以 NUL 字符分隔"
1536
1565 -#: apply.c:5042
1537 +#: apply.c
1538 msgid "ensure at least <n> lines of context match"
1539 msgstr "确保至少匹配 <n> 行上下文"
1540
1569 -#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
1570 -#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1571 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
1572 -#: builtin/rebase.c:1079
1541 +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c
1542 +#: builtin/rebase.c
1543 msgid "action"
1544 msgstr "动作"
1545
1576 -#: apply.c:5044
1546 +#: apply.c
1547 msgid "detect new or modified lines that have whitespace errors"
1548 msgstr "检查新增和修改的行中间的空白字符滥用"
1549
1580 -#: apply.c:5047 apply.c:5050
1550 +#: apply.c
1551 msgid "ignore changes in whitespace when finding context"
1552 msgstr "查找上下文时忽略空白字符的变更"
1553
1584 -#: apply.c:5053
1554 +#: apply.c
1555 msgid "apply the patch in reverse"
1556 msgstr "反向应用补丁"
1557
1588 -#: apply.c:5055
1558 +#: apply.c
1559 msgid "don't expect at least one line of context"
1560 msgstr "无需至少一行上下文"
1561
1592 -#: apply.c:5057
1562 +#: apply.c
1563 msgid "leave the rejected hunks in corresponding *.rej files"
1564 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1565
1596 -#: apply.c:5059
1566 +#: apply.c
1567 msgid "allow overlapping hunks"
1568 msgstr "允许重叠的补丁片段"
1569
1600 -#: apply.c:5062
1570 +#: apply.c
1571 msgid "tolerate incorrectly detected missing new-line at the end of file"
1572 msgstr "允许不正确的文件末尾换行符"
1573
1604 -#: apply.c:5065
1574 +#: apply.c
1575 msgid "do not trust the line counts in the hunk headers"
1576 msgstr "不信任补丁片段的头信息中的行号"
1577
1608 -#: apply.c:5067 builtin/am.c:2367
1578 +#: apply.c builtin/am.c
1579 msgid "root"
1580 msgstr "根目录"
1581
1612 -#: apply.c:5068
1582 +#: apply.c
1583 msgid "prepend <root> to all filenames"
1584 msgstr "为所有文件名前添加 <根目录>"
1585
1616 -#: apply.c:5071
1586 +#: apply.c
1587 msgid "don't return error for empty patches"
1588 msgstr "对空的补丁不返回错误"
1589
1620 -#: archive-tar.c:125 archive-zip.c:346
1590 +#: archive-tar.c archive-zip.c
1591 #, c-format
1592 msgid "cannot stream blob %s"
1593 msgstr "不能打开数据对象 %s"
1594
1625 -#: archive-tar.c:265 archive-zip.c:359
1595 +#: archive-tar.c archive-zip.c
1596 #, c-format
1597 msgid "unsupported file mode: 0%o (SHA1: %s)"
1598 msgstr "不支持的文件模式：0%o (SHA1: %s)"
1599
1630 -#: archive-tar.c:447
1600 +#: archive-tar.c
1601 #, c-format
1602 msgid "unable to start '%s' filter"
1603 msgstr "无法启动 '%s' 过滤器"
1604
1635 -#: archive-tar.c:450
1605 +#: archive-tar.c
1606 msgid "unable to redirect descriptor"
1607 msgstr "无法重定向描述符"
1608
1639 -#: archive-tar.c:457
1609 +#: archive-tar.c
1610 #, c-format
1611 msgid "'%s' filter reported error"
1612 msgstr "'%s' 过滤器报告了错误"
1613
1644 -#: archive-zip.c:319
1614 +#: archive-zip.c
1615 #, c-format
1616 msgid "path is not valid UTF-8: %s"
1617 msgstr "路径不是有效的 UTF-8：%s"
1618
1649 -#: archive-zip.c:323
1619 +#: archive-zip.c
1620 #, c-format
1621 msgid "path too long (%d chars, SHA1: %s): %s"
1622 msgstr "路径太长（%d 字符，SHA1：%s）：%s"
1623
1654 -#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
1624 +#: archive-zip.c builtin/pack-objects.c
1625 #, c-format
1626 msgid "deflate error (%d)"
1627 msgstr "压缩错误 (%d)"
1628
1659 -#: archive-zip.c:604
1629 +#: archive-zip.c
1630 #, c-format
1631 msgid "timestamp too large for this system: %<PRIuMAX>"
1632 msgstr "对于本系统时间戳太大：%<PRIuMAX>"
1633
1664 -#: archive.c:14
1634 +#: archive.c
1635 msgid "git archive [<options>] <tree-ish> [<path>...]"
1636 msgstr "git archive [<选项>] <树对象> [<路径>...]"
1637
1668 -#: archive.c:16
1638 +#: archive.c
1639 msgid ""
1640 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
1641 msgstr ""
1642 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
1643
1674 -#: archive.c:17
1644 +#: archive.c
1645 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1646 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
1647
1678 -#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
1679 -#: builtin/tag.c:579
1648 +#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c
1649 #, c-format
1650 msgid "cannot read '%s'"
1651 msgstr "不能读取 '%s'"
1652
1684 -#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
1653 +#: archive.c builtin/add.c builtin/rm.c
1654 #, c-format
1655 msgid "pathspec '%s' did not match any files"
1656 msgstr "路径规格 '%s' 未匹配任何文件"
1657
1689 -#: archive.c:450
1658 +#: archive.c
1659 #, c-format
1660 msgid "no such ref: %.*s"
1661 msgstr "无此引用：%.*s"
1662
1694 -#: archive.c:456
1663 +#: archive.c
1664 #, c-format
1665 msgid "not a valid object name: %s"
1666 msgstr "不是一个有效的对象名：%s"
1667
1699 -#: archive.c:469
1668 +#: archive.c
1669 #, c-format
1670 msgid "not a tree object: %s"
1671 msgstr "不是一个树对象：%s"
1672
1704 -#: archive.c:481
1673 +#: archive.c
1674 msgid "current working directory is untracked"
1675 msgstr "当前工作目录未被跟踪"
1676
1708 -#: archive.c:522
1677 +#: archive.c
1678 #, c-format
1679 msgid "File not found: %s"
1680 msgstr "文件未找到：%s"
1681
1713 -#: archive.c:524
1682 +#: archive.c
1683 #, c-format
1684 msgid "Not a regular file: %s"
1685 msgstr "不是一个常规文件：%s"
1686
1718 -#: archive.c:551
1687 +#: archive.c
1688 +#, c-format
1689 +msgid "unclosed quote: '%s'"
1690 +msgstr "未关闭的引号：'%s'"
1691 +
1692 +#: archive.c
1693 +#, c-format
1694 +msgid "missing colon: '%s'"
1695 +msgstr "缺失冒号：'%s'"
1696 +
1697 +#: archive.c
1698 +#, c-format
1699 +msgid "empty file name: '%s'"
1700 +msgstr "空的文件名：'%s'"
1701 +
1702 +#: archive.c
1703 msgid "fmt"
1704 msgstr "格式"
1705
1722 -#: archive.c:551
1706 +#: archive.c
1707 msgid "archive format"
1708 msgstr "归档格式"
1709
1726 -#: archive.c:552 builtin/log.c:1809
1710 +#: archive.c builtin/log.c
1711 msgid "prefix"
1712 msgstr "前缀"
1713
1730 -#: archive.c:553
1714 +#: archive.c
1715 msgid "prepend prefix to each pathname in the archive"
1716 msgstr "为归档中每个路径名加上前缀"
1717
1734 -#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
1735 -#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
1736 -#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
1737 -#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
1738 -#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
1739 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
1718 +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
1719 +#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c
1720 +#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
1721 msgid "file"
1722 msgstr "文件"
1723
1743 -#: archive.c:555
1724 +#: archive.c
1725 msgid "add untracked file to archive"
1726 msgstr "将未跟踪文件添加到归档"
1727
1747 -#: archive.c:558 builtin/archive.c:88
1728 +#: archive.c
1729 +msgid "path:content"
1730 +msgstr "路径:内容"
1731 +
1732 +#: archive.c builtin/archive.c
1733 msgid "write the archive to this file"
1734 msgstr "归档写入此文件"
1735
1751 -#: archive.c:560
1736 +#: archive.c
1737 msgid "read .gitattributes in working directory"
1738 msgstr "读取工作区中的 .gitattributes"
1739
1755 -#: archive.c:561
1740 +#: archive.c
1741 msgid "report archived files on stderr"
1742 msgstr "在标准错误上报告归档文件"
1743
1759 -#: archive.c:563
1744 +#: archive.c
1745 msgid "set compression level"
1746 msgstr "设置压缩级别"
1747
1763 -#: archive.c:566
1748 +#: archive.c
1749 msgid "list supported archive formats"
1750 msgstr "列出支持的归档格式"
1751
1767 -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
1768 -#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
1752 +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c
1753 msgid "repo"
1754 msgstr "仓库"
1755
1772 -#: archive.c:569 builtin/archive.c:90
1756 +#: archive.c builtin/archive.c
1757 msgid "retrieve the archive from remote repository <repo>"
1758 msgstr "从远程仓库（<仓库>）提取归档文件"
1759
1776 -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
1777 -#: builtin/notes.c:496
1760 +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c
1761 msgid "command"
1762 msgstr "命令"
1763
1781 -#: archive.c:571 builtin/archive.c:92
1764 +#: archive.c builtin/archive.c
1765 msgid "path to the remote git-upload-archive command"
1766 msgstr "远程 git-upload-archive 命令的路径"
1767
1785 -#: archive.c:578
1768 +#: archive.c
1769 msgid "Unexpected option --remote"
1770 msgstr "未知参数 --remote"
1771
1789 -#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
1790 -#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
1791 -#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
1792 -#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
1793 -#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
1794 -#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
1795 -#: http-fetch.c:153
1772 +#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c
1773 +#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c
1774 +#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c
1775 +#: revision.c
1776 #, c-format
1777 msgid "the option '%s' requires '%s'"
1778 msgstr "选项 '%s' 需要 '%s'"
1779
1800 -#: archive.c:582
1780 +#: archive.c
1781 msgid "Unexpected option --output"
1782 msgstr "未知参数 --output"
1783
1804 -#: archive.c:606
1784 +#: archive.c
1785 #, c-format
1786 msgid "Unknown archive format '%s'"
1787 msgstr "未知归档格式 '%s'"
1788
1809 -#: archive.c:615
1789 +#: archive.c
1790 #, c-format
1791 msgid "Argument not supported for format '%s': -%d"
1792 msgstr "参数不支持此格式 '%s'：-%d"
1793
1814 -#: attr.c:202
1794 +#: attr.c
1795 #, c-format
1796 msgid "%.*s is not a valid attribute name"
1797 msgstr "%.*s 不是一个有效的属性名"
1798
1819 -#: attr.c:363
1799 +#: attr.c
1800 #, c-format
1801 msgid "%s not allowed: %s:%d"
1802 msgstr "不允许 %s：%s:%d"
1803
1824 -#: attr.c:403
1804 +#: attr.c
1805 msgid ""
1806 "Negative patterns are ignored in git attributes\n"
1807 "Use '\\!' for literal leading exclamation."
@@ -1829,22 +1809,22 @@ msgstr ""
1809 "负值模版在 git attributes 中被忽略\n"
1810 "当字符串确实要以感叹号开始时，使用 '\\!'。"
1811
1832 -#: bisect.c:488
1812 +#: bisect.c
1813 #, c-format
1814 msgid "Badly quoted content in file '%s': %s"
1815 msgstr "文件 '%s' 包含错误的引用格式：%s"
1816
1837 -#: bisect.c:698
1817 +#: bisect.c
1818 #, c-format
1819 msgid "We cannot bisect more!\n"
1820 msgstr "我们无法进行更多的二分查找！\n"
1821
1842 -#: bisect.c:765
1822 +#: bisect.c
1823 #, c-format
1824 msgid "Not a valid commit name %s"
1825 msgstr "不是一个有效的提交名 %s"
1826
1847 -#: bisect.c:790
1827 +#: bisect.c
1828 #, c-format
1829 msgid ""
1830 "The merge base %s is bad.\n"
@@ -1853,7 +1833,7 @@ msgstr ""
1833 "合并基线 %s 是坏的。\n"
1834 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
1835
1856 -#: bisect.c:795
1836 +#: bisect.c
1837 #, c-format
1838 msgid ""
1839 "The merge base %s is new.\n"
@@ -1862,7 +1842,7 @@ msgstr ""
1842 "合并基线 %s 是新的。\n"
1843 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
1844
1865 -#: bisect.c:800
1845 +#: bisect.c
1846 #, c-format
1847 msgid ""
1848 "The merge base %s is %s.\n"
@@ -1871,7 +1851,7 @@ msgstr ""
1851 "合并基线 %s 是 %s。\n"
1852 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1853
1874 -#: bisect.c:808
1854 +#: bisect.c
1855 #, c-format
1856 msgid ""
1857 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1882,7 +1862,7 @@ msgstr ""
1862 "这种情况下 git 二分查找无法正常工作。\n"
1863 "您可能弄错了 %s 和 %s 版本？\n"
1864
1885 -#: bisect.c:821
1865 +#: bisect.c
1866 #, c-format
1867 msgid ""
1868 "the merge base between %s and [%s] must be skipped.\n"
@@ -1893,36 +1873,36 @@ msgstr ""
1873 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1874 "我们仍旧继续。"
1875
1896 -#: bisect.c:860
1876 +#: bisect.c
1877 #, c-format
1878 msgid "Bisecting: a merge base must be tested\n"
1879 msgstr "二分查找中：合并基线必须是经过测试的\n"
1880
1901 -#: bisect.c:910
1881 +#: bisect.c
1882 #, c-format
1883 msgid "a %s revision is needed"
1884 msgstr "需要一个 %s 版本"
1885
1906 -#: bisect.c:940
1886 +#: bisect.c
1887 #, c-format
1888 msgid "could not create file '%s'"
1889 msgstr "不能创建文件 '%s'"
1890
1911 -#: bisect.c:986 builtin/merge.c:155
1891 +#: bisect.c builtin/merge.c
1892 #, c-format
1893 msgid "could not read file '%s'"
1894 msgstr "不能读取文件 '%s'"
1895
1916 -#: bisect.c:1026
1896 +#: bisect.c
1897 msgid "reading bisect refs failed"
1898 msgstr "读取二分查找引用失败"
1899
1920 -#: bisect.c:1056
1900 +#: bisect.c
1901 #, c-format
1902 msgid "%s was both %s and %s\n"
1903 msgstr "%s 同时为 %s 和 %s\n"
1904
1925 -#: bisect.c:1065
1905 +#: bisect.c
1906 #, c-format
1907 msgid ""
1908 "No testable commit found.\n"
@@ -1931,7 +1911,7 @@ msgstr ""
1911 "没有发现可测试的提交。\n"
1912 "可能您在运行时使用了错误的路径参数？\n"
1913
1934 -#: bisect.c:1094
1914 +#: bisect.c
1915 #, c-format
1916 msgid "(roughly %d step)"
1917 msgid_plural "(roughly %d steps)"
@@ -1941,80 +1921,77 @@ msgstr[1] "（大概 %d 步）"
1921 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1922 #. steps)" translation.
1923 #.
1944 -#: bisect.c:1100
1924 +#: bisect.c
1925 #, c-format
1926 msgid "Bisecting: %d revision left to test after this %s\n"
1927 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1928 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
1929 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
1930
1951 -#: blame.c:2773
1931 +#: blame.c
1932 msgid "--contents and --reverse do not blend well."
1933 msgstr "--contents 和 --reverse 不能混用。"
1934
1955 -#: blame.c:2787
1935 +#: blame.c
1936 msgid "cannot use --contents with final commit object name"
1937 msgstr "不能将 --contents 和最终的提交对象名共用"
1938
1959 -#: blame.c:2808
1939 +#: blame.c
1940 msgid "--reverse and --first-parent together require specified latest commit"
1941 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1942
1963 -#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
1964 -#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
1965 -#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
1966 -#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
1967 -#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
1968 -#: builtin/shortlog.c:255
1943 +#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
1944 +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c
1945 +#: remote.c sequencer.c submodule.c
1946 msgid "revision walk setup failed"
1947 msgstr "版本遍历设置失败"
1948
1972 -#: blame.c:2835
1949 +#: blame.c
1950 msgid ""
1951 "--reverse --first-parent together require range along first-parent chain"
1952 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
1953
1977 -#: blame.c:2846
1954 +#: blame.c
1955 #, c-format
1956 msgid "no such path %s in %s"
1957 msgstr "在 %2$s 中无此路径 %1$s"
1958
1982 -#: blame.c:2857
1959 +#: blame.c
1960 #, c-format
1961 msgid "cannot read blob %s for path %s"
1962 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1963
1987 -#: branch.c:93
1964 +#: branch.c
1965 msgid ""
1966 "cannot inherit upstream tracking configuration of multiple refs when "
1967 "rebasing is requested"
1968 msgstr "在请求变基时无法继承上游多个引用的跟踪设置"
1969
1993 -#: branch.c:104
1970 +#: branch.c
1971 #, c-format
1972 msgid "not setting branch '%s' as its own upstream"
1973 msgstr "没有将分支 '%s' 设置为它自己的上游"
1974
1998 -#: branch.c:160
1975 +#: branch.c
1976 #, c-format
1977 msgid "branch '%s' set up to track '%s' by rebasing."
1978 msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。"
1979
2003 -#: branch.c:161
1980 +#: branch.c
1981 #, c-format
1982 msgid "branch '%s' set up to track '%s'."
1983 msgstr "分支 '%s' 设置为跟踪 '%s'。"
1984
2008 -#: branch.c:164
1985 +#: branch.c
1986 #, c-format
1987 msgid "branch '%s' set up to track:"
1988 msgstr "分支 '%s' 设置为跟踪："
1989
2013 -#: branch.c:176
1990 +#: branch.c
1991 msgid "unable to write upstream branch configuration"
1992 msgstr "无法写入上游分支配置"
1993
2017 -#: branch.c:178
1994 +#: branch.c
1995 msgid ""
1996 "\n"
1997 "After fixing the error cause you may try to fix up\n"
@@ -2023,32 +2000,34 @@ msgstr ""
2000 "\n"
2001 "在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支："
2002
2026 -#: branch.c:219
2003 +#: branch.c
2004 #, c-format
2005 msgid "asked to inherit tracking from '%s', but no remote is set"
2006 msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程"
2007
2031 -#: branch.c:225
2008 +#: branch.c
2009 #, c-format
2010 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
2011 msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置"
2012
2036 -#: branch.c:277
2013 +#: branch.c
2014 #, c-format
2015 msgid "not tracking: ambiguous information for ref '%s'"
2016 msgstr "不在跟踪中：引用 '%s' 有歧义的信息"
2017
2018 # 译者：为保证在输出中对齐，注意调整句中空格！
2019 +#. #-#-#-#-# branch.c.po #-#-#-#-#
2020 #. TRANSLATORS: This is a line listing a remote with duplicate
2021 #. refspecs in the advice message below. For RTL languages you'll
2022 #. probably want to swap the "%s" and leading " " space around.
2023 #.
2024 +#. #-#-#-#-# object-name.c.po #-#-#-#-#
2025 #. TRANSLATORS: This is line item of ambiguous object output
2026 #. from describe_ambiguous_object() above. For RTL languages
2027 #. you'll probably want to swap the "%s" and leading " " space
2028 #. around.
2029 #.
2051 -#: branch.c:289 object-name.c:464
2030 +#: branch.c object-name.c
2031 #, c-format
2032 msgid " %s\n"
2033 msgstr " %s\n"
@@ -2056,7 +2035,7 @@ msgstr " %s\n"
2035 #. TRANSLATORS: The second argument is a \n-delimited list of
2036 #. duplicate refspecs, composed above.
2037 #.
2059 -#: branch.c:295
2038 +#: branch.c
2039 #, c-format
2040 msgid ""
2041 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2075,32 +2054,32 @@ msgstr ""
2054 "如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空"
2055 "间。"
2056
2078 -#: branch.c:344
2057 +#: branch.c
2058 #, c-format
2059 msgid "'%s' is not a valid branch name"
2060 msgstr "'%s' 不是一个有效的分支名称"
2061
2083 -#: branch.c:364
2062 +#: branch.c
2063 #, c-format
2064 msgid "a branch named '%s' already exists"
2065 msgstr "一个名为 '%s' 的分支已经存在"
2066
2088 -#: branch.c:370
2067 +#: branch.c
2068 #, c-format
2069 msgid "cannot force update the branch '%s' checked out at '%s'"
2070 msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
2071
2093 -#: branch.c:393
2072 +#: branch.c
2073 #, c-format
2074 msgid "cannot set up tracking information; starting point '%s' is not a branch"
2075 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支"
2076
2098 -#: branch.c:395
2077 +#: branch.c
2078 #, c-format
2079 msgid "the requested upstream branch '%s' does not exist"
2080 msgstr "请求的上游分支 '%s' 不存在"
2081
2103 -#: branch.c:397
2082 +#: branch.c
2083 msgid ""
2084 "\n"
2085 "If you are planning on basing your work on an upstream\n"
@@ -2118,28 +2097,27 @@ msgstr ""
2097 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
2098 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
2099
2121 -#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
2122 -#: builtin/replace.c:423 builtin/replace.c:453
2100 +#: branch.c builtin/replace.c
2101 #, c-format
2102 msgid "not a valid object name: '%s'"
2103 msgstr "不是一个有效的对象名：'%s'"
2104
2127 -#: branch.c:465
2105 +#: branch.c
2106 #, c-format
2107 msgid "ambiguous object name: '%s'"
2108 msgstr "歧义的对象名：'%s'"
2109
2132 -#: branch.c:470
2110 +#: branch.c
2111 #, c-format
2112 msgid "not a valid branch point: '%s'"
2113 msgstr "无效的分支点：'%s'"
2114
2137 -#: branch.c:658
2115 +#: branch.c
2116 #, c-format
2117 msgid "submodule '%s': unable to find submodule"
2118 msgstr "子模组 '%s'：无法找到子模组"
2119
2142 -#: branch.c:661
2120 +#: branch.c
2121 #, c-format
2122 msgid ""
2123 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2147,22410 +2125,22477 @@ msgid ""
2125 msgstr ""
2126 "你可以用 'git checkout %s && git submodule update --init' 来尝试更新子模组"
2127
2150 -#: branch.c:672 branch.c:698
2128 +#: branch.c
2129 #, c-format
2130 msgid "submodule '%s': cannot create branch '%s'"
2131 msgstr "子模组 '%s'：不能创建分支 '%s'"
2132
2155 -#: branch.c:730
2133 +#: branch.c
2134 #, c-format
2135 msgid "'%s' is already checked out at '%s'"
2136 msgstr "'%s' 已经检出到 '%s'"
2137
2160 -#: branch.c:755
2138 +#: branch.c
2139 #, c-format
2140 msgid "HEAD of working tree %s is not updated"
2141 msgstr "工作区 %s 的 HEAD 指向没有被更新"
2142
2165 -#: bundle.c:45
2166 -#, c-format
2167 -msgid "unrecognized bundle hash algorithm: %s"
2168 -msgstr "未能识别的归档包哈希算法：%s"
2143 +#: builtin/add.c
2144 +msgid "git add [<options>] [--] <pathspec>..."
2145 +msgstr "git add [<选项>] [--] <路径规格>..."
2146
2170 -#: bundle.c:53
2147 +#: builtin/add.c
2148 #, c-format
2172 -msgid "unknown capability '%s'"
2173 -msgstr "未知能力 '%s'"
2149 +msgid "cannot chmod %cx '%s'"
2150 +msgstr "不能 chmod %cx '%s'"
2151
2175 -#: bundle.c:79
2152 +#: builtin/add.c
2153 #, c-format
2177 -msgid "'%s' does not look like a v2 or v3 bundle file"
2178 -msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
2154 +msgid "unexpected diff status %c"
2155 +msgstr "意外的差异状态 %c"
2156
2180 -#: bundle.c:118
2181 -#, c-format
2182 -msgid "unrecognized header: %s%s (%d)"
2183 -msgstr "未能识别的包头：%s%s (%d)"
2157 +#: builtin/add.c builtin/commit.c
2158 +msgid "updating files failed"
2159 +msgstr "更新文件失败"
2160
2185 -#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
2186 -#: builtin/commit.c:865
2161 +#: builtin/add.c
2162 #, c-format
2188 -msgid "could not open '%s'"
2189 -msgstr "不能打开 '%s'"
2163 +msgid "remove '%s'\n"
2164 +msgstr "删除 '%s'\n"
2165
2191 -#: bundle.c:203
2192 -msgid "Repository lacks these prerequisite commits:"
2193 -msgstr "仓库中缺少这些必备的提交："
2166 +#: builtin/add.c
2167 +msgid "Unstaged changes after refreshing the index:"
2168 +msgstr "刷新索引之后尚未被暂存的变更："
2169
2195 -#: bundle.c:206
2196 -msgid "need a repository to verify a bundle"
2197 -msgstr "需要一个仓库来校验一个归档包"
2170 +#: builtin/add.c builtin/rev-parse.c
2171 +msgid "Could not read the index"
2172 +msgstr "不能读取索引"
2173 +
2174 +#: builtin/add.c
2175 +msgid "Could not write patch"
2176 +msgstr "不能生成补丁"
2177
2199 -#: bundle.c:264
2178 +#: builtin/add.c
2179 +msgid "editing patch failed"
2180 +msgstr "编辑补丁失败"
2181 +
2182 +#: builtin/add.c
2183 #, c-format
2201 -msgid "The bundle contains this ref:"
2202 -msgid_plural "The bundle contains these %<PRIuMAX> refs:"
2203 -msgstr[0] "这个归档包中含有这个引用："
2204 -msgstr[1] "这个归档包中含有 %<PRIuMAX> 个引用："
2184 +msgid "Could not stat '%s'"
2185 +msgstr "不能对 '%s' 调用 stat"
2186
2206 -#: bundle.c:272
2207 -msgid "The bundle records a complete history."
2208 -msgstr "这个归档包记录一个完整历史。"
2187 +#: builtin/add.c
2188 +msgid "Empty patch. Aborted."
2189 +msgstr "空补丁。异常终止。"
2190
2210 -#: bundle.c:274
2191 +#: builtin/add.c
2192 #, c-format
2212 -msgid "The bundle requires this ref:"
2213 -msgid_plural "The bundle requires these %<PRIuMAX> refs:"
2214 -msgstr[0] "这个归档包需要这个引用："
2215 -msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："
2193 +msgid "Could not apply '%s'"
2194 +msgstr "不能应用 '%s'"
2195
2217 -#: bundle.c:350
2218 -msgid "unable to dup bundle descriptor"
2219 -msgstr "无法复制归档包描述符"
2196 +#: builtin/add.c
2197 +msgid "The following paths are ignored by one of your .gitignore files:\n"
2198 +msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
2199
2221 -#: bundle.c:357
2222 -msgid "Could not spawn pack-objects"
2223 -msgstr "不能生成 pack-objects 进程"
2200 +#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c
2201 +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c
2202 +#: builtin/rm.c builtin/send-pack.c
2203 +msgid "dry run"
2204 +msgstr "演习"
2205
2225 -#: bundle.c:368
2226 -msgid "pack-objects died"
2227 -msgstr "pack-objects 终止"
2206 +#: builtin/add.c builtin/check-ignore.c builtin/commit.c
2207 +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c
2208 +#: builtin/read-tree.c
2209 +msgid "be verbose"
2210 +msgstr "冗长输出"
2211
2229 -#: bundle.c:417
2230 -#, c-format
2231 -msgid "ref '%s' is excluded by the rev-list options"
2232 -msgstr "引用 '%s' 被 rev-list 选项排除"
2212 +#: builtin/add.c
2213 +msgid "interactive picking"
2214 +msgstr "交互式拣选"
2215
2234 -#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
2235 -#, c-format
2236 -msgid "unrecognized argument: %s"
2237 -msgstr "未能识别的参数：%s"
2216 +#: builtin/add.c builtin/checkout.c builtin/reset.c
2217 +msgid "select hunks interactively"
2218 +msgstr "交互式挑选数据块"
2219
2239 -#: bundle.c:548
2240 -#, c-format
2241 -msgid "unsupported bundle version %d"
2242 -msgstr "不支持的归档包版本 %d"
2220 +#: builtin/add.c
2221 +msgid "edit current diff and apply"
2222 +msgstr "编辑当前差异并应用"
2223
2244 -#: bundle.c:550
2245 -#, c-format
2246 -msgid "cannot write bundle version %d with algorithm %s"
2247 -msgstr "不能写入，归档包版本 %d 不支持算法 %s"
2224 +#: builtin/add.c
2225 +msgid "allow adding otherwise ignored files"
2226 +msgstr "允许添加忽略的文件"
2227
2249 -#: bundle.c:600
2250 -msgid "Refusing to create empty bundle."
2251 -msgstr "不能创建空的归档包。"
2228 +#: builtin/add.c
2229 +msgid "update tracked files"
2230 +msgstr "更新已跟踪的文件"
2231
2253 -#: bundle.c:610
2254 -#, c-format
2255 -msgid "cannot create '%s'"
2256 -msgstr "不能创建 '%s'"
2232 +#: builtin/add.c
2233 +msgid "renormalize EOL of tracked files (implies -u)"
2234 +msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
2235
2258 -#: bundle.c:639
2259 -msgid "index-pack died"
2260 -msgstr "index-pack 终止"
2236 +#: builtin/add.c
2237 +msgid "record only the fact that the path will be added later"
2238 +msgstr "只记录，该路径稍后再添加"
2239
2262 -#: chunk-format.c:117
2263 -msgid "terminating chunk id appears earlier than expected"
2264 -msgstr "终止块 ID 比预期更早出现"
2240 +#: builtin/add.c
2241 +msgid "add changes from all tracked and untracked files"
2242 +msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2243
2266 -#: chunk-format.c:126
2267 -#, c-format
2268 -msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
2269 -msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"
2244 +#: builtin/add.c
2245 +msgid "ignore paths removed in the working tree (same as --no-all)"
2246 +msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
2247
2271 -#: chunk-format.c:133
2272 -#, c-format
2273 -msgid "duplicate chunk ID %<PRIx32> found"
2274 -msgstr "发现重复的块ID %<PRIx32>"
2248 +#: builtin/add.c
2249 +msgid "don't add, only refresh the index"
2250 +msgstr "不添加，只刷新索引"
2251 +
2252 +#: builtin/add.c
2253 +msgid "just skip files which cannot be added because of errors"
2254 +msgstr "跳过因出错不能添加的文件"
2255 +
2256 +#: builtin/add.c
2257 +msgid "check if - even missing - files are ignored in dry run"
2258 +msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
2259 +
2260 +#: builtin/add.c builtin/mv.c builtin/rm.c
2261 +msgid "allow updating entries outside of the sparse-checkout cone"
2262 +msgstr "允许更新稀疏检出锥以外的条目"
2263 +
2264 +#: builtin/add.c builtin/update-index.c
2265 +msgid "override the executable bit of the listed files"
2266 +msgstr "覆盖列表里文件的可执行位"
2267 +
2268 +#: builtin/add.c
2269 +msgid "warn when adding an embedded repository"
2270 +msgstr "创建一个嵌入式仓库时给予警告"
2271
2276 -#: chunk-format.c:147
2272 +#: builtin/add.c
2273 #, c-format
2278 -msgid "final chunk has non-zero id %<PRIx32>"
2279 -msgstr "最终块有非零 ID %<PRIx32>"
2274 +msgid ""
2275 +"You've added another git repository inside your current repository.\n"
2276 +"Clones of the outer repository will not contain the contents of\n"
2277 +"the embedded repository and will not know how to obtain it.\n"
2278 +"If you meant to add a submodule, use:\n"
2279 +"\n"
2280 +"\tgit submodule add <url> %s\n"
2281 +"\n"
2282 +"If you added this path by mistake, you can remove it from the\n"
2283 +"index with:\n"
2284 +"\n"
2285 +"\tgit rm --cached %s\n"
2286 +"\n"
2287 +"See \"git help submodule\" for more information."
2288 +msgstr ""
2289 +"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
2290 +"内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n"
2291 +"\n"
2292 +"\tgit submodule add <url> %s\n"
2293 +"\n"
2294 +"如果您不小心添加了这个路径，可以用下面的命令将其从索引中删除：\n"
2295 +"\n"
2296 +"\tgit rm --cached %s\n"
2297 +"\n"
2298 +"参见 \"git help submodule\" 获取更多信息。"
2299
2281 -#: color.c:354
2300 +#: builtin/add.c
2301 #, c-format
2283 -msgid "invalid color value: %.*s"
2284 -msgstr "无效的颜色值：%.*s"
2302 +msgid "adding embedded git repository: %s"
2303 +msgstr "正在添加嵌入式 git 仓库：%s"
2304
2286 -#: commit-graph.c:204 midx.c:52
2287 -msgid "invalid hash version"
2288 -msgstr "无效的哈希版本"
2305 +#: builtin/add.c
2306 +msgid ""
2307 +"Use -f if you really want to add them.\n"
2308 +"Turn this message off by running\n"
2309 +"\"git config advice.addIgnoredFile false\""
2310 +msgstr ""
2311 +"如果您确实要添加它们，使用 -f 参数。\n"
2312 +"运行下面的命令来关闭本消息\n"
2313 +"\"git config advice.addIgnoredFile false\""
2314
2290 -#: commit-graph.c:262
2291 -msgid "commit-graph file is too small"
2292 -msgstr "提交图形文件太小"
2315 +#: builtin/add.c
2316 +msgid "adding files failed"
2317 +msgstr "添加文件失败"
2318
2294 -#: commit-graph.c:355
2319 +#: builtin/add.c
2320 #, c-format
2296 -msgid "commit-graph signature %X does not match signature %X"
2297 -msgstr "提交图形签名 %X 和签名 %X 不匹配"
2321 +msgid "--chmod param '%s' must be either -x or +x"
2322 +msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
2323
2299 -#: commit-graph.c:362
2324 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
2325 +#: builtin/rm.c builtin/stash.c
2326 #, c-format
2301 -msgid "commit-graph version %X does not match version %X"
2302 -msgstr "提交图形版本 %X 和版本 %X 不匹配"
2327 +msgid "'%s' and pathspec arguments cannot be used together"
2328 +msgstr "'%s' 和路径规格参数不能同时使用"
2329
2304 -#: commit-graph.c:369
2330 +#: builtin/add.c
2331 #, c-format
2306 -msgid "commit-graph hash version %X does not match version %X"
2307 -msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
2332 +msgid "Nothing specified, nothing added.\n"
2333 +msgstr "没有指定文件，也没有文件被添加。\n"
2334
2309 -#: commit-graph.c:386
2310 -#, c-format
2311 -msgid "commit-graph file is too small to hold %u chunks"
2312 -msgstr "提交图形文件太小，容不下 %u 个块"
2335 +#: builtin/add.c
2336 +msgid ""
2337 +"Maybe you wanted to say 'git add .'?\n"
2338 +"Turn this message off by running\n"
2339 +"\"git config advice.addEmptyPathspec false\""
2340 +msgstr ""
2341 +"也许您想要执行 'git add .'？\n"
2342 +"运行下面的命令来关闭本消息\n"
2343 +"\"git config advice.addEmptyPathspec false\""
2344
2314 -#: commit-graph.c:485
2315 -msgid "commit-graph has no base graphs chunk"
2316 -msgstr "提交图形没有基础图形块"
2345 +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c
2346 +#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c
2347 +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c
2348 +#: rerere.c submodule.c
2349 +msgid "index file corrupt"
2350 +msgstr "索引文件损坏"
2351
2318 -#: commit-graph.c:495
2319 -msgid "commit-graph chain does not match"
2320 -msgstr "提交图形链不匹配"
2352 +#: builtin/am.c builtin/mailinfo.c mailinfo.c
2353 +#, c-format
2354 +msgid "bad action '%s' for '%s'"
2355 +msgstr "'%2$s' 的错误动作 '%1$s'"
2356
2322 -#: commit-graph.c:543
2357 +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2358 +#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c
2359 +#: sequencer.c setup.c
2360 #, c-format
2324 -msgid "invalid commit-graph chain: line '%s' not a hash"
2325 -msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
2361 +msgid "invalid value for '%s': '%s'"
2362 +msgstr "'%s' 的值无效：'%s'"
2363
2327 -#: commit-graph.c:567
2328 -msgid "unable to find all commit-graph files"
2329 -msgstr "无法找到所有提交图形文件"
2364 +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
2365 +#, c-format
2366 +msgid "could not read '%s'"
2367 +msgstr "不能读取 '%s'"
2368
2331 -#: commit-graph.c:752 commit-graph.c:789
2332 -msgid "invalid commit position. commit-graph is likely corrupt"
2333 -msgstr "无效的提交位置。提交图形可能已损坏"
2369 +#: builtin/am.c
2370 +msgid "could not parse author script"
2371 +msgstr "不能解析作者脚本"
2372
2335 -#: commit-graph.c:773
2373 +#: builtin/am.c builtin/replace.c commit.c sequencer.c
2374 #, c-format
2337 -msgid "could not find commit %s"
2338 -msgstr "无法找到提交 %s"
2375 +msgid "could not parse %s"
2376 +msgstr "不能解析 %s"
2377
2340 -#: commit-graph.c:806
2341 -msgid "commit-graph requires overflow generation data but has none"
2342 -msgstr "提交图需要溢出世代数据，但是没有"
2378 +#: builtin/am.c
2379 +#, c-format
2380 +msgid "'%s' was deleted by the applypatch-msg hook"
2381 +msgstr "'%s' 被 applypatch-msg 钩子删除"
2382
2344 -#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
2345 -#: builtin/clone.c:705
2383 +#: builtin/am.c
2384 #, c-format
2347 -msgid "unable to parse commit %s"
2348 -msgstr "不能解析提交 %s"
2385 +msgid "Malformed input line: '%s'."
2386 +msgstr "非法的输入行：'%s'。"
2387
2350 -#: commit-graph.c:1373 builtin/pack-objects.c:3078
2388 +#: builtin/am.c
2389 #, c-format
2352 -msgid "unable to get type of object %s"
2353 -msgstr "无法获得对象 %s 类型"
2390 +msgid "Failed to copy notes from '%s' to '%s'"
2391 +msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2392
2355 -#: commit-graph.c:1404
2356 -msgid "Loading known commits in commit graph"
2357 -msgstr "正在加载提交图中的已知提交"
2393 +#: builtin/am.c
2394 +msgid "fseek failed"
2395 +msgstr "fseek 失败"
2396
2359 -#: commit-graph.c:1421
2360 -msgid "Expanding reachable commits in commit graph"
2361 -msgstr "正在扩展提交图中的可达提交"
2397 +#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c
2398 +#, c-format
2399 +msgid "could not open '%s' for reading"
2400 +msgstr "无法打开 '%s' 进行读取"
2401
2363 -#: commit-graph.c:1441
2364 -msgid "Clearing commit marks in commit graph"
2365 -msgstr "正在清除提交图中的提交标记"
2402 +#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c
2403 +#, c-format
2404 +msgid "could not open '%s' for writing"
2405 +msgstr "无法打开 '%s' 进行写入"
2406
2367 -#: commit-graph.c:1460
2368 -msgid "Computing commit graph topological levels"
2369 -msgstr "正在计算提交图拓扑级别"
2407 +#: builtin/am.c
2408 +#, c-format
2409 +msgid "could not parse patch '%s'"
2410 +msgstr "无法解析补丁 '%s'"
2411
2371 -#: commit-graph.c:1513
2372 -msgid "Computing commit graph generation numbers"
2373 -msgstr "正在计算提交图世代数字"
2412 +#: builtin/am.c
2413 +msgid "Only one StGIT patch series can be applied at once"
2414 +msgstr "一次只能有一个 StGIT 补丁队列被应用"
2415
2375 -#: commit-graph.c:1598
2376 -msgid "Computing commit changed paths Bloom filters"
2377 -msgstr "计算提交变更路径的布隆过滤器"
2416 +#: builtin/am.c
2417 +msgid "invalid timestamp"
2418 +msgstr "无效的时间戳"
2419
2379 -#: commit-graph.c:1675
2380 -msgid "Collecting referenced commits"
2381 -msgstr "正在收集引用的提交"
2420 +#: builtin/am.c
2421 +msgid "invalid Date line"
2422 +msgstr "无效的日期行"
2423 +
2424 +#: builtin/am.c
2425 +msgid "invalid timezone offset"
2426 +msgstr "无效的时区偏移值"
2427 +
2428 +#: builtin/am.c
2429 +msgid "Patch format detection failed."
2430 +msgstr "补丁格式探测失败。"
2431
2383 -#: commit-graph.c:1701
2432 +#: builtin/am.c builtin/clone.c
2433 #, c-format
2385 -msgid "Finding commits for commit graph in %<PRIuMAX> pack"
2386 -msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
2387 -msgstr[0] "正在 %<PRIuMAX> 个包中查找提交图的提交"
2388 -msgstr[1] "正在 %<PRIuMAX> 个包中查找提交图的提交"
2434 +msgid "failed to create directory '%s'"
2435 +msgstr "无法创建目录 '%s'"
2436 +
2437 +#: builtin/am.c
2438 +msgid "Failed to split patches."
2439 +msgstr "无法拆分补丁。"
2440
2390 -#: commit-graph.c:1714
2441 +#: builtin/am.c
2442 #, c-format
2392 -msgid "error adding pack %s"
2393 -msgstr "添加包 %s 出错"
2443 +msgid "When you have resolved this problem, run \"%s --continue\"."
2444 +msgstr "当您解决这一问题，执行 \"%s --continue\"。"
2445
2395 -#: commit-graph.c:1718
2446 +#: builtin/am.c
2447 #, c-format
2397 -msgid "error opening index for %s"
2398 -msgstr "为 %s 打开索引出错"
2448 +msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2449 +msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
2450
2400 -#: commit-graph.c:1756
2401 -msgid "Finding commits for commit graph among packed objects"
2402 -msgstr "正在打包对象中查找提交图的提交"
2451 +#: builtin/am.c
2452 +#, c-format
2453 +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
2454 +msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。"
2455
2404 -#: commit-graph.c:1774
2405 -msgid "Finding extra edges in commit graph"
2406 -msgstr "正在查找提交图中额外的边"
2456 +#: builtin/am.c
2457 +#, c-format
2458 +msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2459 +msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
2460
2408 -#: commit-graph.c:1823
2409 -msgid "failed to write correct number of base graph ids"
2410 -msgstr "无法写入正确数量的基础图形 ID"
2461 +#: builtin/am.c
2462 +msgid "Patch sent with format=flowed; space at the end of lines might be lost."
2463 +msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
2464
2412 -#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
2465 +#: builtin/am.c
2466 #, c-format
2414 -msgid "unable to create leading directories of %s"
2415 -msgstr "不能为 %s 创建先导目录"
2416 -
2417 -#: commit-graph.c:1868
2418 -msgid "unable to create temporary graph layer"
2419 -msgstr "无法创建临时图层"
2467 +msgid "missing author line in commit %s"
2468 +msgstr "在提交 %s 中缺失作者行"
2469
2421 -#: commit-graph.c:1873
2470 +#: builtin/am.c
2471 #, c-format
2423 -msgid "unable to adjust shared permissions for '%s'"
2424 -msgstr "无法为 '%s' 调整共享权限"
2472 +msgid "invalid ident line: %.*s"
2473 +msgstr "无效的身份标识：%.*s"
2474
2426 -#: commit-graph.c:1930
2475 +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c
2476 #, c-format
2428 -msgid "Writing out commit graph in %d pass"
2429 -msgid_plural "Writing out commit graph in %d passes"
2430 -msgstr[0] "正在用 %d 步写出提交图"
2431 -msgstr[1] "正在用 %d 步写出提交图"
2477 +msgid "unable to parse commit %s"
2478 +msgstr "不能解析提交 %s"
2479
2433 -#: commit-graph.c:1967
2434 -msgid "unable to open commit-graph chain file"
2435 -msgstr "无法打开提交图形链文件"
2480 +#: builtin/am.c
2481 +msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2482 +msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2483
2437 -#: commit-graph.c:1983
2438 -msgid "failed to rename base commit-graph file"
2439 -msgstr "无法重命名基础提交图形文件"
2484 +#: builtin/am.c
2485 +msgid "Using index info to reconstruct a base tree..."
2486 +msgstr "使用索引来重建一个（三方合并的）基础目录树..."
2487
2441 -#: commit-graph.c:2004
2442 -msgid "failed to rename temporary commit-graph file"
2443 -msgstr "无法重命名临时提交图形文件"
2488 +#: builtin/am.c
2489 +msgid ""
2490 +"Did you hand edit your patch?\n"
2491 +"It does not apply to blobs recorded in its index."
2492 +msgstr ""
2493 +"您是否曾手动编辑过您的补丁？\n"
2494 +"无法应用补丁到索引中的数据对象上。"
2495
2445 -#: commit-graph.c:2137
2446 -msgid "Scanning merged commits"
2447 -msgstr "正在扫描合并提交"
2496 +#: builtin/am.c
2497 +msgid "Falling back to patching base and 3-way merge..."
2498 +msgstr "回落到基础版本上打补丁及进行三方合并..."
2499
2449 -#: commit-graph.c:2181
2450 -msgid "Merging commit-graph"
2451 -msgstr "正在合并提交图形"
2500 +#: builtin/am.c
2501 +msgid "Failed to merge in the changes."
2502 +msgstr "无法合并变更。"
2503
2453 -#: commit-graph.c:2289
2454 -msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2455 -msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
2504 +#: builtin/am.c builtin/merge.c sequencer.c
2505 +msgid "git write-tree failed to write a tree"
2506 +msgstr "git write-tree 无法写入树对象"
2507
2457 -#: commit-graph.c:2396
2458 -msgid "too many commits to write graph"
2459 -msgstr "提交太多不能画图"
2508 +#: builtin/am.c
2509 +msgid "applying to an empty history"
2510 +msgstr "正应用到一个空历史上"
2511
2461 -#: commit-graph.c:2494
2462 -msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2463 -msgstr "提交图文件的校验码错误，可能已经损坏"
2512 +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
2513 +#: t/helper/test-fast-rebase.c
2514 +msgid "failed to write commit object"
2515 +msgstr "无法写提交对象"
2516
2465 -#: commit-graph.c:2504
2517 +#: builtin/am.c
2518 #, c-format
2467 -msgid "commit-graph has incorrect OID order: %s then %s"
2468 -msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
2519 +msgid "cannot resume: %s does not exist."
2520 +msgstr "无法继续：%s 不存在。"
2521
2470 -#: commit-graph.c:2514 commit-graph.c:2529
2471 -#, c-format
2472 -msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2473 -msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
2522 +#: builtin/am.c
2523 +msgid "Commit Body is:"
2524 +msgstr "提交内容为："
2525
2475 -#: commit-graph.c:2521
2526 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2527 +#. in your translation. The program will only accept English
2528 +#. input at this point.
2529 +#.
2530 +#: builtin/am.c
2531 #, c-format
2477 -msgid "failed to parse commit %s from commit-graph"
2478 -msgstr "无法从提交图形中解析提交 %s"
2532 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2533 +msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
2534
2480 -#: commit-graph.c:2539
2481 -msgid "Verifying commits in commit graph"
2482 -msgstr "正在校验提交图中的提交"
2535 +#: builtin/am.c builtin/commit.c
2536 +msgid "unable to write index file"
2537 +msgstr "无法写入索引文件"
2538
2484 -#: commit-graph.c:2554
2539 +#: builtin/am.c
2540 #, c-format
2486 -msgid "failed to parse commit %s from object database for commit-graph"
2487 -msgstr "无法从提交图形的对象库中解析提交 %s"
2541 +msgid "Dirty index: cannot apply patches (dirty: %s)"
2542 +msgstr "脏索引：不能应用补丁（脏文件：%s）"
2543
2489 -#: commit-graph.c:2561
2544 +#: builtin/am.c
2545 #, c-format
2491 -msgid "root tree OID for commit %s in commit-graph is %s != %s"
2492 -msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
2546 +msgid "Skipping: %.*s"
2547 +msgstr "跳过：%.*s"
2548
2494 -#: commit-graph.c:2571
2549 +#: builtin/am.c
2550 #, c-format
2496 -msgid "commit-graph parent list for commit %s is too long"
2497 -msgstr "提交 %s 的提交图形父提交列表太长了"
2551 +msgid "Creating an empty commit: %.*s"
2552 +msgstr "创建空提交：%.*s"
2553
2499 -#: commit-graph.c:2580
2500 -#, c-format
2501 -msgid "commit-graph parent for %s is %s != %s"
2502 -msgstr "%s 的提交图形父提交是 %s != %s"
2554 +#: builtin/am.c
2555 +msgid "Patch is empty."
2556 +msgstr "补丁为空。"
2557
2504 -#: commit-graph.c:2594
2558 +#: builtin/am.c
2559 #, c-format
2506 -msgid "commit-graph parent list for commit %s terminates early"
2507 -msgstr "提交 %s 的提交图形父提交列表过早终止"
2560 +msgid "Applying: %.*s"
2561 +msgstr "应用：%.*s"
2562
2509 -#: commit-graph.c:2599
2510 -#, c-format
2511 -msgid ""
2512 -"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2513 -msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
2563 +#: builtin/am.c
2564 +msgid "No changes -- Patch already applied."
2565 +msgstr "没有变更 —— 补丁已经应用过。"
2566
2515 -#: commit-graph.c:2603
2567 +#: builtin/am.c
2568 #, c-format
2569 +msgid "Patch failed at %s %.*s"
2570 +msgstr "打补丁失败于 %s %.*s"
2571 +
2572 +#: builtin/am.c
2573 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
2574 +msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
2575 +
2576 +#: builtin/am.c
2577 +msgid "No changes - recorded it as an empty commit."
2578 +msgstr "没有变更 —— 记录为空提交。"
2579 +
2580 +#: builtin/am.c
2581 msgid ""
2518 -"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2519 -msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
2582 +"No changes - did you forget to use 'git add'?\n"
2583 +"If there is nothing left to stage, chances are that something else\n"
2584 +"already introduced the same changes; you might want to skip this patch."
2585 +msgstr ""
2586 +"没有变更 —— 您是不是忘了执行 'git add'？\n"
2587 +"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
2588 +"您也许想要跳过这个补丁。"
2589
2521 -#: commit-graph.c:2620
2522 -#, c-format
2523 -msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2524 -msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
2590 +#: builtin/am.c
2591 +msgid ""
2592 +"You still have unmerged paths in your index.\n"
2593 +"You should 'git add' each file with resolved conflicts to mark them as "
2594 +"such.\n"
2595 +"You might run `git rm` on a file to accept \"deleted by them\" for it."
2596 +msgstr ""
2597 +"在您的索引中仍存在未合并的路径。\n"
2598 +"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
2599 +"您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
2600
2526 -#: commit-graph.c:2626
2527 -#, c-format
2528 -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2529 -msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2601 +#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c
2602 +#: rerere.c
2603 +msgid "unable to write new index file"
2604 +msgstr "无法写新的索引文件"
2605
2531 -#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
2532 -#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
2606 +#: builtin/am.c builtin/reset.c
2607 #, c-format
2534 -msgid "could not parse %s"
2535 -msgstr "不能解析 %s"
2608 +msgid "Could not parse object '%s'."
2609 +msgstr "不能解析对象 '%s'。"
2610
2537 -#: commit.c:56
2538 -#, c-format
2539 -msgid "%s %s is not a commit!"
2540 -msgstr "%s %s 不是一个提交！"
2611 +#: builtin/am.c
2612 +msgid "failed to clean index"
2613 +msgstr "无法清空索引"
2614
2542 -#: commit.c:197
2615 +#: builtin/am.c
2616 msgid ""
2544 -"Support for <GIT_DIR>/info/grafts is deprecated\n"
2545 -"and will be removed in a future Git version.\n"
2546 -"\n"
2547 -"Please use \"git replace --convert-graft-file\"\n"
2548 -"to convert the grafts into replace refs.\n"
2549 -"\n"
2550 -"Turn this message off by running\n"
2551 -"\"git config advice.graftFileDeprecated false\""
2552 -msgstr ""
2553 -"对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n"
2554 -"未来的Git版本中被移除。\n"
2555 -"\n"
2556 -"请使用 \"git replace --convert-graft-file\" 将\n"
2557 -"grafts 转换为替换引用。\n"
2558 -"\n"
2559 -"设置 \"git config advice.graftFileDeprecated false\"\n"
2560 -"可关闭本消息"
2617 +"You seem to have moved HEAD since the last 'am' failure.\n"
2618 +"Not rewinding to ORIG_HEAD"
2619 +msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2620
2562 -#: commit.c:1252
2621 +#: builtin/am.c builtin/bisect--helper.c worktree.c
2622 #, c-format
2564 -msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2565 -msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2623 +msgid "failed to read '%s'"
2624 +msgstr "无法读取 '%s'"
2625
2567 -#: commit.c:1256
2626 +#: builtin/am.c
2627 #, c-format
2569 -msgid "Commit %s has a bad GPG signature allegedly by %s."
2570 -msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2628 +msgid "options '%s=%s' and '%s=%s' cannot be used together"
2629 +msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用"
2630
2572 -#: commit.c:1259
2573 -#, c-format
2574 -msgid "Commit %s does not have a GPG signature."
2575 -msgstr "提交 %s 没有 GPG 签名。"
2631 +#: builtin/am.c
2632 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
2633 +msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
2634
2577 -#: commit.c:1262
2578 -#, c-format
2579 -msgid "Commit %s has a good GPG signature by %s\n"
2580 -msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2635 +#: builtin/am.c
2636 +msgid "git am [<options>] (--continue | --skip | --abort)"
2637 +msgstr "git am [<选项>] (--continue | --skip | --abort)"
2638
2582 -#: commit.c:1516
2583 -msgid ""
2584 -"Warning: commit message did not conform to UTF-8.\n"
2585 -"You may want to amend it after fixing the message, or set the config\n"
2586 -"variable i18n.commitencoding to the encoding your project uses.\n"
2587 -msgstr ""
2588 -"警告：提交说明不符合 UTF-8 字符编码。\n"
2589 -"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
2590 -"设置为您项目所用的字符编码。\n"
2639 +#: builtin/am.c
2640 +msgid "run interactively"
2641 +msgstr "以交互式方式运行"
2642
2592 -#: compat/obstack.c:406 compat/obstack.c:408
2593 -msgid "memory exhausted"
2594 -msgstr "内存耗尽"
2643 +#: builtin/am.c
2644 +msgid "historical option -- no-op"
2645 +msgstr "老的参数 —— 无作用"
2646
2596 -#: compat/terminal.c:167
2597 -msgid "cannot resume in the background, please use 'fg' to resume"
2598 -msgstr "无法从后台中恢复，请使用 'fg' 来恢复"
2647 +#: builtin/am.c
2648 +msgid "allow fall back on 3way merging if needed"
2649 +msgstr "如果必要，允许使用三方合并。"
2650
2600 -#: compat/terminal.c:168
2601 -msgid "cannot restore terminal settings"
2602 -msgstr "无法恢复终端设置"
2651 +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c
2652 +#: builtin/stash.c
2653 +msgid "be quiet"
2654 +msgstr "静默模式"
2655
2604 -#: config.c:143
2605 -#, c-format
2606 -msgid ""
2607 -"exceeded maximum include depth (%d) while including\n"
2608 -"\t%s\n"
2609 -"from\n"
2610 -"\t%s\n"
2611 -"This might be due to circular includes."
2612 -msgstr ""
2613 -"超过了最大包含深度（%1$d），当从\n"
2614 -"\t%3$s\n"
2615 -"包含\n"
2616 -"\t%2$s\n"
2617 -"这可能是因为循环包含。"
2656 +#: builtin/am.c
2657 +msgid "add a Signed-off-by trailer to the commit message"
2658 +msgstr "在提交说明中添加 Signed-off-by 尾注"
2659
2619 -#: config.c:159
2620 -#, c-format
2621 -msgid "could not expand include path '%s'"
2622 -msgstr "无法扩展包含路径 '%s'"
2660 +#: builtin/am.c
2661 +msgid "recode into utf8 (default)"
2662 +msgstr "使用 utf8 字符集（默认）"
2663
2624 -#: config.c:170
2625 -msgid "relative config includes must come from files"
2626 -msgstr "相对路径的配置文件引用必须来自于文件"
2664 +#: builtin/am.c
2665 +msgid "pass -k flag to git-mailinfo"
2666 +msgstr "向 git-mailinfo 传递 -k 参数"
2667
2628 -#: config.c:219
2629 -msgid "relative config include conditionals must come from files"
2630 -msgstr "相对路径的配置文件条件引用必须来自于文件"
2668 +#: builtin/am.c
2669 +msgid "pass -b flag to git-mailinfo"
2670 +msgstr "向 git-mailinfo 传递 -b 参数"
2671
2632 -#: config.c:364
2633 -msgid ""
2634 -"remote URLs cannot be configured in file directly or indirectly included by "
2635 -"includeIf.hasconfig:remote.*.url"
2636 -msgstr ""
2637 -"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*."
2638 -"url 间接地包含。"
2672 +#: builtin/am.c
2673 +msgid "pass -m flag to git-mailinfo"
2674 +msgstr "向 git-mailinfo 传递 -m 参数"
2675
2640 -#: config.c:508
2641 -#, c-format
2642 -msgid "invalid config format: %s"
2643 -msgstr "无效的配置格式：%s"
2676 +#: builtin/am.c
2677 +msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2678 +msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
2679
2645 -#: config.c:512
2646 -#, c-format
2647 -msgid "missing environment variable name for configuration '%.*s'"
2648 -msgstr "配置 '%.*s' 缺少环境变量名称"
2680 +#: builtin/am.c
2681 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2682 +msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
2683
2650 -#: config.c:517
2651 -#, c-format
2652 -msgid "missing environment variable '%s' for configuration '%.*s'"
2653 -msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
2684 +#: builtin/am.c
2685 +msgid "strip everything before a scissors line"
2686 +msgstr "丢弃裁切线前的所有内容"
2687
2655 -#: config.c:553
2656 -#, c-format
2657 -msgid "key does not contain a section: %s"
2658 -msgstr "键名没有包含一个小节名称：%s"
2688 +#: builtin/am.c
2689 +msgid "pass it through git-mailinfo"
2690 +msgstr "传递给 git-mailinfo"
2691
2660 -#: config.c:558
2661 -#, c-format
2662 -msgid "key does not contain variable name: %s"
2663 -msgstr "键名没有包含变量名：%s"
2692 +#: builtin/am.c
2693 +msgid "pass it through git-apply"
2694 +msgstr "传递给 git-apply"
2695
2665 -#: config.c:580 sequencer.c:2802
2666 -#, c-format
2667 -msgid "invalid key: %s"
2668 -msgstr "无效键名：%s"
2696 +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
2697 +#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
2698 +#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
2699 +msgid "n"
2700 +msgstr "n"
2701
2670 -#: config.c:585
2671 -#, c-format
2672 -msgid "invalid key (newline): %s"
2673 -msgstr "无效键名（有换行符）：%s"
2702 +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2703 +#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
2704 +#: builtin/verify-tag.c
2705 +msgid "format"
2706 +msgstr "格式"
2707
2675 -#: config.c:605
2676 -msgid "empty config key"
2677 -msgstr "空的配置键名"
2708 +#: builtin/am.c
2709 +msgid "format the patch(es) are in"
2710 +msgstr "补丁的格式"
2711
2679 -#: config.c:623 config.c:635
2680 -#, c-format
2681 -msgid "bogus config parameter: %s"
2682 -msgstr "伪配置参数：%s"
2712 +#: builtin/am.c
2713 +msgid "override error message when patch failure occurs"
2714 +msgstr "打补丁失败时显示的错误信息"
2715
2684 -#: config.c:649 config.c:666 config.c:673 config.c:682
2685 -#, c-format
2686 -msgid "bogus format in %s"
2687 -msgstr "%s 中格式错误"
2716 +#: builtin/am.c
2717 +msgid "continue applying patches after resolving a conflict"
2718 +msgstr "冲突解决后继续应用补丁"
2719
2689 -#: config.c:716
2690 -#, c-format
2691 -msgid "bogus count in %s"
2692 -msgstr "%s 中错误计数"
2720 +#: builtin/am.c
2721 +msgid "synonyms for --continue"
2722 +msgstr "和 --continue 同义"
2723
2694 -#: config.c:720
2695 -#, c-format
2696 -msgid "too many entries in %s"
2697 -msgstr "%s 中太多的条目"
2724 +#: builtin/am.c
2725 +msgid "skip the current patch"
2726 +msgstr "跳过当前补丁"
2727
2699 -#: config.c:730
2700 -#, c-format
2701 -msgid "missing config key %s"
2702 -msgstr "缺失配置键名 %s"
2728 +#: builtin/am.c
2729 +msgid "restore the original branch and abort the patching operation"
2730 +msgstr "恢复原始分支并终止打补丁操作"
2731
2704 -#: config.c:738
2705 -#, c-format
2706 -msgid "missing config value %s"
2707 -msgstr "缺失配置取值 %s"
2732 +#: builtin/am.c
2733 +msgid "abort the patching operation but keep HEAD where it is"
2734 +msgstr "终止补丁操作但保持 HEAD 不变"
2735
2709 -#: config.c:1089
2710 -#, c-format
2711 -msgid "bad config line %d in blob %s"
2712 -msgstr "数据对象 %2$s 中错误的配置行 %1$d"
2736 +#: builtin/am.c
2737 +msgid "show the patch being applied"
2738 +msgstr "显示正在应用的补丁"
2739
2714 -#: config.c:1093
2715 -#, c-format
2716 -msgid "bad config line %d in file %s"
2717 -msgstr "文件 %2$s 中错误的配置行 %1$d"
2740 +#: builtin/am.c
2741 +msgid "record the empty patch as an empty commit"
2742 +msgstr "把空补丁记录为空提交"
2743
2719 -#: config.c:1097
2720 -#, c-format
2721 -msgid "bad config line %d in standard input"
2722 -msgstr "标准输入中错误的配置行 %d"
2744 +#: builtin/am.c
2745 +msgid "lie about committer date"
2746 +msgstr "将作者日期作为提交日期"
2747
2724 -#: config.c:1101
2725 -#, c-format
2726 -msgid "bad config line %d in submodule-blob %s"
2727 -msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
2748 +#: builtin/am.c
2749 +msgid "use current timestamp for author date"
2750 +msgstr "用当前时间作为作者日期"
2751
2729 -#: config.c:1105
2730 -#, c-format
2731 -msgid "bad config line %d in command line %s"
2732 -msgstr "命令行 %2$s 中错误的配置行 %1$d"
2752 +#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c
2753 +#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c
2754 +msgid "key-id"
2755 +msgstr "key-id"
2756
2734 -#: config.c:1109
2735 -#, c-format
2736 -msgid "bad config line %d in %s"
2737 -msgstr "在 %2$s 中错误的配置行 %1$d"
2757 +#: builtin/am.c builtin/rebase.c
2758 +msgid "GPG-sign commits"
2759 +msgstr "使用 GPG 签名提交"
2760
2739 -#: config.c:1246
2740 -msgid "out of range"
2741 -msgstr "超出范围"
2761 +#: builtin/am.c
2762 +msgid "how to handle empty patches"
2763 +msgstr "如何处理空补丁"
2764
2743 -#: config.c:1246
2744 -msgid "invalid unit"
2745 -msgstr "无效的单位"
2765 +#: builtin/am.c
2766 +msgid "(internal use for git-rebase)"
2767 +msgstr "（内部使用，用于 git-rebase）"
2768
2747 -#: config.c:1247
2748 -#, c-format
2749 -msgid "bad numeric config value '%s' for '%s': %s"
2750 -msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
2769 +#: builtin/am.c
2770 +msgid ""
2771 +"The -b/--binary option has been a no-op for long time, and\n"
2772 +"it will be removed. Please do not use it anymore."
2773 +msgstr ""
2774 +"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
2775 +"请不要再使用它了。"
2776
2752 -#: config.c:1257
2753 -#, c-format
2754 -msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2755 -msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2777 +#: builtin/am.c
2778 +msgid "failed to read the index"
2779 +msgstr "无法读取索引"
2780
2757 -#: config.c:1260
2781 +#: builtin/am.c
2782 #, c-format
2759 -msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2760 -msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2783 +msgid "previous rebase directory %s still exists but mbox given."
2784 +msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
2785
2762 -#: config.c:1263
2786 +#: builtin/am.c
2787 #, c-format
2764 -msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2765 -msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
2788 +msgid ""
2789 +"Stray %s directory found.\n"
2790 +"Use \"git am --abort\" to remove it."
2791 +msgstr ""
2792 +"发现了错误的 %s 目录。\n"
2793 +"使用 \"git am --abort\" 删除它。"
2794
2767 -#: config.c:1266
2768 -#, c-format
2769 -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2770 -msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2795 +#: builtin/am.c
2796 +msgid "Resolve operation not in progress, we are not resuming."
2797 +msgstr "解决操作未进行，我们不会继续。"
2798
2772 -#: config.c:1269
2773 -#, c-format
2774 -msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2775 -msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2799 +#: builtin/am.c
2800 +msgid "interactive mode requires patches on the command line"
2801 +msgstr "交互式模式需要命令行上提供补丁"
2802
2777 -#: config.c:1272
2778 -#, c-format
2779 -msgid "bad numeric config value '%s' for '%s' in %s: %s"
2780 -msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2803 +#: builtin/apply.c
2804 +msgid "git apply [<options>] [<patch>...]"
2805 +msgstr "git apply [<选项>] [<补丁>...]"
2806
2782 -#: config.c:1368
2783 -#, c-format
2784 -msgid "invalid value for variable %s"
2785 -msgstr "变量 %s 的值无效"
2807 +#: builtin/archive.c contrib/scalar/scalar.c
2808 +msgid "could not redirect output"
2809 +msgstr "不能重定向输出"
2810
2787 -#: config.c:1389
2788 -#, c-format
2789 -msgid "ignoring unknown core.fsync component '%s'"
2790 -msgstr "忽略未知的 core.fsync 组件 '%s'"
2811 +#: builtin/archive.c
2812 +msgid "git archive: Remote with no URL"
2813 +msgstr "git archive：未提供远程 URL"
2814
2792 -#: config.c:1425
2793 -#, c-format
2794 -msgid "bad boolean config value '%s' for '%s'"
2795 -msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
2815 +#: builtin/archive.c
2816 +msgid "git archive: expected ACK/NAK, got a flush packet"
2817 +msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"
2818
2797 -#: config.c:1443
2819 +#: builtin/archive.c
2820 #, c-format
2799 -msgid "failed to expand user dir in: '%s'"
2800 -msgstr "无法扩展用户目录：'%s'"
2821 +msgid "git archive: NACK %s"
2822 +msgstr "git archive：NACK %s"
2823
2802 -#: config.c:1452
2803 -#, c-format
2804 -msgid "'%s' for '%s' is not a valid timestamp"
2805 -msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2824 +#: builtin/archive.c
2825 +msgid "git archive: protocol error"
2826 +msgstr "git archive：协议错误"
2827
2807 -#: config.c:1545
2808 -#, c-format
2809 -msgid "abbrev length out of range: %d"
2810 -msgstr "缩写长度超出范围：%d"
2828 +#: builtin/archive.c
2829 +msgid "git archive: expected a flush"
2830 +msgstr "git archive：应有一个 flush 包"
2831
2812 -#: config.c:1559 config.c:1570
2813 -#, c-format
2814 -msgid "bad zlib compression level %d"
2815 -msgstr "错误的 zlib 压缩级别 %d"
2832 +#: builtin/bisect--helper.c
2833 +msgid "git bisect--helper --bisect-reset [<commit>]"
2834 +msgstr "git bisect--helper --bisect-reset [<提交>]"
2835
2817 -#: config.c:1660
2818 -msgid "core.commentChar should only be one character"
2819 -msgstr "core.commentChar 应该是一个字符"
2836 +#: builtin/bisect--helper.c
2837 +msgid ""
2838 +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
2839 +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
2840 +"[<paths>...]"
2841 +msgstr ""
2842 +"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
2843 +"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
2844
2821 -#: config.c:1692
2822 -#, c-format
2823 -msgid "ignoring unknown core.fsyncMethod value '%s'"
2824 -msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
2845 +#: builtin/bisect--helper.c
2846 +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
2847 +msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
2848
2826 -#: config.c:1698
2827 -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
2828 -msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
2849 +#: builtin/bisect--helper.c
2850 +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
2851 +msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
2852 +
2853 +#: builtin/bisect--helper.c
2854 +msgid "git bisect--helper --bisect-replay <filename>"
2855 +msgstr "git bisect--helper --bisect-replay <文件>"
2856 +
2857 +#: builtin/bisect--helper.c
2858 +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
2859 +msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
2860 +
2861 +#: builtin/bisect--helper.c
2862 +msgid "git bisect--helper --bisect-run <cmd>..."
2863 +msgstr "git bisect--helper --bisect-run <命令>..."
2864
2830 -#: config.c:1714
2865 +#: builtin/bisect--helper.c
2866 #, c-format
2832 -msgid "invalid mode for object creation: %s"
2833 -msgstr "无效的对象创建模式：%s"
2867 +msgid "cannot open file '%s' in mode '%s'"
2868 +msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
2869
2835 -#: config.c:1800
2870 +#: builtin/bisect--helper.c
2871 #, c-format
2837 -msgid "malformed value for %s"
2838 -msgstr "%s 的取值格式错误"
2872 +msgid "could not write to file '%s'"
2873 +msgstr "不能写入文件 '%s'"
2874
2840 -#: config.c:1826
2875 +#: builtin/bisect--helper.c
2876 #, c-format
2842 -msgid "malformed value for %s: %s"
2843 -msgstr "%s 的取值格式错误：%s"
2877 +msgid "cannot open file '%s' for reading"
2878 +msgstr "不能打开文件 '%s' 来读取"
2879
2845 -#: config.c:1827
2846 -msgid "must be one of nothing, matching, simple, upstream or current"
2847 -msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
2848 -
2849 -#: config.c:1888 builtin/pack-objects.c:4078
2850 -#, c-format
2851 -msgid "bad pack compression level %d"
2852 -msgstr "错误的打包压缩级别 %d"
2853 -
2854 -#: config.c:2014
2855 -#, c-format
2856 -msgid "unable to load config blob object '%s'"
2857 -msgstr "无法从数据对象 '%s' 加载配置"
2858 -
2859 -#: config.c:2017
2880 +#: builtin/bisect--helper.c
2881 #, c-format
2861 -msgid "reference '%s' does not point to a blob"
2862 -msgstr "引用 '%s' 没有指向一个数据对象"
2882 +msgid "'%s' is not a valid term"
2883 +msgstr "'%s' 不是一个有效的术语"
2884
2864 -#: config.c:2035
2885 +#: builtin/bisect--helper.c
2886 #, c-format
2866 -msgid "unable to resolve config blob '%s'"
2867 -msgstr "不能解析配置对象 '%s'"
2887 +msgid "can't use the builtin command '%s' as a term"
2888 +msgstr "不能使用内置命令 '%s' 作为术语"
2889
2869 -#: config.c:2080
2890 +#: builtin/bisect--helper.c
2891 #, c-format
2871 -msgid "failed to parse %s"
2872 -msgstr "无法解析 %s"
2873 -
2874 -#: config.c:2136
2875 -msgid "unable to parse command-line config"
2876 -msgstr "无法解析命令行中的配置"
2892 +msgid "can't change the meaning of the term '%s'"
2893 +msgstr "不能修改术语 '%s' 的含义"
2894
2878 -#: config.c:2512
2879 -msgid "unknown error occurred while reading the configuration files"
2880 -msgstr "在读取配置文件时遇到未知错误"
2895 +#: builtin/bisect--helper.c
2896 +msgid "please use two different terms"
2897 +msgstr "请使用两个不同的术语"
2898
2882 -#: config.c:2686
2899 +#: builtin/bisect--helper.c
2900 #, c-format
2884 -msgid "Invalid %s: '%s'"
2885 -msgstr "无效 %s：'%s'"
2901 +msgid "We are not bisecting.\n"
2902 +msgstr "我们没有在二分查找。\n"
2903
2887 -#: config.c:2731
2904 +#: builtin/bisect--helper.c
2905 #, c-format
2889 -msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2890 -msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2906 +msgid "'%s' is not a valid commit"
2907 +msgstr "'%s' 不是一个有效的提交"
2908
2892 -#: config.c:2763
2909 +#: builtin/bisect--helper.c
2910 #, c-format
2894 -msgid "unable to parse '%s' from command-line config"
2895 -msgstr "无法解析命令行配置中的 '%s'"
2911 +msgid ""
2912 +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
2913 +msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
2914
2897 -#: config.c:2765
2915 +#: builtin/bisect--helper.c
2916 #, c-format
2899 -msgid "bad config variable '%s' in file '%s' at line %d"
2900 -msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
2917 +msgid "Bad bisect_write argument: %s"
2918 +msgstr "坏的 bisect_write 参数：%s"
2919
2902 -#: config.c:2850
2920 +#: builtin/bisect--helper.c
2921 #, c-format
2904 -msgid "invalid section name '%s'"
2905 -msgstr "无效的小节名称 '%s'"
2922 +msgid "couldn't get the oid of the rev '%s'"
2923 +msgstr "无法获取版本 '%s' 的对象 ID"
2924
2907 -#: config.c:2882
2925 +#: builtin/bisect--helper.c
2926 #, c-format
2909 -msgid "%s has multiple values"
2910 -msgstr "%s 有多个取值"
2927 +msgid "couldn't open the file '%s'"
2928 +msgstr "无法打开文件 '%s'"
2929
2912 -#: config.c:2911
2930 +#: builtin/bisect--helper.c
2931 #, c-format
2914 -msgid "failed to write new configuration file %s"
2915 -msgstr "无法写入新的配置文件 %s"
2932 +msgid "Invalid command: you're currently in a %s/%s bisect"
2933 +msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
2934
2917 -#: config.c:3177 config.c:3518
2935 +#: builtin/bisect--helper.c
2936 #, c-format
2919 -msgid "could not lock config file %s"
2920 -msgstr "不能锁定配置文件 %s"
2937 +msgid ""
2938 +"You need to give me at least one %s and %s revision.\n"
2939 +"You can use \"git bisect %s\" and \"git bisect %s\" for that."
2940 +msgstr ""
2941 +"您需要给我至少一个 %s 和一个 %s 版本。\n"
2942 +"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
2943
2922 -#: config.c:3188
2944 +#: builtin/bisect--helper.c
2945 #, c-format
2924 -msgid "opening %s"
2925 -msgstr "打开 %s"
2946 +msgid ""
2947 +"You need to start by \"git bisect start\".\n"
2948 +"You then need to give me at least one %s and %s revision.\n"
2949 +"You can use \"git bisect %s\" and \"git bisect %s\" for that."
2950 +msgstr ""
2951 +"您需要执行 \"git bisect start\" 来开始。\n"
2952 +"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
2953 +"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
2954
2927 -#: config.c:3225 builtin/config.c:361
2955 +#: builtin/bisect--helper.c
2956 #, c-format
2929 -msgid "invalid pattern: %s"
2930 -msgstr "无效模式：%s"
2957 +msgid "bisecting only with a %s commit"
2958 +msgstr "在只有一个 %s 提交的情况下二分查找"
2959
2932 -#: config.c:3250
2933 -#, c-format
2934 -msgid "invalid config file %s"
2935 -msgstr "无效的配置文件 %s"
2960 +#. TRANSLATORS: Make sure to include [Y] and [n] in your
2961 +#. translation. The program will only accept English input
2962 +#. at this point.
2963 +#.
2964 +#: builtin/bisect--helper.c
2965 +msgid "Are you sure [Y/n]? "
2966 +msgstr "您确认么[Y/n]？ "
2967
2937 -#: config.c:3263 config.c:3531
2938 -#, c-format
2939 -msgid "fstat on %s failed"
2940 -msgstr "对 %s 调用 fstat 失败"
2968 +#: builtin/bisect--helper.c
2969 +msgid "status: waiting for both good and bad commits\n"
2970 +msgstr "状态：正在等待好的和坏的提交\n"
2971
2942 -#: config.c:3274
2972 +#: builtin/bisect--helper.c
2973 #, c-format
2944 -msgid "unable to mmap '%s'%s"
2945 -msgstr "不能 mmap '%s'%s"
2974 +msgid "status: waiting for bad commit, %d good commit known\n"
2975 +msgid_plural "status: waiting for bad commit, %d good commits known\n"
2976 +msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
2977 +msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
2978
2947 -#: config.c:3284 config.c:3536
2948 -#, c-format
2949 -msgid "chmod on %s failed"
2950 -msgstr "对 %s 调用 chmod 失败"
2979 +#: builtin/bisect--helper.c
2980 +msgid "status: waiting for good commit(s), bad commit known\n"
2981 +msgstr "状态：正在等待好的提交，已知坏的提交\n"
2982
2952 -#: config.c:3369 config.c:3633
2953 -#, c-format
2954 -msgid "could not write config file %s"
2955 -msgstr "不能写入配置文件 %s"
2983 +#: builtin/bisect--helper.c
2984 +msgid "no terms defined"
2985 +msgstr "未定义术语"
2986
2957 -#: config.c:3403
2987 +#: builtin/bisect--helper.c
2988 #, c-format
2959 -msgid "could not set '%s' to '%s'"
2960 -msgstr "不能设置 '%s' 为 '%s'"
2989 +msgid ""
2990 +"Your current terms are %s for the old state\n"
2991 +"and %s for the new state.\n"
2992 +msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
2993
2962 -#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
2994 +#: builtin/bisect--helper.c
2995 #, c-format
2964 -msgid "could not unset '%s'"
2965 -msgstr "不能取消设置 '%s'"
2996 +msgid ""
2997 +"invalid argument %s for 'git bisect terms'.\n"
2998 +"Supported options are: --term-good|--term-old and --term-bad|--term-new."
2999 +msgstr ""
3000 +"命令 'git bisect terms' 的参数 %s 无效。\n"
3001 +"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
3002
2967 -#: config.c:3509
2968 -#, c-format
2969 -msgid "invalid section name: %s"
2970 -msgstr "无效的小节名称：%s"
3003 +#: builtin/bisect--helper.c
3004 +msgid "revision walk setup failed\n"
3005 +msgstr "版本遍历设置失败\n"
3006
2972 -#: config.c:3676
3007 +#: builtin/bisect--helper.c
3008 #, c-format
2974 -msgid "missing value for '%s'"
2975 -msgstr "%s 的取值缺失"
2976 -
2977 -#: connect.c:61
2978 -msgid "the remote end hung up upon initial contact"
2979 -msgstr "远端在初始连接时即挂断"
3009 +msgid "could not open '%s' for appending"
3010 +msgstr "无法打开 '%s' 进行追加"
3011
2981 -#: connect.c:63
2982 -msgid ""
2983 -"Could not read from remote repository.\n"
2984 -"\n"
2985 -"Please make sure you have the correct access rights\n"
2986 -"and the repository exists."
2987 -msgstr ""
2988 -"无法读取远程仓库。\n"
2989 -"\n"
2990 -"请确认您有正确的访问权限并且仓库存在。"
3012 +#: builtin/bisect--helper.c
3013 +msgid "'' is not a valid term"
3014 +msgstr "'' 不是一个有效的术语"
3015
2992 -#: connect.c:81
3016 +#: builtin/bisect--helper.c
3017 #, c-format
2994 -msgid "server doesn't support '%s'"
2995 -msgstr "服务器不支持 '%s'"
3018 +msgid "unrecognized option: '%s'"
3019 +msgstr "未识别的选项：'%s'"
3020
2997 -#: connect.c:118
3021 +#: builtin/bisect--helper.c
3022 #, c-format
2999 -msgid "server doesn't support feature '%s'"
3000 -msgstr "服务器不支持特性 '%s'"
3023 +msgid "'%s' does not appear to be a valid revision"
3024 +msgstr "'%s' 看起来不是一个有效的版本"
3025
3002 -#: connect.c:129
3003 -msgid "expected flush after capabilities"
3004 -msgstr "在能力之后应为一个 flush 包"
3026 +#: builtin/bisect--helper.c
3027 +msgid "bad HEAD - I need a HEAD"
3028 +msgstr "坏的 HEAD - 我需要一个 HEAD"
3029
3006 -#: connect.c:265
3030 +#: builtin/bisect--helper.c
3031 #, c-format
3008 -msgid "ignoring capabilities after first line '%s'"
3009 -msgstr "忽略第一行 '%s' 之后的能力字段"
3032 +msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
3033 +msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
3034
3011 -#: connect.c:286
3012 -msgid "protocol error: unexpected capabilities^{}"
3013 -msgstr "协议错误：意外的 capabilities^{}"
3035 +#: builtin/bisect--helper.c
3036 +msgid "won't bisect on cg-seek'ed tree"
3037 +msgstr "不会在做了 cg-seek 的树上做二分查找"
3038
3015 -#: connect.c:308
3039 +#: builtin/bisect--helper.c
3040 +msgid "bad HEAD - strange symbolic ref"
3041 +msgstr "坏的 HEAD - 奇怪的符号引用"
3042 +
3043 +#: builtin/bisect--helper.c
3044 #, c-format
3017 -msgid "protocol error: expected shallow sha-1, got '%s'"
3018 -msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"
3045 +msgid "invalid ref: '%s'"
3046 +msgstr "无效的引用：'%s'"
3047
3020 -#: connect.c:310
3021 -msgid "repository on the other end cannot be shallow"
3022 -msgstr "另一端的仓库不能是浅克隆仓库"
3048 +#: builtin/bisect--helper.c
3049 +msgid "You need to start by \"git bisect start\"\n"
3050 +msgstr "您需要执行 \"git bisect start\" 来开始\n"
3051
3024 -#: connect.c:349
3025 -msgid "invalid packet"
3026 -msgstr "无效数据包"
3052 +#. TRANSLATORS: Make sure to include [Y] and [n] in your
3053 +#. translation. The program will only accept English input
3054 +#. at this point.
3055 +#.
3056 +#: builtin/bisect--helper.c
3057 +msgid "Do you want me to do it for you [Y/n]? "
3058 +msgstr "您想让我为您这样做么[Y/n]？ "
3059 +
3060 +#: builtin/bisect--helper.c
3061 +msgid "Please call `--bisect-state` with at least one argument"
3062 +msgstr "请使用至少一个参数调用 `--bisect-state`"
3063
3028 -#: connect.c:369
3064 +#: builtin/bisect--helper.c
3065 #, c-format
3030 -msgid "protocol error: unexpected '%s'"
3031 -msgstr "协议错误：意外的 '%s'"
3066 +msgid "'git bisect %s' can take only one argument."
3067 +msgstr "'git bisect %s' 只能带一个参数。"
3068
3033 -#: connect.c:499
3069 +#: builtin/bisect--helper.c
3070 #, c-format
3035 -msgid "unknown object format '%s' specified by server"
3036 -msgstr "服务器给出未知的对象格式 '%s'"
3071 +msgid "Bad rev input: %s"
3072 +msgstr "坏的版本输入：%s"
3073
3038 -#: connect.c:528
3074 +#: builtin/bisect--helper.c
3075 #, c-format
3040 -msgid "invalid ls-refs response: %s"
3041 -msgstr "无效的 ls-refs 响应：%s"
3076 +msgid "Bad rev input (not a commit): %s"
3077 +msgstr "坏的版本输入（不是提交）：%s"
3078
3043 -#: connect.c:532
3044 -msgid "expected flush after ref listing"
3045 -msgstr "在引用列表之后应该有一个 flush 包"
3079 +#: builtin/bisect--helper.c
3080 +msgid "We are not bisecting."
3081 +msgstr "我们没有在二分查找。"
3082
3047 -#: connect.c:535
3048 -msgid "expected response end packet after ref listing"
3049 -msgstr "在引用列表之后应该有响应结束包"
3083 +#: builtin/bisect--helper.c
3084 +#, c-format
3085 +msgid "'%s'?? what are you talking about?"
3086 +msgstr "'%s'?? 您在说什么?"
3087
3051 -#: connect.c:670
3088 +#: builtin/bisect--helper.c
3089 #, c-format
3053 -msgid "protocol '%s' is not supported"
3054 -msgstr "不支持 '%s' 协议"
3090 +msgid "cannot read file '%s' for replaying"
3091 +msgstr "不能读取文件 '%s' 来重放"
3092
3056 -#: connect.c:721
3057 -msgid "unable to set SO_KEEPALIVE on socket"
3058 -msgstr "无法为 socket 设置 SO_KEEPALIVE"
3093 +#: builtin/bisect--helper.c
3094 +#, c-format
3095 +msgid "running %s\n"
3096 +msgstr "正在执行 %s\n"
3097
3060 -#: connect.c:761 connect.c:824
3098 +#: builtin/bisect--helper.c
3099 +msgid "bisect run failed: no command provided."
3100 +msgstr "二分查找运行失败：没有提供命令。"
3101 +
3102 +#: builtin/bisect--helper.c
3103 #, c-format
3062 -msgid "Looking up %s ... "
3063 -msgstr "查找 %s ..."
3104 +msgid "unable to verify '%s' on good revision"
3105 +msgstr "无法在好版本中验证 '%s'"
3106
3065 -#: connect.c:765
3107 +#: builtin/bisect--helper.c
3108 #, c-format
3067 -msgid "unable to look up %s (port %s) (%s)"
3068 -msgstr "无法查找 %s（端口 %s）（%s）"
3109 +msgid "bogus exit code %d for good revision"
3110 +msgstr "好版本返回错误的退出码 %d"
3111
3070 -#. TRANSLATORS: this is the end of "Looking up %s ... "
3071 -#: connect.c:769 connect.c:840
3112 +#: builtin/bisect--helper.c
3113 #, c-format
3073 -msgid ""
3074 -"done.\n"
3075 -"Connecting to %s (port %s) ... "
3076 -msgstr ""
3077 -"完成。\n"
3078 -"连接到 %s（端口 %s）... "
3114 +msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
3115 +msgstr "二分查找运行失败：命令 '%2$s' 的退出码 %1$d < 0 或 >= 128"
3116
3080 -#: connect.c:791 connect.c:868
3117 +#: builtin/bisect--helper.c
3118 #, c-format
3082 -msgid ""
3083 -"unable to connect to %s:\n"
3084 -"%s"
3085 -msgstr ""
3086 -"无法连接到 %s：\n"
3087 -"%s"
3119 +msgid "cannot open file '%s' for writing"
3120 +msgstr "无法打开文件 '%s' 进行写入"
3121
3089 -#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
3090 -#: connect.c:797 connect.c:874
3091 -msgid "done."
3092 -msgstr "完成。"
3122 +#: builtin/bisect--helper.c
3123 +msgid "bisect run cannot continue any more"
3124 +msgstr "二分查找不能继续运行"
3125
3094 -#: connect.c:828
3126 +#: builtin/bisect--helper.c
3127 #, c-format
3096 -msgid "unable to look up %s (%s)"
3097 -msgstr "无法查找 %s（%s）"
3128 +msgid "bisect run success"
3129 +msgstr "二分查找运行成功"
3130
3099 -#: connect.c:834
3131 +#: builtin/bisect--helper.c
3132 #, c-format
3101 -msgid "unknown port %s"
3102 -msgstr "未知端口 %s"
3133 +msgid "bisect found first bad commit"
3134 +msgstr "二分查找找到了第一个坏的提交"
3135
3104 -#: connect.c:971 connect.c:1303
3136 +#: builtin/bisect--helper.c
3137 #, c-format
3106 -msgid "strange hostname '%s' blocked"
3107 -msgstr "已阻止奇怪的主机名 '%s'"
3108 -
3109 -#: connect.c:973
3110 -#, c-format
3111 -msgid "strange port '%s' blocked"
3112 -msgstr "已阻止奇怪的端口号 '%s'"
3138 +msgid ""
3139 +"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
3140 +"code %d"
3141 +msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d"
3142
3114 -#: connect.c:983
3115 -#, c-format
3116 -msgid "cannot start proxy %s"
3117 -msgstr "不能启动代理 %s"
3143 +#: builtin/bisect--helper.c
3144 +msgid "reset the bisection state"
3145 +msgstr "清除二分查找状态"
3146
3119 -#: connect.c:1054
3120 -msgid "no path specified; see 'git help pull' for valid url syntax"
3121 -msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
3147 +#: builtin/bisect--helper.c
3148 +msgid "check whether bad or good terms exist"
3149 +msgstr "检查坏的或好的术语是否存在"
3150
3123 -#: connect.c:1194
3124 -msgid "newline is forbidden in git:// hosts and repo paths"
3125 -msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
3151 +#: builtin/bisect--helper.c
3152 +msgid "print out the bisect terms"
3153 +msgstr "打印二分查找术语"
3154
3127 -#: connect.c:1251
3128 -msgid "ssh variant 'simple' does not support -4"
3129 -msgstr "ssh 变体 'simple' 不支持 -4"
3155 +#: builtin/bisect--helper.c
3156 +msgid "start the bisect session"
3157 +msgstr "启动二分查找过程"
3158
3131 -#: connect.c:1263
3132 -msgid "ssh variant 'simple' does not support -6"
3133 -msgstr "ssh 变体 'simple' 不支持 -6"
3159 +#: builtin/bisect--helper.c
3160 +msgid "find the next bisection commit"
3161 +msgstr "查询下一个二分查找提交"
3162
3135 -#: connect.c:1280
3136 -msgid "ssh variant 'simple' does not support setting port"
3137 -msgstr "ssh 变体 'simple' 不支持设置端口"
3163 +#: builtin/bisect--helper.c
3164 +msgid "mark the state of ref (or refs)"
3165 +msgstr "标记引用的状态"
3166
3139 -#: connect.c:1392
3140 -#, c-format
3141 -msgid "strange pathname '%s' blocked"
3142 -msgstr "已阻止奇怪的路径名 '%s'"
3167 +#: builtin/bisect--helper.c
3168 +msgid "list the bisection steps so far"
3169 +msgstr "列出到目前为止的二分查找步骤"
3170
3144 -#: connect.c:1440
3145 -msgid "unable to fork"
3146 -msgstr "无法 fork"
3171 +#: builtin/bisect--helper.c
3172 +msgid "replay the bisection process from the given file"
3173 +msgstr "从给定文件重放二分查找进程"
3174
3148 -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
3149 -msgid "Checking connectivity"
3150 -msgstr "正在检查连通性"
3175 +#: builtin/bisect--helper.c
3176 +msgid "skip some commits for checkout"
3177 +msgstr "跳过要检出的一些提交"
3178
3152 -#: connected.c:122
3153 -msgid "Could not run 'git rev-list'"
3154 -msgstr "不能执行 'git rev-list'"
3179 +#: builtin/bisect--helper.c
3180 +msgid "visualize the bisection"
3181 +msgstr "可视化二分查找过程"
3182
3156 -#: connected.c:146
3157 -msgid "failed write to rev-list"
3158 -msgstr "写入 rev-list 失败"
3183 +#: builtin/bisect--helper.c
3184 +msgid "use <cmd>... to automatically bisect"
3185 +msgstr "使用 <命令>... 来自动二分查找"
3186
3160 -#: connected.c:151
3161 -msgid "failed to close rev-list's stdin"
3162 -msgstr "无法关闭 rev-list 的标准输入"
3187 +#: builtin/bisect--helper.c
3188 +msgid "no log for BISECT_WRITE"
3189 +msgstr "BISECT_WRITE 无日志"
3190
3164 -#: convert.c:183
3165 -#, c-format
3166 -msgid "illegal crlf_action %d"
3167 -msgstr "非法的 crlf_action %d"
3191 +#: builtin/bisect--helper.c
3192 +msgid "--bisect-reset requires either no argument or a commit"
3193 +msgstr "--bisect-reset 无需参数或者需要一个提交"
3194
3169 -#: convert.c:196
3170 -#, c-format
3171 -msgid "CRLF would be replaced by LF in %s"
3172 -msgstr "%s 中的 CRLF 将被 LF 替换"
3195 +#: builtin/bisect--helper.c
3196 +msgid "--bisect-terms requires 0 or 1 argument"
3197 +msgstr "--bisect-terms 需要 0 或 1 个参数"
3198
3174 -#: convert.c:198
3175 -#, c-format
3176 -msgid ""
3177 -"CRLF will be replaced by LF in %s.\n"
3178 -"The file will have its original line endings in your working directory"
3179 -msgstr ""
3180 -"%s 中的 CRLF 将被 LF 替换。<\n"
3181 -"在工作区中该文件仍保持原有的换行符。"
3199 +#: builtin/bisect--helper.c
3200 +msgid "--bisect-next requires 0 arguments"
3201 +msgstr "--bisect-next 需要 0 个参数"
3202
3183 -#: convert.c:206
3184 -#, c-format
3185 -msgid "LF would be replaced by CRLF in %s"
3186 -msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3203 +#: builtin/bisect--helper.c
3204 +msgid "--bisect-log requires 0 arguments"
3205 +msgstr "--bisect-log 需要 0 个参数"
3206
3188 -#: convert.c:208
3189 -#, c-format
3190 -msgid ""
3191 -"LF will be replaced by CRLF in %s.\n"
3192 -"The file will have its original line endings in your working directory"
3193 -msgstr ""
3194 -"%s 中的 LF 将被 CRLF 替换。\n"
3195 -"在工作区中该文件仍保持原有的换行符"
3207 +#: builtin/bisect--helper.c
3208 +msgid "no logfile given"
3209 +msgstr "未提供日志文件"
3210
3197 -#: convert.c:273
3198 -#, c-format
3199 -msgid "BOM is prohibited in '%s' if encoded as %s"
3200 -msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"
3211 +#: builtin/blame.c
3212 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3213 +msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3214
3202 -#: convert.c:280
3203 -#, c-format
3204 -msgid ""
3205 -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
3206 -"working-tree-encoding."
3207 -msgstr ""
3208 -"文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。"
3215 +#: builtin/blame.c
3216 +msgid "<rev-opts> are documented in git-rev-list(1)"
3217 +msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3218
3210 -#: convert.c:293
3219 +#: builtin/blame.c
3220 #, c-format
3212 -msgid "BOM is required in '%s' if encoded as %s"
3213 -msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"
3221 +msgid "expecting a color: %s"
3222 +msgstr "期望一个颜色：%s"
3223
3215 -#: convert.c:295
3216 -#, c-format
3217 -msgid ""
3218 -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
3219 -"%sLE (depending on the byte order) as working-tree-encoding."
3220 -msgstr ""
3221 -"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
3222 -"节序）作为工作区编码。"
3224 +#: builtin/blame.c
3225 +msgid "must end with a color"
3226 +msgstr "必须以一个颜色结尾"
3227
3224 -#: convert.c:408 convert.c:479
3228 +#: builtin/blame.c
3229 #, c-format
3226 -msgid "failed to encode '%s' from %s to %s"
3227 -msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
3230 +msgid "cannot find revision %s to ignore"
3231 +msgstr "不能找到要忽略的版本 %s"
3232
3229 -#: convert.c:451
3230 -#, c-format
3231 -msgid "encoding '%s' from %s to %s and back is not the same"
3232 -msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
3233 +#: builtin/blame.c
3234 +msgid "show blame entries as we find them, incrementally"
3235 +msgstr "增量式地显示发现的 blame 条目"
3236
3234 -#: convert.c:654
3235 -#, c-format
3236 -msgid "cannot fork to run external filter '%s'"
3237 -msgstr "不能 fork 以执行外部过滤器 '%s'"
3237 +#: builtin/blame.c
3238 +msgid "do not show object names of boundary commits (Default: off)"
3239 +msgstr "不显示边界提交的对象名（默认：关闭）"
3240
3239 -#: convert.c:674
3240 -#, c-format
3241 -msgid "cannot feed the input to external filter '%s'"
3242 -msgstr "不能将输入传递给外部过滤器 '%s'"
3241 +#: builtin/blame.c
3242 +msgid "do not treat root commits as boundaries (Default: off)"
3243 +msgstr "不把根提交作为边界（默认：关闭）"
3244
3244 -#: convert.c:681
3245 -#, c-format
3246 -msgid "external filter '%s' failed %d"
3247 -msgstr "外部过滤器 '%s' 失败码 %d"
3245 +#: builtin/blame.c
3246 +msgid "show work cost statistics"
3247 +msgstr "显示工作消耗统计"
3248
3249 -#: convert.c:716 convert.c:719
3250 -#, c-format
3251 -msgid "read from external filter '%s' failed"
3252 -msgstr "从外部过滤器 '%s' 读取失败"
3249 +#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c
3250 +#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c
3251 +#: builtin/push.c builtin/remote.c builtin/send-pack.c
3252 +msgid "force progress reporting"
3253 +msgstr "强制显示进度报告"
3254
3254 -#: convert.c:722 convert.c:777
3255 -#, c-format
3256 -msgid "external filter '%s' failed"
3257 -msgstr "外部过滤器 '%s' 失败"
3255 +#: builtin/blame.c
3256 +msgid "show output score for blame entries"
3257 +msgstr "显示 blame 条目的输出得分"
3258
3259 -#: convert.c:826
3260 -msgid "unexpected filter type"
3261 -msgstr "意外的过滤类型"
3259 +#: builtin/blame.c
3260 +msgid "show original filename (Default: auto)"
3261 +msgstr "显示原始文件名（默认：自动）"
3262
3263 -#: convert.c:837
3264 -msgid "path name too long for external filter"
3265 -msgstr "外部过滤器的路径名太长"
3263 +#: builtin/blame.c
3264 +msgid "show original linenumber (Default: off)"
3265 +msgstr "显示原始的行号（默认：关闭）"
3266
3267 -#: convert.c:935
3268 -#, c-format
3269 -msgid ""
3270 -"external filter '%s' is not available anymore although not all paths have "
3271 -"been filtered"
3272 -msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
3267 +#: builtin/blame.c
3268 +msgid "show in a format designed for machine consumption"
3269 +msgstr "显示为一个适合机器读取的格式"
3270
3274 -#: convert.c:1236
3275 -msgid "true/false are no valid working-tree-encodings"
3276 -msgstr "true/false 不是有效的工作区编码"
3271 +#: builtin/blame.c
3272 +msgid "show porcelain format with per-line commit information"
3273 +msgstr "为每一行显示机器适用的提交信息"
3274
3278 -#: convert.c:1416 convert.c:1449
3279 -#, c-format
3280 -msgid "%s: clean filter '%s' failed"
3281 -msgstr "%s：clean 过滤器 '%s' 失败"
3275 +#: builtin/blame.c
3276 +msgid "use the same output mode as git-annotate (Default: off)"
3277 +msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
3278
3283 -#: convert.c:1492
3284 -#, c-format
3285 -msgid "%s: smudge filter %s failed"
3286 -msgstr "%s：smudge 过滤器 %s 失败"
3279 +#: builtin/blame.c
3280 +msgid "show raw timestamp (Default: off)"
3281 +msgstr "显示原始时间戳（默认：关闭）"
3282
3288 -#: credential.c:96
3289 -#, c-format
3290 -msgid "skipping credential lookup for key: credential.%s"
3291 -msgstr "跳过凭据查询：credential.%s"
3283 +#: builtin/blame.c
3284 +msgid "show long commit SHA1 (Default: off)"
3285 +msgstr "显示长的 SHA1 提交号（默认：关闭）"
3286
3293 -#: credential.c:112
3294 -msgid "refusing to work with credential missing host field"
3295 -msgstr "拒绝使用缺少主机字段的凭据"
3287 +#: builtin/blame.c
3288 +msgid "suppress author name and timestamp (Default: off)"
3289 +msgstr "隐藏作者名字和时间戳（默认：关闭）"
3290
3297 -#: credential.c:114
3298 -msgid "refusing to work with credential missing protocol field"
3299 -msgstr "拒绝使用缺少协议字段的凭据"
3291 +#: builtin/blame.c
3292 +msgid "show author email instead of name (Default: off)"
3293 +msgstr "显示作者的邮箱而不是名字（默认：关闭）"
3294
3301 -#: credential.c:396
3302 -#, c-format
3303 -msgid "url contains a newline in its %s component: %s"
3304 -msgstr "URL 的 %s 组件中包含换行符：%s"
3295 +#: builtin/blame.c
3296 +msgid "ignore whitespace differences"
3297 +msgstr "忽略空白差异"
3298
3306 -#: credential.c:440
3307 -#, c-format
3308 -msgid "url has no scheme: %s"
3309 -msgstr "URL 没有 scheme：%s"
3299 +#: builtin/blame.c builtin/log.c
3300 +msgid "rev"
3301 +msgstr "版本"
3302
3311 -#: credential.c:513
3312 -#, c-format
3313 -msgid "credential url cannot be parsed: %s"
3314 -msgstr "不能解析凭据 URL：%s"
3303 +#: builtin/blame.c
3304 +msgid "ignore <rev> when blaming"
3305 +msgstr "在执行 blame 操作时忽略 <版本>"
3306
3316 -#: date.c:139
3317 -msgid "in the future"
3318 -msgstr "在将来"
3307 +#: builtin/blame.c
3308 +msgid "ignore revisions from <file>"
3309 +msgstr "忽略来自 <文件> 中的版本"
3310
3320 -#: date.c:145
3321 -#, c-format
3322 -msgid "%<PRIuMAX> second ago"
3323 -msgid_plural "%<PRIuMAX> seconds ago"
3324 -msgstr[0] "%<PRIuMAX> 秒钟前"
3325 -msgstr[1] "%<PRIuMAX> 秒钟前"
3311 +#: builtin/blame.c
3312 +msgid "color redundant metadata from previous line differently"
3313 +msgstr "使用颜色间隔输出与前一行不同的重复元信息"
3314
3327 -#: date.c:152
3328 -#, c-format
3329 -msgid "%<PRIuMAX> minute ago"
3330 -msgid_plural "%<PRIuMAX> minutes ago"
3331 -msgstr[0] "%<PRIuMAX> 分钟前"
3332 -msgstr[1] "%<PRIuMAX> 分钟前"
3315 +#: builtin/blame.c
3316 +msgid "color lines by age"
3317 +msgstr "依据时间着色"
3318
3334 -#: date.c:159
3335 -#, c-format
3336 -msgid "%<PRIuMAX> hour ago"
3337 -msgid_plural "%<PRIuMAX> hours ago"
3338 -msgstr[0] "%<PRIuMAX> 小时前"
3339 -msgstr[1] "%<PRIuMAX> 小时前"
3319 +#: builtin/blame.c
3320 +msgid "spend extra cycles to find better match"
3321 +msgstr "花费额外的循环来找到更好的匹配"
3322
3341 -#: date.c:166
3342 -#, c-format
3343 -msgid "%<PRIuMAX> day ago"
3344 -msgid_plural "%<PRIuMAX> days ago"
3345 -msgstr[0] "%<PRIuMAX> 天前"
3346 -msgstr[1] "%<PRIuMAX> 天前"
3323 +#: builtin/blame.c
3324 +msgid "use revisions from <file> instead of calling git-rev-list"
3325 +msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3326
3348 -#: date.c:172
3349 -#, c-format
3350 -msgid "%<PRIuMAX> week ago"
3351 -msgid_plural "%<PRIuMAX> weeks ago"
3352 -msgstr[0] "%<PRIuMAX> 周前"
3353 -msgstr[1] "%<PRIuMAX> 周前"
3327 +#: builtin/blame.c
3328 +msgid "use <file>'s contents as the final image"
3329 +msgstr "使用 <文件> 的内容作为最终的镜像"
3330
3355 -#: date.c:179
3356 -#, c-format
3357 -msgid "%<PRIuMAX> month ago"
3358 -msgid_plural "%<PRIuMAX> months ago"
3359 -msgstr[0] "%<PRIuMAX> 个月前"
3360 -msgstr[1] "%<PRIuMAX> 个月前"
3331 +#: builtin/blame.c
3332 +msgid "score"
3333 +msgstr "得分"
3334
3362 -#: date.c:190
3363 -#, c-format
3364 -msgid "%<PRIuMAX> year"
3365 -msgid_plural "%<PRIuMAX> years"
3366 -msgstr[0] "%<PRIuMAX> 年"
3367 -msgstr[1] "%<PRIuMAX> 年"
3335 +#: builtin/blame.c
3336 +msgid "find line copies within and across files"
3337 +msgstr "找到文件内及跨文件的行拷贝"
3338
3369 -#. TRANSLATORS: "%s" is "<n> years"
3370 -#: date.c:193
3371 -#, c-format
3372 -msgid "%s, %<PRIuMAX> month ago"
3373 -msgid_plural "%s, %<PRIuMAX> months ago"
3374 -msgstr[0] "%s %<PRIuMAX> 个月前"
3375 -msgstr[1] "%s %<PRIuMAX> 个月前"
3376 -
3377 -#: date.c:198 date.c:203
3378 -#, c-format
3379 -msgid "%<PRIuMAX> year ago"
3380 -msgid_plural "%<PRIuMAX> years ago"
3381 -msgstr[0] "%<PRIuMAX> 年前"
3382 -msgstr[1] "%<PRIuMAX> 年前"
3339 +#: builtin/blame.c
3340 +msgid "find line movements within and across files"
3341 +msgstr "找到文件内及跨文件的行移动"
3342
3384 -#: delta-islands.c:272
3385 -msgid "Propagating island marks"
3386 -msgstr "正在传播数据岛标记"
3343 +#: builtin/blame.c
3344 +msgid "range"
3345 +msgstr "范围"
3346
3388 -#: delta-islands.c:290
3389 -#, c-format
3390 -msgid "bad tree object %s"
3391 -msgstr "坏的树对象 %s"
3347 +#: builtin/blame.c
3348 +msgid "process only line range <start>,<end> or function :<funcname>"
3349 +msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>"
3350
3393 -#: delta-islands.c:334
3394 -#, c-format
3395 -msgid "failed to load island regex for '%s': %s"
3396 -msgstr "未能加载 '%s' 的数据岛正则表达式：%s"
3351 +#: builtin/blame.c
3352 +msgid "--progress can't be used with --incremental or porcelain formats"
3353 +msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
3354
3398 -#: delta-islands.c:390
3399 -#, c-format
3400 -msgid "island regex from config has too many capture groups (max=%d)"
3401 -msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"
3355 +#. TRANSLATORS: This string is used to tell us the
3356 +#. maximum display width for a relative timestamp in
3357 +#. "git blame" output. For C locale, "4 years, 11
3358 +#. months ago", which takes 22 places, is the longest
3359 +#. among various forms of relative timestamps, but
3360 +#. your language may need more or fewer display
3361 +#. columns.
3362 +#.
3363 +#: builtin/blame.c
3364 +msgid "4 years, 11 months ago"
3365 +msgstr "4 年 11 个月前"
3366
3403 -#: delta-islands.c:467
3367 +#: builtin/blame.c
3368 #, c-format
3405 -msgid "Marked %d islands, done.\n"
3406 -msgstr "已标记 %d 个数据岛，结束。\n"
3369 +msgid "file %s has only %lu line"
3370 +msgid_plural "file %s has only %lu lines"
3371 +msgstr[0] "文件 %s 只有 %lu 行"
3372 +msgstr[1] "文件 %s 只有 %lu 行"
3373
3408 -#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
3409 -#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
3410 -#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
3411 -#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
3412 -#: builtin/pull.c:47 builtin/pull.c:321
3413 -#, c-format
3414 -msgid "invalid value for '%s': '%s'"
3415 -msgstr "'%s' 的值无效：'%s'"
3374 +#: builtin/blame.c
3375 +msgid "Blaming lines"
3376 +msgstr "追踪代码行"
3377
3417 -#: diff-lib.c:561
3418 -msgid "--merge-base does not work with ranges"
3419 -msgstr "--merge-base 不适用于范围"
3378 +#: builtin/branch.c
3379 +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
3380 +msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
3381
3421 -#: diff-lib.c:563
3422 -msgid "--merge-base only works with commits"
3423 -msgstr "--merge-base 仅适用于提交"
3382 +#: builtin/branch.c
3383 +msgid ""
3384 +"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
3385 +"point>]"
3386 +msgstr "git branch [<选项>] [-f] [--recurse-submodules] <分支名> [<起始点>]"
3387
3425 -#: diff-lib.c:580
3426 -msgid "unable to get HEAD"
3427 -msgstr "不能解析 HEAD"
3388 +#: builtin/branch.c
3389 +msgid "git branch [<options>] [-l] [<pattern>...]"
3390 +msgstr "git branch [<选项>] [-l] [<模式>...]"
3391
3429 -#: diff-lib.c:587
3430 -msgid "no merge base found"
3431 -msgstr "未找到合并基线"
3392 +#: builtin/branch.c
3393 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3394 +msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3395
3433 -#: diff-lib.c:589
3434 -msgid "multiple merge bases found"
3435 -msgstr "找到了多条合并基线"
3396 +#: builtin/branch.c
3397 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3398 +msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3399
3437 -#: diff-no-index.c:237
3438 -msgid "git diff --no-index [<options>] <path> <path>"
3439 -msgstr "git diff --no-index [<选项>] <路径> <路径>"
3400 +#: builtin/branch.c
3401 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
3402 +msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
3403
3441 -#: diff-no-index.c:262
3442 -msgid ""
3443 -"Not a git repository. Use --no-index to compare two paths outside a working "
3444 -"tree"
3445 -msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
3404 +#: builtin/branch.c
3405 +msgid "git branch [<options>] [-r | -a] [--points-at]"
3406 +msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3407
3447 -# 译者：注意保持前导空格
3448 -#: diff.c:159
3449 -#, c-format
3450 -msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3451 -msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
3408 +#: builtin/branch.c
3409 +msgid "git branch [<options>] [-r | -a] [--format]"
3410 +msgstr "git branch [<选项>] [-r | -a] [--format]"
3411
3453 -# 译者：注意保持前导空格
3454 -#: diff.c:164
3412 +# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
3413 +#: builtin/branch.c
3414 #, c-format
3456 -msgid " Unknown dirstat parameter '%s'\n"
3457 -msgstr " 未知的 dirstat 参数 '%s'\n"
3458 -
3459 -#: diff.c:300
3415 msgid ""
3461 -"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3462 -"'dimmed-zebra', 'plain'"
3416 +"deleting branch '%s' that has been merged to\n"
3417 +" '%s', but not yet merged to HEAD."
3418 msgstr ""
3464 -"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
3465 -"'plain'"
3419 +"将要删除的分支 '%s' 已经被合并到\n"
3420 +" '%s'，但未合并到 HEAD。"
3421
3467 -#: diff.c:328
3422 +# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
3423 +#: builtin/branch.c
3424 #, c-format
3425 msgid ""
3470 -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3471 -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3426 +"not deleting branch '%s' that is not yet merged to\n"
3427 +" '%s', even though it is merged to HEAD."
3428 msgstr ""
3473 -"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
3474 -"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
3475 -
3476 -#: diff.c:336
3477 -msgid ""
3478 -"color-moved-ws: allow-indentation-change cannot be combined with other "
3479 -"whitespace modes"
3480 -msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
3429 +"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
3430 +" 然而却尚未被合并到分支 '%s' 。"
3431
3482 -#: diff.c:413
3432 +#: builtin/branch.c
3433 #, c-format
3484 -msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3485 -msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
3434 +msgid "Couldn't look up commit object for '%s'"
3435 +msgstr "无法查询 '%s' 指向的提交对象"
3436
3487 -#: diff.c:473
3437 +#: builtin/branch.c
3438 #, c-format
3439 msgid ""
3490 -"Found errors in 'diff.dirstat' config variable:\n"
3491 -"%s"
3440 +"The branch '%s' is not fully merged.\n"
3441 +"If you are sure you want to delete it, run 'git branch -D %s'."
3442 msgstr ""
3493 -"发现配置变量 'diff.dirstat' 中的错误：\n"
3494 -"%s"
3443 +"分支 '%s' 没有完全合并。\n"
3444 +"如果您确认要删除它，执行 'git branch -D %s'。"
3445
3496 -#: diff.c:4282
3497 -#, c-format
3498 -msgid "external diff died, stopping at %s"
3499 -msgstr "外部 diff 退出，停止在 %s"
3446 +#: builtin/branch.c
3447 +msgid "Update of config-file failed"
3448 +msgstr "更新配置文件失败"
3449
3501 -#: diff.c:4677 parse-options.c:1114
3502 -#, c-format
3503 -msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
3504 -msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"
3450 +#: builtin/branch.c
3451 +msgid "cannot use -a with -d"
3452 +msgstr "不能将 -a 和 -d 同时使用"
3453
3506 -#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
3507 -#, c-format
3508 -msgid "options '%s', '%s', and '%s' cannot be used together"
3509 -msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
3454 +#: builtin/branch.c
3455 +msgid "Couldn't look up commit object for HEAD"
3456 +msgstr "无法查询 HEAD 指向的提交对象"
3457
3511 -#: diff.c:4685
3458 +#: builtin/branch.c
3459 #, c-format
3513 -msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3514 -msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'"
3460 +msgid "Cannot delete branch '%s' checked out at '%s'"
3461 +msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
3462
3516 -#: diff.c:4689
3463 +#: builtin/branch.c
3464 #, c-format
3518 -msgid ""
3519 -"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3520 -msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
3521 -
3522 -#: diff.c:4769
3523 -msgid "--follow requires exactly one pathspec"
3524 -msgstr "--follow 明确要求只跟一个路径规格"
3465 +msgid "remote-tracking branch '%s' not found."
3466 +msgstr "未能找到远程跟踪分支 '%s'。"
3467
3526 -#: diff.c:4823
3468 +#: builtin/branch.c
3469 #, c-format
3528 -msgid "invalid --stat value: %s"
3529 -msgstr "无效的 --stat 值：%s"
3470 +msgid "branch '%s' not found."
3471 +msgstr "分支 '%s' 未发现。"
3472
3531 -#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
3532 -#: parse-options.c:217 parse-options.c:221
3473 +#: builtin/branch.c
3474 #, c-format
3534 -msgid "%s expects a numerical value"
3535 -msgstr "%s 期望一个数字值"
3475 +msgid "Deleted remote-tracking branch %s (was %s).\n"
3476 +msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
3477
3537 -#: diff.c:4860
3478 +#: builtin/branch.c
3479 #, c-format
3539 -msgid ""
3540 -"Failed to parse --dirstat/-X option parameter:\n"
3541 -"%s"
3542 -msgstr ""
3543 -"无法解析 --dirstat/-X 选项的参数：\n"
3544 -"%s"
3480 +msgid "Deleted branch %s (was %s).\n"
3481 +msgstr "已删除分支 %s（曾为 %s）。\n"
3482
3546 -#: diff.c:4893
3547 -#, c-format
3548 -msgid "unknown change class '%c' in --diff-filter=%s"
3549 -msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3483 +#: builtin/branch.c builtin/tag.c
3484 +msgid "unable to parse format string"
3485 +msgstr "不能解析格式化字符串"
3486
3551 -#: diff.c:4917
3552 -#, c-format
3553 -msgid "unknown value after ws-error-highlight=%.*s"
3554 -msgstr "ws-error-highlight=%.*s 之后未知的值"
3487 +#: builtin/branch.c
3488 +msgid "could not resolve HEAD"
3489 +msgstr "不能解析 HEAD 提交"
3490
3556 -#: diff.c:4931
3491 +#: builtin/branch.c
3492 #, c-format
3558 -msgid "unable to resolve '%s'"
3559 -msgstr "不能解析 '%s'"
3493 +msgid "HEAD (%s) points outside of refs/heads/"
3494 +msgstr "HEAD (%s) 指向 refs/heads/ 之外"
3495
3561 -#: diff.c:4981 diff.c:4987
3496 +#: builtin/branch.c
3497 #, c-format
3563 -msgid "%s expects <n>/<m> form"
3564 -msgstr "%s 期望 <n>/<m> 格式"
3498 +msgid "Branch %s is being rebased at %s"
3499 +msgstr "分支 %s 正被变基到 %s"
3500
3566 -#: diff.c:4999
3501 +#: builtin/branch.c
3502 #, c-format
3568 -msgid "%s expects a character, got '%s'"
3569 -msgstr "%s 期望一个字符，得到 '%s'"
3503 +msgid "Branch %s is being bisected at %s"
3504 +msgstr "分支 %s 正被二分查找于 %s"
3505
3571 -#: diff.c:5020
3572 -#, c-format
3573 -msgid "bad --color-moved argument: %s"
3574 -msgstr "坏的 --color-moved 参数：%s"
3506 +#: builtin/branch.c
3507 +msgid "cannot copy the current branch while not on any."
3508 +msgstr "无法拷贝当前分支因为不处于任何分支上。"
3509 +
3510 +#: builtin/branch.c
3511 +msgid "cannot rename the current branch while not on any."
3512 +msgstr "无法重命名当前分支因为不处于任何分支上。"
3513
3576 -#: diff.c:5039
3514 +#: builtin/branch.c
3515 #, c-format
3578 -msgid "invalid mode '%s' in --color-moved-ws"
3579 -msgstr "--color-moved-ws 中的无效模式 '%s' "
3516 +msgid "Invalid branch name: '%s'"
3517 +msgstr "无效的分支名：'%s'"
3518
3581 -#: diff.c:5079
3582 -msgid ""
3583 -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3584 -"\"histogram\""
3585 -msgstr ""
3586 -"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3519 +#: builtin/branch.c
3520 +msgid "Branch rename failed"
3521 +msgstr "分支重命名失败"
3522
3588 -#: diff.c:5115 diff.c:5135
3589 -#, c-format
3590 -msgid "invalid argument to %s"
3591 -msgstr "%s 的参数无效"
3523 +#: builtin/branch.c
3524 +msgid "Branch copy failed"
3525 +msgstr "分支拷贝失败"
3526
3593 -#: diff.c:5239
3527 +#: builtin/branch.c
3528 #, c-format
3595 -msgid "invalid regex given to -I: '%s'"
3596 -msgstr "选项 -I 的正则表达式无效：'%s'"
3529 +msgid "Created a copy of a misnamed branch '%s'"
3530 +msgstr "已为错误命名的分支 '%s' 创建了一个副本"
3531
3598 -#: diff.c:5288
3532 +#: builtin/branch.c
3533 #, c-format
3600 -msgid "failed to parse --submodule option parameter: '%s'"
3601 -msgstr "无法解析 --submodule 选项的参数：'%s'"
3534 +msgid "Renamed a misnamed branch '%s' away"
3535 +msgstr "已将错误命名的分支 '%s' 重命名"
3536
3603 -#: diff.c:5344
3537 +#: builtin/branch.c
3538 #, c-format
3605 -msgid "bad --word-diff argument: %s"
3606 -msgstr "坏的 --word-diff 参数：%s"
3607 -
3608 -#: diff.c:5380
3609 -msgid "Diff output format options"
3610 -msgstr "差异输出格式化选项"
3539 +msgid "Branch renamed to %s, but HEAD is not updated!"
3540 +msgstr "分支重命名为 %s，但 HEAD 没有更新！"
3541
3612 -#: diff.c:5382 diff.c:5388
3613 -msgid "generate patch"
3614 -msgstr "生成补丁"
3542 +#: builtin/branch.c
3543 +msgid "Branch is renamed, but update of config-file failed"
3544 +msgstr "分支被重命名，但更新配置文件失败"
3545
3616 -#: diff.c:5385 builtin/log.c:180
3617 -msgid "suppress diff output"
3618 -msgstr "不显示差异输出"
3546 +#: builtin/branch.c
3547 +msgid "Branch is copied, but update of config-file failed"
3548 +msgstr "分支已拷贝，但更新配置文件失败"
3549
3620 -#: diff.c:5390 diff.c:5504 diff.c:5511
3621 -msgid "<n>"
3622 -msgstr "<n>"
3550 +#: builtin/branch.c
3551 +#, c-format
3552 +msgid ""
3553 +"Please edit the description for the branch\n"
3554 +" %s\n"
3555 +"Lines starting with '%c' will be stripped.\n"
3556 +msgstr ""
3557 +"请编辑分支的描述\n"
3558 +" %s\n"
3559 +"以 '%c' 开头的行将被过滤。\n"
3560
3624 -#: diff.c:5391 diff.c:5394
3625 -msgid "generate diffs with <n> lines context"
3626 -msgstr "生成含 <n> 行上下文的差异"
3561 +#: builtin/branch.c
3562 +msgid "Generic options"
3563 +msgstr "通用选项"
3564
3628 -#: diff.c:5396
3629 -msgid "generate the diff in raw format"
3630 -msgstr "生成原始格式的差异"
3565 +#: builtin/branch.c
3566 +msgid "show hash and subject, give twice for upstream branch"
3567 +msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
3568
3632 -#: diff.c:5399
3633 -msgid "synonym for '-p --raw'"
3634 -msgstr "和 '-p --raw' 同义"
3569 +#: builtin/branch.c
3570 +msgid "suppress informational messages"
3571 +msgstr "不显示信息"
3572
3636 -#: diff.c:5403
3637 -msgid "synonym for '-p --stat'"
3638 -msgstr "和 '-p --stat' 同义"
3573 +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c
3574 +msgid "set branch tracking configuration"
3575 +msgstr "设置分支跟踪配置"
3576
3640 -#: diff.c:5407
3641 -msgid "machine friendly --stat"
3642 -msgstr "机器友好的 --stat"
3577 +#: builtin/branch.c
3578 +msgid "do not use"
3579 +msgstr "不要使用"
3580
3644 -#: diff.c:5410
3645 -msgid "output only the last line of --stat"
3646 -msgstr "只输出 --stat 的最后一行"
3581 +#: builtin/branch.c
3582 +msgid "upstream"
3583 +msgstr "上游"
3584
3648 -#: diff.c:5412 diff.c:5420
3649 -msgid "<param1,param2>..."
3650 -msgstr "<参数1,参数2>..."
3585 +#: builtin/branch.c
3586 +msgid "change the upstream info"
3587 +msgstr "改变上游信息"
3588
3652 -#: diff.c:5413
3653 -msgid ""
3654 -"output the distribution of relative amount of changes for each sub-directory"
3655 -msgstr "输出每个子目录相对变更的分布"
3589 +#: builtin/branch.c
3590 +msgid "unset the upstream info"
3591 +msgstr "取消上游信息的设置"
3592
3657 -#: diff.c:5417
3658 -msgid "synonym for --dirstat=cumulative"
3659 -msgstr "和 --dirstat=cumulative 同义"
3593 +#: builtin/branch.c
3594 +msgid "use colored output"
3595 +msgstr "使用彩色输出"
3596
3661 -#: diff.c:5421
3662 -msgid "synonym for --dirstat=files,param1,param2..."
3663 -msgstr "是 --dirstat=files,param1,param2... 的同义词"
3597 +#: builtin/branch.c
3598 +msgid "act on remote-tracking branches"
3599 +msgstr "作用于远程跟踪分支"
3600
3665 -#: diff.c:5425
3666 -msgid "warn if changes introduce conflict markers or whitespace errors"
3667 -msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
3601 +#: builtin/branch.c
3602 +msgid "print only branches that contain the commit"
3603 +msgstr "只打印包含该提交的分支"
3604
3669 -#: diff.c:5428
3670 -msgid "condensed summary such as creations, renames and mode changes"
3671 -msgstr "精简摘要，例如创建、重命名和模式变更"
3605 +#: builtin/branch.c
3606 +msgid "print only branches that don't contain the commit"
3607 +msgstr "只打印不包含该提交的分支"
3608
3673 -#: diff.c:5431
3674 -msgid "show only names of changed files"
3675 -msgstr "只显示变更文件的文件名"
3609 +#: builtin/branch.c
3610 +msgid "Specific git-branch actions:"
3611 +msgstr "具体的 git-branch 动作："
3612
3677 -#: diff.c:5434
3678 -msgid "show only names and status of changed files"
3679 -msgstr "只显示变更文件的文件名和状态"
3613 +#: builtin/branch.c
3614 +msgid "list both remote-tracking and local branches"
3615 +msgstr "列出远程跟踪及本地分支"
3616
3681 -#: diff.c:5436
3682 -msgid "<width>[,<name-width>[,<count>]]"
3683 -msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3617 +#: builtin/branch.c
3618 +msgid "delete fully merged branch"
3619 +msgstr "删除完全合并的分支"
3620
3685 -#: diff.c:5437
3686 -msgid "generate diffstat"
3687 -msgstr "生成差异统计（diffstat）"
3621 +#: builtin/branch.c
3622 +msgid "delete branch (even if not merged)"
3623 +msgstr "删除分支（即使没有合并）"
3624
3689 -#: diff.c:5439 diff.c:5442 diff.c:5445
3690 -msgid "<width>"
3691 -msgstr "<宽度>"
3625 +#: builtin/branch.c
3626 +msgid "move/rename a branch and its reflog"
3627 +msgstr "移动/重命名一个分支，以及它的引用日志"
3628
3693 -#: diff.c:5440
3694 -msgid "generate diffstat with a given width"
3695 -msgstr "使用给定的长度生成差异统计"
3629 +#: builtin/branch.c
3630 +msgid "move/rename a branch, even if target exists"
3631 +msgstr "移动/重命名一个分支，即使目标已存在"
3632
3697 -#: diff.c:5443
3698 -msgid "generate diffstat with a given name width"
3699 -msgstr "使用给定的文件名长度生成差异统计"
3633 +#: builtin/branch.c
3634 +msgid "copy a branch and its reflog"
3635 +msgstr "拷贝一个分支和它的引用日志"
3636
3701 -#: diff.c:5446
3702 -msgid "generate diffstat with a given graph width"
3703 -msgstr "使用给定的图形长度生成差异统计"
3637 +#: builtin/branch.c
3638 +msgid "copy a branch, even if target exists"
3639 +msgstr "拷贝一个分支，即使目标已存在"
3640
3705 -#: diff.c:5448
3706 -msgid "<count>"
3707 -msgstr "<次数>"
3641 +#: builtin/branch.c
3642 +msgid "list branch names"
3643 +msgstr "列出分支名"
3644
3709 -#: diff.c:5449
3710 -msgid "generate diffstat with limited lines"
3711 -msgstr "生成有限行数的差异统计"
3645 +#: builtin/branch.c
3646 +msgid "show current branch name"
3647 +msgstr "显示当前分支名"
3648
3713 -#: diff.c:5452
3714 -msgid "generate compact summary in diffstat"
3715 -msgstr "生成差异统计的简洁摘要"
3649 +#: builtin/branch.c builtin/submodule--helper.c
3650 +msgid "create the branch's reflog"
3651 +msgstr "创建分支的引用日志"
3652
3717 -#: diff.c:5455
3718 -msgid "output a binary diff that can be applied"
3719 -msgstr "输出一个可以应用的二进制差异"
3653 +#: builtin/branch.c
3654 +msgid "edit the description for the branch"
3655 +msgstr "标记分支的描述"
3656
3721 -#: diff.c:5458
3722 -msgid "show full pre- and post-image object names on the \"index\" lines"
3723 -msgstr "在 \"index\" 行显示完整的前后对象名称"
3657 +#: builtin/branch.c
3658 +msgid "force creation, move/rename, deletion"
3659 +msgstr "强制创建、移动/重命名、删除"
3660
3725 -#: diff.c:5460
3726 -msgid "show colored diff"
3727 -msgstr "显示带颜色的差异"
3661 +#: builtin/branch.c
3662 +msgid "print only branches that are merged"
3663 +msgstr "只打印已经合并的分支"
3664
3729 -#: diff.c:5461
3730 -msgid "<kind>"
3731 -msgstr "<类型>"
3665 +#: builtin/branch.c
3666 +msgid "print only branches that are not merged"
3667 +msgstr "只打印尚未合并的分支"
3668
3733 -#: diff.c:5462
3734 -msgid ""
3735 -"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3736 -"diff"
3737 -msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
3669 +#: builtin/branch.c
3670 +msgid "list branches in columns"
3671 +msgstr "以列的方式显示分支"
3672
3739 -#: diff.c:5465
3740 -msgid ""
3741 -"do not munge pathnames and use NULs as output field terminators in --raw or "
3742 -"--numstat"
3743 -msgstr ""
3744 -"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3745 -"符"
3673 +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c
3674 +msgid "object"
3675 +msgstr "对象"
3676
3747 -#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
3748 -msgid "<prefix>"
3749 -msgstr "<前缀>"
3677 +#: builtin/branch.c
3678 +msgid "print only branches of the object"
3679 +msgstr "只打印指向该对象的分支"
3680
3751 -#: diff.c:5469
3752 -msgid "show the given source prefix instead of \"a/\""
3753 -msgstr "显示给定的源前缀取代 \"a/\""

This file is too large to show in full.