l10n: zh_CN: for git v2.25.0 l10n round 1
Translate 119 new messages (4800t0f0u) for git 2.25.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Dec 30, 2019 at 08:56 UTC
ddc12c429b63912032cbabfaac689093de43c2b9
1 file changed
+2813
-2281
po/zh_CN.po
+2813
-2281
@@ -139,8 +139,8 @@ msgid ""
139
msgstr ""
140
"Project-Id-Version: Git\n"
141
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
142
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
143
-"PO-Revision-Date: 2019-10-30 14:58+0800\n"
142
+"POT-Creation-Date: 2019-12-30 08:48+0800\n"
143
+"PO-Revision-Date: 2020-01-12 17:16+0800\n"
144
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
145
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
146
"Language: zh_CN\n"
@@ -149,37 +149,458 @@ msgstr ""
149
"Content-Transfer-Encoding: 8bit\n"
150
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
151
152
-#: advice.c:109
152
+#: add-interactive.c:347
153
+#, c-format
154
+msgid "Huh (%s)?"
155
+msgstr "嗯（%s）？"
156
+
157
+#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216
158
+#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643
159
+#: builtin/rebase.c:2019 builtin/rebase.c:2063
160
+msgid "could not read index"
161
+msgstr "不能读取索引"
162
+
163
+#: add-interactive.c:555 git-add--interactive.perl:269
164
+#: git-add--interactive.perl:294
165
+msgid "binary"
166
+msgstr "二进制"
167
+
168
+#: add-interactive.c:613 git-add--interactive.perl:278
169
+#: git-add--interactive.perl:332
170
+msgid "nothing"
171
+msgstr "无"
172
+
173
+#: add-interactive.c:614 git-add--interactive.perl:314
174
+#: git-add--interactive.perl:329
175
+msgid "unchanged"
176
+msgstr "没有修改"
177
+
178
+#: add-interactive.c:651 git-add--interactive.perl:643
179
+msgid "Update"
180
+msgstr "更新"
181
+
182
+#: add-interactive.c:668 add-interactive.c:856
183
+#, c-format
184
+msgid "could not stage '%s'"
185
+msgstr "不能暂存 '%s'"
186
+
187
+#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409
188
+#: builtin/rebase.c:895
189
+msgid "could not write index"
190
+msgstr "不能写入索引"
191
+
192
+#: add-interactive.c:677 git-add--interactive.perl:628
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
+
199
+#: add-interactive.c:695 git-add--interactive.perl:678
200
+#, c-format, perl-format
201
+msgid "note: %s is untracked now.\n"
202
+msgstr "说明：%s 现已成为未跟踪的。\n"
203
+
204
+#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281
205
+#: builtin/reset.c:144
206
+#, c-format
207
+msgid "make_cache_entry failed for path '%s'"
208
+msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
209
+
210
+#: add-interactive.c:730 git-add--interactive.perl:655
211
+msgid "Revert"
212
+msgstr "还原"
213
+
214
+#: add-interactive.c:746
215
+msgid "Could not parse HEAD^{tree}"
216
+msgstr "不能解析 HEAD^{tree}"
217
+
218
+#: add-interactive.c:784 git-add--interactive.perl:631
219
+#, c-format, perl-format
220
+msgid "reverted %d path\n"
221
+msgid_plural "reverted %d paths\n"
222
+msgstr[0] "还原了 %d 个路径\n"
223
+msgstr[1] "还原了 %d 个路径\n"
224
+
225
+#: add-interactive.c:835 git-add--interactive.perl:695
226
+#, c-format
227
+msgid "No untracked files.\n"
228
+msgstr "没有未跟踪的文件。\n"
229
+
230
+#: add-interactive.c:839 git-add--interactive.perl:689
231
+msgid "Add untracked"
232
+msgstr "添加未跟踪的"
233
+
234
+#: add-interactive.c:866 git-add--interactive.perl:625
235
+#, c-format, perl-format
236
+msgid "added %d path\n"
237
+msgid_plural "added %d paths\n"
238
+msgstr[0] "增加了 %d 个路径\n"
239
+msgstr[1] "增加了 %d 个路径\n"
240
+
241
+#: add-interactive.c:896
242
+#, c-format
243
+msgid "ignoring unmerged: %s"
244
+msgstr "忽略未合入的：%s"
245
+
246
+#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366
247
+#, c-format
248
+msgid "Only binary files changed.\n"
249
+msgstr "只有二进制文件被修改。\n"
250
+
251
+#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368
252
+#, c-format
253
+msgid "No changes.\n"
254
+msgstr "没有修改。\n"
255
+
256
+#: add-interactive.c:914 git-add--interactive.perl:1376
257
+msgid "Patch update"
258
+msgstr "补丁更新"
259
+
260
+#: add-interactive.c:953 git-add--interactive.perl:1754
261
+msgid "Review diff"
262
+msgstr "检视 diff"
263
+
264
+#: add-interactive.c:981
265
+msgid "show paths with changes"
266
+msgstr "显示含变更的路径"
267
+
268
+#: add-interactive.c:983
269
+msgid "add working tree state to the staged set of changes"
270
+msgstr "将工作区状态添加到暂存区修改集中"
271
+
272
+#: add-interactive.c:985
273
+msgid "revert staged set of changes back to the HEAD version"
274
+msgstr "将暂存的修改集恢复为 HEAD 版本"
275
+
276
+#: add-interactive.c:987
277
+msgid "pick hunks and update selectively"
278
+msgstr "挑选数据块并有选择地更新"
279
+
280
+#: add-interactive.c:989
281
+msgid "view diff between HEAD and index"
282
+msgstr "显示 HEAD 和索引的差异"
283
+
284
+#: add-interactive.c:991
285
+msgid "add contents of untracked files to the staged set of changes"
286
+msgstr "将未跟踪文件的内容添加到暂存区修改集中"
287
+
288
+#: add-interactive.c:999 add-interactive.c:1048
289
+msgid "Prompt help:"
290
+msgstr "帮助："
291
+
292
+#: add-interactive.c:1001
293
+msgid "select a single item"
294
+msgstr "选择一个条目"
295
+
296
+#: add-interactive.c:1003
297
+msgid "select a range of items"
298
+msgstr "选择一系列条目"
299
+
300
+#: add-interactive.c:1005
301
+msgid "select multiple ranges"
302
+msgstr "选择多个范围"
303
+
304
+#: add-interactive.c:1007 add-interactive.c:1052
305
+msgid "select item based on unique prefix"
306
+msgstr "基于唯一前缀选择条目"
307
+
308
+#: add-interactive.c:1009
309
+msgid "unselect specified items"
310
+msgstr "反选指定的条目"
311
+
312
+#: add-interactive.c:1011
313
+msgid "choose all items"
314
+msgstr "选择所有条目"
315
+
316
+#: add-interactive.c:1013
317
+msgid "(empty) finish selecting"
318
+msgstr "（空）结束选择"
319
+
320
+#: add-interactive.c:1050
321
+msgid "select a numbered item"
322
+msgstr "选择一个编号条目"
323
+
324
+#: add-interactive.c:1054
325
+msgid "(empty) select nothing"
326
+msgstr "（空）不选择任何内容"
327
+
328
+#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851
329
+msgid "*** Commands ***"
330
+msgstr "*** 命令 ***"
331
+
332
+#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848
333
+msgid "What now"
334
+msgstr "请选择"
335
+
336
+#: add-interactive.c:1115 git-add--interactive.perl:213
337
+msgid "staged"
338
+msgstr "缓存"
339
+
340
+#: add-interactive.c:1115 git-add--interactive.perl:213
341
+msgid "unstaged"
342
+msgstr "未缓存"
343
+
344
+#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197
345
+#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
346
+#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409
347
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382
348
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878
349
+#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213
350
+msgid "path"
351
+msgstr "路径"
352
+
353
+#: add-interactive.c:1122
354
+msgid "could not refresh index"
355
+msgstr "不能刷新索引"
356
+
357
+#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765
358
+#, c-format
359
+msgid "Bye.\n"
360
+msgstr "再见。\n"
361
+
362
+#: add-patch.c:15
363
+#, c-format
364
+msgid "Stage mode change [y,n,a,q,d%s,?]? "
365
+msgstr "暂存模式变更 [y,n,a,q,d%s,?]? "
366
+
367
+#: add-patch.c:16
368
+#, c-format
369
+msgid "Stage deletion [y,n,a,q,d%s,?]? "
370
+msgstr "暂存删除动作 [y,n,a,q,d%s,?]? "
371
+
372
+#: add-patch.c:17
373
+#, c-format
374
+msgid "Stage this hunk [y,n,a,q,d%s,?]? "
375
+msgstr "暂存该块 [y,n,a,q,d%s,?]? "
376
+
377
+#: add-patch.c:111
378
+#, c-format
379
+msgid "could not parse hunk header '%.*s'"
380
+msgstr "无法解析数据块头信息 '%.*s'"
381
+
382
+#: add-patch.c:130 add-patch.c:134
383
+#, c-format
384
+msgid "could not parse colored hunk header '%.*s'"
385
+msgstr "无法解析彩色数据块头信息 '%.*s'"
386
+
387
+#: add-patch.c:176
388
+msgid "could not parse diff"
389
+msgstr "不能解析差异信息"
390
+
391
+#: add-patch.c:194
392
+msgid "could not parse colored diff"
393
+msgstr "不能解析彩色差异信息"
394
+
395
+#: add-patch.c:508
396
+#, c-format
397
+msgid ""
398
+"expected context line #%d in\n"
399
+"%.*s"
400
+msgstr ""
401
+"预期上下文行 #%d 于\n"
402
+"%.*s"
403
+
404
+#: add-patch.c:523
405
+#, c-format
406
+msgid ""
407
+"hunks do not overlap:\n"
408
+"%.*s\n"
409
+"\tdoes not end with:\n"
410
+"%.*s"
411
+msgstr ""
412
+"块不重叠：\n"
413
+"%.*s\n"
414
+"\t不是结尾于：\n"
415
+"%.*s"
416
+
417
+#: add-patch.c:799 git-add--interactive.perl:1112
418
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
419
+msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
420
+
421
+#: add-patch.c:803
422
+#, c-format
423
+msgid ""
424
+"---\n"
425
+"To remove '%c' lines, make them ' ' lines (context).\n"
426
+"To remove '%c' lines, delete them.\n"
427
+"Lines starting with %c will be removed.\n"
428
+msgstr ""
429
+"---\n"
430
+"要删除 '%c' 开始的行，使其成为 ' ' 开始的行（上下文）。\n"
431
+"要删除 '%c' 开始的行，删除它们。\n"
432
+"以 %c 开始的行将被删除。\n"
433
+
434
+#: add-patch.c:810
435
+msgid ""
436
+"If the patch applies cleanly, the edited hunk will immediately be\n"
437
+"marked for staging.\n"
438
+msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。\n"
439
+
440
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
441
+#: add-patch.c:818 git-add--interactive.perl:1126
442
+msgid ""
443
+"If it does not apply cleanly, you will be given an opportunity to\n"
444
+"edit again. If all lines of the hunk are removed, then the edit is\n"
445
+"aborted and the hunk is left unchanged.\n"
446
+msgstr ""
447
+"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
448
+"此次编辑被终止，该块不会被修改。\n"
449
+
450
+#: add-patch.c:851
451
+msgid "could not parse hunk header"
452
+msgstr "无法解析数据块头信息"
453
+
454
+#: add-patch.c:895 add-patch.c:1294
455
+msgid "'git apply --cached' failed"
456
+msgstr "'git apply --cached' 失败"
457
+
458
+#. TRANSLATORS: do not translate [y/n]
459
+#. The program will only accept that input at this point.
460
+#. Consider translating (saying "no" discards!) as
461
+#. (saying "n" for "no" discards!) if the translation
462
+#. of the word "no" does not start with n.
463
+#.
464
+#. TRANSLATORS: do not translate [y/n]
465
+#. The program will only accept that input
466
+#. at this point.
467
+#. Consider translating (saying "no" discards!) as
468
+#. (saying "n" for "no" discards!) if the translation
469
+#. of the word "no" does not start with n.
470
+#: add-patch.c:952 git-add--interactive.perl:1239
471
+msgid ""
472
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
473
+msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
474
+
475
+#: add-patch.c:1009
476
+msgid ""
477
+"y - stage this hunk\n"
478
+"n - do not stage this hunk\n"
479
+"q - quit; do not stage this hunk or any of the remaining ones\n"
480
+"a - stage this and all the remaining hunks\n"
481
+"d - do not stage this hunk nor any of the remaining hunks\n"
482
+msgstr ""
483
+"y - 暂存该块\n"
484
+"n - 不要暂存该块\n"
485
+"q - 退出。不暂存该块及后面的全部块\n"
486
+"a - 暂存该块和所有剩余的块\n"
487
+"d - 不暂存该块和任何剩余的块\n"
488
+
489
+#: add-patch.c:1016
490
+msgid ""
491
+"j - leave this hunk undecided, see next undecided hunk\n"
492
+"J - leave this hunk undecided, see next hunk\n"
493
+"k - leave this hunk undecided, see previous undecided hunk\n"
494
+"K - leave this hunk undecided, see previous hunk\n"
495
+"g - select a hunk to go to\n"
496
+"/ - search for a hunk matching the given regex\n"
497
+"s - split the current hunk into smaller hunks\n"
498
+"e - manually edit the current hunk\n"
499
+"? - print help\n"
500
+msgstr ""
501
+"j - 维持该块未决状态，查看下一个未决块\n"
502
+"J - 维持该块未决状态，查看下一个块\n"
503
+"k - 维持该块未决状态，查看上一个未决块\n"
504
+"K - 维持该块未决状态，查看上一个块\n"
505
+"g - 选择跳转到一个块\n"
506
+"/ - 查找和给定正则表达式匹配的块\n"
507
+"s - 拆分当前块为更小的块\n"
508
+"e - 手动编辑当前块\n"
509
+"? - 显示帮助\n"
510
+
511
+#: add-patch.c:1137 add-patch.c:1147
512
+msgid "No previous hunk"
513
+msgstr "没有前一个块"
514
+
515
+#: add-patch.c:1142 add-patch.c:1152
516
+msgid "No next hunk"
517
+msgstr "没有下一个块"
518
+
519
+#: add-patch.c:1158
520
+msgid "No other hunks to goto"
521
+msgstr "没有其它可供跳转的块"
522
+
523
+#: add-patch.c:1169 git-add--interactive.perl:1577
524
+msgid "go to which hunk (<ret> to see more)? "
525
+msgstr "跳转到哪个块（<回车> 查看更多）？ "
526
+
527
+#: add-patch.c:1170 git-add--interactive.perl:1579
528
+msgid "go to which hunk? "
529
+msgstr "跳转到哪个块？"
530
+
531
+#: add-patch.c:1181
532
+#, c-format
533
+msgid "Invalid number: '%s'"
534
+msgstr "无效数字：'%s'"
535
+
536
+#: add-patch.c:1186
537
+#, c-format
538
+msgid "Sorry, only %d hunk available."
539
+msgid_plural "Sorry, only %d hunks available."
540
+msgstr[0] "对不起，只有 %d 个可用块。"
541
+msgstr[1] "对不起，只有 %d 个可用块。"
542
+
543
+#: add-patch.c:1195
544
+msgid "No other hunks to search"
545
+msgstr "没有其它可供查找的块"
546
+
547
+#: add-patch.c:1201 git-add--interactive.perl:1623
548
+msgid "search for regex? "
549
+msgstr "使用正则表达式搜索？"
550
+
551
+#: add-patch.c:1216
552
+#, c-format
553
+msgid "Malformed search regexp %s: %s"
554
+msgstr "错误的正则表达式 %s：%s"
555
+
556
+#: add-patch.c:1233
557
+msgid "No hunk matches the given pattern"
558
+msgstr "没有和给定模式相匹配的块"
559
+
560
+#: add-patch.c:1240
561
+msgid "Sorry, cannot split this hunk"
562
+msgstr "对不起，不能拆分这个块"
563
+
564
+#: add-patch.c:1244
565
+#, c-format
566
+msgid "Split into %d hunks."
567
+msgstr "拆分为 %d 块。"
568
+
569
+#: add-patch.c:1248
570
+msgid "Sorry, cannot edit this hunk"
571
+msgstr "对不起，不能编辑这个块"
572
+
573
+#: advice.c:111
574
#, c-format
575
msgid "%shint: %.*s%s\n"
576
msgstr "%s提示：%.*s%s\n"
577
157
-#: advice.c:162
578
+#: advice.c:164
579
msgid "Cherry-picking is not possible because you have unmerged files."
580
msgstr "无法拣选，因为您有未合并的文件。"
581
161
-#: advice.c:164
582
+#: advice.c:166
583
msgid "Committing is not possible because you have unmerged files."
584
msgstr "无法提交，因为您有未合并的文件。"
585
165
-#: advice.c:166
586
+#: advice.c:168
587
msgid "Merging is not possible because you have unmerged files."
588
msgstr "无法合并，因为您有未合并的文件。"
589
169
-#: advice.c:168
590
+#: advice.c:170
591
msgid "Pulling is not possible because you have unmerged files."
592
msgstr "无法拉取，因为您有未合并的文件。"
593
173
-#: advice.c:170
594
+#: advice.c:172
595
msgid "Reverting is not possible because you have unmerged files."
596
msgstr "无法回退，因为您有未合并的文件。"
597
177
-#: advice.c:172
598
+#: advice.c:174
599
#, c-format
600
msgid "It is not possible to %s because you have unmerged files."
601
msgstr "无法 %s，因为您有未合并的文件。"
602
182
-#: advice.c:180
603
+#: advice.c:182
604
msgid ""
605
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
606
"as appropriate to mark resolution and make a commit."
@@ -187,23 +608,23 @@ msgstr ""
608
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
609
"解决方案并提交。"
610
190
-#: advice.c:188
611
+#: advice.c:190
612
msgid "Exiting because of an unresolved conflict."
613
msgstr "因为存在未解决的冲突而退出。"
614
194
-#: advice.c:193 builtin/merge.c:1332
615
+#: advice.c:195 builtin/merge.c:1332
616
msgid "You have not concluded your merge (MERGE_HEAD exists)."
617
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
618
198
-#: advice.c:195
619
+#: advice.c:197
620
msgid "Please, commit your changes before merging."
621
msgstr "请在合并前先提交您的修改。"
622
202
-#: advice.c:196
623
+#: advice.c:198
624
msgid "Exiting because of unfinished merge."
625
msgstr "因为存在未完成的合并而退出。"
626
206
-#: advice.c:202
627
+#: advice.c:204
628
#, c-format
629
msgid ""
630
"Note: switching to '%s'.\n"
@@ -404,24 +825,24 @@ msgstr "无法读取符号链接 %s"
825
msgid "unable to open or read %s"
826
msgstr "不能打开或读取 %s"
827
407
-#: apply.c:2926
828
+#: apply.c:2936
829
#, c-format
830
msgid "invalid start of line: '%c'"
831
msgstr "无效的行首字符：'%c'"
832
412
-#: apply.c:3047
833
+#: apply.c:3057
834
#, c-format
835
msgid "Hunk #%d succeeded at %d (offset %d line)."
836
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
837
msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
838
msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
839
419
-#: apply.c:3059
840
+#: apply.c:3069
841
#, c-format
842
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
843
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
844
424
-#: apply.c:3065
845
+#: apply.c:3075
846
#, c-format
847
msgid ""
848
"while searching for:\n"
@@ -430,451 +851,437 @@ msgstr ""
851
"当查询：\n"
852
"%.*s"
853
433
-#: apply.c:3087
854
+#: apply.c:3097
855
#, c-format
856
msgid "missing binary patch data for '%s'"
857
msgstr "缺失 '%s' 的二进制补丁数据"
858
438
-#: apply.c:3095
859
+#: apply.c:3105
860
#, c-format
861
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
862
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
863
443
-#: apply.c:3142
864
+#: apply.c:3152
865
#, c-format
866
msgid "cannot apply binary patch to '%s' without full index line"
867
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
868
448
-#: apply.c:3152
869
+#: apply.c:3162
870
#, c-format
871
msgid ""
872
"the patch applies to '%s' (%s), which does not match the current contents."
873
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
874
454
-#: apply.c:3160
875
+#: apply.c:3170
876
#, c-format
877
msgid "the patch applies to an empty '%s' but it is not empty"
878
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
879
459
-#: apply.c:3178
880
+#: apply.c:3188
881
#, c-format
882
msgid "the necessary postimage %s for '%s' cannot be read"
883
msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
884
464
-#: apply.c:3191
885
+#: apply.c:3201
886
#, c-format
887
msgid "binary patch does not apply to '%s'"
888
msgstr "二进制补丁未应用到 '%s'"
889
469
-#: apply.c:3197
890
+#: apply.c:3207
891
#, c-format
892
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
893
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
894
474
-#: apply.c:3218
895
+#: apply.c:3228
896
#, c-format
897
msgid "patch failed: %s:%ld"
898
msgstr "打补丁失败：%s:%ld"
899
479
-#: apply.c:3341
900
+#: apply.c:3351
901
#, c-format
902
msgid "cannot checkout %s"
903
msgstr "不能检出 %s"
904
484
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
905
+#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280
906
#, c-format
907
msgid "failed to read %s"
908
msgstr "无法读取 %s"
909
489
-#: apply.c:3401
910
+#: apply.c:3411
911
#, c-format
912
msgid "reading from '%s' beyond a symbolic link"
913
msgstr "读取位于符号链接中的 '%s'"
914
494
-#: apply.c:3430 apply.c:3673
915
+#: apply.c:3440 apply.c:3683
916
#, c-format
917
msgid "path %s has been renamed/deleted"
918
msgstr "路径 %s 已经被重命名/删除"
919
499
-#: apply.c:3516 apply.c:3688
920
+#: apply.c:3526 apply.c:3698
921
#, c-format
922
msgid "%s: does not exist in index"
923
msgstr "%s：不存在于索引中"
924
504
-#: apply.c:3525 apply.c:3696
925
+#: apply.c:3535 apply.c:3706
926
#, c-format
927
msgid "%s: does not match index"
928
msgstr "%s：和索引不匹配"
929
509
-#: apply.c:3560
930
+#: apply.c:3570
931
msgid "repository lacks the necessary blob to fall back on 3-way merge."
932
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
933
513
-#: apply.c:3563
934
+#: apply.c:3573
935
#, c-format
936
msgid "Falling back to three-way merge...\n"
937
msgstr "回落到三方合并...\n"
938
518
-#: apply.c:3579 apply.c:3583
939
+#: apply.c:3589 apply.c:3593
940
#, c-format
941
msgid "cannot read the current contents of '%s'"
942
msgstr "无法读取 '%s' 的当前内容"
943
523
-#: apply.c:3595
944
+#: apply.c:3605
945
#, c-format
946
msgid "Failed to fall back on three-way merge...\n"
947
msgstr "无法回落到三方合并...\n"
948
528
-#: apply.c:3609
949
+#: apply.c:3619
950
#, c-format
951
msgid "Applied patch to '%s' with conflicts.\n"
952
msgstr "应用补丁到 '%s' 存在冲突。\n"
953
533
-#: apply.c:3614
954
+#: apply.c:3624
955
#, c-format
956
msgid "Applied patch to '%s' cleanly.\n"
957
msgstr "成功应用补丁到 '%s'。\n"
958
538
-#: apply.c:3640
959
+#: apply.c:3650
960
msgid "removal patch leaves file contents"
961
msgstr "移除补丁仍留下了文件内容"
962
542
-#: apply.c:3713
963
+#: apply.c:3723
964
#, c-format
965
msgid "%s: wrong type"
966
msgstr "%s：错误类型"
967
547
-#: apply.c:3715
968
+#: apply.c:3725
969
#, c-format
970
msgid "%s has type %o, expected %o"
971
msgstr "%s 的类型是 %o，应为 %o"
972
552
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
553
-#: read-cache.c:1309
973
+#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856
974
+#: read-cache.c:1320
975
#, c-format
976
msgid "invalid path '%s'"
977
msgstr "无效路径 '%s'"
978
558
-#: apply.c:3924
979
+#: apply.c:3934
980
#, c-format
981
msgid "%s: already exists in index"
982
msgstr "%s：已经存在于索引中"
983
563
-#: apply.c:3927
984
+#: apply.c:3937
985
#, c-format
986
msgid "%s: already exists in working directory"
987
msgstr "%s：已经存在于工作区中"
988
568
-#: apply.c:3947
989
+#: apply.c:3957
990
#, c-format
991
msgid "new mode (%o) of %s does not match old mode (%o)"
992
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
993
573
-#: apply.c:3952
994
+#: apply.c:3962
995
#, c-format
996
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
997
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
998
578
-#: apply.c:3972
999
+#: apply.c:3982
1000
#, c-format
1001
msgid "affected file '%s' is beyond a symbolic link"
1002
msgstr "受影响的文件 '%s' 位于符号链接中"
1003
583
-#: apply.c:3976
1004
+#: apply.c:3986
1005
#, c-format
1006
msgid "%s: patch does not apply"
1007
msgstr "%s：补丁未应用"
1008
588
-#: apply.c:3991
1009
+#: apply.c:4001
1010
#, c-format
1011
msgid "Checking patch %s..."
1012
msgstr "正在检查补丁 %s..."
1013
593
-#: apply.c:4083
1014
+#: apply.c:4093
1015
#, c-format
1016
msgid "sha1 information is lacking or useless for submodule %s"
1017
msgstr "子模组 %s 的 sha1 信息缺失或无效"
1018
598
-#: apply.c:4090
1019
+#: apply.c:4100
1020
#, c-format
1021
msgid "mode change for %s, which is not in current HEAD"
1022
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
1023
603
-#: apply.c:4093
1024
+#: apply.c:4103
1025
#, c-format
1026
msgid "sha1 information is lacking or useless (%s)."
1027
msgstr "sha1 信息缺失或无效（%s）。"
1028
608
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
609
-#, c-format
610
-msgid "make_cache_entry failed for path '%s'"
611
-msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
612
-
613
-#: apply.c:4102
1029
+#: apply.c:4112
1030
#, c-format
1031
msgid "could not add %s to temporary index"
1032
msgstr "不能在临时索引中添加 %s"
1033
618
-#: apply.c:4112
1034
+#: apply.c:4122
1035
#, c-format
1036
msgid "could not write temporary index to %s"
1037
msgstr "不能把临时索引写入到 %s"
1038
623
-#: apply.c:4250
1039
+#: apply.c:4260
1040
#, c-format
1041
msgid "unable to remove %s from index"
1042
msgstr "不能从索引中移除 %s"
1043
628
-#: apply.c:4284
1044
+#: apply.c:4294
1045
#, c-format
1046
msgid "corrupt patch for submodule %s"
1047
msgstr "子模组 %s 损坏的补丁"
1048
633
-#: apply.c:4290
1049
+#: apply.c:4300
1050
#, c-format
1051
msgid "unable to stat newly created file '%s'"
1052
msgstr "不能对新建文件 '%s' 调用 stat"
1053
638
-#: apply.c:4298
1054
+#: apply.c:4308
1055
#, c-format
1056
msgid "unable to create backing store for newly created file %s"
1057
msgstr "不能为新建文件 %s 创建后端存储"
1058
643
-#: apply.c:4304 apply.c:4449
1059
+#: apply.c:4314 apply.c:4459
1060
#, c-format
1061
msgid "unable to add cache entry for %s"
1062
msgstr "无法为 %s 添加缓存条目"
1063
648
-#: apply.c:4347
1064
+#: apply.c:4357
1065
#, c-format
1066
msgid "failed to write to '%s'"
1067
msgstr "写入 '%s' 失败"
1068
653
-#: apply.c:4351
1069
+#: apply.c:4361
1070
#, c-format
1071
msgid "closing file '%s'"
1072
msgstr "关闭文件 '%s'"
1073
658
-#: apply.c:4421
1074
+#: apply.c:4431
1075
#, c-format
1076
msgid "unable to write file '%s' mode %o"
1077
msgstr "不能写文件 '%s' 权限 %o"
1078
663
-#: apply.c:4519
1079
+#: apply.c:4529
1080
#, c-format
1081
msgid "Applied patch %s cleanly."
1082
msgstr "成功应用补丁 %s。"
1083
668
-#: apply.c:4527
1084
+#: apply.c:4537
1085
msgid "internal error"
1086
msgstr "内部错误"
1087
672
-#: apply.c:4530
1088
+#: apply.c:4540
1089
#, c-format
1090
msgid "Applying patch %%s with %d reject..."
1091
msgid_plural "Applying patch %%s with %d rejects..."
1092
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1093
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1094
679
-#: apply.c:4541
1095
+#: apply.c:4551
1096
#, c-format
1097
msgid "truncating .rej filename to %.*s.rej"
1098
msgstr "截短 .rej 文件名为 %.*s.rej"
1099
684
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
1100
+#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192
1101
#, c-format
1102
msgid "cannot open %s"
1103
msgstr "不能打开 %s"
1104
689
-#: apply.c:4563
1105
+#: apply.c:4573
1106
#, c-format
1107
msgid "Hunk #%d applied cleanly."
1108
msgstr "第 #%d 个片段成功应用。"
1109
694
-#: apply.c:4567
1110
+#: apply.c:4577
1111
#, c-format
1112
msgid "Rejected hunk #%d."
1113
msgstr "拒绝第 #%d 个片段。"
1114
699
-#: apply.c:4686
1115
+#: apply.c:4696
1116
#, c-format
1117
msgid "Skipped patch '%s'."
1118
msgstr "略过补丁 '%s'。"
1119
704
-#: apply.c:4694
1120
+#: apply.c:4704
1121
msgid "unrecognized input"
1122
msgstr "未能识别的输入"
1123
708
-#: apply.c:4714
1124
+#: apply.c:4724
1125
msgid "unable to read index file"
1126
msgstr "无法读取索引文件"
1127
712
-#: apply.c:4871
1128
+#: apply.c:4881
1129
#, c-format
1130
msgid "can't open patch '%s': %s"
1131
msgstr "不能打开补丁 '%s'：%s"
1132
717
-#: apply.c:4898
1133
+#: apply.c:4908
1134
#, c-format
1135
msgid "squelched %d whitespace error"
1136
msgid_plural "squelched %d whitespace errors"
1137
msgstr[0] "抑制下仍有 %d 个空白字符误用"
1138
msgstr[1] "抑制下仍有 %d 个空白字符误用"
1139
724
-#: apply.c:4904 apply.c:4919
1140
+#: apply.c:4914 apply.c:4929
1141
#, c-format
1142
msgid "%d line adds whitespace errors."
1143
msgid_plural "%d lines add whitespace errors."
1144
msgstr[0] "%d 行新增了空白字符误用。"
1145
msgstr[1] "%d 行新增了空白字符误用。"
1146
731
-#: apply.c:4912
1147
+#: apply.c:4922
1148
#, c-format
1149
msgid "%d line applied after fixing whitespace errors."
1150
msgid_plural "%d lines applied after fixing whitespace errors."
1151
msgstr[0] "修复空白错误后，应用了 %d 行。"
1152
msgstr[1] "修复空白错误后，应用了 %d 行。"
1153
738
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
1154
+#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390
1155
msgid "Unable to write new index file"
1156
msgstr "无法写入新索引文件"
1157
742
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
743
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
744
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
745
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
746
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
747
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
748
-msgid "path"
749
-msgstr "路径"
750
-
751
-#: apply.c:4956
1158
+#: apply.c:4966
1159
msgid "don't apply changes matching the given path"
1160
msgstr "不要应用与给出路径向匹配的变更"
1161
755
-#: apply.c:4959
1162
+#: apply.c:4969
1163
msgid "apply changes matching the given path"
1164
msgstr "应用与给出路径向匹配的变更"
1165
759
-#: apply.c:4961 builtin/am.c:2206
1166
+#: apply.c:4971 builtin/am.c:2206
1167
msgid "num"
1168
msgstr "数字"
1169
763
-#: apply.c:4962
1170
+#: apply.c:4972
1171
msgid "remove <num> leading slashes from traditional diff paths"
1172
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1173
767
-#: apply.c:4965
1174
+#: apply.c:4975
1175
msgid "ignore additions made by the patch"
1176
msgstr "忽略补丁中的添加的文件"
1177
771
-#: apply.c:4967
1178
+#: apply.c:4977
1179
msgid "instead of applying the patch, output diffstat for the input"
1180
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1181
775
-#: apply.c:4971
1182
+#: apply.c:4981
1183
msgid "show number of added and deleted lines in decimal notation"
1184
msgstr "以十进制数显示添加和删除的行数"
1185
779
-#: apply.c:4973
1186
+#: apply.c:4983
1187
msgid "instead of applying the patch, output a summary for the input"
1188
msgstr "不应用补丁，而是显示输入的概要"
1189
783
-#: apply.c:4975
1190
+#: apply.c:4985
1191
msgid "instead of applying the patch, see if the patch is applicable"
1192
msgstr "不应用补丁，而是查看补丁是否可应用"
1193
787
-#: apply.c:4977
1194
+#: apply.c:4987
1195
msgid "make sure the patch is applicable to the current index"
1196
msgstr "确认补丁可以应用到当前索引"
1197
791
-#: apply.c:4979
1198
+#: apply.c:4989
1199
msgid "mark new files with `git add --intent-to-add`"
1200
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1201
795
-#: apply.c:4981
1202
+#: apply.c:4991
1203
msgid "apply a patch without touching the working tree"
1204
msgstr "应用补丁而不修改工作区"
1205
799
-#: apply.c:4983
1206
+#: apply.c:4993
1207
msgid "accept a patch that touches outside the working area"
1208
msgstr "接受修改工作区之外文件的补丁"
1209
803
-#: apply.c:4986
1210
+#: apply.c:4996
1211
msgid "also apply the patch (use with --stat/--summary/--check)"
1212
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
1213
807
-#: apply.c:4988
1214
+#: apply.c:4998
1215
msgid "attempt three-way merge if a patch does not apply"
1216
msgstr "如果一个补丁不能应用则尝试三方合并"
1217
811
-#: apply.c:4990
1218
+#: apply.c:5000
1219
msgid "build a temporary index based on embedded index information"
1220
msgstr "创建一个临时索引基于嵌入的索引信息"
1221
815
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
1222
+#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524
1223
msgid "paths are separated with NUL character"
1224
msgstr "路径以 NUL 字符分隔"
1225
819
-#: apply.c:4995
1226
+#: apply.c:5005
1227
msgid "ensure at least <n> lines of context match"
1228
msgstr "确保至少匹配 <n> 行上下文"
1229
823
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
1230
+#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98
1231
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
825
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
1232
+#: builtin/pack-objects.c:3310 builtin/rebase.c:1474
1233
msgid "action"
1234
msgstr "动作"
1235
829
-#: apply.c:4997
1236
+#: apply.c:5007
1237
msgid "detect new or modified lines that have whitespace errors"
1238
msgstr "检查新增和修改的行中间的空白字符滥用"
1239
833
-#: apply.c:5000 apply.c:5003
1240
+#: apply.c:5010 apply.c:5013
1241
msgid "ignore changes in whitespace when finding context"
1242
msgstr "查找上下文时忽略空白字符的变更"
1243
837
-#: apply.c:5006
1244
+#: apply.c:5016
1245
msgid "apply the patch in reverse"
1246
msgstr "反向应用补丁"
1247
841
-#: apply.c:5008
1248
+#: apply.c:5018
1249
msgid "don't expect at least one line of context"
1250
msgstr "无需至少一行上下文"
1251
845
-#: apply.c:5010
1252
+#: apply.c:5020
1253
msgid "leave the rejected hunks in corresponding *.rej files"
1254
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1255
849
-#: apply.c:5012
1256
+#: apply.c:5022
1257
msgid "allow overlapping hunks"
1258
msgstr "允许重叠的补丁片段"
1259
853
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
854
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
855
-#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
1260
+#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22
1261
+#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774
1262
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
1263
msgid "be verbose"
1264
msgstr "冗长输出"
1265
859
-#: apply.c:5015
1266
+#: apply.c:5025
1267
msgid "tolerate incorrectly detected missing new-line at the end of file"
1268
msgstr "允许不正确的文件末尾换行符"
1269
863
-#: apply.c:5018
1270
+#: apply.c:5028
1271
msgid "do not trust the line counts in the hunk headers"
1272
msgstr "不信任补丁片段的头信息中的行号"
1273
867
-#: apply.c:5020 builtin/am.c:2194
1274
+#: apply.c:5030 builtin/am.c:2194
1275
msgid "root"
1276
msgstr "根目录"
1277
871
-#: apply.c:5021
1278
+#: apply.c:5031
1279
msgid "prepend <root> to all filenames"
1280
msgstr "为所有文件名前添加 <根目录>"
1281
1282
#: archive.c:14
1283
msgid "git archive [<options>] <tree-ish> [<path>...]"
877
-msgstr "git archive [<选项>] <树或提交> [<路径>...]"
1284
+msgstr "git archive [<选项>] <树对象> [<路径>...]"
1285
1286
#: archive.c:15
1287
msgid "git archive --list"
@@ -884,13 +1291,13 @@ msgstr "git archive --list"
1291
msgid ""
1292
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
1293
msgstr ""
887
-"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
1294
+"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
1295
1296
#: archive.c:17
1297
msgid "git archive --remote <repo> [--exec <cmd>] --list"
1298
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
1299
893
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
1300
+#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
1301
#, c-format
1302
msgid "pathspec '%s' did not match any files"
1303
msgstr "路径规格 '%s' 未匹配任何文件"
@@ -922,7 +1329,7 @@ msgstr "格式"
1329
msgid "archive format"
1330
msgstr "归档格式"
1331
925
-#: archive.c:458 builtin/log.c:1581
1332
+#: archive.c:458 builtin/log.c:1653
1333
msgid "prefix"
1334
msgstr "前缀"
1335
@@ -930,12 +1337,12 @@ msgstr "前缀"
1337
msgid "prepend prefix to each pathname in the archive"
1338
msgstr "为归档中每个路径名加上前缀"
1339
933
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
1340
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1341
#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
1342
#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
1343
#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
1344
#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
938
-#: parse-options.h:186
1345
+#: parse-options.h:190
1346
msgid "file"
1347
msgstr "文件"
1348
@@ -967,8 +1374,8 @@ msgstr "压缩效果更好"
1374
msgid "list supported archive formats"
1375
msgstr "列出支持的归档格式"
1376
970
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
971
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
1377
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1378
+#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884
1379
msgid "repo"
1380
msgstr "仓库"
1381
@@ -1007,17 +1414,17 @@ msgstr "未知归档格式 '%s'"
1414
msgid "Argument not supported for format '%s': -%d"
1415
msgstr "参数不支持此格式 '%s'：-%d"
1416
1010
-#: archive-tar.c:125 archive-zip.c:345
1417
+#: archive-tar.c:125 archive-zip.c:350
1418
#, c-format
1419
msgid "cannot stream blob %s"
1420
msgstr "不能打开数据对象 %s"
1421
1015
-#: archive-tar.c:266 archive-zip.c:363
1422
+#: archive-tar.c:266 archive-zip.c:368
1423
#, c-format
1424
msgid "unsupported file mode: 0%o (SHA1: %s)"
1425
msgstr "不支持的文件模式：0%o (SHA1: %s)"
1426
1020
-#: archive-tar.c:293 archive-zip.c:353
1427
+#: archive-tar.c:293 archive-zip.c:358
1428
#, c-format
1429
msgid "cannot read %s"
1430
msgstr "不能读取 %s"
@@ -1036,37 +1443,37 @@ msgstr "无法重定向描述符"
1443
msgid "'%s' filter reported error"
1444
msgstr "'%s' 过滤器报告了错误"
1445
1039
-#: archive-zip.c:314
1446
+#: archive-zip.c:319
1447
#, c-format
1448
msgid "path is not valid UTF-8: %s"
1449
msgstr "路径不是有效的 UTF-8：%s"
1450
1044
-#: archive-zip.c:318
1451
+#: archive-zip.c:323
1452
#, c-format
1453
msgid "path too long (%d chars, SHA1: %s): %s"
1454
msgstr "路径太长（%d 字符，SHA1：%s）：%s"
1455
1049
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
1456
+#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233
1457
#, c-format
1458
msgid "deflate error (%d)"
1459
msgstr "压缩错误 (%d)"
1460
1054
-#: archive-zip.c:609
1461
+#: archive-zip.c:614
1462
#, c-format
1463
msgid "timestamp too large for this system: %<PRIuMAX>"
1464
msgstr "对于本系统时间戳太大：%<PRIuMAX>"
1465
1059
-#: attr.c:213
1466
+#: attr.c:212
1467
#, c-format
1468
msgid "%.*s is not a valid attribute name"
1469
msgstr "%.*s 不是一个有效的属性名"
1470
1064
-#: attr.c:370
1471
+#: attr.c:369
1472
#, c-format
1473
msgid "%s not allowed: %s:%d"
1474
msgstr "不允许 %s：%s:%d"
1475
1069
-#: attr.c:410
1476
+#: attr.c:409
1477
msgid ""
1478
"Negative patterns are ignored in git attributes\n"
1479
"Use '\\!' for literal leading exclamation."
@@ -1205,9 +1612,9 @@ msgstr "不能将 --contents 和最终的提交对象名共用"
1612
msgid "--reverse and --first-parent together require specified latest commit"
1613
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1614
1208
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
1209
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
1210
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
1615
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093
1616
+#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991
1617
+#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411
1618
#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
1619
#: builtin/shortlog.c:192
1620
msgid "revision walk setup failed"
@@ -1371,8 +1778,8 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
1778
msgid "unrecognized header: %s%s (%d)"
1779
msgstr "未能识别的包头：%s%s (%d)"
1780
1374
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
1375
-#: builtin/commit.c:791
1781
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108
1782
+#: builtin/commit.c:811
1783
#, c-format
1784
msgid "could not open '%s'"
1785
msgstr "不能打开 '%s'"
@@ -1403,42 +1810,42 @@ msgid_plural "The bundle requires these %d refs:"
1810
msgstr[0] "这个包需要这个引用："
1811
msgstr[1] "这个包需要 %d 个引用："
1812
1406
-#: bundle.c:272
1813
+#: bundle.c:273
1814
msgid "unable to dup bundle descriptor"
1815
msgstr "无法复制 bundle 描述符"
1816
1410
-#: bundle.c:279
1817
+#: bundle.c:280
1818
msgid "Could not spawn pack-objects"
1819
msgstr "不能生成 pack-objects 进程"
1820
1414
-#: bundle.c:290
1821
+#: bundle.c:291
1822
msgid "pack-objects died"
1823
msgstr "pack-objects 终止"
1824
1418
-#: bundle.c:332
1825
+#: bundle.c:333
1826
msgid "rev-list died"
1827
msgstr "rev-list 终止"
1828
1422
-#: bundle.c:381
1829
+#: bundle.c:382
1830
#, c-format
1831
msgid "ref '%s' is excluded by the rev-list options"
1832
msgstr "引用 '%s' 被 rev-list 选项排除"
1833
1427
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
1834
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
1835
#, c-format
1836
msgid "unrecognized argument: %s"
1837
msgstr "未能识别的参数：%s"
1838
1432
-#: bundle.c:468
1839
+#: bundle.c:469
1840
msgid "Refusing to create empty bundle."
1841
msgstr "不能创建空包。"
1842
1436
-#: bundle.c:478
1843
+#: bundle.c:479
1844
#, c-format
1845
msgid "cannot create '%s'"
1846
msgstr "不能创建 '%s'"
1847
1441
-#: bundle.c:503
1848
+#: bundle.c:504
1849
msgid "index-pack died"
1850
msgstr "index-pack 终止"
1851
@@ -1447,18 +1854,18 @@ msgstr "index-pack 终止"
1854
msgid "invalid color value: %.*s"
1855
msgstr "无效的颜色值：%.*s"
1856
1450
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
1857
+#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398
1858
#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
1859
#, c-format
1860
msgid "could not parse %s"
1861
msgstr "不能解析 %s"
1862
1456
-#: commit.c:52
1863
+#: commit.c:53
1864
#, c-format
1865
msgid "%s %s is not a commit!"
1866
msgstr "%s %s 不是一个提交！"
1867
1461
-#: commit.c:192
1868
+#: commit.c:193
1869
msgid ""
1870
"Support for <GIT_DIR>/info/grafts is deprecated\n"
1871
"and will be removed in a future Git version.\n"
@@ -1478,27 +1885,27 @@ msgstr ""
1885
"设置 \"git config advice.graftFileDeprecated false\"\n"
1886
"可关闭本消息"
1887
1481
-#: commit.c:1128
1888
+#: commit.c:1152
1889
#, c-format
1890
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
1891
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
1892
1486
-#: commit.c:1131
1893
+#: commit.c:1155
1894
#, c-format
1895
msgid "Commit %s has a bad GPG signature allegedly by %s."
1896
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
1897
1491
-#: commit.c:1134
1898
+#: commit.c:1158
1899
#, c-format
1900
msgid "Commit %s does not have a GPG signature."
1901
msgstr "提交 %s 没有 GPG 签名。"
1902
1496
-#: commit.c:1137
1903
+#: commit.c:1161
1904
#, c-format
1905
msgid "Commit %s has a good GPG signature by %s\n"
1906
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
1907
1501
-#: commit.c:1391
1908
+#: commit.c:1415
1909
msgid ""
1910
"Warning: commit message did not conform to UTF-8.\n"
1911
"You may want to amend it after fixing the message, or set the config\n"
@@ -1508,75 +1915,70 @@ msgstr ""
1915
"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
1916
"设置为您项目所用的字符编码。\n"
1917
1511
-#: commit-graph.c:127
1918
+#: commit-graph.c:130
1919
msgid "commit-graph file is too small"
1920
msgstr "提交图形文件太小"
1921
1515
-#: commit-graph.c:192
1922
+#: commit-graph.c:195
1923
#, c-format
1924
msgid "commit-graph signature %X does not match signature %X"
1925
msgstr "提交图形签名 %X 和签名 %X 不匹配"
1926
1520
-#: commit-graph.c:199
1927
+#: commit-graph.c:202
1928
#, c-format
1929
msgid "commit-graph version %X does not match version %X"
1930
msgstr "提交图形版本 %X 和版本 %X 不匹配"
1931
1525
-#: commit-graph.c:206
1932
+#: commit-graph.c:209
1933
#, c-format
1934
msgid "commit-graph hash version %X does not match version %X"
1935
msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
1936
1530
-#: commit-graph.c:229
1937
+#: commit-graph.c:232
1938
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
1939
msgstr "提交图形块查找表条目丢失，文件可能不完整"
1940
1534
-#: commit-graph.c:240
1941
+#: commit-graph.c:243
1942
#, c-format
1943
msgid "commit-graph improper chunk offset %08x%08x"
1944
msgstr "提交图形不正确的块偏移 %08x%08x"
1945
1539
-#: commit-graph.c:283
1946
+#: commit-graph.c:286
1947
#, c-format
1948
msgid "commit-graph chunk id %08x appears multiple times"
1949
msgstr "提交图形块 id %08x 出现了多次"
1950
1544
-#: commit-graph.c:347
1951
+#: commit-graph.c:350
1952
msgid "commit-graph has no base graphs chunk"
1953
msgstr "提交图形没有基础图形块"
1954
1548
-#: commit-graph.c:357
1955
+#: commit-graph.c:360
1956
msgid "commit-graph chain does not match"
1957
msgstr "提交图形链不匹配"
1958
1552
-#: commit-graph.c:404
1959
+#: commit-graph.c:407
1960
#, c-format
1961
msgid "invalid commit-graph chain: line '%s' not a hash"
1962
msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
1963
1557
-#: commit-graph.c:430
1964
+#: commit-graph.c:433
1965
msgid "unable to find all commit-graph files"
1966
msgstr "无法找到所有提交图形文件"
1967
1561
-#: commit-graph.c:561 commit-graph.c:621
1968
+#: commit-graph.c:564 commit-graph.c:624
1969
msgid "invalid commit position. commit-graph is likely corrupt"
1970
msgstr "无效的提交位置。提交图形可能已损坏"
1971
1565
-#: commit-graph.c:582
1972
+#: commit-graph.c:585
1973
#, c-format
1974
msgid "could not find commit %s"
1975
msgstr "无法找到提交 %s"
1976
1570
-#: commit-graph.c:855 builtin/am.c:1287
1977
+#: commit-graph.c:858 builtin/am.c:1287
1978
#, c-format
1979
msgid "unable to parse commit %s"
1980
msgstr "不能解析提交 %s"
1981
1575
-#: commit-graph.c:859
1576
-#, c-format
1577
-msgid "unable to get tree for %s"
1578
-msgstr "无法得到 %s 的树对象"
1579
-
1982
#: commit-graph.c:1017 builtin/pack-objects.c:2641
1983
#, c-format
1984
msgid "unable to get type of object %s"
@@ -1643,12 +2045,12 @@ msgstr "正在查找提交图中额外的边"
2045
msgid "failed to write correct number of base graph ids"
2046
msgstr "无法写入正确数量的基础图形 ID"
2047
1646
-#: commit-graph.c:1379 midx.c:810
2048
+#: commit-graph.c:1379 midx.c:814
2049
#, c-format
2050
msgid "unable to create leading directories of %s"
2051
msgstr "不能为 %s 创建先导目录"
2052
1651
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
2053
+#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248
2054
#, c-format
2055
msgid "unable to create '%s'"
2056
msgstr "不能创建 '%s'"
@@ -1806,7 +2208,7 @@ msgstr "键名没有包含一个小节名称：%s"
2208
msgid "key does not contain variable name: %s"
2209
msgstr "键名没有包含变量名：%s"
2210
1809
-#: config.c:406 sequencer.c:2401
2211
+#: config.c:406 sequencer.c:2530
2212
#, c-format
2213
msgid "invalid key: %s"
2214
msgstr "无效键名：%s"
@@ -1928,144 +2330,144 @@ msgstr "core.commentChar 应该是一个字符"
2330
msgid "invalid mode for object creation: %s"
2331
msgstr "无效的对象创建模式：%s"
2332
1931
-#: config.c:1425
2333
+#: config.c:1430
2334
#, c-format
2335
msgid "malformed value for %s"
2336
msgstr "%s 的取值格式错误"
2337
1936
-#: config.c:1451
2338
+#: config.c:1456
2339
#, c-format
2340
msgid "malformed value for %s: %s"
2341
msgstr "%s 的取值格式错误：%s"
2342
1941
-#: config.c:1452
2343
+#: config.c:1457
2344
msgid "must be one of nothing, matching, simple, upstream or current"
2345
msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
2346
1945
-#: config.c:1513 builtin/pack-objects.c:3394
2347
+#: config.c:1518 builtin/pack-objects.c:3394
2348
#, c-format
2349
msgid "bad pack compression level %d"
2350
msgstr "错误的打包压缩级别 %d"
2351
1950
-#: config.c:1634
2352
+#: config.c:1639
2353
#, c-format
2354
msgid "unable to load config blob object '%s'"
2355
msgstr "无法从数据对象 '%s' 加载配置"
2356
1955
-#: config.c:1637
2357
+#: config.c:1642
2358
#, c-format
2359
msgid "reference '%s' does not point to a blob"
2360
msgstr "引用 '%s' 没有指向一个数据对象"
2361
1960
-#: config.c:1654
2362
+#: config.c:1659
2363
#, c-format
2364
msgid "unable to resolve config blob '%s'"
2365
msgstr "不能解析配置对象 '%s'"
2366
1965
-#: config.c:1684
2367
+#: config.c:1689
2368
#, c-format
2369
msgid "failed to parse %s"
2370
msgstr "解析 %s 失败"
2371
1970
-#: config.c:1740
2372
+#: config.c:1745
2373
msgid "unable to parse command-line config"
2374
msgstr "无法解析命令行中的配置"
2375
1974
-#: config.c:2091
2376
+#: config.c:2096
2377
msgid "unknown error occurred while reading the configuration files"
2378
msgstr "在读取配置文件时遇到未知错误"
2379
1978
-#: config.c:2261
2380
+#: config.c:2266
2381
#, c-format
2382
msgid "Invalid %s: '%s'"
2383
msgstr "无效 %s：'%s'"
2384
1983
-#: config.c:2306
2385
+#: config.c:2311
2386
#, c-format
2387
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2388
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2389
1988
-#: config.c:2352
2390
+#: config.c:2357
2391
#, c-format
2392
msgid "unable to parse '%s' from command-line config"
2393
msgstr "无法解析命令行配置中的 '%s'"
2394
1993
-#: config.c:2354
2395
+#: config.c:2359
2396
#, c-format
2397
msgid "bad config variable '%s' in file '%s' at line %d"
2398
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
2399
1998
-#: config.c:2435
2400
+#: config.c:2440
2401
#, c-format
2402
msgid "invalid section name '%s'"
2403
msgstr "无效的小节名称 '%s'"
2404
2003
-#: config.c:2467
2405
+#: config.c:2472
2406
#, c-format
2407
msgid "%s has multiple values"
2408
msgstr "%s 有多个取值"
2409
2008
-#: config.c:2496
2410
+#: config.c:2501
2411
#, c-format
2412
msgid "failed to write new configuration file %s"
2413
msgstr "写入新的配置文件 %s 失败"
2414
2013
-#: config.c:2748 config.c:3072
2415
+#: config.c:2753 config.c:3077
2416
#, c-format
2417
msgid "could not lock config file %s"
2418
msgstr "不能锁定配置文件 %s"
2419
2018
-#: config.c:2759
2420
+#: config.c:2764
2421
#, c-format
2422
msgid "opening %s"
2423
msgstr "打开 %s"
2424
2023
-#: config.c:2794 builtin/config.c:328
2425
+#: config.c:2799 builtin/config.c:328
2426
#, c-format
2427
msgid "invalid pattern: %s"
2428
msgstr "无效模式：%s"
2429
2028
-#: config.c:2819
2430
+#: config.c:2824
2431
#, c-format
2432
msgid "invalid config file %s"
2433
msgstr "无效的配置文件 %s"
2434
2033
-#: config.c:2832 config.c:3085
2435
+#: config.c:2837 config.c:3090
2436
#, c-format
2437
msgid "fstat on %s failed"
2438
msgstr "对 %s 调用 fstat 失败"
2439
2038
-#: config.c:2843
2440
+#: config.c:2848
2441
#, c-format
2442
msgid "unable to mmap '%s'"
2443
msgstr "不能 mmap '%s'"
2444
2043
-#: config.c:2852 config.c:3090
2445
+#: config.c:2857 config.c:3095
2446
#, c-format
2447
msgid "chmod on %s failed"
2448
msgstr "对 %s 调用 chmod 失败"
2449
2048
-#: config.c:2937 config.c:3187
2450
+#: config.c:2942 config.c:3192
2451
#, c-format
2452
msgid "could not write config file %s"
2453
msgstr "不能写入配置文件 %s"
2454
2053
-#: config.c:2971
2455
+#: config.c:2976
2456
#, c-format
2457
msgid "could not set '%s' to '%s'"
2458
msgstr "不能设置 '%s' 为 '%s'"
2459
2058
-#: config.c:2973 builtin/remote.c:782
2460
+#: config.c:2978 builtin/remote.c:781
2461
#, c-format
2462
msgid "could not unset '%s'"
2463
msgstr "不能取消设置 '%s'"
2464
2063
-#: config.c:3063
2465
+#: config.c:3068
2466
#, c-format
2467
msgid "invalid section name: %s"
2468
msgstr "无效的小节名称：%s"
2469
2068
-#: config.c:3230
2470
+#: config.c:3235
2471
#, c-format
2472
msgid "missing value for '%s'"
2473
msgstr "%s 的取值缺失"
@@ -2228,19 +2630,19 @@ msgstr "已阻止奇怪的路径名 '%s'"
2630
msgid "unable to fork"
2631
msgstr "无法 fork"
2632
2231
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
2633
+#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43
2634
msgid "Checking connectivity"
2635
msgstr "正在检查连通性"
2636
2235
-#: connected.c:100
2637
+#: connected.c:101
2638
msgid "Could not run 'git rev-list'"
2639
msgstr "不能执行 'git rev-list'"
2640
2239
-#: connected.c:120
2641
+#: connected.c:121
2642
msgid "failed write to rev-list"
2643
msgstr "写入 rev-list 失败"
2644
2243
-#: connected.c:127
2645
+#: connected.c:128
2646
msgid "failed to close rev-list's stdin"
2647
msgstr "关闭 rev-list 的标准输入失败"
2648
@@ -2277,24 +2679,24 @@ msgstr ""
2679
"%s 中的 LF 将被 CRLF 替换。\n"
2680
"在工作区中该文件仍保持原有的换行符"
2681
2280
-#: convert.c:280
2682
+#: convert.c:284
2683
#, c-format
2684
msgid "BOM is prohibited in '%s' if encoded as %s"
2685
msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"
2686
2285
-#: convert.c:287
2687
+#: convert.c:291
2688
#, c-format
2689
msgid ""
2288
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
2289
-"tree-encoding."
2290
-msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。"
2690
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
2691
+"working-tree-encoding."
2692
+msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。"
2693
2292
-#: convert.c:305
2694
+#: convert.c:304
2695
#, c-format
2696
msgid "BOM is required in '%s' if encoded as %s"
2697
msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"
2698
2297
-#: convert.c:307
2699
+#: convert.c:306
2700
#, c-format
2701
msgid ""
2702
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2303,66 +2705,66 @@ msgstr ""
2705
"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
2706
"节序）作为工作区编码。"
2707
2306
-#: convert.c:425 convert.c:496
2708
+#: convert.c:419 convert.c:490
2709
#, c-format
2710
msgid "failed to encode '%s' from %s to %s"
2711
msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
2712
2311
-#: convert.c:468
2713
+#: convert.c:462
2714
#, c-format
2715
msgid "encoding '%s' from %s to %s and back is not the same"
2716
msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
2717
2316
-#: convert.c:674
2718
+#: convert.c:668
2719
#, c-format
2720
msgid "cannot fork to run external filter '%s'"
2721
msgstr "不能 fork 以执行外部过滤器 '%s'"
2722
2321
-#: convert.c:694
2723
+#: convert.c:688
2724
#, c-format
2725
msgid "cannot feed the input to external filter '%s'"
2726
msgstr "不能将输入传递给外部过滤器 '%s'"
2727
2326
-#: convert.c:701
2728
+#: convert.c:695
2729
#, c-format
2730
msgid "external filter '%s' failed %d"
2731
msgstr "外部过滤器 '%s' 失败码 %d"
2732
2331
-#: convert.c:736 convert.c:739
2733
+#: convert.c:730 convert.c:733
2734
#, c-format
2735
msgid "read from external filter '%s' failed"
2736
msgstr "从外部过滤器 '%s' 读取失败"
2737
2336
-#: convert.c:742 convert.c:797
2738
+#: convert.c:736 convert.c:791
2739
#, c-format
2740
msgid "external filter '%s' failed"
2741
msgstr "外部过滤器 '%s' 失败"
2742
2341
-#: convert.c:845
2743
+#: convert.c:839
2744
msgid "unexpected filter type"
2745
msgstr "意外的过滤类型"
2746
2345
-#: convert.c:856
2747
+#: convert.c:850
2748
msgid "path name too long for external filter"
2749
msgstr "外部过滤器的路径名太长"
2750
2349
-#: convert.c:930
2751
+#: convert.c:924
2752
#, c-format
2753
msgid ""
2754
"external filter '%s' is not available anymore although not all paths have "
2755
"been filtered"
2756
msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
2757
2356
-#: convert.c:1229
2758
+#: convert.c:1223
2759
msgid "true/false are no valid working-tree-encodings"
2760
msgstr "true/false 不是有效的工作区编码"
2761
2360
-#: convert.c:1417 convert.c:1451
2762
+#: convert.c:1411 convert.c:1445
2763
#, c-format
2764
msgid "%s: clean filter '%s' failed"
2765
msgstr "%s：clean 过滤器 '%s' 失败"
2766
2365
-#: convert.c:1495
2767
+#: convert.c:1489
2768
#, c-format
2769
msgid "%s: smudge filter %s failed"
2770
msgstr "%s：smudge 过滤器 %s 失败"
@@ -2527,35 +2929,35 @@ msgstr ""
2929
"发现配置变量 'diff.dirstat' 中的错误：\n"
2930
"%s"
2931
2530
-#: diff.c:4218
2932
+#: diff.c:4202
2933
#, c-format
2934
msgid "external diff died, stopping at %s"
2935
msgstr "外部 diff 退出，停止在 %s"
2936
2535
-#: diff.c:4563
2937
+#: diff.c:4547
2938
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
2939
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
2940
2539
-#: diff.c:4566
2941
+#: diff.c:4550
2942
msgid "-G, -S and --find-object are mutually exclusive"
2943
msgstr "-G、-S 和 --find-object 是互斥的"
2944
2543
-#: diff.c:4644
2945
+#: diff.c:4628
2946
msgid "--follow requires exactly one pathspec"
2947
msgstr "--follow 明确要求只跟一个路径规格"
2948
2547
-#: diff.c:4692
2949
+#: diff.c:4676
2950
#, c-format
2951
msgid "invalid --stat value: %s"
2952
msgstr "无效的 --stat 值：%s"
2953
2552
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
2954
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
2955
#: parse-options.c:199 parse-options.c:203
2956
#, c-format
2957
msgid "%s expects a numerical value"
2958
msgstr "%s 期望一个数字值"
2959
2558
-#: diff.c:4729
2960
+#: diff.c:4713
2961
#, c-format
2962
msgid ""
2963
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2564,195 +2966,195 @@ msgstr ""
2966
"无法解析 --dirstat/-X 选项的参数：\n"
2967
"%s"
2968
2567
-#: diff.c:4814
2969
+#: diff.c:4798
2970
#, c-format
2971
msgid "unknown change class '%c' in --diff-filter=%s"
2972
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
2973
2572
-#: diff.c:4838
2974
+#: diff.c:4822
2975
#, c-format
2976
msgid "unknown value after ws-error-highlight=%.*s"
2977
msgstr "ws-error-highlight=%.*s 之后未知的值"
2978
2577
-#: diff.c:4852
2979
+#: diff.c:4836
2980
#, c-format
2981
msgid "unable to resolve '%s'"
2982
msgstr "不能解析 '%s'"
2983
2582
-#: diff.c:4902 diff.c:4908
2984
+#: diff.c:4886 diff.c:4892
2985
#, c-format
2986
msgid "%s expects <n>/<m> form"
2987
msgstr "%s 期望 <n>/<m> 格式"
2988
2587
-#: diff.c:4920
2989
+#: diff.c:4904
2990
#, c-format
2991
msgid "%s expects a character, got '%s'"
2992
msgstr "%s 期望一个字符，得到 '%s'"
2993
2592
-#: diff.c:4941
2994
+#: diff.c:4925
2995
#, c-format
2996
msgid "bad --color-moved argument: %s"
2997
msgstr "坏的 --color-moved 参数：%s"
2998
2597
-#: diff.c:4960
2999
+#: diff.c:4944
3000
#, c-format
3001
msgid "invalid mode '%s' in --color-moved-ws"
3002
msgstr "--color-moved-ws 中的无效模式 '%s' "
3003
2602
-#: diff.c:5000
3004
+#: diff.c:4984
3005
msgid ""
3006
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3007
"\"histogram\""
3008
msgstr ""
3009
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3010
2609
-#: diff.c:5036 diff.c:5056
3011
+#: diff.c:5020 diff.c:5040
3012
#, c-format
3013
msgid "invalid argument to %s"
3014
msgstr "%s 的参数无效"
3015
2614
-#: diff.c:5194
3016
+#: diff.c:5178
3017
#, c-format
3018
msgid "failed to parse --submodule option parameter: '%s'"
3019
msgstr "无法解析 --submodule 选项的参数：'%s'"
3020
2619
-#: diff.c:5250
3021
+#: diff.c:5234
3022
#, c-format
3023
msgid "bad --word-diff argument: %s"
3024
msgstr "坏的 --word-diff 参数：%s"
3025
2624
-#: diff.c:5273
3026
+#: diff.c:5257
3027
msgid "Diff output format options"
3028
msgstr "差异输出格式化选项"
3029
2628
-#: diff.c:5275 diff.c:5281
3030
+#: diff.c:5259 diff.c:5265
3031
msgid "generate patch"
3032
msgstr "生成补丁"
3033
2632
-#: diff.c:5278 builtin/log.c:172
3034
+#: diff.c:5262 builtin/log.c:173
3035
msgid "suppress diff output"
3036
msgstr "不显示差异输出"
3037
2636
-#: diff.c:5283 diff.c:5397 diff.c:5404
3038
+#: diff.c:5267 diff.c:5381 diff.c:5388
3039
msgid "<n>"
3040
msgstr "<n>"
3041
2640
-#: diff.c:5284 diff.c:5287
3042
+#: diff.c:5268 diff.c:5271
3043
msgid "generate diffs with <n> lines context"
3044
msgstr "生成含 <n> 行上下文的差异"
3045
2644
-#: diff.c:5289
3046
+#: diff.c:5273
3047
msgid "generate the diff in raw format"
3048
msgstr "生成原始格式的差异"
3049
2648
-#: diff.c:5292
3050
+#: diff.c:5276
3051
msgid "synonym for '-p --raw'"
3052
msgstr "和 '-p --raw' 同义"
3053
2652
-#: diff.c:5296
3054
+#: diff.c:5280
3055
msgid "synonym for '-p --stat'"
3056
msgstr "和 '-p --stat' 同义"
3057
2656
-#: diff.c:5300
3058
+#: diff.c:5284
3059
msgid "machine friendly --stat"
3060
msgstr "机器友好的 --stat"
3061
2660
-#: diff.c:5303
3062
+#: diff.c:5287
3063
msgid "output only the last line of --stat"
3064
msgstr "只输出 --stat 的最后一行"
3065
2664
-#: diff.c:5305 diff.c:5313
3066
+#: diff.c:5289 diff.c:5297
3067
msgid "<param1,param2>..."
3068
msgstr "<参数1,参数2>..."
3069
2668
-#: diff.c:5306
3070
+#: diff.c:5290
3071
msgid ""
3072
"output the distribution of relative amount of changes for each sub-directory"
3073
msgstr "输出每个子目录相对变更的分布"
3074
2673
-#: diff.c:5310
3075
+#: diff.c:5294
3076
msgid "synonym for --dirstat=cumulative"
3077
msgstr "和 --dirstat=cumulative 同义"
3078
2677
-#: diff.c:5314
3079
+#: diff.c:5298
3080
msgid "synonym for --dirstat=files,param1,param2..."
3081
msgstr "是 --dirstat=files,param1,param2... 的同义词"
3082
2681
-#: diff.c:5318
3083
+#: diff.c:5302
3084
msgid "warn if changes introduce conflict markers or whitespace errors"
3085
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
3086
2685
-#: diff.c:5321
3087
+#: diff.c:5305
3088
msgid "condensed summary such as creations, renames and mode changes"
3089
msgstr "精简摘要，例如创建、重命名和模式变更"
3090
2689
-#: diff.c:5324
3091
+#: diff.c:5308
3092
msgid "show only names of changed files"
3093
msgstr "只显示变更文件的文件名"
3094
2693
-#: diff.c:5327
3095
+#: diff.c:5311
3096
msgid "show only names and status of changed files"
3097
msgstr "只显示变更文件的文件名和状态"
3098
2697
-#: diff.c:5329
3099
+#: diff.c:5313
3100
msgid "<width>[,<name-width>[,<count>]]"
3101
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3102
2701
-#: diff.c:5330
3103
+#: diff.c:5314
3104
msgid "generate diffstat"
3105
msgstr "生成差异统计（diffstat）"
3106
2705
-#: diff.c:5332 diff.c:5335 diff.c:5338
3107
+#: diff.c:5316 diff.c:5319 diff.c:5322
3108
msgid "<width>"
3109
msgstr "<宽度>"
3110
2709
-#: diff.c:5333
3111
+#: diff.c:5317
3112
msgid "generate diffstat with a given width"
3113
msgstr "使用给定的长度生成差异统计"
3114
2713
-#: diff.c:5336
3115
+#: diff.c:5320
3116
msgid "generate diffstat with a given name width"
3117
msgstr "使用给定的文件名长度生成差异统计"
3118
2717
-#: diff.c:5339
3119
+#: diff.c:5323
3120
msgid "generate diffstat with a given graph width"
3121
msgstr "使用给定的图形长度生成差异统计"
3122
2721
-#: diff.c:5341
3123
+#: diff.c:5325
3124
msgid "<count>"
3125
msgstr "<次数>"
3126
2725
-#: diff.c:5342
3127
+#: diff.c:5326
3128
msgid "generate diffstat with limited lines"
3129
msgstr "生成有限行数的差异统计"
3130
2729
-#: diff.c:5345
3131
+#: diff.c:5329
3132
msgid "generate compact summary in diffstat"
3133
msgstr "生成差异统计的简洁摘要"
3134
2733
-#: diff.c:5348
3135
+#: diff.c:5332
3136
msgid "output a binary diff that can be applied"
3137
msgstr "输出一个可以应用的二进制差异"
3138
2737
-#: diff.c:5351
3139
+#: diff.c:5335
3140
msgid "show full pre- and post-image object names on the \"index\" lines"
3141
msgstr "在 \"index\" 行显示完整的前后对象名称"
3142
2741
-#: diff.c:5353
3143
+#: diff.c:5337
3144
msgid "show colored diff"
3145
msgstr "显示带颜色的差异"
3146
2745
-#: diff.c:5354
3147
+#: diff.c:5338
3148
msgid "<kind>"
3149
msgstr "<类型>"
3150
2749
-#: diff.c:5355
3151
+#: diff.c:5339
3152
msgid ""
3153
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3154
"diff"
3155
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
3156
2755
-#: diff.c:5358
3157
+#: diff.c:5342
3158
msgid ""
3159
"do not munge pathnames and use NULs as output field terminators in --raw or "
3160
"--numstat"
@@ -2760,334 +3162,353 @@ msgstr ""
3162
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3163
"符"
3164
2763
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
3165
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
3166
msgid "<prefix>"
3167
msgstr "<前缀>"
3168
2767
-#: diff.c:5362
3169
+#: diff.c:5346
3170
msgid "show the given source prefix instead of \"a/\""
3171
msgstr "显示给定的源前缀取代 \"a/\""
3172
2771
-#: diff.c:5365
3173
+#: diff.c:5349
3174
msgid "show the given destination prefix instead of \"b/\""
3175
msgstr "显示给定的目标前缀取代 \"b/\""
3176
2775
-#: diff.c:5368
3177
+#: diff.c:5352
3178
msgid "prepend an additional prefix to every line of output"
3179
msgstr "输出的每一行附加前缀"
3180
2779
-#: diff.c:5371
3181
+#: diff.c:5355
3182
msgid "do not show any source or destination prefix"
3183
msgstr "不显示任何源和目标前缀"
3184
2783
-#: diff.c:5374
3185
+#: diff.c:5358
3186
msgid "show context between diff hunks up to the specified number of lines"
3187
msgstr "显示指定行数的差异块间的上下文"
3188
2787
-#: diff.c:5378 diff.c:5383 diff.c:5388
3189
+#: diff.c:5362 diff.c:5367 diff.c:5372
3190
msgid "<char>"
3191
msgstr "<字符>"
3192
2791
-#: diff.c:5379
3193
+#: diff.c:5363
3194
msgid "specify the character to indicate a new line instead of '+'"
3195
msgstr "指定一个字符取代 '+' 来表示新的一行"
3196
2795
-#: diff.c:5384
3197
+#: diff.c:5368
3198
msgid "specify the character to indicate an old line instead of '-'"
3199
msgstr "指定一个字符取代 '-' 来表示旧的一行"
3200
2799
-#: diff.c:5389
3201
+#: diff.c:5373
3202
msgid "specify the character to indicate a context instead of ' '"
3203
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3204
2803
-#: diff.c:5392
3205
+#: diff.c:5376
3206
msgid "Diff rename options"
3207
msgstr "差异重命名选项"
3208
2807
-#: diff.c:5393
3209
+#: diff.c:5377
3210
msgid "<n>[/<m>]"
3211
msgstr "<n>[/<m>]"
3212
2811
-#: diff.c:5394
3213
+#: diff.c:5378
3214
msgid "break complete rewrite changes into pairs of delete and create"
3215
msgstr "将完全重写的变更打破为成对的删除和创建"
3216
2815
-#: diff.c:5398
3217
+#: diff.c:5382
3218
msgid "detect renames"
3219
msgstr "检测重命名"
3220
2819
-#: diff.c:5402
3221
+#: diff.c:5386
3222
msgid "omit the preimage for deletes"
3223
msgstr "省略删除操作的差异输出"
3224
2823
-#: diff.c:5405
3225
+#: diff.c:5389
3226
msgid "detect copies"
3227
msgstr "检测拷贝"
3228
2827
-#: diff.c:5409
3229
+#: diff.c:5393
3230
msgid "use unmodified files as source to find copies"
3231
msgstr "使用未修改的文件做为发现拷贝的源"
3232
2831
-#: diff.c:5411
3233
+#: diff.c:5395
3234
msgid "disable rename detection"
3235
msgstr "禁用重命名探测"
3236
2835
-#: diff.c:5414
3237
+#: diff.c:5398
3238
msgid "use empty blobs as rename source"
3239
msgstr "使用空的数据对象做为重命名的源"
3240
2839
-#: diff.c:5416
3241
+#: diff.c:5400
3242
msgid "continue listing the history of a file beyond renames"
3243
msgstr "继续列出文件重命名以外的历史记录"
3244
2843
-#: diff.c:5419
3245
+#: diff.c:5403
3246
msgid ""
3247
"prevent rename/copy detection if the number of rename/copy targets exceeds "
3248
"given limit"
3249
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
3250
2849
-#: diff.c:5421
3251
+#: diff.c:5405
3252
msgid "Diff algorithm options"
3253
msgstr "差异算法选项"
3254
2853
-#: diff.c:5423
3255
+#: diff.c:5407
3256
msgid "produce the smallest possible diff"
3257
msgstr "生成尽可能小的差异"
3258
2857
-#: diff.c:5426
3259
+#: diff.c:5410
3260
msgid "ignore whitespace when comparing lines"
3261
msgstr "行比较时忽略空白字符"
3262
2861
-#: diff.c:5429
3263
+#: diff.c:5413
3264
msgid "ignore changes in amount of whitespace"
3265
msgstr "忽略空白字符的变更"
3266
2865
-#: diff.c:5432
3267
+#: diff.c:5416
3268
msgid "ignore changes in whitespace at EOL"
3269
msgstr "忽略行尾的空白字符变更"
3270
2869
-#: diff.c:5435
3271
+#: diff.c:5419
3272
msgid "ignore carrier-return at the end of line"
3273
msgstr "忽略行尾的回车符（CR）"
3274
2873
-#: diff.c:5438
3275
+#: diff.c:5422
3276
msgid "ignore changes whose lines are all blank"
3277
msgstr "忽略整行都是空白的变更"
3278
2877
-#: diff.c:5441
3279
+#: diff.c:5425
3280
msgid "heuristic to shift diff hunk boundaries for easy reading"
3281
msgstr "启发式转换差异边界以便阅读"
3282
2881
-#: diff.c:5444
3283
+#: diff.c:5428
3284
msgid "generate diff using the \"patience diff\" algorithm"
3285
msgstr "使用 \"patience diff\" 算法生成差异"
3286
2885
-#: diff.c:5448
3287
+#: diff.c:5432
3288
msgid "generate diff using the \"histogram diff\" algorithm"
3289
msgstr "使用 \"histogram diff\" 算法生成差异"
3290
2889
-#: diff.c:5450
3291
+#: diff.c:5434
3292
msgid "<algorithm>"
3293
msgstr "<算法>"
3294
2893
-#: diff.c:5451
3295
+#: diff.c:5435
3296
msgid "choose a diff algorithm"
3297
msgstr "选择一个差异算法"
3298
2897
-#: diff.c:5453
3299
+#: diff.c:5437
3300
msgid "<text>"
3301
msgstr "<文本>"
3302
2901
-#: diff.c:5454
3303
+#: diff.c:5438
3304
msgid "generate diff using the \"anchored diff\" algorithm"
3305
msgstr "使用 \"anchored diff\" 算法生成差异"
3306
2905
-#: diff.c:5456 diff.c:5465 diff.c:5468
3307
+#: diff.c:5440 diff.c:5449 diff.c:5452
3308
msgid "<mode>"
3309
msgstr "<模式>"
3310
2909
-#: diff.c:5457
3311
+#: diff.c:5441
3312
msgid "show word diff, using <mode> to delimit changed words"
3313
msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
3314
2913
-#: diff.c:5459 diff.c:5462 diff.c:5507
3315
+#: diff.c:5443 diff.c:5446 diff.c:5491
3316
msgid "<regex>"
3317
msgstr "<正则>"
3318
2917
-#: diff.c:5460
3319
+#: diff.c:5444
3320
msgid "use <regex> to decide what a word is"
3321
msgstr "使用 <正则表达式> 确定何为一个词"
3322
2921
-#: diff.c:5463
3323
+#: diff.c:5447
3324
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3325
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3326
2925
-#: diff.c:5466
3327
+#: diff.c:5450
3328
msgid "moved lines of code are colored differently"
3329
msgstr "移动的代码行用不同方式着色"
3330
2929
-#: diff.c:5469
3331
+#: diff.c:5453
3332
msgid "how white spaces are ignored in --color-moved"
3333
msgstr "在 --color-moved 下如何忽略空白字符"
3334
2933
-#: diff.c:5472
3335
+#: diff.c:5456
3336
msgid "Other diff options"
3337
msgstr "其它差异选项"
3338
2937
-#: diff.c:5474
3339
+#: diff.c:5458
3340
msgid "when run from subdir, exclude changes outside and show relative paths"
3341
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
3342
2941
-#: diff.c:5478
3343
+#: diff.c:5462
3344
msgid "treat all files as text"
3345
msgstr "把所有文件当做文本处理"
3346
2945
-#: diff.c:5480
3347
+#: diff.c:5464
3348
msgid "swap two inputs, reverse the diff"
3349
msgstr "交换两个输入，反转差异"
3350
2949
-#: diff.c:5482
3351
+#: diff.c:5466
3352
msgid "exit with 1 if there were differences, 0 otherwise"
3353
msgstr "有差异时退出码为 1，否则为 0"
3354
2953
-#: diff.c:5484
3355
+#: diff.c:5468
3356
msgid "disable all output of the program"
3357
msgstr "禁用本程序的所有输出"
3358
2957
-#: diff.c:5486
3359
+#: diff.c:5470
3360
msgid "allow an external diff helper to be executed"
3361
msgstr "允许执行一个外置的差异助手"
3362
2961
-#: diff.c:5488
3363
+#: diff.c:5472
3364
msgid "run external text conversion filters when comparing binary files"
3365
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
3366
2965
-#: diff.c:5490
3367
+#: diff.c:5474
3368
msgid "<when>"
3369
msgstr "<何时>"
3370
2969
-#: diff.c:5491
3371
+#: diff.c:5475
3372
msgid "ignore changes to submodules in the diff generation"
3373
msgstr "在生成差异时，忽略子模组的更改"
3374
2973
-#: diff.c:5494
3375
+#: diff.c:5478
3376
msgid "<format>"
3377
msgstr "<格式>"
3378
2977
-#: diff.c:5495
3379
+#: diff.c:5479
3380
msgid "specify how differences in submodules are shown"
3381
msgstr "指定子模组的差异如何显示"
3382
2981
-#: diff.c:5499
3383
+#: diff.c:5483
3384
msgid "hide 'git add -N' entries from the index"
3385
msgstr "隐藏索引中 'git add -N' 条目"
3386
2985
-#: diff.c:5502
3387
+#: diff.c:5486
3388
msgid "treat 'git add -N' entries as real in the index"
3389
msgstr "将索引中 'git add -N' 条目当做真实的"
3390
2989
-#: diff.c:5504
3391
+#: diff.c:5488
3392
msgid "<string>"
3393
msgstr "<字符串>"
3394
2993
-#: diff.c:5505
3395
+#: diff.c:5489
3396
msgid ""
3397
"look for differences that change the number of occurrences of the specified "
3398
"string"
3399
msgstr "查找改变了指定字符串出现次数的差异"
3400
2999
-#: diff.c:5508
3401
+#: diff.c:5492
3402
msgid ""
3403
"look for differences that change the number of occurrences of the specified "
3404
"regex"
3405
msgstr "查找改变指定正则匹配出现次数的差异"
3406
3005
-#: diff.c:5511
3407
+#: diff.c:5495
3408
msgid "show all changes in the changeset with -S or -G"
3409
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3410
3009
-#: diff.c:5514
3411
+#: diff.c:5498
3412
msgid "treat <string> in -S as extended POSIX regular expression"
3413
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3414
3013
-#: diff.c:5517
3415
+#: diff.c:5501
3416
msgid "control the order in which files appear in the output"
3417
msgstr "控制输出中的文件显示顺序"
3418
3017
-#: diff.c:5518
3419
+#: diff.c:5502
3420
msgid "<object-id>"
3421
msgstr "<对象 ID>"
3422
3021
-#: diff.c:5519
3423
+#: diff.c:5503
3424
msgid ""
3425
"look for differences that change the number of occurrences of the specified "
3426
"object"
3427
msgstr "查找改变指定对象出现次数的差异"
3428
3027
-#: diff.c:5521
3429
+#: diff.c:5505
3430
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3431
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3432
3031
-#: diff.c:5522
3433
+#: diff.c:5506
3434
msgid "select files by diff type"
3435
msgstr "通过差异类型选择文件"
3436
3035
-#: diff.c:5524
3437
+#: diff.c:5508
3438
msgid "<file>"
3439
msgstr "<文件>"
3440
3039
-#: diff.c:5525
3441
+#: diff.c:5509
3442
msgid "Output to a specific file"
3443
msgstr "输出到一个指定的文件"
3444
3043
-#: diff.c:6180
3445
+#: diff.c:6164
3446
msgid "inexact rename detection was skipped due to too many files."
3447
msgstr "因为文件太多，略过不严格的重命名检查。"
3448
3047
-#: diff.c:6183
3449
+#: diff.c:6167
3450
msgid "only found copies from modified paths due to too many files."
3451
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
3452
3051
-#: diff.c:6186
3453
+#: diff.c:6170
3454
#, c-format
3455
msgid ""
3456
"you may want to set your %s variable to at least %d and retry the command."
3457
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
3458
3057
-#: dir.c:549
3459
+#: dir.c:554
3460
#, c-format
3461
msgid "pathspec '%s' did not match any file(s) known to git"
3462
msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3463
3062
-#: dir.c:938
3464
+#: dir.c:664
3465
+#, c-format
3466
+msgid "unrecognized pattern: '%s'"
3467
+msgstr "未识别的模式：'%s'"
3468
+
3469
+#: dir.c:682 dir.c:696
3470
+#, c-format
3471
+msgid "unrecognized negative pattern: '%s'"
3472
+msgstr "未识别的反向模式：'%s'"
3473
+
3474
+#: dir.c:714
3475
+#, c-format
3476
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3477
+msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
3478
+
3479
+#: dir.c:724
3480
+msgid "disabling cone pattern matching"
3481
+msgstr "禁止 cone 模式匹配"
3482
+
3483
+#: dir.c:1101
3484
#, c-format
3485
msgid "cannot use %s as an exclude file"
3486
msgstr "不能将 %s 用作排除文件"
3487
3067
-#: dir.c:1877
3488
+#: dir.c:2078
3489
#, c-format
3490
msgid "could not open directory '%s'"
3491
msgstr "不能打开目录 '%s'"
3492
3072
-#: dir.c:2128
3493
+#: dir.c:2415
3494
msgid "failed to get kernel name and information"
3495
msgstr "无法获得内核名称和信息"
3496
3076
-#: dir.c:2252
3497
+#: dir.c:2539
3498
msgid "untracked cache is disabled on this system or location"
3499
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
3500
3080
-#: dir.c:3056
3501
+#: dir.c:3343
3502
#, c-format
3503
msgid "index file corrupt in repo %s"
3504
msgstr "仓库 %s 中的索引文件损坏"
3505
3085
-#: dir.c:3101 dir.c:3106
3506
+#: dir.c:3388 dir.c:3393
3507
#, c-format
3508
msgid "could not create directories for %s"
3509
msgstr "不能为 %s 创建目录"
3510
3090
-#: dir.c:3135
3511
+#: dir.c:3422
3512
#, c-format
3513
msgid "could not migrate git directory from '%s' to '%s'"
3514
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
@@ -3106,12 +3527,12 @@ msgstr "过滤内容"
3527
msgid "could not stat file '%s'"
3528
msgstr "不能对文件 '%s' 调用 stat"
3529
3109
-#: environment.c:148
3530
+#: environment.c:149
3531
#, c-format
3532
msgid "bad git namespace path \"%s\""
3533
msgstr "错误的 git 名字空间路径 \"%s\""
3534
3114
-#: environment.c:330
3535
+#: environment.c:331
3536
#, c-format
3537
msgid "could not set GIT_DIR to '%s'"
3538
msgstr "不能设置 GIT_DIR 为 '%s'"
@@ -3146,32 +3567,32 @@ msgstr "无法写到远程"
3567
msgid "--stateless-rpc requires multi_ack_detailed"
3568
msgstr "--stateless-rpc 需要 multi_ack_detailed"
3569
3149
-#: fetch-pack.c:356 fetch-pack.c:1280
3570
+#: fetch-pack.c:356 fetch-pack.c:1340
3571
#, c-format
3572
msgid "invalid shallow line: %s"
3573
msgstr "无效的 shallow 信息：%s"
3574
3154
-#: fetch-pack.c:362 fetch-pack.c:1286
3575
+#: fetch-pack.c:362 fetch-pack.c:1346
3576
#, c-format
3577
msgid "invalid unshallow line: %s"
3578
msgstr "无效的 unshallow 信息：%s"
3579
3159
-#: fetch-pack.c:364 fetch-pack.c:1288
3580
+#: fetch-pack.c:364 fetch-pack.c:1348
3581
#, c-format
3582
msgid "object not found: %s"
3583
msgstr "对象未找到：%s"
3584
3164
-#: fetch-pack.c:367 fetch-pack.c:1291
3585
+#: fetch-pack.c:367 fetch-pack.c:1351
3586
#, c-format
3587
msgid "error in object: %s"
3588
msgstr "对象中出错：%s"
3589
3169
-#: fetch-pack.c:369 fetch-pack.c:1293
3590
+#: fetch-pack.c:369 fetch-pack.c:1353
3591
#, c-format
3592
msgid "no shallow found: %s"
3593
msgstr "未发现 shallow：%s"
3594
3174
-#: fetch-pack.c:372 fetch-pack.c:1297
3595
+#: fetch-pack.c:372 fetch-pack.c:1357
3596
#, c-format
3597
msgid "expected shallow/unshallow, got %s"
3598
msgstr "应为 shallow/unshallow，却得到 %s"
@@ -3190,7 +3611,7 @@ msgstr "无效提交 %s"
3611
msgid "giving up"
3612
msgstr "放弃"
3613
3193
-#: fetch-pack.c:475 progress.c:312
3614
+#: fetch-pack.c:475 progress.c:323
3615
msgid "done"
3616
msgstr "完成"
3617
@@ -3204,162 +3625,162 @@ msgstr "得到 %s (%d) %s"
3625
msgid "Marking %s as complete"
3626
msgstr "标记 %s 为完成"
3627
3207
-#: fetch-pack.c:742
3628
+#: fetch-pack.c:754
3629
#, c-format
3630
msgid "already have %s (%s)"
3631
msgstr "已经有 %s（%s）"
3632
3212
-#: fetch-pack.c:781
3633
+#: fetch-pack.c:818
3634
msgid "fetch-pack: unable to fork off sideband demultiplexer"
3635
msgstr "fetch-pack：无法派生 sideband 多路输出"
3636
3216
-#: fetch-pack.c:789
3637
+#: fetch-pack.c:826
3638
msgid "protocol error: bad pack header"
3639
msgstr "协议错误：坏的包头"
3640
3220
-#: fetch-pack.c:857
3641
+#: fetch-pack.c:900
3642
#, c-format
3643
msgid "fetch-pack: unable to fork off %s"
3644
msgstr "fetch-pack：无法派生进程 %s"
3645
3225
-#: fetch-pack.c:873
3646
+#: fetch-pack.c:916
3647
#, c-format
3648
msgid "%s failed"
3649
msgstr "%s 失败"
3650
3230
-#: fetch-pack.c:875
3651
+#: fetch-pack.c:918
3652
msgid "error in sideband demultiplexer"
3653
msgstr "sideband 多路输出出错"
3654
3234
-#: fetch-pack.c:907
3655
+#: fetch-pack.c:965
3656
#, c-format
3657
msgid "Server version is %.*s"
3658
msgstr "服务器版本 %.*s"
3659
3239
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
3240
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
3241
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
3242
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
3660
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
3661
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
3662
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
3663
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
3664
#, c-format
3665
msgid "Server supports %s"
3666
msgstr "服务器支持 %s"
3667
3247
-#: fetch-pack.c:914
3668
+#: fetch-pack.c:972
3669
msgid "Server does not support shallow clients"
3670
msgstr "服务器不支持 shalllow 客户端"
3671
3251
-#: fetch-pack.c:974
3672
+#: fetch-pack.c:1032
3673
msgid "Server does not support --shallow-since"
3674
msgstr "服务器不支持 --shallow-since"
3675
3255
-#: fetch-pack.c:979
3676
+#: fetch-pack.c:1037
3677
msgid "Server does not support --shallow-exclude"
3678
msgstr "服务器不支持 --shallow-exclude"
3679
3259
-#: fetch-pack.c:983
3680
+#: fetch-pack.c:1041
3681
msgid "Server does not support --deepen"
3682
msgstr "服务器不支持 --deepen"
3683
3263
-#: fetch-pack.c:1000
3684
+#: fetch-pack.c:1058
3685
msgid "no common commits"
3686
msgstr "没有共同的提交"
3687
3267
-#: fetch-pack.c:1012 fetch-pack.c:1468
3688
+#: fetch-pack.c:1070 fetch-pack.c:1536
3689
msgid "git fetch-pack: fetch failed."
3690
msgstr "git fetch-pack：获取失败。"
3691
3271
-#: fetch-pack.c:1150
3692
+#: fetch-pack.c:1209
3693
msgid "Server does not support shallow requests"
3694
msgstr "服务器不支持 shalllow 请求"
3695
3275
-#: fetch-pack.c:1157
3696
+#: fetch-pack.c:1216
3697
msgid "Server supports filter"
3698
msgstr "服务器支持 filter"
3699
3279
-#: fetch-pack.c:1180
3700
+#: fetch-pack.c:1239
3701
msgid "unable to write request to remote"
3702
msgstr "无法将请求写到远程"
3703
3283
-#: fetch-pack.c:1198
3704
+#: fetch-pack.c:1257
3705
#, c-format
3706
msgid "error reading section header '%s'"
3707
msgstr "读取节标题 '%s' 出错"
3708
3288
-#: fetch-pack.c:1204
3709
+#: fetch-pack.c:1263
3710
#, c-format
3711
msgid "expected '%s', received '%s'"
3712
msgstr "预期 '%s'，得到 '%s'"
3713
3293
-#: fetch-pack.c:1243
3714
+#: fetch-pack.c:1303
3715
#, c-format
3716
msgid "unexpected acknowledgment line: '%s'"
3717
msgstr "意外的确认行：'%s'"
3718
3298
-#: fetch-pack.c:1248
3719
+#: fetch-pack.c:1308
3720
#, c-format
3721
msgid "error processing acks: %d"
3722
msgstr "处理 ack 出错：%d"
3723
3303
-#: fetch-pack.c:1258
3724
+#: fetch-pack.c:1318
3725
msgid "expected packfile to be sent after 'ready'"
3726
msgstr "预期在 'ready' 之后发送 packfile"
3727
3307
-#: fetch-pack.c:1260
3728
+#: fetch-pack.c:1320
3729
msgid "expected no other sections to be sent after no 'ready'"
3730
msgstr "在没有 'ready' 不应该发送其它小节"
3731
3311
-#: fetch-pack.c:1302
3732
+#: fetch-pack.c:1362
3733
#, c-format
3734
msgid "error processing shallow info: %d"
3735
msgstr "处理浅克隆信息出错：%d"
3736
3316
-#: fetch-pack.c:1349
3737
+#: fetch-pack.c:1409
3738
#, c-format
3739
msgid "expected wanted-ref, got '%s'"
3740
msgstr "预期 wanted-ref，得到 '%s'"
3741
3321
-#: fetch-pack.c:1354
3742
+#: fetch-pack.c:1414
3743
#, c-format
3744
msgid "unexpected wanted-ref: '%s'"
3745
msgstr "意外的 wanted-ref：'%s'"
3746
3326
-#: fetch-pack.c:1359
3747
+#: fetch-pack.c:1419
3748
#, c-format
3749
msgid "error processing wanted refs: %d"
3750
msgstr "处理要获取的引用出错：%d"
3751
3331
-#: fetch-pack.c:1693
3752
+#: fetch-pack.c:1762
3753
msgid "no matching remote head"
3754
msgstr "没有匹配的远程分支"
3755
3335
-#: fetch-pack.c:1716 builtin/clone.c:685
3756
+#: fetch-pack.c:1785 builtin/clone.c:688
3757
msgid "remote did not send all necessary objects"
3758
msgstr "远程没有发送所有必需的对象"
3759
3339
-#: fetch-pack.c:1743
3760
+#: fetch-pack.c:1812
3761
#, c-format
3762
msgid "no such remote ref %s"
3763
msgstr "没有这样的远程引用 %s"
3764
3344
-#: fetch-pack.c:1746
3765
+#: fetch-pack.c:1815
3766
#, c-format
3767
msgid "Server does not allow request for unadvertised object %s"
3768
msgstr "服务器不允许请求未公开的对象 %s"
3769
3349
-#: gpg-interface.c:321
3350
-msgid "gpg failed to sign the data"
3351
-msgstr "gpg 无法为数据签名"
3352
-
3353
-#: gpg-interface.c:347
3770
+#: gpg-interface.c:223
3771
msgid "could not create temporary file"
3772
msgstr "不能创建临时文件"
3773
3357
-#: gpg-interface.c:350
3774
+#: gpg-interface.c:226
3775
#, c-format
3776
msgid "failed writing detached signature to '%s'"
3777
msgstr "无法将分离式签名写入 '%s'"
3778
3362
-#: graph.c:97
3779
+#: gpg-interface.c:390
3780
+msgid "gpg failed to sign the data"
3781
+msgstr "gpg 无法为数据签名"
3782
+
3783
+#: graph.c:98
3784
#, c-format
3785
msgid "ignore invalid color '%.*s' in log.graphColors"
3786
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
@@ -3369,14 +3790,15 @@ msgid ""
3790
"given pattern contains NULL byte (via -f <file>). This is only supported "
3791
"with -P under PCRE v2"
3792
msgstr ""
3372
-"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此功能"
3793
+"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
3794
+"功能"
3795
3796
#: grep.c:2124
3797
#, c-format
3798
msgid "'%s': unable to read %s"
3799
msgstr "'%s'：无法读取 %s"
3800
3379
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
3801
+#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82
3802
#: builtin/rm.c:135
3803
#, c-format
3804
msgid "failed to stat '%s'"
@@ -3432,7 +3854,7 @@ msgid "Low-level Commands / Interrogators"
3854
msgstr "低级命令/询问者"
3855
3856
#: help.c:37
3435
-msgid "Low-level Commands / Synching Repositories"
3857
+msgid "Low-level Commands / Syncing Repositories"
3858
msgstr "低级命令/同步仓库"
3859
3860
#: help.c:38
@@ -3596,7 +4018,7 @@ msgstr "不允许空的姓名（对于 <%s>）"
4018
msgid "name consists only of disallowed characters: %s"
4019
msgstr "姓名中仅包含禁用字符：%s"
4020
3599
-#: ident.c:436 builtin/commit.c:611
4021
+#: ident.c:436 builtin/commit.c:631
4022
#, c-format
4023
msgid "invalid date format: %s"
4024
msgstr "无效的日期格式：%s"
@@ -3680,7 +4102,7 @@ msgid "failed to read the cache"
4102
msgstr "读取缓存失败"
4103
4104
#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
3683
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
4105
+#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809
4106
#: builtin/stash.c:264
4107
msgid "unable to write new index file"
4108
msgstr "无法写新的索引文件"
@@ -3866,7 +4288,7 @@ msgstr "重命名"
4288
msgid "renamed"
4289
msgstr "重命名"
4290
3869
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
4291
+#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
4292
#, c-format
4293
msgid "Refusing to lose dirty file at %s"
4294
msgstr "拒绝丢失脏文件 '%s'"
@@ -3911,7 +4333,7 @@ msgstr ""
4333
"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
4334
"%5$s"
4335
3914
-#: merge-recursive.c:2056
4336
+#: merge-recursive.c:2114
4337
#, c-format
4338
msgid ""
4339
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3921,7 +4343,7 @@ msgstr ""
4343
"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
4344
"其它目录，没有目录包含大部分文件。"
4345
3924
-#: merge-recursive.c:2088
4346
+#: merge-recursive.c:2146
4347
#, c-format
4348
msgid ""
4349
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3930,7 +4352,7 @@ msgstr ""
4352
"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
4353
"在：%s。"
4354
3933
-#: merge-recursive.c:2098
4355
+#: merge-recursive.c:2156
4356
#, c-format
4357
msgid ""
4358
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3939,7 +4361,7 @@ msgstr ""
4361
"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
4362
"径放置于此：%s"
4363
3942
-#: merge-recursive.c:2190
4364
+#: merge-recursive.c:2248
4365
#, c-format
4366
msgid ""
4367
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3948,59 +4370,59 @@ msgstr ""
4370
"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
4371
"%4$s->%5$s"
4372
3951
-#: merge-recursive.c:2435
4373
+#: merge-recursive.c:2493
4374
#, c-format
4375
msgid ""
4376
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4377
"renamed."
4378
msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
4379
3958
-#: merge-recursive.c:2961
4380
+#: merge-recursive.c:3019
4381
#, c-format
4382
msgid "cannot read object %s"
4383
msgstr "不能读取对象 %s"
4384
3963
-#: merge-recursive.c:2964
4385
+#: merge-recursive.c:3022
4386
#, c-format
4387
msgid "object %s is not a blob"
4388
msgstr "对象 %s 不是一个数据对象"
4389
3968
-#: merge-recursive.c:3028
4390
+#: merge-recursive.c:3086
4391
msgid "modify"
4392
msgstr "修改"
4393
3972
-#: merge-recursive.c:3028
4394
+#: merge-recursive.c:3086
4395
msgid "modified"
4396
msgstr "修改"
4397
3976
-#: merge-recursive.c:3040
4398
+#: merge-recursive.c:3098
4399
msgid "content"
4400
msgstr "内容"
4401
3980
-#: merge-recursive.c:3044
4402
+#: merge-recursive.c:3102
4403
msgid "add/add"
4404
msgstr "添加/添加"
4405
3984
-#: merge-recursive.c:3067
4406
+#: merge-recursive.c:3125
4407
#, c-format
4408
msgid "Skipped %s (merged same as existing)"
4409
msgstr "略过 %s（已经做过相同合并）"
4410
3989
-#: merge-recursive.c:3089 git-submodule.sh:937
4411
+#: merge-recursive.c:3147 git-submodule.sh:993
4412
msgid "submodule"
4413
msgstr "子模组"
4414
3993
-#: merge-recursive.c:3090
4415
+#: merge-recursive.c:3148
4416
#, c-format
4417
msgid "CONFLICT (%s): Merge conflict in %s"
4418
msgstr "冲突（%s）：合并冲突于 %s"
4419
3998
-#: merge-recursive.c:3120
4420
+#: merge-recursive.c:3178
4421
#, c-format
4422
msgid "Adding as %s instead"
4423
msgstr "而是以 %s 为名添加"
4424
4003
-#: merge-recursive.c:3203
4425
+#: merge-recursive.c:3261
4426
#, c-format
4427
msgid ""
4428
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4008,7 +4430,7 @@ msgid ""
4430
msgstr ""
4431
"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
4432
4011
-#: merge-recursive.c:3206
4433
+#: merge-recursive.c:3264
4434
#, c-format
4435
msgid ""
4436
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4017,7 +4439,7 @@ msgstr ""
4439
"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
4440
"到 %s。"
4441
4020
-#: merge-recursive.c:3210
4442
+#: merge-recursive.c:3268
4443
#, c-format
4444
msgid ""
4445
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4026,7 +4448,7 @@ msgstr ""
4448
"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
4449
"动到 %5$s。"
4450
4029
-#: merge-recursive.c:3213
4451
+#: merge-recursive.c:3271
4452
#, c-format
4453
msgid ""
4454
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4035,59 +4457,59 @@ msgstr ""
4457
"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
4458
"建议将其移动到 %5$s。"
4459
4038
-#: merge-recursive.c:3327
4460
+#: merge-recursive.c:3385
4461
#, c-format
4462
msgid "Removing %s"
4463
msgstr "删除 %s"
4464
4043
-#: merge-recursive.c:3350
4465
+#: merge-recursive.c:3408
4466
msgid "file/directory"
4467
msgstr "文件/目录"
4468
4047
-#: merge-recursive.c:3355
4469
+#: merge-recursive.c:3413
4470
msgid "directory/file"
4471
msgstr "目录/文件"
4472
4051
-#: merge-recursive.c:3362
4473
+#: merge-recursive.c:3420
4474
#, c-format
4475
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4476
msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
4477
4056
-#: merge-recursive.c:3371
4478
+#: merge-recursive.c:3429
4479
#, c-format
4480
msgid "Adding %s"
4481
msgstr "添加 %s"
4482
4061
-#: merge-recursive.c:3380
4483
+#: merge-recursive.c:3438
4484
#, c-format
4485
msgid "CONFLICT (add/add): Merge conflict in %s"
4486
msgstr "冲突（add/add）：合并冲突于 %s"
4487
4066
-#: merge-recursive.c:3424
4488
+#: merge-recursive.c:3482
4489
msgid "Already up to date!"
4490
msgstr "已经是最新的！"
4491
4070
-#: merge-recursive.c:3433
4492
+#: merge-recursive.c:3491
4493
#, c-format
4494
msgid "merging of trees %s and %s failed"
4495
msgstr "无法合并树 %s 和 %s"
4496
4075
-#: merge-recursive.c:3537
4497
+#: merge-recursive.c:3595
4498
msgid "Merging:"
4499
msgstr "合并："
4500
4079
-#: merge-recursive.c:3550
4501
+#: merge-recursive.c:3608
4502
#, c-format
4503
msgid "found %u common ancestor:"
4504
msgid_plural "found %u common ancestors:"
4505
msgstr[0] "发现 %u 个共同祖先："
4506
msgstr[1] "发现 %u 个共同祖先："
4507
4086
-#: merge-recursive.c:3600
4508
+#: merge-recursive.c:3658
4509
msgid "merge returned no commit"
4510
msgstr "合并未返回提交"
4511
4090
-#: merge-recursive.c:3659
4512
+#: merge-recursive.c:3717
4513
#, c-format
4514
msgid ""
4515
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4096,12 +4518,12 @@ msgstr ""
4518
"您对下列文件的本地修改将被合并操作覆盖：\n"
4519
" %s"
4520
4099
-#: merge-recursive.c:3756
4521
+#: merge-recursive.c:3814
4522
#, c-format
4523
msgid "Could not parse object '%s'"
4524
msgstr "不能解析对象 '%s'"
4525
4104
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
4526
+#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874
4527
msgid "Unable to write index."
4528
msgstr "不能写入索引。"
4529
@@ -4167,78 +4589,94 @@ msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
4589
msgid "error preparing packfile from multi-pack-index"
4590
msgstr "从多包索引准备 packfile 出错"
4591
4170
-#: midx.c:469
4592
+#: midx.c:472
4593
#, c-format
4594
msgid "failed to add packfile '%s'"
4595
msgstr "添加包文件 '%s' 失败"
4596
4175
-#: midx.c:475
4597
+#: midx.c:478
4598
#, c-format
4599
msgid "failed to open pack-index '%s'"
4600
msgstr "打开包索引 '%s' 失败"
4601
4180
-#: midx.c:535
4602
+#: midx.c:538
4603
#, c-format
4604
msgid "failed to locate object %d in packfile"
4605
msgstr "在包文件中定位对象 %d 失败"
4606
4185
-#: midx.c:864
4607
+#: midx.c:842
4608
+msgid "Adding packfiles to multi-pack-index"
4609
+msgstr "添加包文件到多包索引"
4610
+
4611
+#: midx.c:875
4612
#, c-format
4613
msgid "did not see pack-file %s to drop"
4614
msgstr "没有看到要丢弃的包文件 %s"
4615
4190
-#: midx.c:1035
4616
+#: midx.c:973
4617
+msgid "Writing chunks to multi-pack-index"
4618
+msgstr "写入块到多包索引"
4619
+
4620
+#: midx.c:1052
4621
#, c-format
4622
msgid "failed to clear multi-pack-index at %s"
4623
msgstr "清理位于 %s 的多包索引失败"
4624
4195
-#: midx.c:1090
4625
+#: midx.c:1108
4626
msgid "Looking for referenced packfiles"
4627
msgstr "正在查找引用的包文件"
4628
4199
-#: midx.c:1105
4629
+#: midx.c:1123
4630
#, c-format
4631
msgid ""
4632
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4633
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4634
4205
-#: midx.c:1109
4206
-msgid "Verifying OID order in MIDX"
4207
-msgstr "正在校验 MIDX 中的对象 ID 顺序"
4635
+#: midx.c:1128
4636
+msgid "Verifying OID order in multi-pack-index"
4637
+msgstr "校验多包索引中的 OID 顺序"
4638
4209
-#: midx.c:1118
4639
+#: midx.c:1137
4640
#, c-format
4641
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
4642
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
4643
4214
-#: midx.c:1137
4644
+#: midx.c:1157
4645
msgid "Sorting objects by packfile"
4646
msgstr "通过包文件为对象排序"
4647
4218
-#: midx.c:1143
4648
+#: midx.c:1164
4649
msgid "Verifying object offsets"
4650
msgstr "校验对象偏移"
4651
4222
-#: midx.c:1159
4652
+#: midx.c:1180
4653
#, c-format
4654
msgid "failed to load pack entry for oid[%d] = %s"
4655
msgstr "为 oid[%d] = %s 加载包条目失败"
4656
4227
-#: midx.c:1165
4657
+#: midx.c:1186
4658
#, c-format
4659
msgid "failed to load pack-index for packfile %s"
4660
msgstr "为包文件 %s 加载包索引失败"
4661
4232
-#: midx.c:1174
4662
+#: midx.c:1195
4663
#, c-format
4664
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
4665
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
4666
4237
-#: midx.c:1349
4667
+#: midx.c:1220
4668
+msgid "Counting referenced objects"
4669
+msgstr "正在对引用对象计数"
4670
+
4671
+#: midx.c:1230
4672
+msgid "Finding and deleting unreferenced packfiles"
4673
+msgstr "正在查找和删除未引用的包文件"
4674
+
4675
+#: midx.c:1388
4676
msgid "could not start pack-objects"
4677
msgstr "不能开始 pack-objects"
4678
4241
-#: midx.c:1368
4679
+#: midx.c:1407
4680
msgid "could not finish pack-objects"
4681
msgstr "不能结束 pack-objects"
4682
@@ -4325,12 +4763,12 @@ msgstr "哈希值与 %s 不匹配"
4763
msgid "offset before end of packfile (broken .idx?)"
4764
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
4765
4328
-#: packfile.c:1887
4766
+#: packfile.c:1888
4767
#, c-format
4768
msgid "offset before start of pack index for %s (corrupt index?)"
4769
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
4770
4333
-#: packfile.c:1891
4771
+#: packfile.c:1892
4772
#, c-format
4773
msgid "offset beyond end of pack index for %s (truncated index?)"
4774
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
@@ -4442,82 +4880,87 @@ msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
4880
msgid "malformed object name '%s'"
4881
msgstr "格式错误的对象名 '%s'"
4882
4445
-#: path.c:897
4883
+#: path.c:915
4884
#, c-format
4885
msgid "Could not make %s writable by group"
4886
msgstr "不能设置 %s 为组可写"
4887
4450
-#: pathspec.c:128
4888
+#: pathspec.c:130
4889
msgid "Escape character '\\' not allowed as last character in attr value"
4890
msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
4891
4454
-#: pathspec.c:146
4892
+#: pathspec.c:148
4893
msgid "Only one 'attr:' specification is allowed."
4894
msgstr "只允许一个 'attr:' 规格。"
4895
4458
-#: pathspec.c:149
4896
+#: pathspec.c:151
4897
msgid "attr spec must not be empty"
4898
msgstr "属性规格不能为空"
4899
4462
-#: pathspec.c:192
4900
+#: pathspec.c:194
4901
#, c-format
4902
msgid "invalid attribute name %s"
4903
msgstr "无效的属性名 %s"
4904
4467
-#: pathspec.c:257
4905
+#: pathspec.c:259
4906
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
4907
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
4908
4471
-#: pathspec.c:264
4909
+#: pathspec.c:266
4910
msgid ""
4911
"global 'literal' pathspec setting is incompatible with all other global "
4912
"pathspec settings"
4913
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
4914
4477
-#: pathspec.c:304
4915
+#: pathspec.c:306
4916
msgid "invalid parameter for pathspec magic 'prefix'"
4917
msgstr "路径规格包含无效的神奇前缀"
4918
4481
-#: pathspec.c:325
4919
+#: pathspec.c:327
4920
#, c-format
4921
msgid "Invalid pathspec magic '%.*s' in '%s'"
4922
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
4923
4486
-#: pathspec.c:330
4924
+#: pathspec.c:332
4925
#, c-format
4926
msgid "Missing ')' at the end of pathspec magic in '%s'"
4927
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
4928
4491
-#: pathspec.c:368
4929
+#: pathspec.c:370
4930
#, c-format
4931
msgid "Unimplemented pathspec magic '%c' in '%s'"
4932
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
4933
4496
-#: pathspec.c:427
4934
+#: pathspec.c:429
4935
#, c-format
4936
msgid "%s: 'literal' and 'glob' are incompatible"
4937
msgstr "%s：'literal' 和 'glob' 不兼容"
4938
4501
-#: pathspec.c:440
4939
+#: pathspec.c:442
4940
#, c-format
4941
msgid "%s: '%s' is outside repository"
4942
msgstr "%s：'%s' 在仓库之外"
4943
4506
-#: pathspec.c:514
4944
+#: pathspec.c:516
4945
#, c-format
4946
msgid "'%s' (mnemonic: '%c')"
4947
msgstr "'%s'（助记符：'%c'）"
4948
4511
-#: pathspec.c:524
4949
+#: pathspec.c:526
4950
#, c-format
4951
msgid "%s: pathspec magic not supported by this command: %s"
4952
msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
4953
4516
-#: pathspec.c:591
4954
+#: pathspec.c:593
4955
#, c-format
4956
msgid "pathspec '%s' is beyond a symbolic link"
4957
msgstr "路径规格 '%s' 位于符号链接中"
4958
4959
+#: pathspec.c:638
4960
+#, c-format
4961
+msgid "line is badly quoted: %s"
4962
+msgstr "行被错误地引用：%s"
4963
+
4964
#: pkt-line.c:92
4965
msgid "unable to write flush packet"
4966
msgstr "无法写 flush 包"
@@ -4578,42 +5021,42 @@ msgstr "正在刷新索引"
5021
msgid "unable to create threaded lstat: %s"
5022
msgstr "无法创建线程 lstat：%s"
5023
4581
-#: pretty.c:966
5024
+#: pretty.c:981
5025
msgid "unable to parse --pretty format"
5026
msgstr "不能解析 --pretty 格式"
5027
4585
-#: promisor-remote.c:25
5028
+#: promisor-remote.c:23
5029
msgid "Remote with no URL"
5030
msgstr "远程未设置 URL"
5031
4589
-#: promisor-remote.c:61
5032
+#: promisor-remote.c:58
5033
#, c-format
5034
msgid "promisor remote name cannot begin with '/': %s"
5035
msgstr "promisor 远程名称不能以 '/' 开始：%s"
5036
4594
-#: range-diff.c:71
5037
+#: range-diff.c:75
5038
msgid "could not start `log`"
5039
msgstr "不能启动 `log`"
5040
4598
-#: range-diff.c:73
5041
+#: range-diff.c:77
5042
msgid "could not read `log` output"
5043
msgstr "不能读取 `log` 的输出"
5044
4602
-#: range-diff.c:92 sequencer.c:4985
5045
+#: range-diff.c:96 sequencer.c:5163
5046
#, c-format
5047
msgid "could not parse commit '%s'"
5048
msgstr "不能解析提交 '%s'"
5049
4607
-#: range-diff.c:118
5050
+#: range-diff.c:122
5051
#, c-format
5052
msgid "could not parse git header '%.*s'"
5053
msgstr "无法解析 git 头 '%.*s'"
5054
4612
-#: range-diff.c:275
5055
+#: range-diff.c:285
5056
msgid "failed to generate diff"
5057
msgstr "生成 diff 失败"
5058
4616
-#: range-diff.c:507 range-diff.c:509
5059
+#: range-diff.c:518 range-diff.c:520
5060
#, c-format
5061
msgid "could not parse log for '%s'"
5062
msgstr "不能解析 '%s' 的日志"
@@ -4652,16 +5095,16 @@ msgstr "无法在索引中添加 '%s'"
5095
msgid "unable to stat '%s'"
5096
msgstr "无法对 %s 执行 stat"
5097
4655
-#: read-cache.c:1314
5098
+#: read-cache.c:1325
5099
#, c-format
5100
msgid "'%s' appears as both a file and as a directory"
5101
msgstr "'%s' 看起来既是文件又是目录"
5102
4660
-#: read-cache.c:1520
5103
+#: read-cache.c:1531
5104
msgid "Refresh index"
5105
msgstr "刷新索引"
5106
4664
-#: read-cache.c:1635
5107
+#: read-cache.c:1646
5108
#, c-format
5109
msgid ""
5110
"index.version set, but the value is invalid.\n"
@@ -4670,7 +5113,7 @@ msgstr ""
5113
"设置了 index.version，但是取值无效。\n"
5114
"使用版本 %i"
5115
4673
-#: read-cache.c:1645
5116
+#: read-cache.c:1656
5117
#, c-format
5118
msgid ""
5119
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4679,139 +5122,139 @@ msgstr ""
5122
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
5123
"使用版本 %i"
5124
4682
-#: read-cache.c:1701
5125
+#: read-cache.c:1712
5126
#, c-format
5127
msgid "bad signature 0x%08x"
5128
msgstr "坏的签名 0x%08x"
5129
4687
-#: read-cache.c:1704
5130
+#: read-cache.c:1715
5131
#, c-format
5132
msgid "bad index version %d"
5133
msgstr "坏的索引版本 %d"
5134
4692
-#: read-cache.c:1713
5135
+#: read-cache.c:1724
5136
msgid "bad index file sha1 signature"
5137
msgstr "坏的索引文件 sha1 签名"
5138
4696
-#: read-cache.c:1743
5139
+#: read-cache.c:1754
5140
#, c-format
5141
msgid "index uses %.4s extension, which we do not understand"
5142
msgstr "索引使用不被支持的 %.4s 扩展"
5143
5144
#
4702
-#: read-cache.c:1745
5145
+#: read-cache.c:1756
5146
#, c-format
5147
msgid "ignoring %.4s extension"
5148
msgstr "忽略 %.4s 扩展"
5149
4707
-#: read-cache.c:1782
5150
+#: read-cache.c:1793
5151
#, c-format
5152
msgid "unknown index entry format 0x%08x"
5153
msgstr "未知的索引条目格式 0x%08x"
5154
4712
-#: read-cache.c:1798
5155
+#: read-cache.c:1809
5156
#, c-format
5157
msgid "malformed name field in the index, near path '%s'"
5158
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
5159
4717
-#: read-cache.c:1855
5160
+#: read-cache.c:1866
5161
msgid "unordered stage entries in index"
5162
msgstr "索引中有未排序的暂存条目"
5163
4721
-#: read-cache.c:1858
5164
+#: read-cache.c:1869
5165
#, c-format
5166
msgid "multiple stage entries for merged file '%s'"
5167
msgstr "合并文件 '%s' 有多个暂存条目"
5168
4726
-#: read-cache.c:1861
5169
+#: read-cache.c:1872
5170
#, c-format
5171
msgid "unordered stage entries for '%s'"
5172
msgstr "'%s' 的未排序暂存条目"
5173
4731
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
4732
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
4733
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
5174
+#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111
5175
+#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470
5176
+#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367
5177
#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
4735
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
5178
+#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332
5179
msgid "index file corrupt"
5180
msgstr "索引文件损坏"
5181
4739
-#: read-cache.c:2108
5182
+#: read-cache.c:2119
5183
#, c-format
5184
msgid "unable to create load_cache_entries thread: %s"
5185
msgstr "无法创建 load_cache_entries 线程：%s"
5186
4744
-#: read-cache.c:2121
5187
+#: read-cache.c:2132
5188
#, c-format
5189
msgid "unable to join load_cache_entries thread: %s"
5190
msgstr "无法加入 load_cache_entries 线程：%s"
5191
4749
-#: read-cache.c:2154
5192
+#: read-cache.c:2165
5193
#, c-format
5194
msgid "%s: index file open failed"
5195
msgstr "%s：打开索引文件失败"
5196
4754
-#: read-cache.c:2158
5197
+#: read-cache.c:2169
5198
#, c-format
5199
msgid "%s: cannot stat the open index"
5200
msgstr "%s：不能对打开的索引执行 stat 操作"
5201
4759
-#: read-cache.c:2162
5202
+#: read-cache.c:2173
5203
#, c-format
5204
msgid "%s: index file smaller than expected"
5205
msgstr "%s：索引文件比预期的小"
5206
4764
-#: read-cache.c:2166
5207
+#: read-cache.c:2177
5208
#, c-format
5209
msgid "%s: unable to map index file"
5210
msgstr "%s：无法对索引文件执行 map 操作"
5211
4769
-#: read-cache.c:2208
5212
+#: read-cache.c:2219
5213
#, c-format
5214
msgid "unable to create load_index_extensions thread: %s"
5215
msgstr "无法创建 load_index_extensions 线程：%s"
5216
4774
-#: read-cache.c:2235
5217
+#: read-cache.c:2246
5218
#, c-format
5219
msgid "unable to join load_index_extensions thread: %s"
5220
msgstr "无法加入 load_index_extensions 线程：%s"
5221
4779
-#: read-cache.c:2267
5222
+#: read-cache.c:2278
5223
#, c-format
5224
msgid "could not freshen shared index '%s'"
5225
msgstr "无法刷新共享索引 '%s'"
5226
4784
-#: read-cache.c:2314
5227
+#: read-cache.c:2325
5228
#, c-format
5229
msgid "broken index, expect %s in %s, got %s"
5230
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
5231
4789
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
5232
+#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119
5233
#, c-format
5234
msgid "could not close '%s'"
5235
msgstr "不能关闭 '%s'"
5236
4794
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
5237
+#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069
5238
#, c-format
5239
msgid "could not stat '%s'"
5240
msgstr "不能对 '%s' 调用 stat"
5241
4799
-#: read-cache.c:3126
5242
+#: read-cache.c:3137
5243
#, c-format
5244
msgid "unable to open git dir: %s"
5245
msgstr "不能打开 git 目录：%s"
5246
4804
-#: read-cache.c:3138
5247
+#: read-cache.c:3149
5248
#, c-format
5249
msgid "unable to unlink: %s"
5250
msgstr "无法删除：%s"
5251
4809
-#: read-cache.c:3163
5252
+#: read-cache.c:3174
5253
#, c-format
5254
msgid "cannot fix permission bits on '%s'"
5255
msgstr "不能修复 '%s' 的权限位"
5256
4814
-#: read-cache.c:3312
5257
+#: read-cache.c:3323
5258
#, c-format
5259
msgid "%s: cannot drop to stage #0"
5260
msgstr "%s：不能落到暂存区 #0"
@@ -4913,8 +5356,8 @@ msgstr ""
5356
msgid "Note that empty commits are commented out"
5357
msgstr "注意空提交已被注释掉"
5358
4916
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
4917
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
5359
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536
5360
+#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254
5361
#, c-format
5362
msgid "could not write '%s'"
5363
msgstr "不能写入 '%s'"
@@ -4984,14 +5427,15 @@ msgstr "引用 '%s' 已经存在"
5427
msgid "unexpected object ID when writing '%s'"
5428
msgstr "写入 '%s' 时意外的对象 ID"
5429
4987
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
4988
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
5430
+#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997
5431
+#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
5432
+#: wrapper.c:620
5433
#, c-format
5434
msgid "could not write to '%s'"
5435
msgstr "不能写入 '%s'"
5436
4993
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
4994
-#: builtin/rebase.c:1004
5437
+#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5438
+#: builtin/rebase.c:1031
5439
#, c-format
5440
msgid "could not open '%s' for writing"
5441
msgstr "无法打开 '%s' 进行写入"
@@ -5647,8 +6091,8 @@ msgstr "不能删除 stray '%s'"
6091
msgid "Recorded preimage for '%s'"
6092
msgstr "为 '%s' 记录 preimage"
6093
5650
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
5651
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
6094
+#: rerere.c:881 submodule.c:2067 builtin/log.c:1871
6095
+#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448
6096
#, c-format
6097
msgid "could not create directory '%s'"
6098
msgstr "不能创建目录 '%s'"
@@ -5682,33 +6126,33 @@ msgstr "忘记 '%s' 的解决方案\n"
6126
msgid "unable to open rr-cache directory"
6127
msgstr "不能打开 rr-cache 目录"
6128
5685
-#: revision.c:2509
6129
+#: revision.c:2497
6130
msgid "your current branch appears to be broken"
6131
msgstr "您的当前分支好像被损坏"
6132
5689
-#: revision.c:2512
6133
+#: revision.c:2500
6134
#, c-format
6135
msgid "your current branch '%s' does not have any commits yet"
6136
msgstr "您的当前分支 '%s' 尚无任何提交"
6137
5694
-#: revision.c:2720
6138
+#: revision.c:2708
6139
msgid "--first-parent is incompatible with --bisect"
6140
msgstr "--first-parent 与 --bisect 不兼容"
6141
5698
-#: revision.c:2724
6142
+#: revision.c:2712
6143
msgid "-L does not yet support diff formats besides -p and -s"
6144
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
6145
5702
-#: run-command.c:763
6146
+#: run-command.c:762
6147
msgid "open /dev/null failed"
6148
msgstr "不能打开 /dev/null"
6149
5706
-#: run-command.c:1269
6150
+#: run-command.c:1268
6151
#, c-format
6152
msgid "cannot create async thread: %s"
6153
msgstr "不能创建 async 线程：%s"
6154
5711
-#: run-command.c:1333
6155
+#: run-command.c:1332
6156
#, c-format
6157
msgid ""
6158
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -5717,75 +6161,75 @@ msgstr ""
6161
"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
6162
"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
6163
5720
-#: send-pack.c:142
6164
+#: send-pack.c:144
6165
msgid "unexpected flush packet while reading remote unpack status"
6166
msgstr "读取远程解包状态时收到意外的 flush 包"
6167
5724
-#: send-pack.c:144
6168
+#: send-pack.c:146
6169
#, c-format
6170
msgid "unable to parse remote unpack status: %s"
6171
msgstr "不能解析远程解包状态：%s"
6172
5729
-#: send-pack.c:146
6173
+#: send-pack.c:148
6174
#, c-format
6175
msgid "remote unpack failed: %s"
6176
msgstr "远程解包失败：%s"
6177
5734
-#: send-pack.c:307
6178
+#: send-pack.c:309
6179
msgid "failed to sign the push certificate"
6180
msgstr "为推送证书签名失败"
6181
5738
-#: send-pack.c:421
6182
+#: send-pack.c:423
6183
msgid "the receiving end does not support --signed push"
6184
msgstr "接收端不支持签名推送"
6185
5742
-#: send-pack.c:423
6186
+#: send-pack.c:425
6187
msgid ""
6188
"not sending a push certificate since the receiving end does not support --"
6189
"signed push"
6190
msgstr "未发送推送证书，因为接收端不支持签名推送"
6191
5748
-#: send-pack.c:435
6192
+#: send-pack.c:437
6193
msgid "the receiving end does not support --atomic push"
6194
msgstr "接收端不支持原子推送"
6195
5752
-#: send-pack.c:440
6196
+#: send-pack.c:442
6197
msgid "the receiving end does not support push options"
6198
msgstr "接收端不支持推送选项"
6199
5756
-#: sequencer.c:187
6200
+#: sequencer.c:189
6201
#, c-format
6202
msgid "invalid commit message cleanup mode '%s'"
6203
msgstr "无效的提交信息清理模式 '%s'"
6204
5761
-#: sequencer.c:292
6205
+#: sequencer.c:294
6206
#, c-format
6207
msgid "could not delete '%s'"
6208
msgstr "无法删除 '%s'"
6209
5766
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
6210
+#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369
6211
#, c-format
6212
msgid "could not remove '%s'"
6213
msgstr "无法删除 '%s'"
6214
5771
-#: sequencer.c:321
6215
+#: sequencer.c:323
6216
msgid "revert"
6217
msgstr "还原"
6218
5775
-#: sequencer.c:323
6219
+#: sequencer.c:325
6220
msgid "cherry-pick"
6221
msgstr "拣选"
6222
5779
-#: sequencer.c:325
6223
+#: sequencer.c:327
6224
msgid "rebase -i"
6225
msgstr "rebase -i"
6226
5783
-#: sequencer.c:327
6227
+#: sequencer.c:329
6228
#, c-format
6229
msgid "unknown action: %d"
6230
msgstr "未知动作：%d"
6231
5788
-#: sequencer.c:385
6232
+#: sequencer.c:387
6233
msgid ""
6234
"after resolving the conflicts, mark the corrected paths\n"
6235
"with 'git add <paths>' or 'git rm <paths>'"
@@ -5793,7 +6237,7 @@ msgstr ""
6237
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
6238
"命令标记修正后的文件"
6239
5796
-#: sequencer.c:388
6240
+#: sequencer.c:390
6241
msgid ""
6242
"after resolving the conflicts, mark the corrected paths\n"
6243
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5802,44 +6246,44 @@ msgstr ""
6246
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
6247
"对修正后的文件做标记，然后用 'git commit' 提交"
6248
5805
-#: sequencer.c:401 sequencer.c:2847
6249
+#: sequencer.c:403 sequencer.c:2993
6250
#, c-format
6251
msgid "could not lock '%s'"
6252
msgstr "不能锁定 '%s'"
6253
5810
-#: sequencer.c:408
6254
+#: sequencer.c:410
6255
#, c-format
6256
msgid "could not write eol to '%s'"
6257
msgstr "不能将换行符写入 '%s'"
6258
5815
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
5816
-#: sequencer.c:3130
6259
+#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
6260
+#: sequencer.c:3277
6261
#, c-format
6262
msgid "failed to finalize '%s'"
6263
msgstr "无法完成 '%s'"
6264
5821
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
5822
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
5823
-#: builtin/rebase.c:568
6265
+#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
6266
+#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
6267
+#: builtin/rebase.c:589
6268
#, c-format
6269
msgid "could not read '%s'"
6270
msgstr "不能读取 '%s'"
6271
5828
-#: sequencer.c:462
6272
+#: sequencer.c:464
6273
#, c-format
6274
msgid "your local changes would be overwritten by %s."
6275
msgstr "您的本地修改将被%s覆盖。"
6276
5833
-#: sequencer.c:466
6277
+#: sequencer.c:468
6278
msgid "commit your changes or stash them to proceed."
6279
msgstr "提交您的修改或贮藏后再继续。"
6280
5837
-#: sequencer.c:498
6281
+#: sequencer.c:500
6282
#, c-format
6283
msgid "%s: fast-forward"
6284
msgstr "%s：快进"
6285
5842
-#: sequencer.c:537 builtin/tag.c:565
6286
+#: sequencer.c:539 builtin/tag.c:565
6287
#, c-format
6288
msgid "Invalid cleanup mode %s"
6289
msgstr "无效的清理模式 %s"
@@ -5847,65 +6291,69 @@ msgstr "无效的清理模式 %s"
6291
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
6292
#. "rebase -i".
6293
#.
5850
-#: sequencer.c:631
6294
+#: sequencer.c:633
6295
#, c-format
6296
msgid "%s: Unable to write new index file"
6297
msgstr "%s：无法写入新索引文件"
6298
5855
-#: sequencer.c:648
6299
+#: sequencer.c:650
6300
msgid "unable to update cache tree"
6301
msgstr "不能更新缓存树"
6302
5859
-#: sequencer.c:662
6303
+#: sequencer.c:664
6304
msgid "could not resolve HEAD commit"
6305
msgstr "不能解析 HEAD 提交"
6306
5863
-#: sequencer.c:742
6307
+#: sequencer.c:744
6308
#, c-format
6309
msgid "no key present in '%.*s'"
6310
msgstr "在 '%.*s' 中没有 key"
6311
5868
-#: sequencer.c:753
6312
+#: sequencer.c:755
6313
#, c-format
6314
msgid "unable to dequote value of '%s'"
6315
msgstr "无法为 '%s' 的值去引号"
6316
5873
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
5874
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
6317
+#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705
6318
+#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074
6319
#, c-format
6320
msgid "could not open '%s' for reading"
6321
msgstr "无法打开 '%s' 进行读取"
6322
5879
-#: sequencer.c:800
6323
+#: sequencer.c:802
6324
msgid "'GIT_AUTHOR_NAME' already given"
6325
msgstr "已经给出 'GIT_AUTHOR_NAME'"
6326
5883
-#: sequencer.c:805
6327
+#: sequencer.c:807
6328
msgid "'GIT_AUTHOR_EMAIL' already given"
6329
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
6330
5887
-#: sequencer.c:810
6331
+#: sequencer.c:812
6332
msgid "'GIT_AUTHOR_DATE' already given"
6333
msgstr "已经给出 'GIT_AUTHOR_DATE'"
6334
5891
-#: sequencer.c:814
6335
+#: sequencer.c:816
6336
#, c-format
6337
msgid "unknown variable '%s'"
6338
msgstr "未知变量 '%s'"
6339
5896
-#: sequencer.c:819
6340
+#: sequencer.c:821
6341
msgid "missing 'GIT_AUTHOR_NAME'"
6342
msgstr "缺少 'GIT_AUTHOR_NAME'"
6343
5900
-#: sequencer.c:821
6344
+#: sequencer.c:823
6345
msgid "missing 'GIT_AUTHOR_EMAIL'"
6346
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6347
5904
-#: sequencer.c:823
6348
+#: sequencer.c:825
6349
msgid "missing 'GIT_AUTHOR_DATE'"
6350
msgstr "缺少 'GIT_AUTHOR_DATE'"
6351
5908
-#: sequencer.c:872
6352
+#: sequencer.c:902 sequencer.c:1427
6353
+msgid "malformed ident line"
6354
+msgstr "错误的身份信息"
6355
+
6356
+#: sequencer.c:925
6357
#, c-format
6358
msgid ""
6359
"you have staged changes in your working tree\n"
@@ -5934,11 +6382,11 @@ msgstr ""
6382
"\n"
6383
" git rebase --continue\n"
6384
5937
-#: sequencer.c:1146
6385
+#: sequencer.c:1218
6386
msgid "'prepare-commit-msg' hook failed"
6387
msgstr "'prepare-commit-msg' 钩子失败"
6388
5941
-#: sequencer.c:1153
6389
+#: sequencer.c:1224
6390
msgid ""
6391
"Your name and email address were configured automatically based\n"
6392
"on your username and hostname. Please check that they are accurate.\n"
@@ -5962,7 +6410,7 @@ msgstr ""
6410
"\n"
6411
" git commit --amend --reset-author\n"
6412
5965
-#: sequencer.c:1166
6413
+#: sequencer.c:1237
6414
msgid ""
6415
"Your name and email address were configured automatically based\n"
6416
"on your username and hostname. Please check that they are accurate.\n"
@@ -5985,326 +6433,330 @@ msgstr ""
6433
"\n"
6434
" git commit --amend --reset-author\n"
6435
5988
-#: sequencer.c:1208
6436
+#: sequencer.c:1279
6437
msgid "couldn't look up newly created commit"
6438
msgstr "无法找到新创建的提交"
6439
5992
-#: sequencer.c:1210
6440
+#: sequencer.c:1281
6441
msgid "could not parse newly created commit"
6442
msgstr "不能解析新创建的提交"
6443
5996
-#: sequencer.c:1256
6444
+#: sequencer.c:1327
6445
msgid "unable to resolve HEAD after creating commit"
6446
msgstr "创建提交后，不能解析 HEAD"
6447
6000
-#: sequencer.c:1258
6448
+#: sequencer.c:1329
6449
msgid "detached HEAD"
6450
msgstr "分离头指针"
6451
6452
# 译者：中文字符串拼接，可删除前导空格
6005
-#: sequencer.c:1262
6453
+#: sequencer.c:1333
6454
msgid " (root-commit)"
6455
msgstr "（根提交）"
6456
6009
-#: sequencer.c:1283
6457
+#: sequencer.c:1354
6458
msgid "could not parse HEAD"
6459
msgstr "不能解析 HEAD"
6460
6013
-#: sequencer.c:1285
6461
+#: sequencer.c:1356
6462
#, c-format
6463
msgid "HEAD %s is not a commit!"
6464
msgstr "HEAD %s 不是一个提交！"
6465
6018
-#: sequencer.c:1289 builtin/commit.c:1571
6466
+#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569
6467
msgid "could not parse HEAD commit"
6468
msgstr "不能解析 HEAD 提交"
6469
6022
-#: sequencer.c:1341 sequencer.c:1933
6470
+#: sequencer.c:1411 sequencer.c:2055
6471
msgid "unable to parse commit author"
6472
msgstr "不能解析提交作者"
6473
6026
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
6474
+#: sequencer.c:1431
6475
+msgid "corrupted author without date information"
6476
+msgstr "损坏的没有日期的作者信息"
6477
+
6478
+#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684
6479
msgid "git write-tree failed to write a tree"
6480
msgstr "git write-tree 无法写入树对象"
6481
6030
-#: sequencer.c:1369 sequencer.c:1429
6482
+#: sequencer.c:1480 sequencer.c:1550
6483
#, c-format
6484
msgid "unable to read commit message from '%s'"
6485
msgstr "不能从 '%s' 读取提交说明"
6486
6035
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
6487
+#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883
6488
#: builtin/merge.c:908
6489
msgid "failed to write commit object"
6490
msgstr "写提交对象失败"
6491
6040
-#: sequencer.c:1456
6492
+#: sequencer.c:1577
6493
#, c-format
6494
msgid "could not parse commit %s"
6495
msgstr "不能解析提交 %s"
6496
6045
-#: sequencer.c:1461
6497
+#: sequencer.c:1582
6498
#, c-format
6499
msgid "could not parse parent commit %s"
6500
msgstr "不能解析父提交 %s"
6501
6050
-#: sequencer.c:1535 sequencer.c:1645
6502
+#: sequencer.c:1656 sequencer.c:1767
6503
#, c-format
6504
msgid "unknown command: %d"
6505
msgstr "未知命令：%d"
6506
6055
-#: sequencer.c:1592 sequencer.c:1617
6507
+#: sequencer.c:1714 sequencer.c:1739
6508
#, c-format
6509
msgid "This is a combination of %d commits."
6510
msgstr "这是一个 %d 个提交的组合。"
6511
6060
-#: sequencer.c:1602
6512
+#: sequencer.c:1724
6513
msgid "need a HEAD to fixup"
6514
msgstr "需要一个 HEAD 来修复"
6515
6064
-#: sequencer.c:1604 sequencer.c:3157
6516
+#: sequencer.c:1726 sequencer.c:3304
6517
msgid "could not read HEAD"
6518
msgstr "不能读取 HEAD"
6519
6068
-#: sequencer.c:1606
6520
+#: sequencer.c:1728
6521
msgid "could not read HEAD's commit message"
6522
msgstr "不能读取 HEAD 的提交说明"
6523
6072
-#: sequencer.c:1612
6524
+#: sequencer.c:1734
6525
#, c-format
6526
msgid "cannot write '%s'"
6527
msgstr "不能写 '%s'"
6528
6077
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
6529
+#: sequencer.c:1741 git-rebase--preserve-merges.sh:496
6530
msgid "This is the 1st commit message:"
6531
msgstr "这是第一个提交说明："
6532
6081
-#: sequencer.c:1627
6533
+#: sequencer.c:1749
6534
#, c-format
6535
msgid "could not read commit message of %s"
6536
msgstr "不能读取 %s 的提交说明"
6537
6086
-#: sequencer.c:1634
6538
+#: sequencer.c:1756
6539
#, c-format
6540
msgid "This is the commit message #%d:"
6541
msgstr "这是提交说明 #%d："
6542
6091
-#: sequencer.c:1640
6543
+#: sequencer.c:1762
6544
#, c-format
6545
msgid "The commit message #%d will be skipped:"
6546
msgstr "提交说明 #%d 将被跳过："
6547
6096
-#: sequencer.c:1728
6548
+#: sequencer.c:1850
6549
msgid "your index file is unmerged."
6550
msgstr "您的索引文件未完成合并。"
6551
6100
-#: sequencer.c:1735
6552
+#: sequencer.c:1857
6553
msgid "cannot fixup root commit"
6554
msgstr "不能修复根提交"
6555
6104
-#: sequencer.c:1754
6556
+#: sequencer.c:1876
6557
#, c-format
6558
msgid "commit %s is a merge but no -m option was given."
6559
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6560
6109
-#: sequencer.c:1762 sequencer.c:1770
6561
+#: sequencer.c:1884 sequencer.c:1892
6562
#, c-format
6563
msgid "commit %s does not have parent %d"
6564
msgstr "提交 %s 没有第 %d 个父提交"
6565
6114
-#: sequencer.c:1776
6566
+#: sequencer.c:1898
6567
#, c-format
6568
msgid "cannot get commit message for %s"
6569
msgstr "不能得到 %s 的提交说明"
6570
6571
#. TRANSLATORS: The first %s will be a "todo" command like
6572
#. "revert" or "pick", the second %s a SHA1.
6121
-#: sequencer.c:1795
6573
+#: sequencer.c:1917
6574
#, c-format
6575
msgid "%s: cannot parse parent commit %s"
6576
msgstr "%s：不能解析父提交 %s"
6577
6126
-#: sequencer.c:1860
6578
+#: sequencer.c:1982
6579
#, c-format
6580
msgid "could not rename '%s' to '%s'"
6581
msgstr "不能将 '%s' 重命名为 '%s'"
6582
6131
-#: sequencer.c:1915
6583
+#: sequencer.c:2037
6584
#, c-format
6585
msgid "could not revert %s... %s"
6586
msgstr "不能还原 %s... %s"
6587
6136
-#: sequencer.c:1916
6588
+#: sequencer.c:2038
6589
#, c-format
6590
msgid "could not apply %s... %s"
6591
msgstr "不能应用 %s... %s"
6592
6141
-#: sequencer.c:1983
6593
+#: sequencer.c:2105
6594
#, c-format
6595
msgid "git %s: failed to read the index"
6596
msgstr "git %s：无法读取索引"
6597
6146
-#: sequencer.c:1990
6598
+#: sequencer.c:2112
6599
#, c-format
6600
msgid "git %s: failed to refresh the index"
6601
msgstr "git %s：无法刷新索引"
6602
6151
-#: sequencer.c:2066
6603
+#: sequencer.c:2189
6604
#, c-format
6605
msgid "%s does not accept arguments: '%s'"
6606
msgstr "%s 不接受参数：'%s'"
6607
6156
-#: sequencer.c:2075
6608
+#: sequencer.c:2198
6609
#, c-format
6610
msgid "missing arguments for %s"
6611
msgstr "缺少 %s 的参数"
6612
6161
-#: sequencer.c:2112
6613
+#: sequencer.c:2235
6614
#, c-format
6615
msgid "could not parse '%.*s'"
6616
msgstr "无法解析 '%.*s'"
6617
6166
-#: sequencer.c:2166
6618
+#: sequencer.c:2289
6619
#, c-format
6620
msgid "invalid line %d: %.*s"
6621
msgstr "无效行 %d：%.*s"
6622
6171
-#: sequencer.c:2177
6623
+#: sequencer.c:2300
6624
#, c-format
6625
msgid "cannot '%s' without a previous commit"
6626
msgstr "没有父提交的情况下不能 '%s'"
6627
6176
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
6177
-#: builtin/rebase.c:204 builtin/rebase.c:229
6628
+#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197
6629
+#: builtin/rebase.c:223 builtin/rebase.c:248
6630
#, c-format
6631
msgid "could not read '%s'."
6632
msgstr "不能读取 '%s'。"
6633
6182
-#: sequencer.c:2261
6634
+#: sequencer.c:2384
6635
msgid "cancelling a cherry picking in progress"
6636
msgstr "正在取消一个进行中的拣选"
6637
6186
-#: sequencer.c:2268
6638
+#: sequencer.c:2391
6639
msgid "cancelling a revert in progress"
6640
msgstr "正在取消一个进行中的还原"
6641
6190
-#: sequencer.c:2302
6642
+#: sequencer.c:2435
6643
msgid "please fix this using 'git rebase --edit-todo'."
6644
msgstr "请用 'git rebase --edit-todo' 来修改。"
6645
6194
-#: sequencer.c:2304
6646
+#: sequencer.c:2437
6647
#, c-format
6648
msgid "unusable instruction sheet: '%s'"
6649
msgstr "不可用的指令清单：'%s'"
6650
6199
-#: sequencer.c:2309
6651
+#: sequencer.c:2442
6652
msgid "no commits parsed."
6653
msgstr "没有解析提交。"
6654
6203
-#: sequencer.c:2320
6655
+#: sequencer.c:2453
6656
msgid "cannot cherry-pick during a revert."
6657
msgstr "不能在回退中执行拣选。"
6658
6207
-#: sequencer.c:2322
6659
+#: sequencer.c:2455
6660
msgid "cannot revert during a cherry-pick."
6661
msgstr "不能在拣选中执行回退。"
6662
6211
-#: sequencer.c:2404
6663
+#: sequencer.c:2533
6664
#, c-format
6665
msgid "invalid value for %s: %s"
6666
msgstr "%s 的值无效：%s"
6667
6216
-#: sequencer.c:2491
6668
+#: sequencer.c:2630
6669
msgid "unusable squash-onto"
6670
msgstr "不可用的 squash-onto"
6671
6220
-#: sequencer.c:2507
6672
+#: sequencer.c:2646
6673
#, c-format
6674
msgid "malformed options sheet: '%s'"
6675
msgstr "格式错误的选项清单：'%s'"
6676
6225
-#: sequencer.c:2590 sequencer.c:4308
6677
+#: sequencer.c:2736 sequencer.c:4463
6678
msgid "empty commit set passed"
6679
msgstr "提供了空的提交集"
6680
6229
-#: sequencer.c:2606
6681
+#: sequencer.c:2752
6682
msgid "revert is already in progress"
6683
msgstr "一个还原操作已在进行"
6684
6233
-#: sequencer.c:2608
6685
+#: sequencer.c:2754
6686
#, c-format
6687
msgid "try \"git revert (--continue | %s--abort | --quit)\""
6688
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
6689
6238
-#: sequencer.c:2611
6690
+#: sequencer.c:2757
6691
msgid "cherry-pick is already in progress"
6692
msgstr "拣选操作已在进行"
6693
6242
-#: sequencer.c:2613
6694
+#: sequencer.c:2759
6695
#, c-format
6696
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
6697
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
6698
6247
-#: sequencer.c:2627
6699
+#: sequencer.c:2773
6700
#, c-format
6701
msgid "could not create sequencer directory '%s'"
6702
msgstr "不能创建序列目录 '%s'"
6703
6252
-#: sequencer.c:2642
6704
+#: sequencer.c:2788
6705
msgid "could not lock HEAD"
6706
msgstr "不能锁定 HEAD"
6707
6256
-#: sequencer.c:2702 sequencer.c:4057
6708
+#: sequencer.c:2848 sequencer.c:4209
6709
msgid "no cherry-pick or revert in progress"
6710
msgstr "拣选或还原操作并未进行"
6711
6260
-#: sequencer.c:2704 sequencer.c:2715
6712
+#: sequencer.c:2850 sequencer.c:2861
6713
msgid "cannot resolve HEAD"
6714
msgstr "不能解析 HEAD"
6715
6264
-#: sequencer.c:2706 sequencer.c:2750
6716
+#: sequencer.c:2852 sequencer.c:2896
6717
msgid "cannot abort from a branch yet to be born"
6718
msgstr "不能从尚未建立的分支终止"
6719
6268
-#: sequencer.c:2736 builtin/grep.c:736
6720
+#: sequencer.c:2882 builtin/grep.c:736
6721
#, c-format
6722
msgid "cannot open '%s'"
6723
msgstr "不能打开 '%s'"
6724
6273
-#: sequencer.c:2738
6725
+#: sequencer.c:2884
6726
#, c-format
6727
msgid "cannot read '%s': %s"
6728
msgstr "不能读取 '%s'：%s"
6729
6278
-#: sequencer.c:2739
6730
+#: sequencer.c:2885
6731
msgid "unexpected end of file"
6732
msgstr "意外的文件结束"
6733
6282
-#: sequencer.c:2745
6734
+#: sequencer.c:2891
6735
#, c-format
6736
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
6737
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
6738
6287
-#: sequencer.c:2756
6739
+#: sequencer.c:2902
6740
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
6741
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
6742
6291
-#: sequencer.c:2797
6743
+#: sequencer.c:2943
6744
msgid "no revert in progress"
6745
msgstr "没有正在进行的还原"
6746
6295
-#: sequencer.c:2805
6747
+#: sequencer.c:2951
6748
msgid "no cherry-pick in progress"
6749
msgstr "没有正在进行的拣选"
6750
6299
-#: sequencer.c:2815
6751
+#: sequencer.c:2961
6752
msgid "failed to skip the commit"
6753
msgstr "无法跳过这个提交"
6754
6303
-#: sequencer.c:2822
6755
+#: sequencer.c:2968
6756
msgid "there is nothing to skip"
6757
msgstr "没有要跳过的"
6758
6307
-#: sequencer.c:2825
6759
+#: sequencer.c:2971
6760
#, c-format
6761
msgid ""
6762
"have you committed already?\n"
@@ -6313,21 +6765,21 @@ msgstr ""
6765
"您已经提交了么？\n"
6766
"试试 \"git %s --continue\""
6767
6316
-#: sequencer.c:2949 sequencer.c:3969
6768
+#: sequencer.c:3095 sequencer.c:4121
6769
#, c-format
6770
msgid "could not update %s"
6771
msgstr "不能更新 %s"
6772
6321
-#: sequencer.c:2987 sequencer.c:3949
6773
+#: sequencer.c:3134 sequencer.c:4101
6774
msgid "cannot read HEAD"
6775
msgstr "不能读取 HEAD"
6776
6325
-#: sequencer.c:3004
6777
+#: sequencer.c:3151
6778
#, c-format
6779
msgid "unable to copy '%s' to '%s'"
6780
msgstr "无法拷贝 '%s' 至 '%s'"
6781
6330
-#: sequencer.c:3012
6782
+#: sequencer.c:3159
6783
#, c-format
6784
msgid ""
6785
"You can amend the commit now, with\n"
@@ -6346,28 +6798,23 @@ msgstr ""
6798
"\n"
6799
" git rebase --continue\n"
6800
6349
-#: sequencer.c:3022
6801
+#: sequencer.c:3169
6802
#, c-format
6803
msgid "Could not apply %s... %.*s"
6804
msgstr "不能应用 %s... %.*s"
6805
6354
-#: sequencer.c:3029
6806
+#: sequencer.c:3176
6807
#, c-format
6808
msgid "Could not merge %.*s"
6809
msgstr "不能合并 %.*s"
6810
6359
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
6811
+#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641
6812
#, c-format
6813
msgid "could not copy '%s' to '%s'"
6814
msgstr "不能拷贝 '%s' 至 '%s'"
6815
6364
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
6365
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
6366
-msgid "could not read index"
6367
-msgstr "不能读取索引"
6368
-
6816
# 译者：注意保持前导空格
6370
-#: sequencer.c:3074
6817
+#: sequencer.c:3221
6818
#, c-format
6819
msgid ""
6820
"execution failed: %s\n"
@@ -6382,11 +6829,11 @@ msgstr ""
6829
" git rebase --continue\n"
6830
"\n"
6831
6385
-#: sequencer.c:3080
6832
+#: sequencer.c:3227
6833
msgid "and made changes to the index and/or the working tree\n"
6834
msgstr "并且修改索引和/或工作区\n"
6835
6389
-#: sequencer.c:3086
6836
+#: sequencer.c:3233
6837
#, c-format
6838
msgid ""
6839
"execution succeeded: %s\n"
@@ -6403,76 +6850,72 @@ msgstr ""
6850
" git rebase --continue\n"
6851
"\n"
6852
6406
-#: sequencer.c:3147
6853
+#: sequencer.c:3294
6854
#, c-format
6855
msgid "illegal label name: '%.*s'"
6856
msgstr "非法的标签名称：'%.*s'"
6857
6411
-#: sequencer.c:3201
6858
+#: sequencer.c:3348
6859
msgid "writing fake root commit"
6860
msgstr "写伪根提交"
6861
6415
-#: sequencer.c:3206
6862
+#: sequencer.c:3353
6863
msgid "writing squash-onto"
6864
msgstr "写入 squash-onto"
6865
6419
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
6866
+#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882
6867
#, c-format
6868
msgid "failed to find tree of %s"
6869
msgstr "无法找到 %s 指向的树。"
6870
6424
-#: sequencer.c:3262 builtin/rebase.c:874
6425
-msgid "could not write index"
6426
-msgstr "不能写入索引"
6427
-
6428
-#: sequencer.c:3289
6871
+#: sequencer.c:3436
6872
#, c-format
6873
msgid "could not resolve '%s'"
6874
msgstr "无法解析 '%s'"
6875
6433
-#: sequencer.c:3320
6876
+#: sequencer.c:3467
6877
msgid "cannot merge without a current revision"
6878
msgstr "没有当前版本不能合并"
6879
6437
-#: sequencer.c:3342
6880
+#: sequencer.c:3489
6881
#, c-format
6882
msgid "unable to parse '%.*s'"
6883
msgstr "无法解析 '%.*s'"
6884
6442
-#: sequencer.c:3351
6885
+#: sequencer.c:3498
6886
#, c-format
6887
msgid "nothing to merge: '%.*s'"
6888
msgstr "无可用合并：'%.*s'"
6889
6447
-#: sequencer.c:3363
6890
+#: sequencer.c:3510
6891
msgid "octopus merge cannot be executed on top of a [new root]"
6892
msgstr "章鱼合并不能在一个新的根提交上执行"
6893
6451
-#: sequencer.c:3378
6894
+#: sequencer.c:3526
6895
#, c-format
6896
msgid "could not get commit message of '%s'"
6897
msgstr "不能获取 '%s' 的提交说明"
6898
6456
-#: sequencer.c:3538
6899
+#: sequencer.c:3688
6900
#, c-format
6901
msgid "could not even attempt to merge '%.*s'"
6902
msgstr "甚至不能尝试合并 '%.*s'"
6903
6461
-#: sequencer.c:3554
6904
+#: sequencer.c:3704
6905
msgid "merge: Unable to write new index file"
6906
msgstr "合并：无法写入新索引文件"
6907
6465
-#: sequencer.c:3623 builtin/rebase.c:712
6908
+#: sequencer.c:3773 builtin/rebase.c:733
6909
#, c-format
6910
msgid "Applied autostash.\n"
6911
msgstr "已应用 autostash。\n"
6912
6470
-#: sequencer.c:3635
6913
+#: sequencer.c:3785
6914
#, c-format
6915
msgid "cannot store %s"
6916
msgstr "不能存储 %s"
6917
6475
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
6918
+#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113
6919
#, c-format
6920
msgid ""
6921
"Applying autostash resulted in conflicts.\n"
@@ -6483,31 +6926,31 @@ msgstr ""
6926
"您的修改安全地保存在贮藏区中。\n"
6927
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
6928
6486
-#: sequencer.c:3699
6929
+#: sequencer.c:3849
6930
#, c-format
6931
msgid "could not checkout %s"
6932
msgstr "不能检出 %s"
6933
6491
-#: sequencer.c:3713
6934
+#: sequencer.c:3863
6935
#, c-format
6936
msgid "%s: not a valid OID"
6937
msgstr "%s：不是一个有效的对象 ID"
6938
6496
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
6939
+#: sequencer.c:3868 git-rebase--preserve-merges.sh:779
6940
msgid "could not detach HEAD"
6941
msgstr "不能分离头指针"
6942
6500
-#: sequencer.c:3733
6943
+#: sequencer.c:3883
6944
#, c-format
6945
msgid "Stopped at HEAD\n"
6946
msgstr "停止在 HEAD\n"
6947
6505
-#: sequencer.c:3735
6948
+#: sequencer.c:3885
6949
#, c-format
6950
msgid "Stopped at %s\n"
6951
msgstr "停止在 %s\n"
6952
6510
-#: sequencer.c:3743
6953
+#: sequencer.c:3893
6954
#, c-format
6955
msgid ""
6956
"Could not execute the todo command\n"
@@ -6527,48 +6970,48 @@ msgstr ""
6970
" git rebase --edit-todo\n"
6971
" git rebase --continue\n"
6972
6530
-#: sequencer.c:3827
6973
+#: sequencer.c:3979
6974
#, c-format
6975
msgid "Stopped at %s... %.*s\n"
6976
msgstr "停止在 %s... %.*s\n"
6977
6535
-#: sequencer.c:3898
6978
+#: sequencer.c:4050
6979
#, c-format
6980
msgid "unknown command %d"
6981
msgstr "未知命令 %d"
6982
6540
-#: sequencer.c:3957
6983
+#: sequencer.c:4109
6984
msgid "could not read orig-head"
6985
msgstr "不能读取 orig-head"
6986
6544
-#: sequencer.c:3962
6987
+#: sequencer.c:4114
6988
msgid "could not read 'onto'"
6989
msgstr "不能读取 'onto'"
6990
6548
-#: sequencer.c:3976
6991
+#: sequencer.c:4128
6992
#, c-format
6993
msgid "could not update HEAD to %s"
6994
msgstr "不能更新 HEAD 为 %s"
6995
6553
-#: sequencer.c:4069
6996
+#: sequencer.c:4221
6997
msgid "cannot rebase: You have unstaged changes."
6998
msgstr "不能变基：您有未暂存的变更。"
6999
6557
-#: sequencer.c:4078
7000
+#: sequencer.c:4230
7001
msgid "cannot amend non-existing commit"
7002
msgstr "不能修补不存在的提交"
7003
6561
-#: sequencer.c:4080
7004
+#: sequencer.c:4232
7005
#, c-format
7006
msgid "invalid file: '%s'"
7007
msgstr "无效文件：'%s'"
7008
6566
-#: sequencer.c:4082
7009
+#: sequencer.c:4234
7010
#, c-format
7011
msgid "invalid contents: '%s'"
7012
msgstr "无效内容：'%s'"
7013
6571
-#: sequencer.c:4085
7014
+#: sequencer.c:4237
7015
msgid ""
7016
"\n"
7017
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6577,42 +7020,42 @@ msgstr ""
7020
"\n"
7021
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
7022
6580
-#: sequencer.c:4121 sequencer.c:4159
7023
+#: sequencer.c:4273 sequencer.c:4312
7024
#, c-format
7025
msgid "could not write file: '%s'"
7026
msgstr "不能写入文件：'%s'"
7027
6585
-#: sequencer.c:4174
7028
+#: sequencer.c:4327
7029
msgid "could not remove CHERRY_PICK_HEAD"
7030
msgstr "不能删除 CHERRY_PICK_HEAD"
7031
6589
-#: sequencer.c:4181
7032
+#: sequencer.c:4334
7033
msgid "could not commit staged changes."
7034
msgstr "不能提交暂存的修改。"
7035
6593
-#: sequencer.c:4285
7036
+#: sequencer.c:4440
7037
#, c-format
7038
msgid "%s: can't cherry-pick a %s"
7039
msgstr "%s：不能拣选一个%s"
7040
6598
-#: sequencer.c:4289
7041
+#: sequencer.c:4444
7042
#, c-format
7043
msgid "%s: bad revision"
7044
msgstr "%s：错误的版本"
7045
6603
-#: sequencer.c:4324
7046
+#: sequencer.c:4479
7047
msgid "can't revert as initial commit"
7048
msgstr "不能作为初始提交回退"
7049
6607
-#: sequencer.c:4774
7050
+#: sequencer.c:4952
7051
msgid "make_script: unhandled options"
7052
msgstr "make_script：有未能处理的选项"
7053
6611
-#: sequencer.c:4777
7054
+#: sequencer.c:4955
7055
msgid "make_script: error preparing revisions"
7056
msgstr "make_script：准备版本时错误"
7057
6615
-#: sequencer.c:4935
7058
+#: sequencer.c:5113
7059
msgid ""
7060
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
7061
"continue'.\n"
@@ -6621,15 +7064,15 @@ msgstr ""
7064
"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
7065
"或者您可以用 'git rebase --abort' 终止变基。\n"
7066
6624
-#: sequencer.c:5047 sequencer.c:5064
7067
+#: sequencer.c:5226 sequencer.c:5243
7068
msgid "nothing to do"
7069
msgstr "无事可做"
7070
6628
-#: sequencer.c:5078
7071
+#: sequencer.c:5257
7072
msgid "could not skip unnecessary pick commands"
7073
msgstr "无法跳过不必要的拣选"
7074
6632
-#: sequencer.c:5166
7075
+#: sequencer.c:5351
7076
msgid "the script was already rearranged."
7077
msgstr "脚本已经重新编排。"
7078
@@ -7125,6 +7568,11 @@ msgid_plural "%u bytes/s"
7568
msgstr[0] "%u 字节/秒"
7569
msgstr[1] "%u 字节/秒"
7570
7571
+#: strbuf.c:1149
7572
+#, c-format
7573
+msgid "could not edit '%s'"
7574
+msgstr "不能编辑 '%s'"
7575
+
7576
#: submodule.c:114 submodule.c:143
7577
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
7578
msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
@@ -7158,7 +7606,7 @@ msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
7606
msgid "submodule entry '%s' (%s) is a %s, not a commit"
7607
msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
7608
7161
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
7609
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016
7610
msgid "Failed to resolve HEAD as a valid ref."
7611
msgstr "无法将 HEAD 解析为有效引用。"
7612
@@ -7197,18 +7645,28 @@ msgstr "子模组 '%s' 中有脏索引"
7645
msgid "Submodule '%s' could not be updated."
7646
msgstr "子模组 '%s' 无法被更新。"
7647
7200
-#: submodule.c:2007
7648
+#: submodule.c:2027
7649
+#, c-format
7650
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
7651
+msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
7652
+
7653
+#: submodule.c:2048
7654
#, c-format
7655
msgid ""
7656
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
7657
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
7658
7206
-#: submodule.c:2019 submodule.c:2074
7659
+#: submodule.c:2060 submodule.c:2119
7660
#, c-format
7661
msgid "could not lookup name for submodule '%s'"
7662
msgstr "不能查询子模组 '%s' 的名称"
7663
7211
-#: submodule.c:2026
7664
+#: submodule.c:2064
7665
+#, c-format
7666
+msgid "refusing to move '%s' into an existing git dir"
7667
+msgstr "禁止移动 '%s' 到现存 git 目录中"
7668
+
7669
+#: submodule.c:2071
7670
#, c-format
7671
msgid ""
7672
"Migrating git directory of '%s%s' from\n"
@@ -7219,16 +7677,16 @@ msgstr ""
7677
"'%s' 迁移至\n"
7678
"'%s'\n"
7679
7222
-#: submodule.c:2109
7680
+#: submodule.c:2154
7681
#, c-format
7682
msgid "could not recurse into submodule '%s'"
7683
msgstr "无法递归进子模组路径 '%s'"
7684
7227
-#: submodule.c:2153
7685
+#: submodule.c:2198
7686
msgid "could not start ls-files in .."
7687
msgstr "无法在 .. 中启动 ls-files"
7688
7231
-#: submodule.c:2192
7689
+#: submodule.c:2237
7690
#, c-format
7691
msgid "ls-tree returned unexpected return code %d"
7692
msgstr "ls-tree 返回未知返回值 %d"
@@ -7247,12 +7705,12 @@ msgstr "submodule.fetchjobs 不允许为负值"
7705
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
7706
msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
7707
7250
-#: submodule-config.c:490
7708
+#: submodule-config.c:498
7709
#, c-format
7710
msgid "invalid value for %s"
7711
msgstr "%s 的值无效"
7712
7255
-#: submodule-config.c:761
7713
+#: submodule-config.c:769
7714
#, c-format
7715
msgid "Could not update .gitmodules entry %s"
7716
msgstr "不能更新 .gitmodules 条目 %s"
@@ -7398,7 +7856,7 @@ msgstr "正在终止。"
7856
msgid "failed to push all needed submodules"
7857
msgstr "不能推送全部需要的子模组"
7858
7401
-#: transport.c:1345 transport-helper.c:655
7859
+#: transport.c:1345 transport-helper.c:656
7860
msgid "operation not supported by protocol"
7861
msgstr "协议不支持该操作"
7862
@@ -7411,7 +7869,7 @@ msgstr "完整写入远程助手失败"
7869
msgid "unable to find remote helper for '%s'"
7870
msgstr "无法为 '%s' 找到远程助手"
7871
7414
-#: transport-helper.c:160 transport-helper.c:569
7872
+#: transport-helper.c:160 transport-helper.c:570
7873
msgid "can't dup helper output fd"
7874
msgstr "无法复制助手输出文件句柄"
7875
@@ -7436,90 +7894,90 @@ msgstr "%s 意外地说：'%s'"
7894
msgid "%s also locked %s"
7895
msgstr "%s 也锁定了 %s"
7896
7439
-#: transport-helper.c:491
7897
+#: transport-helper.c:492
7898
msgid "couldn't run fast-import"
7899
msgstr "不能执行 fast-import"
7900
7443
-#: transport-helper.c:514
7901
+#: transport-helper.c:515
7902
msgid "error while running fast-import"
7903
msgstr "执行 fast-import 出错"
7904
7447
-#: transport-helper.c:543 transport-helper.c:1132
7905
+#: transport-helper.c:544 transport-helper.c:1133
7906
#, c-format
7907
msgid "could not read ref %s"
7908
msgstr "无法读取引用 %s"
7909
7452
-#: transport-helper.c:588
7910
+#: transport-helper.c:589
7911
#, c-format
7912
msgid "unknown response to connect: %s"
7913
msgstr "连接时未知的响应：%s"
7914
7457
-#: transport-helper.c:610
7915
+#: transport-helper.c:611
7916
msgid "setting remote service path not supported by protocol"
7917
msgstr "协议不支持设置远程服务路径"
7918
7461
-#: transport-helper.c:612
7919
+#: transport-helper.c:613
7920
msgid "invalid remote service path"
7921
msgstr "无效的远程服务路径"
7922
7465
-#: transport-helper.c:658
7923
+#: transport-helper.c:659
7924
#, c-format
7925
msgid "can't connect to subservice %s"
7926
msgstr "不能连接到子服务 %s"
7927
7470
-#: transport-helper.c:734
7928
+#: transport-helper.c:735
7929
#, c-format
7930
msgid "expected ok/error, helper said '%s'"
7931
msgstr "预期 ok/error，助手说 '%s'"
7932
7475
-#: transport-helper.c:787
7933
+#: transport-helper.c:788
7934
#, c-format
7935
msgid "helper reported unexpected status of %s"
7936
msgstr "助手报告 %s 的意外状态"
7937
7480
-#: transport-helper.c:848
7938
+#: transport-helper.c:849
7939
#, c-format
7940
msgid "helper %s does not support dry-run"
7941
msgstr "助手 %s 不支持 dry-run"
7942
7485
-#: transport-helper.c:851
7943
+#: transport-helper.c:852
7944
#, c-format
7945
msgid "helper %s does not support --signed"
7946
msgstr "助手 %s 不支持 --signed"
7947
7490
-#: transport-helper.c:854
7948
+#: transport-helper.c:855
7949
#, c-format
7950
msgid "helper %s does not support --signed=if-asked"
7951
msgstr "助手 %s 不支持 --signed=if-asked"
7952
7495
-#: transport-helper.c:859
7953
+#: transport-helper.c:860
7954
#, c-format
7955
msgid "helper %s does not support --atomic"
7956
msgstr "助手 %s 不支持 --atomic"
7957
7500
-#: transport-helper.c:865
7958
+#: transport-helper.c:866
7959
#, c-format
7960
msgid "helper %s does not support 'push-option'"
7961
msgstr "助手 %s 不支持 'push-option'"
7962
7505
-#: transport-helper.c:963
7963
+#: transport-helper.c:964
7964
msgid "remote-helper doesn't support push; refspec needed"
7965
msgstr "remote-heper 不支持 push，需要引用表达式"
7966
7509
-#: transport-helper.c:968
7967
+#: transport-helper.c:969
7968
#, c-format
7969
msgid "helper %s does not support 'force'"
7970
msgstr "助手 %s 不支持 'force'"
7971
7514
-#: transport-helper.c:1015
7972
+#: transport-helper.c:1016
7973
msgid "couldn't run fast-export"
7974
msgstr "无法执行 fast-export"
7975
7518
-#: transport-helper.c:1020
7976
+#: transport-helper.c:1021
7977
msgid "error while running fast-export"
7978
msgstr "执行 fast-export 时出错"
7979
7522
-#: transport-helper.c:1045
7980
+#: transport-helper.c:1046
7981
#, c-format
7982
msgid ""
7983
"No refs in common and none specified; doing nothing.\n"
@@ -7528,47 +7986,47 @@ msgstr ""
7986
"没有共同的引用并且也没有指定，什么也不会做。\n"
7987
"可能您应该指定一个分支如 'master'。\n"
7988
7531
-#: transport-helper.c:1118
7989
+#: transport-helper.c:1119
7990
#, c-format
7991
msgid "malformed response in ref list: %s"
7992
msgstr "引用列表中格式错误的响应：%s"
7993
7536
-#: transport-helper.c:1270
7994
+#: transport-helper.c:1271
7995
#, c-format
7996
msgid "read(%s) failed"
7997
msgstr "读取（%s）失败"
7998
7541
-#: transport-helper.c:1297
7999
+#: transport-helper.c:1298
8000
#, c-format
8001
msgid "write(%s) failed"
8002
msgstr "写（%s）失败"
8003
7546
-#: transport-helper.c:1346
8004
+#: transport-helper.c:1347
8005
#, c-format
8006
msgid "%s thread failed"
8007
msgstr "%s 线程失败"
8008
7551
-#: transport-helper.c:1350
8009
+#: transport-helper.c:1351
8010
#, c-format
8011
msgid "%s thread failed to join: %s"
8012
msgstr "%s 线程等待失败：%s"
8013
7556
-#: transport-helper.c:1369 transport-helper.c:1373
8014
+#: transport-helper.c:1370 transport-helper.c:1374
8015
#, c-format
8016
msgid "can't start thread for copying data: %s"
8017
msgstr "不能启动线程来拷贝数据：%s"
8018
7561
-#: transport-helper.c:1410
8019
+#: transport-helper.c:1411
8020
#, c-format
8021
msgid "%s process failed to wait"
8022
msgstr "%s 进程等待失败"
8023
7566
-#: transport-helper.c:1414
8024
+#: transport-helper.c:1415
8025
#, c-format
8026
msgid "%s process failed"
8027
msgstr "%s 进程失败"
8028
7571
-#: transport-helper.c:1432 transport-helper.c:1441
8029
+#: transport-helper.c:1433 transport-helper.c:1442
8030
msgid "can't start thread for copying data"
8031
msgstr "不能启动线程来拷贝数据"
8032
@@ -7584,7 +8042,12 @@ msgstr "树对象中的条目模式错误"
8042
msgid "empty filename in tree entry"
8043
msgstr "树对象条目中空的文件名"
8044
7587
-#: tree-walk.c:118
8045
+#: tree-walk.c:48
8046
+#, c-format
8047
+msgid "filename in tree entry contains backslash: '%s'"
8048
+msgstr "树条目中的文件名包含反斜杠：'%s'"
8049
+
8050
+#: tree-walk.c:124
8051
msgid "too-short tree file"
8052
msgstr "太短的树文件"
8053
@@ -7822,6 +8285,10 @@ msgstr ""
8285
"以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
8286
"并且碰撞组中只有一个文件存在工作区中：\n"
8287
8288
+#: unpack-trees.c:1441
8289
+msgid "Updating index flags"
8290
+msgstr "正在更新索引标志"
8291
+
8292
#: urlmatch.c:163
8293
msgid "invalid URL scheme name or missing '://' suffix"
8294
msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
@@ -8439,131 +8906,131 @@ msgstr "另外，您的索引中包含未提交的变更。"
8906
msgid "cannot %s: Your index contains uncommitted changes."
8907
msgstr "不能%s：您的索引中包含未提交的变更。"
8908
8442
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
8909
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
8910
#, c-format
8911
msgid "failed to unlink '%s'"
8912
msgstr "删除 '%s' 失败"
8913
8447
-#: builtin/add.c:25
8914
+#: builtin/add.c:26
8915
msgid "git add [<options>] [--] <pathspec>..."
8916
msgstr "git add [<选项>] [--] <路径规格>..."
8917
8451
-#: builtin/add.c:84
8918
+#: builtin/add.c:87
8919
#, c-format
8920
msgid "unexpected diff status %c"
8921
msgstr "意外的差异状态 %c"
8922
8456
-#: builtin/add.c:89 builtin/commit.c:288
8923
+#: builtin/add.c:92 builtin/commit.c:288
8924
msgid "updating files failed"
8925
msgstr "更新文件失败"
8926
8460
-#: builtin/add.c:99
8927
+#: builtin/add.c:102
8928
#, c-format
8929
msgid "remove '%s'\n"
8930
msgstr "删除 '%s'\n"
8931
8465
-#: builtin/add.c:174
8932
+#: builtin/add.c:177
8933
msgid "Unstaged changes after refreshing the index:"
8934
msgstr "刷新索引之后尚未被暂存的变更："
8935
8469
-#: builtin/add.c:234 builtin/rev-parse.c:897
8936
+#: builtin/add.c:252 builtin/rev-parse.c:899
8937
msgid "Could not read the index"
8938
msgstr "不能读取索引"
8939
8473
-#: builtin/add.c:245
8940
+#: builtin/add.c:263
8941
#, c-format
8942
msgid "Could not open '%s' for writing."
8943
msgstr "无法为写入打开 '%s'。"
8944
8478
-#: builtin/add.c:249
8945
+#: builtin/add.c:267
8946
msgid "Could not write patch"
8947
msgstr "不能生成补丁"
8948
8482
-#: builtin/add.c:252
8949
+#: builtin/add.c:270
8950
msgid "editing patch failed"
8951
msgstr "编辑补丁失败"
8952
8486
-#: builtin/add.c:255
8953
+#: builtin/add.c:273
8954
#, c-format
8955
msgid "Could not stat '%s'"
8956
msgstr "不能对 '%s' 调用 stat"
8957
8491
-#: builtin/add.c:257
8958
+#: builtin/add.c:275
8959
msgid "Empty patch. Aborted."
8960
msgstr "空补丁。异常终止。"
8961
8495
-#: builtin/add.c:262
8962
+#: builtin/add.c:280
8963
#, c-format
8964
msgid "Could not apply '%s'"
8965
msgstr "不能应用 '%s'"
8966
8500
-#: builtin/add.c:270
8967
+#: builtin/add.c:288
8968
msgid "The following paths are ignored by one of your .gitignore files:\n"
8969
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
8970
8504
-#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
8505
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
8506
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
8971
+#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
8972
+#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548
8973
+#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165
8974
msgid "dry run"
8975
msgstr "演习"
8976
8510
-#: builtin/add.c:293
8977
+#: builtin/add.c:311
8978
msgid "interactive picking"
8979
msgstr "交互式拣选"
8980
8514
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
8981
+#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307
8982
msgid "select hunks interactively"
8983
msgstr "交互式挑选数据块"
8984
8518
-#: builtin/add.c:295
8985
+#: builtin/add.c:313
8986
msgid "edit current diff and apply"
8987
msgstr "编辑当前差异并应用"
8988
8522
-#: builtin/add.c:296
8989
+#: builtin/add.c:314
8990
msgid "allow adding otherwise ignored files"
8991
msgstr "允许添加忽略的文件"
8992
8526
-#: builtin/add.c:297
8993
+#: builtin/add.c:315
8994
msgid "update tracked files"
8995
msgstr "更新已跟踪的文件"
8996
8530
-#: builtin/add.c:298
8997
+#: builtin/add.c:316
8998
msgid "renormalize EOL of tracked files (implies -u)"
8999
msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
9000
8534
-#: builtin/add.c:299
9001
+#: builtin/add.c:317
This file is too large to show in full.