@matheusbsbs / matheus-bagliano / commits / 79aed79241

l10n: git.pot: v2.35.0 round 1 (126 new, 142 removed)

Generate po/git.pot from v2.35.0-rc0 for git v2.35.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jan 11, 2022 at 09:52 UTC 79aed792415b35d1b31ddc26814a211c7bae97fe
1 file changed +2994 -3008
po/git.pot
+2994 -3008
@@ -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: 2021-11-10 08:55+0800\n"
11 +"POT-Creation-Date: 2022-01-11 09:38+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"
@@ -23,8 +23,8 @@ msgstr ""
23 msgid "Huh (%s)?"
24 msgstr ""
25
26 -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
27 -#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
26 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
27 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
28 #: builtin/rebase.c:1642
29 msgid "could not read index"
30 msgstr ""
@@ -53,7 +53,7 @@ msgstr ""
53 msgid "could not stage '%s'"
54 msgstr ""
55
56 -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
56 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
57 msgid "could not write index"
58 msgstr ""
59
@@ -69,8 +69,8 @@ msgstr[1] ""
69 msgid "note: %s is untracked now.\n"
70 msgstr ""
71
72 -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
73 -#: builtin/reset.c:151
72 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
73 +#: builtin/reset.c:167
74 #, c-format
75 msgid "make_cache_entry failed for path '%s'"
76 msgstr ""
@@ -111,21 +111,21 @@ msgstr[1] ""
111 msgid "ignoring unmerged: %s"
112 msgstr ""
113
114 -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
114 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
115 #, c-format
116 msgid "Only binary files changed.\n"
117 msgstr ""
118
119 -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
119 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
120 #, c-format
121 msgid "No changes.\n"
122 msgstr ""
123
124 -#: add-interactive.c:947 git-add--interactive.perl:1379
124 +#: add-interactive.c:947 git-add--interactive.perl:1381
125 msgid "Patch update"
126 msgstr ""
127
128 -#: add-interactive.c:986 git-add--interactive.perl:1792
128 +#: add-interactive.c:986 git-add--interactive.perl:1794
129 msgid "Review diff"
130 msgstr ""
131
@@ -193,11 +193,11 @@ msgstr ""
193 msgid "(empty) select nothing"
194 msgstr ""
195
196 -#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
196 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
197 msgid "*** Commands ***"
198 msgstr ""
199
200 -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
200 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
201 msgid "What now"
202 msgstr ""
203
@@ -209,13 +209,13 @@ msgstr ""
209 msgid "unstaged"
210 msgstr ""
211
212 -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
213 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
214 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
215 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
216 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
217 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
218 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
212 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
213 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
214 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
215 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
216 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
217 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
218 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
219 #: git-add--interactive.perl:213
220 msgid "path"
221 msgstr ""
@@ -224,27 +224,27 @@ msgstr ""
224 msgid "could not refresh index"
225 msgstr ""
226
227 -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
227 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
228 #, c-format
229 msgid "Bye.\n"
230 msgstr ""
231
232 -#: add-patch.c:34 git-add--interactive.perl:1431
232 +#: add-patch.c:34 git-add--interactive.perl:1433
233 #, c-format, perl-format
234 msgid "Stage mode change [y,n,q,a,d%s,?]? "
235 msgstr ""
236
237 -#: add-patch.c:35 git-add--interactive.perl:1432
237 +#: add-patch.c:35 git-add--interactive.perl:1434
238 #, c-format, perl-format
239 msgid "Stage deletion [y,n,q,a,d%s,?]? "
240 msgstr ""
241
242 -#: add-patch.c:36 git-add--interactive.perl:1433
242 +#: add-patch.c:36 git-add--interactive.perl:1435
243 #, c-format, perl-format
244 msgid "Stage addition [y,n,q,a,d%s,?]? "
245 msgstr ""
246
247 -#: add-patch.c:37 git-add--interactive.perl:1434
247 +#: add-patch.c:37 git-add--interactive.perl:1436
248 #, c-format, perl-format
249 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
250 msgstr ""
@@ -264,22 +264,22 @@ msgid ""
264 "d - do not stage this hunk or any of the later hunks in the file\n"
265 msgstr ""
266
267 -#: add-patch.c:56 git-add--interactive.perl:1437
267 +#: add-patch.c:56 git-add--interactive.perl:1439
268 #, c-format, perl-format
269 msgid "Stash mode change [y,n,q,a,d%s,?]? "
270 msgstr ""
271
272 -#: add-patch.c:57 git-add--interactive.perl:1438
272 +#: add-patch.c:57 git-add--interactive.perl:1440
273 #, c-format, perl-format
274 msgid "Stash deletion [y,n,q,a,d%s,?]? "
275 msgstr ""
276
277 -#: add-patch.c:58 git-add--interactive.perl:1439
277 +#: add-patch.c:58 git-add--interactive.perl:1441
278 #, c-format, perl-format
279 msgid "Stash addition [y,n,q,a,d%s,?]? "
280 msgstr ""
281
282 -#: add-patch.c:59 git-add--interactive.perl:1440
282 +#: add-patch.c:59 git-add--interactive.perl:1442
283 #, c-format, perl-format
284 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
285 msgstr ""
@@ -299,22 +299,22 @@ msgid ""
299 "d - do not stash this hunk or any of the later hunks in the file\n"
300 msgstr ""
301
302 -#: add-patch.c:80 git-add--interactive.perl:1443
302 +#: add-patch.c:80 git-add--interactive.perl:1445
303 #, c-format, perl-format
304 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
305 msgstr ""
306
307 -#: add-patch.c:81 git-add--interactive.perl:1444
307 +#: add-patch.c:81 git-add--interactive.perl:1446
308 #, c-format, perl-format
309 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
310 msgstr ""
311
312 -#: add-patch.c:82 git-add--interactive.perl:1445
312 +#: add-patch.c:82 git-add--interactive.perl:1447
313 #, c-format, perl-format
314 msgid "Unstage addition [y,n,q,a,d%s,?]? "
315 msgstr ""
316
317 -#: add-patch.c:83 git-add--interactive.perl:1446
317 +#: add-patch.c:83 git-add--interactive.perl:1448
318 #, c-format, perl-format
319 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
320 msgstr ""
@@ -334,22 +334,22 @@ msgid ""
334 "d - do not unstage this hunk or any of the later hunks in the file\n"
335 msgstr ""
336
337 -#: add-patch.c:103 git-add--interactive.perl:1449
337 +#: add-patch.c:103 git-add--interactive.perl:1451
338 #, c-format, perl-format
339 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
340 msgstr ""
341
342 -#: add-patch.c:104 git-add--interactive.perl:1450
342 +#: add-patch.c:104 git-add--interactive.perl:1452
343 #, c-format, perl-format
344 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
345 msgstr ""
346
347 -#: add-patch.c:105 git-add--interactive.perl:1451
347 +#: add-patch.c:105 git-add--interactive.perl:1453
348 #, c-format, perl-format
349 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
350 msgstr ""
351
352 -#: add-patch.c:106 git-add--interactive.perl:1452
352 +#: add-patch.c:106 git-add--interactive.perl:1454
353 #, c-format, perl-format
354 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
355 msgstr ""
@@ -369,26 +369,26 @@ msgid ""
369 "d - do not apply this hunk or any of the later hunks in the file\n"
370 msgstr ""
371
372 -#: add-patch.c:126 git-add--interactive.perl:1455
373 -#: git-add--interactive.perl:1473
372 +#: add-patch.c:126 git-add--interactive.perl:1457
373 +#: git-add--interactive.perl:1475
374 #, c-format, perl-format
375 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
376 msgstr ""
377
378 -#: add-patch.c:127 git-add--interactive.perl:1456
379 -#: git-add--interactive.perl:1474
378 +#: add-patch.c:127 git-add--interactive.perl:1458
379 +#: git-add--interactive.perl:1476
380 #, c-format, perl-format
381 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
382 msgstr ""
383
384 -#: add-patch.c:128 git-add--interactive.perl:1457
385 -#: git-add--interactive.perl:1475
384 +#: add-patch.c:128 git-add--interactive.perl:1459
385 +#: git-add--interactive.perl:1477
386 #, c-format, perl-format
387 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
388 msgstr ""
389
390 -#: add-patch.c:129 git-add--interactive.perl:1458
391 -#: git-add--interactive.perl:1476
390 +#: add-patch.c:129 git-add--interactive.perl:1460
391 +#: git-add--interactive.perl:1478
392 #, c-format, perl-format
393 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
394 msgstr ""
@@ -408,22 +408,22 @@ msgid ""
408 "d - do not discard this hunk or any of the later hunks in the file\n"
409 msgstr ""
410
411 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
411 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
412 #, c-format, perl-format
413 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
414 msgstr ""
415
416 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
416 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
417 #, c-format, perl-format
418 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
419 msgstr ""
420
421 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
421 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
422 #, c-format, perl-format
423 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
424 msgstr ""
425
426 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
426 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
427 #, c-format, perl-format
428 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
429 msgstr ""
@@ -437,22 +437,22 @@ msgid ""
437 "d - do not discard this hunk or any of the later hunks in the file\n"
438 msgstr ""
439
440 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
440 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
441 #, c-format, perl-format
442 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
443 msgstr ""
444
445 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
445 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
446 #, c-format, perl-format
447 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
448 msgstr ""
449
450 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
450 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
451 #, c-format, perl-format
452 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
453 msgstr ""
454
455 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
455 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
456 #, c-format, perl-format
457 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
458 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
565 #. Consider translating (saying "no" discards!) as
566 #. (saying "n" for "no" discards!) if the translation
567 #. of the word "no" does not start with n.
568 -#: add-patch.c:1247 git-add--interactive.perl:1242
568 +#: add-patch.c:1247 git-add--interactive.perl:1244
569 msgid ""
570 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
571 msgstr ""
@@ -574,11 +574,11 @@ msgstr ""
574 msgid "The selected hunks do not apply to the index!"
575 msgstr ""
576
577 -#: add-patch.c:1291 git-add--interactive.perl:1346
577 +#: add-patch.c:1291 git-add--interactive.perl:1348
578 msgid "Apply them to the worktree anyway? "
579 msgstr ""
580
581 -#: add-patch.c:1298 git-add--interactive.perl:1349
581 +#: add-patch.c:1298 git-add--interactive.perl:1351
582 msgid "Nothing was applied.\n"
583 msgstr ""
584
@@ -607,11 +607,11 @@ msgstr ""
607 msgid "No other hunks to goto"
608 msgstr ""
609
610 -#: add-patch.c:1549 git-add--interactive.perl:1606
610 +#: add-patch.c:1549 git-add--interactive.perl:1608
611 msgid "go to which hunk (<ret> to see more)? "
612 msgstr ""
613
614 -#: add-patch.c:1550 git-add--interactive.perl:1608
614 +#: add-patch.c:1550 git-add--interactive.perl:1610
615 msgid "go to which hunk? "
616 msgstr ""
617
@@ -631,7 +631,7 @@ msgstr[1] ""
631 msgid "No other hunks to search"
632 msgstr ""
633
634 -#: add-patch.c:1581 git-add--interactive.perl:1661
634 +#: add-patch.c:1581 git-add--interactive.perl:1663
635 msgid "search for regex? "
636 msgstr ""
637
@@ -708,7 +708,7 @@ msgstr ""
708 msgid "Exiting because of an unresolved conflict."
709 msgstr ""
710
711 -#: advice.c:209 builtin/merge.c:1379
711 +#: advice.c:209 builtin/merge.c:1382
712 msgid "You have not concluded your merge (MERGE_HEAD exists)."
713 msgstr ""
714
@@ -780,20 +780,32 @@ msgstr ""
780 msgid "unrecognized whitespace ignore option '%s'"
781 msgstr ""
782
783 -#: apply.c:136
784 -msgid "--reject and --3way cannot be used together."
785 -msgstr ""
786 -
787 -#: apply.c:139
788 -msgid "--3way outside a repository"
789 -msgstr ""
790 -
791 -#: apply.c:150
792 -msgid "--index outside a repository"
783 +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
784 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
785 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
786 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
787 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
788 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
789 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
790 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
791 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
792 +#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
793 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
794 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
795 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
796 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
797 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
798 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
799 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
800 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
801 +#: builtin/worktree.c:702
802 +#, c-format
803 +msgid "options '%s' and '%s' cannot be used together"
804 msgstr ""
805
795 -#: apply.c:153
796 -msgid "--cached outside a repository"
806 +#: apply.c:139 apply.c:150 apply.c:153
807 +#, c-format
808 +msgid "'%s' outside a repository"
809 msgstr ""
810
811 #: apply.c:800
@@ -995,8 +1007,8 @@ msgstr ""
1007 msgid "cannot checkout %s"
1008 msgstr ""
1009
998 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
999 -#: setup.c:308
1010 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
1011 +#: setup.c:309
1012 #, c-format
1013 msgid "failed to read %s"
1014 msgstr ""
@@ -1006,380 +1018,378 @@ msgstr ""
1018 msgid "reading from '%s' beyond a symbolic link"
1019 msgstr ""
1020
1009 -#: apply.c:3442 apply.c:3709
1021 +#: apply.c:3442 apply.c:3711
1022 #, c-format
1023 msgid "path %s has been renamed/deleted"
1024 msgstr ""
1025
1014 -#: apply.c:3549 apply.c:3724
1026 +#: apply.c:3549 apply.c:3726
1027 #, c-format
1028 msgid "%s: does not exist in index"
1029 msgstr ""
1030
1019 -#: apply.c:3558 apply.c:3732 apply.c:3976
1031 +#: apply.c:3558 apply.c:3734 apply.c:3978
1032 #, c-format
1033 msgid "%s: does not match index"
1034 msgstr ""
1035
1024 -#: apply.c:3593
1036 +#: apply.c:3595
1037 msgid "repository lacks the necessary blob to perform 3-way merge."
1038 msgstr ""
1039
1028 -#: apply.c:3596
1040 +#: apply.c:3598
1041 #, c-format
1042 msgid "Performing three-way merge...\n"
1043 msgstr ""
1044
1033 -#: apply.c:3612 apply.c:3616
1045 +#: apply.c:3614 apply.c:3618
1046 #, c-format
1047 msgid "cannot read the current contents of '%s'"
1048 msgstr ""
1049
1038 -#: apply.c:3628
1050 +#: apply.c:3630
1051 #, c-format
1052 msgid "Failed to perform three-way merge...\n"
1053 msgstr ""
1054
1043 -#: apply.c:3642
1055 +#: apply.c:3644
1056 #, c-format
1057 msgid "Applied patch to '%s' with conflicts.\n"
1058 msgstr ""
1059
1048 -#: apply.c:3647
1060 +#: apply.c:3649
1061 #, c-format
1062 msgid "Applied patch to '%s' cleanly.\n"
1063 msgstr ""
1064
1053 -#: apply.c:3664
1065 +#: apply.c:3666
1066 #, c-format
1067 msgid "Falling back to direct application...\n"
1068 msgstr ""
1069
1058 -#: apply.c:3676
1070 +#: apply.c:3678
1071 msgid "removal patch leaves file contents"
1072 msgstr ""
1073
1062 -#: apply.c:3749
1074 +#: apply.c:3751
1075 #, c-format
1076 msgid "%s: wrong type"
1077 msgstr ""
1078
1067 -#: apply.c:3751
1079 +#: apply.c:3753
1080 #, c-format
1081 msgid "%s has type %o, expected %o"
1082 msgstr ""
1083
1072 -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
1073 -#: read-cache.c:1368
1084 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
1085 +#: read-cache.c:1381
1086 #, c-format
1087 msgid "invalid path '%s'"
1088 msgstr ""
1089
1078 -#: apply.c:3974
1090 +#: apply.c:3976
1091 #, c-format
1092 msgid "%s: already exists in index"
1093 msgstr ""
1094
1083 -#: apply.c:3978
1095 +#: apply.c:3980
1096 #, c-format
1097 msgid "%s: already exists in working directory"
1098 msgstr ""
1099
1088 -#: apply.c:3998
1100 +#: apply.c:4000
1101 #, c-format
1102 msgid "new mode (%o) of %s does not match old mode (%o)"
1103 msgstr ""
1104
1093 -#: apply.c:4003
1105 +#: apply.c:4005
1106 #, c-format
1107 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1108 msgstr ""
1109
1098 -#: apply.c:4023
1110 +#: apply.c:4025
1111 #, c-format
1112 msgid "affected file '%s' is beyond a symbolic link"
1113 msgstr ""
1114
1103 -#: apply.c:4027
1115 +#: apply.c:4029
1116 #, c-format
1117 msgid "%s: patch does not apply"
1118 msgstr ""
1119
1108 -#: apply.c:4042
1120 +#: apply.c:4044
1121 #, c-format
1122 msgid "Checking patch %s..."
1123 msgstr ""
1124
1113 -#: apply.c:4134
1125 +#: apply.c:4136
1126 #, c-format
1127 msgid "sha1 information is lacking or useless for submodule %s"
1128 msgstr ""
1129
1118 -#: apply.c:4141
1130 +#: apply.c:4143
1131 #, c-format
1132 msgid "mode change for %s, which is not in current HEAD"
1133 msgstr ""
1134
1123 -#: apply.c:4144
1135 +#: apply.c:4146
1136 #, c-format
1137 msgid "sha1 information is lacking or useless (%s)."
1138 msgstr ""
1139
1128 -#: apply.c:4153
1140 +#: apply.c:4155
1141 #, c-format
1142 msgid "could not add %s to temporary index"
1143 msgstr ""
1144
1133 -#: apply.c:4163
1145 +#: apply.c:4165
1146 #, c-format
1147 msgid "could not write temporary index to %s"
1148 msgstr ""
1149
1138 -#: apply.c:4301
1150 +#: apply.c:4303
1151 #, c-format
1152 msgid "unable to remove %s from index"
1153 msgstr ""
1154
1143 -#: apply.c:4335
1155 +#: apply.c:4337
1156 #, c-format
1157 msgid "corrupt patch for submodule %s"
1158 msgstr ""
1159
1148 -#: apply.c:4341
1160 +#: apply.c:4343
1161 #, c-format
1162 msgid "unable to stat newly created file '%s'"
1163 msgstr ""
1164
1153 -#: apply.c:4349
1165 +#: apply.c:4351
1166 #, c-format
1167 msgid "unable to create backing store for newly created file %s"
1168 msgstr ""
1169
1158 -#: apply.c:4355 apply.c:4500
1170 +#: apply.c:4357 apply.c:4502
1171 #, c-format
1172 msgid "unable to add cache entry for %s"
1173 msgstr ""
1174
1163 -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
1164 -#: builtin/gc.c:2276
1175 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
1176 +#: builtin/gc.c:2293
1177 #, c-format
1178 msgid "failed to write to '%s'"
1179 msgstr ""
1180
1169 -#: apply.c:4402
1181 +#: apply.c:4404
1182 #, c-format
1183 msgid "closing file '%s'"
1184 msgstr ""
1185
1174 -#: apply.c:4472
1186 +#: apply.c:4474
1187 #, c-format
1188 msgid "unable to write file '%s' mode %o"
1189 msgstr ""
1190
1179 -#: apply.c:4570
1191 +#: apply.c:4572
1192 #, c-format
1193 msgid "Applied patch %s cleanly."
1194 msgstr ""
1195
1184 -#: apply.c:4578
1196 +#: apply.c:4580
1197 msgid "internal error"
1198 msgstr ""
1199
1188 -#: apply.c:4581
1200 +#: apply.c:4583
1201 #, c-format
1202 msgid "Applying patch %%s with %d reject..."
1203 msgid_plural "Applying patch %%s with %d rejects..."
1204 msgstr[0] ""
1205 msgstr[1] ""
1206
1195 -#: apply.c:4592
1207 +#: apply.c:4594
1208 #, c-format
1209 msgid "truncating .rej filename to %.*s.rej"
1210 msgstr ""
1211
1200 -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
1212 +#: apply.c:4602
1213 #, c-format
1214 msgid "cannot open %s"
1215 msgstr ""
1216
1205 -#: apply.c:4614
1217 +#: apply.c:4616
1218 #, c-format
1219 msgid "Hunk #%d applied cleanly."
1220 msgstr ""
1221
1210 -#: apply.c:4618
1222 +#: apply.c:4620
1223 #, c-format
1224 msgid "Rejected hunk #%d."
1225 msgstr ""
1226
1215 -#: apply.c:4747
1227 +#: apply.c:4749
1228 #, c-format
1229 msgid "Skipped patch '%s'."
1230 msgstr ""
1231
1220 -#: apply.c:4755
1221 -msgid "unrecognized input"
1232 +#: apply.c:4758
1233 +msgid "No valid patches in input (allow with \"--allow-empty\")"
1234 msgstr ""
1235
1224 -#: apply.c:4775
1236 +#: apply.c:4779
1237 msgid "unable to read index file"
1238 msgstr ""
1239
1228 -#: apply.c:4932
1240 +#: apply.c:4936
1241 #, c-format
1242 msgid "can't open patch '%s': %s"
1243 msgstr ""
1244
1233 -#: apply.c:4959
1245 +#: apply.c:4963
1246 #, c-format
1247 msgid "squelched %d whitespace error"
1248 msgid_plural "squelched %d whitespace errors"
1249 msgstr[0] ""
1250 msgstr[1] ""
1251
1240 -#: apply.c:4965 apply.c:4980
1252 +#: apply.c:4969 apply.c:4984
1253 #, c-format
1254 msgid "%d line adds whitespace errors."
1255 msgid_plural "%d lines add whitespace errors."
1256 msgstr[0] ""
1257 msgstr[1] ""
1258
1247 -#: apply.c:4973
1259 +#: apply.c:4977
1260 #, c-format
1261 msgid "%d line applied after fixing whitespace errors."
1262 msgid_plural "%d lines applied after fixing whitespace errors."
1263 msgstr[0] ""
1264 msgstr[1] ""
1265
1254 -#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
1266 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
1267 msgid "Unable to write new index file"
1268 msgstr ""
1269
1258 -#: apply.c:5017
1270 +#: apply.c:5021
1271 msgid "don't apply changes matching the given path"
1272 msgstr ""
1273
1262 -#: apply.c:5020
1274 +#: apply.c:5024
1275 msgid "apply changes matching the given path"
1276 msgstr ""
1277
1266 -#: apply.c:5022 builtin/am.c:2320
1278 +#: apply.c:5026 builtin/am.c:2376
1279 msgid "num"
1280 msgstr ""
1281
1270 -#: apply.c:5023
1282 +#: apply.c:5027
1283 msgid "remove <num> leading slashes from traditional diff paths"
1284 msgstr ""
1285
1274 -#: apply.c:5026
1286 +#: apply.c:5030
1287 msgid "ignore additions made by the patch"
1288 msgstr ""
1289
1278 -#: apply.c:5028
1290 +#: apply.c:5032
1291 msgid "instead of applying the patch, output diffstat for the input"
1292 msgstr ""
1293
1282 -#: apply.c:5032
1294 +#: apply.c:5036
1295 msgid "show number of added and deleted lines in decimal notation"
1296 msgstr ""
1297
1286 -#: apply.c:5034
1298 +#: apply.c:5038
1299 msgid "instead of applying the patch, output a summary for the input"
1300 msgstr ""
1301
1290 -#: apply.c:5036
1302 +#: apply.c:5040
1303 msgid "instead of applying the patch, see if the patch is applicable"
1304 msgstr ""
1305
1294 -#: apply.c:5038
1306 +#: apply.c:5042
1307 msgid "make sure the patch is applicable to the current index"
1308 msgstr ""
1309
1298 -#: apply.c:5040
1310 +#: apply.c:5044
1311 msgid "mark new files with `git add --intent-to-add`"
1312 msgstr ""
1313
1302 -#: apply.c:5042
1314 +#: apply.c:5046
1315 msgid "apply a patch without touching the working tree"
1316 msgstr ""
1317
1306 -#: apply.c:5044
1318 +#: apply.c:5048
1319 msgid "accept a patch that touches outside the working area"
1320 msgstr ""
1321
1310 -#: apply.c:5047
1322 +#: apply.c:5051
1323 msgid "also apply the patch (use with --stat/--summary/--check)"
1324 msgstr ""
1325
1314 -#: apply.c:5049
1326 +#: apply.c:5053
1327 msgid "attempt three-way merge, fall back on normal patch if that fails"
1328 msgstr ""
1329
1318 -#: apply.c:5051
1330 +#: apply.c:5055
1331 msgid "build a temporary index based on embedded index information"
1332 msgstr ""
1333
1322 -#: apply.c:5054 builtin/checkout-index.c:196
1334 +#: apply.c:5058 builtin/checkout-index.c:196
1335 msgid "paths are separated with NUL character"
1336 msgstr ""
1337
1326 -#: apply.c:5056
1338 +#: apply.c:5060
1339 msgid "ensure at least <n> lines of context match"
1340 msgstr ""
1341
1330 -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
1342 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
1343 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1344 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
1345 #: builtin/rebase.c:1051
1346 msgid "action"
1347 msgstr ""
1348
1337 -#: apply.c:5058
1349 +#: apply.c:5062
1350 msgid "detect new or modified lines that have whitespace errors"
1351 msgstr ""
1352
1341 -#: apply.c:5061 apply.c:5064
1353 +#: apply.c:5065 apply.c:5068
1354 msgid "ignore changes in whitespace when finding context"
1355 msgstr ""
1356
1345 -#: apply.c:5067
1357 +#: apply.c:5071
1358 msgid "apply the patch in reverse"
1359 msgstr ""
1360
1349 -#: apply.c:5069
1361 +#: apply.c:5073
1362 msgid "don't expect at least one line of context"
1363 msgstr ""
1364
1353 -#: apply.c:5071
1365 +#: apply.c:5075
1366 msgid "leave the rejected hunks in corresponding *.rej files"
1367 msgstr ""
1368
1357 -#: apply.c:5073
1369 +#: apply.c:5077
1370 msgid "allow overlapping hunks"
1371 msgstr ""
1372
1361 -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
1362 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
1363 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
1364 -msgid "be verbose"
1365 -msgstr ""
1366 -
1367 -#: apply.c:5076
1373 +#: apply.c:5080
1374 msgid "tolerate incorrectly detected missing new-line at the end of file"
1375 msgstr ""
1376
1371 -#: apply.c:5079
1377 +#: apply.c:5083
1378 msgid "do not trust the line counts in the hunk headers"
1379 msgstr ""
1380
1375 -#: apply.c:5081 builtin/am.c:2308
1381 +#: apply.c:5085 builtin/am.c:2364
1382 msgid "root"
1383 msgstr ""
1384
1379 -#: apply.c:5082
1385 +#: apply.c:5086
1386 msgid "prepend <root> to all filenames"
1387 msgstr ""
1388
1389 +#: apply.c:5089
1390 +msgid "don't return error for empty patches"
1391 +msgstr ""
1392 +
1393 #: archive-tar.c:125 archive-zip.c:345
1394 #, c-format
1395 msgid "cannot stream blob %s"
@@ -1390,16 +1400,16 @@ msgstr ""
1400 msgid "unsupported file mode: 0%o (SHA1: %s)"
1401 msgstr ""
1402
1393 -#: archive-tar.c:450
1403 +#: archive-tar.c:447
1404 #, c-format
1405 msgid "unable to start '%s' filter"
1406 msgstr ""
1407
1398 -#: archive-tar.c:453
1408 +#: archive-tar.c:450
1409 msgid "unable to redirect descriptor"
1410 msgstr ""
1411
1402 -#: archive-tar.c:460
1412 +#: archive-tar.c:457
1413 #, c-format
1414 msgid "'%s' filter reported error"
1415 msgstr ""
@@ -1441,19 +1451,13 @@ msgstr ""
1451 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1452 msgstr ""
1453
1444 -#: archive.c:188
1445 -#, c-format
1446 -msgid "cannot read %s"
1447 -msgstr ""
1448 -
1449 -#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
1450 -#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
1451 -#: builtin/merge.c:1145
1454 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
1455 +#: builtin/tag.c:578
1456 #, c-format
1453 -msgid "could not read '%s'"
1457 +msgid "cannot read '%s'"
1458 msgstr ""
1459
1456 -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
1460 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
1461 #, c-format
1462 msgid "pathspec '%s' did not match any files"
1463 msgstr ""
@@ -1495,7 +1499,7 @@ msgstr ""
1499 msgid "archive format"
1500 msgstr ""
1501
1498 -#: archive.c:552 builtin/log.c:1775
1502 +#: archive.c:552 builtin/log.c:1790
1503 msgid "prefix"
1504 msgstr ""
1505
@@ -1505,9 +1509,9 @@ msgstr ""
1509
1510 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
1511 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
1508 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
1509 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
1510 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
1512 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
1513 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
1514 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
1515 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
1516 msgid "file"
1517 msgstr ""
@@ -1537,7 +1541,7 @@ msgid "list supported archive formats"
1541 msgstr ""
1542
1543 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
1540 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
1544 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
1545 msgid "repo"
1546 msgstr ""
1547
@@ -1545,7 +1549,7 @@ msgstr ""
1549 msgid "retrieve the archive from remote repository <repo>"
1550 msgstr ""
1551
1548 -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
1552 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
1553 #: builtin/notes.c:496
1554 msgid "command"
1555 msgstr ""
@@ -1558,18 +1562,20 @@ msgstr ""
1562 msgid "Unexpected option --remote"
1563 msgstr ""
1564
1561 -#: archive.c:580
1562 -msgid "Option --exec can only be used together with --remote"
1565 +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
1566 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
1567 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
1568 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
1569 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
1570 +#: http-fetch.c:153
1571 +#, c-format
1572 +msgid "the option '%s' requires '%s'"
1573 msgstr ""
1574
1575 #: archive.c:582
1576 msgid "Unexpected option --output"
1577 msgstr ""
1578
1569 -#: archive.c:584
1570 -msgid "Options --add-file and --remote cannot be used together"
1571 -msgstr ""
1572 -
1579 #: archive.c:606
1580 #, c-format
1581 msgid "Unknown archive format '%s'"
@@ -1663,7 +1669,7 @@ msgstr ""
1669 msgid "could not create file '%s'"
1670 msgstr ""
1671
1666 -#: bisect.c:985 builtin/merge.c:154
1672 +#: bisect.c:985 builtin/merge.c:155
1673 #, c-format
1674 msgid "could not read file '%s'"
1675 msgstr ""
@@ -1713,10 +1719,10 @@ msgstr ""
1719 msgid "--reverse and --first-parent together require specified latest commit"
1720 msgstr ""
1721
1716 -#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
1717 -#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
1718 -#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
1719 -#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
1722 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
1723 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
1724 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
1725 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
1726 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
1727 #: builtin/shortlog.c:255
1728 msgid "revision walk setup failed"
@@ -1737,94 +1743,84 @@ msgstr ""
1743 msgid "cannot read blob %s for path %s"
1744 msgstr ""
1745
1740 -#: branch.c:53
1741 -#, c-format
1746 +#: branch.c:77
1747 msgid ""
1743 -"\n"
1744 -"After fixing the error cause you may try to fix up\n"
1745 -"the remote tracking information by invoking\n"
1746 -"\"git branch --set-upstream-to=%s%s%s\"."
1748 +"cannot inherit upstream tracking configuration of multiple refs when "
1749 +"rebasing is requested"
1750 msgstr ""
1751
1749 -#: branch.c:67
1752 +#: branch.c:88
1753 #, c-format
1751 -msgid "Not setting branch %s as its own upstream."
1754 +msgid "not setting branch '%s' as its own upstream"
1755 msgstr ""
1756
1754 -#: branch.c:93
1757 +#: branch.c:144
1758 #, c-format
1756 -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1759 +msgid "branch '%s' set up to track '%s' by rebasing."
1760 msgstr ""
1761
1759 -#: branch.c:94
1762 +#: branch.c:145
1763 #, c-format
1761 -msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1764 +msgid "branch '%s' set up to track '%s'."
1765 msgstr ""
1766
1764 -#: branch.c:98
1767 +#: branch.c:148
1768 #, c-format
1766 -msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1769 +msgid "branch '%s' set up to track:"
1770 msgstr ""
1771
1769 -#: branch.c:99
1770 -#, c-format
1771 -msgid "Branch '%s' set up to track local branch '%s'."
1772 +#: branch.c:160
1773 +msgid "unable to write upstream branch configuration"
1774 msgstr ""
1775
1774 -#: branch.c:104
1775 -#, c-format
1776 -msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1776 +#: branch.c:162
1777 +msgid ""
1778 +"\n"
1779 +"After fixing the error cause you may try to fix up\n"
1780 +"the remote tracking information by invoking:"
1781 msgstr ""
1782
1779 -#: branch.c:105
1783 +#: branch.c:203
1784 #, c-format
1781 -msgid "Branch '%s' set up to track remote ref '%s'."
1785 +msgid "asked to inherit tracking from '%s', but no remote is set"
1786 msgstr ""
1787
1784 -#: branch.c:109
1788 +#: branch.c:209
1789 #, c-format
1786 -msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1790 +msgid "asked to inherit tracking from '%s', but no merge configuration is set"
1791 msgstr ""
1792
1789 -#: branch.c:110
1793 +#: branch.c:252
1794 #, c-format
1791 -msgid "Branch '%s' set up to track local ref '%s'."
1792 -msgstr ""
1793 -
1794 -#: branch.c:119
1795 -msgid "Unable to write upstream branch configuration"
1795 +msgid "not tracking: ambiguous information for ref %s"
1796 msgstr ""
1797
1798 -#: branch.c:156
1798 +#: branch.c:287
1799 #, c-format
1800 -msgid "Not tracking: ambiguous information for ref %s"
1800 +msgid "'%s' is not a valid branch name"
1801 msgstr ""
1802
1803 -#: branch.c:189
1803 +#: branch.c:307
1804 #, c-format
1805 -msgid "'%s' is not a valid branch name."
1805 +msgid "a branch named '%s' already exists"
1806 msgstr ""
1807
1808 -#: branch.c:208
1808 +#: branch.c:313
1809 #, c-format
1810 -msgid "A branch named '%s' already exists."
1811 -msgstr ""
1812 -
1813 -#: branch.c:213
1814 -msgid "Cannot force update the current branch."
1810 +msgid "cannot force update the branch '%s'checked out at '%s'"
1811 msgstr ""
1812
1817 -#: branch.c:233
1813 +#: branch.c:336
1814 #, c-format
1819 -msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1815 +msgid "cannot set up tracking information; starting point '%s' is not a branch"
1816 msgstr ""
1817
1822 -#: branch.c:235
1818 +#: branch.c:338
1819 #, c-format
1820 msgid "the requested upstream branch '%s' does not exist"
1821 msgstr ""
1822
1827 -#: branch.c:237
1823 +#: branch.c:340
1824 msgid ""
1825 "\n"
1826 "If you are planning on basing your work on an upstream\n"
@@ -1836,27 +1832,28 @@ msgid ""
1832 "\"git push -u\" to set the upstream config as you push."
1833 msgstr ""
1834
1839 -#: branch.c:281
1835 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
1836 +#: builtin/replace.c:423 builtin/replace.c:453
1837 #, c-format
1841 -msgid "Not a valid object name: '%s'."
1838 +msgid "not a valid object name: '%s'"
1839 msgstr ""
1840
1844 -#: branch.c:301
1841 +#: branch.c:404
1842 #, c-format
1846 -msgid "Ambiguous object name: '%s'."
1843 +msgid "ambiguous object name: '%s'"
1844 msgstr ""
1845
1849 -#: branch.c:306
1846 +#: branch.c:409
1847 #, c-format
1851 -msgid "Not a valid branch point: '%s'."
1848 +msgid "not a valid branch point: '%s'"
1849 msgstr ""
1850
1854 -#: branch.c:366
1851 +#: branch.c:469
1852 #, c-format
1853 msgid "'%s' is already checked out at '%s'"
1854 msgstr ""
1855
1859 -#: branch.c:389
1856 +#: branch.c:494
1857 #, c-format
1858 msgid "HEAD of working tree %s is not updated"
1859 msgstr ""
@@ -1881,7 +1878,7 @@ msgstr ""
1878 msgid "unrecognized header: %s%s (%d)"
1879 msgstr ""
1880
1884 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
1881 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
1882 #: builtin/commit.c:862
1883 #, c-format
1884 msgid "could not open '%s'"
@@ -1940,7 +1937,7 @@ msgstr ""
1937 msgid "cannot write bundle version %d with algorithm %s"
1938 msgstr ""
1939
1943 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
1940 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
1941 #, c-format
1942 msgid "unrecognized argument: %s"
1943 msgstr ""
@@ -1977,7 +1974,7 @@ msgstr ""
1974 msgid "final chunk has non-zero id %<PRIx32>"
1975 msgstr ""
1976
1980 -#: color.c:329
1977 +#: color.c:354
1978 #, c-format
1979 msgid "invalid color value: %.*s"
1980 msgstr ""
@@ -2027,207 +2024,207 @@ msgstr ""
2024 msgid "unable to find all commit-graph files"
2025 msgstr ""
2026
2030 -#: commit-graph.c:746 commit-graph.c:783
2027 +#: commit-graph.c:749 commit-graph.c:786
2028 msgid "invalid commit position. commit-graph is likely corrupt"
2029 msgstr ""
2030
2034 -#: commit-graph.c:767
2031 +#: commit-graph.c:770
2032 #, c-format
2033 msgid "could not find commit %s"
2034 msgstr ""
2035
2039 -#: commit-graph.c:800
2036 +#: commit-graph.c:803
2037 msgid "commit-graph requires overflow generation data but has none"
2038 msgstr ""
2039
2043 -#: commit-graph.c:1105 builtin/am.c:1342
2040 +#: commit-graph.c:1108 builtin/am.c:1369
2041 #, c-format
2042 msgid "unable to parse commit %s"
2043 msgstr ""
2044
2048 -#: commit-graph.c:1367 builtin/pack-objects.c:3070
2045 +#: commit-graph.c:1370 builtin/pack-objects.c:3070
2046 #, c-format
2047 msgid "unable to get type of object %s"
2048 msgstr ""
2049
2053 -#: commit-graph.c:1398
2050 +#: commit-graph.c:1401
2051 msgid "Loading known commits in commit graph"
2052 msgstr ""
2053
2057 -#: commit-graph.c:1415
2054 +#: commit-graph.c:1418
2055 msgid "Expanding reachable commits in commit graph"
2056 msgstr ""
2057
2061 -#: commit-graph.c:1435
2058 +#: commit-graph.c:1438
2059 msgid "Clearing commit marks in commit graph"
2060 msgstr ""
2061
2065 -#: commit-graph.c:1454
2062 +#: commit-graph.c:1457
2063 msgid "Computing commit graph topological levels"
2064 msgstr ""
2065
2069 -#: commit-graph.c:1507
2066 +#: commit-graph.c:1510
2067 msgid "Computing commit graph generation numbers"
2068 msgstr ""
2069
2073 -#: commit-graph.c:1588
2070 +#: commit-graph.c:1591
2071 msgid "Computing commit changed paths Bloom filters"
2072 msgstr ""
2073
2077 -#: commit-graph.c:1665
2074 +#: commit-graph.c:1668
2075 msgid "Collecting referenced commits"
2076 msgstr ""
2077
2081 -#: commit-graph.c:1690
2078 +#: commit-graph.c:1693
2079 #, c-format
2080 msgid "Finding commits for commit graph in %d pack"
2081 msgid_plural "Finding commits for commit graph in %d packs"
2082 msgstr[0] ""
2083 msgstr[1] ""
2084
2088 -#: commit-graph.c:1703
2085 +#: commit-graph.c:1706
2086 #, c-format
2087 msgid "error adding pack %s"
2088 msgstr ""
2089
2093 -#: commit-graph.c:1707
2090 +#: commit-graph.c:1710
2091 #, c-format
2092 msgid "error opening index for %s"
2093 msgstr ""
2094
2098 -#: commit-graph.c:1744
2095 +#: commit-graph.c:1747
2096 msgid "Finding commits for commit graph among packed objects"
2097 msgstr ""
2098
2102 -#: commit-graph.c:1762
2099 +#: commit-graph.c:1765
2100 msgid "Finding extra edges in commit graph"
2101 msgstr ""
2102
2106 -#: commit-graph.c:1811
2103 +#: commit-graph.c:1814
2104 msgid "failed to write correct number of base graph ids"
2105 msgstr ""
2106
2110 -#: commit-graph.c:1842 midx.c:1146
2107 +#: commit-graph.c:1845 midx.c:1149
2108 #, c-format
2109 msgid "unable to create leading directories of %s"
2110 msgstr ""
2111
2115 -#: commit-graph.c:1855
2112 +#: commit-graph.c:1858
2113 msgid "unable to create temporary graph layer"
2114 msgstr ""
2115
2119 -#: commit-graph.c:1860
2116 +#: commit-graph.c:1863
2117 #, c-format
2118 msgid "unable to adjust shared permissions for '%s'"
2119 msgstr ""
2120
2124 -#: commit-graph.c:1917
2121 +#: commit-graph.c:1920
2122 #, c-format
2123 msgid "Writing out commit graph in %d pass"
2124 msgid_plural "Writing out commit graph in %d passes"
2125 msgstr[0] ""
2126 msgstr[1] ""
2127
2131 -#: commit-graph.c:1953
2128 +#: commit-graph.c:1956
2129 msgid "unable to open commit-graph chain file"
2130 msgstr ""
2131
2135 -#: commit-graph.c:1969
2132 +#: commit-graph.c:1972
2133 msgid "failed to rename base commit-graph file"
2134 msgstr ""
2135
2139 -#: commit-graph.c:1989
2136 +#: commit-graph.c:1992
2137 msgid "failed to rename temporary commit-graph file"
2138 msgstr ""
2139
2143 -#: commit-graph.c:2122
2140 +#: commit-graph.c:2125
2141 msgid "Scanning merged commits"
2142 msgstr ""
2143
2147 -#: commit-graph.c:2166
2144 +#: commit-graph.c:2169
2145 msgid "Merging commit-graph"
2146 msgstr ""
2147
2151 -#: commit-graph.c:2274
2148 +#: commit-graph.c:2277
2149 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2150 msgstr ""
2151
2155 -#: commit-graph.c:2381
2152 +#: commit-graph.c:2384
2153 msgid "too many commits to write graph"
2154 msgstr ""
2155
2159 -#: commit-graph.c:2479
2156 +#: commit-graph.c:2482
2157 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2158 msgstr ""
2159
2163 -#: commit-graph.c:2489
2160 +#: commit-graph.c:2492
2161 #, c-format
2162 msgid "commit-graph has incorrect OID order: %s then %s"
2163 msgstr ""
2164
2168 -#: commit-graph.c:2499 commit-graph.c:2514
2165 +#: commit-graph.c:2502 commit-graph.c:2517
2166 #, c-format
2167 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2168 msgstr ""
2169
2173 -#: commit-graph.c:2506
2170 +#: commit-graph.c:2509
2171 #, c-format
2172 msgid "failed to parse commit %s from commit-graph"
2173 msgstr ""
2174
2178 -#: commit-graph.c:2524
2175 +#: commit-graph.c:2527
2176 msgid "Verifying commits in commit graph"
2177 msgstr ""
2178
2182 -#: commit-graph.c:2539
2179 +#: commit-graph.c:2542
2180 #, c-format
2181 msgid "failed to parse commit %s from object database for commit-graph"
2182 msgstr ""
2183
2187 -#: commit-graph.c:2546
2184 +#: commit-graph.c:2549
2185 #, c-format
2186 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2187 msgstr ""
2188
2192 -#: commit-graph.c:2556
2189 +#: commit-graph.c:2559
2190 #, c-format
2191 msgid "commit-graph parent list for commit %s is too long"
2192 msgstr ""
2193
2197 -#: commit-graph.c:2565
2194 +#: commit-graph.c:2568
2195 #, c-format
2196 msgid "commit-graph parent for %s is %s != %s"
2197 msgstr ""
2198
2202 -#: commit-graph.c:2579
2199 +#: commit-graph.c:2582
2200 #, c-format
2201 msgid "commit-graph parent list for commit %s terminates early"
2202 msgstr ""
2203
2207 -#: commit-graph.c:2584
2204 +#: commit-graph.c:2587
2205 #, c-format
2206 msgid ""
2207 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2208 msgstr ""
2209
2213 -#: commit-graph.c:2588
2210 +#: commit-graph.c:2591
2211 #, c-format
2212 msgid ""
2213 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2214 msgstr ""
2215
2219 -#: commit-graph.c:2605
2216 +#: commit-graph.c:2608
2217 #, c-format
2218 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2219 msgstr ""
2220
2224 -#: commit-graph.c:2611
2221 +#: commit-graph.c:2614
2222 #, c-format
2223 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2224 msgstr ""
2225
2229 -#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
2230 -#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
2226 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
2227 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
2228 #, c-format
2229 msgid "could not parse %s"
2230 msgstr ""
@@ -2249,27 +2246,27 @@ msgid ""
2246 "\"git config advice.graftFileDeprecated false\""
2247 msgstr ""
2248
2252 -#: commit.c:1239
2249 +#: commit.c:1241
2250 #, c-format
2251 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2252 msgstr ""
2253
2257 -#: commit.c:1243
2254 +#: commit.c:1245
2255 #, c-format
2256 msgid "Commit %s has a bad GPG signature allegedly by %s."
2257 msgstr ""
2258
2262 -#: commit.c:1246
2259 +#: commit.c:1248
2260 #, c-format
2261 msgid "Commit %s does not have a GPG signature."
2262 msgstr ""
2263
2267 -#: commit.c:1249
2264 +#: commit.c:1251
2265 #, c-format
2266 msgid "Commit %s has a good GPG signature by %s\n"
2267 msgstr ""
2268
2272 -#: commit.c:1503
2269 +#: commit.c:1505
2270 msgid ""
2271 "Warning: commit message did not conform to UTF-8.\n"
2272 "You may want to amend it after fixing the message, or set the config\n"
@@ -2328,7 +2325,7 @@ msgstr ""
2325 msgid "key does not contain variable name: %s"
2326 msgstr ""
2327
2331 -#: config.c:470 sequencer.c:2804
2328 +#: config.c:470 sequencer.c:2806
2329 #, c-format
2330 msgid "invalid key: %s"
2331 msgstr ""
@@ -2479,144 +2476,144 @@ msgstr ""
2476 msgid "invalid mode for object creation: %s"
2477 msgstr ""
2478
2482 -#: config.c:1581
2479 +#: config.c:1584
2480 #, c-format
2481 msgid "malformed value for %s"
2482 msgstr ""
2483
2487 -#: config.c:1607
2484 +#: config.c:1610
2485 #, c-format
2486 msgid "malformed value for %s: %s"
2487 msgstr ""
2488
2492 -#: config.c:1608
2489 +#: config.c:1611
2490 msgid "must be one of nothing, matching, simple, upstream or current"
2491 msgstr ""
2492
2496 -#: config.c:1669 builtin/pack-objects.c:4053
2493 +#: config.c:1672 builtin/pack-objects.c:4053
2494 #, c-format
2495 msgid "bad pack compression level %d"
2496 msgstr ""
2497
2501 -#: config.c:1792
2498 +#: config.c:1795
2499 #, c-format
2500 msgid "unable to load config blob object '%s'"
2501 msgstr ""
2502
2506 -#: config.c:1795
2503 +#: config.c:1798
2504 #, c-format
2505 msgid "reference '%s' does not point to a blob"
2506 msgstr ""
2507
2511 -#: config.c:1813
2508 +#: config.c:1816
2509 #, c-format
2510 msgid "unable to resolve config blob '%s'"
2511 msgstr ""
2512
2516 -#: config.c:1858
2513 +#: config.c:1861
2514 #, c-format
2515 msgid "failed to parse %s"
2516 msgstr ""
2517
2521 -#: config.c:1914
2518 +#: config.c:1917
2519 msgid "unable to parse command-line config"
2520 msgstr ""
2521
2525 -#: config.c:2282
2522 +#: config.c:2285
2523 msgid "unknown error occurred while reading the configuration files"
2524 msgstr ""
2525
2529 -#: config.c:2456
2526 +#: config.c:2459
2527 #, c-format
2528 msgid "Invalid %s: '%s'"
2529 msgstr ""
2530
2534 -#: config.c:2501
2531 +#: config.c:2504
2532 #, c-format
2533 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2534 msgstr ""
2535
2539 -#: config.c:2547
2536 +#: config.c:2550
2537 #, c-format
2538 msgid "unable to parse '%s' from command-line config"
2539 msgstr ""
2540
2544 -#: config.c:2549
2541 +#: config.c:2552
2542 #, c-format
2543 msgid "bad config variable '%s' in file '%s' at line %d"
2544 msgstr ""
2545
2549 -#: config.c:2633
2546 +#: config.c:2637
2547 #, c-format
2548 msgid "invalid section name '%s'"
2549 msgstr ""
2550
2554 -#: config.c:2665
2551 +#: config.c:2669
2552 #, c-format
2553 msgid "%s has multiple values"
2554 msgstr ""
2555
2559 -#: config.c:2694
2556 +#: config.c:2698
2557 #, c-format
2558 msgid "failed to write new configuration file %s"
2559 msgstr ""
2560
2564 -#: config.c:2946 config.c:3273
2561 +#: config.c:2950 config.c:3277
2562 #, c-format
2563 msgid "could not lock config file %s"
2564 msgstr ""
2565
2569 -#: config.c:2957
2566 +#: config.c:2961
2567 #, c-format
2568 msgid "opening %s"
2569 msgstr ""
2570
2574 -#: config.c:2994 builtin/config.c:361
2571 +#: config.c:2998 builtin/config.c:361
2572 #, c-format
2573 msgid "invalid pattern: %s"
2574 msgstr ""
2575
2579 -#: config.c:3019
2576 +#: config.c:3023
2577 #, c-format
2578 msgid "invalid config file %s"
2579 msgstr ""
2580
2584 -#: config.c:3032 config.c:3286
2581 +#: config.c:3036 config.c:3290
2582 #, c-format
2583 msgid "fstat on %s failed"
2584 msgstr ""
2585
2589 -#: config.c:3043
2586 +#: config.c:3047
2587 #, c-format
2588 msgid "unable to mmap '%s'%s"
2589 msgstr ""
2590
2594 -#: config.c:3053 config.c:3291
2591 +#: config.c:3057 config.c:3295
2592 #, c-format
2593 msgid "chmod on %s failed"
2594 msgstr ""
2595
2599 -#: config.c:3138 config.c:3388
2596 +#: config.c:3142 config.c:3392
2597 #, c-format
2598 msgid "could not write config file %s"
2599 msgstr ""
2600
2604 -#: config.c:3172
2601 +#: config.c:3176
2602 #, c-format
2603 msgid "could not set '%s' to '%s'"
2604 msgstr ""
2605
2609 -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
2606 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
2607 #, c-format
2608 msgid "could not unset '%s'"
2609 msgstr ""
2610
2614 -#: config.c:3264
2611 +#: config.c:3268
2612 #, c-format
2613 msgid "invalid section name: %s"
2614 msgstr ""
2615
2619 -#: config.c:3431
2616 +#: config.c:3435
2617 #, c-format
2618 msgid "missing value for '%s'"
2619 msgstr ""
@@ -2785,7 +2782,7 @@ msgstr ""
2782 msgid "unable to fork"
2783 msgstr ""
2784
2788 -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
2785 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
2786 msgid "Checking connectivity"
2787 msgstr ""
2788
@@ -3073,596 +3070,598 @@ msgid ""
3070 "tree"
3071 msgstr ""
3072
3076 -#: diff.c:157
3073 +#: diff.c:158
3074 #, c-format
3075 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3076 msgstr ""
3077
3081 -#: diff.c:162
3078 +#: diff.c:163
3079 #, c-format
3080 msgid " Unknown dirstat parameter '%s'\n"
3081 msgstr ""
3082
3086 -#: diff.c:298
3083 +#: diff.c:299
3084 msgid ""
3085 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3086 "'dimmed-zebra', 'plain'"
3087 msgstr ""
3088
3092 -#: diff.c:326
3089 +#: diff.c:327
3090 #, c-format
3091 msgid ""
3092 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3093 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3094 msgstr ""
3095
3099 -#: diff.c:334
3096 +#: diff.c:335
3097 msgid ""
3098 "color-moved-ws: allow-indentation-change cannot be combined with other "
3099 "whitespace modes"
3100 msgstr ""
3101
3105 -#: diff.c:411
3102 +#: diff.c:412
3103 #, c-format
3104 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3105 msgstr ""
3106
3110 -#: diff.c:471
3107 +#: diff.c:472
3108 #, c-format
3109 msgid ""
3110 "Found errors in 'diff.dirstat' config variable:\n"
3111 "%s"
3112 msgstr ""
3113
3117 -#: diff.c:4290
3114 +#: diff.c:4237
3115 #, c-format
3116 msgid "external diff died, stopping at %s"
3117 msgstr ""
3118
3122 -#: diff.c:4642
3123 -msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3119 +#: diff.c:4589
3120 +#, c-format
3121 +msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
3122 msgstr ""
3123
3126 -#: diff.c:4645
3127 -msgid "-G, -S and --find-object are mutually exclusive"
3124 +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
3125 +#, c-format
3126 +msgid "options '%s', '%s', and '%s' cannot be used together"
3127 msgstr ""
3128
3130 -#: diff.c:4648
3131 -msgid ""
3132 -"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
3129 +#: diff.c:4597
3130 +#, c-format
3131 +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3132 msgstr ""
3133
3135 -#: diff.c:4651
3134 +#: diff.c:4601
3135 +#, c-format
3136 msgid ""
3137 -"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3138 -"with -G and -S"
3137 +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3138 msgstr ""
3139
3141 -#: diff.c:4730
3140 +#: diff.c:4681
3141 msgid "--follow requires exactly one pathspec"
3142 msgstr ""
3143
3145 -#: diff.c:4778
3144 +#: diff.c:4729
3145 #, c-format
3146 msgid "invalid --stat value: %s"
3147 msgstr ""
3148
3150 -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
3149 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
3150 #: parse-options.c:217 parse-options.c:221
3151 #, c-format
3152 msgid "%s expects a numerical value"
3153 msgstr ""
3154
3156 -#: diff.c:4815
3155 +#: diff.c:4766
3156 #, c-format
3157 msgid ""
3158 "Failed to parse --dirstat/-X option parameter:\n"
3159 "%s"
3160 msgstr ""
3161
3163 -#: diff.c:4900
3162 +#: diff.c:4851
3163 #, c-format
3164 msgid "unknown change class '%c' in --diff-filter=%s"
3165 msgstr ""
3166
3168 -#: diff.c:4924
3167 +#: diff.c:4875
3168 #, c-format
3169 msgid "unknown value after ws-error-highlight=%.*s"
3170 msgstr ""
3171
3173 -#: diff.c:4938
3172 +#: diff.c:4889
3173 #, c-format
3174 msgid "unable to resolve '%s'"
3175 msgstr ""
3176
3178 -#: diff.c:4988 diff.c:4994
3177 +#: diff.c:4939 diff.c:4945
3178 #, c-format
3179 msgid "%s expects <n>/<m> form"
3180 msgstr ""
3181
3183 -#: diff.c:5006
3182 +#: diff.c:4957
3183 #, c-format
3184 msgid "%s expects a character, got '%s'"
3185 msgstr ""
3186
3188 -#: diff.c:5027
3187 +#: diff.c:4978
3188 #, c-format
3189 msgid "bad --color-moved argument: %s"
3190 msgstr ""
3191
3193 -#: diff.c:5046
3192 +#: diff.c:4997
3193 #, c-format
3194 msgid "invalid mode '%s' in --color-moved-ws"
3195 msgstr ""
3196
3198 -#: diff.c:5086
3197 +#: diff.c:5037
3198 msgid ""
3199 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3200 "\"histogram\""
3201 msgstr ""
3202
3204 -#: diff.c:5122 diff.c:5142
3203 +#: diff.c:5073 diff.c:5093
3204 #, c-format
3205 msgid "invalid argument to %s"
3206 msgstr ""
3207
3209 -#: diff.c:5246
3208 +#: diff.c:5197
3209 #, c-format
3210 msgid "invalid regex given to -I: '%s'"
3211 msgstr ""
3212
3214 -#: diff.c:5295
3213 +#: diff.c:5246
3214 #, c-format
3215 msgid "failed to parse --submodule option parameter: '%s'"
3216 msgstr ""
3217
3219 -#: diff.c:5351
3218 +#: diff.c:5302
3219 #, c-format
3220 msgid "bad --word-diff argument: %s"
3221 msgstr ""
3222
3224 -#: diff.c:5387
3223 +#: diff.c:5338
3224 msgid "Diff output format options"
3225 msgstr ""
3226
3228 -#: diff.c:5389 diff.c:5395
3227 +#: diff.c:5340 diff.c:5346
3228 msgid "generate patch"
3229 msgstr ""
3230
3232 -#: diff.c:5392 builtin/log.c:179
3231 +#: diff.c:5343 builtin/log.c:179
3232 msgid "suppress diff output"
3233 msgstr ""
3234
3236 -#: diff.c:5397 diff.c:5511 diff.c:5518
3235 +#: diff.c:5348 diff.c:5462 diff.c:5469
3236 msgid "<n>"
3237 msgstr ""
3238
3240 -#: diff.c:5398 diff.c:5401
3239 +#: diff.c:5349 diff.c:5352
3240 msgid "generate diffs with <n> lines context"
3241 msgstr ""
3242
3244 -#: diff.c:5403
3243 +#: diff.c:5354
3244 msgid "generate the diff in raw format"
3245 msgstr ""
3246
3248 -#: diff.c:5406
3247 +#: diff.c:5357
3248 msgid "synonym for '-p --raw'"
3249 msgstr ""
3250
3252 -#: diff.c:5410
3251 +#: diff.c:5361
3252 msgid "synonym for '-p --stat'"
3253 msgstr ""
3254
3256 -#: diff.c:5414
3255 +#: diff.c:5365
3256 msgid "machine friendly --stat"
3257 msgstr ""
3258
3260 -#: diff.c:5417
3259 +#: diff.c:5368
3260 msgid "output only the last line of --stat"
3261 msgstr ""
3262
3264 -#: diff.c:5419 diff.c:5427
3263 +#: diff.c:5370 diff.c:5378
3264 msgid "<param1,param2>..."
3265 msgstr ""
3266
3268 -#: diff.c:5420
3267 +#: diff.c:5371
3268 msgid ""
3269 "output the distribution of relative amount of changes for each sub-directory"
3270 msgstr ""
3271
3273 -#: diff.c:5424
3272 +#: diff.c:5375
3273 msgid "synonym for --dirstat=cumulative"
3274 msgstr ""
3275
3277 -#: diff.c:5428
3276 +#: diff.c:5379
3277 msgid "synonym for --dirstat=files,param1,param2..."
3278 msgstr ""
3279
3281 -#: diff.c:5432
3280 +#: diff.c:5383
3281 msgid "warn if changes introduce conflict markers or whitespace errors"
3282 msgstr ""
3283
3285 -#: diff.c:5435
3284 +#: diff.c:5386
3285 msgid "condensed summary such as creations, renames and mode changes"
3286 msgstr ""
3287
3289 -#: diff.c:5438
3288 +#: diff.c:5389
3289 msgid "show only names of changed files"
3290 msgstr ""
3291
3293 -#: diff.c:5441
3292 +#: diff.c:5392
3293 msgid "show only names and status of changed files"
3294 msgstr ""
3295
3297 -#: diff.c:5443
3296 +#: diff.c:5394
3297 msgid "<width>[,<name-width>[,<count>]]"
3298 msgstr ""
3299
3301 -#: diff.c:5444
3300 +#: diff.c:5395
3301 msgid "generate diffstat"
3302 msgstr ""
3303
3305 -#: diff.c:5446 diff.c:5449 diff.c:5452
3304 +#: diff.c:5397 diff.c:5400 diff.c:5403
3305 msgid "<width>"
3306 msgstr ""
3307
3309 -#: diff.c:5447
3308 +#: diff.c:5398
3309 msgid "generate diffstat with a given width"
3310 msgstr ""
3311
3313 -#: diff.c:5450
3312 +#: diff.c:5401
3313 msgid "generate diffstat with a given name width"
3314 msgstr ""
3315
3317 -#: diff.c:5453
3316 +#: diff.c:5404
3317 msgid "generate diffstat with a given graph width"
3318 msgstr ""
3319
3321 -#: diff.c:5455
3320 +#: diff.c:5406
3321 msgid "<count>"
3322 msgstr ""
3323
3325 -#: diff.c:5456
3324 +#: diff.c:5407
3325 msgid "generate diffstat with limited lines"
3326 msgstr ""
3327
3329 -#: diff.c:5459
3328 +#: diff.c:5410
3329 msgid "generate compact summary in diffstat"
3330 msgstr ""
3331
3333 -#: diff.c:5462
3332 +#: diff.c:5413
3333 msgid "output a binary diff that can be applied"
3334 msgstr ""
3335
3337 -#: diff.c:5465
3336 +#: diff.c:5416
3337 msgid "show full pre- and post-image object names on the \"index\" lines"
3338 msgstr ""
3339
3341 -#: diff.c:5467
3340 +#: diff.c:5418
3341 msgid "show colored diff"
3342 msgstr ""
3343
3345 -#: diff.c:5468
3344 +#: diff.c:5419
3345 msgid "<kind>"
3346 msgstr ""
3347
3349 -#: diff.c:5469
3348 +#: diff.c:5420
3349 msgid ""
3350 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3351 "diff"
3352 msgstr ""
3353
3355 -#: diff.c:5472
3354 +#: diff.c:5423
3355 msgid ""
3356 "do not munge pathnames and use NULs as output field terminators in --raw or "
3357 "--numstat"
3358 msgstr ""
3359
3361 -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
3360 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
3361 msgid "<prefix>"
3362 msgstr ""
3363
3365 -#: diff.c:5476
3364 +#: diff.c:5427
3365 msgid "show the given source prefix instead of \"a/\""
3366 msgstr ""
3367
3369 -#: diff.c:5479
3368 +#: diff.c:5430
3369 msgid "show the given destination prefix instead of \"b/\""
3370 msgstr ""
3371
3373 -#: diff.c:5482
3372 +#: diff.c:5433
3373 msgid "prepend an additional prefix to every line of output"
3374 msgstr ""
3375
3377 -#: diff.c:5485
3376 +#: diff.c:5436
3377 msgid "do not show any source or destination prefix"
3378 msgstr ""
3379
3381 -#: diff.c:5488
3380 +#: diff.c:5439
3381 msgid "show context between diff hunks up to the specified number of lines"
3382 msgstr ""
3383
3385 -#: diff.c:5492 diff.c:5497 diff.c:5502
3384 +#: diff.c:5443 diff.c:5448 diff.c:5453
3385 msgid "<char>"
3386 msgstr ""
3387
3389 -#: diff.c:5493
3388 +#: diff.c:5444
3389 msgid "specify the character to indicate a new line instead of '+'"
3390 msgstr ""
3391
3393 -#: diff.c:5498
3392 +#: diff.c:5449
3393 msgid "specify the character to indicate an old line instead of '-'"
3394 msgstr ""
3395
3397 -#: diff.c:5503
3396 +#: diff.c:5454
3397 msgid "specify the character to indicate a context instead of ' '"
3398 msgstr ""
3399
3401 -#: diff.c:5506
3400 +#: diff.c:5457
3401 msgid "Diff rename options"
3402 msgstr ""
3403
3405 -#: diff.c:5507
3404 +#: diff.c:5458
3405 msgid "<n>[/<m>]"
3406 msgstr ""
3407
3409 -#: diff.c:5508
3408 +#: diff.c:5459
3409 msgid "break complete rewrite changes into pairs of delete and create"
3410 msgstr ""
3411
3413 -#: diff.c:5512
3412 +#: diff.c:5463
3413 msgid "detect renames"
3414 msgstr ""
3415
3417 -#: diff.c:5516
3416 +#: diff.c:5467
3417 msgid "omit the preimage for deletes"
3418 msgstr ""
3419
3421 -#: diff.c:5519
3420 +#: diff.c:5470
3421 msgid "detect copies"
3422 msgstr ""
3423
3425 -#: diff.c:5523
3424 +#: diff.c:5474
3425 msgid "use unmodified files as source to find copies"
3426 msgstr ""
3427
3429 -#: diff.c:5525
3428 +#: diff.c:5476
3429 msgid "disable rename detection"
3430 msgstr ""
3431
3433 -#: diff.c:5528
3432 +#: diff.c:5479
3433 msgid "use empty blobs as rename source"
3434 msgstr ""
3435
3437 -#: diff.c:5530
3436 +#: diff.c:5481
3437 msgid "continue listing the history of a file beyond renames"
3438 msgstr ""
3439
3441 -#: diff.c:5533
3440 +#: diff.c:5484
3441 msgid ""
3442 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3443 "given limit"
3444 msgstr ""
3445
3447 -#: diff.c:5535
3446 +#: diff.c:5486
3447 msgid "Diff algorithm options"
3448 msgstr ""
3449
3451 -#: diff.c:5537
3450 +#: diff.c:5488
3451 msgid "produce the smallest possible diff"
3452 msgstr ""
3453
3455 -#: diff.c:5540
3454 +#: diff.c:5491
3455 msgid "ignore whitespace when comparing lines"
3456 msgstr ""
3457
3459 -#: diff.c:5543
3458 +#: diff.c:5494
3459 msgid "ignore changes in amount of whitespace"
3460 msgstr ""
3461
3463 -#: diff.c:5546
3462 +#: diff.c:5497
3463 msgid "ignore changes in whitespace at EOL"
3464 msgstr ""
3465
3467 -#: diff.c:5549
3466 +#: diff.c:5500
3467 msgid "ignore carrier-return at the end of line"
3468 msgstr ""
3469
3471 -#: diff.c:5552
3470 +#: diff.c:5503
3471 msgid "ignore changes whose lines are all blank"
3472 msgstr ""
3473
3475 -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
3474 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
3475 msgid "<regex>"
3476 msgstr ""
3477
3479 -#: diff.c:5555
3478 +#: diff.c:5506
3479 msgid "ignore changes whose all lines match <regex>"
3480 msgstr ""
3481
3483 -#: diff.c:5558
3482 +#: diff.c:5509
3483 msgid "heuristic to shift diff hunk boundaries for easy reading"
3484 msgstr ""
3485
3487 -#: diff.c:5561
3486 +#: diff.c:5512
3487 msgid "generate diff using the \"patience diff\" algorithm"
3488 msgstr ""
3489
3491 -#: diff.c:5565
3490 +#: diff.c:5516
3491 msgid "generate diff using the \"histogram diff\" algorithm"
3492 msgstr ""
3493
3495 -#: diff.c:5567
3494 +#: diff.c:5518
3495 msgid "<algorithm>"
3496 msgstr ""
3497
3499 -#: diff.c:5568
3498 +#: diff.c:5519
3499 msgid "choose a diff algorithm"
3500 msgstr ""
3501
3503 -#: diff.c:5570
3502 +#: diff.c:5521
3503 msgid "<text>"
3504 msgstr ""
3505
3507 -#: diff.c:5571
3506 +#: diff.c:5522
3507 msgid "generate diff using the \"anchored diff\" algorithm"
3508 msgstr ""
3509
3511 -#: diff.c:5573 diff.c:5582 diff.c:5585
3510 +#: diff.c:5524 diff.c:5533 diff.c:5536
3511 msgid "<mode>"
3512 msgstr ""
3513
3515 -#: diff.c:5574
3514 +#: diff.c:5525
3515 msgid "show word diff, using <mode> to delimit changed words"
3516 msgstr ""
3517
3519 -#: diff.c:5577
3518 +#: diff.c:5528
3519 msgid "use <regex> to decide what a word is"
3520 msgstr ""
3521
3523 -#: diff.c:5580
3522 +#: diff.c:5531
3523 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3524 msgstr ""
3525
3527 -#: diff.c:5583
3526 +#: diff.c:5534
3527 msgid "moved lines of code are colored differently"
3528 msgstr ""
3529
3531 -#: diff.c:5586
3530 +#: diff.c:5537
3531 msgid "how white spaces are ignored in --color-moved"
3532 msgstr ""
3533
3535 -#: diff.c:5589
3534 +#: diff.c:5540
3535 msgid "Other diff options"
3536 msgstr ""
3537
3539 -#: diff.c:5591
3538 +#: diff.c:5542
3539 msgid "when run from subdir, exclude changes outside and show relative paths"
3540 msgstr ""
3541
3543 -#: diff.c:5595
3542 +#: diff.c:5546
3543 msgid "treat all files as text"
3544 msgstr ""
3545
3547 -#: diff.c:5597
3546 +#: diff.c:5548
3547 msgid "swap two inputs, reverse the diff"
3548 msgstr ""
3549
3551 -#: diff.c:5599
3550 +#: diff.c:5550
3551 msgid "exit with 1 if there were differences, 0 otherwise"
3552 msgstr ""
3553
3555 -#: diff.c:5601
3554 +#: diff.c:5552
3555 msgid "disable all output of the program"
3556 msgstr ""
3557
3559 -#: diff.c:5603
3558 +#: diff.c:5554
3559 msgid "allow an external diff helper to be executed"
3560 msgstr ""
3561
3563 -#: diff.c:5605
3562 +#: diff.c:5556
3563 msgid "run external text conversion filters when comparing binary files"
3564 msgstr ""
3565
3567 -#: diff.c:5607
3566 +#: diff.c:5558
3567 msgid "<when>"
3568 msgstr ""
3569
3571 -#: diff.c:5608
3570 +#: diff.c:5559
3571 msgid "ignore changes to submodules in the diff generation"
3572 msgstr ""
3573
3575 -#: diff.c:5611
3574 +#: diff.c:5562
3575 msgid "<format>"
3576 msgstr ""
3577
3579 -#: diff.c:5612
3578 +#: diff.c:5563
3579 msgid "specify how differences in submodules are shown"
3580 msgstr ""
3581
3583 -#: diff.c:5616
3582 +#: diff.c:5567
3583 msgid "hide 'git add -N' entries from the index"
3584 msgstr ""
3585
3587 -#: diff.c:5619
3586 +#: diff.c:5570
3587 msgid "treat 'git add -N' entries as real in the index"
3588 msgstr ""
3589
3591 -#: diff.c:5621
3590 +#: diff.c:5572
3591 msgid "<string>"
3592 msgstr ""
3593
3595 -#: diff.c:5622
3594 +#: diff.c:5573
3595 msgid ""
3596 "look for differences that change the number of occurrences of the specified "
3597 "string"
3598 msgstr ""
3599
3601 -#: diff.c:5625
3600 +#: diff.c:5576
3601 msgid ""
3602 "look for differences that change the number of occurrences of the specified "
3603 "regex"
3604 msgstr ""
3605
3607 -#: diff.c:5628
3606 +#: diff.c:5579
3607 msgid "show all changes in the changeset with -S or -G"
3608 msgstr ""
3609
3611 -#: diff.c:5631
3610 +#: diff.c:5582
3611 msgid "treat <string> in -S as extended POSIX regular expression"
3612 msgstr ""
3613
3615 -#: diff.c:5634
3614 +#: diff.c:5585
3615 msgid "control the order in which files appear in the output"
3616 msgstr ""
3617
3619 -#: diff.c:5635 diff.c:5638
3618 +#: diff.c:5586 diff.c:5589
3619 msgid "<path>"
3620 msgstr ""
3621
3623 -#: diff.c:5636
3622 +#: diff.c:5587
3623 msgid "show the change in the specified path first"
3624 msgstr ""
3625
3627 -#: diff.c:5639
3626 +#: diff.c:5590
3627 msgid "skip the output to the specified path"
3628 msgstr ""
3629
3631 -#: diff.c:5641
3630 +#: diff.c:5592
3631 msgid "<object-id>"
3632 msgstr ""
3633
3635 -#: diff.c:5642
3634 +#: diff.c:5593
3635 msgid ""
3636 "look for differences that change the number of occurrences of the specified "
3637 "object"
3638 msgstr ""
3639
3641 -#: diff.c:5644
3640 +#: diff.c:5595
3641 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3642 msgstr ""
3643
3645 -#: diff.c:5645
3644 +#: diff.c:5596
3645 msgid "select files by diff type"
3646 msgstr ""
3647
3649 -#: diff.c:5647
3648 +#: diff.c:5598
3649 msgid "<file>"
3650 msgstr ""
3651
3653 -#: diff.c:5648
3652 +#: diff.c:5599
3653 msgid "Output to a specific file"
3654 msgstr ""
3655
3657 -#: diff.c:6306
3656 +#: diff.c:6257
3657 msgid "exhaustive rename detection was skipped due to too many files."
3658 msgstr ""
3659
3661 -#: diff.c:6309
3660 +#: diff.c:6260
3661 msgid "only found copies from modified paths due to too many files."
3662 msgstr ""
3663
3665 -#: diff.c:6312
3664 +#: diff.c:6263
3665 #, c-format
3666 msgid ""
3667 "you may want to set your %s variable to at least %d and retry the command."
@@ -3702,64 +3701,64 @@ msgstr ""
3701 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3702 msgstr ""
3703
3705 -#: dir.c:830
3704 +#: dir.c:828
3705 msgid "disabling cone pattern matching"
3706 msgstr ""
3707
3709 -#: dir.c:1214
3708 +#: dir.c:1212
3709 #, c-format
3710 msgid "cannot use %s as an exclude file"
3711 msgstr ""
3712
3714 -#: dir.c:2464
3713 +#: dir.c:2418
3714 #, c-format
3715 msgid "could not open directory '%s'"
3716 msgstr ""
3717
3719 -#: dir.c:2766
3718 +#: dir.c:2720
3719 msgid "failed to get kernel name and information"
3720 msgstr ""
3721
3723 -#: dir.c:2890
3722 +#: dir.c:2844
3723 msgid "untracked cache is disabled on this system or location"
3724 msgstr ""
3725
3727 -#: dir.c:3158
3726 +#: dir.c:3112
3727 msgid ""
3728 "No directory name could be guessed.\n"
3729 "Please specify a directory on the command line"
3730 msgstr ""
3731
3733 -#: dir.c:3837
3732 +#: dir.c:3800
3733 #, c-format
3734 msgid "index file corrupt in repo %s"
3735 msgstr ""
3736
3738 -#: dir.c:3884 dir.c:3889
3737 +#: dir.c:3847 dir.c:3852
3738 #, c-format
3739 msgid "could not create directories for %s"
3740 msgstr ""
3741
3743 -#: dir.c:3918
3742 +#: dir.c:3881
3743 #, c-format
3744 msgid "could not migrate git directory from '%s' to '%s'"
3745 msgstr ""
3746
3748 -#: editor.c:77
3747 +#: editor.c:74
3748 #, c-format
3749 msgid "hint: Waiting for your editor to close the file...%c"
3750 msgstr ""
3751
3753 -#: entry.c:177
3752 +#: entry.c:179
3753 msgid "Filtering content"
3754 msgstr ""
3755
3757 -#: entry.c:498
3756 +#: entry.c:500
3757 #, c-format
3758 msgid "could not stat file '%s'"
3759 msgstr ""
3760
3762 -#: environment.c:143
3761 +#: environment.c:145
3762 #, c-format
3763 msgid "bad git namespace path \"%s\""
3764 msgstr ""
@@ -3769,338 +3768,334 @@ msgstr ""
3768 msgid "too many args to run %s"
3769 msgstr ""
3770
3772 -#: fetch-pack.c:193
3771 +#: fetch-pack.c:194
3772 msgid "git fetch-pack: expected shallow list"
3773 msgstr ""
3774
3776 -#: fetch-pack.c:196
3775 +#: fetch-pack.c:197
3776 msgid "git fetch-pack: expected a flush packet after shallow list"
3777 msgstr ""
3778
3780 -#: fetch-pack.c:207
3779 +#: fetch-pack.c:208
3780 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3781 msgstr ""
3782
3784 -#: fetch-pack.c:227
3783 +#: fetch-pack.c:228
3784 #, c-format
3785 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
3786 msgstr ""
3787
3789 -#: fetch-pack.c:238
3788 +#: fetch-pack.c:239
3789 msgid "unable to write to remote"
3790 msgstr ""
3791
3793 -#: fetch-pack.c:299
3794 -msgid "--stateless-rpc requires multi_ack_detailed"
3795 -msgstr ""
3796 -
3797 -#: fetch-pack.c:394 fetch-pack.c:1434
3792 +#: fetch-pack.c:395 fetch-pack.c:1439
3793 #, c-format
3794 msgid "invalid shallow line: %s"
3795 msgstr ""
3796
3802 -#: fetch-pack.c:400 fetch-pack.c:1440
3797 +#: fetch-pack.c:401 fetch-pack.c:1445
3798 #, c-format
3799 msgid "invalid unshallow line: %s"
3800 msgstr ""
3801
3807 -#: fetch-pack.c:402 fetch-pack.c:1442
3802 +#: fetch-pack.c:403 fetch-pack.c:1447
3803 #, c-format
3804 msgid "object not found: %s"
3805 msgstr ""
3806
3812 -#: fetch-pack.c:405 fetch-pack.c:1445
3807 +#: fetch-pack.c:406 fetch-pack.c:1450
3808 #, c-format
3809 msgid "error in object: %s"
3810 msgstr ""
3811
3817 -#: fetch-pack.c:407 fetch-pack.c:1447
3812 +#: fetch-pack.c:408 fetch-pack.c:1452
3813 #, c-format
3814 msgid "no shallow found: %s"
3815 msgstr ""
3816
3822 -#: fetch-pack.c:410 fetch-pack.c:1451
3817 +#: fetch-pack.c:411 fetch-pack.c:1456
3818 #, c-format
3819 msgid "expected shallow/unshallow, got %s"
3820 msgstr ""
3821
3827 -#: fetch-pack.c:450
3822 +#: fetch-pack.c:451
3823 #, c-format
3824 msgid "got %s %d %s"
3825 msgstr ""
3826
3832 -#: fetch-pack.c:467
3827 +#: fetch-pack.c:468
3828 #, c-format
3829 msgid "invalid commit %s"
3830 msgstr ""
3831
3837 -#: fetch-pack.c:498
3832 +#: fetch-pack.c:499
3833 msgid "giving up"
3834 msgstr ""
3835
3841 -#: fetch-pack.c:511 progress.c:339
3836 +#: fetch-pack.c:512 progress.c:339
3837 msgid "done"
3838 msgstr ""
3839
3845 -#: fetch-pack.c:523
3840 +#: fetch-pack.c:524
3841 #, c-format
3842 msgid "got %s (%d) %s"
3843 msgstr ""
3844
3850 -#: fetch-pack.c:559
3845 +#: fetch-pack.c:560
3846 #, c-format
3847 msgid "Marking %s as complete"
3848 msgstr ""
3849
3855 -#: fetch-pack.c:774
3850 +#: fetch-pack.c:775
3851 #, c-format
3852 msgid "already have %s (%s)"
3853 msgstr ""
3854
3860 -#: fetch-pack.c:860
3855 +#: fetch-pack.c:861
3856 msgid "fetch-pack: unable to fork off sideband demultiplexer"
3857 msgstr ""
3858
3864 -#: fetch-pack.c:868
3859 +#: fetch-pack.c:869
3860 msgid "protocol error: bad pack header"
3861 msgstr ""
3862
3868 -#: fetch-pack.c:962
3863 +#: fetch-pack.c:965
3864 #, c-format
3865 msgid "fetch-pack: unable to fork off %s"
3866 msgstr ""
3867
3873 -#: fetch-pack.c:968
3868 +#: fetch-pack.c:971
3869 msgid "fetch-pack: invalid index-pack output"
3870 msgstr ""
3871
3877 -#: fetch-pack.c:985
3872 +#: fetch-pack.c:988
3873 #, c-format
3874 msgid "%s failed"
3875 msgstr ""
3876
3882 -#: fetch-pack.c:987
3877 +#: fetch-pack.c:990
3878 msgid "error in sideband demultiplexer"
3879 msgstr ""
3880
3886 -#: fetch-pack.c:1030
3881 +#: fetch-pack.c:1035
3882 #, c-format
3883 msgid "Server version is %.*s"
3884 msgstr ""
3885
3891 -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
3892 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
3893 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
3894 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
3886 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
3887 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
3888 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
3889 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
3890 #, c-format
3891 msgid "Server supports %s"
3892 msgstr ""
3893
3899 -#: fetch-pack.c:1040
3894 +#: fetch-pack.c:1045
3895 msgid "Server does not support shallow clients"
3896 msgstr ""
3897
3903 -#: fetch-pack.c:1100
3898 +#: fetch-pack.c:1105
3899 msgid "Server does not support --shallow-since"
3900 msgstr ""
3901
3907 -#: fetch-pack.c:1105
3902 +#: fetch-pack.c:1110
3903 msgid "Server does not support --shallow-exclude"
3904 msgstr ""
3905
3911 -#: fetch-pack.c:1109
3906 +#: fetch-pack.c:1114
3907 msgid "Server does not support --deepen"
3908 msgstr ""
3909
3915 -#: fetch-pack.c:1111
3910 +#: fetch-pack.c:1116
3911 msgid "Server does not support this repository's object format"
3912 msgstr ""
3913
3919 -#: fetch-pack.c:1124
3914 +#: fetch-pack.c:1129
3915 msgid "no common commits"
3916 msgstr ""
3917
3923 -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
3918 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
3919 msgid "source repository is shallow, reject to clone."
3920 msgstr ""
3921
3927 -#: fetch-pack.c:1139 fetch-pack.c:1671
3922 +#: fetch-pack.c:1144 fetch-pack.c:1681
3923 msgid "git fetch-pack: fetch failed."
3924 msgstr ""
3925
3931 -#: fetch-pack.c:1253
3926 +#: fetch-pack.c:1258
3927 #, c-format
3928 msgid "mismatched algorithms: client %s; server %s"
3929 msgstr ""
3930
3936 -#: fetch-pack.c:1257
3931 +#: fetch-pack.c:1262
3932 #, c-format
3933 msgid "the server does not support algorithm '%s'"
3934 msgstr ""
3935
3941 -#: fetch-pack.c:1290
3936 +#: fetch-pack.c:1295
3937 msgid "Server does not support shallow requests"
3938 msgstr ""
3939
3945 -#: fetch-pack.c:1297
3940 +#: fetch-pack.c:1302
3941 msgid "Server supports filter"
3942 msgstr ""
3943
3949 -#: fetch-pack.c:1340 fetch-pack.c:2053
3944 +#: fetch-pack.c:1345 fetch-pack.c:2063
3945 msgid "unable to write request to remote"
3946 msgstr ""
3947
3953 -#: fetch-pack.c:1358
3948 +#: fetch-pack.c:1363
3949 #, c-format
3950 msgid "error reading section header '%s'"
3951 msgstr ""
3952
3958 -#: fetch-pack.c:1364
3953 +#: fetch-pack.c:1369
3954 #, c-format
3955 msgid "expected '%s', received '%s'"
3956 msgstr ""
3957
3963 -#: fetch-pack.c:1398
3958 +#: fetch-pack.c:1403
3959 #, c-format
3960 msgid "unexpected acknowledgment line: '%s'"
3961 msgstr ""
3962
3968 -#: fetch-pack.c:1403
3963 +#: fetch-pack.c:1408
3964 #, c-format
3965 msgid "error processing acks: %d"
3966 msgstr ""
3967
3973 -#: fetch-pack.c:1413
3968 +#: fetch-pack.c:1418
3969 msgid "expected packfile to be sent after 'ready'"
3970 msgstr ""
3971
3977 -#: fetch-pack.c:1415
3972 +#: fetch-pack.c:1420
3973 msgid "expected no other sections to be sent after no 'ready'"
3974 msgstr ""
3975
3981 -#: fetch-pack.c:1456
3976 +#: fetch-pack.c:1461
3977 #, c-format
3978 msgid "error processing shallow info: %d"
3979 msgstr ""
3980
3986 -#: fetch-pack.c:1505
3981 +#: fetch-pack.c:1510
3982 #, c-format
3983 msgid "expected wanted-ref, got '%s'"
3984 msgstr ""
3985
3991 -#: fetch-pack.c:1510
3986 +#: fetch-pack.c:1515
3987 #, c-format
3988 msgid "unexpected wanted-ref: '%s'"
3989 msgstr ""
3990
3996 -#: fetch-pack.c:1515
3991 +#: fetch-pack.c:1520
3992 #, c-format
3993 msgid "error processing wanted refs: %d"
3994 msgstr ""
3995
4001 -#: fetch-pack.c:1545
3996 +#: fetch-pack.c:1550
3997 msgid "git fetch-pack: expected response end packet"
3998 msgstr ""
3999
4005 -#: fetch-pack.c:1949
4000 +#: fetch-pack.c:1959
4001 msgid "no matching remote head"
4002 msgstr ""
4003
4009 -#: fetch-pack.c:1972 builtin/clone.c:581
4004 +#: fetch-pack.c:1982 builtin/clone.c:581
4005 msgid "remote did not send all necessary objects"
4006 msgstr ""
4007
4013 -#: fetch-pack.c:2075
4008 +#: fetch-pack.c:2085
4009 msgid "unexpected 'ready' from remote"
4010 msgstr ""
4011
4017 -#: fetch-pack.c:2098
4012 +#: fetch-pack.c:2108
4013 #, c-format
4014 msgid "no such remote ref %s"
4015 msgstr ""
4016
4022 -#: fetch-pack.c:2101
4017 +#: fetch-pack.c:2111
4018 #, c-format
4019 msgid "Server does not allow request for unadvertised object %s"
4020 msgstr ""
4021
4027 -#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
4028 -#: gpg-interface.c:918
4022 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
4023 +#: gpg-interface.c:990
4024 msgid "could not create temporary file"
4025 msgstr ""
4026
4032 -#: gpg-interface.c:332 gpg-interface.c:454
4027 +#: gpg-interface.c:332 gpg-interface.c:460
4028 #, c-format
4029 msgid "failed writing detached signature to '%s'"
4030 msgstr ""
4031
4037 -#: gpg-interface.c:445
4032 +#: gpg-interface.c:451
4033 msgid ""
4034 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
4035 "signature verification"
4036 msgstr ""
4037
4043 -#: gpg-interface.c:469
4038 +#: gpg-interface.c:480
4039 msgid ""
4040 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
4041 "verification (available in openssh version 8.2p1+)"
4042 msgstr ""
4043
4049 -#: gpg-interface.c:523
4044 +#: gpg-interface.c:536
4045 #, c-format
4046 msgid "ssh signing revocation file configured but not found: %s"
4047 msgstr ""
4048
4054 -#: gpg-interface.c:576
4049 +#: gpg-interface.c:624
4050 #, c-format
4051 msgid "bad/incompatible signature '%s'"
4052 msgstr ""
4053
4059 -#: gpg-interface.c:735 gpg-interface.c:740
4054 +#: gpg-interface.c:801 gpg-interface.c:806
4055 #, c-format
4056 msgid "failed to get the ssh fingerprint for key '%s'"
4057 msgstr ""
4058
4064 -#: gpg-interface.c:762
4059 +#: gpg-interface.c:829
4060 msgid ""
4061 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
4062 msgstr ""
4063
4069 -#: gpg-interface.c:780
4064 +#: gpg-interface.c:851
4065 #, c-format
4066 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
4067 msgstr ""
4068
4074 -#: gpg-interface.c:786
4069 +#: gpg-interface.c:857
4070 #, c-format
4071 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
4072 msgstr ""
4073
4079 -#: gpg-interface.c:874
4074 +#: gpg-interface.c:945
4075 msgid "gpg failed to sign the data"
4076 msgstr ""
4077
4083 -#: gpg-interface.c:895
4078 +#: gpg-interface.c:967
4079 msgid "user.signingkey needs to be set for ssh signing"
4080 msgstr ""
4081
4087 -#: gpg-interface.c:906
4082 +#: gpg-interface.c:978
4083 #, c-format
4084 msgid "failed writing ssh signing key to '%s'"
4085 msgstr ""
4086
4092 -#: gpg-interface.c:924
4087 +#: gpg-interface.c:996
4088 #, c-format
4089 msgid "failed writing ssh signing key buffer to '%s'"
4090 msgstr ""
4091
4097 -#: gpg-interface.c:942
4092 +#: gpg-interface.c:1014
4093 msgid ""
4094 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
4095 "8.2p1+)"
4096 msgstr ""
4097
4103 -#: gpg-interface.c:954
4098 +#: gpg-interface.c:1026
4099 #, c-format
4100 msgid "failed reading ssh signing data buffer from '%s'"
4101 msgstr ""
@@ -4110,24 +4105,24 @@ msgstr ""
4105 msgid "ignored invalid color '%.*s' in log.graphColors"
4106 msgstr ""
4107
4113 -#: grep.c:533
4108 +#: grep.c:531
4109 msgid ""
4110 "given pattern contains NULL byte (via -f <file>). This is only supported "
4111 "with -P under PCRE v2"
4112 msgstr ""
4113
4119 -#: grep.c:1928
4114 +#: grep.c:1942
4115 #, c-format
4116 msgid "'%s': unable to read %s"
4117 msgstr ""
4118
4124 -#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
4119 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
4120 #: builtin/rm.c:136
4121 #, c-format
4122 msgid "failed to stat '%s'"
4123 msgstr ""
4124
4130 -#: grep.c:1956
4125 +#: grep.c:1970
4126 #, c-format
4127 msgid "'%s': short read"
4128 msgstr ""
@@ -4246,7 +4241,7 @@ msgstr ""
4241
4242 #: help.c:646
4243 #, c-format
4249 -msgid "Run '%s' instead? (y/N)"
4244 +msgid "Run '%s' instead [y/N]? "
4245 msgstr ""
4246
4247 #: help.c:654
@@ -4441,7 +4436,7 @@ msgstr ""
4436 msgid "quoted CRLF detected"
4437 msgstr ""
4438
4444 -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
4439 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
4440 #, c-format
4441 msgid "bad action '%s' for '%s'"
4442 msgstr ""
@@ -4633,14 +4628,14 @@ msgstr ""
4628 msgid "CONFLICT (%s): Merge conflict in %s"
4629 msgstr ""
4630
4636 -#: merge-ort.c:3856
4631 +#: merge-ort.c:3869
4632 #, c-format
4633 msgid ""
4634 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
4635 "of %s left in tree."
4636 msgstr ""
4637
4643 -#: merge-ort.c:4152
4638 +#: merge-ort.c:4165
4639 #, c-format
4640 msgid ""
4641 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4650,7 +4645,7 @@ msgstr ""
4645 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4646 #. base, and 2-3) the trees for the two trees we're merging.
4647 #.
4653 -#: merge-ort.c:4521
4648 +#: merge-ort.c:4534
4649 #, c-format
4650 msgid "collecting merge info failed for trees %s, %s, %s"
4651 msgstr ""
@@ -4662,7 +4657,7 @@ msgid ""
4657 " %s"
4658 msgstr ""
4659
4665 -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
4660 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
4661 msgid "Already up to date."
4662 msgstr ""
4663
@@ -4921,7 +4916,7 @@ msgstr ""
4916 msgid "Could not parse object '%s'"
4917 msgstr ""
4918
4924 -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
4919 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
4920 #: builtin/stash.c:489
4921 msgid "Unable to write index."
4922 msgstr ""
@@ -4930,8 +4925,8 @@ msgstr ""
4925 msgid "failed to read the cache"
4926 msgstr ""
4927
4933 -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
4934 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
4928 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
4929 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
4930 #: builtin/stash.c:269
4931 msgid "unable to write new index file"
4932 msgstr ""
@@ -4940,211 +4935,211 @@ msgstr ""
4935 msgid "multi-pack-index OID fanout is of the wrong size"
4936 msgstr ""
4937
4943 -#: midx.c:109
4938 +#: midx.c:111
4939 #, c-format
4940 msgid "multi-pack-index file %s is too small"
4941 msgstr ""
4942
4948 -#: midx.c:125
4943 +#: midx.c:127
4944 #, c-format
4945 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4946 msgstr ""
4947
4953 -#: midx.c:130
4948 +#: midx.c:132
4949 #, c-format
4950 msgid "multi-pack-index version %d not recognized"
4951 msgstr ""
4952
4958 -#: midx.c:135
4953 +#: midx.c:137
4954 #, c-format
4955 msgid "multi-pack-index hash version %u does not match version %u"
4956 msgstr ""
4957
4963 -#: midx.c:152
4958 +#: midx.c:154
4959 msgid "multi-pack-index missing required pack-name chunk"
4960 msgstr ""
4961
4967 -#: midx.c:154
4962 +#: midx.c:156
4963 msgid "multi-pack-index missing required OID fanout chunk"
4964 msgstr ""
4965
4971 -#: midx.c:156
4966 +#: midx.c:158
4967 msgid "multi-pack-index missing required OID lookup chunk"
4968 msgstr ""
4969
4975 -#: midx.c:158
4970 +#: midx.c:160
4971 msgid "multi-pack-index missing required object offsets chunk"
4972 msgstr ""
4973
4979 -#: midx.c:174
4974 +#: midx.c:176
4975 #, c-format
4976 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
4977 msgstr ""
4978
4984 -#: midx.c:221
4979 +#: midx.c:224
4980 #, c-format
4981 msgid "bad pack-int-id: %u (%u total packs)"
4982 msgstr ""
4983
4989 -#: midx.c:271
4984 +#: midx.c:274
4985 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
4986 msgstr ""
4987
4993 -#: midx.c:502
4988 +#: midx.c:505
4989 #, c-format
4990 msgid "failed to add packfile '%s'"
4991 msgstr ""
4992
4998 -#: midx.c:508
4993 +#: midx.c:511
4994 #, c-format
4995 msgid "failed to open pack-index '%s'"
4996 msgstr ""
4997
5003 -#: midx.c:576
4998 +#: midx.c:579
4999 #, c-format
5000 msgid "failed to locate object %d in packfile"
5001 msgstr ""
5002
5008 -#: midx.c:892
5003 +#: midx.c:895
5004 msgid "cannot store reverse index file"
5005 msgstr ""
5006
5012 -#: midx.c:990
5007 +#: midx.c:993
5008 #, c-format
5009 msgid "could not parse line: %s"
5010 msgstr ""
5011
5017 -#: midx.c:992
5012 +#: midx.c:995
5013 #, c-format
5014 msgid "malformed line: %s"
5015 msgstr ""
5016
5022 -#: midx.c:1159
5017 +#: midx.c:1162
5018 msgid "ignoring existing multi-pack-index; checksum mismatch"
5019 msgstr ""
5020
5026 -#: midx.c:1184
5021 +#: midx.c:1187
5022 msgid "could not load pack"
5023 msgstr ""
5024
5030 -#: midx.c:1190
5025 +#: midx.c:1193
5026 #, c-format
5027 msgid "could not open index for %s"
5028 msgstr ""
5029
5035 -#: midx.c:1201
5030 +#: midx.c:1204
5031 msgid "Adding packfiles to multi-pack-index"
5032 msgstr ""
5033
5039 -#: midx.c:1244
5034 +#: midx.c:1247
5035 #, c-format
5036 msgid "unknown preferred pack: '%s'"
5037 msgstr ""
5038
5044 -#: midx.c:1289
5039 +#: midx.c:1292
5040 #, c-format
5041 msgid "cannot select preferred pack %s with no objects"
5042 msgstr ""
5043
5049 -#: midx.c:1321
5044 +#: midx.c:1324
5045 #, c-format
5046 msgid "did not see pack-file %s to drop"
5047 msgstr ""
5048
5054 -#: midx.c:1367
5049 +#: midx.c:1370
5050 #, c-format
5051 msgid "preferred pack '%s' is expired"
5052 msgstr ""
5053
5059 -#: midx.c:1380
5054 +#: midx.c:1383
5055 msgid "no pack files to index."
5056 msgstr ""
5057
5063 -#: midx.c:1417
5058 +#: midx.c:1420
5059 msgid "could not write multi-pack bitmap"
5060 msgstr ""
5061
5067 -#: midx.c:1427
5062 +#: midx.c:1430
5063 msgid "could not write multi-pack-index"
5064 msgstr ""
5065
5071 -#: midx.c:1486 builtin/clean.c:37
5066 +#: midx.c:1489 builtin/clean.c:37
5067 #, c-format
5068 msgid "failed to remove %s"
5069 msgstr ""
5070
5076 -#: midx.c:1517
5071 +#: midx.c:1522
5072 #, c-format
5073 msgid "failed to clear multi-pack-index at %s"
5074 msgstr ""
5075
5081 -#: midx.c:1577
5076 +#: midx.c:1585
5077 msgid "multi-pack-index file exists, but failed to parse"
5078 msgstr ""
5079
5085 -#: midx.c:1585
5080 +#: midx.c:1593
5081 msgid "incorrect checksum"
5082 msgstr ""
5083
5089 -#: midx.c:1588
5084 +#: midx.c:1596
5085 msgid "Looking for referenced packfiles"
5086 msgstr ""
5087
5093 -#: midx.c:1603
5088 +#: midx.c:1611
5089 #, c-format
5090 msgid ""
5091 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5092 msgstr ""
5093
5099 -#: midx.c:1608
5094 +#: midx.c:1616
5095 msgid "the midx contains no oid"
5096 msgstr ""
5097
5103 -#: midx.c:1617
5098 +#: midx.c:1625
5099 msgid "Verifying OID order in multi-pack-index"
5100 msgstr ""
5101
5107 -#: midx.c:1626
5102 +#: midx.c:1634
5103 #, c-format
5104 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5105 msgstr ""
5106
5112 -#: midx.c:1646
5107 +#: midx.c:1654
5108 msgid "Sorting objects by packfile"
5109 msgstr ""
5110
5116 -#: midx.c:1653
5111 +#: midx.c:1661
5112 msgid "Verifying object offsets"
5113 msgstr ""
5114
5120 -#: midx.c:1669
5115 +#: midx.c:1677
5116 #, c-format
5117 msgid "failed to load pack entry for oid[%d] = %s"
5118 msgstr ""
5119
5125 -#: midx.c:1675
5120 +#: midx.c:1683
5121 #, c-format
5122 msgid "failed to load pack-index for packfile %s"
5123 msgstr ""
5124
5130 -#: midx.c:1684
5125 +#: midx.c:1692
5126 #, c-format
5127 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5128 msgstr ""
5129
5135 -#: midx.c:1709
5130 +#: midx.c:1719
5131 msgid "Counting referenced objects"
5132 msgstr ""
5133
5139 -#: midx.c:1719
5134 +#: midx.c:1729
5135 msgid "Finding and deleting unreferenced packfiles"
5136 msgstr ""
5137
5143 -#: midx.c:1911
5138 +#: midx.c:1921
5139 msgid "could not start pack-objects"
5140 msgstr ""
5141
5147 -#: midx.c:1931
5142 +#: midx.c:1941
5143 msgid "could not finish pack-objects"
5144 msgstr ""
5145
@@ -5199,257 +5194,257 @@ msgstr ""
5194 msgid "Bad %s value: '%s'"
5195 msgstr ""
5196
5202 -#: object-file.c:459
5197 +#: object-file.c:456
5198 #, c-format
5199 msgid "object directory %s does not exist; check .git/objects/info/alternates"
5200 msgstr ""
5201
5207 -#: object-file.c:517
5202 +#: object-file.c:514
5203 #, c-format
5204 msgid "unable to normalize alternate object path: %s"
5205 msgstr ""
5206
5212 -#: object-file.c:591
5207 +#: object-file.c:588
5208 #, c-format
5209 msgid "%s: ignoring alternate object stores, nesting too deep"
5210 msgstr ""
5211
5217 -#: object-file.c:598
5212 +#: object-file.c:595
5213 #, c-format
5214 msgid "unable to normalize object directory: %s"
5215 msgstr ""
5216
5222 -#: object-file.c:641
5217 +#: object-file.c:638
5218 msgid "unable to fdopen alternates lockfile"
5219 msgstr ""
5220
5226 -#: object-file.c:659
5221 +#: object-file.c:656
5222 msgid "unable to read alternates file"
5223 msgstr ""
5224
5230 -#: object-file.c:666
5225 +#: object-file.c:663
5226 msgid "unable to move new alternates file into place"
5227 msgstr ""
5228
5234 -#: object-file.c:701
5229 +#: object-file.c:741
5230 #, c-format
5231 msgid "path '%s' does not exist"
5232 msgstr ""
5233
5239 -#: object-file.c:722
5234 +#: object-file.c:762
5235 #, c-format
5236 msgid "reference repository '%s' as a linked checkout is not supported yet."
5237 msgstr ""
5238
5244 -#: object-file.c:728
5239 +#: object-file.c:768
5240 #, c-format
5241 msgid "reference repository '%s' is not a local repository."
5242 msgstr ""
5243
5249 -#: object-file.c:734
5244 +#: object-file.c:774
5245 #, c-format
5246 msgid "reference repository '%s' is shallow"
5247 msgstr ""
5248
5254 -#: object-file.c:742
5249 +#: object-file.c:782
5250 #, c-format
5251 msgid "reference repository '%s' is grafted"
5252 msgstr ""
5253
5259 -#: object-file.c:773
5254 +#: object-file.c:813
5255 #, c-format
5256 msgid "could not find object directory matching %s"
5257 msgstr ""
5258
5264 -#: object-file.c:823
5259 +#: object-file.c:863
5260 #, c-format
5261 msgid "invalid line while parsing alternate refs: %s"
5262 msgstr ""
5263
5269 -#: object-file.c:973
5264 +#: object-file.c:1013
5265 #, c-format
5266 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
5267 msgstr ""
5268
5274 -#: object-file.c:1008
5269 +#: object-file.c:1048
5270 #, c-format
5271 msgid "mmap failed%s"
5272 msgstr ""
5273
5279 -#: object-file.c:1174
5274 +#: object-file.c:1214
5275 #, c-format
5276 msgid "object file %s is empty"
5277 msgstr ""
5278
5284 -#: object-file.c:1293 object-file.c:2499
5279 +#: object-file.c:1333 object-file.c:2542
5280 #, c-format
5281 msgid "corrupt loose object '%s'"
5282 msgstr ""
5283
5289 -#: object-file.c:1295 object-file.c:2503
5284 +#: object-file.c:1335 object-file.c:2546
5285 #, c-format
5286 msgid "garbage at end of loose object '%s'"
5287 msgstr ""
5288
5294 -#: object-file.c:1417
5289 +#: object-file.c:1457
5290 #, c-format
5291 msgid "unable to parse %s header"
5292 msgstr ""
5293
5299 -#: object-file.c:1419
5294 +#: object-file.c:1459
5295 msgid "invalid object type"
5296 msgstr ""
5297
5303 -#: object-file.c:1430
5298 +#: object-file.c:1470
5299 #, c-format
5300 msgid "unable to unpack %s header"
5301 msgstr ""
5302
5308 -#: object-file.c:1434
5303 +#: object-file.c:1474
5304 #, c-format
5305 msgid "header for %s too long, exceeds %d bytes"
5306 msgstr ""
5307
5313 -#: object-file.c:1664
5308 +#: object-file.c:1704
5309 #, c-format
5310 msgid "failed to read object %s"
5311 msgstr ""
5312
5318 -#: object-file.c:1668
5313 +#: object-file.c:1708
5314 #, c-format
5315 msgid "replacement %s not found for %s"
5316 msgstr ""
5317
5323 -#: object-file.c:1672
5318 +#: object-file.c:1712
5319 #, c-format
5320 msgid "loose object %s (stored in %s) is corrupt"
5321 msgstr ""
5322
5328 -#: object-file.c:1676
5323 +#: object-file.c:1716
5324 #, c-format
5325 msgid "packed object %s (stored in %s) is corrupt"
5326 msgstr ""
5327
5333 -#: object-file.c:1781
5328 +#: object-file.c:1821
5329 #, c-format
5330 msgid "unable to write file %s"
5331 msgstr ""
5332
5338 -#: object-file.c:1788
5333 +#: object-file.c:1828
5334 #, c-format
5335 msgid "unable to set permission to '%s'"
5336 msgstr ""
5337
5343 -#: object-file.c:1795
5338 +#: object-file.c:1835
5339 msgid "file write error"
5340 msgstr ""
5341
5347 -#: object-file.c:1815
5342 +#: object-file.c:1858
5343 msgid "error when closing loose object file"
5344 msgstr ""
5345
5351 -#: object-file.c:1882
5346 +#: object-file.c:1925
5347 #, c-format
5348 msgid "insufficient permission for adding an object to repository database %s"
5349 msgstr ""
5350
5356 -#: object-file.c:1884
5351 +#: object-file.c:1927
5352 msgid "unable to create temporary file"
5353 msgstr ""
5354
5360 -#: object-file.c:1908
5355 +#: object-file.c:1951
5356 msgid "unable to write loose object file"
5357 msgstr ""
5358
5364 -#: object-file.c:1914
5359 +#: object-file.c:1957
5360 #, c-format
5361 msgid "unable to deflate new object %s (%d)"
5362 msgstr ""
5363
5369 -#: object-file.c:1918
5364 +#: object-file.c:1961
5365 #, c-format
5366 msgid "deflateEnd on object %s failed (%d)"
5367 msgstr ""
5368
5374 -#: object-file.c:1922
5369 +#: object-file.c:1965
5370 #, c-format
5371 msgid "confused by unstable object source data for %s"
5372 msgstr ""
5373
5379 -#: object-file.c:1933 builtin/pack-objects.c:1243
5374 +#: object-file.c:1976 builtin/pack-objects.c:1243
5375 #, c-format
5376 msgid "failed utime() on %s"
5377 msgstr ""
5378
5384 -#: object-file.c:2011
5379 +#: object-file.c:2054
5380 #, c-format
5381 msgid "cannot read object for %s"
5382 msgstr ""
5383
5389 -#: object-file.c:2062
5384 +#: object-file.c:2105
5385 msgid "corrupt commit"
5386 msgstr ""
5387
5393 -#: object-file.c:2070
5388 +#: object-file.c:2113
5389 msgid "corrupt tag"
5390 msgstr ""
5391
5397 -#: object-file.c:2170
5392 +#: object-file.c:2213
5393 #, c-format
5394 msgid "read error while indexing %s"
5395 msgstr ""
5396
5402 -#: object-file.c:2173
5397 +#: object-file.c:2216
5398 #, c-format
5399 msgid "short read while indexing %s"
5400 msgstr ""
5401
5407 -#: object-file.c:2246 object-file.c:2256
5402 +#: object-file.c:2289 object-file.c:2299
5403 #, c-format
5404 msgid "%s: failed to insert into database"
5405 msgstr ""
5406
5412 -#: object-file.c:2262
5407 +#: object-file.c:2305
5408 #, c-format
5409 msgid "%s: unsupported file type"
5410 msgstr ""
5411
5417 -#: object-file.c:2286 builtin/fetch.c:1445
5412 +#: object-file.c:2329 builtin/fetch.c:1448
5413 #, c-format
5414 msgid "%s is not a valid object"
5415 msgstr ""
5416
5422 -#: object-file.c:2288
5417 +#: object-file.c:2331
5418 #, c-format
5419 msgid "%s is not a valid '%s' object"
5420 msgstr ""
5421
5427 -#: object-file.c:2315
5422 +#: object-file.c:2358
5423 #, c-format
5424 msgid "unable to open %s"
5425 msgstr ""
5426
5432 -#: object-file.c:2510
5427 +#: object-file.c:2553
5428 #, c-format
5429 msgid "hash mismatch for %s (expected %s)"
5430 msgstr ""
5431
5437 -#: object-file.c:2533
5432 +#: object-file.c:2576
5433 #, c-format
5434 msgid "unable to mmap %s"
5435 msgstr ""
5436
5442 -#: object-file.c:2539
5437 +#: object-file.c:2582
5438 #, c-format
5439 msgid "unable to unpack header of %s"
5440 msgstr ""
5441
5447 -#: object-file.c:2544
5442 +#: object-file.c:2587
5443 #, c-format
5444 msgid "unable to parse header of %s"
5445 msgstr ""
5446
5452 -#: object-file.c:2555
5447 +#: object-file.c:2598
5448 #, c-format
5449 msgid "unable to unpack contents of %s"
5450 msgstr ""
@@ -5561,25 +5556,25 @@ msgstr ""
5556 msgid "hash mismatch %s"
5557 msgstr ""
5558
5564 -#: pack-bitmap.c:348
5559 +#: pack-bitmap.c:353
5560 msgid "multi-pack bitmap is missing required reverse index"
5561 msgstr ""
5562
5568 -#: pack-bitmap.c:424
5563 +#: pack-bitmap.c:429
5564 msgid "load_reverse_index: could not open pack"
5565 msgstr ""
5566
5572 -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
5567 +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
5568 #, c-format
5569 msgid "unable to get size of %s"
5570 msgstr ""
5571
5577 -#: pack-bitmap.c:1916
5572 +#: pack-bitmap.c:1935
5573 #, c-format
5574 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
5575 msgstr ""
5576
5582 -#: pack-bitmap.c:1952 builtin/rev-list.c:92
5577 +#: pack-bitmap.c:1971 builtin/rev-list.c:92
5578 #, c-format
5579 msgid "unable to get disk usage of %s"
5580 msgstr ""
@@ -5628,45 +5623,50 @@ msgstr ""
5623 msgid "could not write '%s' promisor file"
5624 msgstr ""
5625
5631 -#: packfile.c:626
5626 +#: packfile.c:627
5627 msgid "offset before end of packfile (broken .idx?)"
5628 msgstr ""
5629
5635 -#: packfile.c:656
5630 +#: packfile.c:657
5631 #, c-format
5632 msgid "packfile %s cannot be mapped%s"
5633 msgstr ""
5634
5640 -#: packfile.c:1923
5635 +#: packfile.c:1924
5636 #, c-format
5637 msgid "offset before start of pack index for %s (corrupt index?)"
5638 msgstr ""
5639
5645 -#: packfile.c:1927
5640 +#: packfile.c:1928
5641 #, c-format
5642 msgid "offset beyond end of pack index for %s (truncated index?)"
5643 msgstr ""
5644
5650 -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
5645 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
5646 #, c-format
5647 msgid "option `%s' expects a numerical value"
5648 msgstr ""
5649
5655 -#: parse-options-cb.c:41
5650 +#: parse-options-cb.c:42
5651 #, c-format
5652 msgid "malformed expiration date '%s'"
5653 msgstr ""
5654
5660 -#: parse-options-cb.c:54
5655 +#: parse-options-cb.c:55
5656 #, c-format
5657 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
5658 msgstr ""
5659
5665 -#: parse-options-cb.c:132 parse-options-cb.c:149
5660 +#: parse-options-cb.c:133 parse-options-cb.c:150
5661 #, c-format
5662 msgid "malformed object name '%s'"
5663 msgstr ""
5664
5665 +#: parse-options-cb.c:307
5666 +#, c-format
5667 +msgid "option `%s' expects \"%s\" or \"%s\""
5668 +msgstr ""
5669 +
5670 #: parse-options.c:58
5671 #, c-format
5672 msgid "%s requires a value"
@@ -5702,36 +5702,36 @@ msgstr ""
5702 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
5703 msgstr ""
5704
5705 -#: parse-options.c:427 parse-options.c:435
5705 +#: parse-options.c:428 parse-options.c:436
5706 #, c-format
5707 msgid "did you mean `--%s` (with two dashes)?"
5708 msgstr ""
5709
5710 -#: parse-options.c:677 parse-options.c:1053
5710 +#: parse-options.c:678 parse-options.c:1054
5711 #, c-format
5712 msgid "alias of --%s"
5713 msgstr ""
5714
5715 -#: parse-options.c:891
5715 +#: parse-options.c:892
5716 #, c-format
5717 msgid "unknown option `%s'"
5718 msgstr ""
5719
5720 -#: parse-options.c:893
5720 +#: parse-options.c:894
5721 #, c-format
5722 msgid "unknown switch `%c'"
5723 msgstr ""
5724
5725 -#: parse-options.c:895
5725 +#: parse-options.c:896
5726 #, c-format
5727 msgid "unknown non-ascii option in string: `%s'"
5728 msgstr ""
5729
5730 -#: parse-options.c:919
5730 +#: parse-options.c:920
5731 msgid "..."
5732 msgstr ""
5733
5734 -#: parse-options.c:933
5734 +#: parse-options.c:934
5735 #, c-format
5736 msgid "usage: %s"
5737 msgstr ""
@@ -5739,7 +5739,7 @@ msgstr ""
5739 #. TRANSLATORS: the colon here should align with the
5740 #. one in "usage: %s" translation.
5741 #.
5742 -#: parse-options.c:948
5742 +#: parse-options.c:949
5743 #, c-format
5744 msgid " or: %s"
5745 msgstr ""
@@ -5763,17 +5763,17 @@ msgstr ""
5763 #. translated) N_() usage string, which contained embedded
5764 #. newlines before we split it up.
5765 #.
5766 -#: parse-options.c:969
5766 +#: parse-options.c:970
5767 #, c-format
5768 msgid "%*s%s"
5769 msgstr ""
5770
5771 -#: parse-options.c:992
5771 +#: parse-options.c:993
5772 #, c-format
5773 msgid " %s"
5774 msgstr ""
5775
5776 -#: parse-options.c:1039
5776 +#: parse-options.c:1040
5777 msgid "-NUM"
5778 msgstr ""
5779
@@ -5899,17 +5899,17 @@ msgstr ""
5899 msgid "the remote end hung up unexpectedly"
5900 msgstr ""
5901
5902 -#: pkt-line.c:390 pkt-line.c:392
5902 +#: pkt-line.c:417 pkt-line.c:419
5903 #, c-format
5904 msgid "protocol error: bad line length character: %.4s"
5905 msgstr ""
5906
5907 -#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
5907 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
5908 #, c-format
5909 msgid "protocol error: bad line length %d"
5910 msgstr ""
5911
5912 -#: pkt-line.c:434 sideband.c:165
5912 +#: pkt-line.c:472 sideband.c:165
5913 #, c-format
5914 msgid "remote error: %s"
5915 msgstr ""
@@ -5960,7 +5960,7 @@ msgstr ""
5960 msgid "could not read `log` output"
5961 msgstr ""
5962
5963 -#: range-diff.c:97 sequencer.c:5605
5963 +#: range-diff.c:97 sequencer.c:5602
5964 #, c-format
5965 msgid "could not parse commit '%s'"
5966 msgstr ""
@@ -5981,209 +5981,205 @@ msgstr ""
5981 msgid "failed to generate diff"
5982 msgstr ""
5983
5984 -#: range-diff.c:559
5985 -msgid "--left-only and --right-only are mutually exclusive"
5986 -msgstr ""
5987 -
5984 #: range-diff.c:562 range-diff.c:564
5985 #, c-format
5986 msgid "could not parse log for '%s'"
5987 msgstr ""
5988
5993 -#: read-cache.c:710
5989 +#: read-cache.c:723
5990 #, c-format
5991 msgid "will not add file alias '%s' ('%s' already exists in index)"
5992 msgstr ""
5993
5998 -#: read-cache.c:726
5994 +#: read-cache.c:739
5995 msgid "cannot create an empty blob in the object database"
5996 msgstr ""
5997
6002 -#: read-cache.c:748
5998 +#: read-cache.c:761
5999 #, c-format
6000 msgid "%s: can only add regular files, symbolic links or git-directories"
6001 msgstr ""
6002
6007 -#: read-cache.c:753 builtin/submodule--helper.c:3241
6003 +#: read-cache.c:766 builtin/submodule--helper.c:3242
6004 #, c-format
6005 msgid "'%s' does not have a commit checked out"
6006 msgstr ""
6007
6012 -#: read-cache.c:805
6008 +#: read-cache.c:818
6009 #, c-format
6010 msgid "unable to index file '%s'"
6011 msgstr ""
6012
6017 -#: read-cache.c:824
6013 +#: read-cache.c:837
6014 #, c-format
6015 msgid "unable to add '%s' to index"
6016 msgstr ""
6017
6022 -#: read-cache.c:835
6018 +#: read-cache.c:848
6019 #, c-format
6020 msgid "unable to stat '%s'"
6021 msgstr ""
6022
6027 -#: read-cache.c:1373
6023 +#: read-cache.c:1386
6024 #, c-format
6025 msgid "'%s' appears as both a file and as a directory"
6026 msgstr ""
6027
6032 -#: read-cache.c:1588
6028 +#: read-cache.c:1601
6029 msgid "Refresh index"
6030 msgstr ""
6031
6036 -#: read-cache.c:1720
6032 +#: read-cache.c:1733
6033 #, c-format
6034 msgid ""
6035 "index.version set, but the value is invalid.\n"
6036 "Using version %i"
6037 msgstr ""
6038
6043 -#: read-cache.c:1730
6039 +#: read-cache.c:1743
6040 #, c-format
6041 msgid ""
6042 "GIT_INDEX_VERSION set, but the value is invalid.\n"
6043 "Using version %i"
6044 msgstr ""
6045
6050 -#: read-cache.c:1786
6046 +#: read-cache.c:1799
6047 #, c-format
6048 msgid "bad signature 0x%08x"
6049 msgstr ""
6050
6055 -#: read-cache.c:1789
6051 +#: read-cache.c:1802
6052 #, c-format
6053 msgid "bad index version %d"
6054 msgstr ""
6055
6060 -#: read-cache.c:1798
6056 +#: read-cache.c:1811
6057 msgid "bad index file sha1 signature"
6058 msgstr ""
6059
6064 -#: read-cache.c:1832
6060 +#: read-cache.c:1845
6061 #, c-format
6062 msgid "index uses %.4s extension, which we do not understand"
6063 msgstr ""
6064
6069 -#: read-cache.c:1834
6065 +#: read-cache.c:1847
6066 #, c-format
6067 msgid "ignoring %.4s extension"
6068 msgstr ""
6069
6074 -#: read-cache.c:1871
6070 +#: read-cache.c:1884
6071 #, c-format
6072 msgid "unknown index entry format 0x%08x"
6073 msgstr ""
6074
6079 -#: read-cache.c:1887
6075 +#: read-cache.c:1900
6076 #, c-format
6077 msgid "malformed name field in the index, near path '%s'"
6078 msgstr ""
6079
6084 -#: read-cache.c:1944
6080 +#: read-cache.c:1957
6081 msgid "unordered stage entries in index"
6082 msgstr ""
6083
6088 -#: read-cache.c:1947
6084 +#: read-cache.c:1960
6085 #, c-format
6086 msgid "multiple stage entries for merged file '%s'"
6087 msgstr ""
6088
6093 -#: read-cache.c:1950
6089 +#: read-cache.c:1963
6090 #, c-format
6091 msgid "unordered stage entries for '%s'"
6092 msgstr ""
6093
6098 -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
6099 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
6100 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
6094 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
6095 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
6096 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
6097 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
6102 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
6103 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
6098 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
6099 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
6100 msgid "index file corrupt"
6101 msgstr ""
6102
6107 -#: read-cache.c:2209
6103 +#: read-cache.c:2222
6104 #, c-format
6105 msgid "unable to create load_cache_entries thread: %s"
6106 msgstr ""
6107
6112 -#: read-cache.c:2222
6108 +#: read-cache.c:2235
6109 #, c-format
6110 msgid "unable to join load_cache_entries thread: %s"
6111 msgstr ""
6112
6117 -#: read-cache.c:2255
6113 +#: read-cache.c:2268
6114 #, c-format
6115 msgid "%s: index file open failed"
6116 msgstr ""
6117
6122 -#: read-cache.c:2259
6118 +#: read-cache.c:2272
6119 #, c-format
6120 msgid "%s: cannot stat the open index"
6121 msgstr ""
6122
6127 -#: read-cache.c:2263
6123 +#: read-cache.c:2276
6124 #, c-format
6125 msgid "%s: index file smaller than expected"
6126 msgstr ""
6127
6132 -#: read-cache.c:2267
6128 +#: read-cache.c:2280
6129 #, c-format
6130 msgid "%s: unable to map index file%s"
6131 msgstr ""
6132
6137 -#: read-cache.c:2310
6133 +#: read-cache.c:2323
6134 #, c-format
6135 msgid "unable to create load_index_extensions thread: %s"
6136 msgstr ""
6137
6142 -#: read-cache.c:2337
6138 +#: read-cache.c:2350
6139 #, c-format
6140 msgid "unable to join load_index_extensions thread: %s"
6141 msgstr ""
6142
6147 -#: read-cache.c:2375
6143 +#: read-cache.c:2396
6144 #, c-format
6145 msgid "could not freshen shared index '%s'"
6146 msgstr ""
6147
6152 -#: read-cache.c:2434
6148 +#: read-cache.c:2455
6149 #, c-format
6150 msgid "broken index, expect %s in %s, got %s"
6151 msgstr ""
6152
6157 -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
6153 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
6154 #, c-format
6155 msgid "could not close '%s'"
6156 msgstr ""
6157
6162 -#: read-cache.c:3108
6158 +#: read-cache.c:3129
6159 msgid "failed to convert to a sparse-index"
6160 msgstr ""
6161
6166 -#: read-cache.c:3179
6162 +#: read-cache.c:3200
6163 #, c-format
6164 msgid "could not stat '%s'"
6165 msgstr ""
6166
6171 -#: read-cache.c:3192
6167 +#: read-cache.c:3213
6168 #, c-format
6169 msgid "unable to open git dir: %s"
6170 msgstr ""
6171
6176 -#: read-cache.c:3204
6172 +#: read-cache.c:3225
6173 #, c-format
6174 msgid "unable to unlink: %s"
6175 msgstr ""
6176
6181 -#: read-cache.c:3233
6177 +#: read-cache.c:3254
6178 #, c-format
6179 msgid "cannot fix permission bits on '%s'"
6180 msgstr ""
6181
6186 -#: read-cache.c:3390
6182 +#: read-cache.c:3411
6183 #, c-format
6184 msgid "%s: cannot drop to stage #0"
6185 msgstr ""
@@ -6261,8 +6257,8 @@ msgid ""
6257 "\n"
6258 msgstr ""
6259
6264 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
6265 -#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
6260 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
6261 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
6262 #: builtin/rebase.c:190
6263 #, c-format
6264 msgid "could not write '%s'"
@@ -6296,7 +6292,7 @@ msgstr ""
6292 msgid "%s: 'preserve' superseded by 'merges'"
6293 msgstr ""
6294
6299 -#: ref-filter.c:42 wt-status.c:2036
6295 +#: ref-filter.c:42 wt-status.c:2048
6296 msgid "gone"
6297 msgstr ""
6298
@@ -6335,7 +6331,8 @@ msgstr ""
6331 msgid "Integer value expected refname:rstrip=%s"
6332 msgstr ""
6333
6338 -#: ref-filter.c:265
6334 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
6335 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
6336 #, c-format
6337 msgid "unrecognized %%(%s) argument: %s"
6338 msgstr ""
@@ -6345,11 +6342,6 @@ msgstr ""
6342 msgid "%%(objecttype) does not take arguments"
6343 msgstr ""
6344
6348 -#: ref-filter.c:344
6349 -#, c-format
6350 -msgid "unrecognized %%(objectsize) argument: %s"
6351 -msgstr ""
6352 -
6345 #: ref-filter.c:352
6346 #, c-format
6347 msgid "%%(deltabase) does not take arguments"
@@ -6360,11 +6352,6 @@ msgstr ""
6352 msgid "%%(body) does not take arguments"
6353 msgstr ""
6354
6363 -#: ref-filter.c:377
6364 -#, c-format
6365 -msgid "unrecognized %%(subject) argument: %s"
6366 -msgstr ""
6367 -
6355 #: ref-filter.c:396
6356 #, c-format
6357 msgid "expected %%(trailers:key=<value>)"
@@ -6380,26 +6367,11 @@ msgstr ""
6367 msgid "positive value expected contents:lines=%s"
6368 msgstr ""
6369
6383 -#: ref-filter.c:431
6384 -#, c-format
6385 -msgid "unrecognized %%(contents) argument: %s"
6386 -msgstr ""
6387 -
6388 -#: ref-filter.c:443
6389 -#, c-format
6390 -msgid "unrecognized %%(raw) argument: %s"
6391 -msgstr ""
6392 -
6370 #: ref-filter.c:458
6371 #, c-format
6372 msgid "positive value expected '%s' in %%(%s)"
6373 msgstr ""
6374
6398 -#: ref-filter.c:462
6399 -#, c-format
6400 -msgid "unrecognized argument '%s' in %%(%s)"
6401 -msgstr ""
6402 -
6375 #: ref-filter.c:476
6376 #, c-format
6377 msgid "unrecognized email option: %s"
@@ -6420,21 +6392,11 @@ msgstr ""
6392 msgid "unrecognized width:%s"
6393 msgstr ""
6394
6423 -#: ref-filter.c:534
6424 -#, c-format
6425 -msgid "unrecognized %%(align) argument: %s"
6426 -msgstr ""
6427 -
6395 #: ref-filter.c:542
6396 #, c-format
6397 msgid "positive width expected with the %%(align) atom"
6398 msgstr ""
6399
6433 -#: ref-filter.c:560
6434 -#, c-format
6435 -msgid "unrecognized %%(if) argument: %s"
6436 -msgstr ""
6437 -
6400 #: ref-filter.c:568
6401 #, c-format
6402 msgid "%%(rest) does not take arguments"
@@ -6456,14 +6418,9 @@ msgid ""
6418 "not a git repository, but the field '%.*s' requires access to object data"
6419 msgstr ""
6420
6459 -#: ref-filter.c:844
6460 -#, c-format
6461 -msgid "format: %%(if) atom used without a %%(then) atom"
6462 -msgstr ""
6463 -
6464 -#: ref-filter.c:910
6421 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
6422 #, c-format
6466 -msgid "format: %%(then) atom used without an %%(if) atom"
6423 +msgid "format: %%(%s) atom used without a %%(%s) atom"
6424 msgstr ""
6425
6426 #: ref-filter.c:912
@@ -6476,16 +6433,6 @@ msgstr ""
6433 msgid "format: %%(then) atom used after %%(else)"
6434 msgstr ""
6435
6479 -#: ref-filter.c:946
6480 -#, c-format
6481 -msgid "format: %%(else) atom used without an %%(if) atom"
6482 -msgstr ""
6483 -
6484 -#: ref-filter.c:948
6485 -#, c-format
6486 -msgid "format: %%(else) atom used without a %%(then) atom"
6487 -msgstr ""
6488 -
6436 #: ref-filter.c:950
6437 #, c-format
6438 msgid "format: %%(else) atom used more than once"
@@ -6560,22 +6507,22 @@ msgstr ""
6507 msgid "ignoring ref with broken name %s"
6508 msgstr ""
6509
6563 -#: ref-filter.c:2250 refs.c:673
6510 +#: ref-filter.c:2250 refs.c:676
6511 #, c-format
6512 msgid "ignoring broken ref %s"
6513 msgstr ""
6514
6568 -#: ref-filter.c:2623
6515 +#: ref-filter.c:2629
6516 #, c-format
6517 msgid "format: %%(end) atom missing"
6518 msgstr ""
6519
6573 -#: ref-filter.c:2726
6520 +#: ref-filter.c:2740
6521 #, c-format
6522 msgid "malformed object name %s"
6523 msgstr ""
6524
6578 -#: ref-filter.c:2731
6525 +#: ref-filter.c:2745
6526 #, c-format
6527 msgid "option `%s' must point to a commit"
6528 msgstr ""
@@ -6610,71 +6557,71 @@ msgstr ""
6557 msgid "invalid branch name: %s = %s"
6558 msgstr ""
6559
6613 -#: refs.c:671
6560 +#: refs.c:674
6561 #, c-format
6562 msgid "ignoring dangling symref %s"
6563 msgstr ""
6564
6618 -#: refs.c:920
6565 +#: refs.c:925
6566 #, c-format
6567 msgid "log for ref %s has gap after %s"
6568 msgstr ""
6569
6623 -#: refs.c:927
6570 +#: refs.c:932
6571 #, c-format
6572 msgid "log for ref %s unexpectedly ended on %s"
6573 msgstr ""
6574
6628 -#: refs.c:992
6575 +#: refs.c:997
6576 #, c-format
6577 msgid "log for %s is empty"
6578 msgstr ""
6579
6633 -#: refs.c:1084
6580 +#: refs.c:1090
6581 #, c-format
6582 msgid "refusing to update ref with bad name '%s'"
6583 msgstr ""
6584
6638 -#: refs.c:1155
6585 +#: refs.c:1168
6586 #, c-format
6587 msgid "update_ref failed for ref '%s': %s"
6588 msgstr ""
6589
6643 -#: refs.c:2062
6590 +#: refs.c:2069
6591 #, c-format
6592 msgid "multiple updates for ref '%s' not allowed"
6593 msgstr ""
6594
6648 -#: refs.c:2142
6595 +#: refs.c:2152
6596 msgid "ref updates forbidden inside quarantine environment"
6597 msgstr ""
6598
6652 -#: refs.c:2153
6599 +#: refs.c:2163
6600 msgid "ref updates aborted by hook"
6601 msgstr ""
6602
6656 -#: refs.c:2253 refs.c:2283
6603 +#: refs.c:2271 refs.c:2301
6604 #, c-format
6605 msgid "'%s' exists; cannot create '%s'"
6606 msgstr ""
6607
6661 -#: refs.c:2259 refs.c:2294
6608 +#: refs.c:2277 refs.c:2312
6609 #, c-format
6610 msgid "cannot process '%s' and '%s' at the same time"
6611 msgstr ""
6612
6666 -#: refs/files-backend.c:1271
6613 +#: refs/files-backend.c:1268
6614 #, c-format
6615 msgid "could not remove reference %s"
6616 msgstr ""
6617
6671 -#: refs/files-backend.c:1285 refs/packed-backend.c:1549
6618 +#: refs/files-backend.c:1282 refs/packed-backend.c:1549
6619 #: refs/packed-backend.c:1559
6620 #, c-format
6621 msgid "could not delete reference %s: %s"
6622 msgstr ""
6623
6677 -#: refs/files-backend.c:1288 refs/packed-backend.c:1562
6624 +#: refs/files-backend.c:1285 refs/packed-backend.c:1562
6625 #, c-format
6626 msgid "could not delete references: %s"
6627 msgstr ""
@@ -6684,50 +6631,50 @@ msgstr ""
6631 msgid "invalid refspec '%s'"
6632 msgstr ""
6633
6687 -#: remote.c:351
6634 +#: remote.c:402
6635 #, c-format
6636 msgid "config remote shorthand cannot begin with '/': %s"
6637 msgstr ""
6638
6692 -#: remote.c:399
6639 +#: remote.c:450
6640 msgid "more than one receivepack given, using the first"
6641 msgstr ""
6642
6696 -#: remote.c:407
6643 +#: remote.c:458
6644 msgid "more than one uploadpack given, using the first"
6645 msgstr ""
6646
6700 -#: remote.c:590
6647 +#: remote.c:699
6648 #, c-format
6649 msgid "Cannot fetch both %s and %s to %s"
6650 msgstr ""
6651
6705 -#: remote.c:594
6652 +#: remote.c:703
6653 #, c-format
6654 msgid "%s usually tracks %s, not %s"
6655 msgstr ""
6656
6710 -#: remote.c:598
6657 +#: remote.c:707
6658 #, c-format
6659 msgid "%s tracks both %s and %s"
6660 msgstr ""
6661
6715 -#: remote.c:666
6662 +#: remote.c:775
6663 #, c-format
6664 msgid "key '%s' of pattern had no '*'"
6665 msgstr ""
6666
6720 -#: remote.c:676
6667 +#: remote.c:785
6668 #, c-format
6669 msgid "value '%s' of pattern has no '*'"
6670 msgstr ""
6671
6725 -#: remote.c:1083
6672 +#: remote.c:1192
6673 #, c-format
6674 msgid "src refspec %s does not match any"
6675 msgstr ""
6676
6730 -#: remote.c:1088
6677 +#: remote.c:1197
6678 #, c-format
6679 msgid "src refspec %s matches more than one"
6680 msgstr ""
@@ -6736,7 +6683,7 @@ msgstr ""
6683 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6684 #. the <src>.
6685 #.
6739 -#: remote.c:1103
6686 +#: remote.c:1212
6687 #, c-format
6688 msgid ""
6689 "The destination you provided is not a full refname (i.e.,\n"
@@ -6750,7 +6697,7 @@ msgid ""
6697 "Neither worked, so we gave up. You must fully qualify the ref."
6698 msgstr ""
6699
6753 -#: remote.c:1123
6700 +#: remote.c:1232
6701 #, c-format
6702 msgid ""
6703 "The <src> part of the refspec is a commit object.\n"
@@ -6758,7 +6705,7 @@ msgid ""
6705 "'%s:refs/heads/%s'?"
6706 msgstr ""
6707
6761 -#: remote.c:1128
6708 +#: remote.c:1237
6709 #, c-format
6710 msgid ""
6711 "The <src> part of the refspec is a tag object.\n"
@@ -6766,7 +6713,7 @@ msgid ""
6713 "'%s:refs/tags/%s'?"
6714 msgstr ""
6715
6769 -#: remote.c:1133
6716 +#: remote.c:1242
6717 #, c-format
6718 msgid ""
6719 "The <src> part of the refspec is a tree object.\n"
@@ -6774,7 +6721,7 @@ msgid ""
6721 "'%s:refs/tags/%s'?"
6722 msgstr ""
6723
6777 -#: remote.c:1138
6724 +#: remote.c:1247
6725 #, c-format
6726 msgid ""
6727 "The <src> part of the refspec is a blob object.\n"
@@ -6782,114 +6729,114 @@ msgid ""
6729 "'%s:refs/tags/%s'?"
6730 msgstr ""
6731
6785 -#: remote.c:1174
6732 +#: remote.c:1283
6733 #, c-format
6734 msgid "%s cannot be resolved to branch"
6735 msgstr ""
6736
6790 -#: remote.c:1185
6737 +#: remote.c:1294
6738 #, c-format
6739 msgid "unable to delete '%s': remote ref does not exist"
6740 msgstr ""
6741
6795 -#: remote.c:1197
6742 +#: remote.c:1306
6743 #, c-format
6744 msgid "dst refspec %s matches more than one"
6745 msgstr ""
6746
6800 -#: remote.c:1204
6747 +#: remote.c:1313
6748 #, c-format
6749 msgid "dst ref %s receives from more than one src"
6750 msgstr ""
6751
6805 -#: remote.c:1724 remote.c:1825
6752 +#: remote.c:1834 remote.c:1941
6753 msgid "HEAD does not point to a branch"
6754 msgstr ""
6755
6809 -#: remote.c:1733
6756 +#: remote.c:1843
6757 #, c-format
6758 msgid "no such branch: '%s'"
6759 msgstr ""
6760
6814 -#: remote.c:1736
6761 +#: remote.c:1846
6762 #, c-format
6763 msgid "no upstream configured for branch '%s'"
6764 msgstr ""
6765
6819 -#: remote.c:1742
6766 +#: remote.c:1852
6767 #, c-format
6768 msgid "upstream branch '%s' not stored as a remote-tracking branch"
6769 msgstr ""
6770
6824 -#: remote.c:1757
6771 +#: remote.c:1867
6772 #, c-format
6773 msgid "push destination '%s' on remote '%s' has no local tracking branch"
6774 msgstr ""
6775
6829 -#: remote.c:1769
6776 +#: remote.c:1882
6777 #, c-format
6778 msgid "branch '%s' has no remote for pushing"
6779 msgstr ""
6780
6834 -#: remote.c:1779
6781 +#: remote.c:1892
6782 #, c-format
6783 msgid "push refspecs for '%s' do not include '%s'"
6784 msgstr ""
6785
6839 -#: remote.c:1792
6786 +#: remote.c:1905
6787 msgid "push has no destination (push.default is 'nothing')"
6788 msgstr ""
6789
6843 -#: remote.c:1814
6790 +#: remote.c:1927
6791 msgid "cannot resolve 'simple' push to a single destination"
6792 msgstr ""
6793
6847 -#: remote.c:1943
6794 +#: remote.c:2060
6795 #, c-format
6796 msgid "couldn't find remote ref %s"
6797 msgstr ""
6798
6852 -#: remote.c:1956
6799 +#: remote.c:2073
6800 #, c-format
6801 msgid "* Ignoring funny ref '%s' locally"
6802 msgstr ""
6803
6857 -#: remote.c:2119
6804 +#: remote.c:2236
6805 #, c-format
6806 msgid "Your branch is based on '%s', but the upstream is gone.\n"
6807 msgstr ""
6808
6862 -#: remote.c:2123
6809 +#: remote.c:2240
6810 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6811 msgstr ""
6812
6866 -#: remote.c:2126
6813 +#: remote.c:2243
6814 #, c-format
6815 msgid "Your branch is up to date with '%s'.\n"
6816 msgstr ""
6817
6871 -#: remote.c:2130
6818 +#: remote.c:2247
6819 #, c-format
6820 msgid "Your branch and '%s' refer to different commits.\n"
6821 msgstr ""
6822
6876 -#: remote.c:2133
6823 +#: remote.c:2250
6824 #, c-format
6825 msgid " (use \"%s\" for details)\n"
6826 msgstr ""
6827
6881 -#: remote.c:2137
6828 +#: remote.c:2254
6829 #, c-format
6830 msgid "Your branch is ahead of '%s' by %d commit.\n"
6831 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6832 msgstr[0] ""
6833 msgstr[1] ""
6834
6888 -#: remote.c:2143
6835 +#: remote.c:2260
6836 msgid " (use \"git push\" to publish your local commits)\n"
6837 msgstr ""
6838
6892 -#: remote.c:2146
6839 +#: remote.c:2263
6840 #, c-format
6841 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6842 msgid_plural ""
@@ -6897,11 +6844,11 @@ msgid_plural ""
6844 msgstr[0] ""
6845 msgstr[1] ""
6846
6900 -#: remote.c:2154
6847 +#: remote.c:2271
6848 msgid " (use \"git pull\" to update your local branch)\n"
6849 msgstr ""
6850
6904 -#: remote.c:2157
6851 +#: remote.c:2274
6852 #, c-format
6853 msgid ""
6854 "Your branch and '%s' have diverged,\n"
@@ -6912,11 +6859,11 @@ msgid_plural ""
6859 msgstr[0] ""
6860 msgstr[1] ""
6861
6915 -#: remote.c:2167
6862 +#: remote.c:2284
6863 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6864 msgstr ""
6865
6919 -#: remote.c:2359
6866 +#: remote.c:2476
6867 #, c-format
6868 msgid "cannot parse expected object name '%s'"
6869 msgstr ""
@@ -6949,7 +6896,7 @@ msgstr ""
6896 msgid "there were errors while writing '%s' (%s)"
6897 msgstr ""
6898
6952 -#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
6899 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
6900 #, c-format
6901 msgid "failed to flush '%s'"
6902 msgstr ""
@@ -6994,8 +6941,8 @@ msgstr ""
6941 msgid "Recorded preimage for '%s'"
6942 msgstr ""
6943
6997 -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
6998 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
6944 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
6945 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
6946 #, c-format
6947 msgid "could not create directory '%s'"
6948 msgstr ""
@@ -7033,37 +6980,29 @@ msgstr ""
6980 msgid "could not determine HEAD revision"
6981 msgstr ""
6982
7036 -#: reset.c:70 reset.c:76 sequencer.c:3705
6983 +#: reset.c:70 reset.c:76 sequencer.c:3700
6984 #, c-format
6985 msgid "failed to find tree of %s"
6986 msgstr ""
6987
7041 -#: revision.c:2259
7042 -msgid "--unsorted-input is incompatible with --no-walk"
7043 -msgstr ""
7044 -
7045 -#: revision.c:2346
6988 +#: revision.c:2347
6989 msgid "--unpacked=<packfile> no longer supported"
6990 msgstr ""
6991
7049 -#: revision.c:2655 revision.c:2659
7050 -msgid "--no-walk is incompatible with --unsorted-input"
7051 -msgstr ""
7052 -
7053 -#: revision.c:2690
6992 +#: revision.c:2686
6993 msgid "your current branch appears to be broken"
6994 msgstr ""
6995
7057 -#: revision.c:2693
6996 +#: revision.c:2689
6997 #, c-format
6998 msgid "your current branch '%s' does not have any commits yet"
6999 msgstr ""
7000
7062 -#: revision.c:2895
7001 +#: revision.c:2891
7002 msgid "-L does not yet support diff formats besides -p and -s"
7003 msgstr ""
7004
7066 -#: run-command.c:1278
7005 +#: run-command.c:1262
7006 #, c-format
7007 msgid "cannot create async thread: %s"
7008 msgstr ""
@@ -7126,8 +7065,8 @@ msgstr ""
7065 msgid "could not delete '%s'"
7066 msgstr ""
7067
7129 -#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
7130 -#: builtin/rm.c:408
7068 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
7069 +#: builtin/rm.c:409
7070 #, c-format
7071 msgid "could not remove '%s'"
7072 msgstr ""
@@ -7175,13 +7114,13 @@ msgid ""
7114 "run \"git revert --abort\"."
7115 msgstr ""
7116
7178 -#: sequencer.c:448 sequencer.c:3290
7117 +#: sequencer.c:448 sequencer.c:3292
7118 #, c-format
7119 msgid "could not lock '%s'"
7120 msgstr ""
7121
7183 -#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
7184 -#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
7122 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
7123 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
7124 #, c-format
7125 msgid "could not write to '%s'"
7126 msgstr ""
@@ -7191,12 +7130,18 @@ msgstr ""
7130 msgid "could not write eol to '%s'"
7131 msgstr ""
7132
7194 -#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
7195 -#: sequencer.c:3574
7133 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
7134 +#: sequencer.c:3569
7135 #, c-format
7136 msgid "failed to finalize '%s'"
7137 msgstr ""
7138
7139 +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
7140 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
7141 +#, c-format
7142 +msgid "could not read '%s'"
7143 +msgstr ""
7144 +
7145 #: sequencer.c:499
7146 #, c-format
7147 msgid "your local changes would be overwritten by %s."
@@ -7211,7 +7156,7 @@ msgstr ""
7156 msgid "%s: fast-forward"
7157 msgstr ""
7158
7214 -#: sequencer.c:574 builtin/tag.c:610
7159 +#: sequencer.c:574 builtin/tag.c:614
7160 #, c-format
7161 msgid "Invalid cleanup mode %s"
7162 msgstr ""
@@ -7242,8 +7187,8 @@ msgstr ""
7187 msgid "unable to dequote value of '%s'"
7188 msgstr ""
7189
7245 -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
7246 -#: builtin/am.c:822 builtin/rebase.c:694
7190 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
7191 +#: builtin/am.c:848 builtin/rebase.c:694
7192 #, c-format
7193 msgid "could not open '%s' for reading"
7194 msgstr ""
@@ -7294,11 +7239,11 @@ msgid ""
7239 " git rebase --continue\n"
7240 msgstr ""
7241
7297 -#: sequencer.c:1229
7242 +#: sequencer.c:1225
7243 msgid "'prepare-commit-msg' hook failed"
7244 msgstr ""
7245
7301 -#: sequencer.c:1235
7246 +#: sequencer.c:1231
7247 msgid ""
7248 "Your name and email address were configured automatically based\n"
7249 "on your username and hostname. Please check that they are accurate.\n"
@@ -7313,7 +7258,7 @@ msgid ""
7258 " git commit --amend --reset-author\n"
7259 msgstr ""
7260
7316 -#: sequencer.c:1248
7261 +#: sequencer.c:1244
7262 msgid ""
7263 "Your name and email address were configured automatically based\n"
7264 "on your username and hostname. Please check that they are accurate.\n"
@@ -7327,364 +7272,364 @@ msgid ""
7272 " git commit --amend --reset-author\n"
7273 msgstr ""
7274
7330 -#: sequencer.c:1290
7275 +#: sequencer.c:1288
7276 msgid "couldn't look up newly created commit"
7277 msgstr ""
7278
7334 -#: sequencer.c:1292
7279 +#: sequencer.c:1290
7280 msgid "could not parse newly created commit"
7281 msgstr ""
7282
7338 -#: sequencer.c:1338
7283 +#: sequencer.c:1339
7284 msgid "unable to resolve HEAD after creating commit"
7285 msgstr ""
7286
7342 -#: sequencer.c:1340
7287 +#: sequencer.c:1342
7288 msgid "detached HEAD"
7289 msgstr ""
7290
7346 -#: sequencer.c:1344
7291 +#: sequencer.c:1346
7292 msgid " (root-commit)"
7293 msgstr ""
7294
7350 -#: sequencer.c:1365
7295 +#: sequencer.c:1367
7296 msgid "could not parse HEAD"
7297 msgstr ""
7298
7354 -#: sequencer.c:1367
7299 +#: sequencer.c:1369
7300 #, c-format
7301 msgid "HEAD %s is not a commit!"
7302 msgstr ""
7303
7359 -#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
7304 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
7305 msgid "could not parse HEAD commit"
7306 msgstr ""
7307
7363 -#: sequencer.c:1427 sequencer.c:2312
7308 +#: sequencer.c:1429 sequencer.c:2314
7309 msgid "unable to parse commit author"
7310 msgstr ""
7311
7367 -#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
7312 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
7313 msgid "git write-tree failed to write a tree"
7314 msgstr ""
7315
7371 -#: sequencer.c:1471 sequencer.c:1591
7316 +#: sequencer.c:1473 sequencer.c:1593
7317 #, c-format
7318 msgid "unable to read commit message from '%s'"
7319 msgstr ""
7320
7376 -#: sequencer.c:1502 sequencer.c:1534
7321 +#: sequencer.c:1504 sequencer.c:1536
7322 #, c-format
7323 msgid "invalid author identity '%s'"
7324 msgstr ""
7325
7381 -#: sequencer.c:1508
7326 +#: sequencer.c:1510
7327 msgid "corrupt author: missing date information"
7328 msgstr ""
7329
7385 -#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
7386 -#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
7330 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
7331 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
7332 msgid "failed to write commit object"
7333 msgstr ""
7334
7390 -#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
7335 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
7336 #: t/helper/test-fast-rebase.c:217
7337 #, c-format
7338 msgid "could not update %s"
7339 msgstr ""
7340
7396 -#: sequencer.c:1623
7341 +#: sequencer.c:1625
7342 #, c-format
7343 msgid "could not parse commit %s"
7344 msgstr ""
7345
7401 -#: sequencer.c:1628
7346 +#: sequencer.c:1630
7347 #, c-format
7348 msgid "could not parse parent commit %s"
7349 msgstr ""
7350
7406 -#: sequencer.c:1711 sequencer.c:1992
7351 +#: sequencer.c:1713 sequencer.c:1994
7352 #, c-format
7353 msgid "unknown command: %d"
7354 msgstr ""
7355
7411 -#: sequencer.c:1753
7356 +#: sequencer.c:1755
7357 msgid "This is the 1st commit message:"
7358 msgstr ""
7359
7415 -#: sequencer.c:1754
7360 +#: sequencer.c:1756
7361 #, c-format
7362 msgid "This is the commit message #%d:"
7363 msgstr ""
7364
7420 -#: sequencer.c:1755
7365 +#: sequencer.c:1757
7366 msgid "The 1st commit message will be skipped:"
7367 msgstr ""
7368
7424 -#: sequencer.c:1756
7369 +#: sequencer.c:1758
7370 #, c-format
7371 msgid "The commit message #%d will be skipped:"
7372 msgstr ""
7373
7429 -#: sequencer.c:1757
7374 +#: sequencer.c:1759
7375 #, c-format
7376 msgid "This is a combination of %d commits."
7377 msgstr ""
7378
7434 -#: sequencer.c:1904 sequencer.c:1961
7379 +#: sequencer.c:1906 sequencer.c:1963
7380 #, c-format
7381 msgid "cannot write '%s'"
7382 msgstr ""
7383
7439 -#: sequencer.c:1951
7384 +#: sequencer.c:1953
7385 msgid "need a HEAD to fixup"
7386 msgstr ""
7387
7443 -#: sequencer.c:1953 sequencer.c:3601
7388 +#: sequencer.c:1955 sequencer.c:3596
7389 msgid "could not read HEAD"
7390 msgstr ""
7391
7447 -#: sequencer.c:1955
7392 +#: sequencer.c:1957
7393 msgid "could not read HEAD's commit message"
7394 msgstr ""
7395
7451 -#: sequencer.c:1979
7396 +#: sequencer.c:1981
7397 #, c-format
7398 msgid "could not read commit message of %s"
7399 msgstr ""
7400
7456 -#: sequencer.c:2089
7401 +#: sequencer.c:2091
7402 msgid "your index file is unmerged."
7403 msgstr ""
7404
7460 -#: sequencer.c:2096
7405 +#: sequencer.c:2098
7406 msgid "cannot fixup root commit"
7407 msgstr ""
7408
7464 -#: sequencer.c:2115
7409 +#: sequencer.c:2117
7410 #, c-format
7411 msgid "commit %s is a merge but no -m option was given."
7412 msgstr ""
7413
7469 -#: sequencer.c:2123 sequencer.c:2131
7414 +#: sequencer.c:2125 sequencer.c:2133
7415 #, c-format
7416 msgid "commit %s does not have parent %d"
7417 msgstr ""
7418
7474 -#: sequencer.c:2137
7419 +#: sequencer.c:2139
7420 #, c-format
7421 msgid "cannot get commit message for %s"
7422 msgstr ""
7423
7424 #. TRANSLATORS: The first %s will be a "todo" command like
7425 #. "revert" or "pick", the second %s a SHA1.
7481 -#: sequencer.c:2156
7426 +#: sequencer.c:2158
7427 #, c-format
7428 msgid "%s: cannot parse parent commit %s"
7429 msgstr ""
7430
7486 -#: sequencer.c:2222
7431 +#: sequencer.c:2224
7432 #, c-format
7433 msgid "could not rename '%s' to '%s'"
7434 msgstr ""
7435
7491 -#: sequencer.c:2282
7436 +#: sequencer.c:2284
7437 #, c-format
7438 msgid "could not revert %s... %s"
7439 msgstr ""
7440
7496 -#: sequencer.c:2283
7441 +#: sequencer.c:2285
7442 #, c-format
7443 msgid "could not apply %s... %s"
7444 msgstr ""
7445
7501 -#: sequencer.c:2304
7446 +#: sequencer.c:2306
7447 #, c-format
7448 msgid "dropping %s %s -- patch contents already upstream\n"
7449 msgstr ""
7450
7506 -#: sequencer.c:2362
7451 +#: sequencer.c:2364
7452 #, c-format
7453 msgid "git %s: failed to read the index"
7454 msgstr ""
7455
7511 -#: sequencer.c:2370
7456 +#: sequencer.c:2372
7457 #, c-format
7458 msgid "git %s: failed to refresh the index"
7459 msgstr ""
7460
7516 -#: sequencer.c:2450
7461 +#: sequencer.c:2452
7462 #, c-format
7463 msgid "%s does not accept arguments: '%s'"
7464 msgstr ""
7465
7521 -#: sequencer.c:2459
7466 +#: sequencer.c:2461
7467 #, c-format
7468 msgid "missing arguments for %s"
7469 msgstr ""
7470
7526 -#: sequencer.c:2502
7471 +#: sequencer.c:2504
7472 #, c-format
7473 msgid "could not parse '%s'"
7474 msgstr ""
7475
7531 -#: sequencer.c:2563
7476 +#: sequencer.c:2565
7477 #, c-format
7478 msgid "invalid line %d: %.*s"
7479 msgstr ""
7480
7536 -#: sequencer.c:2574
7481 +#: sequencer.c:2576
7482 #, c-format
7483 msgid "cannot '%s' without a previous commit"
7484 msgstr ""
7485
7541 -#: sequencer.c:2622 builtin/rebase.c:184
7486 +#: sequencer.c:2624 builtin/rebase.c:184
7487 #, c-format
7488 msgid "could not read '%s'."
7489 msgstr ""
7490
7546 -#: sequencer.c:2660
7491 +#: sequencer.c:2662
7492 msgid "cancelling a cherry picking in progress"
7493 msgstr ""
7494
7550 -#: sequencer.c:2669
7495 +#: sequencer.c:2671
7496 msgid "cancelling a revert in progress"
7497 msgstr ""
7498
7554 -#: sequencer.c:2709
7499 +#: sequencer.c:2711
7500 msgid "please fix this using 'git rebase --edit-todo'."
7501 msgstr ""
7502
7558 -#: sequencer.c:2711
7503 +#: sequencer.c:2713

This file is too large to show in full.