l10n: git.pot: v2.28.0 round 1 (70 new, 14 removed)
Generate po/git.pot from v2.28.0-rc0 for git v2.28.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Jul 10, 2020 at 09:54 UTC
d84f4abf5fefc629065890b216fa2f004bab4c4f
1 file changed
+1350
-1102
po/git.pot
+1350
-1102
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: PACKAGE VERSION\n"
10
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11
-"POT-Creation-Date: 2020-05-27 07:23+0800\n"
11
+"POT-Creation-Date: 2020-07-10 09:53+0800\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -111,21 +111,21 @@ msgstr[1] ""
111
msgid "ignoring unmerged: %s"
112
msgstr ""
113
114
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
114
+#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368
115
#, c-format
116
msgid "Only binary files changed.\n"
117
msgstr ""
118
119
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
119
+#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370
120
#, c-format
121
msgid "No changes.\n"
122
msgstr ""
123
124
-#: add-interactive.c:935 git-add--interactive.perl:1376
124
+#: add-interactive.c:935 git-add--interactive.perl:1378
125
msgid "Patch update"
126
msgstr ""
127
128
-#: add-interactive.c:974 git-add--interactive.perl:1754
128
+#: add-interactive.c:974 git-add--interactive.perl:1771
129
msgid "Review diff"
130
msgstr ""
131
@@ -193,11 +193,11 @@ msgstr ""
193
msgid "(empty) select nothing"
194
msgstr ""
195
196
-#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
196
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868
197
msgid "*** Commands ***"
198
msgstr ""
199
200
-#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
200
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865
201
msgid "What now"
202
msgstr ""
203
@@ -214,7 +214,7 @@ msgstr ""
214
#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
215
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
216
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
217
-#: builtin/submodule--helper.c:2148 bugreport.c:129
217
+#: builtin/submodule--helper.c:2148 bugreport.c:135
218
#: git-add--interactive.perl:213
219
msgid "path"
220
msgstr ""
@@ -223,33 +223,38 @@ msgstr ""
223
msgid "could not refresh index"
224
msgstr ""
225
226
-#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
226
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782
227
#, c-format
228
msgid "Bye.\n"
229
msgstr ""
230
231
-#: add-patch.c:34 git-add--interactive.perl:1428
231
+#: add-patch.c:34 git-add--interactive.perl:1430
232
#, c-format, perl-format
233
msgid "Stage mode change [y,n,q,a,d%s,?]? "
234
msgstr ""
235
236
-#: add-patch.c:35 git-add--interactive.perl:1429
236
+#: add-patch.c:35 git-add--interactive.perl:1431
237
#, c-format, perl-format
238
msgid "Stage deletion [y,n,q,a,d%s,?]? "
239
msgstr ""
240
241
-#: add-patch.c:36 git-add--interactive.perl:1430
241
+#: add-patch.c:36 git-add--interactive.perl:1432
242
+#, c-format, perl-format
243
+msgid "Stage addition [y,n,q,a,d%s,?]? "
244
+msgstr ""
245
+
246
+#: add-patch.c:37 git-add--interactive.perl:1433
247
#, c-format, perl-format
248
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
249
msgstr ""
250
246
-#: add-patch.c:38
251
+#: add-patch.c:39
252
msgid ""
253
"If the patch applies cleanly, the edited hunk will immediately be marked for "
254
"staging."
255
msgstr ""
256
252
-#: add-patch.c:41
257
+#: add-patch.c:42
258
msgid ""
259
"y - stage this hunk\n"
260
"n - do not stage this hunk\n"
@@ -258,28 +263,33 @@ msgid ""
263
"d - do not stage this hunk or any of the later hunks in the file\n"
264
msgstr ""
265
261
-#: add-patch.c:55 git-add--interactive.perl:1433
266
+#: add-patch.c:56 git-add--interactive.perl:1436
267
#, c-format, perl-format
268
msgid "Stash mode change [y,n,q,a,d%s,?]? "
269
msgstr ""
270
266
-#: add-patch.c:56 git-add--interactive.perl:1434
271
+#: add-patch.c:57 git-add--interactive.perl:1437
272
#, c-format, perl-format
273
msgid "Stash deletion [y,n,q,a,d%s,?]? "
274
msgstr ""
275
271
-#: add-patch.c:57 git-add--interactive.perl:1435
276
+#: add-patch.c:58 git-add--interactive.perl:1438
277
+#, c-format, perl-format
278
+msgid "Stash addition [y,n,q,a,d%s,?]? "
279
+msgstr ""
280
+
281
+#: add-patch.c:59 git-add--interactive.perl:1439
282
#, c-format, perl-format
283
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
284
msgstr ""
285
276
-#: add-patch.c:59
286
+#: add-patch.c:61
287
msgid ""
288
"If the patch applies cleanly, the edited hunk will immediately be marked for "
289
"stashing."
290
msgstr ""
291
282
-#: add-patch.c:62
292
+#: add-patch.c:64
293
msgid ""
294
"y - stash this hunk\n"
295
"n - do not stash this hunk\n"
@@ -288,28 +298,33 @@ msgid ""
298
"d - do not stash this hunk or any of the later hunks in the file\n"
299
msgstr ""
300
291
-#: add-patch.c:78 git-add--interactive.perl:1438
301
+#: add-patch.c:80 git-add--interactive.perl:1442
302
#, c-format, perl-format
303
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
304
msgstr ""
305
296
-#: add-patch.c:79 git-add--interactive.perl:1439
306
+#: add-patch.c:81 git-add--interactive.perl:1443
307
#, c-format, perl-format
308
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
309
msgstr ""
310
301
-#: add-patch.c:80 git-add--interactive.perl:1440
311
+#: add-patch.c:82 git-add--interactive.perl:1444
312
+#, c-format, perl-format
313
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
314
+msgstr ""
315
+
316
+#: add-patch.c:83 git-add--interactive.perl:1445
317
#, c-format, perl-format
318
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
319
msgstr ""
320
306
-#: add-patch.c:82
321
+#: add-patch.c:85
322
msgid ""
323
"If the patch applies cleanly, the edited hunk will immediately be marked for "
324
"unstaging."
325
msgstr ""
326
312
-#: add-patch.c:85
327
+#: add-patch.c:88
328
msgid ""
329
"y - unstage this hunk\n"
330
"n - do not unstage this hunk\n"
@@ -318,28 +333,33 @@ msgid ""
333
"d - do not unstage this hunk or any of the later hunks in the file\n"
334
msgstr ""
335
321
-#: add-patch.c:100 git-add--interactive.perl:1443
336
+#: add-patch.c:103 git-add--interactive.perl:1448
337
#, c-format, perl-format
338
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
339
msgstr ""
340
326
-#: add-patch.c:101 git-add--interactive.perl:1444
341
+#: add-patch.c:104 git-add--interactive.perl:1449
342
#, c-format, perl-format
343
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
344
msgstr ""
345
331
-#: add-patch.c:102 git-add--interactive.perl:1445
346
+#: add-patch.c:105 git-add--interactive.perl:1450
347
+#, c-format, perl-format
348
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
349
+msgstr ""
350
+
351
+#: add-patch.c:106 git-add--interactive.perl:1451
352
#, c-format, perl-format
353
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
354
msgstr ""
355
336
-#: add-patch.c:104 add-patch.c:169 add-patch.c:212
356
+#: add-patch.c:108 add-patch.c:176 add-patch.c:221
357
msgid ""
358
"If the patch applies cleanly, the edited hunk will immediately be marked for "
359
"applying."
360
msgstr ""
361
342
-#: add-patch.c:107
362
+#: add-patch.c:111
363
msgid ""
364
"y - apply this hunk to index\n"
365
"n - do not apply this hunk to index\n"
@@ -348,31 +368,37 @@ msgid ""
368
"d - do not apply this hunk or any of the later hunks in the file\n"
369
msgstr ""
370
351
-#: add-patch.c:122 git-add--interactive.perl:1448
352
-#: git-add--interactive.perl:1463
371
+#: add-patch.c:126 git-add--interactive.perl:1454
372
+#: git-add--interactive.perl:1472
373
#, c-format, perl-format
374
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
375
msgstr ""
376
357
-#: add-patch.c:123 git-add--interactive.perl:1449
358
-#: git-add--interactive.perl:1464
377
+#: add-patch.c:127 git-add--interactive.perl:1455
378
+#: git-add--interactive.perl:1473
379
#, c-format, perl-format
380
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
381
msgstr ""
382
363
-#: add-patch.c:124 git-add--interactive.perl:1450
364
-#: git-add--interactive.perl:1465
383
+#: add-patch.c:128 git-add--interactive.perl:1456
384
+#: git-add--interactive.perl:1474
385
+#, c-format, perl-format
386
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
387
+msgstr ""
388
+
389
+#: add-patch.c:129 git-add--interactive.perl:1457
390
+#: git-add--interactive.perl:1475
391
#, c-format, perl-format
392
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
393
msgstr ""
394
369
-#: add-patch.c:126 add-patch.c:148 add-patch.c:191
395
+#: add-patch.c:131 add-patch.c:154 add-patch.c:199
396
msgid ""
397
"If the patch applies cleanly, the edited hunk will immediately be marked for "
398
"discarding."
399
msgstr ""
400
375
-#: add-patch.c:129 add-patch.c:194
401
+#: add-patch.c:134 add-patch.c:202
402
msgid ""
403
"y - discard this hunk from worktree\n"
404
"n - do not discard this hunk from worktree\n"
@@ -381,22 +407,27 @@ msgid ""
407
"d - do not discard this hunk or any of the later hunks in the file\n"
408
msgstr ""
409
384
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
410
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460
411
#, c-format, perl-format
412
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
413
msgstr ""
414
389
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
415
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461
416
#, c-format, perl-format
417
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
418
msgstr ""
419
394
-#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
420
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462
421
+#, c-format, perl-format
422
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
423
+msgstr ""
424
+
425
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463
426
#, c-format, perl-format
427
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
428
msgstr ""
429
399
-#: add-patch.c:151
430
+#: add-patch.c:157
431
msgid ""
432
"y - discard this hunk from index and worktree\n"
433
"n - do not discard this hunk from index and worktree\n"
@@ -405,22 +436,27 @@ msgid ""
436
"d - do not discard this hunk or any of the later hunks in the file\n"
437
msgstr ""
438
408
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
439
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466
440
#, c-format, perl-format
441
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
442
msgstr ""
443
413
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
444
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467
445
#, c-format, perl-format
446
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
447
msgstr ""
448
418
-#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
449
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468
450
+#, c-format, perl-format
451
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
452
+msgstr ""
453
+
454
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469
455
#, c-format, perl-format
456
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
457
msgstr ""
458
423
-#: add-patch.c:172
459
+#: add-patch.c:179
460
msgid ""
461
"y - apply this hunk to index and worktree\n"
462
"n - do not apply this hunk to index and worktree\n"
@@ -429,7 +465,7 @@ msgid ""
465
"d - do not apply this hunk or any of the later hunks in the file\n"
466
msgstr ""
467
432
-#: add-patch.c:215
468
+#: add-patch.c:224
469
msgid ""
470
"y - apply this hunk to worktree\n"
471
"n - do not apply this hunk to worktree\n"
@@ -438,47 +474,47 @@ msgid ""
474
"d - do not apply this hunk or any of the later hunks in the file\n"
475
msgstr ""
476
441
-#: add-patch.c:319
477
+#: add-patch.c:328
478
#, c-format
479
msgid "could not parse hunk header '%.*s'"
480
msgstr ""
481
446
-#: add-patch.c:338 add-patch.c:342
482
+#: add-patch.c:347 add-patch.c:351
483
#, c-format
484
msgid "could not parse colored hunk header '%.*s'"
485
msgstr ""
486
451
-#: add-patch.c:396
487
+#: add-patch.c:405
488
msgid "could not parse diff"
489
msgstr ""
490
455
-#: add-patch.c:415
491
+#: add-patch.c:424
492
msgid "could not parse colored diff"
493
msgstr ""
494
459
-#: add-patch.c:429
495
+#: add-patch.c:438
496
#, c-format
497
msgid "failed to run '%s'"
498
msgstr ""
499
464
-#: add-patch.c:588
500
+#: add-patch.c:602
501
msgid "mismatched output from interactive.diffFilter"
502
msgstr ""
503
468
-#: add-patch.c:589
504
+#: add-patch.c:603
505
msgid ""
506
"Your filter must maintain a one-to-one correspondence\n"
507
"between its input and output lines."
508
msgstr ""
509
474
-#: add-patch.c:762
510
+#: add-patch.c:776
511
#, c-format
512
msgid ""
513
"expected context line #%d in\n"
514
"%.*s"
515
msgstr ""
516
481
-#: add-patch.c:777
517
+#: add-patch.c:791
518
#, c-format
519
msgid ""
520
"hunks do not overlap:\n"
@@ -487,11 +523,11 @@ msgid ""
523
"%.*s"
524
msgstr ""
525
490
-#: add-patch.c:1053 git-add--interactive.perl:1112
526
+#: add-patch.c:1067 git-add--interactive.perl:1114
527
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
528
msgstr ""
529
494
-#: add-patch.c:1057
530
+#: add-patch.c:1071
531
#, c-format
532
msgid ""
533
"---\n"
@@ -501,18 +537,18 @@ msgid ""
537
msgstr ""
538
539
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
504
-#: add-patch.c:1071 git-add--interactive.perl:1126
540
+#: add-patch.c:1085 git-add--interactive.perl:1128
541
msgid ""
542
"If it does not apply cleanly, you will be given an opportunity to\n"
543
"edit again. If all lines of the hunk are removed, then the edit is\n"
544
"aborted and the hunk is left unchanged.\n"
545
msgstr ""
546
511
-#: add-patch.c:1104
547
+#: add-patch.c:1118
548
msgid "could not parse hunk header"
549
msgstr ""
550
515
-#: add-patch.c:1149
551
+#: add-patch.c:1163
552
msgid "'git apply --cached' failed"
553
msgstr ""
554
@@ -528,24 +564,24 @@ msgstr ""
564
#. Consider translating (saying "no" discards!) as
565
#. (saying "n" for "no" discards!) if the translation
566
#. of the word "no" does not start with n.
531
-#: add-patch.c:1218 git-add--interactive.perl:1239
567
+#: add-patch.c:1232 git-add--interactive.perl:1241
568
msgid ""
569
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
570
msgstr ""
571
536
-#: add-patch.c:1261
572
+#: add-patch.c:1275
573
msgid "The selected hunks do not apply to the index!"
574
msgstr ""
575
540
-#: add-patch.c:1262 git-add--interactive.perl:1343
576
+#: add-patch.c:1276 git-add--interactive.perl:1345
577
msgid "Apply them to the worktree anyway? "
578
msgstr ""
579
544
-#: add-patch.c:1269 git-add--interactive.perl:1346
580
+#: add-patch.c:1283 git-add--interactive.perl:1348
581
msgid "Nothing was applied.\n"
582
msgstr ""
583
548
-#: add-patch.c:1326
584
+#: add-patch.c:1340
585
msgid ""
586
"j - leave this hunk undecided, see next undecided hunk\n"
587
"J - leave this hunk undecided, see next hunk\n"
@@ -558,69 +594,69 @@ msgid ""
594
"? - print help\n"
595
msgstr ""
596
561
-#: add-patch.c:1447 add-patch.c:1457
597
+#: add-patch.c:1463 add-patch.c:1473
598
msgid "No previous hunk"
599
msgstr ""
600
565
-#: add-patch.c:1452 add-patch.c:1462
601
+#: add-patch.c:1468 add-patch.c:1478
602
msgid "No next hunk"
603
msgstr ""
604
569
-#: add-patch.c:1468
605
+#: add-patch.c:1484
606
msgid "No other hunks to goto"
607
msgstr ""
608
573
-#: add-patch.c:1479 git-add--interactive.perl:1577
609
+#: add-patch.c:1495 git-add--interactive.perl:1594
610
msgid "go to which hunk (<ret> to see more)? "
611
msgstr ""
612
577
-#: add-patch.c:1480 git-add--interactive.perl:1579
613
+#: add-patch.c:1496 git-add--interactive.perl:1596
614
msgid "go to which hunk? "
615
msgstr ""
616
581
-#: add-patch.c:1491
617
+#: add-patch.c:1507
618
#, c-format
619
msgid "Invalid number: '%s'"
620
msgstr ""
621
586
-#: add-patch.c:1496
622
+#: add-patch.c:1512
623
#, c-format
624
msgid "Sorry, only %d hunk available."
625
msgid_plural "Sorry, only %d hunks available."
626
msgstr[0] ""
627
msgstr[1] ""
628
593
-#: add-patch.c:1505
629
+#: add-patch.c:1521
630
msgid "No other hunks to search"
631
msgstr ""
632
597
-#: add-patch.c:1511 git-add--interactive.perl:1623
633
+#: add-patch.c:1527 git-add--interactive.perl:1640
634
msgid "search for regex? "
635
msgstr ""
636
601
-#: add-patch.c:1526
637
+#: add-patch.c:1542
638
#, c-format
639
msgid "Malformed search regexp %s: %s"
640
msgstr ""
641
606
-#: add-patch.c:1543
642
+#: add-patch.c:1559
643
msgid "No hunk matches the given pattern"
644
msgstr ""
645
610
-#: add-patch.c:1550
646
+#: add-patch.c:1566
647
msgid "Sorry, cannot split this hunk"
648
msgstr ""
649
614
-#: add-patch.c:1554
650
+#: add-patch.c:1570
651
#, c-format
652
msgid "Split into %d hunks."
653
msgstr ""
654
619
-#: add-patch.c:1558
655
+#: add-patch.c:1574
656
msgid "Sorry, cannot edit this hunk"
657
msgstr ""
658
623
-#: add-patch.c:1609
659
+#: add-patch.c:1625
660
msgid "'git apply' failed"
661
msgstr ""
662
@@ -1270,7 +1306,7 @@ msgstr ""
1306
1307
#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
1308
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1273
-#: builtin/pack-objects.c:3458 builtin/rebase.c:1332
1309
+#: builtin/pack-objects.c:3530 builtin/rebase.c:1332
1310
msgid "action"
1311
msgstr ""
1312
@@ -1359,7 +1395,7 @@ msgstr ""
1395
msgid "path too long (%d chars, SHA1: %s): %s"
1396
msgstr ""
1397
1362
-#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
1398
+#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246
1399
#, c-format
1400
msgid "deflate error (%d)"
1401
msgstr ""
@@ -1427,8 +1463,8 @@ msgid "prepend prefix to each pathname in the archive"
1463
msgstr ""
1464
1465
#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1430
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
1431
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
1466
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208
1467
+#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907
1468
#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
1469
#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
1470
#: parse-options.h:190
@@ -1636,10 +1672,10 @@ msgstr ""
1672
msgid "--reverse and --first-parent together require specified latest commit"
1673
msgstr ""
1674
1639
-#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
1675
+#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
1676
#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
1677
#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
1642
-#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
1678
+#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363
1679
#: builtin/shortlog.c:192
1680
msgid "revision walk setup failed"
1681
msgstr ""
@@ -1783,84 +1819,88 @@ msgstr ""
1819
msgid "HEAD of working tree %s is not updated"
1820
msgstr ""
1821
1786
-#: bundle.c:36
1822
+#: bundle.c:47
1823
#, c-format
1824
msgid "'%s' does not look like a v2 bundle file"
1825
msgstr ""
1826
1791
-#: bundle.c:64
1827
+#: bundle.c:69
1828
+msgid "unknown hash algorithm length"
1829
+msgstr ""
1830
+
1831
+#: bundle.c:84
1832
#, c-format
1833
msgid "unrecognized header: %s%s (%d)"
1834
msgstr ""
1835
1796
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
1836
+#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
1837
#: builtin/commit.c:814
1838
#, c-format
1839
msgid "could not open '%s'"
1840
msgstr ""
1841
1802
-#: bundle.c:143
1842
+#: bundle.c:163
1843
msgid "Repository lacks these prerequisite commits:"
1844
msgstr ""
1845
1806
-#: bundle.c:146
1846
+#: bundle.c:166
1847
msgid "need a repository to verify a bundle"
1848
msgstr ""
1849
1810
-#: bundle.c:197
1850
+#: bundle.c:217
1851
#, c-format
1852
msgid "The bundle contains this ref:"
1853
msgid_plural "The bundle contains these %d refs:"
1854
msgstr[0] ""
1855
msgstr[1] ""
1856
1817
-#: bundle.c:204
1857
+#: bundle.c:224
1858
msgid "The bundle records a complete history."
1859
msgstr ""
1860
1821
-#: bundle.c:206
1861
+#: bundle.c:226
1862
#, c-format
1863
msgid "The bundle requires this ref:"
1864
msgid_plural "The bundle requires these %d refs:"
1865
msgstr[0] ""
1866
msgstr[1] ""
1867
1828
-#: bundle.c:273
1868
+#: bundle.c:293
1869
msgid "unable to dup bundle descriptor"
1870
msgstr ""
1871
1832
-#: bundle.c:280
1872
+#: bundle.c:300
1873
msgid "Could not spawn pack-objects"
1874
msgstr ""
1875
1836
-#: bundle.c:291
1876
+#: bundle.c:311
1877
msgid "pack-objects died"
1878
msgstr ""
1879
1840
-#: bundle.c:333
1880
+#: bundle.c:353
1881
msgid "rev-list died"
1882
msgstr ""
1883
1844
-#: bundle.c:382
1884
+#: bundle.c:402
1885
#, c-format
1886
msgid "ref '%s' is excluded by the rev-list options"
1887
msgstr ""
1888
1849
-#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
1889
+#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
1890
#, c-format
1891
msgid "unrecognized argument: %s"
1892
msgstr ""
1893
1854
-#: bundle.c:469
1894
+#: bundle.c:489
1895
msgid "Refusing to create empty bundle."
1896
msgstr ""
1897
1858
-#: bundle.c:479
1898
+#: bundle.c:499
1899
#, c-format
1900
msgid "cannot create '%s'"
1901
msgstr ""
1902
1863
-#: bundle.c:504
1903
+#: bundle.c:524
1904
msgid "index-pack died"
1905
msgstr ""
1906
@@ -1869,269 +1909,261 @@ msgstr ""
1909
msgid "invalid color value: %.*s"
1910
msgstr ""
1911
1872
-#: commit-graph.c:183
1912
+#: commit-graph.c:238
1913
msgid "commit-graph file is too small"
1914
msgstr ""
1915
1876
-#: commit-graph.c:248
1916
+#: commit-graph.c:303
1917
#, c-format
1918
msgid "commit-graph signature %X does not match signature %X"
1919
msgstr ""
1920
1881
-#: commit-graph.c:255
1921
+#: commit-graph.c:310
1922
#, c-format
1923
msgid "commit-graph version %X does not match version %X"
1924
msgstr ""
1925
1886
-#: commit-graph.c:262
1926
+#: commit-graph.c:317
1927
#, c-format
1928
msgid "commit-graph hash version %X does not match version %X"
1929
msgstr ""
1930
1891
-#: commit-graph.c:284
1931
+#: commit-graph.c:339
1932
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
1933
msgstr ""
1934
1895
-#: commit-graph.c:294
1935
+#: commit-graph.c:349
1936
#, c-format
1937
msgid "commit-graph improper chunk offset %08x%08x"
1938
msgstr ""
1939
1900
-#: commit-graph.c:362
1940
+#: commit-graph.c:417
1941
#, c-format
1942
msgid "commit-graph chunk id %08x appears multiple times"
1943
msgstr ""
1944
1905
-#: commit-graph.c:436
1945
+#: commit-graph.c:491
1946
msgid "commit-graph has no base graphs chunk"
1947
msgstr ""
1948
1909
-#: commit-graph.c:446
1949
+#: commit-graph.c:501
1950
msgid "commit-graph chain does not match"
1951
msgstr ""
1952
1913
-#: commit-graph.c:494
1953
+#: commit-graph.c:549
1954
#, c-format
1955
msgid "invalid commit-graph chain: line '%s' not a hash"
1956
msgstr ""
1957
1918
-#: commit-graph.c:518
1958
+#: commit-graph.c:573
1959
msgid "unable to find all commit-graph files"
1960
msgstr ""
1961
1922
-#: commit-graph.c:651 commit-graph.c:711
1962
+#: commit-graph.c:706 commit-graph.c:770
1963
msgid "invalid commit position. commit-graph is likely corrupt"
1964
msgstr ""
1965
1926
-#: commit-graph.c:672
1966
+#: commit-graph.c:727
1967
#, c-format
1968
msgid "could not find commit %s"
1969
msgstr ""
1970
1931
-#: commit-graph.c:948 builtin/am.c:1292
1971
+#: commit-graph.c:1009 builtin/am.c:1292
1972
#, c-format
1973
msgid "unable to parse commit %s"
1974
msgstr ""
1975
1936
-#: commit-graph.c:1096
1976
+#: commit-graph.c:1157
1977
msgid "Writing changed paths Bloom filters index"
1978
msgstr ""
1979
1940
-#: commit-graph.c:1121
1980
+#: commit-graph.c:1182
1981
msgid "Writing changed paths Bloom filters data"
1982
msgstr ""
1983
1944
-#: commit-graph.c:1160 builtin/pack-objects.c:2783
1984
+#: commit-graph.c:1221 builtin/pack-objects.c:2832
1985
#, c-format
1986
msgid "unable to get type of object %s"
1987
msgstr ""
1988
1949
-#: commit-graph.c:1196
1989
+#: commit-graph.c:1257
1990
msgid "Loading known commits in commit graph"
1991
msgstr ""
1992
1953
-#: commit-graph.c:1213
1993
+#: commit-graph.c:1274
1994
msgid "Expanding reachable commits in commit graph"
1995
msgstr ""
1996
1957
-#: commit-graph.c:1233
1997
+#: commit-graph.c:1294
1998
msgid "Clearing commit marks in commit graph"
1999
msgstr ""
2000
1961
-#: commit-graph.c:1252
2001
+#: commit-graph.c:1313
2002
msgid "Computing commit graph generation numbers"
2003
msgstr ""
2004
1965
-#: commit-graph.c:1300
2005
+#: commit-graph.c:1367
2006
msgid "Computing commit changed paths Bloom filters"
2007
msgstr ""
2008
1969
-#: commit-graph.c:1359
2009
+#: commit-graph.c:1423
2010
+msgid "Collecting referenced commits"
2011
+msgstr ""
2012
+
2013
+#: commit-graph.c:1447
2014
#, c-format
2015
msgid "Finding commits for commit graph in %d pack"
2016
msgid_plural "Finding commits for commit graph in %d packs"
2017
msgstr[0] ""
2018
msgstr[1] ""
2019
1976
-#: commit-graph.c:1372
2020
+#: commit-graph.c:1460
2021
#, c-format
2022
msgid "error adding pack %s"
2023
msgstr ""
2024
1981
-#: commit-graph.c:1376
2025
+#: commit-graph.c:1464
2026
#, c-format
2027
msgid "error opening index for %s"
2028
msgstr ""
2029
1986
-#: commit-graph.c:1405
1987
-#, c-format
1988
-msgid "Finding commits for commit graph from %d ref"
1989
-msgid_plural "Finding commits for commit graph from %d refs"
1990
-msgstr[0] ""
1991
-msgstr[1] ""
1992
-
1993
-#: commit-graph.c:1426
1994
-#, c-format
1995
-msgid "invalid commit object id: %s"
1996
-msgstr ""
1997
-
1998
-#: commit-graph.c:1442
2030
+#: commit-graph.c:1503
2031
msgid "Finding commits for commit graph among packed objects"
2032
msgstr ""
2033
2002
-#: commit-graph.c:1457
2034
+#: commit-graph.c:1518
2035
msgid "Counting distinct commits in commit graph"
2036
msgstr ""
2037
2006
-#: commit-graph.c:1489
2038
+#: commit-graph.c:1550
2039
msgid "Finding extra edges in commit graph"
2040
msgstr ""
2041
2010
-#: commit-graph.c:1538
2042
+#: commit-graph.c:1599
2043
msgid "failed to write correct number of base graph ids"
2044
msgstr ""
2045
2014
-#: commit-graph.c:1572 midx.c:812
2046
+#: commit-graph.c:1633 midx.c:812
2047
#, c-format
2048
msgid "unable to create leading directories of %s"
2049
msgstr ""
2050
2019
-#: commit-graph.c:1585
2051
+#: commit-graph.c:1646
2052
msgid "unable to create temporary graph layer"
2053
msgstr ""
2054
2023
-#: commit-graph.c:1590
2055
+#: commit-graph.c:1651
2056
#, c-format
2057
msgid "unable to adjust shared permissions for '%s'"
2058
msgstr ""
2059
2028
-#: commit-graph.c:1667
2060
+#: commit-graph.c:1728
2061
#, c-format
2062
msgid "Writing out commit graph in %d pass"
2063
msgid_plural "Writing out commit graph in %d passes"
2064
msgstr[0] ""
2065
msgstr[1] ""
2066
2035
-#: commit-graph.c:1712
2067
+#: commit-graph.c:1773
2068
msgid "unable to open commit-graph chain file"
2069
msgstr ""
2070
2039
-#: commit-graph.c:1728
2071
+#: commit-graph.c:1789
2072
msgid "failed to rename base commit-graph file"
2073
msgstr ""
2074
2043
-#: commit-graph.c:1748
2075
+#: commit-graph.c:1809
2076
msgid "failed to rename temporary commit-graph file"
2077
msgstr ""
2078
2047
-#: commit-graph.c:1874
2079
+#: commit-graph.c:1935
2080
msgid "Scanning merged commits"
2081
msgstr ""
2082
2051
-#: commit-graph.c:1885
2083
+#: commit-graph.c:1946
2084
#, c-format
2085
msgid "unexpected duplicate commit id %s"
2086
msgstr ""
2087
2056
-#: commit-graph.c:1908
2088
+#: commit-graph.c:1969
2089
msgid "Merging commit-graph"
2090
msgstr ""
2091
2060
-#: commit-graph.c:2096
2092
+#: commit-graph.c:2156
2093
#, c-format
2094
msgid "the commit graph format cannot write %d commits"
2095
msgstr ""
2096
2065
-#: commit-graph.c:2107
2097
+#: commit-graph.c:2167
2098
msgid "too many commits to write graph"
2099
msgstr ""
2100
2069
-#: commit-graph.c:2200
2101
+#: commit-graph.c:2260
2102
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2103
msgstr ""
2104
2073
-#: commit-graph.c:2210
2105
+#: commit-graph.c:2270
2106
#, c-format
2107
msgid "commit-graph has incorrect OID order: %s then %s"
2108
msgstr ""
2109
2078
-#: commit-graph.c:2220 commit-graph.c:2235
2110
+#: commit-graph.c:2280 commit-graph.c:2295
2111
#, c-format
2112
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2113
msgstr ""
2114
2083
-#: commit-graph.c:2227
2115
+#: commit-graph.c:2287
2116
#, c-format
2117
msgid "failed to parse commit %s from commit-graph"
2118
msgstr ""
2119
2088
-#: commit-graph.c:2245
2120
+#: commit-graph.c:2305
2121
msgid "Verifying commits in commit graph"
2122
msgstr ""
2123
2092
-#: commit-graph.c:2259
2124
+#: commit-graph.c:2320
2125
#, c-format
2126
msgid "failed to parse commit %s from object database for commit-graph"
2127
msgstr ""
2128
2097
-#: commit-graph.c:2266
2129
+#: commit-graph.c:2327
2130
#, c-format
2131
msgid "root tree OID for commit %s in commit-graph is %s != %s"
2132
msgstr ""
2133
2102
-#: commit-graph.c:2276
2134
+#: commit-graph.c:2337
2135
#, c-format
2136
msgid "commit-graph parent list for commit %s is too long"
2137
msgstr ""
2138
2107
-#: commit-graph.c:2285
2139
+#: commit-graph.c:2346
2140
#, c-format
2141
msgid "commit-graph parent for %s is %s != %s"
2142
msgstr ""
2143
2112
-#: commit-graph.c:2298
2144
+#: commit-graph.c:2360
2145
#, c-format
2146
msgid "commit-graph parent list for commit %s terminates early"
2147
msgstr ""
2148
2117
-#: commit-graph.c:2303
2149
+#: commit-graph.c:2365
2150
#, c-format
2151
msgid ""
2152
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2153
msgstr ""
2154
2123
-#: commit-graph.c:2307
2155
+#: commit-graph.c:2369
2156
#, c-format
2157
msgid ""
2158
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2159
msgstr ""
2160
2129
-#: commit-graph.c:2322
2161
+#: commit-graph.c:2385
2162
#, c-format
2163
msgid "commit-graph generation for commit %s is %u != %u"
2164
msgstr ""
2165
2134
-#: commit-graph.c:2328
2166
+#: commit-graph.c:2391
2167
#, c-format
2168
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2169
msgstr ""
@@ -2159,27 +2191,27 @@ msgid ""
2191
"\"git config advice.graftFileDeprecated false\""
2192
msgstr ""
2193
2162
-#: commit.c:1168
2194
+#: commit.c:1172
2195
#, c-format
2196
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2197
msgstr ""
2198
2167
-#: commit.c:1172
2199
+#: commit.c:1176
2200
#, c-format
2201
msgid "Commit %s has a bad GPG signature allegedly by %s."
2202
msgstr ""
2203
2172
-#: commit.c:1175
2204
+#: commit.c:1179
2205
#, c-format
2206
msgid "Commit %s does not have a GPG signature."
2207
msgstr ""
2208
2177
-#: commit.c:1178
2209
+#: commit.c:1182
2210
#, c-format
2211
msgid "Commit %s has a good GPG signature by %s\n"
2212
msgstr ""
2213
2182
-#: commit.c:1432
2214
+#: commit.c:1436
2215
msgid ""
2216
"Warning: commit message did not conform to UTF-8.\n"
2217
"You may want to amend it after fixing the message, or set the config\n"
@@ -2359,7 +2391,7 @@ msgstr ""
2391
msgid "must be one of nothing, matching, simple, upstream or current"
2392
msgstr ""
2393
2362
-#: config.c:1533 builtin/pack-objects.c:3542
2394
+#: config.c:1533 builtin/pack-objects.c:3617
2395
#, c-format
2396
msgid "bad pack compression level %d"
2397
msgstr ""
@@ -2504,79 +2536,88 @@ msgstr ""
2536
msgid "server doesn't support '%s'"
2537
msgstr ""
2538
2507
-#: connect.c:103
2539
+#: connect.c:118
2540
#, c-format
2541
msgid "server doesn't support feature '%s'"
2542
msgstr ""
2543
2512
-#: connect.c:114
2544
+#: connect.c:129
2545
msgid "expected flush after capabilities"
2546
msgstr ""
2547
2516
-#: connect.c:233
2548
+#: connect.c:263
2549
#, c-format
2550
msgid "ignoring capabilities after first line '%s'"
2551
msgstr ""
2552
2521
-#: connect.c:252
2553
+#: connect.c:284
2554
msgid "protocol error: unexpected capabilities^{}"
2555
msgstr ""
2556
2525
-#: connect.c:273
2557
+#: connect.c:306
2558
#, c-format
2559
msgid "protocol error: expected shallow sha-1, got '%s'"
2560
msgstr ""
2561
2530
-#: connect.c:275
2562
+#: connect.c:308
2563
msgid "repository on the other end cannot be shallow"
2564
msgstr ""
2565
2534
-#: connect.c:313
2566
+#: connect.c:347
2567
msgid "invalid packet"
2568
msgstr ""
2569
2538
-#: connect.c:333
2570
+#: connect.c:367
2571
#, c-format
2572
msgid "protocol error: unexpected '%s'"
2573
msgstr ""
2574
2543
-#: connect.c:441
2575
+#: connect.c:473
2576
+#, c-format
2577
+msgid "unknown object format '%s' specified by server"
2578
+msgstr ""
2579
+
2580
+#: connect.c:500
2581
#, c-format
2582
msgid "invalid ls-refs response: %s"
2583
msgstr ""
2584
2548
-#: connect.c:445
2585
+#: connect.c:504
2586
msgid "expected flush after ref listing"
2587
msgstr ""
2588
2552
-#: connect.c:544
2589
+#: connect.c:507
2590
+msgid "expected response end packet after ref listing"
2591
+msgstr ""
2592
+
2593
+#: connect.c:640
2594
#, c-format
2595
msgid "protocol '%s' is not supported"
2596
msgstr ""
2597
2557
-#: connect.c:595
2598
+#: connect.c:691
2599
msgid "unable to set SO_KEEPALIVE on socket"
2600
msgstr ""
2601
2561
-#: connect.c:635 connect.c:698
2602
+#: connect.c:731 connect.c:794
2603
#, c-format
2604
msgid "Looking up %s ... "
2605
msgstr ""
2606
2566
-#: connect.c:639
2607
+#: connect.c:735
2608
#, c-format
2609
msgid "unable to look up %s (port %s) (%s)"
2610
msgstr ""
2611
2612
#. TRANSLATORS: this is the end of "Looking up %s ... "
2572
-#: connect.c:643 connect.c:714
2613
+#: connect.c:739 connect.c:810
2614
#, c-format
2615
msgid ""
2616
"done.\n"
2617
"Connecting to %s (port %s) ... "
2618
msgstr ""
2619
2579
-#: connect.c:665 connect.c:742
2620
+#: connect.c:761 connect.c:838
2621
#, c-format
2622
msgid ""
2623
"unable to connect to %s:\n"
@@ -2584,73 +2625,73 @@ msgid ""
2625
msgstr ""
2626
2627
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
2587
-#: connect.c:671 connect.c:748
2628
+#: connect.c:767 connect.c:844
2629
msgid "done."
2630
msgstr ""
2631
2591
-#: connect.c:702
2632
+#: connect.c:798
2633
#, c-format
2634
msgid "unable to look up %s (%s)"
2635
msgstr ""
2636
2596
-#: connect.c:708
2637
+#: connect.c:804
2638
#, c-format
2639
msgid "unknown port %s"
2640
msgstr ""
2641
2601
-#: connect.c:845 connect.c:1175
2642
+#: connect.c:941 connect.c:1271
2643
#, c-format
2644
msgid "strange hostname '%s' blocked"
2645
msgstr ""
2646
2606
-#: connect.c:847
2647
+#: connect.c:943
2648
#, c-format
2649
msgid "strange port '%s' blocked"
2650
msgstr ""
2651
2611
-#: connect.c:857
2652
+#: connect.c:953
2653
#, c-format
2654
msgid "cannot start proxy %s"
2655
msgstr ""
2656
2616
-#: connect.c:928
2657
+#: connect.c:1024
2658
msgid "no path specified; see 'git help pull' for valid url syntax"
2659
msgstr ""
2660
2620
-#: connect.c:1123
2661
+#: connect.c:1219
2662
msgid "ssh variant 'simple' does not support -4"
2663
msgstr ""
2664
2624
-#: connect.c:1135
2665
+#: connect.c:1231
2666
msgid "ssh variant 'simple' does not support -6"
2667
msgstr ""
2668
2628
-#: connect.c:1152
2669
+#: connect.c:1248
2670
msgid "ssh variant 'simple' does not support setting port"
2671
msgstr ""
2672
2632
-#: connect.c:1264
2673
+#: connect.c:1360
2674
#, c-format
2675
msgid "strange pathname '%s' blocked"
2676
msgstr ""
2677
2637
-#: connect.c:1311
2678
+#: connect.c:1407
2679
msgid "unable to fork"
2680
msgstr ""
2681
2641
-#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45
2682
+#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45
2683
msgid "Checking connectivity"
2684
msgstr ""
2685
2645
-#: connected.c:119
2686
+#: connected.c:121
2687
msgid "Could not run 'git rev-list'"
2688
msgstr ""
2689
2649
-#: connected.c:139
2690
+#: connected.c:141
2691
msgid "failed write to rev-list"
2692
msgstr ""
2693
2653
-#: connected.c:146
2694
+#: connected.c:148
2695
msgid "failed to close rev-list's stdin"
2696
msgstr ""
2697
@@ -2901,564 +2942,564 @@ msgid ""
2942
"tree"
2943
msgstr ""
2944
2904
-#: diff.c:155
2945
+#: diff.c:156
2946
#, c-format
2947
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
2948
msgstr ""
2949
2909
-#: diff.c:160
2950
+#: diff.c:161
2951
#, c-format
2952
msgid " Unknown dirstat parameter '%s'\n"
2953
msgstr ""
2954
2914
-#: diff.c:296
2955
+#: diff.c:297
2956
msgid ""
2957
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
2958
"'dimmed-zebra', 'plain'"
2959
msgstr ""
2960
2920
-#: diff.c:324
2961
+#: diff.c:325
2962
#, c-format
2963
msgid ""
2964
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
2965
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
2966
msgstr ""
2967
2927
-#: diff.c:332
2968
+#: diff.c:333
2969
msgid ""
2970
"color-moved-ws: allow-indentation-change cannot be combined with other "
2971
"whitespace modes"
2972
msgstr ""
2973
2933
-#: diff.c:405
2974
+#: diff.c:410
2975
#, c-format
2976
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
2977
msgstr ""
2978
2938
-#: diff.c:465
2979
+#: diff.c:470
2980
#, c-format
2981
msgid ""
2982
"Found errors in 'diff.dirstat' config variable:\n"
2983
"%s"
2984
msgstr ""
2985
2945
-#: diff.c:4238
2986
+#: diff.c:4243
2987
#, c-format
2988
msgid "external diff died, stopping at %s"
2989
msgstr ""
2990
2950
-#: diff.c:4583
2991
+#: diff.c:4589
2992
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
2993
msgstr ""
2994
2954
-#: diff.c:4586
2995
+#: diff.c:4592
2996
msgid "-G, -S and --find-object are mutually exclusive"
2997
msgstr ""
2998
2958
-#: diff.c:4664
2999
+#: diff.c:4670
3000
msgid "--follow requires exactly one pathspec"
3001
msgstr ""
3002
2962
-#: diff.c:4712
3003
+#: diff.c:4718
3004
#, c-format
3005
msgid "invalid --stat value: %s"
3006
msgstr ""
3007
2967
-#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
3008
+#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250
3009
#: parse-options.c:197 parse-options.c:201
3010
#, c-format
3011
msgid "%s expects a numerical value"
3012
msgstr ""
3013
2973
-#: diff.c:4749
3014
+#: diff.c:4755
3015
#, c-format
3016
msgid ""
3017
"Failed to parse --dirstat/-X option parameter:\n"
3018
"%s"
3019
msgstr ""
3020
2980
-#: diff.c:4834
3021
+#: diff.c:4840
3022
#, c-format
3023
msgid "unknown change class '%c' in --diff-filter=%s"
3024
msgstr ""
3025
2985
-#: diff.c:4858
3026
+#: diff.c:4864
3027
#, c-format
3028
msgid "unknown value after ws-error-highlight=%.*s"
3029
msgstr ""
3030
2990
-#: diff.c:4872
3031
+#: diff.c:4878
3032
#, c-format
3033
msgid "unable to resolve '%s'"
3034
msgstr ""
3035
2995
-#: diff.c:4922 diff.c:4928
3036
+#: diff.c:4928 diff.c:4934
3037
#, c-format
3038
msgid "%s expects <n>/<m> form"
3039
msgstr ""
3040
3000
-#: diff.c:4940
3041
+#: diff.c:4946
3042
#, c-format
3043
msgid "%s expects a character, got '%s'"
3044
msgstr ""
3045
3005
-#: diff.c:4961
3046
+#: diff.c:4967
3047
#, c-format
3048
msgid "bad --color-moved argument: %s"
3049
msgstr ""
3050
3010
-#: diff.c:4980
3051
+#: diff.c:4986
3052
#, c-format
3053
msgid "invalid mode '%s' in --color-moved-ws"
3054
msgstr ""
3055
3015
-#: diff.c:5020
3056
+#: diff.c:5026
3057
msgid ""
3058
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3059
"\"histogram\""
3060
msgstr ""
3061
3021
-#: diff.c:5056 diff.c:5076
3062
+#: diff.c:5062 diff.c:5082
3063
#, c-format
3064
msgid "invalid argument to %s"
3065
msgstr ""
3066
3026
-#: diff.c:5214
3067
+#: diff.c:5219
3068
#, c-format
3069
msgid "failed to parse --submodule option parameter: '%s'"
3070
msgstr ""
3071
3031
-#: diff.c:5270
3072
+#: diff.c:5275
3073
#, c-format
3074
msgid "bad --word-diff argument: %s"
3075
msgstr ""
3076
3036
-#: diff.c:5293
3077
+#: diff.c:5298
3078
msgid "Diff output format options"
3079
msgstr ""
3080
3040
-#: diff.c:5295 diff.c:5301
3081
+#: diff.c:5300 diff.c:5306
3082
msgid "generate patch"
3083
msgstr ""
3084
3044
-#: diff.c:5298 builtin/log.c:177
3085
+#: diff.c:5303 builtin/log.c:177
3086
msgid "suppress diff output"
3087
msgstr ""
3088
3048
-#: diff.c:5303 diff.c:5417 diff.c:5424
3089
+#: diff.c:5308 diff.c:5422 diff.c:5429
3090
msgid "<n>"
3091
msgstr ""
3092
3052
-#: diff.c:5304 diff.c:5307
3093
+#: diff.c:5309 diff.c:5312
3094
msgid "generate diffs with <n> lines context"
3095
msgstr ""
3096
3056
-#: diff.c:5309
3097
+#: diff.c:5314
3098
msgid "generate the diff in raw format"
3099
msgstr ""
3100
3060
-#: diff.c:5312
3101
+#: diff.c:5317
3102
msgid "synonym for '-p --raw'"
3103
msgstr ""
3104
3064
-#: diff.c:5316
3105
+#: diff.c:5321
3106
msgid "synonym for '-p --stat'"
3107
msgstr ""
3108
3068
-#: diff.c:5320
3109
+#: diff.c:5325
3110
msgid "machine friendly --stat"
3111
msgstr ""
3112
3072
-#: diff.c:5323
3113
+#: diff.c:5328
3114
msgid "output only the last line of --stat"
3115
msgstr ""
3116
3076
-#: diff.c:5325 diff.c:5333
3117
+#: diff.c:5330 diff.c:5338
3118
msgid "<param1,param2>..."
3119
msgstr ""
3120
3080
-#: diff.c:5326
3121
+#: diff.c:5331
3122
msgid ""
3123
"output the distribution of relative amount of changes for each sub-directory"
3124
msgstr ""
3125
3085
-#: diff.c:5330
3126
+#: diff.c:5335
3127
msgid "synonym for --dirstat=cumulative"
3128
msgstr ""
3129
3089
-#: diff.c:5334
3130
+#: diff.c:5339
3131
msgid "synonym for --dirstat=files,param1,param2..."
3132
msgstr ""
3133
3093
-#: diff.c:5338
3134
+#: diff.c:5343
3135
msgid "warn if changes introduce conflict markers or whitespace errors"
3136
msgstr ""
3137
3097
-#: diff.c:5341
3138
+#: diff.c:5346
3139
msgid "condensed summary such as creations, renames and mode changes"
3140
msgstr ""
3141
3101
-#: diff.c:5344
3142
+#: diff.c:5349
3143
msgid "show only names of changed files"
3144
msgstr ""
3145
3105
-#: diff.c:5347
3146
+#: diff.c:5352
3147
msgid "show only names and status of changed files"
3148
msgstr ""
3149
3109
-#: diff.c:5349
3150
+#: diff.c:5354
3151
msgid "<width>[,<name-width>[,<count>]]"
3152
msgstr ""
3153
3113
-#: diff.c:5350
3154
+#: diff.c:5355
3155
msgid "generate diffstat"
3156
msgstr ""
3157
3117
-#: diff.c:5352 diff.c:5355 diff.c:5358
3158
+#: diff.c:5357 diff.c:5360 diff.c:5363
3159
msgid "<width>"
3160
msgstr ""
3161
3121
-#: diff.c:5353
3162
+#: diff.c:5358
3163
msgid "generate diffstat with a given width"
3164
msgstr ""
3165
3125
-#: diff.c:5356
3166
+#: diff.c:5361
3167
msgid "generate diffstat with a given name width"
3168
msgstr ""
3169
3129
-#: diff.c:5359
3170
+#: diff.c:5364
3171
msgid "generate diffstat with a given graph width"
3172
msgstr ""
3173
3133
-#: diff.c:5361
3174
+#: diff.c:5366
3175
msgid "<count>"
3176
msgstr ""
3177
3137
-#: diff.c:5362
3178
+#: diff.c:5367
3179
msgid "generate diffstat with limited lines"
3180
msgstr ""
3181
3141
-#: diff.c:5365
3182
+#: diff.c:5370
3183
msgid "generate compact summary in diffstat"
3184
msgstr ""
3185
3145
-#: diff.c:5368
3186
+#: diff.c:5373
3187
msgid "output a binary diff that can be applied"
3188
msgstr ""
3189
3149
-#: diff.c:5371
3190
+#: diff.c:5376
3191
msgid "show full pre- and post-image object names on the \"index\" lines"
3192
msgstr ""
3193
3153
-#: diff.c:5373
3194
+#: diff.c:5378
3195
msgid "show colored diff"
3196
msgstr ""
3197
3157
-#: diff.c:5374
3198
+#: diff.c:5379
3199
msgid "<kind>"
3200
msgstr ""
3201
3161
-#: diff.c:5375
3202
+#: diff.c:5380
3203
msgid ""
3204
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3205
"diff"
3206
msgstr ""
3207
3167
-#: diff.c:5378
3208
+#: diff.c:5383
3209
msgid ""
3210
"do not munge pathnames and use NULs as output field terminators in --raw or "
3211
"--numstat"
3212
msgstr ""
3213
3173
-#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
3214
+#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498
3215
msgid "<prefix>"
3216
msgstr ""
3217
3177
-#: diff.c:5382
3218
+#: diff.c:5387
3219
msgid "show the given source prefix instead of \"a/\""
3220
msgstr ""
3221
3181
-#: diff.c:5385
3222
+#: diff.c:5390
3223
msgid "show the given destination prefix instead of \"b/\""
3224
msgstr ""
3225
3185
-#: diff.c:5388
3226
+#: diff.c:5393
3227
msgid "prepend an additional prefix to every line of output"
3228
msgstr ""
3229
3189
-#: diff.c:5391
3230
+#: diff.c:5396
3231
msgid "do not show any source or destination prefix"
3232
msgstr ""
3233
3193
-#: diff.c:5394
3234
+#: diff.c:5399
3235
msgid "show context between diff hunks up to the specified number of lines"
3236
msgstr ""
3237
3197
-#: diff.c:5398 diff.c:5403 diff.c:5408
3238
+#: diff.c:5403 diff.c:5408 diff.c:5413
3239
msgid "<char>"
3240
msgstr ""
3241
3201
-#: diff.c:5399
3242
+#: diff.c:5404
3243
msgid "specify the character to indicate a new line instead of '+'"
3244
msgstr ""
3245
3205
-#: diff.c:5404
3246
+#: diff.c:5409
3247
msgid "specify the character to indicate an old line instead of '-'"
3248
msgstr ""
3249
3209
-#: diff.c:5409
3250
+#: diff.c:5414
3251
msgid "specify the character to indicate a context instead of ' '"
3252
msgstr ""
3253
3213
-#: diff.c:5412
3254
+#: diff.c:5417
3255
msgid "Diff rename options"
3256
msgstr ""
3257
3217
-#: diff.c:5413
3258
+#: diff.c:5418
3259
msgid "<n>[/<m>]"
3260
msgstr ""
3261
3221
-#: diff.c:5414
3262
+#: diff.c:5419
3263
msgid "break complete rewrite changes into pairs of delete and create"
3264
msgstr ""
3265
3225
-#: diff.c:5418
3266
+#: diff.c:5423
3267
msgid "detect renames"
3268
msgstr ""
3269
3229
-#: diff.c:5422
3270
+#: diff.c:5427
3271
msgid "omit the preimage for deletes"
3272
msgstr ""
3273
3233
-#: diff.c:5425
3274
+#: diff.c:5430
3275
msgid "detect copies"
3276
msgstr ""
3277
3237
-#: diff.c:5429
3278
+#: diff.c:5434
3279
msgid "use unmodified files as source to find copies"
3280
msgstr ""
3281
3241
-#: diff.c:5431
3282
+#: diff.c:5436
3283
msgid "disable rename detection"
3284
msgstr ""
3285
3245
-#: diff.c:5434
3286
+#: diff.c:5439
3287
msgid "use empty blobs as rename source"
3288
msgstr ""
3289
3249
-#: diff.c:5436
3290
+#: diff.c:5441
3291
msgid "continue listing the history of a file beyond renames"
3292
msgstr ""
3293
3253
-#: diff.c:5439
3294
+#: diff.c:5444
3295
msgid ""
3296
"prevent rename/copy detection if the number of rename/copy targets exceeds "
3297
"given limit"
3298
msgstr ""
3299
3259
-#: diff.c:5441
3300
+#: diff.c:5446
3301
msgid "Diff algorithm options"
3302
msgstr ""
3303
3263
-#: diff.c:5443
3304
+#: diff.c:5448
3305
msgid "produce the smallest possible diff"
3306
msgstr ""
3307
3267
-#: diff.c:5446
3308
+#: diff.c:5451
3309
msgid "ignore whitespace when comparing lines"
3310
msgstr ""
3311
3271
-#: diff.c:5449
3312
+#: diff.c:5454
3313
msgid "ignore changes in amount of whitespace"
3314
msgstr ""
3315
3275
-#: diff.c:5452
3316
+#: diff.c:5457
3317
msgid "ignore changes in whitespace at EOL"
3318
msgstr ""
3319
3279
-#: diff.c:5455
3320
+#: diff.c:5460
3321
msgid "ignore carrier-return at the end of line"
3322
msgstr ""
3323
3283
-#: diff.c:5458
3324
+#: diff.c:5463
3325
msgid "ignore changes whose lines are all blank"
3326
msgstr ""
3327
3287
-#: diff.c:5461
3328
+#: diff.c:5466
3329
msgid "heuristic to shift diff hunk boundaries for easy reading"
3330
msgstr ""
3331
3291
-#: diff.c:5464
3332
+#: diff.c:5469
3333
msgid "generate diff using the \"patience diff\" algorithm"
3334
msgstr ""
3335
3295
-#: diff.c:5468
3336
+#: diff.c:5473
3337
msgid "generate diff using the \"histogram diff\" algorithm"
3338
msgstr ""
3339
3299
-#: diff.c:5470
3340
+#: diff.c:5475
3341
msgid "<algorithm>"
3342
msgstr ""
3343
3303
-#: diff.c:5471
3344
+#: diff.c:5476
3345
msgid "choose a diff algorithm"
3346
msgstr ""
3347
3307
-#: diff.c:5473
3348
+#: diff.c:5478
3349
msgid "<text>"
3350
msgstr ""
3351
3311
-#: diff.c:5474
3352
+#: diff.c:5479
3353
msgid "generate diff using the \"anchored diff\" algorithm"
3354
msgstr ""
3355
3315
-#: diff.c:5476 diff.c:5485 diff.c:5488
3356
+#: diff.c:5481 diff.c:5490 diff.c:5493
3357
msgid "<mode>"
3358
msgstr ""
3359
3319
-#: diff.c:5477
3360
+#: diff.c:5482
3361
msgid "show word diff, using <mode> to delimit changed words"
3362
msgstr ""
3363
3323
-#: diff.c:5479 diff.c:5482 diff.c:5527
3364
+#: diff.c:5484 diff.c:5487 diff.c:5532
3365
msgid "<regex>"
3366
msgstr ""
3367
3327
-#: diff.c:5480
3368
+#: diff.c:5485
3369
msgid "use <regex> to decide what a word is"
3370
msgstr ""
3371
3331
-#: diff.c:5483
3372
+#: diff.c:5488
3373
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3374
msgstr ""
3375
3335
-#: diff.c:5486
3376
+#: diff.c:5491
3377
msgid "moved lines of code are colored differently"
3378
msgstr ""
3379
3339
-#: diff.c:5489
3380
+#: diff.c:5494
3381
msgid "how white spaces are ignored in --color-moved"
3382
msgstr ""
3383
3343
-#: diff.c:5492
3384
+#: diff.c:5497
3385
msgid "Other diff options"
3386
msgstr ""
3387
3347
-#: diff.c:5494
3388
+#: diff.c:5499
3389
msgid "when run from subdir, exclude changes outside and show relative paths"
3390
msgstr ""
3391
3351
-#: diff.c:5498
3392
+#: diff.c:5503
3393
msgid "treat all files as text"
3394
msgstr ""
3395
3355
-#: diff.c:5500
3396
+#: diff.c:5505
3397
msgid "swap two inputs, reverse the diff"
3398
msgstr ""
3399
3359
-#: diff.c:5502
3400
+#: diff.c:5507
3401
msgid "exit with 1 if there were differences, 0 otherwise"
3402
msgstr ""
3403
3363
-#: diff.c:5504
3404
+#: diff.c:5509
3405
msgid "disable all output of the program"
3406
msgstr ""
3407
3367
-#: diff.c:5506
3408
+#: diff.c:5511
3409
msgid "allow an external diff helper to be executed"
3410
msgstr ""
3411
3371
-#: diff.c:5508
3412
+#: diff.c:5513
3413
msgid "run external text conversion filters when comparing binary files"
3414
msgstr ""
3415
3375
-#: diff.c:5510
3416
+#: diff.c:5515
3417
msgid "<when>"
3418
msgstr ""
3419
3379
-#: diff.c:5511
3420
+#: diff.c:5516
3421
msgid "ignore changes to submodules in the diff generation"
3422
msgstr ""
3423
3383
-#: diff.c:5514
3424
+#: diff.c:5519
3425
msgid "<format>"
3426
msgstr ""
3427
3387
-#: diff.c:5515
3428
+#: diff.c:5520
3429
msgid "specify how differences in submodules are shown"
3430
msgstr ""
3431
3391
-#: diff.c:5519
3432
+#: diff.c:5524
3433
msgid "hide 'git add -N' entries from the index"
3434
msgstr ""
3435
3395
-#: diff.c:5522
3436
+#: diff.c:5527
3437
msgid "treat 'git add -N' entries as real in the index"
3438
msgstr ""
3439
3399
-#: diff.c:5524
3440
+#: diff.c:5529
3441
msgid "<string>"
3442
msgstr ""
3443
3403
-#: diff.c:5525
3444
+#: diff.c:5530
3445
msgid ""
3446
"look for differences that change the number of occurrences of the specified "
3447
"string"
3448
msgstr ""
3449
3409
-#: diff.c:5528
3450
+#: diff.c:5533
3451
msgid ""
3452
"look for differences that change the number of occurrences of the specified "
3453
"regex"
3454
msgstr ""
3455
3415
-#: diff.c:5531
3456
+#: diff.c:5536
3457
msgid "show all changes in the changeset with -S or -G"
3458
msgstr ""
3459
3419
-#: diff.c:5534
3460
+#: diff.c:5539
3461
msgid "treat <string> in -S as extended POSIX regular expression"
3462
msgstr ""
3463
3423
-#: diff.c:5537
3464
+#: diff.c:5542
3465
msgid "control the order in which files appear in the output"
3466
msgstr ""
3467
3427
-#: diff.c:5538
3468
+#: diff.c:5543
3469
msgid "<object-id>"
3470
msgstr ""
3471
3431
-#: diff.c:5539
3472
+#: diff.c:5544
3473
msgid ""
3474
"look for differences that change the number of occurrences of the specified "
3475
"object"
3476
msgstr ""
3477
3437
-#: diff.c:5541
3478
+#: diff.c:5546
3479
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3480
msgstr ""
3481
3441
-#: diff.c:5542
3482
+#: diff.c:5547
3483
msgid "select files by diff type"
3484
msgstr ""
3485
3445
-#: diff.c:5544
3486
+#: diff.c:5549
3487
msgid "<file>"
3488
msgstr ""
3489
3449
-#: diff.c:5545
3490
+#: diff.c:5550
3491
msgid "Output to a specific file"
3492
msgstr ""
3493
3453
-#: diff.c:6200
3494
+#: diff.c:6205
3495
msgid "inexact rename detection was skipped due to too many files."
3496
msgstr ""
3497
3457
-#: diff.c:6203
3498
+#: diff.c:6208
3499
msgid "only found copies from modified paths due to too many files."
3500
msgstr ""
3501
3461
-#: diff.c:6206
3502
+#: diff.c:6211
3503
#, c-format
3504
msgid ""
3505
"you may want to set your %s variable to at least %d and retry the command."
@@ -3473,59 +3514,59 @@ msgstr ""
3514
msgid "Performing inexact rename detection"
3515
msgstr ""
3516
3476
-#: dir.c:555
3517
+#: dir.c:573
3518
#, c-format
3519
msgid "pathspec '%s' did not match any file(s) known to git"
3520
msgstr ""
3521
3481
-#: dir.c:695 dir.c:724 dir.c:737
3522
+#: dir.c:713 dir.c:742 dir.c:755
3523
#, c-format
3524
msgid "unrecognized pattern: '%s'"
3525
msgstr ""
3526
3486
-#: dir.c:754 dir.c:768
3527
+#: dir.c:772 dir.c:786
3528
#, c-format
3529
msgid "unrecognized negative pattern: '%s'"
3530
msgstr ""
3531
3491
-#: dir.c:786
3532
+#: dir.c:804
3533
#, c-format
3534
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3535
msgstr ""
3536
3496
-#: dir.c:796
3537
+#: dir.c:814
3538
msgid "disabling cone pattern matching"
3539
msgstr ""
3540
3500
-#: dir.c:1173
3541
+#: dir.c:1191
3542
#, c-format
3543
msgid "cannot use %s as an exclude file"
3544
msgstr ""
3545
3505
-#: dir.c:2275
3546
+#: dir.c:2296
3547
#, c-format
3548
msgid "could not open directory '%s'"
3549
msgstr ""
3550
3510
-#: dir.c:2575
3551
+#: dir.c:2596
3552
msgid "failed to get kernel name and information"
3553
msgstr ""
3554
3514
-#: dir.c:2699
3555
+#: dir.c:2720
3556
msgid "untracked cache is disabled on this system or location"
3557
msgstr ""
3558
3518
-#: dir.c:3481
3559
+#: dir.c:3502
3560
#, c-format
3561
msgid "index file corrupt in repo %s"
3562
msgstr ""
3563
3523
-#: dir.c:3526 dir.c:3531
3564
+#: dir.c:3547 dir.c:3552
3565
#, c-format
3566
msgid "could not create directories for %s"
3567
msgstr ""
3568
3528
-#: dir.c:3560
3569
+#: dir.c:3581
3570
#, c-format
3571
msgid "could not migrate git directory from '%s' to '%s'"
3572
msgstr ""
@@ -3535,11 +3576,11 @@ msgstr ""
3576
msgid "hint: Waiting for your editor to close the file...%c"
3577
msgstr ""
3578
3538
-#: entry.c:178
3579
+#: entry.c:177
3580
msgid "Filtering content"
3581
msgstr ""
3582
3542
-#: entry.c:479
3583
+#: entry.c:478
3584
#, c-format
3585
msgid "could not stat file '%s'"
3586
msgstr ""
@@ -3559,227 +3600,245 @@ msgstr ""
3600
msgid "too many args to run %s"
3601
msgstr ""
3602
3562
-#: fetch-pack.c:151
3603
+#: fetch-pack.c:152
3604
msgid "git fetch-pack: expected shallow list"
3605
msgstr ""
3606
3566
-#: fetch-pack.c:154
3607
+#: fetch-pack.c:155
3608
msgid "git fetch-pack: expected a flush packet after shallow list"
3609
msgstr ""
3610
3570
-#: fetch-pack.c:165
3611
+#: fetch-pack.c:166
3612
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3613
msgstr ""
3614
3574
-#: fetch-pack.c:185
3615
+#: fetch-pack.c:186
3616
#, c-format
3617
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
3618
msgstr ""
3619
3579
-#: fetch-pack.c:196
3620
+#: fetch-pack.c:197
3621
msgid "unable to write to remote"
3622
msgstr ""
3623
3583
-#: fetch-pack.c:258
3624
+#: fetch-pack.c:259
3625
msgid "--stateless-rpc requires multi_ack_detailed"
3626
msgstr ""
3627
3587
-#: fetch-pack.c:357 fetch-pack.c:1364
3628
+#: fetch-pack.c:358 fetch-pack.c:1408
3629
#, c-format
3630
msgid "invalid shallow line: %s"
3631
msgstr ""
3632
3592
-#: fetch-pack.c:363 fetch-pack.c:1370
3633
+#: fetch-pack.c:364 fetch-pack.c:1414
3634
#, c-format
3635
msgid "invalid unshallow line: %s"
3636
msgstr ""
3637
3597
-#: fetch-pack.c:365 fetch-pack.c:1372
3638
+#: fetch-pack.c:366 fetch-pack.c:1416
3639
#, c-format
3640
msgid "object not found: %s"
3641
msgstr ""
3642
3602
-#: fetch-pack.c:368 fetch-pack.c:1375
3643
+#: fetch-pack.c:369 fetch-pack.c:1419
3644
#, c-format
3645
msgid "error in object: %s"
3646
msgstr ""
3647
3607
-#: fetch-pack.c:370 fetch-pack.c:1377
3648
+#: fetch-pack.c:371 fetch-pack.c:1421
3649
#, c-format
3650
msgid "no shallow found: %s"
3651
msgstr ""
3652
3612
-#: fetch-pack.c:373 fetch-pack.c:1381
3653
+#: fetch-pack.c:374 fetch-pack.c:1425
3654
#, c-format
3655
msgid "expected shallow/unshallow, got %s"
3656
msgstr ""
3657
3617
-#: fetch-pack.c:415
3658
+#: fetch-pack.c:416
3659
#, c-format
3660
msgid "got %s %d %s"
3661
msgstr ""
3662
3622
-#: fetch-pack.c:432
3663
+#: fetch-pack.c:433
3664
#, c-format
3665
msgid "invalid commit %s"
3666
msgstr ""
3667
3627
-#: fetch-pack.c:463
3668
+#: fetch-pack.c:464
3669
msgid "giving up"
3670
msgstr ""
3671
3631
-#: fetch-pack.c:476 progress.c:336
3672
+#: fetch-pack.c:477 progress.c:336
3673
msgid "done"
3674
msgstr ""
3675
3635
-#: fetch-pack.c:488
3676
+#: fetch-pack.c:489
3677
#, c-format
3678
msgid "got %s (%d) %s"
3679
msgstr ""
3680
3640
-#: fetch-pack.c:534
3681
+#: fetch-pack.c:535
3682
#, c-format
3683
msgid "Marking %s as complete"
3684
msgstr ""
3685
3645
-#: fetch-pack.c:755
3686
+#: fetch-pack.c:756
3687
#, c-format
3688
msgid "already have %s (%s)"
3689
msgstr ""
3690
3650
-#: fetch-pack.c:819
3691
+#: fetch-pack.c:821
3692
msgid "fetch-pack: unable to fork off sideband demultiplexer"
3693
msgstr ""
3694
3654
-#: fetch-pack.c:827
3695
+#: fetch-pack.c:829
3696
msgid "protocol error: bad pack header"
3697
msgstr ""
3698
3658
-#: fetch-pack.c:901
3699
+#: fetch-pack.c:910
3700
#, c-format
3701
msgid "fetch-pack: unable to fork off %s"
3702
msgstr ""
3703
3663
-#: fetch-pack.c:917
3704
+#: fetch-pack.c:927
3705
#, c-format
3706
msgid "%s failed"
3707
msgstr ""
3708
3668
-#: fetch-pack.c:919
3709
+#: fetch-pack.c:929
3710
msgid "error in sideband demultiplexer"
3711
msgstr ""
3712
3672
-#: fetch-pack.c:966
3713
+#: fetch-pack.c:976
3714
#, c-format
3715
msgid "Server version is %.*s"
3716
msgstr ""
3717
3677
-#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
3678
-#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002
3679
-#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018
3680
-#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
3718
+#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996
3719
+#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012
3720
+#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028
3721
+#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050
3722
#, c-format
3723
msgid "Server supports %s"
3724
msgstr ""
3725
3685
-#: fetch-pack.c:973
3726
+#: fetch-pack.c:983
3727
msgid "Server does not support shallow clients"
3728
msgstr ""
3729
3689
-#: fetch-pack.c:1033
3730
+#: fetch-pack.c:1043
3731
msgid "Server does not support --shallow-since"
3732
msgstr ""
3733
3693
-#: fetch-pack.c:1038
3734
+#: fetch-pack.c:1048
3735
msgid "Server does not support --shallow-exclude"
3736
msgstr ""
3737
3697
-#: fetch-pack.c:1042
3738
+#: fetch-pack.c:1052
3739
msgid "Server does not support --deepen"
3740
msgstr ""
3741
3701
-#: fetch-pack.c:1059
3742
+#: fetch-pack.c:1054
3743
+msgid "Server does not support this repository's object format"
3744
+msgstr ""
3745
+
3746
+#: fetch-pack.c:1071
3747
msgid "no common commits"
3748
msgstr ""
3749
3705
-#: fetch-pack.c:1071 fetch-pack.c:1563
3750
+#: fetch-pack.c:1083 fetch-pack.c:1639
3751
msgid "git fetch-pack: fetch failed."
3752
msgstr ""
3753
3754
#: fetch-pack.c:1211
3755
+#, c-format
3756
+msgid "mismatched algorithms: client %s; server %s"
3757
+msgstr ""
3758
+
3759
+#: fetch-pack.c:1215
3760
+#, c-format
3761
+msgid "the server does not support algorithm '%s'"
3762
+msgstr ""
3763
+
3764
+#: fetch-pack.c:1235
3765
msgid "Server does not support shallow requests"
3766
msgstr ""
3767
3713
-#: fetch-pack.c:1218
3768
+#: fetch-pack.c:1242
3769
msgid "Server supports filter"
3770
msgstr ""
3771
3717
-#: fetch-pack.c:1242
3772
+#: fetch-pack.c:1286
3773
msgid "unable to write request to remote"
3774
msgstr ""
3775
3721
-#: fetch-pack.c:1260
3776
+#: fetch-pack.c:1304
3777
#, c-format
3778
msgid "error reading section header '%s'"
3779
msgstr ""
3780
3726
-#: fetch-pack.c:1266
3781
+#: fetch-pack.c:1310
3782
#, c-format
3783
msgid "expected '%s', received '%s'"
3784
msgstr ""
3785
3731
-#: fetch-pack.c:1327
3786
+#: fetch-pack.c:1371
3787
#, c-format
3788
msgid "unexpected acknowledgment line: '%s'"
3789
msgstr ""
3790
3736
-#: fetch-pack.c:1332
3791
+#: fetch-pack.c:1376
3792
#, c-format
3793
msgid "error processing acks: %d"
3794
msgstr ""
3795
3741
-#: fetch-pack.c:1342
3796
+#: fetch-pack.c:1386
3797
msgid "expected packfile to be sent after 'ready'"
3798
msgstr ""
3799
3745
-#: fetch-pack.c:1344
3800
+#: fetch-pack.c:1388
3801
msgid "expected no other sections to be sent after no 'ready'"
3802
msgstr ""
3803
3749
-#: fetch-pack.c:1386
3804
+#: fetch-pack.c:1430
3805
#, c-format
3806
msgid "error processing shallow info: %d"
3807
msgstr ""
3808
3754
-#: fetch-pack.c:1433
3809
+#: fetch-pack.c:1477
3810
#, c-format
3811
msgid "expected wanted-ref, got '%s'"
3812
msgstr ""
3813
3759
-#: fetch-pack.c:1438
3814
+#: fetch-pack.c:1482
3815
#, c-format
3816
msgid "unexpected wanted-ref: '%s'"
3817
msgstr ""
3818
3764
-#: fetch-pack.c:1443
3819
+#: fetch-pack.c:1487
3820
#, c-format
3821
msgid "error processing wanted refs: %d"
3822
msgstr ""
3823
3769
-#: fetch-pack.c:1789
3824
+#: fetch-pack.c:1517
3825
+msgid "git fetch-pack: expected response end packet"
3826
+msgstr ""
3827
+
3828
+#: fetch-pack.c:1921
3829
msgid "no matching remote head"
3830
msgstr ""
3831
3773
-#: fetch-pack.c:1812 builtin/clone.c:692
3832
+#: fetch-pack.c:1944 builtin/clone.c:692
3833
msgid "remote did not send all necessary objects"
3834
msgstr ""
3835
3777
-#: fetch-pack.c:1839
3836
+#: fetch-pack.c:1971
3837
#, c-format
3838
msgid "no such remote ref %s"
3839
msgstr ""
3840
3782
-#: fetch-pack.c:1842
3841
+#: fetch-pack.c:1974
3842
#, c-format
3843
msgid "Server does not allow request for unadvertised object %s"
3844
msgstr ""
@@ -3813,7 +3872,7 @@ msgstr ""
3872
msgid "'%s': unable to read %s"
3873
msgstr ""
3874
3816
-#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
3875
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
3876
#: builtin/rm.c:135
3877
#, c-format
3878
msgid "failed to stat '%s'"
@@ -3951,16 +4010,16 @@ msgid_plural ""
4010
msgstr[0] ""
4011
msgstr[1] ""
4012
3954
-#: help.c:653
4013
+#: help.c:654
4014
msgid "git version [<options>]"
4015
msgstr ""
4016
3958
-#: help.c:708
4017
+#: help.c:709
4018
#, c-format
4019
msgid "%s: %s - %s"
4020
msgstr ""
4021
3963
-#: help.c:712
4022
+#: help.c:713
4023
msgid ""
4024
"\n"
4025
"Did you mean this?"
@@ -4044,6 +4103,10 @@ msgstr ""
4103
msgid "multiple filter-specs cannot be combined"
4104
msgstr ""
4105
4106
+#: list-objects-filter-options.c:330
4107
+msgid "unable to upgrade repository format to support partial clone"
4108
+msgstr ""
4109
+
4110
#: list-objects-filter.c:492
4111
#, c-format
4112
msgid "unable to access sparse blob in '%s'"
@@ -4366,7 +4429,7 @@ msgstr ""
4429
msgid "Skipped %s (merged same as existing)"
4430
msgstr ""
4431
4369
-#: merge-recursive.c:3101 git-submodule.sh:985
4432
+#: merge-recursive.c:3101 git-submodule.sh:959
4433
msgid "submodule"
4434
msgstr ""
4435
@@ -4481,7 +4544,7 @@ msgid "failed to read the cache"
4544
msgstr ""
4545
4546
#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
4484
-#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
4547
+#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816
4548
#: builtin/stash.c:265
4549
msgid "unable to write new index file"
4550
msgstr ""
@@ -4723,21 +4786,21 @@ msgstr ""
4786
msgid "hash mismatch %s"
4787
msgstr ""
4788
4726
-#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
4789
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184
4790
#, c-format
4791
msgid "unable to get size of %s"
4792
msgstr ""
4793
4731
-#: packfile.c:629
4794
+#: packfile.c:630
4795
msgid "offset before end of packfile (broken .idx?)"
4796
msgstr ""
4797
4735
-#: packfile.c:1899
4798
+#: packfile.c:1900
4799
#, c-format
4800
msgid "offset before start of pack index for %s (corrupt index?)"
4801
msgstr ""
4802
4740
-#: packfile.c:1903
4803
+#: packfile.c:1904
4804
#, c-format
4805
msgid "offset beyond end of pack index for %s (truncated index?)"
4806
msgstr ""
@@ -4938,44 +5001,48 @@ msgid "unable to write delim packet"
5001
msgstr ""
5002
5003
#: pkt-line.c:106
5004
+msgid "unable to write stateless separator packet"
5005
+msgstr ""
5006
+
5007
+#: pkt-line.c:113
5008
msgid "flush packet write failed"
5009
msgstr ""
5010
4944
-#: pkt-line.c:146 pkt-line.c:232
5011
+#: pkt-line.c:153 pkt-line.c:239
5012
msgid "protocol error: impossibly long line"
5013
msgstr ""
5014
4948
-#: pkt-line.c:162 pkt-line.c:164
5015
+#: pkt-line.c:169 pkt-line.c:171
5016
msgid "packet write with format failed"
5017
msgstr ""
5018
4952
-#: pkt-line.c:196
5019
+#: pkt-line.c:203
5020
msgid "packet write failed - data exceeds max packet size"
5021
msgstr ""
5022
4956
-#: pkt-line.c:203 pkt-line.c:210
5023
+#: pkt-line.c:210 pkt-line.c:217
5024
msgid "packet write failed"
5025
msgstr ""
5026
4960
-#: pkt-line.c:295
5027
+#: pkt-line.c:302
5028
msgid "read error"
5029
msgstr ""
5030
4964
-#: pkt-line.c:303
5031
+#: pkt-line.c:310
5032
msgid "the remote end hung up unexpectedly"
5033
msgstr ""
5034
4968
-#: pkt-line.c:331
5035
+#: pkt-line.c:338
5036
#, c-format
5037
msgid "protocol error: bad line length character: %.4s"
5038
msgstr ""
5039
4973
-#: pkt-line.c:341 pkt-line.c:346
5040
+#: pkt-line.c:352 pkt-line.c:357
5041
#, c-format
5042
msgid "protocol error: bad line length %d"
5043
msgstr ""
5044
4978
-#: pkt-line.c:362
5045
+#: pkt-line.c:373
5046
#, c-format
5047
msgid "remote error: %s"
5048
msgstr ""
@@ -5147,7 +5214,7 @@ msgstr ""
5214
5215
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
5216
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5150
-#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
5217
+#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991
5218
#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
5219
#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
5220
#: builtin/submodule--helper.c:332
@@ -5204,7 +5271,7 @@ msgstr ""
5271
msgid "broken index, expect %s in %s, got %s"
5272
msgstr ""
5273
5207
-#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
5274
+#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130
5275
#, c-format
5276
msgid "could not close '%s'"
5277
msgstr ""
@@ -5341,7 +5408,7 @@ msgstr ""
5408
msgid "could not read '%s'."
5409
msgstr ""
5410
5344
-#: ref-filter.c:42 wt-status.c:1936
5411
+#: ref-filter.c:42 wt-status.c:1977
5412
msgid "gone"
5413
msgstr ""
5414
@@ -5565,7 +5632,7 @@ msgstr ""
5632
msgid "ignoring ref with broken name %s"
5633
msgstr ""
5634
5568
-#: ref-filter.c:2095 refs.c:625
5635
+#: ref-filter.c:2095 refs.c:657
5636
#, c-format
5637
msgid "ignoring broken ref %s"
5638
msgstr ""
@@ -5595,94 +5662,108 @@ msgstr ""
5662
msgid "option `%s' must point to a commit"
5663
msgstr ""
5664
5598
-#: refs.c:262
5665
+#: refs.c:264
5666
#, c-format
5667
msgid "%s does not point to a valid object!"
5668
msgstr ""
5669
5603
-#: refs.c:623
5670
+#: refs.c:572
5671
+#, c-format
5672
+msgid "could not retrieve `%s`"
5673
+msgstr ""
5674
+
5675
+#: refs.c:579
5676
+#, c-format
5677
+msgid "invalid branch name: %s = %s"
5678
+msgstr ""
5679
+
5680
+#: refs.c:655
5681
#, c-format
5682
msgid "ignoring dangling symref %s"
5683
msgstr ""
5684
5608
-#: refs.c:760
5685
+#: refs.c:792
5686
#, c-format
5687
msgid "could not open '%s' for writing: %s"
5688
msgstr ""
5689
5613
-#: refs.c:770 refs.c:821
5690
+#: refs.c:802 refs.c:853
5691
#, c-format
5692
msgid "could not read ref '%s'"
5693
msgstr ""
5694
5618
-#: refs.c:776
5695
+#: refs.c:808
5696
#, c-format
5697
msgid "ref '%s' already exists"
5698
msgstr ""
5699
5623
-#: refs.c:781
5700
+#: refs.c:813
5701
#, c-format
5702
msgid "unexpected object ID when writing '%s'"
5703
msgstr ""
5704
5628
-#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
5629
-#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
5630
-#: wrapper.c:620
5705
+#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
5706
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168
5707
+#: wrapper.c:628
5708
#, c-format
5709
msgid "could not write to '%s'"
5710
msgstr ""
5711
5635
-#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
5712
+#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719
5713
#: builtin/rebase.c:852
5714
#, c-format
5715
msgid "could not open '%s' for writing"
5716
msgstr ""
5717
5641
-#: refs.c:823
5718
+#: refs.c:855
5719
#, c-format
5720
msgid "unexpected object ID when deleting '%s'"
5721
msgstr ""
5722
5646
-#: refs.c:954
5723
+#: refs.c:986
5724
#, c-format
5725
msgid "log for ref %s has gap after %s"
5726
msgstr ""
5727
5651
-#: refs.c:960
5728
+#: refs.c:992
5729
#, c-format
5730
msgid "log for ref %s unexpectedly ended on %s"
5731
msgstr ""
5732
5656
-#: refs.c:1019
5733
+#: refs.c:1051
5734
#, c-format
5735
msgid "log for %s is empty"
5736
msgstr ""
5737
5661
-#: refs.c:1111
5738
+#: refs.c:1143
5739
#, c-format
5740
msgid "refusing to update ref with bad name '%s'"
5741
msgstr ""
5742
5666
-#: refs.c:1187
5743
+#: refs.c:1219
5744
#, c-format
5745
msgid "update_ref failed for ref '%s': %s"
5746
msgstr ""
5747
5671
-#: refs.c:1979
5748
+#: refs.c:2011
5749
#, c-format
5750
msgid "multiple updates for ref '%s' not allowed"
5751
msgstr ""
5752
5676
-#: refs.c:2011
5753
+#: refs.c:2098
5754
msgid "ref updates forbidden inside quarantine environment"
5755
msgstr ""
5756
5680
-#: refs.c:2107 refs.c:2137
5757
+#: refs.c:2109
5758
+msgid "ref updates aborted by hook"
5759
+msgstr ""
5760
+
5761
+#: refs.c:2209 refs.c:2239
5762
#, c-format
5763
msgid "'%s' exists; cannot create '%s'"
5764
msgstr ""
5765
5685
-#: refs.c:2113 refs.c:2148
5766
+#: refs.c:2215 refs.c:2250
5767
#, c-format
5768
msgid "cannot process '%s' and '%s' at the same time"
5769
msgstr ""
@@ -5940,7 +6021,7 @@ msgstr[1] ""
6021
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6022
msgstr ""
6023
5943
-#: remote.c:2233
6024
+#: remote.c:2241
6025
#, c-format
6026
msgid "cannot parse expected object name '%s'"
6027
msgstr ""
@@ -6067,20 +6148,20 @@ msgstr ""
6148
msgid "failed to find tree of %s"
6149
msgstr ""
6150
6070
-#: revision.c:2655
6151
+#: revision.c:2661
6152
msgid "your current branch appears to be broken"
6153
msgstr ""
6154
6074
-#: revision.c:2658
6155
+#: revision.c:2664
6156
#, c-format
6157
msgid "your current branch '%s' does not have any commits yet"
6158
msgstr ""
6159
6079
-#: revision.c:2866
6160
+#: revision.c:2873
6161
msgid "--first-parent is incompatible with --bisect"
6162
msgstr ""
6163
6083
-#: revision.c:2870
6164
+#: revision.c:2877
6165
msgid "-L does not yet support diff formats besides -p and -s"
6166
msgstr ""
6167
@@ -6118,21 +6199,25 @@ msgstr ""
6199
msgid "failed to sign the push certificate"
6200
msgstr ""
6201
6121
-#: send-pack.c:399
6202
+#: send-pack.c:394
6203
+msgid "the receiving end does not support this repository's hash algorithm"
6204
+msgstr ""
6205
+
6206
+#: send-pack.c:403
6207
msgid "the receiving end does not support --signed push"
6208
msgstr ""
6209
6125
-#: send-pack.c:401
6210
+#: send-pack.c:405
6211
msgid ""
6212
"not sending a push certificate since the receiving end does not support --"
6213
"signed push"
6214
msgstr ""
6215
6131
-#: send-pack.c:413
6216
+#: send-pack.c:417
6217
msgid "the receiving end does not support --atomic push"
6218
msgstr ""
6219
6135
-#: send-pack.c:418
6220
+#: send-pack.c:422
6221
msgid "the receiving end does not support push options"
6222
msgstr ""
6223
@@ -6248,7 +6333,7 @@ msgstr ""
6333
msgid "unable to dequote value of '%s'"
6334
msgstr ""
6335
6251
-#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
6336
+#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710
6337
#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
6338
#, c-format
6339
msgid "could not open '%s' for reading"
@@ -7005,106 +7090,106 @@ msgstr ""
7090
msgid "this operation must be run in a work tree"
7091
msgstr ""
7092
7008
-#: setup.c:569
7093
+#: setup.c:604
7094
#, c-format
7095
msgid "Expected git repo version <= %d, found %d"
7096
msgstr ""
7097
7013
-#: setup.c:577
7098
+#: setup.c:612
7099
msgid "unknown repository extensions found:"
7100
msgstr ""
7101
7017
-#: setup.c:596
7102
+#: setup.c:631
7103
#, c-format
7104
msgid "error opening '%s'"
7105
msgstr ""
7106
7022
-#: setup.c:598
7107
+#: setup.c:633
7108
#, c-format
7109
msgid "too large to be a .git file: '%s'"
7110
msgstr ""
7111
7027
-#: setup.c:600
7112
+#: setup.c:635
7113
#, c-format
7114
msgid "error reading %s"
7115
msgstr ""
7116
7032
-#: setup.c:602
7117
+#: setup.c:637
7118
#, c-format
7119
msgid "invalid gitfile format: %s"
7120
msgstr ""
7121
7037
-#: setup.c:604
7122
+#: setup.c:639
7123
#, c-format
7124
msgid "no path in gitfile: %s"
7125
msgstr ""
7126
7042
-#: setup.c:606
7127
+#: setup.c:641
7128
#, c-format
7129
msgid "not a git repository: %s"
7130
msgstr ""
7131
7047
-#: setup.c:708
7132
+#: setup.c:743
7133
#, c-format
7134
msgid "'$%s' too big"
7135
msgstr ""
7136
7052
-#: setup.c:722
7137
+#: setup.c:757
7138
#, c-format
7139
msgid "not a git repository: '%s'"
7140
msgstr ""
7141
7057
-#: setup.c:751 setup.c:753 setup.c:784
7142
+#: setup.c:786 setup.c:788 setup.c:819
7143
#, c-format
7144
msgid "cannot chdir to '%s'"
7145
msgstr ""
7146
7062
-#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
7147
+#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904
7148
msgid "cannot come back to cwd"
7149
msgstr ""
7150
7066
-#: setup.c:883
7151
+#: setup.c:918
7152
#, c-format
7153
msgid "failed to stat '%*s%s%s'"
7154
msgstr ""
7155
7071
-#: setup.c:1121
7156
+#: setup.c:1156
7157
msgid "Unable to read current working directory"
7158
msgstr ""
7159
7075
-#: setup.c:1130 setup.c:1136
7160
+#: setup.c:1165 setup.c:1171
7161
#, c-format
7162
msgid "cannot change to '%s'"
7163
msgstr ""
7164
7080
-#: setup.c:1141
7165
+#: setup.c:1176
7166
#, c-format
7167
msgid "not a git repository (or any of the parent directories): %s"
7168
msgstr ""
7169
7085
-#: setup.c:1147
7170
+#: setup.c:1182
7171
#, c-format
7172
msgid ""
7173
"not a git repository (or any parent up to mount point %s)\n"
7174
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
7175
msgstr ""
7176
7092
-#: setup.c:1258
7177
+#: setup.c:1293
7178
#, c-format
7179
msgid ""
7180
"problem with core.sharedRepository filemode value (0%.3o).\n"
7181
"The owner of files must always have read and write permissions."
7182
msgstr ""
7183
7099
-#: setup.c:1304
7184
+#: setup.c:1340
7185
msgid "open /dev/null or dup failed"
7186
msgstr ""
7187
7103
-#: setup.c:1319
7188
+#: setup.c:1355
7189
msgid "fork failed"
7190
msgstr ""
7191
7107
-#: setup.c:1324
7192
+#: setup.c:1360
7193
msgid "setsid failed"
7194
msgstr ""
7195
@@ -7284,7 +7369,7 @@ msgstr ""
7369
msgid "confused by unstable object source data for %s"
7370
msgstr ""
7371
7287
-#: sha1-file.c:1906 builtin/pack-objects.c:1055
7372
+#: sha1-file.c:1906 builtin/pack-objects.c:1085
7373
#, c-format
7374
msgid "failed utime() on %s"
7375
msgstr ""
@@ -7445,43 +7530,43 @@ msgid "invalid object name '%.*s'."
7530
msgstr ""
7531
7532
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
7448
-#: strbuf.c:853
7533
+#: strbuf.c:848
7534
#, c-format
7535
msgid "%u.%2.2u GiB"
7536
msgstr ""
7537
7538
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
7454
-#: strbuf.c:855
7539
+#: strbuf.c:850
7540
#, c-format
7541
msgid "%u.%2.2u GiB/s"
7542
msgstr ""
7543
7544
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
7460
-#: strbuf.c:863
7545
+#: strbuf.c:858
7546
#, c-format
7547
msgid "%u.%2.2u MiB"
7548
msgstr ""
7549
7550
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
7466
-#: strbuf.c:865
7551
+#: strbuf.c:860
7552
#, c-format
7553
msgid "%u.%2.2u MiB/s"
7554
msgstr ""
7555
7556
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
7472
-#: strbuf.c:872
7557
+#: strbuf.c:867
7558
#, c-format
7559
msgid "%u.%2.2u KiB"
7560
msgstr ""
7561
7562
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
7478
-#: strbuf.c:874
7563
+#: strbuf.c:869
7564
#, c-format
7565
msgid "%u.%2.2u KiB/s"
7566
msgstr ""
7567
7568
#. TRANSLATORS: IEC 80000-13:2008 byte
7484
-#: strbuf.c:880
7569
+#: strbuf.c:875
7570
#, c-format
7571
msgid "%u byte"
7572
msgid_plural "%u bytes"
@@ -7489,14 +7574,14 @@ msgstr[0] ""
7574
msgstr[1] ""
7575
7576
#. TRANSLATORS: IEC 80000-13:2008 byte/second
7492
-#: strbuf.c:882
7577
+#: strbuf.c:877
7578
#, c-format
7579
msgid "%u byte/s"
7580
msgid_plural "%u bytes/s"
7581
msgstr[0] ""
7582
msgstr[1] ""
7583
7499
-#: strbuf.c:1180
7584
+#: strbuf.c:1175
7585
#, c-format
7586
msgid "could not edit '%s'"
7587
msgstr ""
@@ -7730,7 +7815,7 @@ msgstr ""
7815
msgid "could not read from stdin"
7816
msgstr ""
7817
7733
-#: trailer.c:1011 wrapper.c:665
7818
+#: trailer.c:1011 wrapper.c:673
7819
#, c-format
7820
msgid "could not stat %s"
7821
msgstr ""
@@ -7754,175 +7839,180 @@ msgstr ""
7839
msgid "could not rename temporary file to %s"
7840
msgstr ""
7841
7757
-#: transport-helper.c:61 transport-helper.c:90
7842
+#: transport-helper.c:62 transport-helper.c:91
7843
msgid "full write to remote helper failed"
7844
msgstr ""
7845
7761
-#: transport-helper.c:144
7846
+#: transport-helper.c:145
7847
#, c-format
7848
msgid "unable to find remote helper for '%s'"
7849
msgstr ""
7850
7766
-#: transport-helper.c:160 transport-helper.c:571
7851
+#: transport-helper.c:161 transport-helper.c:575
7852
msgid "can't dup helper output fd"
7853
msgstr ""
7854
7770
-#: transport-helper.c:211
7855
+#: transport-helper.c:214
7856
#, c-format
7857
msgid ""
7858
"unknown mandatory capability %s; this remote helper probably needs newer "
7859
"version of Git"
7860
msgstr ""
7861
7777
-#: transport-helper.c:217
7862
+#: transport-helper.c:220
7863
msgid "this remote helper should implement refspec capability"
7864
msgstr ""
7865
7781
-#: transport-helper.c:284 transport-helper.c:425
7866
+#: transport-helper.c:287 transport-helper.c:429
7867
#, c-format
7868
msgid "%s unexpectedly said: '%s'"
7869
msgstr ""
7870
7786
-#: transport-helper.c:414
7871
+#: transport-helper.c:417
7872
#, c-format
7873
msgid "%s also locked %s"
7874
msgstr ""
7875
7791
-#: transport-helper.c:493
7876
+#: transport-helper.c:497
7877
msgid "couldn't run fast-import"
7878
msgstr ""
7879
7795
-#: transport-helper.c:516
7880
+#: transport-helper.c:520
7881
msgid "error while running fast-import"
7882
msgstr ""
7883
7799
-#: transport-helper.c:545 transport-helper.c:1135
7884
+#: transport-helper.c:549 transport-helper.c:1156
7885
#, c-format
7886
msgid "could not read ref %s"
7887
msgstr ""
7888
7804
-#: transport-helper.c:590
7889
+#: transport-helper.c:594
7890
#, c-format
7891
msgid "unknown response to connect: %s"
7892
msgstr ""
7893
7809
-#: transport-helper.c:612
7894
+#: transport-helper.c:616
7895
msgid "setting remote service path not supported by protocol"
7896
msgstr ""
7897
7813
-#: transport-helper.c:614
7898
+#: transport-helper.c:618
7899
msgid "invalid remote service path"
7900
msgstr ""
7901
7817
-#: transport-helper.c:657 transport.c:1339
7902
+#: transport-helper.c:661 transport.c:1347
7903
msgid "operation not supported by protocol"
7904
msgstr ""
7905
7821
-#: transport-helper.c:660
7906
+#: transport-helper.c:664
7907
#, c-format
7908
msgid "can't connect to subservice %s"
7909
msgstr ""
7910
7826
-#: transport-helper.c:736
7911
+#: transport-helper.c:740
7912
#, c-format
7913
msgid "expected ok/error, helper said '%s'"
7914
msgstr ""
7915
7831
-#: transport-helper.c:789
7916
+#: transport-helper.c:793
7917
#, c-format
7918
msgid "helper reported unexpected status of %s"
7919
msgstr ""
7920
7836
-#: transport-helper.c:850
7921
+#: transport-helper.c:854
7922
#, c-format
7923
msgid "helper %s does not support dry-run"
7924
msgstr ""
7925
7841
-#: transport-helper.c:853
7926
+#: transport-helper.c:857
7927
#, c-format
7928
msgid "helper %s does not support --signed"
7929
msgstr ""
7930
7846
-#: transport-helper.c:856
7931
+#: transport-helper.c:860
7932
#, c-format
7933
msgid "helper %s does not support --signed=if-asked"
7934
msgstr ""
7935
7851
-#: transport-helper.c:861
7936
+#: transport-helper.c:865
7937
#, c-format
7938
msgid "helper %s does not support --atomic"
7939
msgstr ""
7940
7856
-#: transport-helper.c:867
7941
+#: transport-helper.c:871
7942
#, c-format
7943
msgid "helper %s does not support 'push-option'"
7944
msgstr ""
7945
7861
-#: transport-helper.c:966
7946
+#: transport-helper.c:970
7947
msgid "remote-helper doesn't support push; refspec needed"
7948
msgstr ""
7949
7865
-#: transport-helper.c:971
7950
+#: transport-helper.c:975
7951
#, c-format
7952
msgid "helper %s does not support 'force'"
7953
msgstr ""
7954
7870
-#: transport-helper.c:1018
7955
+#: transport-helper.c:1022
7956
msgid "couldn't run fast-export"
7957
msgstr ""
7958
7874
-#: transport-helper.c:1023
7959
+#: transport-helper.c:1027
7960
msgid "error while running fast-export"
7961
msgstr ""
7962
7878
-#: transport-helper.c:1048
7963
+#: transport-helper.c:1052
7964
#, c-format
7965
msgid ""
7966
"No refs in common and none specified; doing nothing.\n"
7882
-"Perhaps you should specify a branch such as 'master'.\n"
7967
+"Perhaps you should specify a branch.\n"
7968
msgstr ""
7969
7885
-#: transport-helper.c:1121
7970
+#: transport-helper.c:1133
7971
+#, c-format
7972
+msgid "unsupported object format '%s'"
7973
+msgstr ""
7974
+
7975
+#: transport-helper.c:1142
7976
#, c-format
7977
msgid "malformed response in ref list: %s"
7978
msgstr ""
7979
7890
-#: transport-helper.c:1273
7980
+#: transport-helper.c:1294
7981
#, c-format
7982
msgid "read(%s) failed"
7983
msgstr ""
7984
7895
-#: transport-helper.c:1300
7985
+#: transport-helper.c:1321
7986
#, c-format
7987
msgid "write(%s) failed"
7988
msgstr ""
7989
7900
-#: transport-helper.c:1349
7990
+#: transport-helper.c:1370
7991
#, c-format
7992
msgid "%s thread failed"
7993
msgstr ""
7994
7905
-#: transport-helper.c:1353
7995
+#: transport-helper.c:1374
7996
#, c-format
7997
msgid "%s thread failed to join: %s"
7998
msgstr ""
7999
7910
-#: transport-helper.c:1372 transport-helper.c:1376
8000
+#: transport-helper.c:1393 transport-helper.c:1397
8001
#, c-format
8002
msgid "can't start thread for copying data: %s"
8003
msgstr ""
8004
7915
-#: transport-helper.c:1413
8005
+#: transport-helper.c:1434
8006
#, c-format
8007
msgid "%s process failed to wait"
8008
msgstr ""
8009
7920
-#: transport-helper.c:1417
8010
+#: transport-helper.c:1438
8011
#, c-format
8012
msgid "%s process failed"
8013
msgstr ""
8014
7925
-#: transport-helper.c:1435 transport-helper.c:1444
8015
+#: transport-helper.c:1456 transport-helper.c:1465
8016
msgid "can't start thread for copying data"
8017
msgstr ""
8018
@@ -7936,33 +8026,33 @@ msgstr ""
8026
msgid "could not read bundle '%s'"
8027
msgstr ""
8028
7939
-#: transport.c:214
8029
+#: transport.c:220
8030
#, c-format
8031
msgid "transport: invalid depth option '%s'"
8032
msgstr ""
8033
7944
-#: transport.c:266
8034
+#: transport.c:272
8035
msgid "see protocol.version in 'git help config' for more details"
8036
msgstr ""
8037
7948
-#: transport.c:267
8038
+#: transport.c:273
8039
msgid "server options require protocol version 2 or later"
8040
msgstr ""
8041
7952
-#: transport.c:632
8042
+#: transport.c:631
8043
msgid "could not parse transport.color.* config"
8044
msgstr ""
8045
7956
-#: transport.c:705
8046
+#: transport.c:704
8047
msgid "support for protocol v2 not implemented yet"
8048
msgstr ""
8049
7960
-#: transport.c:839
8050
+#: transport.c:838
8051
#, c-format
8052
msgid "unknown value for config '%s': %s"
8053
msgstr ""
8054
7965
-#: transport.c:905
8055
+#: transport.c:904
8056
#, c-format
8057
msgid "transport '%s' not allowed"
8058
msgstr ""
@@ -7971,14 +8061,14 @@ msgstr ""
8061
msgid "git-over-rsync is no longer supported"
8062
msgstr ""
8063
7974
-#: transport.c:1052
8064
+#: transport.c:1059
8065
#, c-format
8066
msgid ""
8067
"The following submodule paths contain changes that can\n"
8068
"not be found on any remote:\n"
8069
msgstr ""
8070
7981
-#: transport.c:1056
8071
+#: transport.c:1063
8072
#, c-format
8073
msgid ""
8074
"\n"
@@ -7994,11 +8084,11 @@ msgid ""
8084
"\n"
8085
msgstr ""
8086
7997
-#: transport.c:1064
8087
+#: transport.c:1071
8088
msgid "Aborting."
8089
msgstr ""
8090
8001
-#: transport.c:1209
8091
+#: transport.c:1216
8092
msgid "failed to push all needed submodules"
8093
msgstr ""
8094
@@ -8215,7 +8305,7 @@ msgstr ""
8305
msgid "Updating index flags"
8306
msgstr ""
8307
8218
-#: upload-pack.c:1337
8308
+#: upload-pack.c:1415
8309
msgid "expected flush after fetch arguments"
8310
msgstr ""
8311
@@ -8252,47 +8342,47 @@ msgstr ""
8342
msgid "Fetching objects"
8343
msgstr ""
8344
8255
-#: worktree.c:262 builtin/am.c:2098
8345
+#: worktree.c:248 builtin/am.c:2098
8346
#, c-format
8347
msgid "failed to read '%s'"
8348
msgstr ""
8349
8260
-#: worktree.c:309
8350
+#: worktree.c:295
8351
#, c-format
8352
msgid "'%s' at main working tree is not the repository directory"
8353
msgstr ""
8354
8265
-#: worktree.c:320
8355
+#: worktree.c:306
8356
#, c-format
8357
msgid "'%s' file does not contain absolute path to the working tree location"
8358
msgstr ""
8359
8270
-#: worktree.c:332
8360
+#: worktree.c:318
8361
#, c-format
8362
msgid "'%s' does not exist"
8363
msgstr ""
8364
8275
-#: worktree.c:338
8365
+#: worktree.c:324
8366
#, c-format
8367
msgid "'%s' is not a .git file, error code %d"
8368
msgstr ""
8369
8280
-#: worktree.c:347
8370
+#: worktree.c:333
8371
#, c-format
8372
msgid "'%s' does not point back to '%s'"
8373
msgstr ""
8374
8285
-#: wrapper.c:186 wrapper.c:356
8375
+#: wrapper.c:194 wrapper.c:364
8376
#, c-format
8377
msgid "could not open '%s' for reading and writing"
8378
msgstr ""
8379
8290
-#: wrapper.c:387 wrapper.c:588
8380
+#: wrapper.c:395 wrapper.c:596
8381
#, c-format
8382
msgid "unable to access '%s'"
8383
msgstr ""
8384
8295
-#: wrapper.c:596
8385
+#: wrapper.c:604
8386
msgid "unable to get current working directory"
8387
msgstr ""
8388
@@ -8659,39 +8749,44 @@ msgstr ""
8749
msgid " (use \"git bisect reset\" to get back to the original branch)"
8750
msgstr ""
8751
8662
-#: wt-status.c:1692
8752
+#: wt-status.c:1494
8753
+#, c-format
8754
+msgid "You are in a sparse checkout with %d%% of tracked files present."
8755
+msgstr ""
8756
+
8757
+#: wt-status.c:1733
8758
msgid "On branch "
8759
msgstr ""
8760
8666
-#: wt-status.c:1699
8761
+#: wt-status.c:1740
8762
msgid "interactive rebase in progress; onto "
8763
msgstr ""
8764
8670
-#: wt-status.c:1701
8765
+#: wt-status.c:1742
8766
msgid "rebase in progress; onto "
8767
msgstr ""
8768
8674
-#: wt-status.c:1711
8769
+#: wt-status.c:1752
8770
msgid "Not currently on any branch."
8771
msgstr ""
8772
8678
-#: wt-status.c:1728
8773
+#: wt-status.c:1769
8774
msgid "Initial commit"
8775
msgstr ""
8776
8682
-#: wt-status.c:1729
8777
+#: wt-status.c:1770
8778
msgid "No commits yet"
8779
msgstr ""
8780
8686
-#: wt-status.c:1743
8781
+#: wt-status.c:1784
8782
msgid "Untracked files"
8783
msgstr ""
8784
8690
-#: wt-status.c:1745
8785
+#: wt-status.c:1786
8786
msgid "Ignored files"
8787
msgstr ""
8788
8694
-#: wt-status.c:1749
8789
+#: wt-status.c:1790
8790
#, c-format
8791
msgid ""
8792
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8699,92 +8794,92 @@ msgid ""
8794
"new files yourself (see 'git help status')."
8795
msgstr ""
8796
8702
-#: wt-status.c:1755
8797
+#: wt-status.c:1796
8798
#, c-format
8799
msgid "Untracked files not listed%s"
8800
msgstr ""
8801
8707
-#: wt-status.c:1757
8802
+#: wt-status.c:1798
8803
msgid " (use -u option to show untracked files)"
8804
msgstr ""
8805
8711
-#: wt-status.c:1763
8806
+#: wt-status.c:1804
8807
msgid "No changes"
8808
msgstr ""
8809
8715
-#: wt-status.c:1768
8810
+#: wt-status.c:1809
8811
#, c-format
8812
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
8813
msgstr ""
8814
8720
-#: wt-status.c:1771
8815
+#: wt-status.c:1812
8816
#, c-format
8817
msgid "no changes added to commit\n"
8818
msgstr ""
8819
8725
-#: wt-status.c:1774
8820
+#: wt-status.c:1815
8821
#, c-format
8822
msgid ""
8823
"nothing added to commit but untracked files present (use \"git add\" to "
8824
"track)\n"
8825
msgstr ""
8826
8732
-#: wt-status.c:1777
8827
+#: wt-status.c:1818
8828
#, c-format
8829
msgid "nothing added to commit but untracked files present\n"
8830
msgstr ""
8831
8737
-#: wt-status.c:1780
8832
+#: wt-status.c:1821
8833
#, c-format
8834
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
8835
msgstr ""
8836
8742
-#: wt-status.c:1783 wt-status.c:1788
8837
+#: wt-status.c:1824 wt-status.c:1829
8838
#, c-format
8839
msgid "nothing to commit\n"
8840
msgstr ""
8841
8747
-#: wt-status.c:1786
8842
+#: wt-status.c:1827
8843
#, c-format
8844
msgid "nothing to commit (use -u to show untracked files)\n"
8845
msgstr ""
8846
8752
-#: wt-status.c:1790
8847
+#: wt-status.c:1831
8848
#, c-format
8849
msgid "nothing to commit, working tree clean\n"
8850
msgstr ""
8851
8757
-#: wt-status.c:1903
8852
+#: wt-status.c:1944
8853
msgid "No commits yet on "
8854
msgstr ""
8855
8761
-#: wt-status.c:1907
8856
+#: wt-status.c:1948
8857
msgid "HEAD (no branch)"
8858
msgstr ""
8859
8765
-#: wt-status.c:1938
8860
+#: wt-status.c:1979
8861
msgid "different"
8862
msgstr ""
8863
8769
-#: wt-status.c:1940 wt-status.c:1948
8864
+#: wt-status.c:1981 wt-status.c:1989
8865
msgid "behind "
8866
msgstr ""
8867
8773
-#: wt-status.c:1943 wt-status.c:1946
8868
+#: wt-status.c:1984 wt-status.c:1987
8869
msgid "ahead "
8870
msgstr ""
8871
8872
#. TRANSLATORS: the action is e.g. "pull with rebase"
8778
-#: wt-status.c:2468
8873
+#: wt-status.c:2509
8874
#, c-format
8875
msgid "cannot %s: You have unstaged changes."
8876
msgstr ""
8877
8783
-#: wt-status.c:2474
8878
+#: wt-status.c:2515
8879
msgid "additionally, your index contains uncommitted changes."
8880
msgstr ""
8881
8787
-#: wt-status.c:2476
8882
+#: wt-status.c:2517
8883
#, c-format
8884
msgid "cannot %s: Your index contains uncommitted changes."
8885
msgstr ""
@@ -8861,7 +8956,7 @@ msgstr ""
8956
msgid "interactive picking"
8957
msgstr ""
8958
8864
-#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
8959
+#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308
8960
msgid "select hunks interactively"
8961
msgstr ""
8962
@@ -8972,12 +9067,12 @@ msgstr ""
9067
msgid "--chmod param '%s' must be either -x or +x"
9068
msgstr ""
9069
8975
-#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351
9070
+#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351
9071
#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
9072
msgid "--pathspec-from-file is incompatible with pathspec arguments"
9073
msgstr ""
9074
8980
-#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357
9075
+#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357
9076
#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
9077
msgid "--pathspec-file-nul requires --pathspec-from-file"
9078
msgstr ""
@@ -9221,7 +9316,7 @@ msgstr ""
9316
msgid "allow fall back on 3way merging if needed"
9317
msgstr ""
9318
9224
-#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
9319
+#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16
9320
#: builtin/repack.c:306 builtin/stash.c:816
9321
msgid "be quiet"
9322
msgstr ""
@@ -9276,7 +9371,7 @@ msgstr ""
9371
9372
#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
9373
#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
9279
-#: bugreport.c:131
9374
+#: bugreport.c:137
9375
msgid "format"
9376
msgstr ""
9377
@@ -9547,111 +9642,115 @@ msgid ""
9642
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
9643
msgstr ""
9644
9550
-#: builtin/bisect--helper.c:478
9645
+#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473
9646
+msgid "'' is not a valid term"
9647
+msgstr ""
9648
+
9649
+#: builtin/bisect--helper.c:483
9650
#, c-format
9651
msgid "unrecognized option: '%s'"
9652
msgstr ""
9653
9555
-#: builtin/bisect--helper.c:482
9654
+#: builtin/bisect--helper.c:487
9655
#, c-format
9656
msgid "'%s' does not appear to be a valid revision"
9657
msgstr ""
9658
9560
-#: builtin/bisect--helper.c:514
9659
+#: builtin/bisect--helper.c:519
9660
msgid "bad HEAD - I need a HEAD"
9661
msgstr ""
9662
9564
-#: builtin/bisect--helper.c:529
9663
+#: builtin/bisect--helper.c:534
9664
#, c-format
9665
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
9666
msgstr ""
9667
9569
-#: builtin/bisect--helper.c:550
9668
+#: builtin/bisect--helper.c:555
9669
msgid "won't bisect on cg-seek'ed tree"
9670
msgstr ""
9671
9573
-#: builtin/bisect--helper.c:553
9672
+#: builtin/bisect--helper.c:558
9673
msgid "bad HEAD - strange symbolic ref"
9674
msgstr ""
9675
9577
-#: builtin/bisect--helper.c:577
9676
+#: builtin/bisect--helper.c:582
9677
#, c-format
9678
msgid "invalid ref: '%s'"
9679
msgstr ""
9680
9582
-#: builtin/bisect--helper.c:633
9681
+#: builtin/bisect--helper.c:638
9682
msgid "perform 'git bisect next'"
9683
msgstr ""
9684
9586
-#: builtin/bisect--helper.c:635
9685
+#: builtin/bisect--helper.c:640
9686
msgid "write the terms to .git/BISECT_TERMS"
9687
msgstr ""
9688
9590
-#: builtin/bisect--helper.c:637
9689
+#: builtin/bisect--helper.c:642
9690
msgid "cleanup the bisection state"
9691
msgstr ""
9692
9594
-#: builtin/bisect--helper.c:639
9693
+#: builtin/bisect--helper.c:644
9694
msgid "check for expected revs"
9695
msgstr ""
9696
9598
-#: builtin/bisect--helper.c:641
9697
+#: builtin/bisect--helper.c:646
9698
msgid "reset the bisection state"
9699
msgstr ""
9700
9602
-#: builtin/bisect--helper.c:643
9701
+#: builtin/bisect--helper.c:648
9702
msgid "write out the bisection state in BISECT_LOG"
9703
msgstr ""
9704
9606
-#: builtin/bisect--helper.c:645
9705
+#: builtin/bisect--helper.c:650
9706
msgid "check and set terms in a bisection state"
9707
msgstr ""
9708
9610
-#: builtin/bisect--helper.c:647
9709
+#: builtin/bisect--helper.c:652
9710
msgid "check whether bad or good terms exist"
9711
msgstr ""
9712
9614
-#: builtin/bisect--helper.c:649
9713
+#: builtin/bisect--helper.c:654
9714
msgid "print out the bisect terms"
9715
msgstr ""
9716
9618
-#: builtin/bisect--helper.c:651
9717
+#: builtin/bisect--helper.c:656
9718
msgid "start the bisect session"
9719
msgstr ""
9720
9622
-#: builtin/bisect--helper.c:653
9721
+#: builtin/bisect--helper.c:658
9722
msgid "update BISECT_HEAD instead of checking out the current commit"
9723
msgstr ""
9724
9626
-#: builtin/bisect--helper.c:655
9725
+#: builtin/bisect--helper.c:660
9726
msgid "no log for BISECT_WRITE"
9727
msgstr ""
9728
9630
-#: builtin/bisect--helper.c:673
9729
+#: builtin/bisect--helper.c:678
9730
msgid "--write-terms requires two arguments"
9731
msgstr ""
9732
9634
-#: builtin/bisect--helper.c:677
9733
+#: builtin/bisect--helper.c:682
9734
msgid "--bisect-clean-state requires no arguments"
9735
msgstr ""
9736
9638
-#: builtin/bisect--helper.c:684
9737
+#: builtin/bisect--helper.c:689
9738
msgid "--bisect-reset requires either no argument or a commit"
9739
msgstr ""
9740
9642
-#: builtin/bisect--helper.c:688
9741
+#: builtin/bisect--helper.c:693
9742
msgid "--bisect-write requires either 4 or 5 arguments"
9743
msgstr ""
9744
9646
-#: builtin/bisect--helper.c:694
9745
+#: builtin/bisect--helper.c:699
9746
msgid "--check-and-set-terms requires 3 arguments"
9747
msgstr ""
9748
9650
-#: builtin/bisect--helper.c:700
9749
+#: builtin/bisect--helper.c:705
9750
msgid "--bisect-next-check requires 2 or 3 arguments"
9751
msgstr ""
9752
9654
-#: builtin/bisect--helper.c:706
9753
+#: builtin/bisect--helper.c:711
9754
msgid "--bisect-terms requires 0 or 1 argument"
9755
msgstr ""
9756
@@ -10235,19 +10334,19 @@ msgstr ""
10334
msgid "git bundle unbundle <file> [<refname>...]"
10335
msgstr ""
10336
10238
-#: builtin/bundle.c:66 builtin/pack-objects.c:3376
10337
+#: builtin/bundle.c:66 builtin/pack-objects.c:3448
10338
msgid "do not show progress meter"
10339
msgstr ""
10340
10242
-#: builtin/bundle.c:68 builtin/pack-objects.c:3378
10341
+#: builtin/bundle.c:68 builtin/pack-objects.c:3450
10342
msgid "show progress meter"
10343
msgstr ""
10344
10246
-#: builtin/bundle.c:70 builtin/pack-objects.c:3380
10345
+#: builtin/bundle.c:70 builtin/pack-objects.c:3452
10346
msgid "show progress meter during object writing phase"
10347
msgstr ""
10348
10250
-#: builtin/bundle.c:73 builtin/pack-objects.c:3383
10349
+#: builtin/bundle.c:73 builtin/pack-objects.c:3455
10350
msgid "similar to --all-progress when progress meter is shown"
10351
msgstr ""
10352
@@ -10285,8 +10384,8 @@ msgstr ""
10384
10385
#: builtin/cat-file.c:599
10386
msgid ""
10288
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10289
-"filters]"
10387
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
10388
+"symlinks] [--textconv | --filters]"
10389
msgstr ""
10390
10391
#: builtin/cat-file.c:620
@@ -10321,7 +10420,7 @@ msgstr ""
10420
msgid "for blob objects, run filters on object's content"
10421
msgstr ""
10422
10324
-#: builtin/cat-file.c:648 git-submodule.sh:984
10423
+#: builtin/cat-file.c:648 git-submodule.sh:958
10424
msgid "blob"
10425
msgstr ""
10426
@@ -10381,8 +10480,8 @@ msgstr ""
10480
msgid "terminate input and output records by a NUL character"
10481
msgstr ""
10482
10384
-#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537
10385
-#: builtin/worktree.c:502
10483
+#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537
10484
+#: builtin/worktree.c:561
10485
msgid "suppress progress reporting"
10486
msgstr ""
10487
@@ -10474,7 +10573,7 @@ msgstr ""
10573
#: builtin/checkout-index.c:178 builtin/column.c:31
10574
#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
10575
#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
10477
-#: builtin/worktree.c:675
10576
+#: builtin/worktree.c:754
10577
msgid "string"
10578
msgstr ""
10579
@@ -10589,61 +10688,61 @@ msgstr ""
10688
msgid "path '%s' is unmerged"
10689
msgstr ""
10690
10592
-#: builtin/checkout.c:704
10691
+#: builtin/checkout.c:702
10692
msgid "you need to resolve your current index first"
10693
msgstr ""
10694
10596
-#: builtin/checkout.c:758
10695
+#: builtin/checkout.c:756
10696
#, c-format
10697
msgid ""
10698
"cannot continue with staged changes in the following files:\n"
10699
"%s"
10700
msgstr ""
10701
10603
-#: builtin/checkout.c:861
10702
+#: builtin/checkout.c:859
10703
#, c-format
10704
msgid "Can not do reflog for '%s': %s\n"
10705
msgstr ""
10706
10608
-#: builtin/checkout.c:903
10707
+#: builtin/checkout.c:901
10708
msgid "HEAD is now at"
10709
msgstr ""
10710
10612
-#: builtin/checkout.c:907 builtin/clone.c:720
10711
+#: builtin/checkout.c:905 builtin/clone.c:720
10712
msgid "unable to update HEAD"
10713
msgstr ""
10714
10616
-#: builtin/checkout.c:911
10715
+#: builtin/checkout.c:909
10716
#, c-format
10717
msgid "Reset branch '%s'\n"
10718
msgstr ""
10719
10621
-#: builtin/checkout.c:914
10720
+#: builtin/checkout.c:912
10721
#, c-format
10722
msgid "Already on '%s'\n"
10723
msgstr ""
10724
10626
-#: builtin/checkout.c:918
10725
+#: builtin/checkout.c:916
10726
#, c-format
10727
msgid "Switched to and reset branch '%s'\n"
10728
msgstr ""
10729
10631
-#: builtin/checkout.c:920 builtin/checkout.c:1344
10730
+#: builtin/checkout.c:918 builtin/checkout.c:1342
10731
#, c-format
10732
msgid "Switched to a new branch '%s'\n"
10733
msgstr ""
10734
10636
-#: builtin/checkout.c:922
10735
+#: builtin/checkout.c:920
10736
#, c-format
10737
msgid "Switched to branch '%s'\n"
10738
msgstr ""
10739
10641
-#: builtin/checkout.c:973
10740
+#: builtin/checkout.c:971
10741
#, c-format
10742
msgid " ... and %d more.\n"
10743
msgstr ""
10744
10646
-#: builtin/checkout.c:979
10745
+#: builtin/checkout.c:977
10746
#, c-format
10747
msgid ""
10748
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -10658,7 +10757,7 @@ msgid_plural ""
10757
msgstr[0] ""
10758
msgstr[1] ""
10759
10661
-#: builtin/checkout.c:998
10760
+#: builtin/checkout.c:996
10761
#, c-format
10762
msgid ""
10763
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10675,26 +10774,26 @@ msgid_plural ""
10774
msgstr[0] ""
10775
msgstr[1] ""
10776
10678
-#: builtin/checkout.c:1033
10777
+#: builtin/checkout.c:1031
10778
msgid "internal error in revision walk"
10779
msgstr ""
10780
10682
-#: builtin/checkout.c:1037
10781
+#: builtin/checkout.c:1035
10782
msgid "Previous HEAD position was"
10783
msgstr ""
10784
10686
-#: builtin/checkout.c:1077 builtin/checkout.c:1339
10785
+#: builtin/checkout.c:1075 builtin/checkout.c:1337
10786
msgid "You are on a branch yet to be born"
10787
msgstr ""
10788
10690
-#: builtin/checkout.c:1152
10789
+#: builtin/checkout.c:1150
10790
#, c-format
10791
msgid ""
10792
"'%s' could be both a local file and a tracking branch.\n"
10793
"Please use -- (and optionally --no-guess) to disambiguate"
10794
msgstr ""
10795
10697
-#: builtin/checkout.c:1159
10796
+#: builtin/checkout.c:1157
10797
msgid ""
10798
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
10799
"you can do so by fully qualifying the name with the --track option:\n"
@@ -10706,286 +10805,287 @@ msgid ""
10805
"checkout.defaultRemote=origin in your config."
10806
msgstr ""
10807
10709
-#: builtin/checkout.c:1169
10808
+#: builtin/checkout.c:1167
10809
#, c-format
10810
msgid "'%s' matched multiple (%d) remote tracking branches"
10811
msgstr ""
10812
10714
-#: builtin/checkout.c:1235
10813
+#: builtin/checkout.c:1233
10814
msgid "only one reference expected"
10815
msgstr ""
10816
10718
-#: builtin/checkout.c:1252
10817
+#: builtin/checkout.c:1250
10818
#, c-format
10819
msgid "only one reference expected, %d given."
10820
msgstr ""
10821
10723
-#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451
10822
+#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510
10823
#, c-format
10824
msgid "invalid reference: %s"
10825
msgstr ""
10826
10728
-#: builtin/checkout.c:1311 builtin/checkout.c:1677
10827
+#: builtin/checkout.c:1309 builtin/checkout.c:1675
10828
#, c-format
10829
msgid "reference is not a tree: %s"
10830
msgstr ""
10831
10733
-#: builtin/checkout.c:1358
10832
+#: builtin/checkout.c:1356
10833
#, c-format
10834
msgid "a branch is expected, got tag '%s'"
10835
msgstr ""
10836
10738
-#: builtin/checkout.c:1360
10837
+#: builtin/checkout.c:1358
10838
#, c-format
10839
msgid "a branch is expected, got remote branch '%s'"
10840
msgstr ""
10841
10743
-#: builtin/checkout.c:1361 builtin/checkout.c:1369
10842
+#: builtin/checkout.c:1359 builtin/checkout.c:1367
10843
#, c-format
10844
msgid "a branch is expected, got '%s'"
10845
msgstr ""
10846
10748
-#: builtin/checkout.c:1364
10847
+#: builtin/checkout.c:1362
10848
#, c-format
10849
msgid "a branch is expected, got commit '%s'"
10850
msgstr ""
10851
10753
-#: builtin/checkout.c:1380
10852
+#: builtin/checkout.c:1378
10853
msgid ""
10854
"cannot switch branch while merging\n"
10855
"Consider \"git merge --quit\" or \"git worktree add\"."
10856
msgstr ""
10857
10759
-#: builtin/checkout.c:1384
10858
+#: builtin/checkout.c:1382
10859
msgid ""
10860
"cannot switch branch in the middle of an am session\n"
10861
"Consider \"git am --quit\" or \"git worktree add\"."
10862
msgstr ""
10863
10765
-#: builtin/checkout.c:1388
10864
+#: builtin/checkout.c:1386
10865
msgid ""
10866
"cannot switch branch while rebasing\n"
10867
"Consider \"git rebase --quit\" or \"git worktree add\"."
10868
msgstr ""
10869
10771
-#: builtin/checkout.c:1392
10870
+#: builtin/checkout.c:1390
10871
msgid ""
10872
"cannot switch branch while cherry-picking\n"
10873
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
10874
msgstr ""
10875
10777
-#: builtin/checkout.c:1396
10876
+#: builtin/checkout.c:1394
10877
msgid ""
10878
"cannot switch branch while reverting\n"
10879
"Consider \"git revert --quit\" or \"git worktree add\"."
10880
msgstr ""
10881
10783
-#: builtin/checkout.c:1400
10882
+#: builtin/checkout.c:1398
10883
msgid "you are switching branch while bisecting"
10884
msgstr ""
10885
10787
-#: builtin/checkout.c:1407
10886
+#: builtin/checkout.c:1405
10887
msgid "paths cannot be used with switching branches"
10888
msgstr ""
10889
10791
-#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
10890
+#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416
10891
#, c-format
10892
msgid "'%s' cannot be used with switching branches"
10893
msgstr ""
10894
10796
-#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
10797
-#: builtin/checkout.c:1433 builtin/checkout.c:1438
10895
+#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426
10896
+#: builtin/checkout.c:1431 builtin/checkout.c:1436
10897
#, c-format
10898
msgid "'%s' cannot be used with '%s'"
10899
msgstr ""
10900
10802
-#: builtin/checkout.c:1435
10901
+#: builtin/checkout.c:1433
10902
#, c-format
10903
msgid "'%s' cannot take <start-point>"
10904
msgstr ""
10905
10807
-#: builtin/checkout.c:1443
10906
+#: builtin/checkout.c:1441
10907
#, c-format
10908
msgid "Cannot switch branch to a non-commit '%s'"
10909
msgstr ""
10910
10812
-#: builtin/checkout.c:1450
10911
+#: builtin/checkout.c:1448
10912
msgid "missing branch or commit argument"
10913
msgstr ""
10914
10816
-#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
10817
-#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
10915
+#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82
10916
+#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288
10917
#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
10918
#: builtin/send-pack.c:173
10919
msgid "force progress reporting"
10920
msgstr ""
10921
10823
-#: builtin/checkout.c:1493
10922
+#: builtin/checkout.c:1491
10923
msgid "perform a 3-way merge with the new branch"
10924
msgstr ""
10925
10827
-#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322
10926
+#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322
10927
msgid "style"
10928
msgstr ""
10929
10831
-#: builtin/checkout.c:1495
10930
+#: builtin/checkout.c:1493
10931
msgid "conflict style (merge or diff3)"
10932
msgstr ""
10933
10835
-#: builtin/checkout.c:1507 builtin/worktree.c:499
10934
+#: builtin/checkout.c:1505 builtin/worktree.c:558
10935
msgid "detach HEAD at named commit"
10936
msgstr ""
10937
10839
-#: builtin/checkout.c:1508
10938
+#: builtin/checkout.c:1506
10939
msgid "set upstream info for new branch"
10940
msgstr ""
10941
10843
-#: builtin/checkout.c:1510
10942
+#: builtin/checkout.c:1508
10943
msgid "force checkout (throw away local modifications)"
10944
msgstr ""
10945
10847
-#: builtin/checkout.c:1512
10946
+#: builtin/checkout.c:1510
10947
msgid "new-branch"
10948
msgstr ""
10949
10851
-#: builtin/checkout.c:1512
10950
+#: builtin/checkout.c:1510
10951
msgid "new unparented branch"
10952
msgstr ""
10953
10855
-#: builtin/checkout.c:1514 builtin/merge.c:292
10954
+#: builtin/checkout.c:1512 builtin/merge.c:292
10955
msgid "update ignored files (default)"
10956
msgstr ""
10957
10859
-#: builtin/checkout.c:1517
10958
+#: builtin/checkout.c:1515
10959
msgid "do not check if another worktree is holding the given ref"
10960
msgstr ""
10961
10863
-#: builtin/checkout.c:1530
10962
+#: builtin/checkout.c:1528
10963
msgid "checkout our version for unmerged files"
10964
msgstr ""
10965
10867
-#: builtin/checkout.c:1533
10966
+#: builtin/checkout.c:1531
10967
msgid "checkout their version for unmerged files"
10968
msgstr ""
10969
10871
-#: builtin/checkout.c:1537
10970
+#: builtin/checkout.c:1535
10971
msgid "do not limit pathspecs to sparse entries only"
10972
msgstr ""
10973
10875
-#: builtin/checkout.c:1592
10974
+#: builtin/checkout.c:1590
10975
#, c-format
10976
msgid "-%c, -%c and --orphan are mutually exclusive"
10977
msgstr ""
10978
10880
-#: builtin/checkout.c:1596
10979
+#: builtin/checkout.c:1594
10980
msgid "-p and --overlay are mutually exclusive"
10981
msgstr ""
10982
10884
-#: builtin/checkout.c:1633
10983
+#: builtin/checkout.c:1631
10984
msgid "--track needs a branch name"
10985
msgstr ""
10986
10888
-#: builtin/checkout.c:1638
10987
+#: builtin/checkout.c:1636
10988
#, c-format
10989
msgid "missing branch name; try -%c"
10990
msgstr ""
10991
10893
-#: builtin/checkout.c:1670
10992
+#: builtin/checkout.c:1668
10993
#, c-format
10994
msgid "could not resolve %s"
10995
msgstr ""
10996
10898
-#: builtin/checkout.c:1686
10997
+#: builtin/checkout.c:1684
10998
msgid "invalid path specification"
10999
msgstr ""
11000
10902
-#: builtin/checkout.c:1693
11001
+#: builtin/checkout.c:1691
11002
#, c-format
11003
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11004
msgstr ""
11005
10907
-#: builtin/checkout.c:1697
11006
+#: builtin/checkout.c:1695
11007
#, c-format
11008
msgid "git checkout: --detach does not take a path argument '%s'"
11009
msgstr ""
11010
10912
-#: builtin/checkout.c:1706
11011
+#: builtin/checkout.c:1704
11012
msgid "--pathspec-from-file is incompatible with --detach"
11013
msgstr ""
11014
10916
-#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503
11015
+#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503
11016
msgid "--pathspec-from-file is incompatible with --patch"
11017
msgstr ""
11018
10920
-#: builtin/checkout.c:1720
11019
+#: builtin/checkout.c:1718
11020
msgid ""
11021
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
11022
"checking out of the index."
11023
msgstr ""
11024
10926
-#: builtin/checkout.c:1725
11025
+#: builtin/checkout.c:1723
11026
msgid "you must specify path(s) to restore"
11027
msgstr ""
11028
10930
-#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
10931
-#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
10932
-#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
11029
+#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800
11030
+#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170
11031
+#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554
11032
+#: builtin/worktree.c:556
11033
msgid "branch"
11034
msgstr ""
11035
10936
-#: builtin/checkout.c:1752
11036
+#: builtin/checkout.c:1750
11037
msgid "create and checkout a new branch"
11038
msgstr ""
11039
10940
-#: builtin/checkout.c:1754
11040
+#: builtin/checkout.c:1752
11041
msgid "create/reset and checkout a branch"
11042
msgstr ""
11043
10944
-#: builtin/checkout.c:1755
11044
+#: builtin/checkout.c:1753
11045
msgid "create reflog for new branch"
11046
msgstr ""
11047
10948
-#: builtin/checkout.c:1757
11048
+#: builtin/checkout.c:1755
11049
msgid "second guess 'git checkout <no-such-branch>' (default)"
11050
msgstr ""
11051
10952
-#: builtin/checkout.c:1758
11052
+#: builtin/checkout.c:1756
11053
msgid "use overlay mode (default)"
11054
msgstr ""
11055
10956
-#: builtin/checkout.c:1803
11056
+#: builtin/checkout.c:1801
11057
msgid "create and switch to a new branch"
11058
msgstr ""
11059
10960
-#: builtin/checkout.c:1805
11060
+#: builtin/checkout.c:1803
11061
msgid "create/reset and switch to a branch"
11062
msgstr ""
11063
10964
-#: builtin/checkout.c:1807
11064
+#: builtin/checkout.c:1805
11065
msgid "second guess 'git switch <no-such-branch>'"
11066
msgstr ""
11067
10968
-#: builtin/checkout.c:1809
11068
+#: builtin/checkout.c:1807
11069
msgid "throw away local modifications"
11070
msgstr ""
11071
10972
-#: builtin/checkout.c:1843
11072
+#: builtin/checkout.c:1841
11073
msgid "which tree-ish to checkout from"
11074
msgstr ""
11075
10976
-#: builtin/checkout.c:1845
11076
+#: builtin/checkout.c:1843
11077
msgid "restore the index"
11078
msgstr ""
11079
10980
-#: builtin/checkout.c:1847
11080
+#: builtin/checkout.c:1845
11081
msgid "restore the working tree (default)"
11082
msgstr ""
11083
10984
-#: builtin/checkout.c:1849
11084
+#: builtin/checkout.c:1847
11085
msgid "ignore unmerged entries"
11086
msgstr ""
11087
10988
-#: builtin/checkout.c:1850
11088
+#: builtin/checkout.c:1848
11089
msgid "use overlay mode"
11090
msgstr ""
11091
@@ -11128,22 +11228,22 @@ msgstr ""
11228
msgid "remove only ignored files"
11229
msgstr ""
11230
11131
-#: builtin/clean.c:931
11132
-msgid "-x and -X cannot be used together"
11133
-msgstr ""
11134
-
11135
-#: builtin/clean.c:935
11231
+#: builtin/clean.c:929
11232
msgid ""
11233
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
11234
"clean"
11235
msgstr ""
11236
11141
-#: builtin/clean.c:938
11237
+#: builtin/clean.c:932
11238
msgid ""
11239
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
11240
"refusing to clean"
11241
msgstr ""
11242
11243
+#: builtin/clean.c:944
11244
+msgid "-x and -X cannot be used together"
11245
+msgstr ""
11246
+
11247
#: builtin/clone.c:45
11248
msgid "git clone [<options>] [--] <repo> [<dir>]"
11249
msgstr ""
@@ -11152,7 +11252,7 @@ msgstr ""
11252
msgid "don't create a checkout"
11253
msgstr ""
11254
11155
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
11255
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554
11256
msgid "create a bare repository"
11257
msgstr ""
11258
@@ -11184,11 +11284,11 @@ msgstr ""
11284
msgid "number of submodules cloned in parallel"
11285
msgstr ""
11286
11187
-#: builtin/clone.c:111 builtin/init-db.c:533
11287
+#: builtin/clone.c:111 builtin/init-db.c:551
11288
msgid "template-directory"
11289
msgstr ""
11290
11191
-#: builtin/clone.c:112 builtin/init-db.c:534
11291
+#: builtin/clone.c:112 builtin/init-db.c:552
11292
msgid "directory from which templates will be used"
11293
msgstr ""
11294
@@ -11202,8 +11302,8 @@ msgstr ""
11302
msgid "use --reference only while cloning"
11303
msgstr ""
11304
11205
-#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
11206
-#: builtin/pack-objects.c:3442 builtin/repack.c:329
11305
+#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562
11306
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329
11307
msgid "name"
11308
msgstr ""
11309
@@ -11228,7 +11328,7 @@ msgstr ""
11328
msgid "create a shallow clone of that depth"
11329
msgstr ""
11330
11231
-#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
11331
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503
11332
#: builtin/pull.c:211
11333
msgid "time"
11334
msgstr ""
@@ -11259,11 +11359,11 @@ msgstr ""
11359
msgid "any cloned submodules will be shallow"
11360
msgstr ""
11361
11262
-#: builtin/clone.c:137 builtin/init-db.c:542
11362
+#: builtin/clone.c:137 builtin/init-db.c:560
11363
msgid "gitdir"
11364
msgstr ""
11365
11266
-#: builtin/clone.c:138 builtin/init-db.c:543
11366
+#: builtin/clone.c:138 builtin/init-db.c:561
11367
msgid "separate git dir from working tree"
11368
msgstr ""
11369
@@ -11385,7 +11485,7 @@ msgstr ""
11485
msgid "cannot unlink temporary alternates file"
11486
msgstr ""
11487
11388
-#: builtin/clone.c:971 builtin/receive-pack.c:1972
11488
+#: builtin/clone.c:971 builtin/receive-pack.c:1982
11489
msgid "Too many arguments."
11490
msgstr ""
11491
@@ -11402,83 +11502,83 @@ msgstr ""
11502
msgid "--bare and --separate-git-dir are incompatible."
11503
msgstr ""
11504
11405
-#: builtin/clone.c:1004
11505
+#: builtin/clone.c:1007
11506
#, c-format
11507
msgid "repository '%s' does not exist"
11508
msgstr ""
11509
11410
-#: builtin/clone.c:1010 builtin/fetch.c:1789
11510
+#: builtin/clone.c:1011 builtin/fetch.c:1794
11511
#, c-format
11512
msgid "depth %s is not a positive number"
11513
msgstr ""
11514
11415
-#: builtin/clone.c:1020
11515
+#: builtin/clone.c:1021
11516
#, c-format
11517
msgid "destination path '%s' already exists and is not an empty directory."
11518
msgstr ""
11519
11420
-#: builtin/clone.c:1030
11520
+#: builtin/clone.c:1033
11521
#, c-format
11522
msgid "working tree '%s' already exists."
11523
msgstr ""
11524
11425
-#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271
11426
-#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
11525
+#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271
11526
+#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386
11527
#, c-format
11528
msgid "could not create leading directories of '%s'"
11529
msgstr ""
11530
11431
-#: builtin/clone.c:1050
11531
+#: builtin/clone.c:1053
11532
#, c-format
11533
msgid "could not create work tree dir '%s'"
11534
msgstr ""
11535
11436
-#: builtin/clone.c:1070
11536
+#: builtin/clone.c:1073
11537
#, c-format
11538
msgid "Cloning into bare repository '%s'...\n"
11539
msgstr ""
11540
11441
-#: builtin/clone.c:1072
11541
+#: builtin/clone.c:1075
11542
#, c-format
11543
msgid "Cloning into '%s'...\n"
11544
msgstr ""
11545
11446
-#: builtin/clone.c:1096
11546
+#: builtin/clone.c:1099
11547
msgid ""
11548
"clone --recursive is not compatible with both --reference and --reference-if-"
11549
"able"
11550
msgstr ""
11551
11452
-#: builtin/clone.c:1160
11552
+#: builtin/clone.c:1164
11553
msgid "--depth is ignored in local clones; use file:// instead."
11554
msgstr ""
11555
11456
-#: builtin/clone.c:1162
11556
+#: builtin/clone.c:1166
11557
msgid "--shallow-since is ignored in local clones; use file:// instead."
11558
msgstr ""
11559
11460
-#: builtin/clone.c:1164
11560
+#: builtin/clone.c:1168
11561
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
11562
msgstr ""
11563
11464
-#: builtin/clone.c:1166
11564
+#: builtin/clone.c:1170
11565
msgid "--filter is ignored in local clones; use file:// instead."
11566
msgstr ""
11567
11468
-#: builtin/clone.c:1169
11568
+#: builtin/clone.c:1173
11569
msgid "source repository is shallow, ignoring --local"
11570
msgstr ""
11571
11472
-#: builtin/clone.c:1174
11572
+#: builtin/clone.c:1178
11573
msgid "--local is ignored"
11574
msgstr ""
11575
11476
-#: builtin/clone.c:1249 builtin/clone.c:1257
11576
+#: builtin/clone.c:1262 builtin/clone.c:1270
11577
#, c-format
11578
msgid "Remote branch %s not found in upstream %s"
11579
msgstr ""
11580
11481
-#: builtin/clone.c:1260
11581
+#: builtin/clone.c:1273
11582
msgid "You appear to have cloned an empty repository."
11583
msgstr ""
11584
@@ -11514,90 +11614,99 @@ msgstr ""
11614
msgid "--command must be the first argument"
11615
msgstr ""
11616
11517
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
11617
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:21
11618
msgid ""
11619
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
11620
msgstr ""
11621
11522
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
11622
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:26
11623
msgid ""
11624
"git commit-graph write [--object-dir <objdir>] [--append] [--"
11625
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
11626
"paths] [--[no-]progress] <split options>"
11627
msgstr ""
11628
11529
-#: builtin/commit-graph.c:60
11629
+#: builtin/commit-graph.c:62
11630
#, c-format
11631
msgid "could not find object directory matching %s"
11632
msgstr ""
11633
11534
-#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
11535
-#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
11634
+#: builtin/commit-graph.c:78 builtin/commit-graph.c:177
11635
+#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678
11636
msgid "dir"
11637
msgstr ""
11638
11539
-#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
11540
-#: builtin/commit-graph.c:258
11639
+#: builtin/commit-graph.c:79 builtin/commit-graph.c:178
11640
+#: builtin/commit-graph.c:277
11641
msgid "The object directory to store the graph"
11642
msgstr ""
11643
11544
-#: builtin/commit-graph.c:79
11644
+#: builtin/commit-graph.c:81
11645
msgid "if the commit-graph is split, only verify the tip file"
11646
msgstr ""
11647
11548
-#: builtin/commit-graph.c:102
11648
+#: builtin/commit-graph.c:104
11649
#, c-format
11650
msgid "Could not open commit-graph '%s'"
11651
msgstr ""
11652
11553
-#: builtin/commit-graph.c:136
11653
+#: builtin/commit-graph.c:138
11654
#, c-format
11655
msgid "unrecognized --split argument, %s"
11656
msgstr ""
11657
11558
-#: builtin/commit-graph.c:155
11658
+#: builtin/commit-graph.c:151
11659
+#, c-format
11660
+msgid "unexpected non-hex object ID: %s"
11661
+msgstr ""
11662
+
11663
+#: builtin/commit-graph.c:156
11664
+#, c-format
11665
+msgid "invalid object: %s"
11666
+msgstr ""
11667
+
11668
+#: builtin/commit-graph.c:180
11669
msgid "start walk at all refs"
11670
msgstr ""
11671
11562
-#: builtin/commit-graph.c:157
11672
+#: builtin/commit-graph.c:182
11673
msgid "scan pack-indexes listed by stdin for commits"
11674
msgstr ""
11675
11566
-#: builtin/commit-graph.c:159
11676
+#: builtin/commit-graph.c:184
11677
msgid "start walk at commits listed by stdin"
11678
msgstr ""
11679
11570
-#: builtin/commit-graph.c:161
11680
+#: builtin/commit-graph.c:186
11681
msgid "include all commits already in the commit-graph file"
11682
msgstr ""
11683
11574
-#: builtin/commit-graph.c:163
11684
+#: builtin/commit-graph.c:188
11685
msgid "enable computation for changed paths"
11686
msgstr ""
11687
11578
-#: builtin/commit-graph.c:166
11688
+#: builtin/commit-graph.c:191
11689
msgid "allow writing an incremental commit-graph file"
11690
msgstr ""
11691
11582
-#: builtin/commit-graph.c:170
11692
+#: builtin/commit-graph.c:195
11693
msgid "maximum number of commits in a non-base split commit-graph"
11694
msgstr ""
11695
11586
-#: builtin/commit-graph.c:172
11696
+#: builtin/commit-graph.c:197
11697
msgid "maximum ratio between two levels of a split commit-graph"
11698
msgstr ""
11699
11590
-#: builtin/commit-graph.c:174
11700
+#: builtin/commit-graph.c:199
11701
msgid "only expire files older than a given date-time"
11702
msgstr ""
11703
11594
-#: builtin/commit-graph.c:190
11704
+#: builtin/commit-graph.c:215
11705
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
11706
msgstr ""
11707
11598
-#: builtin/commit-graph.c:229
11599
-#, c-format
11600
-msgid "unexpected non-hex object ID: %s"
11708
+#: builtin/commit-graph.c:245
11709
+msgid "Collecting commits from input"
11710
msgstr ""
11711
11712
#: builtin/commit-tree.c:18
@@ -11962,7 +12071,7 @@ msgid "version"
12071
msgstr ""
12072
12073
#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
11965
-#: builtin/worktree.c:646
12074
+#: builtin/worktree.c:722
12075
msgid "machine-readable output"
12076
msgstr ""
12077
@@ -11975,8 +12084,8 @@ msgid "terminate entries with NUL"
12084
msgstr ""
12085
12086
#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
11978
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
11979
-#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
12087
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
12088
+#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336
12089
msgid "mode"
12090
msgstr ""
12091
@@ -12630,35 +12739,45 @@ msgstr ""
12739
msgid "--broken is incompatible with commit-ishes"
12740
msgstr ""
12741
12633
-#: builtin/diff.c:84
12742
+#: builtin/diff.c:91
12743
#, c-format
12744
msgid "'%s': not a regular file or symlink"
12745
msgstr ""
12746
12638
-#: builtin/diff.c:235
12747
+#: builtin/diff.c:242
12748
#, c-format
12749
msgid "invalid option: %s"
12750
msgstr ""
12751
12643
-#: builtin/diff.c:350
12752
+#: builtin/diff.c:359
12753
+#, c-format
12754
+msgid "%s...%s: no merge base"
12755
+msgstr ""
12756
+
12757
+#: builtin/diff.c:469
12758
msgid "Not a git repository"
12759
msgstr ""
12760
12647
-#: builtin/diff.c:394
12761
+#: builtin/diff.c:514
12762
#, c-format
12763
msgid "invalid object '%s' given."
12764
msgstr ""
12765
12652
-#: builtin/diff.c:403
12766
+#: builtin/diff.c:525
12767
#, c-format
12768
msgid "more than two blobs given: '%s'"
12769
msgstr ""
12770
12657
-#: builtin/diff.c:408
12771
+#: builtin/diff.c:530
12772
#, c-format
12773
msgid "unhandled object '%s' given."
12774
msgstr ""
12775
12776
+#: builtin/diff.c:564
12777
+#, c-format
12778
+msgid "%s...%s: multiple merge bases, using %s"
12779
+msgstr ""
12780
+
12781
#: builtin/difftool.c:30
12782
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
12783
msgstr ""
@@ -12801,82 +12920,103 @@ msgstr ""
12920
msgid "git fast-export [rev-list-opts]"
12921
msgstr ""
12922
12804
-#: builtin/fast-export.c:853
12923
+#: builtin/fast-export.c:868
12924
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
12925
msgstr ""
12926
12808
-#: builtin/fast-export.c:1152
12927
+#: builtin/fast-export.c:1178
12928
+msgid "--anonymize-map token cannot be empty"
12929
+msgstr ""
12930
+
12931
+#: builtin/fast-export.c:1198
12932
msgid "show progress after <n> objects"
12933
msgstr ""
12934
12812
-#: builtin/fast-export.c:1154
12935
+#: builtin/fast-export.c:1200
12936
msgid "select handling of signed tags"
12937
msgstr ""
12938
12816
-#: builtin/fast-export.c:1157
12939
+#: builtin/fast-export.c:1203
12940
msgid "select handling of tags that tag filtered objects"
12941
msgstr ""
12942
12820
-#: builtin/fast-export.c:1160
12943
+#: builtin/fast-export.c:1206
12944
msgid "select handling of commit messages in an alternate encoding"
12945
msgstr ""
12946
12824
-#: builtin/fast-export.c:1163
12947
+#: builtin/fast-export.c:1209
12948
msgid "Dump marks to this file"
12949
msgstr ""
12950
12828
-#: builtin/fast-export.c:1165
12951
+#: builtin/fast-export.c:1211
12952
msgid "Import marks from this file"
12953
msgstr ""
12954
12832
-#: builtin/fast-export.c:1169
12955
+#: builtin/fast-export.c:1215
12956
msgid "Import marks from this file if it exists"
12957
msgstr ""
12958
12836
-#: builtin/fast-export.c:1171
12959
+#: builtin/fast-export.c:1217
12960
msgid "Fake a tagger when tags lack one"
12961
msgstr ""
12962
12840
-#: builtin/fast-export.c:1173
12963
+#: builtin/fast-export.c:1219
12964
msgid "Output full tree for each commit"
12965
msgstr ""
12966
12844
-#: builtin/fast-export.c:1175
12967
+#: builtin/fast-export.c:1221
12968
msgid "Use the done feature to terminate the stream"
12969
msgstr ""
12970
12848
-#: builtin/fast-export.c:1176
12971
+#: builtin/fast-export.c:1222
12972
msgid "Skip output of blob data"
12973
msgstr ""
12974
12852
-#: builtin/fast-export.c:1177 builtin/log.c:1724
12975
+#: builtin/fast-export.c:1223 builtin/log.c:1724
12976
msgid "refspec"
12977
msgstr ""
12978
12856
-#: builtin/fast-export.c:1178
12979
+#: builtin/fast-export.c:1224
12980
msgid "Apply refspec to exported refs"
12981
msgstr ""
12982
12860
-#: builtin/fast-export.c:1179
12983
+#: builtin/fast-export.c:1225
12984
msgid "anonymize output"
12985
msgstr ""
12986
12864
-#: builtin/fast-export.c:1181
12987
+#: builtin/fast-export.c:1226
12988
+msgid "from:to"
12989
+msgstr ""
12990
+
12991
+#: builtin/fast-export.c:1227
12992
+msgid "convert <from> to <to> in anonymized output"
12993
+msgstr ""
12994
+
12995
+#: builtin/fast-export.c:1230
12996
msgid "Reference parents which are not in fast-export stream by object id"
12997
msgstr ""
12998
12868
-#: builtin/fast-export.c:1183
12999
+#: builtin/fast-export.c:1232
13000
msgid "Show original object ids of blobs/commits"
13001
msgstr ""
13002
12872
-#: builtin/fast-export.c:1185
13003
+#: builtin/fast-export.c:1234
13004
msgid "Label tags with mark ids"
13005
msgstr ""
13006
12876
-#: builtin/fast-export.c:1220
13007
+#: builtin/fast-export.c:1257
13008
+msgid "--anonymize-map without --anonymize does not make sense"
13009
+msgstr ""
13010
+
13011
+#: builtin/fast-export.c:1272
13012
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
13013
msgstr ""
13014
13015
+#: builtin/fetch-pack.c:245
13016
+#, c-format
13017
+msgid "Lockfile created but not reported: %s"
13018
+msgstr ""
13019
+
13020
#: builtin/fetch.c:35
13021
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
13022
msgstr ""
@@ -13185,40 +13325,40 @@ msgstr ""
13325
msgid "You need to specify a tag name."
13326
msgstr ""
13327
13188
-#: builtin/fetch.c:1773
13328
+#: builtin/fetch.c:1778
13329
msgid "Negative depth in --deepen is not supported"
13330
msgstr ""
13331
13192
-#: builtin/fetch.c:1775
13332
+#: builtin/fetch.c:1780
13333
msgid "--deepen and --depth are mutually exclusive"
13334
msgstr ""
13335
13196
-#: builtin/fetch.c:1780
13336
+#: builtin/fetch.c:1785
13337
msgid "--depth and --unshallow cannot be used together"
13338
msgstr ""
13339
13200
-#: builtin/fetch.c:1782
13340
+#: builtin/fetch.c:1787
13341
msgid "--unshallow on a complete repository does not make sense"
13342
msgstr ""
13343
13204
-#: builtin/fetch.c:1798
13344
+#: builtin/fetch.c:1800
13345
msgid "fetch --all does not take a repository argument"
13346
msgstr ""
13347
13208
-#: builtin/fetch.c:1800
13348
+#: builtin/fetch.c:1802
13349
msgid "fetch --all does not make sense with refspecs"
13350
msgstr ""
13351
13212
-#: builtin/fetch.c:1809
13352
+#: builtin/fetch.c:1811
13353
#, c-format
13354
msgid "No such remote or remote group: %s"
13355
msgstr ""
13356
13217
-#: builtin/fetch.c:1816
13357
+#: builtin/fetch.c:1818
13358
msgid "Fetching a group and specifying refspecs does not make sense"
13359
msgstr ""
13360
13221
-#: builtin/fetch.c:1834
13361
+#: builtin/fetch.c:1836
13362
msgid ""
13363
"--filter can only be used with the remote configured in extensions."
13364
"partialclone"
@@ -13658,8 +13798,8 @@ msgstr ""
13798
#. variable for tweaking threads, currently
13799
#. grep.threads
13800
#.
13661
-#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
13662
-#: builtin/pack-objects.c:2855
13801
+#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727
13802
+#: builtin/pack-objects.c:2904
13803
#, c-format
13804
msgid "no threads support, ignoring %s"
13805
msgstr ""
@@ -13888,11 +14028,11 @@ msgstr ""
14028
msgid "invalid option combination, ignoring --threads"
14029
msgstr ""
14030
13891
-#: builtin/grep.c:1084 builtin/pack-objects.c:3548
14031
+#: builtin/grep.c:1084 builtin/pack-objects.c:3623
14032
msgid "no threads support, ignoring --threads"
14033
msgstr ""
14034
13895
-#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
14035
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901
14036
#, c-format
14037
msgid "invalid number of threads specified (%d)"
14038
msgstr ""
@@ -14087,7 +14227,7 @@ msgstr ""
14227
msgid "used more bytes than were available"
14228
msgstr ""
14229
14090
-#: builtin/index-pack.c:288 builtin/pack-objects.c:607
14230
+#: builtin/index-pack.c:288 builtin/pack-objects.c:618
14231
msgid "pack too large for current definition of off_t"
14232
msgstr ""
14233
@@ -14158,8 +14298,8 @@ msgstr ""
14298
msgid "SHA1 COLLISION FOUND WITH %s !"
14299
msgstr ""
14300
14161
-#: builtin/index-pack.c:738 builtin/pack-objects.c:159
14162
-#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
14301
+#: builtin/index-pack.c:738 builtin/pack-objects.c:170
14302
+#: builtin/pack-objects.c:230 builtin/pack-objects.c:325
14303
#, c-format
14304
msgid "unable to read %s"
14305
msgstr ""
@@ -14220,7 +14360,7 @@ msgstr ""
14360
msgid "Resolving deltas"
14361
msgstr ""
14362
14223
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
14363
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665
14364
#, c-format
14365
msgid "unable to create thread: %s"
14366
msgstr ""
@@ -14285,58 +14425,67 @@ msgstr ""
14425
msgid "cannot store index file"
14426
msgstr ""
14427
14288
-#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
14428
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912
14429
#, c-format
14430
msgid "bad pack.indexversion=%<PRIu32>"
14431
msgstr ""
14432
14293
-#: builtin/index-pack.c:1596
14433
+#: builtin/index-pack.c:1592
14434
#, c-format
14435
msgid "Cannot open existing pack file '%s'"
14436
msgstr ""
14437
14298
-#: builtin/index-pack.c:1598
14438
+#: builtin/index-pack.c:1594
14439
#, c-format
14440
msgid "Cannot open existing pack idx file for '%s'"
14441
msgstr ""
14442
14303
-#: builtin/index-pack.c:1646
14443
+#: builtin/index-pack.c:1642
14444
#, c-format
14445
msgid "non delta: %d object"
14446
msgid_plural "non delta: %d objects"
14447
msgstr[0] ""
14448
msgstr[1] ""
14449
14310
-#: builtin/index-pack.c:1653
14450
+#: builtin/index-pack.c:1649
14451
#, c-format
14452
msgid "chain length = %d: %lu object"
14453
msgid_plural "chain length = %d: %lu objects"
14454
msgstr[0] ""
14455
msgstr[1] ""
14456
14317
-#: builtin/index-pack.c:1692
14457
+#: builtin/index-pack.c:1689
14458
msgid "Cannot come back to cwd"
14459
msgstr ""
14460
14321
-#: builtin/index-pack.c:1741 builtin/index-pack.c:1744
14322
-#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
14461
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
14462
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
14463
#, c-format
14464
msgid "bad %s"
14465
msgstr ""
14466
14327
-#: builtin/index-pack.c:1780
14328
-msgid "--fix-thin cannot be used without --stdin"
14467
+#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621
14468
+#, c-format
14469
+msgid "unknown hash algorithm '%s'"
14470
msgstr ""
14471
14472
#: builtin/index-pack.c:1782
14473
+msgid "--fix-thin cannot be used without --stdin"
14474
+msgstr ""
14475
+
14476
+#: builtin/index-pack.c:1784
14477
msgid "--stdin requires a git repository"
14478
msgstr ""
14479
14335
-#: builtin/index-pack.c:1788
14480
+#: builtin/index-pack.c:1786
14481
+msgid "--object-format cannot be used with --stdin"
14482
+msgstr ""
14483
+
14484
+#: builtin/index-pack.c:1792
14485
msgid "--verify with no packfile name given"
14486
msgstr ""
14487
14339
-#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
14488
+#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582
14489
msgid "fsck error in pack objects"
14490
msgstr ""
14491
@@ -14380,90 +14529,99 @@ msgstr ""
14529
msgid "not copying templates from '%s': %s"
14530
msgstr ""
14531
14383
-#: builtin/init-db.c:356
14532
+#: builtin/init-db.c:276
14533
+#, c-format
14534
+msgid "invalid initial branch name: '%s'"
14535
+msgstr ""
14536
+
14537
+#: builtin/init-db.c:368
14538
#, c-format
14539
msgid "unable to handle file type %d"
14540
msgstr ""
14541
14388
-#: builtin/init-db.c:359
14542
+#: builtin/init-db.c:371
14543
#, c-format
14544
msgid "unable to move %s to %s"
14545
msgstr ""
14546
14393
-#: builtin/init-db.c:374
14547
+#: builtin/init-db.c:386
14548
msgid "attempt to reinitialize repository with different hash"
14549
msgstr ""
14550
14397
-#: builtin/init-db.c:380 builtin/init-db.c:601
14551
+#: builtin/init-db.c:410 builtin/init-db.c:413
14552
#, c-format
14399
-msgid "unknown hash algorithm '%s'"
14553
+msgid "%s already exists"
14554
msgstr ""
14555
14402
-#: builtin/init-db.c:397 builtin/init-db.c:400
14556
+#: builtin/init-db.c:444
14557
#, c-format
14404
-msgid "%s already exists"
14558
+msgid "re-init: ignored --initial-branch=%s"
14559
msgstr ""
14560
14407
-#: builtin/init-db.c:458
14561
+#: builtin/init-db.c:475
14562
#, c-format
14563
msgid "Reinitialized existing shared Git repository in %s%s\n"
14564
msgstr ""
14565
14412
-#: builtin/init-db.c:459
14566
+#: builtin/init-db.c:476
14567
#, c-format
14568
msgid "Reinitialized existing Git repository in %s%s\n"
14569
msgstr ""
14570
14417
-#: builtin/init-db.c:463
14571
+#: builtin/init-db.c:480
14572
#, c-format
14573
msgid "Initialized empty shared Git repository in %s%s\n"
14574
msgstr ""
14575
14422
-#: builtin/init-db.c:464
14576
+#: builtin/init-db.c:481
14577
#, c-format
14578
msgid "Initialized empty Git repository in %s%s\n"
14579
msgstr ""
14580
14427
-#: builtin/init-db.c:513
14581
+#: builtin/init-db.c:530
14582
msgid ""
14583
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
14584
"shared[=<permissions>]] [<directory>]"
14585
msgstr ""
14586
14433
-#: builtin/init-db.c:538
14587
+#: builtin/init-db.c:556
14588
msgid "permissions"
14589
msgstr ""
14590
14437
-#: builtin/init-db.c:539
14591
+#: builtin/init-db.c:557
14592
msgid "specify that the git repository is to be shared amongst several users"
14593
msgstr ""
14594
14441
-#: builtin/init-db.c:544
14595
+#: builtin/init-db.c:563
14596
+msgid "override the name of the initial branch"
14597
+msgstr ""
14598
+
14599
+#: builtin/init-db.c:564
14600
msgid "hash"
14601
msgstr ""
14602
14445
-#: builtin/init-db.c:545
14603
+#: builtin/init-db.c:565 builtin/show-index.c:22
14604
msgid "specify the hash algorithm to use"
14605
msgstr ""
14606
14449
-#: builtin/init-db.c:578 builtin/init-db.c:583
14607
+#: builtin/init-db.c:598 builtin/init-db.c:603
14608
#, c-format
14609
msgid "cannot mkdir %s"
14610
msgstr ""
14611
14454
-#: builtin/init-db.c:587
14612
+#: builtin/init-db.c:607
14613
#, c-format
14614
msgid "cannot chdir to %s"
14615
msgstr ""
14616
14459
-#: builtin/init-db.c:614
14617
+#: builtin/init-db.c:634
14618
#, c-format
14619
msgid ""
14620
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
14621
"dir=<directory>)"
14622
msgstr ""
14623
14466
-#: builtin/init-db.c:642
14624
+#: builtin/init-db.c:662
14625
#, c-format
14626
msgid "Cannot access work tree '%s'"
14627
msgstr ""
@@ -16154,7 +16312,7 @@ msgstr ""
16312
msgid "read object names from the standard input"
16313
msgstr ""
16314
16157
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164
16315
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
16316
msgid "do not remove, show only"
16317
msgstr ""
16318
@@ -16185,334 +16343,355 @@ msgid ""
This file is too large to show in full.