@matheusbsbs / matheus-bagliano / commits / 66593217ec

l10n: git.pot: v2.36.0 round 1 (192 new, 106 removed)

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

Jiang Xin committed Apr 6, 2022 at 14:35 UTC 66593217ec853a295f5a0122d28faf3f7f7ecaa2
1 file changed +4329 -3837
po/git.pot
+4329 -3837
@@ -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: 2022-01-17 08:31+0800\n"
11 +"POT-Creation-Date: 2022-04-06 14:40+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"
@@ -18,213 +18,212 @@ msgstr ""
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
21 -#: add-interactive.c:380
21 +#: add-interactive.c:382
22 #, c-format
23 msgid "Huh (%s)?"
24 msgstr ""
25
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
26 +#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
27 +#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
28 +#: builtin/rebase.c:1671
29 msgid "could not read index"
30 msgstr ""
31
32 -#: add-interactive.c:588 git-add--interactive.perl:269
32 +#: add-interactive.c:590 git-add--interactive.perl:269
33 #: git-add--interactive.perl:294
34 msgid "binary"
35 msgstr ""
36
37 -#: add-interactive.c:646 git-add--interactive.perl:278
37 +#: add-interactive.c:648 git-add--interactive.perl:278
38 #: git-add--interactive.perl:332
39 msgid "nothing"
40 msgstr ""
41
42 -#: add-interactive.c:647 git-add--interactive.perl:314
42 +#: add-interactive.c:649 git-add--interactive.perl:314
43 #: git-add--interactive.perl:329
44 msgid "unchanged"
45 msgstr ""
46
47 -#: add-interactive.c:684 git-add--interactive.perl:641
47 +#: add-interactive.c:686 git-add--interactive.perl:641
48 msgid "Update"
49 msgstr ""
50
51 -#: add-interactive.c:701 add-interactive.c:889
51 +#: add-interactive.c:703 add-interactive.c:891
52 #, c-format
53 msgid "could not stage '%s'"
54 msgstr ""
55
56 -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
56 +#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
57 msgid "could not write index"
58 msgstr ""
59
60 -#: add-interactive.c:710 git-add--interactive.perl:626
60 +#: add-interactive.c:712 git-add--interactive.perl:626
61 #, c-format, perl-format
62 msgid "updated %d path\n"
63 msgid_plural "updated %d paths\n"
64 msgstr[0] ""
65 msgstr[1] ""
66
67 -#: add-interactive.c:728 git-add--interactive.perl:676
67 +#: add-interactive.c:730 git-add--interactive.perl:676
68 #, c-format, perl-format
69 msgid "note: %s is untracked now.\n"
70 msgstr ""
71
72 -#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
72 +#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
73 #: builtin/reset.c:167
74 #, c-format
75 msgid "make_cache_entry failed for path '%s'"
76 msgstr ""
77
78 -#: add-interactive.c:763 git-add--interactive.perl:653
78 +#: add-interactive.c:765 git-add--interactive.perl:653
79 msgid "Revert"
80 msgstr ""
81
82 -#: add-interactive.c:779
82 +#: add-interactive.c:781
83 msgid "Could not parse HEAD^{tree}"
84 msgstr ""
85
86 -#: add-interactive.c:817 git-add--interactive.perl:629
86 +#: add-interactive.c:819 git-add--interactive.perl:629
87 #, c-format, perl-format
88 msgid "reverted %d path\n"
89 msgid_plural "reverted %d paths\n"
90 msgstr[0] ""
91 msgstr[1] ""
92
93 -#: add-interactive.c:868 git-add--interactive.perl:693
93 +#: add-interactive.c:870 git-add--interactive.perl:693
94 #, c-format
95 msgid "No untracked files.\n"
96 msgstr ""
97
98 -#: add-interactive.c:872 git-add--interactive.perl:687
98 +#: add-interactive.c:874 git-add--interactive.perl:687
99 msgid "Add untracked"
100 msgstr ""
101
102 -#: add-interactive.c:899 git-add--interactive.perl:623
102 +#: add-interactive.c:901 git-add--interactive.perl:623
103 #, c-format, perl-format
104 msgid "added %d path\n"
105 msgid_plural "added %d paths\n"
106 msgstr[0] ""
107 msgstr[1] ""
108
109 -#: add-interactive.c:929
109 +#: add-interactive.c:931
110 #, c-format
111 msgid "ignoring unmerged: %s"
112 msgstr ""
113
114 -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
114 +#: add-interactive.c:943 add-patch.c:1758 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:1373
119 +#: add-interactive.c:945 add-patch.c:1756 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:1381
124 +#: add-interactive.c:949 git-add--interactive.perl:1381
125 msgid "Patch update"
126 msgstr ""
127
128 -#: add-interactive.c:986 git-add--interactive.perl:1794
128 +#: add-interactive.c:988 git-add--interactive.perl:1794
129 msgid "Review diff"
130 msgstr ""
131
132 -#: add-interactive.c:1014
132 +#: add-interactive.c:1016
133 msgid "show paths with changes"
134 msgstr ""
135
136 -#: add-interactive.c:1016
136 +#: add-interactive.c:1018
137 msgid "add working tree state to the staged set of changes"
138 msgstr ""
139
140 -#: add-interactive.c:1018
140 +#: add-interactive.c:1020
141 msgid "revert staged set of changes back to the HEAD version"
142 msgstr ""
143
144 -#: add-interactive.c:1020
144 +#: add-interactive.c:1022
145 msgid "pick hunks and update selectively"
146 msgstr ""
147
148 -#: add-interactive.c:1022
148 +#: add-interactive.c:1024
149 msgid "view diff between HEAD and index"
150 msgstr ""
151
152 -#: add-interactive.c:1024
152 +#: add-interactive.c:1026
153 msgid "add contents of untracked files to the staged set of changes"
154 msgstr ""
155
156 -#: add-interactive.c:1032 add-interactive.c:1081
156 +#: add-interactive.c:1034 add-interactive.c:1083
157 msgid "Prompt help:"
158 msgstr ""
159
160 -#: add-interactive.c:1034
160 +#: add-interactive.c:1036
161 msgid "select a single item"
162 msgstr ""
163
164 -#: add-interactive.c:1036
164 +#: add-interactive.c:1038
165 msgid "select a range of items"
166 msgstr ""
167
168 -#: add-interactive.c:1038
168 +#: add-interactive.c:1040
169 msgid "select multiple ranges"
170 msgstr ""
171
172 -#: add-interactive.c:1040 add-interactive.c:1085
172 +#: add-interactive.c:1042 add-interactive.c:1087
173 msgid "select item based on unique prefix"
174 msgstr ""
175
176 -#: add-interactive.c:1042
176 +#: add-interactive.c:1044
177 msgid "unselect specified items"
178 msgstr ""
179
180 -#: add-interactive.c:1044
180 +#: add-interactive.c:1046
181 msgid "choose all items"
182 msgstr ""
183
184 -#: add-interactive.c:1046
184 +#: add-interactive.c:1048
185 msgid "(empty) finish selecting"
186 msgstr ""
187
188 -#: add-interactive.c:1083
188 +#: add-interactive.c:1085
189 msgid "select a numbered item"
190 msgstr ""
191
192 -#: add-interactive.c:1087
192 +#: add-interactive.c:1089
193 msgid "(empty) select nothing"
194 msgstr ""
195
196 -#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
196 +#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
197 msgid "*** Commands ***"
198 msgstr ""
199
200 -#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
200 +#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
201 msgid "What now"
202 msgstr ""
203
204 -#: add-interactive.c:1148 git-add--interactive.perl:213
204 +#: add-interactive.c:1150 git-add--interactive.perl:213
205 msgid "staged"
206 msgstr ""
207
208 -#: add-interactive.c:1148 git-add--interactive.perl:213
208 +#: add-interactive.c:1150 git-add--interactive.perl:213
209 msgid "unstaged"
210 msgstr ""
211
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
212 +#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
213 +#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
214 +#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
215 +#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
216 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
217 +#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
218 #: git-add--interactive.perl:213
219 msgid "path"
220 msgstr ""
221
223 -#: add-interactive.c:1155
222 +#: add-interactive.c:1157
223 msgid "could not refresh index"
224 msgstr ""
225
227 -#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
226 +#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
227 #, c-format
228 msgid "Bye.\n"
229 msgstr ""
@@ -485,37 +484,37 @@ msgstr ""
484 msgid "could not parse colored hunk header '%.*s'"
485 msgstr ""
486
488 -#: add-patch.c:420
487 +#: add-patch.c:431
488 msgid "could not parse diff"
489 msgstr ""
490
492 -#: add-patch.c:439
491 +#: add-patch.c:450
492 msgid "could not parse colored diff"
493 msgstr ""
494
496 -#: add-patch.c:453
495 +#: add-patch.c:464
496 #, c-format
497 msgid "failed to run '%s'"
498 msgstr ""
499
501 -#: add-patch.c:612
500 +#: add-patch.c:618
501 msgid "mismatched output from interactive.diffFilter"
502 msgstr ""
503
505 -#: add-patch.c:613
504 +#: add-patch.c:619
505 msgid ""
506 "Your filter must maintain a one-to-one correspondence\n"
507 "between its input and output lines."
508 msgstr ""
509
511 -#: add-patch.c:791
510 +#: add-patch.c:797
511 #, c-format
512 msgid ""
513 "expected context line #%d in\n"
514 "%.*s"
515 msgstr ""
516
518 -#: add-patch.c:806
517 +#: add-patch.c:812
518 #, c-format
519 msgid ""
520 "hunks do not overlap:\n"
@@ -524,11 +523,11 @@ msgid ""
523 "%.*s"
524 msgstr ""
525
527 -#: add-patch.c:1082 git-add--interactive.perl:1115
526 +#: add-patch.c:1088 git-add--interactive.perl:1115
527 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
528 msgstr ""
529
531 -#: add-patch.c:1086
530 +#: add-patch.c:1092
531 #, c-format
532 msgid ""
533 "---\n"
@@ -538,18 +537,18 @@ msgid ""
537 msgstr ""
538
539 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
541 -#: add-patch.c:1100 git-add--interactive.perl:1129
540 +#: add-patch.c:1106 git-add--interactive.perl:1129
541 msgid ""
542 "If it does not apply cleanly, you will be given an opportunity to\n"
543 "edit again. If all lines of the hunk are removed, then the edit is\n"
544 "aborted and the hunk is left unchanged.\n"
545 msgstr ""
546
548 -#: add-patch.c:1133
547 +#: add-patch.c:1139
548 msgid "could not parse hunk header"
549 msgstr ""
550
552 -#: add-patch.c:1178
551 +#: add-patch.c:1184
552 msgid "'git apply --cached' failed"
553 msgstr ""
554
@@ -565,24 +564,24 @@ msgstr ""
564 #. Consider translating (saying "no" discards!) as
565 #. (saying "n" for "no" discards!) if the translation
566 #. of the word "no" does not start with n.
568 -#: add-patch.c:1247 git-add--interactive.perl:1244
567 +#: add-patch.c:1253 git-add--interactive.perl:1244
568 msgid ""
569 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
570 msgstr ""
571
573 -#: add-patch.c:1290
572 +#: add-patch.c:1296
573 msgid "The selected hunks do not apply to the index!"
574 msgstr ""
575
577 -#: add-patch.c:1291 git-add--interactive.perl:1348
576 +#: add-patch.c:1297 git-add--interactive.perl:1348
577 msgid "Apply them to the worktree anyway? "
578 msgstr ""
579
581 -#: add-patch.c:1298 git-add--interactive.perl:1351
580 +#: add-patch.c:1304 git-add--interactive.perl:1351
581 msgid "Nothing was applied.\n"
582 msgstr ""
583
585 -#: add-patch.c:1355
584 +#: add-patch.c:1361
585 msgid ""
586 "j - leave this hunk undecided, see next undecided hunk\n"
587 "J - leave this hunk undecided, see next hunk\n"
@@ -595,136 +594,136 @@ msgid ""
594 "? - print help\n"
595 msgstr ""
596
598 -#: add-patch.c:1517 add-patch.c:1527
597 +#: add-patch.c:1523 add-patch.c:1533
598 msgid "No previous hunk"
599 msgstr ""
600
602 -#: add-patch.c:1522 add-patch.c:1532
601 +#: add-patch.c:1528 add-patch.c:1538
602 msgid "No next hunk"
603 msgstr ""
604
606 -#: add-patch.c:1538
605 +#: add-patch.c:1544
606 msgid "No other hunks to goto"
607 msgstr ""
608
610 -#: add-patch.c:1549 git-add--interactive.perl:1608
609 +#: add-patch.c:1555 git-add--interactive.perl:1608
610 msgid "go to which hunk (<ret> to see more)? "
611 msgstr ""
612
614 -#: add-patch.c:1550 git-add--interactive.perl:1610
613 +#: add-patch.c:1556 git-add--interactive.perl:1610
614 msgid "go to which hunk? "
615 msgstr ""
616
618 -#: add-patch.c:1561
617 +#: add-patch.c:1567
618 #, c-format
619 msgid "Invalid number: '%s'"
620 msgstr ""
621
623 -#: add-patch.c:1566
622 +#: add-patch.c:1572
623 #, c-format
624 msgid "Sorry, only %d hunk available."
625 msgid_plural "Sorry, only %d hunks available."
626 msgstr[0] ""
627 msgstr[1] ""
628
630 -#: add-patch.c:1575
629 +#: add-patch.c:1581
630 msgid "No other hunks to search"
631 msgstr ""
632
634 -#: add-patch.c:1581 git-add--interactive.perl:1663
633 +#: add-patch.c:1587 git-add--interactive.perl:1663
634 msgid "search for regex? "
635 msgstr ""
636
638 -#: add-patch.c:1596
637 +#: add-patch.c:1602
638 #, c-format
639 msgid "Malformed search regexp %s: %s"
640 msgstr ""
641
643 -#: add-patch.c:1613
642 +#: add-patch.c:1619
643 msgid "No hunk matches the given pattern"
644 msgstr ""
645
647 -#: add-patch.c:1620
646 +#: add-patch.c:1626
647 msgid "Sorry, cannot split this hunk"
648 msgstr ""
649
651 -#: add-patch.c:1624
650 +#: add-patch.c:1630
651 #, c-format
652 msgid "Split into %d hunks."
653 msgstr ""
654
656 -#: add-patch.c:1628
655 +#: add-patch.c:1634
656 msgid "Sorry, cannot edit this hunk"
657 msgstr ""
658
660 -#: add-patch.c:1680
659 +#: add-patch.c:1686
660 msgid "'git apply' failed"
661 msgstr ""
662
664 -#: advice.c:78
663 +#: advice.c:81
664 #, c-format
665 msgid ""
666 "\n"
667 "Disable this message with \"git config advice.%s false\""
668 msgstr ""
669
671 -#: advice.c:94
670 +#: advice.c:97
671 #, c-format
672 msgid "%shint: %.*s%s\n"
673 msgstr ""
674
676 -#: advice.c:178
675 +#: advice.c:181
676 msgid "Cherry-picking is not possible because you have unmerged files."
677 msgstr ""
678
680 -#: advice.c:180
679 +#: advice.c:183
680 msgid "Committing is not possible because you have unmerged files."
681 msgstr ""
682
684 -#: advice.c:182
683 +#: advice.c:185
684 msgid "Merging is not possible because you have unmerged files."
685 msgstr ""
686
688 -#: advice.c:184
687 +#: advice.c:187
688 msgid "Pulling is not possible because you have unmerged files."
689 msgstr ""
690
692 -#: advice.c:186
691 +#: advice.c:189
692 msgid "Reverting is not possible because you have unmerged files."
693 msgstr ""
694
696 -#: advice.c:188
695 +#: advice.c:191
696 #, c-format
697 msgid "It is not possible to %s because you have unmerged files."
698 msgstr ""
699
701 -#: advice.c:196
700 +#: advice.c:199
701 msgid ""
702 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
703 "as appropriate to mark resolution and make a commit."
704 msgstr ""
705
707 -#: advice.c:204
706 +#: advice.c:207
707 msgid "Exiting because of an unresolved conflict."
708 msgstr ""
709
711 -#: advice.c:209 builtin/merge.c:1382
710 +#: advice.c:212 builtin/merge.c:1388
711 msgid "You have not concluded your merge (MERGE_HEAD exists)."
712 msgstr ""
713
715 -#: advice.c:211
714 +#: advice.c:214
715 msgid "Please, commit your changes before merging."
716 msgstr ""
717
719 -#: advice.c:212
718 +#: advice.c:215
719 msgid "Exiting because of unfinished merge."
720 msgstr ""
721
723 -#: advice.c:217
722 +#: advice.c:220
723 msgid "Not possible to fast-forward, aborting."
724 msgstr ""
725
727 -#: advice.c:227
726 +#: advice.c:230
727 #, c-format
728 msgid ""
729 "The following paths and/or pathspecs matched paths that exist\n"
@@ -732,14 +731,14 @@ msgid ""
731 "updated in the index:\n"
732 msgstr ""
733
735 -#: advice.c:234
734 +#: advice.c:237
735 msgid ""
736 "If you intend to update such entries, try one of the following:\n"
737 "* Use the --sparse option.\n"
738 "* Disable or modify the sparsity rules."
739 msgstr ""
740
742 -#: advice.c:242
741 +#: advice.c:245
742 #, c-format
743 msgid ""
744 "Note: switching to '%s'.\n"
@@ -780,80 +779,83 @@ msgstr ""
779 msgid "unrecognized whitespace ignore option '%s'"
780 msgstr ""
781
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:2038
792 -#: builtin/fetch.c:2043 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
782 +#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
783 +#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
784 +#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
785 +#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
786 +#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
787 +#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
788 +#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
789 +#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
790 +#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
791 +#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
792 +#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
793 +#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
794 +#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
795 +#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
796 +#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
797 +#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
798 +#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
799 +#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
800 +#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
801 +#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
802 +#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
803 +#: builtin/worktree.c:779
804 #, c-format
805 msgid "options '%s' and '%s' cannot be used together"
806 msgstr ""
807
806 -#: apply.c:139 apply.c:150 apply.c:153
808 +#: apply.c:141 apply.c:152 apply.c:155
809 #, c-format
810 msgid "'%s' outside a repository"
811 msgstr ""
812
811 -#: apply.c:800
813 +#: apply.c:807
814 #, c-format
815 msgid "Cannot prepare timestamp regexp %s"
816 msgstr ""
817
816 -#: apply.c:809
818 +#: apply.c:816
819 #, c-format
820 msgid "regexec returned %d for input: %s"
821 msgstr ""
822
821 -#: apply.c:883
823 +#: apply.c:890
824 #, c-format
825 msgid "unable to find filename in patch at line %d"
826 msgstr ""
827
826 -#: apply.c:921
828 +#: apply.c:928
829 #, c-format
830 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
831 msgstr ""
832
831 -#: apply.c:927
833 +#: apply.c:934
834 #, c-format
835 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
836 msgstr ""
837
836 -#: apply.c:928
838 +#: apply.c:935
839 #, c-format
840 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
841 msgstr ""
842
841 -#: apply.c:933
843 +#: apply.c:940
844 #, c-format
845 msgid "git apply: bad git-diff - expected /dev/null on line %d"
846 msgstr ""
847
846 -#: apply.c:962
848 +#: apply.c:969
849 #, c-format
850 msgid "invalid mode on line %d: %s"
851 msgstr ""
852
851 -#: apply.c:1281
853 +#: apply.c:1288
854 #, c-format
855 msgid "inconsistent header lines %d and %d"
856 msgstr ""
857
856 -#: apply.c:1371
858 +#: apply.c:1378
859 #, c-format
860 msgid ""
861 "git diff header lacks filename information when removing %d leading pathname "
@@ -864,538 +866,538 @@ msgid_plural ""
866 msgstr[0] ""
867 msgstr[1] ""
868
867 -#: apply.c:1384
869 +#: apply.c:1391
870 #, c-format
871 msgid "git diff header lacks filename information (line %d)"
872 msgstr ""
873
872 -#: apply.c:1480
874 +#: apply.c:1487
875 #, c-format
876 msgid "recount: unexpected line: %.*s"
877 msgstr ""
878
877 -#: apply.c:1549
879 +#: apply.c:1556
880 #, c-format
881 msgid "patch fragment without header at line %d: %.*s"
882 msgstr ""
883
882 -#: apply.c:1752
884 +#: apply.c:1759
885 msgid "new file depends on old contents"
886 msgstr ""
887
886 -#: apply.c:1754
888 +#: apply.c:1761
889 msgid "deleted file still has contents"
890 msgstr ""
891
890 -#: apply.c:1788
892 +#: apply.c:1795
893 #, c-format
894 msgid "corrupt patch at line %d"
895 msgstr ""
896
895 -#: apply.c:1825
897 +#: apply.c:1832
898 #, c-format
899 msgid "new file %s depends on old contents"
900 msgstr ""
901
900 -#: apply.c:1827
902 +#: apply.c:1834
903 #, c-format
904 msgid "deleted file %s still has contents"
905 msgstr ""
906
905 -#: apply.c:1830
907 +#: apply.c:1837
908 #, c-format
909 msgid "** warning: file %s becomes empty but is not deleted"
910 msgstr ""
911
910 -#: apply.c:1978
912 +#: apply.c:1985
913 #, c-format
914 msgid "corrupt binary patch at line %d: %.*s"
915 msgstr ""
916
915 -#: apply.c:2015
917 +#: apply.c:2022
918 #, c-format
919 msgid "unrecognized binary patch at line %d"
920 msgstr ""
921
920 -#: apply.c:2177
922 +#: apply.c:2184
923 #, c-format
924 msgid "patch with only garbage at line %d"
925 msgstr ""
926
925 -#: apply.c:2263
927 +#: apply.c:2270
928 #, c-format
929 msgid "unable to read symlink %s"
930 msgstr ""
931
930 -#: apply.c:2267
932 +#: apply.c:2274
933 #, c-format
934 msgid "unable to open or read %s"
935 msgstr ""
936
935 -#: apply.c:2936
937 +#: apply.c:2943
938 #, c-format
939 msgid "invalid start of line: '%c'"
940 msgstr ""
941
940 -#: apply.c:3057
942 +#: apply.c:3064
943 #, c-format
944 msgid "Hunk #%d succeeded at %d (offset %d line)."
945 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
946 msgstr[0] ""
947 msgstr[1] ""
948
947 -#: apply.c:3069
949 +#: apply.c:3076
950 #, c-format
951 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
952 msgstr ""
953
952 -#: apply.c:3075
954 +#: apply.c:3082
955 #, c-format
956 msgid ""
957 "while searching for:\n"
958 "%.*s"
959 msgstr ""
960
959 -#: apply.c:3097
961 +#: apply.c:3104
962 #, c-format
963 msgid "missing binary patch data for '%s'"
964 msgstr ""
965
964 -#: apply.c:3105
966 +#: apply.c:3112
967 #, c-format
968 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
969 msgstr ""
970
969 -#: apply.c:3152
971 +#: apply.c:3159
972 #, c-format
973 msgid "cannot apply binary patch to '%s' without full index line"
974 msgstr ""
975
974 -#: apply.c:3163
976 +#: apply.c:3170
977 #, c-format
978 msgid ""
979 "the patch applies to '%s' (%s), which does not match the current contents."
980 msgstr ""
981
980 -#: apply.c:3171
982 +#: apply.c:3178
983 #, c-format
984 msgid "the patch applies to an empty '%s' but it is not empty"
985 msgstr ""
986
985 -#: apply.c:3189
987 +#: apply.c:3196
988 #, c-format
989 msgid "the necessary postimage %s for '%s' cannot be read"
990 msgstr ""
991
990 -#: apply.c:3202
992 +#: apply.c:3209
993 #, c-format
994 msgid "binary patch does not apply to '%s'"
995 msgstr ""
996
995 -#: apply.c:3209
997 +#: apply.c:3216
998 #, c-format
999 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1000 msgstr ""
1001
1000 -#: apply.c:3230
1002 +#: apply.c:3237
1003 #, c-format
1004 msgid "patch failed: %s:%ld"
1005 msgstr ""
1006
1005 -#: apply.c:3353
1007 +#: apply.c:3360
1008 #, c-format
1009 msgid "cannot checkout %s"
1010 msgstr ""
1011
1010 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
1012 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
1013 #: setup.c:309
1014 #, c-format
1015 msgid "failed to read %s"
1016 msgstr ""
1017
1016 -#: apply.c:3413
1018 +#: apply.c:3420
1019 #, c-format
1020 msgid "reading from '%s' beyond a symbolic link"
1021 msgstr ""
1022
1021 -#: apply.c:3442 apply.c:3711
1023 +#: apply.c:3449 apply.c:3721
1024 #, c-format
1025 msgid "path %s has been renamed/deleted"
1026 msgstr ""
1027
1026 -#: apply.c:3549 apply.c:3726
1028 +#: apply.c:3559 apply.c:3736
1029 #, c-format
1030 msgid "%s: does not exist in index"
1031 msgstr ""
1032
1031 -#: apply.c:3558 apply.c:3734 apply.c:3978
1033 +#: apply.c:3568 apply.c:3744 apply.c:3960
1034 #, c-format
1035 msgid "%s: does not match index"
1036 msgstr ""
1037
1036 -#: apply.c:3595
1038 +#: apply.c:3605
1039 msgid "repository lacks the necessary blob to perform 3-way merge."
1040 msgstr ""
1041
1040 -#: apply.c:3598
1042 +#: apply.c:3608
1043 #, c-format
1044 msgid "Performing three-way merge...\n"
1045 msgstr ""
1046
1045 -#: apply.c:3614 apply.c:3618
1047 +#: apply.c:3624 apply.c:3628
1048 #, c-format
1049 msgid "cannot read the current contents of '%s'"
1050 msgstr ""
1051
1050 -#: apply.c:3630
1052 +#: apply.c:3640
1053 #, c-format
1054 msgid "Failed to perform three-way merge...\n"
1055 msgstr ""
1056
1055 -#: apply.c:3644
1057 +#: apply.c:3654
1058 #, c-format
1059 msgid "Applied patch to '%s' with conflicts.\n"
1060 msgstr ""
1061
1060 -#: apply.c:3649
1062 +#: apply.c:3659
1063 #, c-format
1064 msgid "Applied patch to '%s' cleanly.\n"
1065 msgstr ""
1066
1065 -#: apply.c:3666
1067 +#: apply.c:3676
1068 #, c-format
1069 msgid "Falling back to direct application...\n"
1070 msgstr ""
1071
1070 -#: apply.c:3678
1072 +#: apply.c:3688
1073 msgid "removal patch leaves file contents"
1074 msgstr ""
1075
1074 -#: apply.c:3751
1076 +#: apply.c:3761
1077 #, c-format
1078 msgid "%s: wrong type"
1079 msgstr ""
1080
1079 -#: apply.c:3753
1081 +#: apply.c:3763
1082 #, c-format
1083 msgid "%s has type %o, expected %o"
1084 msgstr ""
1085
1084 -#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
1085 -#: read-cache.c:1381
1086 +#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
1087 +#: read-cache.c:1399
1088 #, c-format
1089 msgid "invalid path '%s'"
1090 msgstr ""
1091
1090 -#: apply.c:3976
1092 +#: apply.c:3958
1093 #, c-format
1094 msgid "%s: already exists in index"
1095 msgstr ""
1096
1095 -#: apply.c:3980
1097 +#: apply.c:3962
1098 #, c-format
1099 msgid "%s: already exists in working directory"
1100 msgstr ""
1101
1100 -#: apply.c:4000
1102 +#: apply.c:3982
1103 #, c-format
1104 msgid "new mode (%o) of %s does not match old mode (%o)"
1105 msgstr ""
1106
1105 -#: apply.c:4005
1107 +#: apply.c:3987
1108 #, c-format
1109 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1110 msgstr ""
1111
1110 -#: apply.c:4025
1112 +#: apply.c:4007
1113 #, c-format
1114 msgid "affected file '%s' is beyond a symbolic link"
1115 msgstr ""
1116
1115 -#: apply.c:4029
1117 +#: apply.c:4011
1118 #, c-format
1119 msgid "%s: patch does not apply"
1120 msgstr ""
1121
1120 -#: apply.c:4044
1122 +#: apply.c:4026
1123 #, c-format
1124 msgid "Checking patch %s..."
1125 msgstr ""
1126
1125 -#: apply.c:4136
1127 +#: apply.c:4118
1128 #, c-format
1129 msgid "sha1 information is lacking or useless for submodule %s"
1130 msgstr ""
1131
1130 -#: apply.c:4143
1132 +#: apply.c:4125
1133 #, c-format
1134 msgid "mode change for %s, which is not in current HEAD"
1135 msgstr ""
1136
1135 -#: apply.c:4146
1137 +#: apply.c:4128
1138 #, c-format
1139 msgid "sha1 information is lacking or useless (%s)."
1140 msgstr ""
1141
1140 -#: apply.c:4155
1142 +#: apply.c:4137
1143 #, c-format
1144 msgid "could not add %s to temporary index"
1145 msgstr ""
1146
1145 -#: apply.c:4165
1147 +#: apply.c:4147
1148 #, c-format
1149 msgid "could not write temporary index to %s"
1150 msgstr ""
1151
1150 -#: apply.c:4303
1152 +#: apply.c:4285
1153 #, c-format
1154 msgid "unable to remove %s from index"
1155 msgstr ""
1156
1155 -#: apply.c:4337
1157 +#: apply.c:4319
1158 #, c-format
1159 msgid "corrupt patch for submodule %s"
1160 msgstr ""
1161
1160 -#: apply.c:4343
1162 +#: apply.c:4325
1163 #, c-format
1164 msgid "unable to stat newly created file '%s'"
1165 msgstr ""
1166
1165 -#: apply.c:4351
1167 +#: apply.c:4333
1168 #, c-format
1169 msgid "unable to create backing store for newly created file %s"
1170 msgstr ""
1171
1170 -#: apply.c:4357 apply.c:4502
1172 +#: apply.c:4339 apply.c:4484
1173 #, c-format
1174 msgid "unable to add cache entry for %s"
1175 msgstr ""
1176
1175 -#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
1177 +#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
1178 #: builtin/gc.c:2293
1179 #, c-format
1180 msgid "failed to write to '%s'"
1181 msgstr ""
1182
1181 -#: apply.c:4404
1183 +#: apply.c:4386
1184 #, c-format
1185 msgid "closing file '%s'"
1186 msgstr ""
1187
1186 -#: apply.c:4474
1188 +#: apply.c:4456
1189 #, c-format
1190 msgid "unable to write file '%s' mode %o"
1191 msgstr ""
1192
1191 -#: apply.c:4572
1193 +#: apply.c:4554
1194 #, c-format
1195 msgid "Applied patch %s cleanly."
1196 msgstr ""
1197
1196 -#: apply.c:4580
1198 +#: apply.c:4562
1199 msgid "internal error"
1200 msgstr ""
1201
1200 -#: apply.c:4583
1202 +#: apply.c:4565
1203 #, c-format
1204 msgid "Applying patch %%s with %d reject..."
1205 msgid_plural "Applying patch %%s with %d rejects..."
1206 msgstr[0] ""
1207 msgstr[1] ""
1208
1207 -#: apply.c:4594
1209 +#: apply.c:4576
1210 #, c-format
1211 msgid "truncating .rej filename to %.*s.rej"
1212 msgstr ""
1213
1212 -#: apply.c:4602
1214 +#: apply.c:4584
1215 #, c-format
1216 msgid "cannot open %s"
1217 msgstr ""
1218
1217 -#: apply.c:4616
1219 +#: apply.c:4598
1220 #, c-format
1221 msgid "Hunk #%d applied cleanly."
1222 msgstr ""
1223
1222 -#: apply.c:4620
1224 +#: apply.c:4602
1225 #, c-format
1226 msgid "Rejected hunk #%d."
1227 msgstr ""
1228
1227 -#: apply.c:4749
1229 +#: apply.c:4731
1230 #, c-format
1231 msgid "Skipped patch '%s'."
1232 msgstr ""
1233
1232 -#: apply.c:4758
1234 +#: apply.c:4740
1235 msgid "No valid patches in input (allow with \"--allow-empty\")"
1236 msgstr ""
1237
1236 -#: apply.c:4779
1238 +#: apply.c:4761
1239 msgid "unable to read index file"
1240 msgstr ""
1241
1240 -#: apply.c:4936
1242 +#: apply.c:4918
1243 #, c-format
1244 msgid "can't open patch '%s': %s"
1245 msgstr ""
1246
1245 -#: apply.c:4963
1247 +#: apply.c:4945
1248 #, c-format
1249 msgid "squelched %d whitespace error"
1250 msgid_plural "squelched %d whitespace errors"
1251 msgstr[0] ""
1252 msgstr[1] ""
1253
1252 -#: apply.c:4969 apply.c:4984
1254 +#: apply.c:4951 apply.c:4966
1255 #, c-format
1256 msgid "%d line adds whitespace errors."
1257 msgid_plural "%d lines add whitespace errors."
1258 msgstr[0] ""
1259 msgstr[1] ""
1260
1259 -#: apply.c:4977
1261 +#: apply.c:4959
1262 #, c-format
1263 msgid "%d line applied after fixing whitespace errors."
1264 msgid_plural "%d lines applied after fixing whitespace errors."
1265 msgstr[0] ""
1266 msgstr[1] ""
1267
1266 -#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
1268 +#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
1269 msgid "Unable to write new index file"
1270 msgstr ""
1271
1270 -#: apply.c:5021
1272 +#: apply.c:5003
1273 msgid "don't apply changes matching the given path"
1274 msgstr ""
1275
1274 -#: apply.c:5024
1276 +#: apply.c:5006
1277 msgid "apply changes matching the given path"
1278 msgstr ""
1279
1278 -#: apply.c:5026 builtin/am.c:2376
1280 +#: apply.c:5008 builtin/am.c:2379
1281 msgid "num"
1282 msgstr ""
1283
1282 -#: apply.c:5027
1284 +#: apply.c:5009
1285 msgid "remove <num> leading slashes from traditional diff paths"
1286 msgstr ""
1287
1286 -#: apply.c:5030
1288 +#: apply.c:5012
1289 msgid "ignore additions made by the patch"
1290 msgstr ""
1291
1290 -#: apply.c:5032
1292 +#: apply.c:5014
1293 msgid "instead of applying the patch, output diffstat for the input"
1294 msgstr ""
1295
1294 -#: apply.c:5036
1296 +#: apply.c:5018
1297 msgid "show number of added and deleted lines in decimal notation"
1298 msgstr ""
1299
1298 -#: apply.c:5038
1300 +#: apply.c:5020
1301 msgid "instead of applying the patch, output a summary for the input"
1302 msgstr ""
1303
1302 -#: apply.c:5040
1304 +#: apply.c:5022
1305 msgid "instead of applying the patch, see if the patch is applicable"
1306 msgstr ""
1307
1306 -#: apply.c:5042
1308 +#: apply.c:5024
1309 msgid "make sure the patch is applicable to the current index"
1310 msgstr ""
1311
1310 -#: apply.c:5044
1312 +#: apply.c:5026
1313 msgid "mark new files with `git add --intent-to-add`"
1314 msgstr ""
1315
1314 -#: apply.c:5046
1316 +#: apply.c:5028
1317 msgid "apply a patch without touching the working tree"
1318 msgstr ""
1319
1318 -#: apply.c:5048
1320 +#: apply.c:5030
1321 msgid "accept a patch that touches outside the working area"
1322 msgstr ""
1323
1322 -#: apply.c:5051
1324 +#: apply.c:5033
1325 msgid "also apply the patch (use with --stat/--summary/--check)"
1326 msgstr ""
1327
1326 -#: apply.c:5053
1328 +#: apply.c:5035
1329 msgid "attempt three-way merge, fall back on normal patch if that fails"
1330 msgstr ""
1331
1330 -#: apply.c:5055
1332 +#: apply.c:5037
1333 msgid "build a temporary index based on embedded index information"
1334 msgstr ""
1335
1334 -#: apply.c:5058 builtin/checkout-index.c:196
1336 +#: apply.c:5040 builtin/checkout-index.c:230
1337 msgid "paths are separated with NUL character"
1338 msgstr ""
1339
1338 -#: apply.c:5060
1340 +#: apply.c:5042
1341 msgid "ensure at least <n> lines of context match"
1342 msgstr ""
1343
1342 -#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
1344 +#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
1345 #: 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 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
1347 +#: builtin/rebase.c:1079
1348 msgid "action"
1349 msgstr ""
1350
1349 -#: apply.c:5062
1351 +#: apply.c:5044
1352 msgid "detect new or modified lines that have whitespace errors"
1353 msgstr ""
1354
1353 -#: apply.c:5065 apply.c:5068
1355 +#: apply.c:5047 apply.c:5050
1356 msgid "ignore changes in whitespace when finding context"
1357 msgstr ""
1358
1357 -#: apply.c:5071
1359 +#: apply.c:5053
1360 msgid "apply the patch in reverse"
1361 msgstr ""
1362
1361 -#: apply.c:5073
1363 +#: apply.c:5055
1364 msgid "don't expect at least one line of context"
1365 msgstr ""
1366
1365 -#: apply.c:5075
1367 +#: apply.c:5057
1368 msgid "leave the rejected hunks in corresponding *.rej files"
1369 msgstr ""
1370
1369 -#: apply.c:5077
1371 +#: apply.c:5059
1372 msgid "allow overlapping hunks"
1373 msgstr ""
1374
1373 -#: apply.c:5080
1375 +#: apply.c:5062
1376 msgid "tolerate incorrectly detected missing new-line at the end of file"
1377 msgstr ""
1378
1377 -#: apply.c:5083
1379 +#: apply.c:5065
1380 msgid "do not trust the line counts in the hunk headers"
1381 msgstr ""
1382
1381 -#: apply.c:5085 builtin/am.c:2364
1383 +#: apply.c:5067 builtin/am.c:2367
1384 msgid "root"
1385 msgstr ""
1386
1385 -#: apply.c:5086
1387 +#: apply.c:5068
1388 msgid "prepend <root> to all filenames"
1389 msgstr ""
1390
1389 -#: apply.c:5089
1391 +#: apply.c:5071
1392 msgid "don't return error for empty patches"
1393 msgstr ""
1394
1393 -#: archive-tar.c:125 archive-zip.c:345
1395 +#: archive-tar.c:125 archive-zip.c:346
1396 #, c-format
1397 msgid "cannot stream blob %s"
1398 msgstr ""
1399
1398 -#: archive-tar.c:265 archive-zip.c:358
1400 +#: archive-tar.c:265 archive-zip.c:359
1401 #, c-format
1402 msgid "unsupported file mode: 0%o (SHA1: %s)"
1403 msgstr ""
@@ -1414,22 +1416,22 @@ msgstr ""
1416 msgid "'%s' filter reported error"
1417 msgstr ""
1418
1417 -#: archive-zip.c:318
1419 +#: archive-zip.c:319
1420 #, c-format
1421 msgid "path is not valid UTF-8: %s"
1422 msgstr ""
1423
1422 -#: archive-zip.c:322
1424 +#: archive-zip.c:323
1425 #, c-format
1426 msgid "path too long (%d chars, SHA1: %s): %s"
1427 msgstr ""
1428
1427 -#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
1429 +#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
1430 #, c-format
1431 msgid "deflate error (%d)"
1432 msgstr ""
1433
1432 -#: archive-zip.c:603
1434 +#: archive-zip.c:604
1435 #, c-format
1436 msgid "timestamp too large for this system: %<PRIuMAX>"
1437 msgstr ""
@@ -1438,10 +1440,6 @@ msgstr ""
1440 msgid "git archive [<options>] <tree-ish> [<path>...]"
1441 msgstr ""
1442
1441 -#: archive.c:15
1442 -msgid "git archive --list"
1443 -msgstr ""
1444 -
1443 #: archive.c:16
1444 msgid ""
1445 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
@@ -1452,12 +1450,12 @@ msgid "git archive --remote <repo> [--exec <cmd>] --list"
1450 msgstr ""
1451
1452 #: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
1455 -#: builtin/tag.c:578
1453 +#: builtin/tag.c:579
1454 #, c-format
1455 msgid "cannot read '%s'"
1456 msgstr ""
1457
1460 -#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
1458 +#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
1459 #, c-format
1460 msgid "pathspec '%s' did not match any files"
1461 msgstr ""
@@ -1499,7 +1497,7 @@ msgstr ""
1497 msgid "archive format"
1498 msgstr ""
1499
1502 -#: archive.c:552 builtin/log.c:1790
1500 +#: archive.c:552 builtin/log.c:1809
1501 msgid "prefix"
1502 msgstr ""
1503
@@ -1507,12 +1505,12 @@ msgstr ""
1505 msgid "prepend prefix to each pathname in the archive"
1506 msgstr ""
1507
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 +#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
1509 +#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
1510 #: 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
1511 +#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
1512 #: 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
1513 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
1514 msgid "file"
1515 msgstr ""
1516
@@ -1540,8 +1538,8 @@ msgstr ""
1538 msgid "list supported archive formats"
1539 msgstr ""
1540
1543 -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
1544 -#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
1541 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
1542 +#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
1543 msgid "repo"
1544 msgstr ""
1545
@@ -1562,11 +1560,12 @@ msgstr ""
1560 msgid "Unexpected option --remote"
1561 msgstr ""
1562
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
1563 +#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
1564 +#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
1565 +#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
1566 +#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
1567 +#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
1568 +#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
1569 #: http-fetch.c:153
1570 #, c-format
1571 msgid "the option '%s' requires '%s'"
@@ -1586,17 +1585,17 @@ msgstr ""
1585 msgid "Argument not supported for format '%s': -%d"
1586 msgstr ""
1587
1589 -#: attr.c:203
1588 +#: attr.c:202
1589 #, c-format
1590 msgid "%.*s is not a valid attribute name"
1591 msgstr ""
1592
1594 -#: attr.c:364
1593 +#: attr.c:363
1594 #, c-format
1595 msgid "%s not allowed: %s:%d"
1596 msgstr ""
1597
1599 -#: attr.c:404
1598 +#: attr.c:403
1599 msgid ""
1600 "Negative patterns are ignored in git attributes\n"
1601 "Use '\\!' for literal leading exclamation."
@@ -1612,33 +1611,33 @@ msgstr ""
1611 msgid "We cannot bisect more!\n"
1612 msgstr ""
1613
1615 -#: bisect.c:764
1614 +#: bisect.c:765
1615 #, c-format
1616 msgid "Not a valid commit name %s"
1617 msgstr ""
1618
1620 -#: bisect.c:789
1619 +#: bisect.c:790
1620 #, c-format
1621 msgid ""
1622 "The merge base %s is bad.\n"
1623 "This means the bug has been fixed between %s and [%s].\n"
1624 msgstr ""
1625
1627 -#: bisect.c:794
1626 +#: bisect.c:795
1627 #, c-format
1628 msgid ""
1629 "The merge base %s is new.\n"
1630 "The property has changed between %s and [%s].\n"
1631 msgstr ""
1632
1634 -#: bisect.c:799
1633 +#: bisect.c:800
1634 #, c-format
1635 msgid ""
1636 "The merge base %s is %s.\n"
1637 "This means the first '%s' commit is between %s and [%s].\n"
1638 msgstr ""
1639
1641 -#: bisect.c:807
1640 +#: bisect.c:808
1641 #, c-format
1642 msgid ""
1643 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1646,7 +1645,7 @@ msgid ""
1645 "Maybe you mistook %s and %s revs?\n"
1646 msgstr ""
1647
1649 -#: bisect.c:820
1648 +#: bisect.c:821
1649 #, c-format
1650 msgid ""
1651 "the merge base between %s and [%s] must be skipped.\n"
@@ -1654,43 +1653,43 @@ msgid ""
1653 "We continue anyway."
1654 msgstr ""
1655
1657 -#: bisect.c:859
1656 +#: bisect.c:860
1657 #, c-format
1658 msgid "Bisecting: a merge base must be tested\n"
1659 msgstr ""
1660
1662 -#: bisect.c:909
1661 +#: bisect.c:910
1662 #, c-format
1663 msgid "a %s revision is needed"
1664 msgstr ""
1665
1667 -#: bisect.c:939
1666 +#: bisect.c:940
1667 #, c-format
1668 msgid "could not create file '%s'"
1669 msgstr ""
1670
1672 -#: bisect.c:985 builtin/merge.c:155
1671 +#: bisect.c:986 builtin/merge.c:155
1672 #, c-format
1673 msgid "could not read file '%s'"
1674 msgstr ""
1675
1677 -#: bisect.c:1025
1676 +#: bisect.c:1026
1677 msgid "reading bisect refs failed"
1678 msgstr ""
1679
1681 -#: bisect.c:1055
1680 +#: bisect.c:1056
1681 #, c-format
1682 msgid "%s was both %s and %s\n"
1683 msgstr ""
1684
1686 -#: bisect.c:1064
1685 +#: bisect.c:1065
1686 #, c-format
1687 msgid ""
1688 "No testable commit found.\n"
1689 "Maybe you started with bad path arguments?\n"
1690 msgstr ""
1691
1693 -#: bisect.c:1093
1692 +#: bisect.c:1094
1693 #, c-format
1694 msgid "(roughly %d step)"
1695 msgid_plural "(roughly %d steps)"
@@ -1700,127 +1699,157 @@ msgstr[1] ""
1699 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1700 #. steps)" translation.
1701 #.
1703 -#: bisect.c:1099
1702 +#: bisect.c:1100
1703 #, c-format
1704 msgid "Bisecting: %d revision left to test after this %s\n"
1705 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1706 msgstr[0] ""
1707 msgstr[1] ""
1708
1710 -#: blame.c:2776
1709 +#: blame.c:2773
1710 msgid "--contents and --reverse do not blend well."
1711 msgstr ""
1712
1714 -#: blame.c:2790
1713 +#: blame.c:2787
1714 msgid "cannot use --contents with final commit object name"
1715 msgstr ""
1716
1718 -#: blame.c:2811
1717 +#: blame.c:2808
1718 msgid "--reverse and --first-parent together require specified latest commit"
1719 msgstr ""
1720
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
1721 +#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
1722 +#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
1723 +#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
1724 +#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
1725 +#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
1726 #: builtin/shortlog.c:255
1727 msgid "revision walk setup failed"
1728 msgstr ""
1729
1731 -#: blame.c:2838
1730 +#: blame.c:2835
1731 msgid ""
1732 "--reverse --first-parent together require range along first-parent chain"
1733 msgstr ""
1734
1736 -#: blame.c:2849
1735 +#: blame.c:2846
1736 #, c-format
1737 msgid "no such path %s in %s"
1738 msgstr ""
1739
1741 -#: blame.c:2860
1740 +#: blame.c:2857
1741 #, c-format
1742 msgid "cannot read blob %s for path %s"
1743 msgstr ""
1744
1746 -#: branch.c:77
1745 +#: branch.c:93
1746 msgid ""
1747 "cannot inherit upstream tracking configuration of multiple refs when "
1748 "rebasing is requested"
1749 msgstr ""
1750
1752 -#: branch.c:88
1751 +#: branch.c:104
1752 #, c-format
1753 msgid "not setting branch '%s' as its own upstream"
1754 msgstr ""
1755
1757 -#: branch.c:144
1756 +#: branch.c:160
1757 #, c-format
1758 msgid "branch '%s' set up to track '%s' by rebasing."
1759 msgstr ""
1760
1762 -#: branch.c:145
1761 +#: branch.c:161
1762 #, c-format
1763 msgid "branch '%s' set up to track '%s'."
1764 msgstr ""
1765
1767 -#: branch.c:148
1766 +#: branch.c:164
1767 #, c-format
1768 msgid "branch '%s' set up to track:"
1769 msgstr ""
1770
1772 -#: branch.c:160
1771 +#: branch.c:176
1772 msgid "unable to write upstream branch configuration"
1773 msgstr ""
1774
1776 -#: branch.c:162
1775 +#: branch.c:178
1776 msgid ""
1777 "\n"
1778 "After fixing the error cause you may try to fix up\n"
1779 "the remote tracking information by invoking:"
1780 msgstr ""
1781
1783 -#: branch.c:203
1782 +#: branch.c:219
1783 #, c-format
1784 msgid "asked to inherit tracking from '%s', but no remote is set"
1785 msgstr ""
1786
1788 -#: branch.c:209
1787 +#: branch.c:225
1788 #, c-format
1789 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
1790 msgstr ""
1791
1793 -#: branch.c:252
1792 +#: branch.c:277
1793 +#, c-format
1794 +msgid "not tracking: ambiguous information for ref '%s'"
1795 +msgstr ""
1796 +
1797 +#. TRANSLATORS: This is a line listing a remote with duplicate
1798 +#. refspecs in the advice message below. For RTL languages you'll
1799 +#. probably want to swap the "%s" and leading " " space around.
1800 +#.
1801 +#. TRANSLATORS: This is line item of ambiguous object output
1802 +#. from describe_ambiguous_object() above. For RTL languages
1803 +#. you'll probably want to swap the "%s" and leading " " space
1804 +#. around.
1805 +#.
1806 +#: branch.c:289 object-name.c:464
1807 +#, c-format
1808 +msgid " %s\n"
1809 +msgstr ""
1810 +
1811 +#. TRANSLATORS: The second argument is a \n-delimited list of
1812 +#. duplicate refspecs, composed above.
1813 +#.
1814 +#: branch.c:295
1815 #, c-format
1795 -msgid "not tracking: ambiguous information for ref %s"
1816 +msgid ""
1817 +"There are multiple remotes whose fetch refspecs map to the remote\n"
1818 +"tracking ref '%s':\n"
1819 +"%s\n"
1820 +"This is typically a configuration error.\n"
1821 +"\n"
1822 +"To support setting up tracking branches, ensure that\n"
1823 +"different remotes' fetch refspecs map into different\n"
1824 +"tracking namespaces."
1825 msgstr ""
1826
1798 -#: branch.c:287
1827 +#: branch.c:344
1828 #, c-format
1829 msgid "'%s' is not a valid branch name"
1830 msgstr ""
1831
1803 -#: branch.c:307
1832 +#: branch.c:364
1833 #, c-format
1834 msgid "a branch named '%s' already exists"
1835 msgstr ""
1836
1808 -#: branch.c:313
1837 +#: branch.c:370
1838 #, c-format
1839 msgid "cannot force update the branch '%s' checked out at '%s'"
1840 msgstr ""
1841
1813 -#: branch.c:336
1842 +#: branch.c:393
1843 #, c-format
1844 msgid "cannot set up tracking information; starting point '%s' is not a branch"
1845 msgstr ""
1846
1818 -#: branch.c:338
1847 +#: branch.c:395
1848 #, c-format
1849 msgid "the requested upstream branch '%s' does not exist"
1850 msgstr ""
1851
1823 -#: branch.c:340
1852 +#: branch.c:397
1853 msgid ""
1854 "\n"
1855 "If you are planning on basing your work on an upstream\n"
@@ -1832,126 +1861,143 @@ msgid ""
1861 "\"git push -u\" to set the upstream config as you push."
1862 msgstr ""
1863
1835 -#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
1864 +#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
1865 #: builtin/replace.c:423 builtin/replace.c:453
1866 #, c-format
1867 msgid "not a valid object name: '%s'"
1868 msgstr ""
1869
1841 -#: branch.c:404
1870 +#: branch.c:465
1871 #, c-format
1872 msgid "ambiguous object name: '%s'"
1873 msgstr ""
1874
1846 -#: branch.c:409
1875 +#: branch.c:470
1876 #, c-format
1877 msgid "not a valid branch point: '%s'"
1878 msgstr ""
1879
1851 -#: branch.c:469
1880 +#: branch.c:658
1881 +#, c-format
1882 +msgid "submodule '%s': unable to find submodule"
1883 +msgstr ""
1884 +
1885 +#: branch.c:661
1886 +#, c-format
1887 +msgid ""
1888 +"You may try updating the submodules using 'git checkout %s && git submodule "
1889 +"update --init'"
1890 +msgstr ""
1891 +
1892 +#: branch.c:672 branch.c:698
1893 +#, c-format
1894 +msgid "submodule '%s': cannot create branch '%s'"
1895 +msgstr ""
1896 +
1897 +#: branch.c:730
1898 #, c-format
1899 msgid "'%s' is already checked out at '%s'"
1900 msgstr ""
1901
1856 -#: branch.c:494
1902 +#: branch.c:755
1903 #, c-format
1904 msgid "HEAD of working tree %s is not updated"
1905 msgstr ""
1906
1861 -#: bundle.c:44
1907 +#: bundle.c:45
1908 #, c-format
1909 msgid "unrecognized bundle hash algorithm: %s"
1910 msgstr ""
1911
1866 -#: bundle.c:48
1912 +#: bundle.c:53
1913 #, c-format
1914 msgid "unknown capability '%s'"
1915 msgstr ""
1916
1871 -#: bundle.c:74
1917 +#: bundle.c:79
1918 #, c-format
1919 msgid "'%s' does not look like a v2 or v3 bundle file"
1920 msgstr ""
1921
1876 -#: bundle.c:113
1922 +#: bundle.c:118
1923 #, c-format
1924 msgid "unrecognized header: %s%s (%d)"
1925 msgstr ""
1926
1881 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
1882 -#: builtin/commit.c:862
1927 +#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
1928 +#: builtin/commit.c:865
1929 #, c-format
1930 msgid "could not open '%s'"
1931 msgstr ""
1932
1887 -#: bundle.c:198
1933 +#: bundle.c:203
1934 msgid "Repository lacks these prerequisite commits:"
1935 msgstr ""
1936
1891 -#: bundle.c:201
1937 +#: bundle.c:206
1938 msgid "need a repository to verify a bundle"
1939 msgstr ""
1940
1895 -#: bundle.c:257
1941 +#: bundle.c:264
1942 #, c-format
1943 msgid "The bundle contains this ref:"
1898 -msgid_plural "The bundle contains these %d refs:"
1944 +msgid_plural "The bundle contains these %<PRIuMAX> refs:"
1945 msgstr[0] ""
1946 msgstr[1] ""
1947
1902 -#: bundle.c:264
1948 +#: bundle.c:272
1949 msgid "The bundle records a complete history."
1950 msgstr ""
1951
1906 -#: bundle.c:266
1952 +#: bundle.c:274
1953 #, c-format
1954 msgid "The bundle requires this ref:"
1909 -msgid_plural "The bundle requires these %d refs:"
1955 +msgid_plural "The bundle requires these %<PRIuMAX> refs:"
1956 msgstr[0] ""
1957 msgstr[1] ""
1958
1913 -#: bundle.c:333
1959 +#: bundle.c:350
1960 msgid "unable to dup bundle descriptor"
1961 msgstr ""
1962
1917 -#: bundle.c:340
1963 +#: bundle.c:357
1964 msgid "Could not spawn pack-objects"
1965 msgstr ""
1966
1921 -#: bundle.c:351
1967 +#: bundle.c:368
1968 msgid "pack-objects died"
1969 msgstr ""
1970
1925 -#: bundle.c:400
1971 +#: bundle.c:417
1972 #, c-format
1973 msgid "ref '%s' is excluded by the rev-list options"
1974 msgstr ""
1975
1930 -#: bundle.c:504
1976 +#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
1977 #, c-format
1932 -msgid "unsupported bundle version %d"
1978 +msgid "unrecognized argument: %s"
1979 msgstr ""
1980
1935 -#: bundle.c:506
1981 +#: bundle.c:548
1982 #, c-format
1937 -msgid "cannot write bundle version %d with algorithm %s"
1983 +msgid "unsupported bundle version %d"
1984 msgstr ""
1985
1940 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
1986 +#: bundle.c:550
1987 #, c-format
1942 -msgid "unrecognized argument: %s"
1988 +msgid "cannot write bundle version %d with algorithm %s"
1989 msgstr ""
1990
1945 -#: bundle.c:553
1991 +#: bundle.c:600
1992 msgid "Refusing to create empty bundle."
1993 msgstr ""
1994
1949 -#: bundle.c:563
1995 +#: bundle.c:610
1996 #, c-format
1997 msgid "cannot create '%s'"
1998 msgstr ""
1999
1954 -#: bundle.c:588
2000 +#: bundle.c:639
2001 msgid "index-pack died"
2002 msgstr ""
2003
@@ -1979,7 +2025,7 @@ msgstr ""
2025 msgid "invalid color value: %.*s"
2026 msgstr ""
2027
1982 -#: commit-graph.c:204 midx.c:51
2028 +#: commit-graph.c:204 midx.c:52
2029 msgid "invalid hash version"
2030 msgstr ""
2031
@@ -2007,234 +2053,235 @@ msgstr ""
2053 msgid "commit-graph file is too small to hold %u chunks"
2054 msgstr ""
2055
2010 -#: commit-graph.c:482
2056 +#: commit-graph.c:485
2057 msgid "commit-graph has no base graphs chunk"
2058 msgstr ""
2059
2014 -#: commit-graph.c:492
2060 +#: commit-graph.c:495
2061 msgid "commit-graph chain does not match"
2062 msgstr ""
2063
2018 -#: commit-graph.c:540
2064 +#: commit-graph.c:543
2065 #, c-format
2066 msgid "invalid commit-graph chain: line '%s' not a hash"
2067 msgstr ""
2068
2023 -#: commit-graph.c:564
2069 +#: commit-graph.c:567
2070 msgid "unable to find all commit-graph files"
2071 msgstr ""
2072
2027 -#: commit-graph.c:749 commit-graph.c:786
2073 +#: commit-graph.c:752 commit-graph.c:789
2074 msgid "invalid commit position. commit-graph is likely corrupt"
2075 msgstr ""
2076
2031 -#: commit-graph.c:770
2077 +#: commit-graph.c:773
2078 #, c-format
2079 msgid "could not find commit %s"
2080 msgstr ""
2081
2036 -#: commit-graph.c:803
2082 +#: commit-graph.c:806
2083 msgid "commit-graph requires overflow generation data but has none"
2084 msgstr ""
2085
2040 -#: commit-graph.c:1108 builtin/am.c:1369
2086 +#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
2087 +#: builtin/clone.c:705
2088 #, c-format
2089 msgid "unable to parse commit %s"
2090 msgstr ""
2091
2045 -#: commit-graph.c:1370 builtin/pack-objects.c:3070
2092 +#: commit-graph.c:1373 builtin/pack-objects.c:3078
2093 #, c-format
2094 msgid "unable to get type of object %s"
2095 msgstr ""
2096
2050 -#: commit-graph.c:1401
2097 +#: commit-graph.c:1404
2098 msgid "Loading known commits in commit graph"
2099 msgstr ""
2100
2054 -#: commit-graph.c:1418
2101 +#: commit-graph.c:1421
2102 msgid "Expanding reachable commits in commit graph"
2103 msgstr ""
2104
2058 -#: commit-graph.c:1438
2105 +#: commit-graph.c:1441
2106 msgid "Clearing commit marks in commit graph"
2107 msgstr ""
2108
2062 -#: commit-graph.c:1457
2109 +#: commit-graph.c:1460
2110 msgid "Computing commit graph topological levels"
2111 msgstr ""
2112
2066 -#: commit-graph.c:1510
2113 +#: commit-graph.c:1513
2114 msgid "Computing commit graph generation numbers"
2115 msgstr ""
2116
2070 -#: commit-graph.c:1591
2117 +#: commit-graph.c:1598
2118 msgid "Computing commit changed paths Bloom filters"
2119 msgstr ""
2120
2074 -#: commit-graph.c:1668
2121 +#: commit-graph.c:1675
2122 msgid "Collecting referenced commits"
2123 msgstr ""
2124
2078 -#: commit-graph.c:1693
2125 +#: commit-graph.c:1701
2126 #, c-format
2080 -msgid "Finding commits for commit graph in %d pack"
2081 -msgid_plural "Finding commits for commit graph in %d packs"
2127 +msgid "Finding commits for commit graph in %<PRIuMAX> pack"
2128 +msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
2129 msgstr[0] ""
2130 msgstr[1] ""
2131
2085 -#: commit-graph.c:1706
2132 +#: commit-graph.c:1714
2133 #, c-format
2134 msgid "error adding pack %s"
2135 msgstr ""
2136
2090 -#: commit-graph.c:1710
2137 +#: commit-graph.c:1718
2138 #, c-format
2139 msgid "error opening index for %s"
2140 msgstr ""
2141
2095 -#: commit-graph.c:1747
2142 +#: commit-graph.c:1756
2143 msgid "Finding commits for commit graph among packed objects"
2144 msgstr ""
2145
2099 -#: commit-graph.c:1765
2146 +#: commit-graph.c:1774
2147 msgid "Finding extra edges in commit graph"
2148 msgstr ""
2149
2103 -#: commit-graph.c:1814
2150 +#: commit-graph.c:1823
2151 msgid "failed to write correct number of base graph ids"
2152 msgstr ""
2153
2107 -#: commit-graph.c:1845 midx.c:1149
2154 +#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
2155 #, c-format
2156 msgid "unable to create leading directories of %s"
2157 msgstr ""
2158
2112 -#: commit-graph.c:1858
2159 +#: commit-graph.c:1868
2160 msgid "unable to create temporary graph layer"
2161 msgstr ""
2162
2116 -#: commit-graph.c:1863
2163 +#: commit-graph.c:1873
2164 #, c-format
2165 msgid "unable to adjust shared permissions for '%s'"
2166 msgstr ""
2167
2121 -#: commit-graph.c:1920
2168 +#: commit-graph.c:1930
2169 #, c-format
2170 msgid "Writing out commit graph in %d pass"
2171 msgid_plural "Writing out commit graph in %d passes"
2172 msgstr[0] ""
2173 msgstr[1] ""
2174
2128 -#: commit-graph.c:1956
2175 +#: commit-graph.c:1967
2176 msgid "unable to open commit-graph chain file"
2177 msgstr ""
2178
2132 -#: commit-graph.c:1972
2179 +#: commit-graph.c:1983
2180 msgid "failed to rename base commit-graph file"
2181 msgstr ""
2182
2136 -#: commit-graph.c:1992
2183 +#: commit-graph.c:2004
2184 msgid "failed to rename temporary commit-graph file"
2185 msgstr ""
2186
2140 -#: commit-graph.c:2125
2187 +#: commit-graph.c:2137
2188 msgid "Scanning merged commits"
2189 msgstr ""
2190
2144 -#: commit-graph.c:2169
2191 +#: commit-graph.c:2181
2192 msgid "Merging commit-graph"
2193 msgstr ""
2194
2148 -#: commit-graph.c:2277
2195 +#: commit-graph.c:2289
2196 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2197 msgstr ""
2198
2152 -#: commit-graph.c:2384
2199 +#: commit-graph.c:2396
2200 msgid "too many commits to write graph"
2201 msgstr ""
2202
2156 -#: commit-graph.c:2482
2203 +#: commit-graph.c:2494
2204 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2205 msgstr ""
2206
2160 -#: commit-graph.c:2492
2207 +#: commit-graph.c:2504
2208 #, c-format
2209 msgid "commit-graph has incorrect OID order: %s then %s"
2210 msgstr ""
2211
2165 -#: commit-graph.c:2502 commit-graph.c:2517
2212 +#: commit-graph.c:2514 commit-graph.c:2529
2213 #, c-format
2214 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2215 msgstr ""
2216
2170 -#: commit-graph.c:2509
2217 +#: commit-graph.c:2521
2218 #, c-format
2219 msgid "failed to parse commit %s from commit-graph"
2220 msgstr ""
2221
2175 -#: commit-graph.c:2527
2222 +#: commit-graph.c:2539
2223 msgid "Verifying commits in commit graph"
2224 msgstr ""
2225
2179 -#: commit-graph.c:2542
2226 +#: commit-graph.c:2554
2227 #, c-format
2228 msgid "failed to parse commit %s from object database for commit-graph"
2229 msgstr ""
2230
2184 -#: commit-graph.c:2549
2231 +#: commit-graph.c:2561
2232 #, c-format
2233 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2234 msgstr ""
2235
2189 -#: commit-graph.c:2559
2236 +#: commit-graph.c:2571
2237 #, c-format
2238 msgid "commit-graph parent list for commit %s is too long"
2239 msgstr ""
2240
2194 -#: commit-graph.c:2568
2241 +#: commit-graph.c:2580
2242 #, c-format
2243 msgid "commit-graph parent for %s is %s != %s"
2244 msgstr ""
2245
2199 -#: commit-graph.c:2582
2246 +#: commit-graph.c:2594
2247 #, c-format
2248 msgid "commit-graph parent list for commit %s terminates early"
2249 msgstr ""
2250
2204 -#: commit-graph.c:2587
2251 +#: commit-graph.c:2599
2252 #, c-format
2253 msgid ""
2254 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2255 msgstr ""
2256
2210 -#: commit-graph.c:2591
2257 +#: commit-graph.c:2603
2258 #, c-format
2259 msgid ""
2260 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2261 msgstr ""
2262
2216 -#: commit-graph.c:2608
2263 +#: commit-graph.c:2620
2264 #, c-format
2265 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2266 msgstr ""
2267
2221 -#: commit-graph.c:2614
2268 +#: commit-graph.c:2626
2269 #, c-format
2270 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2271 msgstr ""
2272
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
2273 +#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
2274 +#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
2275 #, c-format
2276 msgid "could not parse %s"
2277 msgstr ""
2278
2232 -#: commit.c:55
2279 +#: commit.c:56
2280 #, c-format
2281 msgid "%s %s is not a commit!"
2282 msgstr ""
2283
2237 -#: commit.c:196
2284 +#: commit.c:197
2285 msgid ""
2286 "Support for <GIT_DIR>/info/grafts is deprecated\n"
2287 "and will be removed in a future Git version.\n"
@@ -2246,27 +2293,27 @@ msgid ""
2293 "\"git config advice.graftFileDeprecated false\""
2294 msgstr ""
2295
2249 -#: commit.c:1241
2296 +#: commit.c:1252
2297 #, c-format
2298 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2299 msgstr ""
2300
2254 -#: commit.c:1245
2301 +#: commit.c:1256
2302 #, c-format
2303 msgid "Commit %s has a bad GPG signature allegedly by %s."
2304 msgstr ""
2305
2259 -#: commit.c:1248
2306 +#: commit.c:1259
2307 #, c-format
2308 msgid "Commit %s does not have a GPG signature."
2309 msgstr ""
2310
2264 -#: commit.c:1251
2311 +#: commit.c:1262
2312 #, c-format
2313 msgid "Commit %s has a good GPG signature by %s\n"
2314 msgstr ""
2315
2269 -#: commit.c:1505
2316 +#: commit.c:1516
2317 msgid ""
2318 "Warning: commit message did not conform to UTF-8.\n"
2319 "You may want to amend it after fixing the message, or set the config\n"
@@ -2277,7 +2324,15 @@ msgstr ""
2324 msgid "memory exhausted"
2325 msgstr ""
2326
2280 -#: config.c:125
2327 +#: compat/terminal.c:167
2328 +msgid "cannot resume in the background, please use 'fg' to resume"
2329 +msgstr ""
2330 +
2331 +#: compat/terminal.c:168
2332 +msgid "cannot restore terminal settings"
2333 +msgstr ""
2334 +
2335 +#: config.c:143
2336 #, c-format
2337 msgid ""
2338 "exceeded maximum include depth (%d) while including\n"
@@ -2287,333 +2342,358 @@ msgid ""
2342 "This might be due to circular includes."
2343 msgstr ""
2344
2290 -#: config.c:141
2345 +#: config.c:159
2346 #, c-format
2347 msgid "could not expand include path '%s'"
2348 msgstr ""
2349
2295 -#: config.c:152
2350 +#: config.c:170
2351 msgid "relative config includes must come from files"
2352 msgstr ""
2353
2299 -#: config.c:201
2354 +#: config.c:219
2355 msgid "relative config include conditionals must come from files"
2356 msgstr ""
2357
2303 -#: config.c:398
2358 +#: config.c:364
2359 +msgid ""
2360 +"remote URLs cannot be configured in file directly or indirectly included by "
2361 +"includeIf.hasconfig:remote.*.url"
2362 +msgstr ""
2363 +
2364 +#: config.c:508
2365 #, c-format
2366 msgid "invalid config format: %s"
2367 msgstr ""
2368
2308 -#: config.c:402
2369 +#: config.c:512
2370 #, c-format
2371 msgid "missing environment variable name for configuration '%.*s'"
2372 msgstr ""
2373
2313 -#: config.c:407
2374 +#: config.c:517
2375 #, c-format
2376 msgid "missing environment variable '%s' for configuration '%.*s'"
2377 msgstr ""
2378
2318 -#: config.c:443
2379 +#: config.c:553
2380 #, c-format
2381 msgid "key does not contain a section: %s"
2382 msgstr ""
2383
2323 -#: config.c:448
2384 +#: config.c:558
2385 #, c-format
2386 msgid "key does not contain variable name: %s"
2387 msgstr ""
2388
2328 -#: config.c:470 sequencer.c:2806
2389 +#: config.c:580 sequencer.c:2802
2390 #, c-format
2391 msgid "invalid key: %s"
2392 msgstr ""
2393
2333 -#: config.c:475
2394 +#: config.c:585
2395 #, c-format
2396 msgid "invalid key (newline): %s"
2397 msgstr ""
2398
2338 -#: config.c:495
2399 +#: config.c:605
2400 msgid "empty config key"
2401 msgstr ""
2402
2342 -#: config.c:513 config.c:525
2403 +#: config.c:623 config.c:635
2404 #, c-format
2405 msgid "bogus config parameter: %s"
2406 msgstr ""
2407
2347 -#: config.c:539 config.c:556 config.c:563 config.c:572
2408 +#: config.c:649 config.c:666 config.c:673 config.c:682
2409 #, c-format
2410 msgid "bogus format in %s"
2411 msgstr ""
2412
2352 -#: config.c:606
2413 +#: config.c:716
2414 #, c-format
2415 msgid "bogus count in %s"
2416 msgstr ""
2417
2357 -#: config.c:610
2418 +#: config.c:720
2419 #, c-format
2420 msgid "too many entries in %s"
2421 msgstr ""
2422
2362 -#: config.c:620
2423 +#: config.c:730
2424 #, c-format
2425 msgid "missing config key %s"
2426 msgstr ""
2427
2367 -#: config.c:628
2428 +#: config.c:738
2429 #, c-format
2430 msgid "missing config value %s"
2431 msgstr ""
2432
2372 -#: config.c:979
2433 +#: config.c:1089
2434 #, c-format
2435 msgid "bad config line %d in blob %s"
2436 msgstr ""
2437
2377 -#: config.c:983
2438 +#: config.c:1093
2439 #, c-format
2440 msgid "bad config line %d in file %s"
2441 msgstr ""
2442
2382 -#: config.c:987
2443 +#: config.c:1097
2444 #, c-format
2445 msgid "bad config line %d in standard input"
2446 msgstr ""
2447
2387 -#: config.c:991
2448 +#: config.c:1101
2449 #, c-format
2450 msgid "bad config line %d in submodule-blob %s"
2451 msgstr ""
2452
2392 -#: config.c:995
2453 +#: config.c:1105
2454 #, c-format
2455 msgid "bad config line %d in command line %s"
2456 msgstr ""
2457
2397 -#: config.c:999
2458 +#: config.c:1109
2459 #, c-format
2460 msgid "bad config line %d in %s"
2461 msgstr ""
2462
2402 -#: config.c:1136
2463 +#: config.c:1246
2464 msgid "out of range"
2465 msgstr ""
2466
2406 -#: config.c:1136
2467 +#: config.c:1246
2468 msgid "invalid unit"
2469 msgstr ""
2470
2410 -#: config.c:1137
2471 +#: config.c:1247
2472 #, c-format
2473 msgid "bad numeric config value '%s' for '%s': %s"
2474 msgstr ""
2475
2415 -#: config.c:1147
2476 +#: config.c:1257
2477 #, c-format
2478 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2479 msgstr ""
2480
2420 -#: config.c:1150
2481 +#: config.c:1260
2482 #, c-format
2483 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2484 msgstr ""
2485
2425 -#: config.c:1153
2486 +#: config.c:1263
2487 #, c-format
2488 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2489 msgstr ""
2490
2430 -#: config.c:1156
2491 +#: config.c:1266
2492 #, c-format
2493 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2494 msgstr ""
2495
2435 -#: config.c:1159
2496 +#: config.c:1269
2497 #, c-format
2498 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2499 msgstr ""
2500
2440 -#: config.c:1162
2501 +#: config.c:1272
2502 #, c-format
2503 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2504 msgstr ""
2505
2445 -#: config.c:1241
2506 +#: config.c:1368
2507 +#, c-format
2508 +msgid "invalid value for variable %s"
2509 +msgstr ""
2510 +
2511 +#: config.c:1389
2512 +#, c-format
2513 +msgid "ignoring unknown core.fsync component '%s'"
2514 +msgstr ""
2515 +
2516 +#: config.c:1425
2517 #, c-format
2518 msgid "bad boolean config value '%s' for '%s'"
2519 msgstr ""
2520
2450 -#: config.c:1259
2521 +#: config.c:1443
2522 #, c-format
2523 msgid "failed to expand user dir in: '%s'"
2524 msgstr ""
2525
2455 -#: config.c:1268
2526 +#: config.c:1452
2527 #, c-format
2528 msgid "'%s' for '%s' is not a valid timestamp"
2529 msgstr ""
2530
2460 -#: config.c:1361
2531 +#: config.c:1545
2532 #, c-format
2533 msgid "abbrev length out of range: %d"
2534 msgstr ""
2535
2465 -#: config.c:1375 config.c:1386
2536 +#: config.c:1559 config.c:1570
2537 #, c-format
2538 msgid "bad zlib compression level %d"
2539 msgstr ""
2540
2470 -#: config.c:1476
2541 +#: config.c:1660
2542 msgid "core.commentChar should only be one character"
2543 msgstr ""
2544
2474 -#: config.c:1509
2545 +#: config.c:1692
2546 +#, c-format
2547 +msgid "ignoring unknown core.fsyncMethod value '%s'"
2548 +msgstr ""
2549 +
2550 +#: config.c:1698
2551 +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
2552 +msgstr ""
2553 +
2554 +#: config.c:1714
2555 #, c-format
2556 msgid "invalid mode for object creation: %s"
2557 msgstr ""
2558
2479 -#: config.c:1584
2559 +#: config.c:1800
2560 #, c-format
2561 msgid "malformed value for %s"
2562 msgstr ""
2563
2484 -#: config.c:1610
2564 +#: config.c:1826
2565 #, c-format
2566 msgid "malformed value for %s: %s"
2567 msgstr ""
2568
2489 -#: config.c:1611
2569 +#: config.c:1827
2570 msgid "must be one of nothing, matching, simple, upstream or current"
2571 msgstr ""
2572
2493 -#: config.c:1672 builtin/pack-objects.c:4053
2573 +#: config.c:1888 builtin/pack-objects.c:4078
2574 #, c-format
2575 msgid "bad pack compression level %d"
2576 msgstr ""
2577
2498 -#: config.c:1795
2578 +#: config.c:2014
2579 #, c-format
2580 msgid "unable to load config blob object '%s'"
2581 msgstr ""
2582
2503 -#: config.c:1798
2583 +#: config.c:2017
2584 #, c-format
2585 msgid "reference '%s' does not point to a blob"
2586 msgstr ""
2587
2508 -#: config.c:1816
2588 +#: config.c:2035
2589 #, c-format
2590 msgid "unable to resolve config blob '%s'"
2591 msgstr ""
2592
2513 -#: config.c:1861
2593 +#: config.c:2080
2594 #, c-format
2595 msgid "failed to parse %s"
2596 msgstr ""
2597
2518 -#: config.c:1917
2598 +#: config.c:2136
2599 msgid "unable to parse command-line config"
2600 msgstr ""
2601
2522 -#: config.c:2285
2602 +#: config.c:2512
2603 msgid "unknown error occurred while reading the configuration files"
2604 msgstr ""
2605
2526 -#: config.c:2459
2606 +#: config.c:2686
2607 #, c-format
2608 msgid "Invalid %s: '%s'"
2609 msgstr ""
2610
2531 -#: config.c:2504
2611 +#: config.c:2731
2612 #, c-format
2613 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2614 msgstr ""
2615
2536 -#: config.c:2550
2616 +#: config.c:2763
2617 #, c-format
2618 msgid "unable to parse '%s' from command-line config"
2619 msgstr ""
2620
2541 -#: config.c:2552
2621 +#: config.c:2765
2622 #, c-format
2623 msgid "bad config variable '%s' in file '%s' at line %d"
2624 msgstr ""
2625
2546 -#: config.c:2637
2626 +#: config.c:2850
2627 #, c-format
2628 msgid "invalid section name '%s'"
2629 msgstr ""
2630
2551 -#: config.c:2669
2631 +#: config.c:2882
2632 #, c-format
2633 msgid "%s has multiple values"
2634 msgstr ""
2635
2556 -#: config.c:2698
2636 +#: config.c:2911
2637 #, c-format
2638 msgid "failed to write new configuration file %s"
2639 msgstr ""
2640
2561 -#: config.c:2950 config.c:3277
2641 +#: config.c:3177 config.c:3518
2642 #, c-format
2643 msgid "could not lock config file %s"
2644 msgstr ""
2645
2566 -#: config.c:2961
2646 +#: config.c:3188
2647 #, c-format
2648 msgid "opening %s"
2649 msgstr ""
2650
2571 -#: config.c:2998 builtin/config.c:361
2651 +#: config.c:3225 builtin/config.c:361
2652 #, c-format
2653 msgid "invalid pattern: %s"
2654 msgstr ""
2655
2576 -#: config.c:3023
2656 +#: config.c:3250
2657 #, c-format
2658 msgid "invalid config file %s"
2659 msgstr ""
2660
2581 -#: config.c:3036 config.c:3290
2661 +#: config.c:3263 config.c:3531
2662 #, c-format
2663 msgid "fstat on %s failed"
2664 msgstr ""
2665
2586 -#: config.c:3047
2666 +#: config.c:3274
2667 #, c-format
2668 msgid "unable to mmap '%s'%s"
2669 msgstr ""
2670
2591 -#: config.c:3057 config.c:3295
2671 +#: config.c:3284 config.c:3536
2672 #, c-format
2673 msgid "chmod on %s failed"
2674 msgstr ""
2675
2596 -#: config.c:3142 config.c:3392
2676 +#: config.c:3369 config.c:3633
2677 #, c-format
2678 msgid "could not write config file %s"
2679 msgstr ""
2680
2601 -#: config.c:3176
2681 +#: config.c:3403
2682 #, c-format
2683 msgid "could not set '%s' to '%s'"
2684 msgstr ""
2685
2606 -#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
2686 +#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
2687 #, c-format
2688 msgid "could not unset '%s'"
2689 msgstr ""
2690
2611 -#: config.c:3268
2691 +#: config.c:3509
2692 #, c-format
2693 msgid "invalid section name: %s"
2694 msgstr ""
2695
2616 -#: config.c:3435
2696 +#: config.c:3676
2697 #, c-format
2698 msgid "missing value for '%s'"
2699 msgstr ""
@@ -2928,68 +3008,68 @@ msgstr ""
3008 msgid "refusing to work with credential missing protocol field"
3009 msgstr ""
3010
2931 -#: credential.c:395
3011 +#: credential.c:396
3012 #, c-format
3013 msgid "url contains a newline in its %s component: %s"
3014 msgstr ""
3015
2936 -#: credential.c:439
3016 +#: credential.c:440
3017 #, c-format
3018 msgid "url has no scheme: %s"
3019 msgstr ""
3020
2941 -#: credential.c:512
3021 +#: credential.c:513
3022 #, c-format
3023 msgid "credential url cannot be parsed: %s"
3024 msgstr ""
3025
2946 -#: date.c:138
3026 +#: date.c:139
3027 msgid "in the future"
3028 msgstr ""
3029
2950 -#: date.c:144
3030 +#: date.c:145
3031 #, c-format
3032 msgid "%<PRIuMAX> second ago"
3033 msgid_plural "%<PRIuMAX> seconds ago"
3034 msgstr[0] ""
3035 msgstr[1] ""
3036
2957 -#: date.c:151
3037 +#: date.c:152
3038 #, c-format
3039 msgid "%<PRIuMAX> minute ago"
3040 msgid_plural "%<PRIuMAX> minutes ago"
3041 msgstr[0] ""
3042 msgstr[1] ""
3043
2964 -#: date.c:158
3044 +#: date.c:159
3045 #, c-format
3046 msgid "%<PRIuMAX> hour ago"
3047 msgid_plural "%<PRIuMAX> hours ago"
3048 msgstr[0] ""
3049 msgstr[1] ""
3050
2971 -#: date.c:165
3051 +#: date.c:166
3052 #, c-format
3053 msgid "%<PRIuMAX> day ago"
3054 msgid_plural "%<PRIuMAX> days ago"
3055 msgstr[0] ""
3056 msgstr[1] ""
3057
2978 -#: date.c:171
3058 +#: date.c:172
3059 #, c-format
3060 msgid "%<PRIuMAX> week ago"
3061 msgid_plural "%<PRIuMAX> weeks ago"
3062 msgstr[0] ""
3063 msgstr[1] ""
3064
2985 -#: date.c:178
3065 +#: date.c:179
3066 #, c-format
3067 msgid "%<PRIuMAX> month ago"
3068 msgid_plural "%<PRIuMAX> months ago"
3069 msgstr[0] ""
3070 msgstr[1] ""
3071
2992 -#: date.c:189
3072 +#: date.c:190
3073 #, c-format
3074 msgid "%<PRIuMAX> year"
3075 msgid_plural "%<PRIuMAX> years"
@@ -2997,14 +3077,14 @@ msgstr[0] ""
3077 msgstr[1] ""
3078
3079 #. TRANSLATORS: "%s" is "<n> years"
3000 -#: date.c:192
3080 +#: date.c:193
3081 #, c-format
3082 msgid "%s, %<PRIuMAX> month ago"
3083 msgid_plural "%s, %<PRIuMAX> months ago"
3084 msgstr[0] ""
3085 msgstr[1] ""
3086
3007 -#: date.c:197 date.c:202
3087 +#: date.c:198 date.c:203
3088 #, c-format
3089 msgid "%<PRIuMAX> year ago"
3090 msgid_plural "%<PRIuMAX> years ago"
@@ -3035,9 +3115,13 @@ msgstr ""
3115 msgid "Marked %d islands, done.\n"
3116 msgstr ""
3117
3038 -#: diff-merges.c:70
3118 +#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
3119 +#: parallel-checkout.c:42 sequencer.c:2805 setup.c:562 builtin/am.c:203
3120 +#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
3121 +#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
3122 +#: builtin/pull.c:47 builtin/pull.c:321
3123 #, c-format
3040 -msgid "unknown value for --diff-merges: %s"
3124 +msgid "invalid value for '%s': '%s'"
3125 msgstr ""
3126
3127 #: diff-lib.c:561
@@ -3070,598 +3154,598 @@ msgid ""
3154 "tree"
3155 msgstr ""
3156
3073 -#: diff.c:158
3157 +#: diff.c:159
3158 #, c-format
3159 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3160 msgstr ""
3161
3078 -#: diff.c:163
3162 +#: diff.c:164
3163 #, c-format
3164 msgid " Unknown dirstat parameter '%s'\n"
3165 msgstr ""
3166
3083 -#: diff.c:299
3167 +#: diff.c:300
3168 msgid ""
3169 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3170 "'dimmed-zebra', 'plain'"
3171 msgstr ""
3172
3089 -#: diff.c:327
3173 +#: diff.c:328
3174 #, c-format
3175 msgid ""
3176 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3177 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3178 msgstr ""
3179
3096 -#: diff.c:335
3180 +#: diff.c:336
3181 msgid ""
3182 "color-moved-ws: allow-indentation-change cannot be combined with other "
3183 "whitespace modes"
3184 msgstr ""
3185
3102 -#: diff.c:412
3186 +#: diff.c:413
3187 #, c-format
3188 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3189 msgstr ""
3190
3107 -#: diff.c:472
3191 +#: diff.c:473
3192 #, c-format
3193 msgid ""
3194 "Found errors in 'diff.dirstat' config variable:\n"
3195 "%s"
3196 msgstr ""
3197
3114 -#: diff.c:4237
3198 +#: diff.c:4282
3199 #, c-format
3200 msgid "external diff died, stopping at %s"
3201 msgstr ""
3202
3119 -#: diff.c:4589
3203 +#: diff.c:4677 parse-options.c:1114
3204 #, c-format
3205 msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
3206 msgstr ""
3207
3124 -#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
3208 +#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
3209 #, c-format
3210 msgid "options '%s', '%s', and '%s' cannot be used together"
3211 msgstr ""
3212
3129 -#: diff.c:4597
3213 +#: diff.c:4685
3214 #, c-format
3215 msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3216 msgstr ""
3217
3134 -#: diff.c:4601
3218 +#: diff.c:4689
3219 #, c-format
3220 msgid ""
3221 "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3222 msgstr ""
3223
3140 -#: diff.c:4681
3224 +#: diff.c:4769
3225 msgid "--follow requires exactly one pathspec"
3226 msgstr ""
3227
3144 -#: diff.c:4729
3228 +#: diff.c:4823
3229 #, c-format
3230 msgid "invalid --stat value: %s"
3231 msgstr ""
3232
3149 -#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
3233 +#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
3234 #: parse-options.c:217 parse-options.c:221
3235 #, c-format
3236 msgid "%s expects a numerical value"
3237 msgstr ""
3238
3155 -#: diff.c:4766
3239 +#: diff.c:4860
3240 #, c-format
3241 msgid ""
3242 "Failed to parse --dirstat/-X option parameter:\n"
3243 "%s"
3244 msgstr ""
3245
3162 -#: diff.c:4851
3246 +#: diff.c:4893
3247 #, c-format
3248 msgid "unknown change class '%c' in --diff-filter=%s"
3249 msgstr ""
3250
3167 -#: diff.c:4875
3251 +#: diff.c:4917
3252 #, c-format
3253 msgid "unknown value after ws-error-highlight=%.*s"
3254 msgstr ""
3255
3172 -#: diff.c:4889
3256 +#: diff.c:4931
3257 #, c-format
3258 msgid "unable to resolve '%s'"
3259 msgstr ""
3260
3177 -#: diff.c:4939 diff.c:4945
3261 +#: diff.c:4981 diff.c:4987
3262 #, c-format
3263 msgid "%s expects <n>/<m> form"
3264 msgstr ""
3265
3182 -#: diff.c:4957
3266 +#: diff.c:4999
3267 #, c-format
3268 msgid "%s expects a character, got '%s'"
3269 msgstr ""
3270
3187 -#: diff.c:4978
3271 +#: diff.c:5020
3272 #, c-format
3273 msgid "bad --color-moved argument: %s"
3274 msgstr ""
3275
3192 -#: diff.c:4997
3276 +#: diff.c:5039
3277 #, c-format
3278 msgid "invalid mode '%s' in --color-moved-ws"
3279 msgstr ""
3280
3197 -#: diff.c:5037
3281 +#: diff.c:5079
3282 msgid ""
3283 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3284 "\"histogram\""
3285 msgstr ""
3286
3203 -#: diff.c:5073 diff.c:5093
3287 +#: diff.c:5115 diff.c:5135
3288 #, c-format
3289 msgid "invalid argument to %s"
3290 msgstr ""
3291
3208 -#: diff.c:5197
3292 +#: diff.c:5239
3293 #, c-format
3294 msgid "invalid regex given to -I: '%s'"
3295 msgstr ""
3296
3213 -#: diff.c:5246
3297 +#: diff.c:5288
3298 #, c-format
3299 msgid "failed to parse --submodule option parameter: '%s'"
3300 msgstr ""
3301
3218 -#: diff.c:5302
3302 +#: diff.c:5344
3303 #, c-format
3304 msgid "bad --word-diff argument: %s"
3305 msgstr ""
3306
3223 -#: diff.c:5338
3307 +#: diff.c:5380
3308 msgid "Diff output format options"
3309 msgstr ""
3310
3227 -#: diff.c:5340 diff.c:5346
3311 +#: diff.c:5382 diff.c:5388
3312 msgid "generate patch"
3313 msgstr ""
3314
3231 -#: diff.c:5343 builtin/log.c:179
3315 +#: diff.c:5385 builtin/log.c:180
3316 msgid "suppress diff output"
3317 msgstr ""
3318
3235 -#: diff.c:5348 diff.c:5462 diff.c:5469
3319 +#: diff.c:5390 diff.c:5504 diff.c:5511
3320 msgid "<n>"
3321 msgstr ""
3322
3239 -#: diff.c:5349 diff.c:5352
3323 +#: diff.c:5391 diff.c:5394
3324 msgid "generate diffs with <n> lines context"
3325 msgstr ""
3326
3243 -#: diff.c:5354
3327 +#: diff.c:5396
3328 msgid "generate the diff in raw format"
3329 msgstr ""
3330
3247 -#: diff.c:5357
3331 +#: diff.c:5399
3332 msgid "synonym for '-p --raw'"
3333 msgstr ""
3334
3251 -#: diff.c:5361
3335 +#: diff.c:5403
3336 msgid "synonym for '-p --stat'"
3337 msgstr ""
3338
3255 -#: diff.c:5365
3339 +#: diff.c:5407
3340 msgid "machine friendly --stat"
3341 msgstr ""
3342
3259 -#: diff.c:5368
3343 +#: diff.c:5410
3344 msgid "output only the last line of --stat"
3345 msgstr ""
3346
3263 -#: diff.c:5370 diff.c:5378
3347 +#: diff.c:5412 diff.c:5420
3348 msgid "<param1,param2>..."
3349 msgstr ""
3350
3267 -#: diff.c:5371
3351 +#: diff.c:5413
3352 msgid ""
3353 "output the distribution of relative amount of changes for each sub-directory"
3354 msgstr ""
3355
3272 -#: diff.c:5375
3356 +#: diff.c:5417
3357 msgid "synonym for --dirstat=cumulative"
3358 msgstr ""
3359
3276 -#: diff.c:5379
3360 +#: diff.c:5421
3361 msgid "synonym for --dirstat=files,param1,param2..."
3362 msgstr ""
3363
3280 -#: diff.c:5383
3364 +#: diff.c:5425
3365 msgid "warn if changes introduce conflict markers or whitespace errors"
3366 msgstr ""
3367
3284 -#: diff.c:5386
3368 +#: diff.c:5428
3369 msgid "condensed summary such as creations, renames and mode changes"
3370 msgstr ""
3371
3288 -#: diff.c:5389
3372 +#: diff.c:5431
3373 msgid "show only names of changed files"
3374 msgstr ""
3375
3292 -#: diff.c:5392
3376 +#: diff.c:5434
3377 msgid "show only names and status of changed files"
3378 msgstr ""
3379
3296 -#: diff.c:5394
3380 +#: diff.c:5436
3381 msgid "<width>[,<name-width>[,<count>]]"
3382 msgstr ""
3383
3300 -#: diff.c:5395
3384 +#: diff.c:5437
3385 msgid "generate diffstat"
3386 msgstr ""
3387
3304 -#: diff.c:5397 diff.c:5400 diff.c:5403
3388 +#: diff.c:5439 diff.c:5442 diff.c:5445
3389 msgid "<width>"
3390 msgstr ""
3391
3308 -#: diff.c:5398
3392 +#: diff.c:5440
3393 msgid "generate diffstat with a given width"
3394 msgstr ""
3395
3312 -#: diff.c:5401
3396 +#: diff.c:5443
3397 msgid "generate diffstat with a given name width"
3398 msgstr ""
3399
3316 -#: diff.c:5404
3400 +#: diff.c:5446
3401 msgid "generate diffstat with a given graph width"
3402 msgstr ""
3403
3320 -#: diff.c:5406
3404 +#: diff.c:5448
3405 msgid "<count>"
3406 msgstr ""
3407
3324 -#: diff.c:5407
3408 +#: diff.c:5449
3409 msgid "generate diffstat with limited lines"
3410 msgstr ""
3411
3328 -#: diff.c:5410
3412 +#: diff.c:5452
3413 msgid "generate compact summary in diffstat"
3414 msgstr ""
3415
3332 -#: diff.c:5413
3416 +#: diff.c:5455
3417 msgid "output a binary diff that can be applied"
3418 msgstr ""
3419
3336 -#: diff.c:5416
3420 +#: diff.c:5458
3421 msgid "show full pre- and post-image object names on the \"index\" lines"
3422 msgstr ""
3423
3340 -#: diff.c:5418
3424 +#: diff.c:5460
3425 msgid "show colored diff"
3426 msgstr ""
3427
3344 -#: diff.c:5419
3428 +#: diff.c:5461
3429 msgid "<kind>"
3430 msgstr ""
3431
3348 -#: diff.c:5420
3432 +#: diff.c:5462
3433 msgid ""
3434 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3435 "diff"
3436 msgstr ""
3437
3354 -#: diff.c:5423
3438 +#: diff.c:5465
3439 msgid ""
3440 "do not munge pathnames and use NULs as output field terminators in --raw or "
3441 "--numstat"
3442 msgstr ""
3443
3360 -#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
3444 +#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
3445 msgid "<prefix>"
3446 msgstr ""
3447
3364 -#: diff.c:5427
3448 +#: diff.c:5469
3449 msgid "show the given source prefix instead of \"a/\""
3450 msgstr ""
3451
3368 -#: diff.c:5430
3452 +#: diff.c:5472
3453 msgid "show the given destination prefix instead of \"b/\""
3454 msgstr ""
3455
3372 -#: diff.c:5433
3456 +#: diff.c:5475
3457 msgid "prepend an additional prefix to every line of output"
3458 msgstr ""
3459
3376 -#: diff.c:5436
3460 +#: diff.c:5478
3461 msgid "do not show any source or destination prefix"
3462 msgstr ""
3463
3380 -#: diff.c:5439
3464 +#: diff.c:5481
3465 msgid "show context between diff hunks up to the specified number of lines"
3466 msgstr ""
3467
3384 -#: diff.c:5443 diff.c:5448 diff.c:5453
3468 +#: diff.c:5485 diff.c:5490 diff.c:5495
3469 msgid "<char>"
3470 msgstr ""
3471
3388 -#: diff.c:5444
3472 +#: diff.c:5486
3473 msgid "specify the character to indicate a new line instead of '+'"
3474 msgstr ""
3475
3392 -#: diff.c:5449
3476 +#: diff.c:5491
3477 msgid "specify the character to indicate an old line instead of '-'"
3478 msgstr ""
3479
3396 -#: diff.c:5454
3480 +#: diff.c:5496
3481 msgid "specify the character to indicate a context instead of ' '"
3482 msgstr ""
3483
3400 -#: diff.c:5457
3484 +#: diff.c:5499
3485 msgid "Diff rename options"
3486 msgstr ""
3487
3404 -#: diff.c:5458
3488 +#: diff.c:5500
3489 msgid "<n>[/<m>]"
3490 msgstr ""
3491
3408 -#: diff.c:5459
3492 +#: diff.c:5501
3493 msgid "break complete rewrite changes into pairs of delete and create"
3494 msgstr ""
3495
3412 -#: diff.c:5463
3496 +#: diff.c:5505
3497 msgid "detect renames"
3498 msgstr ""
3499
3416 -#: diff.c:5467
3500 +#: diff.c:5509
3501 msgid "omit the preimage for deletes"
3502 msgstr ""
3503
3420 -#: diff.c:5470
3504 +#: diff.c:5512
3505 msgid "detect copies"
3506 msgstr ""
3507
3424 -#: diff.c:5474
3508 +#: diff.c:5516
3509 msgid "use unmodified files as source to find copies"
3510 msgstr ""
3511
3428 -#: diff.c:5476
3512 +#: diff.c:5518
3513 msgid "disable rename detection"
3514 msgstr ""
3515
3432 -#: diff.c:5479
3516 +#: diff.c:5521
3517 msgid "use empty blobs as rename source"
3518 msgstr ""
3519
3436 -#: diff.c:5481
3520 +#: diff.c:5523
3521 msgid "continue listing the history of a file beyond renames"
3522 msgstr ""
3523
3440 -#: diff.c:5484
3524 +#: diff.c:5526
3525 msgid ""
3526 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3527 "given limit"
3528 msgstr ""
3529
3446 -#: diff.c:5486
3530 +#: diff.c:5528
3531 msgid "Diff algorithm options"
3532 msgstr ""
3533
3450 -#: diff.c:5488
3534 +#: diff.c:5530
3535 msgid "produce the smallest possible diff"
3536 msgstr ""
3537
3454 -#: diff.c:5491
3538 +#: diff.c:5533
3539 msgid "ignore whitespace when comparing lines"
3540 msgstr ""
3541
3458 -#: diff.c:5494
3542 +#: diff.c:5536
3543 msgid "ignore changes in amount of whitespace"
3544 msgstr ""
3545
3462 -#: diff.c:5497
3546 +#: diff.c:5539
3547 msgid "ignore changes in whitespace at EOL"
3548 msgstr ""
3549
3466 -#: diff.c:5500
3550 +#: diff.c:5542
3551 msgid "ignore carrier-return at the end of line"
3552 msgstr ""
3553
3470 -#: diff.c:5503
3554 +#: diff.c:5545
3555 msgid "ignore changes whose lines are all blank"
3556 msgstr ""
3557
3474 -#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
3558 +#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
3559 msgid "<regex>"
3560 msgstr ""
3561
3478 -#: diff.c:5506
3562 +#: diff.c:5548
3563 msgid "ignore changes whose all lines match <regex>"
3564 msgstr ""
3565
3482 -#: diff.c:5509
3566 +#: diff.c:5551
3567 msgid "heuristic to shift diff hunk boundaries for easy reading"
3568 msgstr ""
3569
3486 -#: diff.c:5512
3570 +#: diff.c:5554
3571 msgid "generate diff using the \"patience diff\" algorithm"
3572 msgstr ""
3573
3490 -#: diff.c:5516
3574 +#: diff.c:5558
3575 msgid "generate diff using the \"histogram diff\" algorithm"
3576 msgstr ""
3577
3494 -#: diff.c:5518
3578 +#: diff.c:5560
3579 msgid "<algorithm>"
3580 msgstr ""
3581
3498 -#: diff.c:5519
3582 +#: diff.c:5561
3583 msgid "choose a diff algorithm"
3584 msgstr ""
3585
3502 -#: diff.c:5521
3586 +#: diff.c:5563
3587 msgid "<text>"
3588 msgstr ""
3589
3506 -#: diff.c:5522
3590 +#: diff.c:5564
3591 msgid "generate diff using the \"anchored diff\" algorithm"
3592 msgstr ""
3593
3510 -#: diff.c:5524 diff.c:5533 diff.c:5536
3594 +#: diff.c:5566 diff.c:5575 diff.c:5578
3595 msgid "<mode>"
3596 msgstr ""
3597
3514 -#: diff.c:5525
3598 +#: diff.c:5567
3599 msgid "show word diff, using <mode> to delimit changed words"
3600 msgstr ""
3601
3518 -#: diff.c:5528
3602 +#: diff.c:5570
3603 msgid "use <regex> to decide what a word is"
3604 msgstr ""
3605
3522 -#: diff.c:5531
3606 +#: diff.c:5573
3607 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3608 msgstr ""
3609
3526 -#: diff.c:5534
3610 +#: diff.c:5576
3611 msgid "moved lines of code are colored differently"
3612 msgstr ""
3613
3530 -#: diff.c:5537
3614 +#: diff.c:5579
3615 msgid "how white spaces are ignored in --color-moved"
3616 msgstr ""
3617
3534 -#: diff.c:5540
3618 +#: diff.c:5582
3619 msgid "Other diff options"
3620 msgstr ""
3621
3538 -#: diff.c:5542
3622 +#: diff.c:5584
3623 msgid "when run from subdir, exclude changes outside and show relative paths"
3624 msgstr ""
3625
3542 -#: diff.c:5546
3626 +#: diff.c:5588
3627 msgid "treat all files as text"
3628 msgstr ""
3629
3546 -#: diff.c:5548
3630 +#: diff.c:5590
3631 msgid "swap two inputs, reverse the diff"
3632 msgstr ""
3633
3550 -#: diff.c:5550
3634 +#: diff.c:5592
3635 msgid "exit with 1 if there were differences, 0 otherwise"
3636 msgstr ""
3637
3554 -#: diff.c:5552
3638 +#: diff.c:5594
3639 msgid "disable all output of the program"
3640 msgstr ""
3641
3558 -#: diff.c:5554
3642 +#: diff.c:5596
3643 msgid "allow an external diff helper to be executed"
3644 msgstr ""
3645
3562 -#: diff.c:5556
3646 +#: diff.c:5598
3647 msgid "run external text conversion filters when comparing binary files"
3648 msgstr ""
3649
3566 -#: diff.c:5558
3650 +#: diff.c:5600
3651 msgid "<when>"
3652 msgstr ""
3653
3570 -#: diff.c:5559
3654 +#: diff.c:5601
3655 msgid "ignore changes to submodules in the diff generation"
3656 msgstr ""
3657
3574 -#: diff.c:5562
3658 +#: diff.c:5604
3659 msgid "<format>"
3660 msgstr ""
3661
3578 -#: diff.c:5563
3662 +#: diff.c:5605
3663 msgid "specify how differences in submodules are shown"
3664 msgstr ""
3665
3582 -#: diff.c:5567
3666 +#: diff.c:5609
3667 msgid "hide 'git add -N' entries from the index"
3668 msgstr ""
3669
3586 -#: diff.c:5570
3670 +#: diff.c:5612
3671 msgid "treat 'git add -N' entries as real in the index"
3672 msgstr ""
3673
3590 -#: diff.c:5572
3674 +#: diff.c:5614
3675 msgid "<string>"
3676 msgstr ""
3677
3594 -#: diff.c:5573
3678 +#: diff.c:5615
3679 msgid ""
3680 "look for differences that change the number of occurrences of the specified "
3681 "string"
3682 msgstr ""
3683
3600 -#: diff.c:5576
3684 +#: diff.c:5618
3685 msgid ""
3686 "look for differences that change the number of occurrences of the specified "
3687 "regex"
3688 msgstr ""
3689
3606 -#: diff.c:5579
3690 +#: diff.c:5621
3691 msgid "show all changes in the changeset with -S or -G"
3692 msgstr ""
3693
3610 -#: diff.c:5582
3694 +#: diff.c:5624
3695 msgid "treat <string> in -S as extended POSIX regular expression"
3696 msgstr ""
3697
3614 -#: diff.c:5585
3698 +#: diff.c:5627
3699 msgid "control the order in which files appear in the output"
3700 msgstr ""
3701
3618 -#: diff.c:5586 diff.c:5589
3702 +#: diff.c:5628 diff.c:5631
3703 msgid "<path>"
3704 msgstr ""
3705
3622 -#: diff.c:5587
3706 +#: diff.c:5629
3707 msgid "show the change in the specified path first"
3708 msgstr ""
3709
3626 -#: diff.c:5590
3710 +#: diff.c:5632
3711 msgid "skip the output to the specified path"
3712 msgstr ""
3713
3630 -#: diff.c:5592
3714 +#: diff.c:5634
3715 msgid "<object-id>"
3716 msgstr ""
3717
3634 -#: diff.c:5593
3718 +#: diff.c:5635
3719 msgid ""
3720 "look for differences that change the number of occurrences of the specified "
3721 "object"
3722 msgstr ""
3723
3640 -#: diff.c:5595
3724 +#: diff.c:5637
3725 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3726 msgstr ""
3727
3644 -#: diff.c:5596
3728 +#: diff.c:5638
3729 msgid "select files by diff type"
3730 msgstr ""
3731
3648 -#: diff.c:5598
3732 +#: diff.c:5640
3733 msgid "<file>"
3734 msgstr ""
3735
3652 -#: diff.c:5599
3653 -msgid "Output to a specific file"
3736 +#: diff.c:5641
3737 +msgid "output to a specific file"
3738 msgstr ""
3739
3656 -#: diff.c:6257
3740 +#: diff.c:6321
3741 msgid "exhaustive rename detection was skipped due to too many files."
3742 msgstr ""
3743
3660 -#: diff.c:6260
3744 +#: diff.c:6324
3745 msgid "only found copies from modified paths due to too many files."
3746 msgstr ""
3747
3664 -#: diff.c:6263
3748 +#: diff.c:6327
3749 #, c-format
3750 msgid ""
3751 "you may want to set your %s variable to at least %d and retry the command."
@@ -3710,36 +3794,36 @@ msgstr ""
3794 msgid "cannot use %s as an exclude file"
3795 msgstr ""
3796
3713 -#: dir.c:2418
3797 +#: dir.c:2419
3798 #, c-format
3799 msgid "could not open directory '%s'"
3800 msgstr ""
3801
3718 -#: dir.c:2720
3802 +#: dir.c:2721
3803 msgid "failed to get kernel name and information"
3804 msgstr ""
3805
3722 -#: dir.c:2844
3806 +#: dir.c:2846
3807 msgid "untracked cache is disabled on this system or location"
3808 msgstr ""
3809
3726 -#: dir.c:3112
3810 +#: dir.c:3119
3811 msgid ""
3812 "No directory name could be guessed.\n"
3813 "Please specify a directory on the command line"
3814 msgstr ""
3815
3732 -#: dir.c:3800
3816 +#: dir.c:3807
3817 #, c-format
3818 msgid "index file corrupt in repo %s"
3819 msgstr ""
3820
3737 -#: dir.c:3847 dir.c:3852
3821 +#: dir.c:3854 dir.c:3859
3822 #, c-format
3823 msgid "could not create directories for %s"
3824 msgstr ""
3825
3742 -#: dir.c:3881
3826 +#: dir.c:3888
3827 #, c-format
3828 msgid "could not migrate git directory from '%s' to '%s'"
3829 msgstr ""
@@ -3758,7 +3842,7 @@ msgstr ""
3842 msgid "could not stat file '%s'"
3843 msgstr ""
3844
3761 -#: environment.c:145
3845 +#: environment.c:147
3846 #, c-format
3847 msgid "bad git namespace path \"%s\""
3848 msgstr ""
@@ -3789,313 +3873,340 @@ msgstr ""
3873 msgid "unable to write to remote"
3874 msgstr ""
3875
3792 -#: fetch-pack.c:395 fetch-pack.c:1439
3876 +#: fetch-pack.c:397 fetch-pack.c:1460
3877 #, c-format
3878 msgid "invalid shallow line: %s"
3879 msgstr ""
3880
3797 -#: fetch-pack.c:401 fetch-pack.c:1445
3881 +#: fetch-pack.c:403 fetch-pack.c:1466
3882 #, c-format
3883 msgid "invalid unshallow line: %s"
3884 msgstr ""
3885
3802 -#: fetch-pack.c:403 fetch-pack.c:1447
3886 +#: fetch-pack.c:405 fetch-pack.c:1468
3887 #, c-format
3888 msgid "object not found: %s"
3889 msgstr ""
3890
3807 -#: fetch-pack.c:406 fetch-pack.c:1450
3891 +#: fetch-pack.c:408 fetch-pack.c:1471
3892 #, c-format
3893 msgid "error in object: %s"
3894 msgstr ""
3895
3812 -#: fetch-pack.c:408 fetch-pack.c:1452
3896 +#: fetch-pack.c:410 fetch-pack.c:1473
3897 #, c-format
3898 msgid "no shallow found: %s"
3899 msgstr ""
3900
3817 -#: fetch-pack.c:411 fetch-pack.c:1456
3901 +#: fetch-pack.c:413 fetch-pack.c:1477
3902 #, c-format
3903 msgid "expected shallow/unshallow, got %s"
3904 msgstr ""
3905
3822 -#: fetch-pack.c:451
3906 +#: fetch-pack.c:453
3907 #, c-format
3908 msgid "got %s %d %s"
3909 msgstr ""
3910
3827 -#: fetch-pack.c:468
3911 +#: fetch-pack.c:470
3912 #, c-format
3913 msgid "invalid commit %s"
3914 msgstr ""
3915
3832 -#: fetch-pack.c:499
3916 +#: fetch-pack.c:501
3917 msgid "giving up"
3918 msgstr ""
3919
3836 -#: fetch-pack.c:512 progress.c:339
3920 +#: fetch-pack.c:514 progress.h:25
3921 msgid "done"
3922 msgstr ""
3923
3840 -#: fetch-pack.c:524
3924 +#: fetch-pack.c:526
3925 #, c-format
3926 msgid "got %s (%d) %s"
3927 msgstr ""
3928
3845 -#: fetch-pack.c:560
3929 +#: fetch-pack.c:562
3930 #, c-format
3931 msgid "Marking %s as complete"
3932 msgstr ""
3933
3850 -#: fetch-pack.c:775
3934 +#: fetch-pack.c:784
3935 #, c-format
3936 msgid "already have %s (%s)"
3937 msgstr ""
3938
3855 -#: fetch-pack.c:861
3939 +#: fetch-pack.c:870
3940 msgid "fetch-pack: unable to fork off sideband demultiplexer"
3941 msgstr ""
3942
3859 -#: fetch-pack.c:869
3943 +#: fetch-pack.c:878
3944 msgid "protocol error: bad pack header"
3945 msgstr ""
3946
3863 -#: fetch-pack.c:965
3947 +#: fetch-pack.c:974
3948 #, c-format
3949 msgid "fetch-pack: unable to fork off %s"
3950 msgstr ""
3951
3868 -#: fetch-pack.c:971
3952 +#: fetch-pack.c:980
3953 msgid "fetch-pack: invalid index-pack output"
3954 msgstr ""
3955
3872 -#: fetch-pack.c:988
3956 +#: fetch-pack.c:997
3957 #, c-format
3958 msgid "%s failed"
3959 msgstr ""
3960
3877 -#: fetch-pack.c:990
3961 +#: fetch-pack.c:999
3962 msgid "error in sideband demultiplexer"
3963 msgstr ""
3964
3881 -#: fetch-pack.c:1035
3965 +#: fetch-pack.c:1048
3966 #, c-format
3967 msgid "Server version is %.*s"
3968 msgstr ""
3969
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
3970 +#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
3971 +#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
3972 +#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
3973 +#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
3974 #, c-format
3975 msgid "Server supports %s"
3976 msgstr ""
3977
3894 -#: fetch-pack.c:1045
3978 +#: fetch-pack.c:1058
3979 msgid "Server does not support shallow clients"
3980 msgstr ""
3981
3898 -#: fetch-pack.c:1105
3982 +#: fetch-pack.c:1118
3983 msgid "Server does not support --shallow-since"
3984 msgstr ""
3985
3902 -#: fetch-pack.c:1110
3986 +#: fetch-pack.c:1123
3987 msgid "Server does not support --shallow-exclude"
3988 msgstr ""
3989
3906 -#: fetch-pack.c:1114
3990 +#: fetch-pack.c:1127
3991 msgid "Server does not support --deepen"
3992 msgstr ""
3993
3910 -#: fetch-pack.c:1116
3994 +#: fetch-pack.c:1129
3995 msgid "Server does not support this repository's object format"
3996 msgstr ""
3997
3914 -#: fetch-pack.c:1129
3998 +#: fetch-pack.c:1142
3999 msgid "no common commits"
4000 msgstr ""
4001
3918 -#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
4002 +#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
4003 msgid "source repository is shallow, reject to clone."
4004 msgstr ""
4005
3922 -#: fetch-pack.c:1144 fetch-pack.c:1681
4006 +#: fetch-pack.c:1157 fetch-pack.c:1705
4007 msgid "git fetch-pack: fetch failed."
4008 msgstr ""
4009
3926 -#: fetch-pack.c:1258
4010 +#: fetch-pack.c:1271
4011 #, c-format
4012 msgid "mismatched algorithms: client %s; server %s"
4013 msgstr ""
4014
3931 -#: fetch-pack.c:1262
4015 +#: fetch-pack.c:1275
4016 #, c-format
4017 msgid "the server does not support algorithm '%s'"
4018 msgstr ""
4019
3936 -#: fetch-pack.c:1295
4020 +#: fetch-pack.c:1308
4021 msgid "Server does not support shallow requests"
4022 msgstr ""
4023
3940 -#: fetch-pack.c:1302
4024 +#: fetch-pack.c:1315
4025 msgid "Server supports filter"
4026 msgstr ""
4027
3944 -#: fetch-pack.c:1345 fetch-pack.c:2063
4028 +#: fetch-pack.c:1358 fetch-pack.c:2087
4029 msgid "unable to write request to remote"
4030 msgstr ""
4031
3948 -#: fetch-pack.c:1363
4032 +#: fetch-pack.c:1376
4033 #, c-format
4034 msgid "error reading section header '%s'"
4035 msgstr ""
4036
3953 -#: fetch-pack.c:1369
4037 +#: fetch-pack.c:1382
4038 #, c-format
4039 msgid "expected '%s', received '%s'"
4040 msgstr ""
4041
3958 -#: fetch-pack.c:1403
4042 +#: fetch-pack.c:1416
4043 #, c-format
4044 msgid "unexpected acknowledgment line: '%s'"
4045 msgstr ""
4046
3963 -#: fetch-pack.c:1408
4047 +#: fetch-pack.c:1421
4048 #, c-format
4049 msgid "error processing acks: %d"
4050 msgstr ""
4051
3968 -#: fetch-pack.c:1418
3969 -msgid "expected packfile to be sent after 'ready'"
4052 +#. TRANSLATORS: The parameter will be 'ready', a protocol
4053 +#. keyword.
4054 +#.
4055 +#: fetch-pack.c:1435
4056 +#, c-format
4057 +msgid "expected packfile to be sent after '%s'"
4058 msgstr ""
4059
3972 -#: fetch-pack.c:1420
3973 -msgid "expected no other sections to be sent after no 'ready'"
4060 +#. TRANSLATORS: The parameter will be 'ready', a protocol
4061 +#. keyword.
4062 +#.
4063 +#: fetch-pack.c:1441
4064 +#, c-format
4065 +msgid "expected no other sections to be sent after no '%s'"
4066 msgstr ""
4067
3976 -#: fetch-pack.c:1461
4068 +#: fetch-pack.c:1482
4069 #, c-format
4070 msgid "error processing shallow info: %d"
4071 msgstr ""
4072
3981 -#: fetch-pack.c:1510
4073 +#: fetch-pack.c:1531
4074 #, c-format
4075 msgid "expected wanted-ref, got '%s'"
4076 msgstr ""
4077
3986 -#: fetch-pack.c:1515
4078 +#: fetch-pack.c:1536
4079 #, c-format
4080 msgid "unexpected wanted-ref: '%s'"
4081 msgstr ""
4082
3991 -#: fetch-pack.c:1520
4083 +#: fetch-pack.c:1541
4084 #, c-format
4085 msgid "error processing wanted refs: %d"
4086 msgstr ""
4087
3996 -#: fetch-pack.c:1550
4088 +#: fetch-pack.c:1571
4089 msgid "git fetch-pack: expected response end packet"
4090 msgstr ""
4091
4000 -#: fetch-pack.c:1959
4092 +#: fetch-pack.c:1983
4093 msgid "no matching remote head"
4094 msgstr ""
4095
4004 -#: fetch-pack.c:1982 builtin/clone.c:581
4096 +#: fetch-pack.c:2006 builtin/clone.c:587
4097 msgid "remote did not send all necessary objects"
4098 msgstr ""
4099
4008 -#: fetch-pack.c:2085
4100 +#: fetch-pack.c:2109
4101 msgid "unexpected 'ready' from remote"
4102 msgstr ""
4103
4012 -#: fetch-pack.c:2108
4104 +#: fetch-pack.c:2132
4105 #, c-format
4106 msgid "no such remote ref %s"
4107 msgstr ""
4108
4017 -#: fetch-pack.c:2111
4109 +#: fetch-pack.c:2135
4110 #, c-format
4111 msgid "Server does not allow request for unadvertised object %s"
4112 msgstr ""
4113
4022 -#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
4023 -#: gpg-interface.c:990
4114 +#: fsmonitor-ipc.c:119
4115 +#, c-format
4116 +msgid "fsmonitor_ipc__send_query: invalid path '%s'"
4117 +msgstr ""
4118 +
4119 +#: fsmonitor-ipc.c:125
4120 +#, c-format
4121 +msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
4122 +msgstr ""
4123 +
4124 +#: fsmonitor-ipc.c:155
4125 +msgid "fsmonitor--daemon is not running"
4126 +msgstr ""
4127 +
4128 +#: fsmonitor-ipc.c:164
4129 +#, c-format
4130 +msgid "could not send '%s' command to fsmonitor--daemon"
4131 +msgstr ""
4132 +
4133 +#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
4134 +#: gpg-interface.c:1011
4135 msgid "could not create temporary file"
4136 msgstr ""
4137
4027 -#: gpg-interface.c:332 gpg-interface.c:460
4138 +#: gpg-interface.c:332 gpg-interface.c:459
4139 #, c-format
4140 msgid "failed writing detached signature to '%s'"
4141 msgstr ""
4142
4032 -#: gpg-interface.c:451
4143 +#: gpg-interface.c:450
4144 msgid ""
4145 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
4146 "signature verification"
4147 msgstr ""
4148
4038 -#: gpg-interface.c:480
4149 +#: gpg-interface.c:479
4150 msgid ""
4151 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
4152 "verification (available in openssh version 8.2p1+)"
4153 msgstr ""
4154
4044 -#: gpg-interface.c:536
4155 +#: gpg-interface.c:550
4156 #, c-format
4157 msgid "ssh signing revocation file configured but not found: %s"
4158 msgstr ""
4159
4049 -#: gpg-interface.c:624
4160 +#: gpg-interface.c:638
4161 #, c-format
4162 msgid "bad/incompatible signature '%s'"
4163 msgstr ""
4164
4054 -#: gpg-interface.c:801 gpg-interface.c:806
4165 +#: gpg-interface.c:815 gpg-interface.c:820
4166 #, c-format
4167 msgid "failed to get the ssh fingerprint for key '%s'"
4168 msgstr ""
4169
4059 -#: gpg-interface.c:829
4170 +#: gpg-interface.c:843
4171 msgid ""
4172 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
4173 msgstr ""
4174
4064 -#: gpg-interface.c:851
4175 +#: gpg-interface.c:865
4176 #, c-format
4177 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
4178 msgstr ""
4179
4069 -#: gpg-interface.c:857
4180 +#: gpg-interface.c:871
4181 #, c-format
4182 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
4183 msgstr ""
4184
4074 -#: gpg-interface.c:945
4185 +#: gpg-interface.c:966
4186 msgid "gpg failed to sign the data"
4187 msgstr ""
4188
4078 -#: gpg-interface.c:967
4189 +#: gpg-interface.c:988
4190 msgid "user.signingkey needs to be set for ssh signing"
4191 msgstr ""
4192
4082 -#: gpg-interface.c:978
4193 +#: gpg-interface.c:999
4194 #, c-format
4195 msgid "failed writing ssh signing key to '%s'"
4196 msgstr ""
4197
4087 -#: gpg-interface.c:996
4198 +#: gpg-interface.c:1017
4199 #, c-format
4200 msgid "failed writing ssh signing key buffer to '%s'"
4201 msgstr ""
4202
4092 -#: gpg-interface.c:1014
4203 +#: gpg-interface.c:1035
4204 msgid ""
4205 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
4206 "8.2p1+)"
4207 msgstr ""
4208
4098 -#: gpg-interface.c:1026
4209 +#: gpg-interface.c:1047
4210 #, c-format
4211 msgid "failed reading ssh signing data buffer from '%s'"
4212 msgstr ""
@@ -4105,151 +4216,151 @@ msgstr ""
4216 msgid "ignored invalid color '%.*s' in log.graphColors"
4217 msgstr ""
4218
4108 -#: grep.c:531
4219 +#: grep.c:446
4220 msgid ""
4221 "given pattern contains NULL byte (via -f <file>). This is only supported "
4222 "with -P under PCRE v2"
4223 msgstr ""
4224
4114 -#: grep.c:1942
4225 +#: grep.c:1859
4226 #, c-format
4227 msgid "'%s': unable to read %s"
4228 msgstr ""
4229
4119 -#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
4230 +#: grep.c:1876 setup.c:177 builtin/clone.c:308 builtin/diff.c:90
4231 #: builtin/rm.c:136
4232 #, c-format
4233 msgid "failed to stat '%s'"
4234 msgstr ""
4235
4125 -#: grep.c:1970
4236 +#: grep.c:1887
4237 #, c-format
4238 msgid "'%s': short read"
4239 msgstr ""
4240
4130 -#: help.c:24
4241 +#: help.c:25
4242 msgid "start a working area (see also: git help tutorial)"
4243 msgstr ""
4244
4134 -#: help.c:25
4245 +#: help.c:26
4246 msgid "work on the current change (see also: git help everyday)"
4247 msgstr ""
4248
4138 -#: help.c:26
4249 +#: help.c:27
4250 msgid "examine the history and state (see also: git help revisions)"
4251 msgstr ""
4252
4142 -#: help.c:27
4253 +#: help.c:28
4254 msgid "grow, mark and tweak your common history"
4255 msgstr ""
4256
4146 -#: help.c:28
4257 +#: help.c:29
4258 msgid "collaborate (see also: git help workflows)"
4259 msgstr ""
4260
4150 -#: help.c:32
4261 +#: help.c:33
4262 msgid "Main Porcelain Commands"
4263 msgstr ""
4264
4154 -#: help.c:33
4265 +#: help.c:34
4266 msgid "Ancillary Commands / Manipulators"
4267 msgstr ""
4268
4158 -#: help.c:34
4269 +#: help.c:35
4270 msgid "Ancillary Commands / Interrogators"
4271 msgstr ""
4272
4162 -#: help.c:35
4273 +#: help.c:36
4274 msgid "Interacting with Others"
4275 msgstr ""
4276
4166 -#: help.c:36
4277 +#: help.c:37
4278 msgid "Low-level Commands / Manipulators"
4279 msgstr ""
4280
4170 -#: help.c:37
4281 +#: help.c:38
4282 msgid "Low-level Commands / Interrogators"
4283 msgstr ""
4284
4174 -#: help.c:38
4285 +#: help.c:39
4286 msgid "Low-level Commands / Syncing Repositories"
4287 msgstr ""
4288
4178 -#: help.c:39
4289 +#: help.c:40
4290 msgid "Low-level Commands / Internal Helpers"
4291 msgstr ""
4292
4182 -#: help.c:313
4293 +#: help.c:316
4294 #, c-format
4295 msgid "available git commands in '%s'"
4296 msgstr ""
4297
4187 -#: help.c:320
4298 +#: help.c:323
4299 msgid "git commands available from elsewhere on your $PATH"
4300 msgstr ""
4301
4191 -#: help.c:329
4302 +#: help.c:332
4303 msgid "These are common Git commands used in various situations:"
4304 msgstr ""
4305
4195 -#: help.c:378 git.c:100
4306 +#: help.c:382 git.c:100
4307 #, c-format
4308 msgid "unsupported command listing type '%s'"
4309 msgstr ""
4310
4200 -#: help.c:418
4311 +#: help.c:422
4312 msgid "The Git concept guides are:"
4313 msgstr ""
4314
4204 -#: help.c:442
4205 -msgid "See 'git help <command>' to read about a specific subcommand"
4206 -msgstr ""
4207 -
4208 -#: help.c:447
4315 +#: help.c:446
4316 msgid "External commands"
4317 msgstr ""
4318
4212 -#: help.c:462
4319 +#: help.c:468
4320 msgid "Command aliases"
4321 msgstr ""
4322
4216 -#: help.c:543
4323 +#: help.c:486
4324 +msgid "See 'git help <command>' to read about a specific subcommand"
4325 +msgstr ""
4326 +
4327 +#: help.c:563
4328 #, c-format
4329 msgid ""
4330 "'%s' appears to be a git command, but we were not\n"
4331 "able to execute it. Maybe git-%s is broken?"
4332 msgstr ""
4333
4223 -#: help.c:565 help.c:662
4334 +#: help.c:585 help.c:682
4335 #, c-format
4336 msgid "git: '%s' is not a git command. See 'git --help'."
4337 msgstr ""
4338
4228 -#: help.c:613
4339 +#: help.c:633
4340 msgid "Uh oh. Your system reports no Git commands at all."
4341 msgstr ""
4342
4232 -#: help.c:635
4343 +#: help.c:655
4344 #, c-format
4345 msgid "WARNING: You called a Git command named '%s', which does not exist."
4346 msgstr ""
4347
4237 -#: help.c:640
4348 +#: help.c:660
4349 #, c-format
4350 msgid "Continuing under the assumption that you meant '%s'."
4351 msgstr ""
4352
4242 -#: help.c:646
4353 +#: help.c:666
4354 #, c-format
4355 msgid "Run '%s' instead [y/N]? "
4356 msgstr ""
4357
4247 -#: help.c:654
4358 +#: help.c:674
4359 #, c-format
4360 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4361 msgstr ""
4362
4252 -#: help.c:666
4363 +#: help.c:686
4364 msgid ""
4365 "\n"
4366 "The most similar command is"
@@ -4259,16 +4370,16 @@ msgid_plural ""
4370 msgstr[0] ""
4371 msgstr[1] ""
4372
4262 -#: help.c:706
4373 +#: help.c:729
4374 msgid "git version [<options>]"
4375 msgstr ""
4376
4266 -#: help.c:761
4377 +#: help.c:784
4378 #, c-format
4379 msgid "%s: %s - %s"
4380 msgstr ""
4381
4271 -#: help.c:765
4382 +#: help.c:788
4383 msgid ""
4384 "\n"
4385 "Did you mean this?"
@@ -4278,22 +4389,27 @@ msgid_plural ""
4389 msgstr[0] ""
4390 msgstr[1] ""
4391
4281 -#: hook.c:27
4392 +#: hook.c:28
4393 #, c-format
4394 msgid ""
4395 "The '%s' hook was ignored because it's not set as executable.\n"
4396 "You can disable this warning with `git config advice.ignoredHook false`."
4397 msgstr ""
4398
4288 -#: ident.c:353
4399 +#: hook.c:87
4400 +#, c-format
4401 +msgid "Couldn't start hook '%s'\n"
4402 +msgstr ""
4403 +
4404 +#: ident.c:354
4405 msgid "Author identity unknown\n"
4406 msgstr ""
4407
4292 -#: ident.c:356
4408 +#: ident.c:357
4409 msgid "Committer identity unknown\n"
4410 msgstr ""
4411
4296 -#: ident.c:362
4412 +#: ident.c:363
4413 msgid ""
4414 "\n"
4415 "*** Please tell me who you are.\n"
@@ -4308,71 +4424,71 @@ msgid ""
4424 "\n"
4425 msgstr ""
4426
4311 -#: ident.c:397
4427 +#: ident.c:398
4428 msgid "no email was given and auto-detection is disabled"
4429 msgstr ""
4430
4315 -#: ident.c:402
4431 +#: ident.c:403
4432 #, c-format
4433 msgid "unable to auto-detect email address (got '%s')"
4434 msgstr ""
4435
4320 -#: ident.c:419
4436 +#: ident.c:420
4437 msgid "no name was given and auto-detection is disabled"
4438 msgstr ""
4439
4324 -#: ident.c:425
4440 +#: ident.c:426
4441 #, c-format
4442 msgid "unable to auto-detect name (got '%s')"
4443 msgstr ""
4444
4329 -#: ident.c:433
4445 +#: ident.c:434
4446 #, c-format
4447 msgid "empty ident name (for <%s>) not allowed"
4448 msgstr ""
4449
4334 -#: ident.c:439
4450 +#: ident.c:440
4451 #, c-format
4452 msgid "name consists only of disallowed characters: %s"
4453 msgstr ""
4454
4339 -#: ident.c:454 builtin/commit.c:648
4455 +#: ident.c:455 builtin/commit.c:649
4456 #, c-format
4457 msgid "invalid date format: %s"
4458 msgstr ""
4459
4344 -#: list-objects-filter-options.c:83
4460 +#: list-objects-filter-options.c:68
4461 msgid "expected 'tree:<depth>'"
4462 msgstr ""
4463
4348 -#: list-objects-filter-options.c:98
4464 +#: list-objects-filter-options.c:83
4465 msgid "sparse:path filters support has been dropped"
4466 msgstr ""
4467
4352 -#: list-objects-filter-options.c:105
4468 +#: list-objects-filter-options.c:90
4469 #, c-format
4470 msgid "'%s' for 'object:type=<type>' is not a valid object type"
4471 msgstr ""
4472
4357 -#: list-objects-filter-options.c:124
4473 +#: list-objects-filter-options.c:109
4474 #, c-format
4475 msgid "invalid filter-spec '%s'"
4476 msgstr ""
4477
4362 -#: list-objects-filter-options.c:140
4478 +#: list-objects-filter-options.c:125
4479 #, c-format
4480 msgid "must escape char in sub-filter-spec: '%c'"
4481 msgstr ""
4482
4367 -#: list-objects-filter-options.c:182
4483 +#: list-objects-filter-options.c:167
4484 msgid "expected something after combine:"
4485 msgstr ""
4486
4371 -#: list-objects-filter-options.c:264
4487 +#: list-objects-filter-options.c:249
4488 msgid "multiple filter-specs cannot be combined"
4489 msgstr ""
4490
4375 -#: list-objects-filter-options.c:376
4491 +#: list-objects-filter-options.c:365
4492 msgid "unable to upgrade repository format to support partial clone"
4493 msgstr ""
4494
@@ -4386,17 +4502,17 @@ msgstr ""
4502 msgid "unable to parse sparse filter data in %s"
4503 msgstr ""
4504
4389 -#: list-objects.c:127
4505 +#: list-objects.c:144
4506 #, c-format
4507 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4508 msgstr ""
4509
4394 -#: list-objects.c:140
4510 +#: list-objects.c:157
4511 #, c-format
4512 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4513 msgstr ""
4514
4399 -#: list-objects.c:398
4515 +#: list-objects.c:415
4516 #, c-format
4517 msgid "unable to load root tree for commit %s"
4518 msgstr ""
@@ -4418,17 +4534,12 @@ msgstr ""
4534 msgid "Unable to create '%s.lock': %s"
4535 msgstr ""
4536
4421 -#: ls-refs.c:37
4422 -#, c-format
4423 -msgid "invalid value '%s' for lsrefs.unborn"
4424 -msgstr ""
4425 -
4426 -#: ls-refs.c:174
4537 +#: ls-refs.c:175
4538 #, c-format
4539 msgid "unexpected line: '%s'"
4540 msgstr ""
4541
4431 -#: ls-refs.c:178
4542 +#: ls-refs.c:179
4543 msgid "expected flush after ls-refs arguments"
4544 msgstr ""
4545
@@ -4436,44 +4547,44 @@ msgstr ""
4547 msgid "quoted CRLF detected"
4548 msgstr ""
4549
4439 -#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
4550 +#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
4551 #, c-format
4552 msgid "bad action '%s' for '%s'"
4553 msgstr ""
4554
4444 -#: merge-ort.c:1584 merge-recursive.c:1211
4555 +#: merge-ort.c:1630 merge-recursive.c:1214
4556 #, c-format
4557 msgid "Failed to merge submodule %s (not checked out)"
4558 msgstr ""
4559
4449 -#: merge-ort.c:1593 merge-recursive.c:1218
4560 +#: merge-ort.c:1639 merge-recursive.c:1221
4561 #, c-format
4562 msgid "Failed to merge submodule %s (commits not present)"
4563 msgstr ""
4564
4454 -#: merge-ort.c:1602 merge-recursive.c:1225
4565 +#: merge-ort.c:1648 merge-recursive.c:1228
4566 #, c-format
4567 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4568 msgstr ""
4569
4459 -#: merge-ort.c:1612 merge-ort.c:1620
4570 +#: merge-ort.c:1658 merge-ort.c:1666
4571 #, c-format
4572 msgid "Note: Fast-forwarding submodule %s to %s"
4573 msgstr ""
4574
4464 -#: merge-ort.c:1642
4575 +#: merge-ort.c:1688
4576 #, c-format
4577 msgid "Failed to merge submodule %s"
4578 msgstr ""
4579
4469 -#: merge-ort.c:1649
4580 +#: merge-ort.c:1695
4581 #, c-format
4582 msgid ""
4583 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
4584 "%s\n"
4585 msgstr ""
4586
4476 -#: merge-ort.c:1653 merge-recursive.c:1281
4587 +#: merge-ort.c:1699 merge-recursive.c:1284
4588 #, c-format
4589 msgid ""
4590 "If this is correct simply add it to the index for example\n"
@@ -4484,42 +4595,42 @@ msgid ""
4595 "which will accept this suggestion.\n"
4596 msgstr ""
4597
4487 -#: merge-ort.c:1666
4598 +#: merge-ort.c:1712
4599 #, c-format
4600 msgid ""
4601 "Failed to merge submodule %s, but multiple possible merges exist:\n"
4602 "%s"
4603 msgstr ""
4604
4494 -#: merge-ort.c:1887 merge-recursive.c:1372
4605 +#: merge-ort.c:1937 merge-recursive.c:1375
4606 msgid "Failed to execute internal merge"
4607 msgstr ""
4608
4498 -#: merge-ort.c:1892 merge-recursive.c:1377
4609 +#: merge-ort.c:1942 merge-recursive.c:1380
4610 #, c-format
4611 msgid "Unable to add %s to database"
4612 msgstr ""
4613
4503 -#: merge-ort.c:1899 merge-recursive.c:1410
4614 +#: merge-ort.c:1949 merge-recursive.c:1413
4615 #, c-format
4616 msgid "Auto-merging %s"
4617 msgstr ""
4618
4508 -#: merge-ort.c:2038 merge-recursive.c:2132
4619 +#: merge-ort.c:2088 merge-recursive.c:2135
4620 #, c-format
4621 msgid ""
4622 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4623 "implicit directory rename(s) putting the following path(s) there: %s."
4624 msgstr ""
4625
4515 -#: merge-ort.c:2048 merge-recursive.c:2142
4626 +#: merge-ort.c:2098 merge-recursive.c:2145
4627 #, c-format
4628 msgid ""
4629 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4630 "implicit directory renames tried to put these paths there: %s"
4631 msgstr ""
4632
4522 -#: merge-ort.c:2106
4633 +#: merge-ort.c:2156
4634 #, c-format
4635 msgid ""
4636 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4527,47 +4638,47 @@ msgid ""
4638 "majority of the files."
4639 msgstr ""
4640
4530 -#: merge-ort.c:2260 merge-recursive.c:2478
4641 +#: merge-ort.c:2310 merge-recursive.c:2481
4642 #, c-format
4643 msgid ""
4644 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4645 "renamed."
4646 msgstr ""
4647
4537 -#: merge-ort.c:2400 merge-recursive.c:3261
4648 +#: merge-ort.c:2450 merge-recursive.c:3264
4649 #, c-format
4650 msgid ""
4651 "Path updated: %s added in %s inside a directory that was renamed in %s; "
4652 "moving it to %s."
4653 msgstr ""
4654
4544 -#: merge-ort.c:2407 merge-recursive.c:3268
4655 +#: merge-ort.c:2457 merge-recursive.c:3271
4656 #, c-format
4657 msgid ""
4658 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4659 "%s; moving it to %s."
4660 msgstr ""
4661
4551 -#: merge-ort.c:2420 merge-recursive.c:3264
4662 +#: merge-ort.c:2470 merge-recursive.c:3267
4663 #, c-format
4664 msgid ""
4665 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
4666 "in %s, suggesting it should perhaps be moved to %s."
4667 msgstr ""
4668
4558 -#: merge-ort.c:2428 merge-recursive.c:3271
4669 +#: merge-ort.c:2478 merge-recursive.c:3274
4670 #, c-format
4671 msgid ""
4672 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4673 "was renamed in %s, suggesting it should perhaps be moved to %s."
4674 msgstr ""
4675
4565 -#: merge-ort.c:2584
4676 +#: merge-ort.c:2634
4677 #, c-format
4678 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4679 msgstr ""
4680
4570 -#: merge-ort.c:2679
4681 +#: merge-ort.c:2729
4682 #, c-format
4683 msgid ""
4684 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4575,67 +4686,67 @@ msgid ""
4686 "markers."
4687 msgstr ""
4688
4578 -#: merge-ort.c:2698 merge-ort.c:2722
4689 +#: merge-ort.c:2748 merge-ort.c:2772
4690 #, c-format
4691 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4692 msgstr ""
4693
4583 -#: merge-ort.c:3212 merge-recursive.c:3022
4694 +#: merge-ort.c:3261 merge-recursive.c:3025
4695 #, c-format
4696 msgid "cannot read object %s"
4697 msgstr ""
4698
4588 -#: merge-ort.c:3215 merge-recursive.c:3025
4699 +#: merge-ort.c:3264 merge-recursive.c:3028
4700 #, c-format
4701 msgid "object %s is not a blob"
4702 msgstr ""
4703
4593 -#: merge-ort.c:3644
4704 +#: merge-ort.c:3693
4705 #, c-format
4706 msgid ""
4707 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4708 "%s instead."
4709 msgstr ""
4710
4600 -#: merge-ort.c:3721
4711 +#: merge-ort.c:3770
4712 #, c-format
4713 msgid ""
4714 "CONFLICT (distinct types): %s had different types on each side; renamed both "
4715 "of them so each can be recorded somewhere."
4716 msgstr ""
4717
4607 -#: merge-ort.c:3728
4718 +#: merge-ort.c:3777
4719 #, c-format
4720 msgid ""
4721 "CONFLICT (distinct types): %s had different types on each side; renamed one "
4722 "of them so each can be recorded somewhere."
4723 msgstr ""
4724
4614 -#: merge-ort.c:3819 merge-recursive.c:3101
4725 +#: merge-ort.c:3866 merge-recursive.c:3104
4726 msgid "content"
4727 msgstr ""
4728
4618 -#: merge-ort.c:3821 merge-recursive.c:3105
4729 +#: merge-ort.c:3868 merge-recursive.c:3108
4730 msgid "add/add"
4731 msgstr ""
4732
4622 -#: merge-ort.c:3823 merge-recursive.c:3150
4733 +#: merge-ort.c:3870 merge-recursive.c:3153
4734 msgid "submodule"
4735 msgstr ""
4736
4626 -#: merge-ort.c:3825 merge-recursive.c:3151
4737 +#: merge-ort.c:3872 merge-recursive.c:3154
4738 #, c-format
4739 msgid "CONFLICT (%s): Merge conflict in %s"
4740 msgstr ""
4741
4631 -#: merge-ort.c:3869
4742 +#: merge-ort.c:3916
4743 #, c-format
4744 msgid ""
4745 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
4746 "of %s left in tree."
4747 msgstr ""
4748
4638 -#: merge-ort.c:4165
4749 +#: merge-ort.c:4212
4750 #, c-format
4751 msgid ""
4752 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4645,19 +4756,19 @@ msgstr ""
4756 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4757 #. base, and 2-3) the trees for the two trees we're merging.
4758 #.
4648 -#: merge-ort.c:4534
4759 +#: merge-ort.c:4586
4760 #, c-format
4761 msgid "collecting merge info failed for trees %s, %s, %s"
4762 msgstr ""
4763
4653 -#: merge-ort-wrappers.c:13 merge-recursive.c:3716
4764 +#: merge-ort-wrappers.c:13 merge-recursive.c:3723
4765 #, c-format
4766 msgid ""
4767 "Your local changes to the following files would be overwritten by merge:\n"
4768 " %s"
4769 msgstr ""
4770
4660 -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
4771 +#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
4772 msgid "Already up to date."
4773 msgstr ""
4774
@@ -4694,7 +4805,7 @@ msgstr ""
4805 msgid "refusing to lose untracked file at '%s'"
4806 msgstr ""
4807
4697 -#: merge-recursive.c:956 builtin/cat-file.c:41
4808 +#: merge-recursive.c:956 builtin/cat-file.c:47
4809 #, c-format
4810 msgid "cannot read object %s '%s'"
4811 msgstr ""
@@ -4719,118 +4830,118 @@ msgstr ""
4830 msgid "do not know what to do with %06o %s '%s'"
4831 msgstr ""
4832
4722 -#: merge-recursive.c:1233 merge-recursive.c:1246
4833 +#: merge-recursive.c:1236 merge-recursive.c:1249
4834 #, c-format
4835 msgid "Fast-forwarding submodule %s to the following commit:"
4836 msgstr ""
4837
4727 -#: merge-recursive.c:1236 merge-recursive.c:1249
4838 +#: merge-recursive.c:1239 merge-recursive.c:1252
4839 #, c-format
4840 msgid "Fast-forwarding submodule %s"
4841 msgstr ""
4842
4732 -#: merge-recursive.c:1273
4843 +#: merge-recursive.c:1276
4844 #, c-format
4845 msgid "Failed to merge submodule %s (merge following commits not found)"
4846 msgstr ""
4847
4737 -#: merge-recursive.c:1277
4848 +#: merge-recursive.c:1280
4849 #, c-format
4850 msgid "Failed to merge submodule %s (not fast-forward)"
4851 msgstr ""
4852
4742 -#: merge-recursive.c:1278
4853 +#: merge-recursive.c:1281
4854 msgid "Found a possible merge resolution for the submodule:\n"
4855 msgstr ""
4856
4746 -#: merge-recursive.c:1290
4857 +#: merge-recursive.c:1293
4858 #, c-format
4859 msgid "Failed to merge submodule %s (multiple merges found)"
4860 msgstr ""
4861
4751 -#: merge-recursive.c:1434
4862 +#: merge-recursive.c:1437
4863 #, c-format
4864 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4865 msgstr ""
4866
4756 -#: merge-recursive.c:1506
4867 +#: merge-recursive.c:1509
4868 #, c-format
4869 msgid ""
4870 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4871 "in tree."
4872 msgstr ""
4873
4763 -#: merge-recursive.c:1511
4874 +#: merge-recursive.c:1514
4875 #, c-format
4876 msgid ""
4877 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4878 "left in tree."
4879 msgstr ""
4880
4770 -#: merge-recursive.c:1518
4881 +#: merge-recursive.c:1521
4882 #, c-format
4883 msgid ""
4884 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4885 "in tree at %s."
4886 msgstr ""
4887
4777 -#: merge-recursive.c:1523
4888 +#: merge-recursive.c:1526
4889 #, c-format
4890 msgid ""
4891 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4892 "left in tree at %s."
4893 msgstr ""
4894
4784 -#: merge-recursive.c:1558
4895 +#: merge-recursive.c:1561
4896 msgid "rename"
4897 msgstr ""
4898
4788 -#: merge-recursive.c:1558
4899 +#: merge-recursive.c:1561
4900 msgid "renamed"
4901 msgstr ""
4902
4792 -#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
4903 +#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
4904 #, c-format
4905 msgid "Refusing to lose dirty file at %s"
4906 msgstr ""
4907
4797 -#: merge-recursive.c:1619
4908 +#: merge-recursive.c:1622
4909 #, c-format
4910 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4911 msgstr ""
4912
4802 -#: merge-recursive.c:1677
4913 +#: merge-recursive.c:1680
4914 #, c-format
4915 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4916 msgstr ""
4917
4807 -#: merge-recursive.c:1708
4918 +#: merge-recursive.c:1711
4919 #, c-format
4920 msgid "%s is a directory in %s adding as %s instead"
4921 msgstr ""
4922
4812 -#: merge-recursive.c:1713
4923 +#: merge-recursive.c:1716
4924 #, c-format
4925 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4926 msgstr ""
4927
4817 -#: merge-recursive.c:1740
4928 +#: merge-recursive.c:1743
4929 #, c-format
4930 msgid ""
4931 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4932 "\"->\"%s\" in \"%s\"%s"
4933 msgstr ""
4934
4824 -#: merge-recursive.c:1745
4935 +#: merge-recursive.c:1748
4936 msgid " (left unresolved)"
4937 msgstr ""
4938
4828 -#: merge-recursive.c:1837
4939 +#: merge-recursive.c:1840
4940 #, c-format
4941 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4942 msgstr ""
4943
4833 -#: merge-recursive.c:2100
4944 +#: merge-recursive.c:2103
4945 #, c-format
4946 msgid ""
4947 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4838,85 +4949,85 @@ msgid ""
4949 "getting a majority of the files."
4950 msgstr ""
4951
4841 -#: merge-recursive.c:2234
4952 +#: merge-recursive.c:2237
4953 #, c-format
4954 msgid ""
4955 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4956 ">%s in %s"
4957 msgstr ""
4958
4848 -#: merge-recursive.c:3089
4959 +#: merge-recursive.c:3092
4960 msgid "modify"
4961 msgstr ""
4962
4852 -#: merge-recursive.c:3089
4963 +#: merge-recursive.c:3092
4964 msgid "modified"
4965 msgstr ""
4966
4856 -#: merge-recursive.c:3128
4967 +#: merge-recursive.c:3131
4968 #, c-format
4969 msgid "Skipped %s (merged same as existing)"
4970 msgstr ""
4971
4861 -#: merge-recursive.c:3181
4972 +#: merge-recursive.c:3184
4973 #, c-format
4974 msgid "Adding as %s instead"
4975 msgstr ""
4976
4866 -#: merge-recursive.c:3385
4977 +#: merge-recursive.c:3388
4978 #, c-format
4979 msgid "Removing %s"
4980 msgstr ""
4981
4871 -#: merge-recursive.c:3408
4982 +#: merge-recursive.c:3411
4983 msgid "file/directory"
4984 msgstr ""
4985
4875 -#: merge-recursive.c:3413
4986 +#: merge-recursive.c:3416
4987 msgid "directory/file"
4988 msgstr ""
4989
4879 -#: merge-recursive.c:3420
4990 +#: merge-recursive.c:3423
4991 #, c-format
4992 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4993 msgstr ""
4994
4884 -#: merge-recursive.c:3429
4995 +#: merge-recursive.c:3432
4996 #, c-format
4997 msgid "Adding %s"
4998 msgstr ""
4999
4889 -#: merge-recursive.c:3438
5000 +#: merge-recursive.c:3441
5001 #, c-format
5002 msgid "CONFLICT (add/add): Merge conflict in %s"
5003 msgstr ""
5004
4894 -#: merge-recursive.c:3491
5005 +#: merge-recursive.c:3494
5006 #, c-format
5007 msgid "merging of trees %s and %s failed"
5008 msgstr ""
5009
4899 -#: merge-recursive.c:3585
5010 +#: merge-recursive.c:3588
5011 msgid "Merging:"
5012 msgstr ""
5013
4903 -#: merge-recursive.c:3598
5014 +#: merge-recursive.c:3601
5015 #, c-format
5016 msgid "found %u common ancestor:"
5017 msgid_plural "found %u common ancestors:"
5018 msgstr[0] ""
5019 msgstr[1] ""
5020
4910 -#: merge-recursive.c:3648
5021 +#: merge-recursive.c:3651
5022 msgid "merge returned no commit"
5023 msgstr ""
5024
4914 -#: merge-recursive.c:3816
5025 +#: merge-recursive.c:3823
5026 #, c-format
5027 msgid "Could not parse object '%s'"
5028 msgstr ""
5029
4919 -#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
5030 +#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
5031 #: builtin/stash.c:489
5032 msgid "Unable to write index."
5033 msgstr ""
@@ -4925,221 +5036,225 @@ msgstr ""
5036 msgid "failed to read the cache"
5037 msgstr ""
5038
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
5039 +#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
5040 +#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
5041 #: builtin/stash.c:269
5042 msgid "unable to write new index file"
5043 msgstr ""
5044
4934 -#: midx.c:78
5045 +#: midx.c:79
5046 msgid "multi-pack-index OID fanout is of the wrong size"
5047 msgstr ""
5048
4938 -#: midx.c:111
5049 +#: midx.c:112
5050 #, c-format
5051 msgid "multi-pack-index file %s is too small"
5052 msgstr ""
5053
4943 -#: midx.c:127
5054 +#: midx.c:128
5055 #, c-format
5056 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
5057 msgstr ""
5058
4948 -#: midx.c:132
5059 +#: midx.c:133
5060 #, c-format
5061 msgid "multi-pack-index version %d not recognized"
5062 msgstr ""
5063
4953 -#: midx.c:137
5064 +#: midx.c:138
5065 #, c-format
5066 msgid "multi-pack-index hash version %u does not match version %u"
5067 msgstr ""
5068
4958 -#: midx.c:154
5069 +#: midx.c:155
5070 msgid "multi-pack-index missing required pack-name chunk"
5071 msgstr ""
5072
4962 -#: midx.c:156
5073 +#: midx.c:157
5074 msgid "multi-pack-index missing required OID fanout chunk"
5075 msgstr ""
5076
4966 -#: midx.c:158
5077 +#: midx.c:159
5078 msgid "multi-pack-index missing required OID lookup chunk"
5079 msgstr ""
5080
4970 -#: midx.c:160
5081 +#: midx.c:161
5082 msgid "multi-pack-index missing required object offsets chunk"
5083 msgstr ""
5084
4974 -#: midx.c:176
5085 +#: midx.c:180
5086 #, c-format
5087 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
5088 msgstr ""
5089
4979 -#: midx.c:224
5090 +#: midx.c:228
5091 #, c-format
5092 msgid "bad pack-int-id: %u (%u total packs)"
5093 msgstr ""
5094
4984 -#: midx.c:274
5095 +#: midx.c:278
5096 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5097 msgstr ""
5098
4988 -#: midx.c:505
5099 +#: midx.c:509
5100 #, c-format
5101 msgid "failed to add packfile '%s'"
5102 msgstr ""
5103
4993 -#: midx.c:511
5104 +#: midx.c:515
5105 #, c-format
5106 msgid "failed to open pack-index '%s'"
5107 msgstr ""
5108
4998 -#: midx.c:579
5109 +#: midx.c:583
5110 #, c-format
5111 msgid "failed to locate object %d in packfile"
5112 msgstr ""
5113
5003 -#: midx.c:895
5114 +#: midx.c:911
5115 msgid "cannot store reverse index file"
5116 msgstr ""

This file is too large to show in full.