l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
Generate po/git.pot from v2.25.0-rc0 for git v2.25.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Dec 30, 2019 at 08:52 UTC
578c793731fc63bfd54800f6884de369d66e4d48
1 file changed
+2755
-2252
po/git.pot
+2755
-2252
@@ -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: 2019-10-28 13:19+0800\n"
11
+"POT-Creation-Date: 2019-12-30 08:48+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,59 +18,454 @@ msgstr ""
18
"Content-Transfer-Encoding: 8bit\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
21
-#: advice.c:109
21
+#: add-interactive.c:347
22
+#, c-format
23
+msgid "Huh (%s)?"
24
+msgstr ""
25
+
26
+#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216
27
+#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643
28
+#: builtin/rebase.c:2019 builtin/rebase.c:2063
29
+msgid "could not read index"
30
+msgstr ""
31
+
32
+#: add-interactive.c:555 git-add--interactive.perl:269
33
+#: git-add--interactive.perl:294
34
+msgid "binary"
35
+msgstr ""
36
+
37
+#: add-interactive.c:613 git-add--interactive.perl:278
38
+#: git-add--interactive.perl:332
39
+msgid "nothing"
40
+msgstr ""
41
+
42
+#: add-interactive.c:614 git-add--interactive.perl:314
43
+#: git-add--interactive.perl:329
44
+msgid "unchanged"
45
+msgstr ""
46
+
47
+#: add-interactive.c:651 git-add--interactive.perl:643
48
+msgid "Update"
49
+msgstr ""
50
+
51
+#: add-interactive.c:668 add-interactive.c:856
52
+#, c-format
53
+msgid "could not stage '%s'"
54
+msgstr ""
55
+
56
+#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409
57
+#: builtin/rebase.c:895
58
+msgid "could not write index"
59
+msgstr ""
60
+
61
+#: add-interactive.c:677 git-add--interactive.perl:628
62
+#, c-format, perl-format
63
+msgid "updated %d path\n"
64
+msgid_plural "updated %d paths\n"
65
+msgstr[0] ""
66
+msgstr[1] ""
67
+
68
+#: add-interactive.c:695 git-add--interactive.perl:678
69
+#, c-format, perl-format
70
+msgid "note: %s is untracked now.\n"
71
+msgstr ""
72
+
73
+#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281
74
+#: builtin/reset.c:144
75
+#, c-format
76
+msgid "make_cache_entry failed for path '%s'"
77
+msgstr ""
78
+
79
+#: add-interactive.c:730 git-add--interactive.perl:655
80
+msgid "Revert"
81
+msgstr ""
82
+
83
+#: add-interactive.c:746
84
+msgid "Could not parse HEAD^{tree}"
85
+msgstr ""
86
+
87
+#: add-interactive.c:784 git-add--interactive.perl:631
88
+#, c-format, perl-format
89
+msgid "reverted %d path\n"
90
+msgid_plural "reverted %d paths\n"
91
+msgstr[0] ""
92
+msgstr[1] ""
93
+
94
+#: add-interactive.c:835 git-add--interactive.perl:695
95
+#, c-format
96
+msgid "No untracked files.\n"
97
+msgstr ""
98
+
99
+#: add-interactive.c:839 git-add--interactive.perl:689
100
+msgid "Add untracked"
101
+msgstr ""
102
+
103
+#: add-interactive.c:866 git-add--interactive.perl:625
104
+#, c-format, perl-format
105
+msgid "added %d path\n"
106
+msgid_plural "added %d paths\n"
107
+msgstr[0] ""
108
+msgstr[1] ""
109
+
110
+#: add-interactive.c:896
111
+#, c-format
112
+msgid "ignoring unmerged: %s"
113
+msgstr ""
114
+
115
+#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366
116
+#, c-format
117
+msgid "Only binary files changed.\n"
118
+msgstr ""
119
+
120
+#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368
121
+#, c-format
122
+msgid "No changes.\n"
123
+msgstr ""
124
+
125
+#: add-interactive.c:914 git-add--interactive.perl:1376
126
+msgid "Patch update"
127
+msgstr ""
128
+
129
+#: add-interactive.c:953 git-add--interactive.perl:1754
130
+msgid "Review diff"
131
+msgstr ""
132
+
133
+#: add-interactive.c:981
134
+msgid "show paths with changes"
135
+msgstr ""
136
+
137
+#: add-interactive.c:983
138
+msgid "add working tree state to the staged set of changes"
139
+msgstr ""
140
+
141
+#: add-interactive.c:985
142
+msgid "revert staged set of changes back to the HEAD version"
143
+msgstr ""
144
+
145
+#: add-interactive.c:987
146
+msgid "pick hunks and update selectively"
147
+msgstr ""
148
+
149
+#: add-interactive.c:989
150
+msgid "view diff between HEAD and index"
151
+msgstr ""
152
+
153
+#: add-interactive.c:991
154
+msgid "add contents of untracked files to the staged set of changes"
155
+msgstr ""
156
+
157
+#: add-interactive.c:999 add-interactive.c:1048
158
+msgid "Prompt help:"
159
+msgstr ""
160
+
161
+#: add-interactive.c:1001
162
+msgid "select a single item"
163
+msgstr ""
164
+
165
+#: add-interactive.c:1003
166
+msgid "select a range of items"
167
+msgstr ""
168
+
169
+#: add-interactive.c:1005
170
+msgid "select multiple ranges"
171
+msgstr ""
172
+
173
+#: add-interactive.c:1007 add-interactive.c:1052
174
+msgid "select item based on unique prefix"
175
+msgstr ""
176
+
177
+#: add-interactive.c:1009
178
+msgid "unselect specified items"
179
+msgstr ""
180
+
181
+#: add-interactive.c:1011
182
+msgid "choose all items"
183
+msgstr ""
184
+
185
+#: add-interactive.c:1013
186
+msgid "(empty) finish selecting"
187
+msgstr ""
188
+
189
+#: add-interactive.c:1050
190
+msgid "select a numbered item"
191
+msgstr ""
192
+
193
+#: add-interactive.c:1054
194
+msgid "(empty) select nothing"
195
+msgstr ""
196
+
197
+#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851
198
+msgid "*** Commands ***"
199
+msgstr ""
200
+
201
+#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848
202
+msgid "What now"
203
+msgstr ""
204
+
205
+#: add-interactive.c:1115 git-add--interactive.perl:213
206
+msgid "staged"
207
+msgstr ""
208
+
209
+#: add-interactive.c:1115 git-add--interactive.perl:213
210
+msgid "unstaged"
211
+msgstr ""
212
+
213
+#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197
214
+#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
215
+#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409
216
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382
217
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878
218
+#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213
219
+msgid "path"
220
+msgstr ""
221
+
222
+#: add-interactive.c:1122
223
+msgid "could not refresh index"
224
+msgstr ""
225
+
226
+#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765
227
+#, c-format
228
+msgid "Bye.\n"
229
+msgstr ""
230
+
231
+#: add-patch.c:15
232
+#, c-format
233
+msgid "Stage mode change [y,n,a,q,d%s,?]? "
234
+msgstr ""
235
+
236
+#: add-patch.c:16
237
+#, c-format
238
+msgid "Stage deletion [y,n,a,q,d%s,?]? "
239
+msgstr ""
240
+
241
+#: add-patch.c:17
242
+#, c-format
243
+msgid "Stage this hunk [y,n,a,q,d%s,?]? "
244
+msgstr ""
245
+
246
+#: add-patch.c:111
247
+#, c-format
248
+msgid "could not parse hunk header '%.*s'"
249
+msgstr ""
250
+
251
+#: add-patch.c:130 add-patch.c:134
252
+#, c-format
253
+msgid "could not parse colored hunk header '%.*s'"
254
+msgstr ""
255
+
256
+#: add-patch.c:176
257
+msgid "could not parse diff"
258
+msgstr ""
259
+
260
+#: add-patch.c:194
261
+msgid "could not parse colored diff"
262
+msgstr ""
263
+
264
+#: add-patch.c:508
265
+#, c-format
266
+msgid ""
267
+"expected context line #%d in\n"
268
+"%.*s"
269
+msgstr ""
270
+
271
+#: add-patch.c:523
272
+#, c-format
273
+msgid ""
274
+"hunks do not overlap:\n"
275
+"%.*s\n"
276
+"\tdoes not end with:\n"
277
+"%.*s"
278
+msgstr ""
279
+
280
+#: add-patch.c:799 git-add--interactive.perl:1112
281
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
282
+msgstr ""
283
+
284
+#: add-patch.c:803
285
+#, c-format
286
+msgid ""
287
+"---\n"
288
+"To remove '%c' lines, make them ' ' lines (context).\n"
289
+"To remove '%c' lines, delete them.\n"
290
+"Lines starting with %c will be removed.\n"
291
+msgstr ""
292
+
293
+#: add-patch.c:810
294
+msgid ""
295
+"If the patch applies cleanly, the edited hunk will immediately be\n"
296
+"marked for staging.\n"
297
+msgstr ""
298
+
299
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
300
+#: add-patch.c:818 git-add--interactive.perl:1126
301
+msgid ""
302
+"If it does not apply cleanly, you will be given an opportunity to\n"
303
+"edit again. If all lines of the hunk are removed, then the edit is\n"
304
+"aborted and the hunk is left unchanged.\n"
305
+msgstr ""
306
+
307
+#: add-patch.c:851
308
+msgid "could not parse hunk header"
309
+msgstr ""
310
+
311
+#: add-patch.c:895 add-patch.c:1294
312
+msgid "'git apply --cached' failed"
313
+msgstr ""
314
+
315
+#. TRANSLATORS: do not translate [y/n]
316
+#. The program will only accept that input at this point.
317
+#. Consider translating (saying "no" discards!) as
318
+#. (saying "n" for "no" discards!) if the translation
319
+#. of the word "no" does not start with n.
320
+#.
321
+#. TRANSLATORS: do not translate [y/n]
322
+#. The program will only accept that input
323
+#. at this point.
324
+#. Consider translating (saying "no" discards!) as
325
+#. (saying "n" for "no" discards!) if the translation
326
+#. of the word "no" does not start with n.
327
+#: add-patch.c:952 git-add--interactive.perl:1239
328
+msgid ""
329
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
330
+msgstr ""
331
+
332
+#: add-patch.c:1009
333
+msgid ""
334
+"y - stage this hunk\n"
335
+"n - do not stage this hunk\n"
336
+"q - quit; do not stage this hunk or any of the remaining ones\n"
337
+"a - stage this and all the remaining hunks\n"
338
+"d - do not stage this hunk nor any of the remaining hunks\n"
339
+msgstr ""
340
+
341
+#: add-patch.c:1016
342
+msgid ""
343
+"j - leave this hunk undecided, see next undecided hunk\n"
344
+"J - leave this hunk undecided, see next hunk\n"
345
+"k - leave this hunk undecided, see previous undecided hunk\n"
346
+"K - leave this hunk undecided, see previous hunk\n"
347
+"g - select a hunk to go to\n"
348
+"/ - search for a hunk matching the given regex\n"
349
+"s - split the current hunk into smaller hunks\n"
350
+"e - manually edit the current hunk\n"
351
+"? - print help\n"
352
+msgstr ""
353
+
354
+#: add-patch.c:1137 add-patch.c:1147
355
+msgid "No previous hunk"
356
+msgstr ""
357
+
358
+#: add-patch.c:1142 add-patch.c:1152
359
+msgid "No next hunk"
360
+msgstr ""
361
+
362
+#: add-patch.c:1158
363
+msgid "No other hunks to goto"
364
+msgstr ""
365
+
366
+#: add-patch.c:1169 git-add--interactive.perl:1577
367
+msgid "go to which hunk (<ret> to see more)? "
368
+msgstr ""
369
+
370
+#: add-patch.c:1170 git-add--interactive.perl:1579
371
+msgid "go to which hunk? "
372
+msgstr ""
373
+
374
+#: add-patch.c:1181
375
+#, c-format
376
+msgid "Invalid number: '%s'"
377
+msgstr ""
378
+
379
+#: add-patch.c:1186
380
+#, c-format
381
+msgid "Sorry, only %d hunk available."
382
+msgid_plural "Sorry, only %d hunks available."
383
+msgstr[0] ""
384
+msgstr[1] ""
385
+
386
+#: add-patch.c:1195
387
+msgid "No other hunks to search"
388
+msgstr ""
389
+
390
+#: add-patch.c:1201 git-add--interactive.perl:1623
391
+msgid "search for regex? "
392
+msgstr ""
393
+
394
+#: add-patch.c:1216
395
+#, c-format
396
+msgid "Malformed search regexp %s: %s"
397
+msgstr ""
398
+
399
+#: add-patch.c:1233
400
+msgid "No hunk matches the given pattern"
401
+msgstr ""
402
+
403
+#: add-patch.c:1240
404
+msgid "Sorry, cannot split this hunk"
405
+msgstr ""
406
+
407
+#: add-patch.c:1244
408
+#, c-format
409
+msgid "Split into %d hunks."
410
+msgstr ""
411
+
412
+#: add-patch.c:1248
413
+msgid "Sorry, cannot edit this hunk"
414
+msgstr ""
415
+
416
+#: advice.c:111
417
#, c-format
418
msgid "%shint: %.*s%s\n"
419
msgstr ""
420
26
-#: advice.c:162
421
+#: advice.c:164
422
msgid "Cherry-picking is not possible because you have unmerged files."
423
msgstr ""
424
30
-#: advice.c:164
425
+#: advice.c:166
426
msgid "Committing is not possible because you have unmerged files."
427
msgstr ""
428
34
-#: advice.c:166
429
+#: advice.c:168
430
msgid "Merging is not possible because you have unmerged files."
431
msgstr ""
432
38
-#: advice.c:168
433
+#: advice.c:170
434
msgid "Pulling is not possible because you have unmerged files."
435
msgstr ""
436
42
-#: advice.c:170
437
+#: advice.c:172
438
msgid "Reverting is not possible because you have unmerged files."
439
msgstr ""
440
46
-#: advice.c:172
441
+#: advice.c:174
442
#, c-format
443
msgid "It is not possible to %s because you have unmerged files."
444
msgstr ""
445
51
-#: advice.c:180
446
+#: advice.c:182
447
msgid ""
448
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
449
"as appropriate to mark resolution and make a commit."
450
msgstr ""
451
57
-#: advice.c:188
452
+#: advice.c:190
453
msgid "Exiting because of an unresolved conflict."
454
msgstr ""
455
61
-#: advice.c:193 builtin/merge.c:1332
456
+#: advice.c:195 builtin/merge.c:1332
457
msgid "You have not concluded your merge (MERGE_HEAD exists)."
458
msgstr ""
459
65
-#: advice.c:195
460
+#: advice.c:197
461
msgid "Please, commit your changes before merging."
462
msgstr ""
463
69
-#: advice.c:196
464
+#: advice.c:198
465
msgid "Exiting because of unfinished merge."
466
msgstr ""
467
73
-#: advice.c:202
468
+#: advice.c:204
469
#, c-format
470
msgid ""
471
"Note: switching to '%s'.\n"
@@ -255,469 +650,455 @@ msgstr ""
650
msgid "unable to open or read %s"
651
msgstr ""
652
258
-#: apply.c:2926
653
+#: apply.c:2936
654
#, c-format
655
msgid "invalid start of line: '%c'"
656
msgstr ""
657
263
-#: apply.c:3047
658
+#: apply.c:3057
659
#, c-format
660
msgid "Hunk #%d succeeded at %d (offset %d line)."
661
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
662
msgstr[0] ""
663
msgstr[1] ""
664
270
-#: apply.c:3059
665
+#: apply.c:3069
666
#, c-format
667
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
668
msgstr ""
669
275
-#: apply.c:3065
670
+#: apply.c:3075
671
#, c-format
672
msgid ""
673
"while searching for:\n"
674
"%.*s"
675
msgstr ""
676
282
-#: apply.c:3087
677
+#: apply.c:3097
678
#, c-format
679
msgid "missing binary patch data for '%s'"
680
msgstr ""
681
287
-#: apply.c:3095
682
+#: apply.c:3105
683
#, c-format
684
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
685
msgstr ""
686
292
-#: apply.c:3142
687
+#: apply.c:3152
688
#, c-format
689
msgid "cannot apply binary patch to '%s' without full index line"
690
msgstr ""
691
297
-#: apply.c:3152
692
+#: apply.c:3162
693
#, c-format
694
msgid ""
695
"the patch applies to '%s' (%s), which does not match the current contents."
696
msgstr ""
697
303
-#: apply.c:3160
698
+#: apply.c:3170
699
#, c-format
700
msgid "the patch applies to an empty '%s' but it is not empty"
701
msgstr ""
702
308
-#: apply.c:3178
703
+#: apply.c:3188
704
#, c-format
705
msgid "the necessary postimage %s for '%s' cannot be read"
706
msgstr ""
707
313
-#: apply.c:3191
708
+#: apply.c:3201
709
#, c-format
710
msgid "binary patch does not apply to '%s'"
711
msgstr ""
712
318
-#: apply.c:3197
713
+#: apply.c:3207
714
#, c-format
715
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
716
msgstr ""
717
323
-#: apply.c:3218
718
+#: apply.c:3228
719
#, c-format
720
msgid "patch failed: %s:%ld"
721
msgstr ""
722
328
-#: apply.c:3341
723
+#: apply.c:3351
724
#, c-format
725
msgid "cannot checkout %s"
726
msgstr ""
727
333
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
728
+#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280
729
#, c-format
730
msgid "failed to read %s"
731
msgstr ""
732
338
-#: apply.c:3401
733
+#: apply.c:3411
734
#, c-format
735
msgid "reading from '%s' beyond a symbolic link"
736
msgstr ""
737
343
-#: apply.c:3430 apply.c:3673
738
+#: apply.c:3440 apply.c:3683
739
#, c-format
740
msgid "path %s has been renamed/deleted"
741
msgstr ""
742
348
-#: apply.c:3516 apply.c:3688
743
+#: apply.c:3526 apply.c:3698
744
#, c-format
745
msgid "%s: does not exist in index"
746
msgstr ""
747
353
-#: apply.c:3525 apply.c:3696
748
+#: apply.c:3535 apply.c:3706
749
#, c-format
750
msgid "%s: does not match index"
751
msgstr ""
752
358
-#: apply.c:3560
753
+#: apply.c:3570
754
msgid "repository lacks the necessary blob to fall back on 3-way merge."
755
msgstr ""
756
362
-#: apply.c:3563
757
+#: apply.c:3573
758
#, c-format
759
msgid "Falling back to three-way merge...\n"
760
msgstr ""
761
367
-#: apply.c:3579 apply.c:3583
762
+#: apply.c:3589 apply.c:3593
763
#, c-format
764
msgid "cannot read the current contents of '%s'"
765
msgstr ""
766
372
-#: apply.c:3595
767
+#: apply.c:3605
768
#, c-format
769
msgid "Failed to fall back on three-way merge...\n"
770
msgstr ""
771
377
-#: apply.c:3609
772
+#: apply.c:3619
773
#, c-format
774
msgid "Applied patch to '%s' with conflicts.\n"
775
msgstr ""
776
382
-#: apply.c:3614
777
+#: apply.c:3624
778
#, c-format
779
msgid "Applied patch to '%s' cleanly.\n"
780
msgstr ""
781
387
-#: apply.c:3640
782
+#: apply.c:3650
783
msgid "removal patch leaves file contents"
784
msgstr ""
785
391
-#: apply.c:3713
786
+#: apply.c:3723
787
#, c-format
788
msgid "%s: wrong type"
789
msgstr ""
790
396
-#: apply.c:3715
791
+#: apply.c:3725
792
#, c-format
793
msgid "%s has type %o, expected %o"
794
msgstr ""
795
401
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
402
-#: read-cache.c:1309
796
+#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856
797
+#: read-cache.c:1320
798
#, c-format
799
msgid "invalid path '%s'"
800
msgstr ""
801
407
-#: apply.c:3924
802
+#: apply.c:3934
803
#, c-format
804
msgid "%s: already exists in index"
805
msgstr ""
806
412
-#: apply.c:3927
807
+#: apply.c:3937
808
#, c-format
809
msgid "%s: already exists in working directory"
810
msgstr ""
811
417
-#: apply.c:3947
812
+#: apply.c:3957
813
#, c-format
814
msgid "new mode (%o) of %s does not match old mode (%o)"
815
msgstr ""
816
422
-#: apply.c:3952
817
+#: apply.c:3962
818
#, c-format
819
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
820
msgstr ""
821
427
-#: apply.c:3972
822
+#: apply.c:3982
823
#, c-format
824
msgid "affected file '%s' is beyond a symbolic link"
825
msgstr ""
826
432
-#: apply.c:3976
827
+#: apply.c:3986
828
#, c-format
829
msgid "%s: patch does not apply"
830
msgstr ""
831
437
-#: apply.c:3991
832
+#: apply.c:4001
833
#, c-format
834
msgid "Checking patch %s..."
835
msgstr ""
836
442
-#: apply.c:4083
837
+#: apply.c:4093
838
#, c-format
839
msgid "sha1 information is lacking or useless for submodule %s"
840
msgstr ""
841
447
-#: apply.c:4090
842
+#: apply.c:4100
843
#, c-format
844
msgid "mode change for %s, which is not in current HEAD"
845
msgstr ""
846
452
-#: apply.c:4093
847
+#: apply.c:4103
848
#, c-format
849
msgid "sha1 information is lacking or useless (%s)."
850
msgstr ""
851
457
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
458
-#, c-format
459
-msgid "make_cache_entry failed for path '%s'"
460
-msgstr ""
461
-
462
-#: apply.c:4102
852
+#: apply.c:4112
853
#, c-format
854
msgid "could not add %s to temporary index"
855
msgstr ""
856
467
-#: apply.c:4112
857
+#: apply.c:4122
858
#, c-format
859
msgid "could not write temporary index to %s"
860
msgstr ""
861
472
-#: apply.c:4250
862
+#: apply.c:4260
863
#, c-format
864
msgid "unable to remove %s from index"
865
msgstr ""
866
477
-#: apply.c:4284
867
+#: apply.c:4294
868
#, c-format
869
msgid "corrupt patch for submodule %s"
870
msgstr ""
871
482
-#: apply.c:4290
872
+#: apply.c:4300
873
#, c-format
874
msgid "unable to stat newly created file '%s'"
875
msgstr ""
876
487
-#: apply.c:4298
877
+#: apply.c:4308
878
#, c-format
879
msgid "unable to create backing store for newly created file %s"
880
msgstr ""
881
492
-#: apply.c:4304 apply.c:4449
882
+#: apply.c:4314 apply.c:4459
883
#, c-format
884
msgid "unable to add cache entry for %s"
885
msgstr ""
886
497
-#: apply.c:4347
887
+#: apply.c:4357
888
#, c-format
889
msgid "failed to write to '%s'"
890
msgstr ""
891
502
-#: apply.c:4351
892
+#: apply.c:4361
893
#, c-format
894
msgid "closing file '%s'"
895
msgstr ""
896
507
-#: apply.c:4421
897
+#: apply.c:4431
898
#, c-format
899
msgid "unable to write file '%s' mode %o"
900
msgstr ""
901
512
-#: apply.c:4519
902
+#: apply.c:4529
903
#, c-format
904
msgid "Applied patch %s cleanly."
905
msgstr ""
906
517
-#: apply.c:4527
907
+#: apply.c:4537
908
msgid "internal error"
909
msgstr ""
910
521
-#: apply.c:4530
911
+#: apply.c:4540
912
#, c-format
913
msgid "Applying patch %%s with %d reject..."
914
msgid_plural "Applying patch %%s with %d rejects..."
915
msgstr[0] ""
916
msgstr[1] ""
917
528
-#: apply.c:4541
918
+#: apply.c:4551
919
#, c-format
920
msgid "truncating .rej filename to %.*s.rej"
921
msgstr ""
922
533
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
923
+#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192
924
#, c-format
925
msgid "cannot open %s"
926
msgstr ""
927
538
-#: apply.c:4563
928
+#: apply.c:4573
929
#, c-format
930
msgid "Hunk #%d applied cleanly."
931
msgstr ""
932
543
-#: apply.c:4567
933
+#: apply.c:4577
934
#, c-format
935
msgid "Rejected hunk #%d."
936
msgstr ""
937
548
-#: apply.c:4686
938
+#: apply.c:4696
939
#, c-format
940
msgid "Skipped patch '%s'."
941
msgstr ""
942
553
-#: apply.c:4694
943
+#: apply.c:4704
944
msgid "unrecognized input"
945
msgstr ""
946
557
-#: apply.c:4714
947
+#: apply.c:4724
948
msgid "unable to read index file"
949
msgstr ""
950
561
-#: apply.c:4871
951
+#: apply.c:4881
952
#, c-format
953
msgid "can't open patch '%s': %s"
954
msgstr ""
955
566
-#: apply.c:4898
956
+#: apply.c:4908
957
#, c-format
958
msgid "squelched %d whitespace error"
959
msgid_plural "squelched %d whitespace errors"
960
msgstr[0] ""
961
msgstr[1] ""
962
573
-#: apply.c:4904 apply.c:4919
963
+#: apply.c:4914 apply.c:4929
964
#, c-format
965
msgid "%d line adds whitespace errors."
966
msgid_plural "%d lines add whitespace errors."
967
msgstr[0] ""
968
msgstr[1] ""
969
580
-#: apply.c:4912
970
+#: apply.c:4922
971
#, c-format
972
msgid "%d line applied after fixing whitespace errors."
973
msgid_plural "%d lines applied after fixing whitespace errors."
974
msgstr[0] ""
975
msgstr[1] ""
976
587
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
977
+#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390
978
msgid "Unable to write new index file"
979
msgstr ""
980
591
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
592
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
593
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
594
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
595
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
596
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
597
-msgid "path"
598
-msgstr ""
599
-
600
-#: apply.c:4956
981
+#: apply.c:4966
982
msgid "don't apply changes matching the given path"
983
msgstr ""
984
604
-#: apply.c:4959
985
+#: apply.c:4969
986
msgid "apply changes matching the given path"
987
msgstr ""
988
608
-#: apply.c:4961 builtin/am.c:2206
989
+#: apply.c:4971 builtin/am.c:2206
990
msgid "num"
991
msgstr ""
992
612
-#: apply.c:4962
993
+#: apply.c:4972
994
msgid "remove <num> leading slashes from traditional diff paths"
995
msgstr ""
996
616
-#: apply.c:4965
997
+#: apply.c:4975
998
msgid "ignore additions made by the patch"
999
msgstr ""
1000
620
-#: apply.c:4967
1001
+#: apply.c:4977
1002
msgid "instead of applying the patch, output diffstat for the input"
1003
msgstr ""
1004
624
-#: apply.c:4971
1005
+#: apply.c:4981
1006
msgid "show number of added and deleted lines in decimal notation"
1007
msgstr ""
1008
628
-#: apply.c:4973
1009
+#: apply.c:4983
1010
msgid "instead of applying the patch, output a summary for the input"
1011
msgstr ""
1012
632
-#: apply.c:4975
1013
+#: apply.c:4985
1014
msgid "instead of applying the patch, see if the patch is applicable"
1015
msgstr ""
1016
636
-#: apply.c:4977
1017
+#: apply.c:4987
1018
msgid "make sure the patch is applicable to the current index"
1019
msgstr ""
1020
640
-#: apply.c:4979
1021
+#: apply.c:4989
1022
msgid "mark new files with `git add --intent-to-add`"
1023
msgstr ""
1024
644
-#: apply.c:4981
1025
+#: apply.c:4991
1026
msgid "apply a patch without touching the working tree"
1027
msgstr ""
1028
648
-#: apply.c:4983
1029
+#: apply.c:4993
1030
msgid "accept a patch that touches outside the working area"
1031
msgstr ""
1032
652
-#: apply.c:4986
1033
+#: apply.c:4996
1034
msgid "also apply the patch (use with --stat/--summary/--check)"
1035
msgstr ""
1036
656
-#: apply.c:4988
1037
+#: apply.c:4998
1038
msgid "attempt three-way merge if a patch does not apply"
1039
msgstr ""
1040
660
-#: apply.c:4990
1041
+#: apply.c:5000
1042
msgid "build a temporary index based on embedded index information"
1043
msgstr ""
1044
664
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
1045
+#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524
1046
msgid "paths are separated with NUL character"
1047
msgstr ""
1048
668
-#: apply.c:4995
1049
+#: apply.c:5005
1050
msgid "ensure at least <n> lines of context match"
1051
msgstr ""
1052
672
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
1053
+#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98
1054
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
674
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
1055
+#: builtin/pack-objects.c:3310 builtin/rebase.c:1474
1056
msgid "action"
1057
msgstr ""
1058
678
-#: apply.c:4997
1059
+#: apply.c:5007
1060
msgid "detect new or modified lines that have whitespace errors"
1061
msgstr ""
1062
682
-#: apply.c:5000 apply.c:5003
1063
+#: apply.c:5010 apply.c:5013
1064
msgid "ignore changes in whitespace when finding context"
1065
msgstr ""
1066
686
-#: apply.c:5006
1067
+#: apply.c:5016
1068
msgid "apply the patch in reverse"
1069
msgstr ""
1070
690
-#: apply.c:5008
1071
+#: apply.c:5018
1072
msgid "don't expect at least one line of context"
1073
msgstr ""
1074
694
-#: apply.c:5010
1075
+#: apply.c:5020
1076
msgid "leave the rejected hunks in corresponding *.rej files"
1077
msgstr ""
1078
698
-#: apply.c:5012
1079
+#: apply.c:5022
1080
msgid "allow overlapping hunks"
1081
msgstr ""
1082
702
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
703
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
704
-#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
1083
+#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22
1084
+#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774
1085
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
1086
msgid "be verbose"
1087
msgstr ""
1088
708
-#: apply.c:5015
1089
+#: apply.c:5025
1090
msgid "tolerate incorrectly detected missing new-line at the end of file"
1091
msgstr ""
1092
712
-#: apply.c:5018
1093
+#: apply.c:5028
1094
msgid "do not trust the line counts in the hunk headers"
1095
msgstr ""
1096
716
-#: apply.c:5020 builtin/am.c:2194
1097
+#: apply.c:5030 builtin/am.c:2194
1098
msgid "root"
1099
msgstr ""
1100
720
-#: apply.c:5021
1101
+#: apply.c:5031
1102
msgid "prepend <root> to all filenames"
1103
msgstr ""
1104
@@ -738,7 +1119,7 @@ msgstr ""
1119
msgid "git archive --remote <repo> [--exec <cmd>] --list"
1120
msgstr ""
1121
741
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
1122
+#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
1123
#, c-format
1124
msgid "pathspec '%s' did not match any files"
1125
msgstr ""
@@ -770,7 +1151,7 @@ msgstr ""
1151
msgid "archive format"
1152
msgstr ""
1153
773
-#: archive.c:458 builtin/log.c:1581
1154
+#: archive.c:458 builtin/log.c:1653
1155
msgid "prefix"
1156
msgstr ""
1157
@@ -778,12 +1159,12 @@ msgstr ""
1159
msgid "prepend prefix to each pathname in the archive"
1160
msgstr ""
1161
781
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
1162
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1163
#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
1164
#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
1165
#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
1166
#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
786
-#: parse-options.h:186
1167
+#: parse-options.h:190
1168
msgid "file"
1169
msgstr ""
1170
@@ -815,8 +1196,8 @@ msgstr ""
1196
msgid "list supported archive formats"
1197
msgstr ""
1198
818
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
819
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
1199
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1200
+#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884
1201
msgid "repo"
1202
msgstr ""
1203
@@ -855,17 +1236,17 @@ msgstr ""
1236
msgid "Argument not supported for format '%s': -%d"
1237
msgstr ""
1238
858
-#: archive-tar.c:125 archive-zip.c:345
1239
+#: archive-tar.c:125 archive-zip.c:350
1240
#, c-format
1241
msgid "cannot stream blob %s"
1242
msgstr ""
1243
863
-#: archive-tar.c:266 archive-zip.c:363
1244
+#: archive-tar.c:266 archive-zip.c:368
1245
#, c-format
1246
msgid "unsupported file mode: 0%o (SHA1: %s)"
1247
msgstr ""
1248
868
-#: archive-tar.c:293 archive-zip.c:353
1249
+#: archive-tar.c:293 archive-zip.c:358
1250
#, c-format
1251
msgid "cannot read %s"
1252
msgstr ""
@@ -884,37 +1265,37 @@ msgstr ""
1265
msgid "'%s' filter reported error"
1266
msgstr ""
1267
887
-#: archive-zip.c:314
1268
+#: archive-zip.c:319
1269
#, c-format
1270
msgid "path is not valid UTF-8: %s"
1271
msgstr ""
1272
892
-#: archive-zip.c:318
1273
+#: archive-zip.c:323
1274
#, c-format
1275
msgid "path too long (%d chars, SHA1: %s): %s"
1276
msgstr ""
1277
897
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
1278
+#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233
1279
#, c-format
1280
msgid "deflate error (%d)"
1281
msgstr ""
1282
902
-#: archive-zip.c:609
1283
+#: archive-zip.c:614
1284
#, c-format
1285
msgid "timestamp too large for this system: %<PRIuMAX>"
1286
msgstr ""
1287
907
-#: attr.c:213
1288
+#: attr.c:212
1289
#, c-format
1290
msgid "%.*s is not a valid attribute name"
1291
msgstr ""
1292
912
-#: attr.c:370
1293
+#: attr.c:369
1294
#, c-format
1295
msgid "%s not allowed: %s:%d"
1296
msgstr ""
1297
917
-#: attr.c:410
1298
+#: attr.c:409
1299
msgid ""
1300
"Negative patterns are ignored in git attributes\n"
1301
"Use '\\!' for literal leading exclamation."
@@ -1037,9 +1418,9 @@ msgstr ""
1418
msgid "--reverse and --first-parent together require specified latest commit"
1419
msgstr ""
1420
1040
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
1041
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
1042
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
1421
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093
1422
+#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991
1423
+#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411
1424
#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
1425
#: builtin/shortlog.c:192
1426
msgid "revision walk setup failed"
@@ -1194,8 +1575,8 @@ msgstr ""
1575
msgid "unrecognized header: %s%s (%d)"
1576
msgstr ""
1577
1197
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
1198
-#: builtin/commit.c:791
1578
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108
1579
+#: builtin/commit.c:811
1580
#, c-format
1581
msgid "could not open '%s'"
1582
msgstr ""
@@ -1226,42 +1607,42 @@ msgid_plural "The bundle requires these %d refs:"
1607
msgstr[0] ""
1608
msgstr[1] ""
1609
1229
-#: bundle.c:272
1610
+#: bundle.c:273
1611
msgid "unable to dup bundle descriptor"
1612
msgstr ""
1613
1233
-#: bundle.c:279
1614
+#: bundle.c:280
1615
msgid "Could not spawn pack-objects"
1616
msgstr ""
1617
1237
-#: bundle.c:290
1618
+#: bundle.c:291
1619
msgid "pack-objects died"
1620
msgstr ""
1621
1241
-#: bundle.c:332
1622
+#: bundle.c:333
1623
msgid "rev-list died"
1624
msgstr ""
1625
1245
-#: bundle.c:381
1626
+#: bundle.c:382
1627
#, c-format
1628
msgid "ref '%s' is excluded by the rev-list options"
1629
msgstr ""
1630
1250
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
1631
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
1632
#, c-format
1633
msgid "unrecognized argument: %s"
1634
msgstr ""
1635
1255
-#: bundle.c:468
1636
+#: bundle.c:469
1637
msgid "Refusing to create empty bundle."
1638
msgstr ""
1639
1259
-#: bundle.c:478
1640
+#: bundle.c:479
1641
#, c-format
1642
msgid "cannot create '%s'"
1643
msgstr ""
1644
1264
-#: bundle.c:503
1645
+#: bundle.c:504
1646
msgid "index-pack died"
1647
msgstr ""
1648
@@ -1270,18 +1651,18 @@ msgstr ""
1651
msgid "invalid color value: %.*s"
1652
msgstr ""
1653
1273
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
1654
+#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398
1655
#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
1656
#, c-format
1657
msgid "could not parse %s"
1658
msgstr ""
1659
1279
-#: commit.c:52
1660
+#: commit.c:53
1661
#, c-format
1662
msgid "%s %s is not a commit!"
1663
msgstr ""
1664
1284
-#: commit.c:192
1665
+#: commit.c:193
1666
msgid ""
1667
"Support for <GIT_DIR>/info/grafts is deprecated\n"
1668
"and will be removed in a future Git version.\n"
@@ -1293,102 +1674,97 @@ msgid ""
1674
"\"git config advice.graftFileDeprecated false\""
1675
msgstr ""
1676
1296
-#: commit.c:1128
1677
+#: commit.c:1152
1678
#, c-format
1679
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
1680
msgstr ""
1681
1301
-#: commit.c:1131
1682
+#: commit.c:1155
1683
#, c-format
1684
msgid "Commit %s has a bad GPG signature allegedly by %s."
1685
msgstr ""
1686
1306
-#: commit.c:1134
1687
+#: commit.c:1158
1688
#, c-format
1689
msgid "Commit %s does not have a GPG signature."
1690
msgstr ""
1691
1311
-#: commit.c:1137
1692
+#: commit.c:1161
1693
#, c-format
1694
msgid "Commit %s has a good GPG signature by %s\n"
1695
msgstr ""
1696
1316
-#: commit.c:1391
1697
+#: commit.c:1415
1698
msgid ""
1699
"Warning: commit message did not conform to UTF-8.\n"
1700
"You may want to amend it after fixing the message, or set the config\n"
1701
"variable i18n.commitencoding to the encoding your project uses.\n"
1702
msgstr ""
1703
1323
-#: commit-graph.c:127
1704
+#: commit-graph.c:130
1705
msgid "commit-graph file is too small"
1706
msgstr ""
1707
1327
-#: commit-graph.c:192
1708
+#: commit-graph.c:195
1709
#, c-format
1710
msgid "commit-graph signature %X does not match signature %X"
1711
msgstr ""
1712
1332
-#: commit-graph.c:199
1713
+#: commit-graph.c:202
1714
#, c-format
1715
msgid "commit-graph version %X does not match version %X"
1716
msgstr ""
1717
1337
-#: commit-graph.c:206
1718
+#: commit-graph.c:209
1719
#, c-format
1720
msgid "commit-graph hash version %X does not match version %X"
1721
msgstr ""
1722
1342
-#: commit-graph.c:229
1723
+#: commit-graph.c:232
1724
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
1725
msgstr ""
1726
1346
-#: commit-graph.c:240
1727
+#: commit-graph.c:243
1728
#, c-format
1729
msgid "commit-graph improper chunk offset %08x%08x"
1730
msgstr ""
1731
1351
-#: commit-graph.c:283
1732
+#: commit-graph.c:286
1733
#, c-format
1734
msgid "commit-graph chunk id %08x appears multiple times"
1735
msgstr ""
1736
1356
-#: commit-graph.c:347
1737
+#: commit-graph.c:350
1738
msgid "commit-graph has no base graphs chunk"
1739
msgstr ""
1740
1360
-#: commit-graph.c:357
1741
+#: commit-graph.c:360
1742
msgid "commit-graph chain does not match"
1743
msgstr ""
1744
1364
-#: commit-graph.c:404
1745
+#: commit-graph.c:407
1746
#, c-format
1747
msgid "invalid commit-graph chain: line '%s' not a hash"
1748
msgstr ""
1749
1369
-#: commit-graph.c:430
1750
+#: commit-graph.c:433
1751
msgid "unable to find all commit-graph files"
1752
msgstr ""
1753
1373
-#: commit-graph.c:561 commit-graph.c:621
1754
+#: commit-graph.c:564 commit-graph.c:624
1755
msgid "invalid commit position. commit-graph is likely corrupt"
1756
msgstr ""
1757
1377
-#: commit-graph.c:582
1758
+#: commit-graph.c:585
1759
#, c-format
1760
msgid "could not find commit %s"
1761
msgstr ""
1762
1382
-#: commit-graph.c:855 builtin/am.c:1287
1763
+#: commit-graph.c:858 builtin/am.c:1287
1764
#, c-format
1765
msgid "unable to parse commit %s"
1766
msgstr ""
1767
1387
-#: commit-graph.c:859
1388
-#, c-format
1389
-msgid "unable to get tree for %s"
1390
-msgstr ""
1391
-
1768
#: commit-graph.c:1017 builtin/pack-objects.c:2641
1769
#, c-format
1770
msgid "unable to get type of object %s"
@@ -1455,12 +1831,12 @@ msgstr ""
1831
msgid "failed to write correct number of base graph ids"
1832
msgstr ""
1833
1458
-#: commit-graph.c:1379 midx.c:810
1834
+#: commit-graph.c:1379 midx.c:814
1835
#, c-format
1836
msgid "unable to create leading directories of %s"
1837
msgstr ""
1838
1463
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
1839
+#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248
1840
#, c-format
1841
msgid "unable to create '%s'"
1842
msgstr ""
@@ -1613,7 +1989,7 @@ msgstr ""
1989
msgid "key does not contain variable name: %s"
1990
msgstr ""
1991
1616
-#: config.c:406 sequencer.c:2401
1992
+#: config.c:406 sequencer.c:2530
1993
#, c-format
1994
msgid "invalid key: %s"
1995
msgstr ""
@@ -1735,144 +2111,144 @@ msgstr ""
2111
msgid "invalid mode for object creation: %s"
2112
msgstr ""
2113
1738
-#: config.c:1425
2114
+#: config.c:1430
2115
#, c-format
2116
msgid "malformed value for %s"
2117
msgstr ""
2118
1743
-#: config.c:1451
2119
+#: config.c:1456
2120
#, c-format
2121
msgid "malformed value for %s: %s"
2122
msgstr ""
2123
1748
-#: config.c:1452
2124
+#: config.c:1457
2125
msgid "must be one of nothing, matching, simple, upstream or current"
2126
msgstr ""
2127
1752
-#: config.c:1513 builtin/pack-objects.c:3394
2128
+#: config.c:1518 builtin/pack-objects.c:3394
2129
#, c-format
2130
msgid "bad pack compression level %d"
2131
msgstr ""
2132
1757
-#: config.c:1634
2133
+#: config.c:1639
2134
#, c-format
2135
msgid "unable to load config blob object '%s'"
2136
msgstr ""
2137
1762
-#: config.c:1637
2138
+#: config.c:1642
2139
#, c-format
2140
msgid "reference '%s' does not point to a blob"
2141
msgstr ""
2142
1767
-#: config.c:1654
2143
+#: config.c:1659
2144
#, c-format
2145
msgid "unable to resolve config blob '%s'"
2146
msgstr ""
2147
1772
-#: config.c:1684
2148
+#: config.c:1689
2149
#, c-format
2150
msgid "failed to parse %s"
2151
msgstr ""
2152
1777
-#: config.c:1740
2153
+#: config.c:1745
2154
msgid "unable to parse command-line config"
2155
msgstr ""
2156
1781
-#: config.c:2091
2157
+#: config.c:2096
2158
msgid "unknown error occurred while reading the configuration files"
2159
msgstr ""
2160
1785
-#: config.c:2261
2161
+#: config.c:2266
2162
#, c-format
2163
msgid "Invalid %s: '%s'"
2164
msgstr ""
2165
1790
-#: config.c:2306
2166
+#: config.c:2311
2167
#, c-format
2168
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2169
msgstr ""
2170
1795
-#: config.c:2352
2171
+#: config.c:2357
2172
#, c-format
2173
msgid "unable to parse '%s' from command-line config"
2174
msgstr ""
2175
1800
-#: config.c:2354
2176
+#: config.c:2359
2177
#, c-format
2178
msgid "bad config variable '%s' in file '%s' at line %d"
2179
msgstr ""
2180
1805
-#: config.c:2435
2181
+#: config.c:2440
2182
#, c-format
2183
msgid "invalid section name '%s'"
2184
msgstr ""
2185
1810
-#: config.c:2467
2186
+#: config.c:2472
2187
#, c-format
2188
msgid "%s has multiple values"
2189
msgstr ""
2190
1815
-#: config.c:2496
2191
+#: config.c:2501
2192
#, c-format
2193
msgid "failed to write new configuration file %s"
2194
msgstr ""
2195
1820
-#: config.c:2748 config.c:3072
2196
+#: config.c:2753 config.c:3077
2197
#, c-format
2198
msgid "could not lock config file %s"
2199
msgstr ""
2200
1825
-#: config.c:2759
2201
+#: config.c:2764
2202
#, c-format
2203
msgid "opening %s"
2204
msgstr ""
2205
1830
-#: config.c:2794 builtin/config.c:328
2206
+#: config.c:2799 builtin/config.c:328
2207
#, c-format
2208
msgid "invalid pattern: %s"
2209
msgstr ""
2210
1835
-#: config.c:2819
2211
+#: config.c:2824
2212
#, c-format
2213
msgid "invalid config file %s"
2214
msgstr ""
2215
1840
-#: config.c:2832 config.c:3085
2216
+#: config.c:2837 config.c:3090
2217
#, c-format
2218
msgid "fstat on %s failed"
2219
msgstr ""
2220
1845
-#: config.c:2843
2221
+#: config.c:2848
2222
#, c-format
2223
msgid "unable to mmap '%s'"
2224
msgstr ""
2225
1850
-#: config.c:2852 config.c:3090
2226
+#: config.c:2857 config.c:3095
2227
#, c-format
2228
msgid "chmod on %s failed"
2229
msgstr ""
2230
1855
-#: config.c:2937 config.c:3187
2231
+#: config.c:2942 config.c:3192
2232
#, c-format
2233
msgid "could not write config file %s"
2234
msgstr ""
2235
1860
-#: config.c:2971
2236
+#: config.c:2976
2237
#, c-format
2238
msgid "could not set '%s' to '%s'"
2239
msgstr ""
2240
1865
-#: config.c:2973 builtin/remote.c:782
2241
+#: config.c:2978 builtin/remote.c:781
2242
#, c-format
2243
msgid "could not unset '%s'"
2244
msgstr ""
2245
1870
-#: config.c:3063
2246
+#: config.c:3068
2247
#, c-format
2248
msgid "invalid section name: %s"
2249
msgstr ""
2250
1875
-#: config.c:3230
2251
+#: config.c:3235
2252
#, c-format
2253
msgid "missing value for '%s'"
2254
msgstr ""
@@ -2028,19 +2404,19 @@ msgstr ""
2404
msgid "unable to fork"
2405
msgstr ""
2406
2031
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
2407
+#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43
2408
msgid "Checking connectivity"
2409
msgstr ""
2410
2035
-#: connected.c:100
2411
+#: connected.c:101
2412
msgid "Could not run 'git rev-list'"
2413
msgstr ""
2414
2039
-#: connected.c:120
2415
+#: connected.c:121
2416
msgid "failed write to rev-list"
2417
msgstr ""
2418
2043
-#: connected.c:127
2419
+#: connected.c:128
2420
msgid "failed to close rev-list's stdin"
2421
msgstr ""
2422
@@ -2073,90 +2449,90 @@ msgid ""
2449
"The file will have its original line endings in your working directory"
2450
msgstr ""
2451
2076
-#: convert.c:280
2452
+#: convert.c:284
2453
#, c-format
2454
msgid "BOM is prohibited in '%s' if encoded as %s"
2455
msgstr ""
2456
2081
-#: convert.c:287
2457
+#: convert.c:291
2458
#, c-format
2459
msgid ""
2084
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
2085
-"tree-encoding."
2460
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
2461
+"working-tree-encoding."
2462
msgstr ""
2463
2088
-#: convert.c:305
2464
+#: convert.c:304
2465
#, c-format
2466
msgid "BOM is required in '%s' if encoded as %s"
2467
msgstr ""
2468
2093
-#: convert.c:307
2469
+#: convert.c:306
2470
#, c-format
2471
msgid ""
2472
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2473
"%sLE (depending on the byte order) as working-tree-encoding."
2474
msgstr ""
2475
2100
-#: convert.c:425 convert.c:496
2476
+#: convert.c:419 convert.c:490
2477
#, c-format
2478
msgid "failed to encode '%s' from %s to %s"
2479
msgstr ""
2480
2105
-#: convert.c:468
2481
+#: convert.c:462
2482
#, c-format
2483
msgid "encoding '%s' from %s to %s and back is not the same"
2484
msgstr ""
2485
2110
-#: convert.c:674
2486
+#: convert.c:668
2487
#, c-format
2488
msgid "cannot fork to run external filter '%s'"
2489
msgstr ""
2490
2115
-#: convert.c:694
2491
+#: convert.c:688
2492
#, c-format
2493
msgid "cannot feed the input to external filter '%s'"
2494
msgstr ""
2495
2120
-#: convert.c:701
2496
+#: convert.c:695
2497
#, c-format
2498
msgid "external filter '%s' failed %d"
2499
msgstr ""
2500
2125
-#: convert.c:736 convert.c:739
2501
+#: convert.c:730 convert.c:733
2502
#, c-format
2503
msgid "read from external filter '%s' failed"
2504
msgstr ""
2505
2130
-#: convert.c:742 convert.c:797
2506
+#: convert.c:736 convert.c:791
2507
#, c-format
2508
msgid "external filter '%s' failed"
2509
msgstr ""
2510
2135
-#: convert.c:845
2511
+#: convert.c:839
2512
msgid "unexpected filter type"
2513
msgstr ""
2514
2139
-#: convert.c:856
2515
+#: convert.c:850
2516
msgid "path name too long for external filter"
2517
msgstr ""
2518
2143
-#: convert.c:930
2519
+#: convert.c:924
2520
#, c-format
2521
msgid ""
2522
"external filter '%s' is not available anymore although not all paths have "
2523
"been filtered"
2524
msgstr ""
2525
2150
-#: convert.c:1229
2526
+#: convert.c:1223
2527
msgid "true/false are no valid working-tree-encodings"
2528
msgstr ""
2529
2154
-#: convert.c:1417 convert.c:1451
2530
+#: convert.c:1411 convert.c:1445
2531
#, c-format
2532
msgid "%s: clean filter '%s' failed"
2533
msgstr ""
2534
2159
-#: convert.c:1495
2535
+#: convert.c:1489
2536
#, c-format
2537
msgid "%s: smudge filter %s failed"
2538
msgstr ""
@@ -2313,562 +2689,581 @@ msgid ""
2689
"%s"
2690
msgstr ""
2691
2316
-#: diff.c:4218
2692
+#: diff.c:4202
2693
#, c-format
2694
msgid "external diff died, stopping at %s"
2695
msgstr ""
2696
2321
-#: diff.c:4563
2697
+#: diff.c:4547
2698
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
2699
msgstr ""
2700
2325
-#: diff.c:4566
2701
+#: diff.c:4550
2702
msgid "-G, -S and --find-object are mutually exclusive"
2703
msgstr ""
2704
2329
-#: diff.c:4644
2705
+#: diff.c:4628
2706
msgid "--follow requires exactly one pathspec"
2707
msgstr ""
2708
2333
-#: diff.c:4692
2709
+#: diff.c:4676
2710
#, c-format
2711
msgid "invalid --stat value: %s"
2712
msgstr ""
2713
2338
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
2714
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
2715
#: parse-options.c:199 parse-options.c:203
2716
#, c-format
2717
msgid "%s expects a numerical value"
2718
msgstr ""
2719
2344
-#: diff.c:4729
2720
+#: diff.c:4713
2721
#, c-format
2722
msgid ""
2723
"Failed to parse --dirstat/-X option parameter:\n"
2724
"%s"
2725
msgstr ""
2726
2351
-#: diff.c:4814
2727
+#: diff.c:4798
2728
#, c-format
2729
msgid "unknown change class '%c' in --diff-filter=%s"
2730
msgstr ""
2731
2356
-#: diff.c:4838
2732
+#: diff.c:4822
2733
#, c-format
2734
msgid "unknown value after ws-error-highlight=%.*s"
2735
msgstr ""
2736
2361
-#: diff.c:4852
2737
+#: diff.c:4836
2738
#, c-format
2739
msgid "unable to resolve '%s'"
2740
msgstr ""
2741
2366
-#: diff.c:4902 diff.c:4908
2742
+#: diff.c:4886 diff.c:4892
2743
#, c-format
2744
msgid "%s expects <n>/<m> form"
2745
msgstr ""
2746
2371
-#: diff.c:4920
2747
+#: diff.c:4904
2748
#, c-format
2749
msgid "%s expects a character, got '%s'"
2750
msgstr ""
2751
2376
-#: diff.c:4941
2752
+#: diff.c:4925
2753
#, c-format
2754
msgid "bad --color-moved argument: %s"
2755
msgstr ""
2756
2381
-#: diff.c:4960
2757
+#: diff.c:4944
2758
#, c-format
2759
msgid "invalid mode '%s' in --color-moved-ws"
2760
msgstr ""
2761
2386
-#: diff.c:5000
2762
+#: diff.c:4984
2763
msgid ""
2764
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
2765
"\"histogram\""
2766
msgstr ""
2767
2392
-#: diff.c:5036 diff.c:5056
2768
+#: diff.c:5020 diff.c:5040
2769
#, c-format
2770
msgid "invalid argument to %s"
2771
msgstr ""
2772
2397
-#: diff.c:5194
2773
+#: diff.c:5178
2774
#, c-format
2775
msgid "failed to parse --submodule option parameter: '%s'"
2776
msgstr ""
2777
2402
-#: diff.c:5250
2778
+#: diff.c:5234
2779
#, c-format
2780
msgid "bad --word-diff argument: %s"
2781
msgstr ""
2782
2407
-#: diff.c:5273
2783
+#: diff.c:5257
2784
msgid "Diff output format options"
2785
msgstr ""
2786
2411
-#: diff.c:5275 diff.c:5281
2787
+#: diff.c:5259 diff.c:5265
2788
msgid "generate patch"
2789
msgstr ""
2790
2415
-#: diff.c:5278 builtin/log.c:172
2791
+#: diff.c:5262 builtin/log.c:173
2792
msgid "suppress diff output"
2793
msgstr ""
2794
2419
-#: diff.c:5283 diff.c:5397 diff.c:5404
2795
+#: diff.c:5267 diff.c:5381 diff.c:5388
2796
msgid "<n>"
2797
msgstr ""
2798
2423
-#: diff.c:5284 diff.c:5287
2799
+#: diff.c:5268 diff.c:5271
2800
msgid "generate diffs with <n> lines context"
2801
msgstr ""
2802
2427
-#: diff.c:5289
2803
+#: diff.c:5273
2804
msgid "generate the diff in raw format"
2805
msgstr ""
2806
2431
-#: diff.c:5292
2807
+#: diff.c:5276
2808
msgid "synonym for '-p --raw'"
2809
msgstr ""
2810
2435
-#: diff.c:5296
2811
+#: diff.c:5280
2812
msgid "synonym for '-p --stat'"
2813
msgstr ""
2814
2439
-#: diff.c:5300
2815
+#: diff.c:5284
2816
msgid "machine friendly --stat"
2817
msgstr ""
2818
2443
-#: diff.c:5303
2819
+#: diff.c:5287
2820
msgid "output only the last line of --stat"
2821
msgstr ""
2822
2447
-#: diff.c:5305 diff.c:5313
2823
+#: diff.c:5289 diff.c:5297
2824
msgid "<param1,param2>..."
2825
msgstr ""
2826
2451
-#: diff.c:5306
2827
+#: diff.c:5290
2828
msgid ""
2829
"output the distribution of relative amount of changes for each sub-directory"
2830
msgstr ""
2831
2456
-#: diff.c:5310
2832
+#: diff.c:5294
2833
msgid "synonym for --dirstat=cumulative"
2834
msgstr ""
2835
2460
-#: diff.c:5314
2836
+#: diff.c:5298
2837
msgid "synonym for --dirstat=files,param1,param2..."
2838
msgstr ""
2839
2464
-#: diff.c:5318
2840
+#: diff.c:5302
2841
msgid "warn if changes introduce conflict markers or whitespace errors"
2842
msgstr ""
2843
2468
-#: diff.c:5321
2844
+#: diff.c:5305
2845
msgid "condensed summary such as creations, renames and mode changes"
2846
msgstr ""
2847
2472
-#: diff.c:5324
2848
+#: diff.c:5308
2849
msgid "show only names of changed files"
2850
msgstr ""
2851
2476
-#: diff.c:5327
2852
+#: diff.c:5311
2853
msgid "show only names and status of changed files"
2854
msgstr ""
2855
2480
-#: diff.c:5329
2856
+#: diff.c:5313
2857
msgid "<width>[,<name-width>[,<count>]]"
2858
msgstr ""
2859
2484
-#: diff.c:5330
2860
+#: diff.c:5314
2861
msgid "generate diffstat"
2862
msgstr ""
2863
2488
-#: diff.c:5332 diff.c:5335 diff.c:5338
2864
+#: diff.c:5316 diff.c:5319 diff.c:5322
2865
msgid "<width>"
2866
msgstr ""
2867
2492
-#: diff.c:5333
2868
+#: diff.c:5317
2869
msgid "generate diffstat with a given width"
2870
msgstr ""
2871
2496
-#: diff.c:5336
2872
+#: diff.c:5320
2873
msgid "generate diffstat with a given name width"
2874
msgstr ""
2875
2500
-#: diff.c:5339
2876
+#: diff.c:5323
2877
msgid "generate diffstat with a given graph width"
2878
msgstr ""
2879
2504
-#: diff.c:5341
2880
+#: diff.c:5325
2881
msgid "<count>"
2882
msgstr ""
2883
2508
-#: diff.c:5342
2884
+#: diff.c:5326
2885
msgid "generate diffstat with limited lines"
2886
msgstr ""
2887
2512
-#: diff.c:5345
2888
+#: diff.c:5329
2889
msgid "generate compact summary in diffstat"
2890
msgstr ""
2891
2516
-#: diff.c:5348
2892
+#: diff.c:5332
2893
msgid "output a binary diff that can be applied"
2894
msgstr ""
2895
2520
-#: diff.c:5351
2896
+#: diff.c:5335
2897
msgid "show full pre- and post-image object names on the \"index\" lines"
2898
msgstr ""
2899
2524
-#: diff.c:5353
2900
+#: diff.c:5337
2901
msgid "show colored diff"
2902
msgstr ""
2903
2528
-#: diff.c:5354
2904
+#: diff.c:5338
2905
msgid "<kind>"
2906
msgstr ""
2907
2532
-#: diff.c:5355
2908
+#: diff.c:5339
2909
msgid ""
2910
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
2911
"diff"
2912
msgstr ""
2913
2538
-#: diff.c:5358
2914
+#: diff.c:5342
2915
msgid ""
2916
"do not munge pathnames and use NULs as output field terminators in --raw or "
2917
"--numstat"
2918
msgstr ""
2919
2544
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
2920
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
2921
msgid "<prefix>"
2922
msgstr ""
2923
2548
-#: diff.c:5362
2924
+#: diff.c:5346
2925
msgid "show the given source prefix instead of \"a/\""
2926
msgstr ""
2927
2552
-#: diff.c:5365
2928
+#: diff.c:5349
2929
msgid "show the given destination prefix instead of \"b/\""
2930
msgstr ""
2931
2556
-#: diff.c:5368
2932
+#: diff.c:5352
2933
msgid "prepend an additional prefix to every line of output"
2934
msgstr ""
2935
2560
-#: diff.c:5371
2936
+#: diff.c:5355
2937
msgid "do not show any source or destination prefix"
2938
msgstr ""
2939
2564
-#: diff.c:5374
2940
+#: diff.c:5358
2941
msgid "show context between diff hunks up to the specified number of lines"
2942
msgstr ""
2943
2568
-#: diff.c:5378 diff.c:5383 diff.c:5388
2944
+#: diff.c:5362 diff.c:5367 diff.c:5372
2945
msgid "<char>"
2946
msgstr ""
2947
2572
-#: diff.c:5379
2948
+#: diff.c:5363
2949
msgid "specify the character to indicate a new line instead of '+'"
2950
msgstr ""
2951
2576
-#: diff.c:5384
2952
+#: diff.c:5368
2953
msgid "specify the character to indicate an old line instead of '-'"
2954
msgstr ""
2955
2580
-#: diff.c:5389
2956
+#: diff.c:5373
2957
msgid "specify the character to indicate a context instead of ' '"
2958
msgstr ""
2959
2584
-#: diff.c:5392
2960
+#: diff.c:5376
2961
msgid "Diff rename options"
2962
msgstr ""
2963
2588
-#: diff.c:5393
2964
+#: diff.c:5377
2965
msgid "<n>[/<m>]"
2966
msgstr ""
2967
2592
-#: diff.c:5394
2968
+#: diff.c:5378
2969
msgid "break complete rewrite changes into pairs of delete and create"
2970
msgstr ""
2971
2596
-#: diff.c:5398
2972
+#: diff.c:5382
2973
msgid "detect renames"
2974
msgstr ""
2975
2600
-#: diff.c:5402
2976
+#: diff.c:5386
2977
msgid "omit the preimage for deletes"
2978
msgstr ""
2979
2604
-#: diff.c:5405
2980
+#: diff.c:5389
2981
msgid "detect copies"
2982
msgstr ""
2983
2608
-#: diff.c:5409
2984
+#: diff.c:5393
2985
msgid "use unmodified files as source to find copies"
2986
msgstr ""
2987
2612
-#: diff.c:5411
2988
+#: diff.c:5395
2989
msgid "disable rename detection"
2990
msgstr ""
2991
2616
-#: diff.c:5414
2992
+#: diff.c:5398
2993
msgid "use empty blobs as rename source"
2994
msgstr ""
2995
2620
-#: diff.c:5416
2996
+#: diff.c:5400
2997
msgid "continue listing the history of a file beyond renames"
2998
msgstr ""
2999
2624
-#: diff.c:5419
3000
+#: diff.c:5403
3001
msgid ""
3002
"prevent rename/copy detection if the number of rename/copy targets exceeds "
3003
"given limit"
3004
msgstr ""
3005
2630
-#: diff.c:5421
3006
+#: diff.c:5405
3007
msgid "Diff algorithm options"
3008
msgstr ""
3009
2634
-#: diff.c:5423
3010
+#: diff.c:5407
3011
msgid "produce the smallest possible diff"
3012
msgstr ""
3013
2638
-#: diff.c:5426
3014
+#: diff.c:5410
3015
msgid "ignore whitespace when comparing lines"
3016
msgstr ""
3017
2642
-#: diff.c:5429
3018
+#: diff.c:5413
3019
msgid "ignore changes in amount of whitespace"
3020
msgstr ""
3021
2646
-#: diff.c:5432
3022
+#: diff.c:5416
3023
msgid "ignore changes in whitespace at EOL"
3024
msgstr ""
3025
2650
-#: diff.c:5435
3026
+#: diff.c:5419
3027
msgid "ignore carrier-return at the end of line"
3028
msgstr ""
3029
2654
-#: diff.c:5438
3030
+#: diff.c:5422
3031
msgid "ignore changes whose lines are all blank"
3032
msgstr ""
3033
2658
-#: diff.c:5441
3034
+#: diff.c:5425
3035
msgid "heuristic to shift diff hunk boundaries for easy reading"
3036
msgstr ""
3037
2662
-#: diff.c:5444
3038
+#: diff.c:5428
3039
msgid "generate diff using the \"patience diff\" algorithm"
3040
msgstr ""
3041
2666
-#: diff.c:5448
3042
+#: diff.c:5432
3043
msgid "generate diff using the \"histogram diff\" algorithm"
3044
msgstr ""
3045
2670
-#: diff.c:5450
3046
+#: diff.c:5434
3047
msgid "<algorithm>"
3048
msgstr ""
3049
2674
-#: diff.c:5451
3050
+#: diff.c:5435
3051
msgid "choose a diff algorithm"
3052
msgstr ""
3053
2678
-#: diff.c:5453
3054
+#: diff.c:5437
3055
msgid "<text>"
3056
msgstr ""
3057
2682
-#: diff.c:5454
3058
+#: diff.c:5438
3059
msgid "generate diff using the \"anchored diff\" algorithm"
3060
msgstr ""
3061
2686
-#: diff.c:5456 diff.c:5465 diff.c:5468
3062
+#: diff.c:5440 diff.c:5449 diff.c:5452
3063
msgid "<mode>"
3064
msgstr ""
3065
2690
-#: diff.c:5457
3066
+#: diff.c:5441
3067
msgid "show word diff, using <mode> to delimit changed words"
3068
msgstr ""
3069
2694
-#: diff.c:5459 diff.c:5462 diff.c:5507
3070
+#: diff.c:5443 diff.c:5446 diff.c:5491
3071
msgid "<regex>"
3072
msgstr ""
3073
2698
-#: diff.c:5460
3074
+#: diff.c:5444
3075
msgid "use <regex> to decide what a word is"
3076
msgstr ""
3077
2702
-#: diff.c:5463
3078
+#: diff.c:5447
3079
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3080
msgstr ""
3081
2706
-#: diff.c:5466
3082
+#: diff.c:5450
3083
msgid "moved lines of code are colored differently"
3084
msgstr ""
3085
2710
-#: diff.c:5469
3086
+#: diff.c:5453
3087
msgid "how white spaces are ignored in --color-moved"
3088
msgstr ""
3089
2714
-#: diff.c:5472
3090
+#: diff.c:5456
3091
msgid "Other diff options"
3092
msgstr ""
3093
2718
-#: diff.c:5474
3094
+#: diff.c:5458
3095
msgid "when run from subdir, exclude changes outside and show relative paths"
3096
msgstr ""
3097
2722
-#: diff.c:5478
3098
+#: diff.c:5462
3099
msgid "treat all files as text"
3100
msgstr ""
3101
2726
-#: diff.c:5480
3102
+#: diff.c:5464
3103
msgid "swap two inputs, reverse the diff"
3104
msgstr ""
3105
2730
-#: diff.c:5482
3106
+#: diff.c:5466
3107
msgid "exit with 1 if there were differences, 0 otherwise"
3108
msgstr ""
3109
2734
-#: diff.c:5484
3110
+#: diff.c:5468
3111
msgid "disable all output of the program"
3112
msgstr ""
3113
2738
-#: diff.c:5486
3114
+#: diff.c:5470
3115
msgid "allow an external diff helper to be executed"
3116
msgstr ""
3117
2742
-#: diff.c:5488
3118
+#: diff.c:5472
3119
msgid "run external text conversion filters when comparing binary files"
3120
msgstr ""
3121
2746
-#: diff.c:5490
3122
+#: diff.c:5474
3123
msgid "<when>"
3124
msgstr ""
3125
2750
-#: diff.c:5491
3126
+#: diff.c:5475
3127
msgid "ignore changes to submodules in the diff generation"
3128
msgstr ""
3129
2754
-#: diff.c:5494
3130
+#: diff.c:5478
3131
msgid "<format>"
3132
msgstr ""
3133
2758
-#: diff.c:5495
3134
+#: diff.c:5479
3135
msgid "specify how differences in submodules are shown"
3136
msgstr ""
3137
2762
-#: diff.c:5499
3138
+#: diff.c:5483
3139
msgid "hide 'git add -N' entries from the index"
3140
msgstr ""
3141
2766
-#: diff.c:5502
3142
+#: diff.c:5486
3143
msgid "treat 'git add -N' entries as real in the index"
3144
msgstr ""
3145
2770
-#: diff.c:5504
3146
+#: diff.c:5488
3147
msgid "<string>"
3148
msgstr ""
3149
2774
-#: diff.c:5505
3150
+#: diff.c:5489
3151
msgid ""
3152
"look for differences that change the number of occurrences of the specified "
3153
"string"
3154
msgstr ""
3155
2780
-#: diff.c:5508
3156
+#: diff.c:5492
3157
msgid ""
3158
"look for differences that change the number of occurrences of the specified "
3159
"regex"
3160
msgstr ""
3161
2786
-#: diff.c:5511
3162
+#: diff.c:5495
3163
msgid "show all changes in the changeset with -S or -G"
3164
msgstr ""
3165
2790
-#: diff.c:5514
3166
+#: diff.c:5498
3167
msgid "treat <string> in -S as extended POSIX regular expression"
3168
msgstr ""
3169
2794
-#: diff.c:5517
3170
+#: diff.c:5501
3171
msgid "control the order in which files appear in the output"
3172
msgstr ""
3173
2798
-#: diff.c:5518
3174
+#: diff.c:5502
3175
msgid "<object-id>"
3176
msgstr ""
3177
2802
-#: diff.c:5519
3178
+#: diff.c:5503
3179
msgid ""
3180
"look for differences that change the number of occurrences of the specified "
3181
"object"
3182
msgstr ""
3183
2808
-#: diff.c:5521
3184
+#: diff.c:5505
3185
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3186
msgstr ""
3187
2812
-#: diff.c:5522
3188
+#: diff.c:5506
3189
msgid "select files by diff type"
3190
msgstr ""
3191
2816
-#: diff.c:5524
3192
+#: diff.c:5508
3193
msgid "<file>"
3194
msgstr ""
3195
2820
-#: diff.c:5525
3196
+#: diff.c:5509
3197
msgid "Output to a specific file"
3198
msgstr ""
3199
2824
-#: diff.c:6180
3200
+#: diff.c:6164
3201
msgid "inexact rename detection was skipped due to too many files."
3202
msgstr ""
3203
2828
-#: diff.c:6183
3204
+#: diff.c:6167
3205
msgid "only found copies from modified paths due to too many files."
3206
msgstr ""
3207
2832
-#: diff.c:6186
3208
+#: diff.c:6170
3209
#, c-format
3210
msgid ""
3211
"you may want to set your %s variable to at least %d and retry the command."
3212
msgstr ""
3213
2838
-#: dir.c:549
3214
+#: dir.c:554
3215
#, c-format
3216
msgid "pathspec '%s' did not match any file(s) known to git"
3217
msgstr ""
3218
2843
-#: dir.c:938
3219
+#: dir.c:664
3220
+#, c-format
3221
+msgid "unrecognized pattern: '%s'"
3222
+msgstr ""
3223
+
3224
+#: dir.c:682 dir.c:696
3225
+#, c-format
3226
+msgid "unrecognized negative pattern: '%s'"
3227
+msgstr ""
3228
+
3229
+#: dir.c:714
3230
+#, c-format
3231
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3232
+msgstr ""
3233
+
3234
+#: dir.c:724
3235
+msgid "disabling cone pattern matching"
3236
+msgstr ""
3237
+
3238
+#: dir.c:1101
3239
#, c-format
3240
msgid "cannot use %s as an exclude file"
3241
msgstr ""
3242
2848
-#: dir.c:1877
3243
+#: dir.c:2078
3244
#, c-format
3245
msgid "could not open directory '%s'"
3246
msgstr ""
3247
2853
-#: dir.c:2128
3248
+#: dir.c:2415
3249
msgid "failed to get kernel name and information"
3250
msgstr ""
3251
2857
-#: dir.c:2252
3252
+#: dir.c:2539
3253
msgid "untracked cache is disabled on this system or location"
3254
msgstr ""
3255
2861
-#: dir.c:3056
3256
+#: dir.c:3343
3257
#, c-format
3258
msgid "index file corrupt in repo %s"
3259
msgstr ""
3260
2866
-#: dir.c:3101 dir.c:3106
3261
+#: dir.c:3388 dir.c:3393
3262
#, c-format
3263
msgid "could not create directories for %s"
3264
msgstr ""
3265
2871
-#: dir.c:3135
3266
+#: dir.c:3422
3267
#, c-format
3268
msgid "could not migrate git directory from '%s' to '%s'"
3269
msgstr ""
@@ -2887,12 +3282,12 @@ msgstr ""
3282
msgid "could not stat file '%s'"
3283
msgstr ""
3284
2890
-#: environment.c:148
3285
+#: environment.c:149
3286
#, c-format
3287
msgid "bad git namespace path \"%s\""
3288
msgstr ""
3289
2895
-#: environment.c:330
3290
+#: environment.c:331
3291
#, c-format
3292
msgid "could not set GIT_DIR to '%s'"
3293
msgstr ""
@@ -2927,32 +3322,32 @@ msgstr ""
3322
msgid "--stateless-rpc requires multi_ack_detailed"
3323
msgstr ""
3324
2930
-#: fetch-pack.c:356 fetch-pack.c:1280
3325
+#: fetch-pack.c:356 fetch-pack.c:1340
3326
#, c-format
3327
msgid "invalid shallow line: %s"
3328
msgstr ""
3329
2935
-#: fetch-pack.c:362 fetch-pack.c:1286
3330
+#: fetch-pack.c:362 fetch-pack.c:1346
3331
#, c-format
3332
msgid "invalid unshallow line: %s"
3333
msgstr ""
3334
2940
-#: fetch-pack.c:364 fetch-pack.c:1288
3335
+#: fetch-pack.c:364 fetch-pack.c:1348
3336
#, c-format
3337
msgid "object not found: %s"
3338
msgstr ""
3339
2945
-#: fetch-pack.c:367 fetch-pack.c:1291
3340
+#: fetch-pack.c:367 fetch-pack.c:1351
3341
#, c-format
3342
msgid "error in object: %s"
3343
msgstr ""
3344
2950
-#: fetch-pack.c:369 fetch-pack.c:1293
3345
+#: fetch-pack.c:369 fetch-pack.c:1353
3346
#, c-format
3347
msgid "no shallow found: %s"
3348
msgstr ""
3349
2955
-#: fetch-pack.c:372 fetch-pack.c:1297
3350
+#: fetch-pack.c:372 fetch-pack.c:1357
3351
#, c-format
3352
msgid "expected shallow/unshallow, got %s"
3353
msgstr ""
@@ -2971,7 +3366,7 @@ msgstr ""
3366
msgid "giving up"
3367
msgstr ""
3368
2974
-#: fetch-pack.c:475 progress.c:312
3369
+#: fetch-pack.c:475 progress.c:323
3370
msgid "done"
3371
msgstr ""
3372
@@ -2985,162 +3380,162 @@ msgstr ""
3380
msgid "Marking %s as complete"
3381
msgstr ""
3382
2988
-#: fetch-pack.c:742
3383
+#: fetch-pack.c:754
3384
#, c-format
3385
msgid "already have %s (%s)"
3386
msgstr ""
3387
2993
-#: fetch-pack.c:781
3388
+#: fetch-pack.c:818
3389
msgid "fetch-pack: unable to fork off sideband demultiplexer"
3390
msgstr ""
3391
2997
-#: fetch-pack.c:789
3392
+#: fetch-pack.c:826
3393
msgid "protocol error: bad pack header"
3394
msgstr ""
3395
3001
-#: fetch-pack.c:857
3396
+#: fetch-pack.c:900
3397
#, c-format
3398
msgid "fetch-pack: unable to fork off %s"
3399
msgstr ""
3400
3006
-#: fetch-pack.c:873
3401
+#: fetch-pack.c:916
3402
#, c-format
3403
msgid "%s failed"
3404
msgstr ""
3405
3011
-#: fetch-pack.c:875
3406
+#: fetch-pack.c:918
3407
msgid "error in sideband demultiplexer"
3408
msgstr ""
3409
3015
-#: fetch-pack.c:907
3410
+#: fetch-pack.c:965
3411
#, c-format
3412
msgid "Server version is %.*s"
3413
msgstr ""
3414
3020
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
3021
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
3022
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
3023
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
3415
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
3416
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
3417
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
3418
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
3419
#, c-format
3420
msgid "Server supports %s"
3421
msgstr ""
3422
3028
-#: fetch-pack.c:914
3423
+#: fetch-pack.c:972
3424
msgid "Server does not support shallow clients"
3425
msgstr ""
3426
3032
-#: fetch-pack.c:974
3427
+#: fetch-pack.c:1032
3428
msgid "Server does not support --shallow-since"
3429
msgstr ""
3430
3036
-#: fetch-pack.c:979
3431
+#: fetch-pack.c:1037
3432
msgid "Server does not support --shallow-exclude"
3433
msgstr ""
3434
3040
-#: fetch-pack.c:983
3435
+#: fetch-pack.c:1041
3436
msgid "Server does not support --deepen"
3437
msgstr ""
3438
3044
-#: fetch-pack.c:1000
3439
+#: fetch-pack.c:1058
3440
msgid "no common commits"
3441
msgstr ""
3442
3048
-#: fetch-pack.c:1012 fetch-pack.c:1468
3443
+#: fetch-pack.c:1070 fetch-pack.c:1536
3444
msgid "git fetch-pack: fetch failed."
3445
msgstr ""
3446
3052
-#: fetch-pack.c:1150
3447
+#: fetch-pack.c:1209
3448
msgid "Server does not support shallow requests"
3449
msgstr ""
3450
3056
-#: fetch-pack.c:1157
3451
+#: fetch-pack.c:1216
3452
msgid "Server supports filter"
3453
msgstr ""
3454
3060
-#: fetch-pack.c:1180
3455
+#: fetch-pack.c:1239
3456
msgid "unable to write request to remote"
3457
msgstr ""
3458
3064
-#: fetch-pack.c:1198
3459
+#: fetch-pack.c:1257
3460
#, c-format
3461
msgid "error reading section header '%s'"
3462
msgstr ""
3463
3069
-#: fetch-pack.c:1204
3464
+#: fetch-pack.c:1263
3465
#, c-format
3466
msgid "expected '%s', received '%s'"
3467
msgstr ""
3468
3074
-#: fetch-pack.c:1243
3469
+#: fetch-pack.c:1303
3470
#, c-format
3471
msgid "unexpected acknowledgment line: '%s'"
3472
msgstr ""
3473
3079
-#: fetch-pack.c:1248
3474
+#: fetch-pack.c:1308
3475
#, c-format
3476
msgid "error processing acks: %d"
3477
msgstr ""
3478
3084
-#: fetch-pack.c:1258
3479
+#: fetch-pack.c:1318
3480
msgid "expected packfile to be sent after 'ready'"
3481
msgstr ""
3482
3088
-#: fetch-pack.c:1260
3483
+#: fetch-pack.c:1320
3484
msgid "expected no other sections to be sent after no 'ready'"
3485
msgstr ""
3486
3092
-#: fetch-pack.c:1302
3487
+#: fetch-pack.c:1362
3488
#, c-format
3489
msgid "error processing shallow info: %d"
3490
msgstr ""
3491
3097
-#: fetch-pack.c:1349
3492
+#: fetch-pack.c:1409
3493
#, c-format
3494
msgid "expected wanted-ref, got '%s'"
3495
msgstr ""
3496
3102
-#: fetch-pack.c:1354
3497
+#: fetch-pack.c:1414
3498
#, c-format
3499
msgid "unexpected wanted-ref: '%s'"
3500
msgstr ""
3501
3107
-#: fetch-pack.c:1359
3502
+#: fetch-pack.c:1419
3503
#, c-format
3504
msgid "error processing wanted refs: %d"
3505
msgstr ""
3506
3112
-#: fetch-pack.c:1693
3507
+#: fetch-pack.c:1762
3508
msgid "no matching remote head"
3509
msgstr ""
3510
3116
-#: fetch-pack.c:1716 builtin/clone.c:685
3511
+#: fetch-pack.c:1785 builtin/clone.c:688
3512
msgid "remote did not send all necessary objects"
3513
msgstr ""
3514
3120
-#: fetch-pack.c:1743
3515
+#: fetch-pack.c:1812
3516
#, c-format
3517
msgid "no such remote ref %s"
3518
msgstr ""
3519
3125
-#: fetch-pack.c:1746
3520
+#: fetch-pack.c:1815
3521
#, c-format
3522
msgid "Server does not allow request for unadvertised object %s"
3523
msgstr ""
3524
3130
-#: gpg-interface.c:321
3131
-msgid "gpg failed to sign the data"
3132
-msgstr ""
3133
-
3134
-#: gpg-interface.c:347
3525
+#: gpg-interface.c:223
3526
msgid "could not create temporary file"
3527
msgstr ""
3528
3138
-#: gpg-interface.c:350
3529
+#: gpg-interface.c:226
3530
#, c-format
3531
msgid "failed writing detached signature to '%s'"
3532
msgstr ""
3533
3143
-#: graph.c:97
3534
+#: gpg-interface.c:390
3535
+msgid "gpg failed to sign the data"
3536
+msgstr ""
3537
+
3538
+#: graph.c:98
3539
#, c-format
3540
msgid "ignore invalid color '%.*s' in log.graphColors"
3541
msgstr ""
@@ -3156,7 +3551,7 @@ msgstr ""
3551
msgid "'%s': unable to read %s"
3552
msgstr ""
3553
3159
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
3554
+#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82
3555
#: builtin/rm.c:135
3556
#, c-format
3557
msgid "failed to stat '%s'"
@@ -3212,7 +3607,7 @@ msgid "Low-level Commands / Interrogators"
3607
msgstr ""
3608
3609
#: help.c:37
3215
-msgid "Low-level Commands / Synching Repositories"
3610
+msgid "Low-level Commands / Syncing Repositories"
3611
msgstr ""
3612
3613
#: help.c:38
@@ -3356,7 +3751,7 @@ msgstr ""
3751
msgid "name consists only of disallowed characters: %s"
3752
msgstr ""
3753
3359
-#: ident.c:436 builtin/commit.c:611
3754
+#: ident.c:436 builtin/commit.c:631
3755
#, c-format
3756
msgid "invalid date format: %s"
3757
msgstr ""
@@ -3434,7 +3829,7 @@ msgid "failed to read the cache"
3829
msgstr ""
3830
3831
#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
3437
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
3832
+#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809
3833
#: builtin/stash.c:264
3834
msgid "unable to write new index file"
3835
msgstr ""
@@ -3607,7 +4002,7 @@ msgstr ""
4002
msgid "renamed"
4003
msgstr ""
4004
3610
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
4005
+#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
4006
#, c-format
4007
msgid "Refusing to lose dirty file at %s"
4008
msgstr ""
@@ -3648,7 +4043,7 @@ msgstr ""
4043
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4044
msgstr ""
4045
3651
-#: merge-recursive.c:2056
4046
+#: merge-recursive.c:2114
4047
#, c-format
4048
msgid ""
4049
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3656,172 +4051,172 @@ msgid ""
4051
"getting a majority of the files."
4052
msgstr ""
4053
3659
-#: merge-recursive.c:2088
4054
+#: merge-recursive.c:2146
4055
#, c-format
4056
msgid ""
4057
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4058
"implicit directory rename(s) putting the following path(s) there: %s."
4059
msgstr ""
4060
3666
-#: merge-recursive.c:2098
4061
+#: merge-recursive.c:2156
4062
#, c-format
4063
msgid ""
4064
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4065
"implicit directory renames tried to put these paths there: %s"
4066
msgstr ""
4067
3673
-#: merge-recursive.c:2190
4068
+#: merge-recursive.c:2248
4069
#, c-format
4070
msgid ""
4071
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4072
">%s in %s"
4073
msgstr ""
4074
3680
-#: merge-recursive.c:2435
4075
+#: merge-recursive.c:2493
4076
#, c-format
4077
msgid ""
4078
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4079
"renamed."
4080
msgstr ""
4081
3687
-#: merge-recursive.c:2961
4082
+#: merge-recursive.c:3019
4083
#, c-format
4084
msgid "cannot read object %s"
4085
msgstr ""
4086
3692
-#: merge-recursive.c:2964
4087
+#: merge-recursive.c:3022
4088
#, c-format
4089
msgid "object %s is not a blob"
4090
msgstr ""
4091
3697
-#: merge-recursive.c:3028
4092
+#: merge-recursive.c:3086
4093
msgid "modify"
4094
msgstr ""
4095
3701
-#: merge-recursive.c:3028
4096
+#: merge-recursive.c:3086
4097
msgid "modified"
4098
msgstr ""
4099
3705
-#: merge-recursive.c:3040
4100
+#: merge-recursive.c:3098
4101
msgid "content"
4102
msgstr ""
4103
3709
-#: merge-recursive.c:3044
4104
+#: merge-recursive.c:3102
4105
msgid "add/add"
4106
msgstr ""
4107
3713
-#: merge-recursive.c:3067
4108
+#: merge-recursive.c:3125
4109
#, c-format
4110
msgid "Skipped %s (merged same as existing)"
4111
msgstr ""
4112
3718
-#: merge-recursive.c:3089 git-submodule.sh:937
4113
+#: merge-recursive.c:3147 git-submodule.sh:993
4114
msgid "submodule"
4115
msgstr ""
4116
3722
-#: merge-recursive.c:3090
4117
+#: merge-recursive.c:3148
4118
#, c-format
4119
msgid "CONFLICT (%s): Merge conflict in %s"
4120
msgstr ""
4121
3727
-#: merge-recursive.c:3120
4122
+#: merge-recursive.c:3178
4123
#, c-format
4124
msgid "Adding as %s instead"
4125
msgstr ""
4126
3732
-#: merge-recursive.c:3203
4127
+#: merge-recursive.c:3261
4128
#, c-format
4129
msgid ""
4130
"Path updated: %s added in %s inside a directory that was renamed in %s; "
4131
"moving it to %s."
4132
msgstr ""
4133
3739
-#: merge-recursive.c:3206
4134
+#: merge-recursive.c:3264
4135
#, c-format
4136
msgid ""
4137
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4138
"in %s, suggesting it should perhaps be moved to %s."
4139
msgstr ""
4140
3746
-#: merge-recursive.c:3210
4141
+#: merge-recursive.c:3268
4142
#, c-format
4143
msgid ""
4144
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4145
"%s; moving it to %s."
4146
msgstr ""
4147
3753
-#: merge-recursive.c:3213
4148
+#: merge-recursive.c:3271
4149
#, c-format
4150
msgid ""
4151
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4152
"was renamed in %s, suggesting it should perhaps be moved to %s."
4153
msgstr ""
4154
3760
-#: merge-recursive.c:3327
4155
+#: merge-recursive.c:3385
4156
#, c-format
4157
msgid "Removing %s"
4158
msgstr ""
4159
3765
-#: merge-recursive.c:3350
4160
+#: merge-recursive.c:3408
4161
msgid "file/directory"
4162
msgstr ""
4163
3769
-#: merge-recursive.c:3355
4164
+#: merge-recursive.c:3413
4165
msgid "directory/file"
4166
msgstr ""
4167
3773
-#: merge-recursive.c:3362
4168
+#: merge-recursive.c:3420
4169
#, c-format
4170
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4171
msgstr ""
4172
3778
-#: merge-recursive.c:3371
4173
+#: merge-recursive.c:3429
4174
#, c-format
4175
msgid "Adding %s"
4176
msgstr ""
4177
3783
-#: merge-recursive.c:3380
4178
+#: merge-recursive.c:3438
4179
#, c-format
4180
msgid "CONFLICT (add/add): Merge conflict in %s"
4181
msgstr ""
4182
3788
-#: merge-recursive.c:3424
4183
+#: merge-recursive.c:3482
4184
msgid "Already up to date!"
4185
msgstr ""
4186
3792
-#: merge-recursive.c:3433
4187
+#: merge-recursive.c:3491
4188
#, c-format
4189
msgid "merging of trees %s and %s failed"
4190
msgstr ""
4191
3797
-#: merge-recursive.c:3537
4192
+#: merge-recursive.c:3595
4193
msgid "Merging:"
4194
msgstr ""
4195
3801
-#: merge-recursive.c:3550
4196
+#: merge-recursive.c:3608
4197
#, c-format
4198
msgid "found %u common ancestor:"
4199
msgid_plural "found %u common ancestors:"
4200
msgstr[0] ""
4201
msgstr[1] ""
4202
3808
-#: merge-recursive.c:3600
4203
+#: merge-recursive.c:3658
4204
msgid "merge returned no commit"
4205
msgstr ""
4206
3812
-#: merge-recursive.c:3659
4207
+#: merge-recursive.c:3717
4208
#, c-format
4209
msgid ""
4210
"Your local changes to the following files would be overwritten by merge:\n"
4211
" %s"
4212
msgstr ""
4213
3819
-#: merge-recursive.c:3756
4214
+#: merge-recursive.c:3814
4215
#, c-format
4216
msgid "Could not parse object '%s'"
4217
msgstr ""
4218
3824
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
4219
+#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874
4220
msgid "Unable to write index."
4221
msgstr ""
4222
@@ -3887,78 +4282,94 @@ msgstr ""
4282
msgid "error preparing packfile from multi-pack-index"
4283
msgstr ""
4284
3890
-#: midx.c:469
4285
+#: midx.c:472
4286
#, c-format
4287
msgid "failed to add packfile '%s'"
4288
msgstr ""
4289
3895
-#: midx.c:475
4290
+#: midx.c:478
4291
#, c-format
4292
msgid "failed to open pack-index '%s'"
4293
msgstr ""
4294
3900
-#: midx.c:535
4295
+#: midx.c:538
4296
#, c-format
4297
msgid "failed to locate object %d in packfile"
4298
msgstr ""
4299
3905
-#: midx.c:864
4300
+#: midx.c:842
4301
+msgid "Adding packfiles to multi-pack-index"
4302
+msgstr ""
4303
+
4304
+#: midx.c:875
4305
#, c-format
4306
msgid "did not see pack-file %s to drop"
4307
msgstr ""
4308
3910
-#: midx.c:1035
4309
+#: midx.c:973
4310
+msgid "Writing chunks to multi-pack-index"
4311
+msgstr ""
4312
+
4313
+#: midx.c:1052
4314
#, c-format
4315
msgid "failed to clear multi-pack-index at %s"
4316
msgstr ""
4317
3915
-#: midx.c:1090
4318
+#: midx.c:1108
4319
msgid "Looking for referenced packfiles"
4320
msgstr ""
4321
3919
-#: midx.c:1105
4322
+#: midx.c:1123
4323
#, c-format
4324
msgid ""
4325
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4326
msgstr ""
4327
3925
-#: midx.c:1109
3926
-msgid "Verifying OID order in MIDX"
4328
+#: midx.c:1128
4329
+msgid "Verifying OID order in multi-pack-index"
4330
msgstr ""
4331
3929
-#: midx.c:1118
4332
+#: midx.c:1137
4333
#, c-format
4334
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
4335
msgstr ""
4336
3934
-#: midx.c:1137
4337
+#: midx.c:1157
4338
msgid "Sorting objects by packfile"
4339
msgstr ""
4340
3938
-#: midx.c:1143
4341
+#: midx.c:1164
4342
msgid "Verifying object offsets"
4343
msgstr ""
4344
3942
-#: midx.c:1159
4345
+#: midx.c:1180
4346
#, c-format
4347
msgid "failed to load pack entry for oid[%d] = %s"
4348
msgstr ""
4349
3947
-#: midx.c:1165
4350
+#: midx.c:1186
4351
#, c-format
4352
msgid "failed to load pack-index for packfile %s"
4353
msgstr ""
4354
3952
-#: midx.c:1174
4355
+#: midx.c:1195
4356
#, c-format
4357
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
4358
msgstr ""
4359
3957
-#: midx.c:1349
4360
+#: midx.c:1220
4361
+msgid "Counting referenced objects"
4362
+msgstr ""
4363
+
4364
+#: midx.c:1230
4365
+msgid "Finding and deleting unreferenced packfiles"
4366
+msgstr ""
4367
+
4368
+#: midx.c:1388
4369
msgid "could not start pack-objects"
4370
msgstr ""
4371
3961
-#: midx.c:1368
4372
+#: midx.c:1407
4373
msgid "could not finish pack-objects"
4374
msgstr ""
4375
@@ -4042,12 +4453,12 @@ msgstr ""
4453
msgid "offset before end of packfile (broken .idx?)"
4454
msgstr ""
4455
4045
-#: packfile.c:1887
4456
+#: packfile.c:1888
4457
#, c-format
4458
msgid "offset before start of pack index for %s (corrupt index?)"
4459
msgstr ""
4460
4050
-#: packfile.c:1891
4461
+#: packfile.c:1892
4462
#, c-format
4463
msgid "offset beyond end of pack index for %s (truncated index?)"
4464
msgstr ""
@@ -4158,82 +4569,87 @@ msgstr ""
4569
msgid "malformed object name '%s'"
4570
msgstr ""
4571
4161
-#: path.c:897
4572
+#: path.c:915
4573
#, c-format
4574
msgid "Could not make %s writable by group"
4575
msgstr ""
4576
4166
-#: pathspec.c:128
4577
+#: pathspec.c:130
4578
msgid "Escape character '\\' not allowed as last character in attr value"
4579
msgstr ""
4580
4170
-#: pathspec.c:146
4581
+#: pathspec.c:148
4582
msgid "Only one 'attr:' specification is allowed."
4583
msgstr ""
4584
4174
-#: pathspec.c:149
4585
+#: pathspec.c:151
4586
msgid "attr spec must not be empty"
4587
msgstr ""
4588
4178
-#: pathspec.c:192
4589
+#: pathspec.c:194
4590
#, c-format
4591
msgid "invalid attribute name %s"
4592
msgstr ""
4593
4183
-#: pathspec.c:257
4594
+#: pathspec.c:259
4595
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
4596
msgstr ""
4597
4187
-#: pathspec.c:264
4598
+#: pathspec.c:266
4599
msgid ""
4600
"global 'literal' pathspec setting is incompatible with all other global "
4601
"pathspec settings"
4602
msgstr ""
4603
4193
-#: pathspec.c:304
4604
+#: pathspec.c:306
4605
msgid "invalid parameter for pathspec magic 'prefix'"
4606
msgstr ""
4607
4197
-#: pathspec.c:325
4608
+#: pathspec.c:327
4609
#, c-format
4610
msgid "Invalid pathspec magic '%.*s' in '%s'"
4611
msgstr ""
4612
4202
-#: pathspec.c:330
4613
+#: pathspec.c:332
4614
#, c-format
4615
msgid "Missing ')' at the end of pathspec magic in '%s'"
4616
msgstr ""
4617
4207
-#: pathspec.c:368
4618
+#: pathspec.c:370
4619
#, c-format
4620
msgid "Unimplemented pathspec magic '%c' in '%s'"
4621
msgstr ""
4622
4212
-#: pathspec.c:427
4623
+#: pathspec.c:429
4624
#, c-format
4625
msgid "%s: 'literal' and 'glob' are incompatible"
4626
msgstr ""
4627
4217
-#: pathspec.c:440
4628
+#: pathspec.c:442
4629
#, c-format
4630
msgid "%s: '%s' is outside repository"
4631
msgstr ""
4632
4222
-#: pathspec.c:514
4633
+#: pathspec.c:516
4634
#, c-format
4635
msgid "'%s' (mnemonic: '%c')"
4636
msgstr ""
4637
4227
-#: pathspec.c:524
4638
+#: pathspec.c:526
4639
#, c-format
4640
msgid "%s: pathspec magic not supported by this command: %s"
4641
msgstr ""
4642
4232
-#: pathspec.c:591
4643
+#: pathspec.c:593
4644
#, c-format
4645
msgid "pathspec '%s' is beyond a symbolic link"
4646
msgstr ""
4647
4648
+#: pathspec.c:638
4649
+#, c-format
4650
+msgid "line is badly quoted: %s"
4651
+msgstr ""
4652
+
4653
#: pkt-line.c:92
4654
msgid "unable to write flush packet"
4655
msgstr ""
@@ -4294,42 +4710,42 @@ msgstr ""
4710
msgid "unable to create threaded lstat: %s"
4711
msgstr ""
4712
4297
-#: pretty.c:966
4713
+#: pretty.c:981
4714
msgid "unable to parse --pretty format"
4715
msgstr ""
4716
4301
-#: promisor-remote.c:25
4717
+#: promisor-remote.c:23
4718
msgid "Remote with no URL"
4719
msgstr ""
4720
4305
-#: promisor-remote.c:61
4721
+#: promisor-remote.c:58
4722
#, c-format
4723
msgid "promisor remote name cannot begin with '/': %s"
4724
msgstr ""
4725
4310
-#: range-diff.c:71
4726
+#: range-diff.c:75
4727
msgid "could not start `log`"
4728
msgstr ""
4729
4314
-#: range-diff.c:73
4730
+#: range-diff.c:77
4731
msgid "could not read `log` output"
4732
msgstr ""
4733
4318
-#: range-diff.c:92 sequencer.c:4985
4734
+#: range-diff.c:96 sequencer.c:5163
4735
#, c-format
4736
msgid "could not parse commit '%s'"
4737
msgstr ""
4738
4323
-#: range-diff.c:118
4739
+#: range-diff.c:122
4740
#, c-format
4741
msgid "could not parse git header '%.*s'"
4742
msgstr ""
4743
4328
-#: range-diff.c:275
4744
+#: range-diff.c:285
4745
msgid "failed to generate diff"
4746
msgstr ""
4747
4332
-#: range-diff.c:507 range-diff.c:509
4748
+#: range-diff.c:518 range-diff.c:520
4749
#, c-format
4750
msgid "could not parse log for '%s'"
4751
msgstr ""
@@ -4368,161 +4784,161 @@ msgstr ""
4784
msgid "unable to stat '%s'"
4785
msgstr ""
4786
4371
-#: read-cache.c:1314
4787
+#: read-cache.c:1325
4788
#, c-format
4789
msgid "'%s' appears as both a file and as a directory"
4790
msgstr ""
4791
4376
-#: read-cache.c:1520
4792
+#: read-cache.c:1531
4793
msgid "Refresh index"
4794
msgstr ""
4795
4380
-#: read-cache.c:1635
4796
+#: read-cache.c:1646
4797
#, c-format
4798
msgid ""
4799
"index.version set, but the value is invalid.\n"
4800
"Using version %i"
4801
msgstr ""
4802
4387
-#: read-cache.c:1645
4803
+#: read-cache.c:1656
4804
#, c-format
4805
msgid ""
4806
"GIT_INDEX_VERSION set, but the value is invalid.\n"
4807
"Using version %i"
4808
msgstr ""
4809
4394
-#: read-cache.c:1701
4810
+#: read-cache.c:1712
4811
#, c-format
4812
msgid "bad signature 0x%08x"
4813
msgstr ""
4814
4399
-#: read-cache.c:1704
4815
+#: read-cache.c:1715
4816
#, c-format
4817
msgid "bad index version %d"
4818
msgstr ""
4819
4404
-#: read-cache.c:1713
4820
+#: read-cache.c:1724
4821
msgid "bad index file sha1 signature"
4822
msgstr ""
4823
4408
-#: read-cache.c:1743
4824
+#: read-cache.c:1754
4825
#, c-format
4826
msgid "index uses %.4s extension, which we do not understand"
4827
msgstr ""
4828
4413
-#: read-cache.c:1745
4829
+#: read-cache.c:1756
4830
#, c-format
4831
msgid "ignoring %.4s extension"
4832
msgstr ""
4833
4418
-#: read-cache.c:1782
4834
+#: read-cache.c:1793
4835
#, c-format
4836
msgid "unknown index entry format 0x%08x"
4837
msgstr ""
4838
4423
-#: read-cache.c:1798
4839
+#: read-cache.c:1809
4840
#, c-format
4841
msgid "malformed name field in the index, near path '%s'"
4842
msgstr ""
4843
4428
-#: read-cache.c:1855
4844
+#: read-cache.c:1866
4845
msgid "unordered stage entries in index"
4846
msgstr ""
4847
4432
-#: read-cache.c:1858
4848
+#: read-cache.c:1869
4849
#, c-format
4850
msgid "multiple stage entries for merged file '%s'"
4851
msgstr ""
4852
4437
-#: read-cache.c:1861
4853
+#: read-cache.c:1872
4854
#, c-format
4855
msgid "unordered stage entries for '%s'"
4856
msgstr ""
4857
4442
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
4443
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
4444
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
4858
+#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111
4859
+#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470
4860
+#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367
4861
#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
4446
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
4862
+#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332
4863
msgid "index file corrupt"
4864
msgstr ""
4865
4450
-#: read-cache.c:2108
4866
+#: read-cache.c:2119
4867
#, c-format
4868
msgid "unable to create load_cache_entries thread: %s"
4869
msgstr ""
4870
4455
-#: read-cache.c:2121
4871
+#: read-cache.c:2132
4872
#, c-format
4873
msgid "unable to join load_cache_entries thread: %s"
4874
msgstr ""
4875
4460
-#: read-cache.c:2154
4876
+#: read-cache.c:2165
4877
#, c-format
4878
msgid "%s: index file open failed"
4879
msgstr ""
4880
4465
-#: read-cache.c:2158
4881
+#: read-cache.c:2169
4882
#, c-format
4883
msgid "%s: cannot stat the open index"
4884
msgstr ""
4885
4470
-#: read-cache.c:2162
4886
+#: read-cache.c:2173
4887
#, c-format
4888
msgid "%s: index file smaller than expected"
4889
msgstr ""
4890
4475
-#: read-cache.c:2166
4891
+#: read-cache.c:2177
4892
#, c-format
4893
msgid "%s: unable to map index file"
4894
msgstr ""
4895
4480
-#: read-cache.c:2208
4896
+#: read-cache.c:2219
4897
#, c-format
4898
msgid "unable to create load_index_extensions thread: %s"
4899
msgstr ""
4900
4485
-#: read-cache.c:2235
4901
+#: read-cache.c:2246
4902
#, c-format
4903
msgid "unable to join load_index_extensions thread: %s"
4904
msgstr ""
4905
4490
-#: read-cache.c:2267
4906
+#: read-cache.c:2278
4907
#, c-format
4908
msgid "could not freshen shared index '%s'"
4909
msgstr ""
4910
4495
-#: read-cache.c:2314
4911
+#: read-cache.c:2325
4912
#, c-format
4913
msgid "broken index, expect %s in %s, got %s"
4914
msgstr ""
4915
4500
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
4916
+#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119
4917
#, c-format
4918
msgid "could not close '%s'"
4919
msgstr ""
4920
4505
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
4921
+#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069
4922
#, c-format
4923
msgid "could not stat '%s'"
4924
msgstr ""
4925
4510
-#: read-cache.c:3126
4926
+#: read-cache.c:3137
4927
#, c-format
4928
msgid "unable to open git dir: %s"
4929
msgstr ""
4930
4515
-#: read-cache.c:3138
4931
+#: read-cache.c:3149
4932
#, c-format
4933
msgid "unable to unlink: %s"
4934
msgstr ""
4935
4520
-#: read-cache.c:3163
4936
+#: read-cache.c:3174
4937
#, c-format
4938
msgid "cannot fix permission bits on '%s'"
4939
msgstr ""
4940
4525
-#: read-cache.c:3312
4941
+#: read-cache.c:3323
4942
#, c-format
4943
msgid "%s: cannot drop to stage #0"
4944
msgstr ""
@@ -4594,8 +5010,8 @@ msgstr ""
5010
msgid "Note that empty commits are commented out"
5011
msgstr ""
5012
4597
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
4598
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
5013
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536
5014
+#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254
5015
#, c-format
5016
msgid "could not write '%s'"
5017
msgstr ""
@@ -4658,14 +5074,15 @@ msgstr ""
5074
msgid "unexpected object ID when writing '%s'"
5075
msgstr ""
5076
4661
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
4662
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
5077
+#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997
5078
+#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
5079
+#: wrapper.c:620
5080
#, c-format
5081
msgid "could not write to '%s'"
5082
msgstr ""
5083
4667
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
4668
-#: builtin/rebase.c:1004
5084
+#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5085
+#: builtin/rebase.c:1031
5086
#, c-format
5087
msgid "could not open '%s' for writing"
5088
msgstr ""
@@ -5299,8 +5716,8 @@ msgstr ""
5716
msgid "Recorded preimage for '%s'"
5717
msgstr ""
5718
5302
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
5303
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
5719
+#: rerere.c:881 submodule.c:2067 builtin/log.c:1871
5720
+#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448
5721
#, c-format
5722
msgid "could not create directory '%s'"
5723
msgstr ""
@@ -5334,158 +5751,158 @@ msgstr ""
5751
msgid "unable to open rr-cache directory"
5752
msgstr ""
5753
5337
-#: revision.c:2509
5754
+#: revision.c:2497
5755
msgid "your current branch appears to be broken"
5756
msgstr ""
5757
5341
-#: revision.c:2512
5758
+#: revision.c:2500
5759
#, c-format
5760
msgid "your current branch '%s' does not have any commits yet"
5761
msgstr ""
5762
5346
-#: revision.c:2720
5763
+#: revision.c:2708
5764
msgid "--first-parent is incompatible with --bisect"
5765
msgstr ""
5766
5350
-#: revision.c:2724
5767
+#: revision.c:2712
5768
msgid "-L does not yet support diff formats besides -p and -s"
5769
msgstr ""
5770
5354
-#: run-command.c:763
5771
+#: run-command.c:762
5772
msgid "open /dev/null failed"
5773
msgstr ""
5774
5358
-#: run-command.c:1269
5775
+#: run-command.c:1268
5776
#, c-format
5777
msgid "cannot create async thread: %s"
5778
msgstr ""
5779
5363
-#: run-command.c:1333
5780
+#: run-command.c:1332
5781
#, c-format
5782
msgid ""
5783
"The '%s' hook was ignored because it's not set as executable.\n"
5784
"You can disable this warning with `git config advice.ignoredHook false`."
5785
msgstr ""
5786
5370
-#: send-pack.c:142
5787
+#: send-pack.c:144
5788
msgid "unexpected flush packet while reading remote unpack status"
5789
msgstr ""
5790
5374
-#: send-pack.c:144
5791
+#: send-pack.c:146
5792
#, c-format
5793
msgid "unable to parse remote unpack status: %s"
5794
msgstr ""
5795
5379
-#: send-pack.c:146
5796
+#: send-pack.c:148
5797
#, c-format
5798
msgid "remote unpack failed: %s"
5799
msgstr ""
5800
5384
-#: send-pack.c:307
5801
+#: send-pack.c:309
5802
msgid "failed to sign the push certificate"
5803
msgstr ""
5804
5388
-#: send-pack.c:421
5805
+#: send-pack.c:423
5806
msgid "the receiving end does not support --signed push"
5807
msgstr ""
5808
5392
-#: send-pack.c:423
5809
+#: send-pack.c:425
5810
msgid ""
5811
"not sending a push certificate since the receiving end does not support --"
5812
"signed push"
5813
msgstr ""
5814
5398
-#: send-pack.c:435
5815
+#: send-pack.c:437
5816
msgid "the receiving end does not support --atomic push"
5817
msgstr ""
5818
5402
-#: send-pack.c:440
5819
+#: send-pack.c:442
5820
msgid "the receiving end does not support push options"
5821
msgstr ""
5822
5406
-#: sequencer.c:187
5823
+#: sequencer.c:189
5824
#, c-format
5825
msgid "invalid commit message cleanup mode '%s'"
5826
msgstr ""
5827
5411
-#: sequencer.c:292
5828
+#: sequencer.c:294
5829
#, c-format
5830
msgid "could not delete '%s'"
5831
msgstr ""
5832
5416
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
5833
+#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369
5834
#, c-format
5835
msgid "could not remove '%s'"
5836
msgstr ""
5837
5421
-#: sequencer.c:321
5838
+#: sequencer.c:323
5839
msgid "revert"
5840
msgstr ""
5841
5425
-#: sequencer.c:323
5842
+#: sequencer.c:325
5843
msgid "cherry-pick"
5844
msgstr ""
5845
5429
-#: sequencer.c:325
5846
+#: sequencer.c:327
5847
msgid "rebase -i"
5848
msgstr ""
5849
5433
-#: sequencer.c:327
5850
+#: sequencer.c:329
5851
#, c-format
5852
msgid "unknown action: %d"
5853
msgstr ""
5854
5438
-#: sequencer.c:385
5855
+#: sequencer.c:387
5856
msgid ""
5857
"after resolving the conflicts, mark the corrected paths\n"
5858
"with 'git add <paths>' or 'git rm <paths>'"
5859
msgstr ""
5860
5444
-#: sequencer.c:388
5861
+#: sequencer.c:390
5862
msgid ""
5863
"after resolving the conflicts, mark the corrected paths\n"
5864
"with 'git add <paths>' or 'git rm <paths>'\n"
5865
"and commit the result with 'git commit'"
5866
msgstr ""
5867
5451
-#: sequencer.c:401 sequencer.c:2847
5868
+#: sequencer.c:403 sequencer.c:2993
5869
#, c-format
5870
msgid "could not lock '%s'"
5871
msgstr ""
5872
5456
-#: sequencer.c:408
5873
+#: sequencer.c:410
5874
#, c-format
5875
msgid "could not write eol to '%s'"
5876
msgstr ""
5877
5461
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
5462
-#: sequencer.c:3130
5878
+#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
5879
+#: sequencer.c:3277
5880
#, c-format
5881
msgid "failed to finalize '%s'"
5882
msgstr ""
5883
5467
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
5468
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
5469
-#: builtin/rebase.c:568
5884
+#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
5885
+#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
5886
+#: builtin/rebase.c:589
5887
#, c-format
5888
msgid "could not read '%s'"
5889
msgstr ""
5890
5474
-#: sequencer.c:462
5891
+#: sequencer.c:464
5892
#, c-format
5893
msgid "your local changes would be overwritten by %s."
5894
msgstr ""
5895
5479
-#: sequencer.c:466
5896
+#: sequencer.c:468
5897
msgid "commit your changes or stash them to proceed."
5898
msgstr ""
5899
5483
-#: sequencer.c:498
5900
+#: sequencer.c:500
5901
#, c-format
5902
msgid "%s: fast-forward"
5903
msgstr ""
5904
5488
-#: sequencer.c:537 builtin/tag.c:565
5905
+#: sequencer.c:539 builtin/tag.c:565
5906
#, c-format
5907
msgid "Invalid cleanup mode %s"
5908
msgstr ""
@@ -5493,65 +5910,69 @@ msgstr ""
5910
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
5911
#. "rebase -i".
5912
#.
5496
-#: sequencer.c:631
5913
+#: sequencer.c:633
5914
#, c-format
5915
msgid "%s: Unable to write new index file"
5916
msgstr ""
5917
5501
-#: sequencer.c:648
5918
+#: sequencer.c:650
5919
msgid "unable to update cache tree"
5920
msgstr ""
5921
5505
-#: sequencer.c:662
5922
+#: sequencer.c:664
5923
msgid "could not resolve HEAD commit"
5924
msgstr ""
5925
5509
-#: sequencer.c:742
5926
+#: sequencer.c:744
5927
#, c-format
5928
msgid "no key present in '%.*s'"
5929
msgstr ""
5930
5514
-#: sequencer.c:753
5931
+#: sequencer.c:755
5932
#, c-format
5933
msgid "unable to dequote value of '%s'"
5934
msgstr ""
5935
5519
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
5520
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
5936
+#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705
5937
+#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074
5938
#, c-format
5939
msgid "could not open '%s' for reading"
5940
msgstr ""
5941
5525
-#: sequencer.c:800
5942
+#: sequencer.c:802
5943
msgid "'GIT_AUTHOR_NAME' already given"
5944
msgstr ""
5945
5529
-#: sequencer.c:805
5946
+#: sequencer.c:807
5947
msgid "'GIT_AUTHOR_EMAIL' already given"
5948
msgstr ""
5949
5533
-#: sequencer.c:810
5950
+#: sequencer.c:812
5951
msgid "'GIT_AUTHOR_DATE' already given"
5952
msgstr ""
5953
5537
-#: sequencer.c:814
5954
+#: sequencer.c:816
5955
#, c-format
5956
msgid "unknown variable '%s'"
5957
msgstr ""
5958
5542
-#: sequencer.c:819
5959
+#: sequencer.c:821
5960
msgid "missing 'GIT_AUTHOR_NAME'"
5961
msgstr ""
5962
5546
-#: sequencer.c:821
5963
+#: sequencer.c:823
5964
msgid "missing 'GIT_AUTHOR_EMAIL'"
5965
msgstr ""
5966
5550
-#: sequencer.c:823
5967
+#: sequencer.c:825
5968
msgid "missing 'GIT_AUTHOR_DATE'"
5969
msgstr ""
5970
5554
-#: sequencer.c:872
5971
+#: sequencer.c:902 sequencer.c:1427
5972
+msgid "malformed ident line"
5973
+msgstr ""
5974
+
5975
+#: sequencer.c:925
5976
#, c-format
5977
msgid ""
5978
"you have staged changes in your working tree\n"
@@ -5568,11 +5989,11 @@ msgid ""
5989
" git rebase --continue\n"
5990
msgstr ""
5991
5571
-#: sequencer.c:1146
5992
+#: sequencer.c:1218
5993
msgid "'prepare-commit-msg' hook failed"
5994
msgstr ""
5995
5575
-#: sequencer.c:1153
5996
+#: sequencer.c:1224
5997
msgid ""
5998
"Your name and email address were configured automatically based\n"
5999
"on your username and hostname. Please check that they are accurate.\n"
@@ -5587,7 +6008,7 @@ msgid ""
6008
" git commit --amend --reset-author\n"
6009
msgstr ""
6010
5590
-#: sequencer.c:1166
6011
+#: sequencer.c:1237
6012
msgid ""
6013
"Your name and email address were configured automatically based\n"
6014
"on your username and hostname. Please check that they are accurate.\n"
@@ -5601,346 +6022,350 @@ msgid ""
6022
" git commit --amend --reset-author\n"
6023
msgstr ""
6024
5604
-#: sequencer.c:1208
6025
+#: sequencer.c:1279
6026
msgid "couldn't look up newly created commit"
6027
msgstr ""
6028
5608
-#: sequencer.c:1210
6029
+#: sequencer.c:1281
6030
msgid "could not parse newly created commit"
6031
msgstr ""
6032
5612
-#: sequencer.c:1256
6033
+#: sequencer.c:1327
6034
msgid "unable to resolve HEAD after creating commit"
6035
msgstr ""
6036
5616
-#: sequencer.c:1258
6037
+#: sequencer.c:1329
6038
msgid "detached HEAD"
6039
msgstr ""
6040
5620
-#: sequencer.c:1262
6041
+#: sequencer.c:1333
6042
msgid " (root-commit)"
6043
msgstr ""
6044
5624
-#: sequencer.c:1283
6045
+#: sequencer.c:1354
6046
msgid "could not parse HEAD"
6047
msgstr ""
6048
5628
-#: sequencer.c:1285
6049
+#: sequencer.c:1356
6050
#, c-format
6051
msgid "HEAD %s is not a commit!"
6052
msgstr ""
6053
5633
-#: sequencer.c:1289 builtin/commit.c:1571
6054
+#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569
6055
msgid "could not parse HEAD commit"
6056
msgstr ""
6057
5637
-#: sequencer.c:1341 sequencer.c:1933
6058
+#: sequencer.c:1411 sequencer.c:2055
6059
msgid "unable to parse commit author"
6060
msgstr ""
6061
5641
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
6062
+#: sequencer.c:1431
6063
+msgid "corrupted author without date information"
6064
+msgstr ""
6065
+
6066
+#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684
6067
msgid "git write-tree failed to write a tree"
6068
msgstr ""
6069
5645
-#: sequencer.c:1369 sequencer.c:1429
6070
+#: sequencer.c:1480 sequencer.c:1550
6071
#, c-format
6072
msgid "unable to read commit message from '%s'"
6073
msgstr ""
6074
5650
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
6075
+#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883
6076
#: builtin/merge.c:908
6077
msgid "failed to write commit object"
6078
msgstr ""
6079
5655
-#: sequencer.c:1456
6080
+#: sequencer.c:1577
6081
#, c-format
6082
msgid "could not parse commit %s"
6083
msgstr ""
6084
5660
-#: sequencer.c:1461
6085
+#: sequencer.c:1582
6086
#, c-format
6087
msgid "could not parse parent commit %s"
6088
msgstr ""
6089
5665
-#: sequencer.c:1535 sequencer.c:1645
6090
+#: sequencer.c:1656 sequencer.c:1767
6091
#, c-format
6092
msgid "unknown command: %d"
6093
msgstr ""
6094
5670
-#: sequencer.c:1592 sequencer.c:1617
6095
+#: sequencer.c:1714 sequencer.c:1739
6096
#, c-format
6097
msgid "This is a combination of %d commits."
6098
msgstr ""
6099
5675
-#: sequencer.c:1602
6100
+#: sequencer.c:1724
6101
msgid "need a HEAD to fixup"
6102
msgstr ""
6103
5679
-#: sequencer.c:1604 sequencer.c:3157
6104
+#: sequencer.c:1726 sequencer.c:3304
6105
msgid "could not read HEAD"
6106
msgstr ""
6107
5683
-#: sequencer.c:1606
6108
+#: sequencer.c:1728
6109
msgid "could not read HEAD's commit message"
6110
msgstr ""
6111
5687
-#: sequencer.c:1612
6112
+#: sequencer.c:1734
6113
#, c-format
6114
msgid "cannot write '%s'"
6115
msgstr ""
6116
5692
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
6117
+#: sequencer.c:1741 git-rebase--preserve-merges.sh:496
6118
msgid "This is the 1st commit message:"
6119
msgstr ""
6120
5696
-#: sequencer.c:1627
6121
+#: sequencer.c:1749
6122
#, c-format
6123
msgid "could not read commit message of %s"
6124
msgstr ""
6125
5701
-#: sequencer.c:1634
6126
+#: sequencer.c:1756
6127
#, c-format
6128
msgid "This is the commit message #%d:"
6129
msgstr ""
6130
5706
-#: sequencer.c:1640
6131
+#: sequencer.c:1762
6132
#, c-format
6133
msgid "The commit message #%d will be skipped:"
6134
msgstr ""
6135
5711
-#: sequencer.c:1728
6136
+#: sequencer.c:1850
6137
msgid "your index file is unmerged."
6138
msgstr ""
6139
5715
-#: sequencer.c:1735
6140
+#: sequencer.c:1857
6141
msgid "cannot fixup root commit"
6142
msgstr ""
6143
5719
-#: sequencer.c:1754
6144
+#: sequencer.c:1876
6145
#, c-format
6146
msgid "commit %s is a merge but no -m option was given."
6147
msgstr ""
6148
5724
-#: sequencer.c:1762 sequencer.c:1770
6149
+#: sequencer.c:1884 sequencer.c:1892
6150
#, c-format
6151
msgid "commit %s does not have parent %d"
6152
msgstr ""
6153
5729
-#: sequencer.c:1776
6154
+#: sequencer.c:1898
6155
#, c-format
6156
msgid "cannot get commit message for %s"
6157
msgstr ""
6158
6159
#. TRANSLATORS: The first %s will be a "todo" command like
6160
#. "revert" or "pick", the second %s a SHA1.
5736
-#: sequencer.c:1795
6161
+#: sequencer.c:1917
6162
#, c-format
6163
msgid "%s: cannot parse parent commit %s"
6164
msgstr ""
6165
5741
-#: sequencer.c:1860
6166
+#: sequencer.c:1982
6167
#, c-format
6168
msgid "could not rename '%s' to '%s'"
6169
msgstr ""
6170
5746
-#: sequencer.c:1915
6171
+#: sequencer.c:2037
6172
#, c-format
6173
msgid "could not revert %s... %s"
6174
msgstr ""
6175
5751
-#: sequencer.c:1916
6176
+#: sequencer.c:2038
6177
#, c-format
6178
msgid "could not apply %s... %s"
6179
msgstr ""
6180
5756
-#: sequencer.c:1983
6181
+#: sequencer.c:2105
6182
#, c-format
6183
msgid "git %s: failed to read the index"
6184
msgstr ""
6185
5761
-#: sequencer.c:1990
6186
+#: sequencer.c:2112
6187
#, c-format
6188
msgid "git %s: failed to refresh the index"
6189
msgstr ""
6190
5766
-#: sequencer.c:2066
6191
+#: sequencer.c:2189
6192
#, c-format
6193
msgid "%s does not accept arguments: '%s'"
6194
msgstr ""
6195
5771
-#: sequencer.c:2075
6196
+#: sequencer.c:2198
6197
#, c-format
6198
msgid "missing arguments for %s"
6199
msgstr ""
6200
5776
-#: sequencer.c:2112
6201
+#: sequencer.c:2235
6202
#, c-format
6203
msgid "could not parse '%.*s'"
6204
msgstr ""
6205
5781
-#: sequencer.c:2166
6206
+#: sequencer.c:2289
6207
#, c-format
6208
msgid "invalid line %d: %.*s"
6209
msgstr ""
6210
5786
-#: sequencer.c:2177
6211
+#: sequencer.c:2300
6212
#, c-format
6213
msgid "cannot '%s' without a previous commit"
6214
msgstr ""
6215
5791
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
5792
-#: builtin/rebase.c:204 builtin/rebase.c:229
6216
+#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197
6217
+#: builtin/rebase.c:223 builtin/rebase.c:248
6218
#, c-format
6219
msgid "could not read '%s'."
6220
msgstr ""
6221
5797
-#: sequencer.c:2261
6222
+#: sequencer.c:2384
6223
msgid "cancelling a cherry picking in progress"
6224
msgstr ""
6225
5801
-#: sequencer.c:2268
6226
+#: sequencer.c:2391
6227
msgid "cancelling a revert in progress"
6228
msgstr ""
6229
5805
-#: sequencer.c:2302
6230
+#: sequencer.c:2435
6231
msgid "please fix this using 'git rebase --edit-todo'."
6232
msgstr ""
6233
5809
-#: sequencer.c:2304
6234
+#: sequencer.c:2437
6235
#, c-format
6236
msgid "unusable instruction sheet: '%s'"
6237
msgstr ""
6238
5814
-#: sequencer.c:2309
6239
+#: sequencer.c:2442
6240
msgid "no commits parsed."
6241
msgstr ""
6242
5818
-#: sequencer.c:2320
6243
+#: sequencer.c:2453
6244
msgid "cannot cherry-pick during a revert."
6245
msgstr ""
6246
5822
-#: sequencer.c:2322
6247
+#: sequencer.c:2455
6248
msgid "cannot revert during a cherry-pick."
6249
msgstr ""
6250
5826
-#: sequencer.c:2404
6251
+#: sequencer.c:2533
6252
#, c-format
6253
msgid "invalid value for %s: %s"
6254
msgstr ""
6255
5831
-#: sequencer.c:2491
6256
+#: sequencer.c:2630
6257
msgid "unusable squash-onto"
6258
msgstr ""
6259
5835
-#: sequencer.c:2507
6260
+#: sequencer.c:2646
6261
#, c-format
6262
msgid "malformed options sheet: '%s'"
6263
msgstr ""
6264
5840
-#: sequencer.c:2590 sequencer.c:4308
6265
+#: sequencer.c:2736 sequencer.c:4463
6266
msgid "empty commit set passed"
6267
msgstr ""
6268
5844
-#: sequencer.c:2606
6269
+#: sequencer.c:2752
6270
msgid "revert is already in progress"
6271
msgstr ""
6272
5848
-#: sequencer.c:2608
6273
+#: sequencer.c:2754
6274
#, c-format
6275
msgid "try \"git revert (--continue | %s--abort | --quit)\""
6276
msgstr ""
6277
5853
-#: sequencer.c:2611
6278
+#: sequencer.c:2757
6279
msgid "cherry-pick is already in progress"
6280
msgstr ""
6281
5857
-#: sequencer.c:2613
6282
+#: sequencer.c:2759
6283
#, c-format
6284
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
6285
msgstr ""
6286
5862
-#: sequencer.c:2627
6287
+#: sequencer.c:2773
6288
#, c-format
6289
msgid "could not create sequencer directory '%s'"
6290
msgstr ""
6291
5867
-#: sequencer.c:2642
6292
+#: sequencer.c:2788
6293
msgid "could not lock HEAD"
6294
msgstr ""
6295
5871
-#: sequencer.c:2702 sequencer.c:4057
6296
+#: sequencer.c:2848 sequencer.c:4209
6297
msgid "no cherry-pick or revert in progress"
6298
msgstr ""
6299
5875
-#: sequencer.c:2704 sequencer.c:2715
6300
+#: sequencer.c:2850 sequencer.c:2861
6301
msgid "cannot resolve HEAD"
6302
msgstr ""
6303
5879
-#: sequencer.c:2706 sequencer.c:2750
6304
+#: sequencer.c:2852 sequencer.c:2896
6305
msgid "cannot abort from a branch yet to be born"
6306
msgstr ""
6307
5883
-#: sequencer.c:2736 builtin/grep.c:736
6308
+#: sequencer.c:2882 builtin/grep.c:736
6309
#, c-format
6310
msgid "cannot open '%s'"
6311
msgstr ""
6312
5888
-#: sequencer.c:2738
6313
+#: sequencer.c:2884
6314
#, c-format
6315
msgid "cannot read '%s': %s"
6316
msgstr ""
6317
5893
-#: sequencer.c:2739
6318
+#: sequencer.c:2885
6319
msgid "unexpected end of file"
6320
msgstr ""
6321
5897
-#: sequencer.c:2745
6322
+#: sequencer.c:2891
6323
#, c-format
6324
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
6325
msgstr ""
6326
5902
-#: sequencer.c:2756
6327
+#: sequencer.c:2902
6328
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
6329
msgstr ""
6330
5906
-#: sequencer.c:2797
6331
+#: sequencer.c:2943
6332
msgid "no revert in progress"
6333
msgstr ""
6334
5910
-#: sequencer.c:2805
6335
+#: sequencer.c:2951
6336
msgid "no cherry-pick in progress"
6337
msgstr ""
6338
5914
-#: sequencer.c:2815
6339
+#: sequencer.c:2961
6340
msgid "failed to skip the commit"
6341
msgstr ""
6342
5918
-#: sequencer.c:2822
6343
+#: sequencer.c:2968
6344
msgid "there is nothing to skip"
6345
msgstr ""
6346
5922
-#: sequencer.c:2825
6347
+#: sequencer.c:2971
6348
#, c-format
6349
msgid ""
6350
"have you committed already?\n"
6351
"try \"git %s --continue\""
6352
msgstr ""
6353
5929
-#: sequencer.c:2949 sequencer.c:3969
6354
+#: sequencer.c:3095 sequencer.c:4121
6355
#, c-format
6356
msgid "could not update %s"
6357
msgstr ""
6358
5934
-#: sequencer.c:2987 sequencer.c:3949
6359
+#: sequencer.c:3134 sequencer.c:4101
6360
msgid "cannot read HEAD"
6361
msgstr ""
6362
5938
-#: sequencer.c:3004
6363
+#: sequencer.c:3151
6364
#, c-format
6365
msgid "unable to copy '%s' to '%s'"
6366
msgstr ""
6367
5943
-#: sequencer.c:3012
6368
+#: sequencer.c:3159
6369
#, c-format
6370
msgid ""
6371
"You can amend the commit now, with\n"
@@ -5952,27 +6377,22 @@ msgid ""
6377
" git rebase --continue\n"
6378
msgstr ""
6379
5955
-#: sequencer.c:3022
6380
+#: sequencer.c:3169
6381
#, c-format
6382
msgid "Could not apply %s... %.*s"
6383
msgstr ""
6384
5960
-#: sequencer.c:3029
6385
+#: sequencer.c:3176
6386
#, c-format
6387
msgid "Could not merge %.*s"
6388
msgstr ""
6389
5965
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
6390
+#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641
6391
#, c-format
6392
msgid "could not copy '%s' to '%s'"
6393
msgstr ""
6394
5970
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
5971
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
5972
-msgid "could not read index"
5973
-msgstr ""
5974
-
5975
-#: sequencer.c:3074
6395
+#: sequencer.c:3221
6396
#, c-format
6397
msgid ""
6398
"execution failed: %s\n"
@@ -5982,11 +6402,11 @@ msgid ""
6402
"\n"
6403
msgstr ""
6404
5985
-#: sequencer.c:3080
6405
+#: sequencer.c:3227
6406
msgid "and made changes to the index and/or the working tree\n"
6407
msgstr ""
6408
5989
-#: sequencer.c:3086
6409
+#: sequencer.c:3233
6410
#, c-format
6411
msgid ""
6412
"execution succeeded: %s\n"
@@ -5997,76 +6417,72 @@ msgid ""
6417
"\n"
6418
msgstr ""
6419
6000
-#: sequencer.c:3147
6420
+#: sequencer.c:3294
6421
#, c-format
6422
msgid "illegal label name: '%.*s'"
6423
msgstr ""
6424
6005
-#: sequencer.c:3201
6425
+#: sequencer.c:3348
6426
msgid "writing fake root commit"
6427
msgstr ""
6428
6009
-#: sequencer.c:3206
6429
+#: sequencer.c:3353
6430
msgid "writing squash-onto"
6431
msgstr ""
6432
6013
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
6433
+#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882
6434
#, c-format
6435
msgid "failed to find tree of %s"
6436
msgstr ""
6437
6018
-#: sequencer.c:3262 builtin/rebase.c:874
6019
-msgid "could not write index"
6020
-msgstr ""
6021
-
6022
-#: sequencer.c:3289
6438
+#: sequencer.c:3436
6439
#, c-format
6440
msgid "could not resolve '%s'"
6441
msgstr ""
6442
6027
-#: sequencer.c:3320
6443
+#: sequencer.c:3467
6444
msgid "cannot merge without a current revision"
6445
msgstr ""
6446
6031
-#: sequencer.c:3342
6447
+#: sequencer.c:3489
6448
#, c-format
6449
msgid "unable to parse '%.*s'"
6450
msgstr ""
6451
6036
-#: sequencer.c:3351
6452
+#: sequencer.c:3498
6453
#, c-format
6454
msgid "nothing to merge: '%.*s'"
6455
msgstr ""
6456
6041
-#: sequencer.c:3363
6457
+#: sequencer.c:3510
6458
msgid "octopus merge cannot be executed on top of a [new root]"
6459
msgstr ""
6460
6045
-#: sequencer.c:3378
6461
+#: sequencer.c:3526
6462
#, c-format
6463
msgid "could not get commit message of '%s'"
6464
msgstr ""
6465
6050
-#: sequencer.c:3538
6466
+#: sequencer.c:3688
6467
#, c-format
6468
msgid "could not even attempt to merge '%.*s'"
6469
msgstr ""
6470
6055
-#: sequencer.c:3554
6471
+#: sequencer.c:3704
6472
msgid "merge: Unable to write new index file"
6473
msgstr ""
6474
6059
-#: sequencer.c:3623 builtin/rebase.c:712
6475
+#: sequencer.c:3773 builtin/rebase.c:733
6476
#, c-format
6477
msgid "Applied autostash.\n"
6478
msgstr ""
6479
6064
-#: sequencer.c:3635
6480
+#: sequencer.c:3785
6481
#, c-format
6482
msgid "cannot store %s"
6483
msgstr ""
6484
6069
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
6485
+#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113
6486
#, c-format
6487
msgid ""
6488
"Applying autostash resulted in conflicts.\n"
@@ -6074,31 +6490,31 @@ msgid ""
6490
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
6491
msgstr ""
6492
6077
-#: sequencer.c:3699
6493
+#: sequencer.c:3849
6494
#, c-format
6495
msgid "could not checkout %s"
6496
msgstr ""
6497
6082
-#: sequencer.c:3713
6498
+#: sequencer.c:3863
6499
#, c-format
6500
msgid "%s: not a valid OID"
6501
msgstr ""
6502
6087
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
6503
+#: sequencer.c:3868 git-rebase--preserve-merges.sh:779
6504
msgid "could not detach HEAD"
6505
msgstr ""
6506
6091
-#: sequencer.c:3733
6507
+#: sequencer.c:3883
6508
#, c-format
6509
msgid "Stopped at HEAD\n"
6510
msgstr ""
6511
6096
-#: sequencer.c:3735
6512
+#: sequencer.c:3885
6513
#, c-format
6514
msgid "Stopped at %s\n"
6515
msgstr ""
6516
6101
-#: sequencer.c:3743
6517
+#: sequencer.c:3893
6518
#, c-format
6519
msgid ""
6520
"Could not execute the todo command\n"
@@ -6111,105 +6527,105 @@ msgid ""
6527
" git rebase --continue\n"
6528
msgstr ""
6529
6114
-#: sequencer.c:3827
6530
+#: sequencer.c:3979
6531
#, c-format
6532
msgid "Stopped at %s... %.*s\n"
6533
msgstr ""
6534
6119
-#: sequencer.c:3898
6535
+#: sequencer.c:4050
6536
#, c-format
6537
msgid "unknown command %d"
6538
msgstr ""
6539
6124
-#: sequencer.c:3957
6540
+#: sequencer.c:4109
6541
msgid "could not read orig-head"
6542
msgstr ""
6543
6128
-#: sequencer.c:3962
6544
+#: sequencer.c:4114
6545
msgid "could not read 'onto'"
6546
msgstr ""
6547
6132
-#: sequencer.c:3976
6548
+#: sequencer.c:4128
6549
#, c-format
6550
msgid "could not update HEAD to %s"
6551
msgstr ""
6552
6137
-#: sequencer.c:4069
6553
+#: sequencer.c:4221
6554
msgid "cannot rebase: You have unstaged changes."
6555
msgstr ""
6556
6141
-#: sequencer.c:4078
6557
+#: sequencer.c:4230
6558
msgid "cannot amend non-existing commit"
6559
msgstr ""
6560
6145
-#: sequencer.c:4080
6561
+#: sequencer.c:4232
6562
#, c-format
6563
msgid "invalid file: '%s'"
6564
msgstr ""
6565
6150
-#: sequencer.c:4082
6566
+#: sequencer.c:4234
6567
#, c-format
6568
msgid "invalid contents: '%s'"
6569
msgstr ""
6570
6155
-#: sequencer.c:4085
6571
+#: sequencer.c:4237
6572
msgid ""
6573
"\n"
6574
"You have uncommitted changes in your working tree. Please, commit them\n"
6575
"first and then run 'git rebase --continue' again."
6576
msgstr ""
6577
6162
-#: sequencer.c:4121 sequencer.c:4159
6578
+#: sequencer.c:4273 sequencer.c:4312
6579
#, c-format
6580
msgid "could not write file: '%s'"
6581
msgstr ""
6582
6167
-#: sequencer.c:4174
6583
+#: sequencer.c:4327
6584
msgid "could not remove CHERRY_PICK_HEAD"
6585
msgstr ""
6586
6171
-#: sequencer.c:4181
6587
+#: sequencer.c:4334
6588
msgid "could not commit staged changes."
6589
msgstr ""
6590
6175
-#: sequencer.c:4285
6591
+#: sequencer.c:4440
6592
#, c-format
6593
msgid "%s: can't cherry-pick a %s"
6594
msgstr ""
6595
6180
-#: sequencer.c:4289
6596
+#: sequencer.c:4444
6597
#, c-format
6598
msgid "%s: bad revision"
6599
msgstr ""
6600
6185
-#: sequencer.c:4324
6601
+#: sequencer.c:4479
6602
msgid "can't revert as initial commit"
6603
msgstr ""
6604
6189
-#: sequencer.c:4774
6605
+#: sequencer.c:4952
6606
msgid "make_script: unhandled options"
6607
msgstr ""
6608
6193
-#: sequencer.c:4777
6609
+#: sequencer.c:4955
6610
msgid "make_script: error preparing revisions"
6611
msgstr ""
6612
6197
-#: sequencer.c:4935
6613
+#: sequencer.c:5113
6614
msgid ""
6615
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
6616
"continue'.\n"
6617
"Or you can abort the rebase with 'git rebase --abort'.\n"
6618
msgstr ""
6619
6204
-#: sequencer.c:5047 sequencer.c:5064
6620
+#: sequencer.c:5226 sequencer.c:5243
6621
msgid "nothing to do"
6622
msgstr ""
6623
6208
-#: sequencer.c:5078
6624
+#: sequencer.c:5257
6625
msgid "could not skip unnecessary pick commands"
6626
msgstr ""
6627
6212
-#: sequencer.c:5166
6628
+#: sequencer.c:5351
6629
msgid "the script was already rearranged."
6630
msgstr ""
6631
@@ -6685,6 +7101,11 @@ msgid_plural "%u bytes/s"
7101
msgstr[0] ""
7102
msgstr[1] ""
7103
7104
+#: strbuf.c:1149
7105
+#, c-format
7106
+msgid "could not edit '%s'"
7107
+msgstr ""
7108
+
7109
#: submodule.c:114 submodule.c:143
7110
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
7111
msgstr ""
@@ -6718,7 +7139,7 @@ msgstr ""
7139
msgid "submodule entry '%s' (%s) is a %s, not a commit"
7140
msgstr ""
7141
6721
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
7142
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016
7143
msgid "Failed to resolve HEAD as a valid ref."
7144
msgstr ""
7145
@@ -6757,18 +7178,28 @@ msgstr ""
7178
msgid "Submodule '%s' could not be updated."
7179
msgstr ""
7180
6760
-#: submodule.c:2007
7181
+#: submodule.c:2027
7182
+#, c-format
7183
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
7184
+msgstr ""
7185
+
7186
+#: submodule.c:2048
7187
#, c-format
7188
msgid ""
7189
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
7190
msgstr ""
7191
6766
-#: submodule.c:2019 submodule.c:2074
7192
+#: submodule.c:2060 submodule.c:2119
7193
#, c-format
7194
msgid "could not lookup name for submodule '%s'"
7195
msgstr ""
7196
6771
-#: submodule.c:2026
7197
+#: submodule.c:2064
7198
+#, c-format
7199
+msgid "refusing to move '%s' into an existing git dir"
7200
+msgstr ""
7201
+
7202
+#: submodule.c:2071
7203
#, c-format
7204
msgid ""
7205
"Migrating git directory of '%s%s' from\n"
@@ -6776,16 +7207,16 @@ msgid ""
7207
"'%s'\n"
7208
msgstr ""
7209
6779
-#: submodule.c:2109
7210
+#: submodule.c:2154
7211
#, c-format
7212
msgid "could not recurse into submodule '%s'"
7213
msgstr ""
7214
6784
-#: submodule.c:2153
7215
+#: submodule.c:2198
7216
msgid "could not start ls-files in .."
7217
msgstr ""
7218
6788
-#: submodule.c:2192
7219
+#: submodule.c:2237
7220
#, c-format
7221
msgid "ls-tree returned unexpected return code %d"
7222
msgstr ""
@@ -6804,12 +7235,12 @@ msgstr ""
7235
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
7236
msgstr ""
7237
6807
-#: submodule-config.c:490
7238
+#: submodule-config.c:498
7239
#, c-format
7240
msgid "invalid value for %s"
7241
msgstr ""
7242
6812
-#: submodule-config.c:761
7243
+#: submodule-config.c:769
7244
#, c-format
7245
msgid "Could not update .gitmodules entry %s"
7246
msgstr ""
@@ -6944,7 +7375,7 @@ msgstr ""
7375
msgid "failed to push all needed submodules"
7376
msgstr ""
7377
6947
-#: transport.c:1345 transport-helper.c:655
7378
+#: transport.c:1345 transport-helper.c:656
7379
msgid "operation not supported by protocol"
7380
msgstr ""
7381
@@ -6957,7 +7388,7 @@ msgstr ""
7388
msgid "unable to find remote helper for '%s'"
7389
msgstr ""
7390
6960
-#: transport-helper.c:160 transport-helper.c:569
7391
+#: transport-helper.c:160 transport-helper.c:570
7392
msgid "can't dup helper output fd"
7393
msgstr ""
7394
@@ -6982,137 +7413,137 @@ msgstr ""
7413
msgid "%s also locked %s"
7414
msgstr ""
7415
6985
-#: transport-helper.c:491
7416
+#: transport-helper.c:492
7417
msgid "couldn't run fast-import"
7418
msgstr ""
7419
6989
-#: transport-helper.c:514
7420
+#: transport-helper.c:515
7421
msgid "error while running fast-import"
7422
msgstr ""
7423
6993
-#: transport-helper.c:543 transport-helper.c:1132
7424
+#: transport-helper.c:544 transport-helper.c:1133
7425
#, c-format
7426
msgid "could not read ref %s"
7427
msgstr ""
7428
6998
-#: transport-helper.c:588
7429
+#: transport-helper.c:589
7430
#, c-format
7431
msgid "unknown response to connect: %s"
7432
msgstr ""
7433
7003
-#: transport-helper.c:610
7434
+#: transport-helper.c:611
7435
msgid "setting remote service path not supported by protocol"
7436
msgstr ""
7437
7007
-#: transport-helper.c:612
7438
+#: transport-helper.c:613
7439
msgid "invalid remote service path"
7440
msgstr ""
7441
7011
-#: transport-helper.c:658
7442
+#: transport-helper.c:659
7443
#, c-format
7444
msgid "can't connect to subservice %s"
7445
msgstr ""
7446
7016
-#: transport-helper.c:734
7447
+#: transport-helper.c:735
7448
#, c-format
7449
msgid "expected ok/error, helper said '%s'"
7450
msgstr ""
7451
7021
-#: transport-helper.c:787
7452
+#: transport-helper.c:788
7453
#, c-format
7454
msgid "helper reported unexpected status of %s"
7455
msgstr ""
7456
7026
-#: transport-helper.c:848
7457
+#: transport-helper.c:849
7458
#, c-format
7459
msgid "helper %s does not support dry-run"
7460
msgstr ""
7461
7031
-#: transport-helper.c:851
7462
+#: transport-helper.c:852
7463
#, c-format
7464
msgid "helper %s does not support --signed"
7465
msgstr ""
7466
7036
-#: transport-helper.c:854
7467
+#: transport-helper.c:855
7468
#, c-format
7469
msgid "helper %s does not support --signed=if-asked"
7470
msgstr ""
7471
7041
-#: transport-helper.c:859
7472
+#: transport-helper.c:860
7473
#, c-format
7474
msgid "helper %s does not support --atomic"
7475
msgstr ""
7476
7046
-#: transport-helper.c:865
7477
+#: transport-helper.c:866
7478
#, c-format
7479
msgid "helper %s does not support 'push-option'"
7480
msgstr ""
7481
7051
-#: transport-helper.c:963
7482
+#: transport-helper.c:964
7483
msgid "remote-helper doesn't support push; refspec needed"
7484
msgstr ""
7485
7055
-#: transport-helper.c:968
7486
+#: transport-helper.c:969
7487
#, c-format
7488
msgid "helper %s does not support 'force'"
7489
msgstr ""
7490
7060
-#: transport-helper.c:1015
7491
+#: transport-helper.c:1016
7492
msgid "couldn't run fast-export"
7493
msgstr ""
7494
7064
-#: transport-helper.c:1020
7495
+#: transport-helper.c:1021
7496
msgid "error while running fast-export"
7497
msgstr ""
7498
7068
-#: transport-helper.c:1045
7499
+#: transport-helper.c:1046
7500
#, c-format
7501
msgid ""
7502
"No refs in common and none specified; doing nothing.\n"
7503
"Perhaps you should specify a branch such as 'master'.\n"
7504
msgstr ""
7505
7075
-#: transport-helper.c:1118
7506
+#: transport-helper.c:1119
7507
#, c-format
7508
msgid "malformed response in ref list: %s"
7509
msgstr ""
7510
7080
-#: transport-helper.c:1270
7511
+#: transport-helper.c:1271
7512
#, c-format
7513
msgid "read(%s) failed"
7514
msgstr ""
7515
7085
-#: transport-helper.c:1297
7516
+#: transport-helper.c:1298
7517
#, c-format
7518
msgid "write(%s) failed"
7519
msgstr ""
7520
7090
-#: transport-helper.c:1346
7521
+#: transport-helper.c:1347
7522
#, c-format
7523
msgid "%s thread failed"
7524
msgstr ""
7525
7095
-#: transport-helper.c:1350
7526
+#: transport-helper.c:1351
7527
#, c-format
7528
msgid "%s thread failed to join: %s"
7529
msgstr ""
7530
7100
-#: transport-helper.c:1369 transport-helper.c:1373
7531
+#: transport-helper.c:1370 transport-helper.c:1374
7532
#, c-format
7533
msgid "can't start thread for copying data: %s"
7534
msgstr ""
7535
7105
-#: transport-helper.c:1410
7536
+#: transport-helper.c:1411
7537
#, c-format
7538
msgid "%s process failed to wait"
7539
msgstr ""
7540
7110
-#: transport-helper.c:1414
7541
+#: transport-helper.c:1415
7542
#, c-format
7543
msgid "%s process failed"
7544
msgstr ""
7545
7115
-#: transport-helper.c:1432 transport-helper.c:1441
7546
+#: transport-helper.c:1433 transport-helper.c:1442
7547
msgid "can't start thread for copying data"
7548
msgstr ""
7549
@@ -7128,7 +7559,12 @@ msgstr ""
7559
msgid "empty filename in tree entry"
7560
msgstr ""
7561
7131
-#: tree-walk.c:118
7562
+#: tree-walk.c:48
7563
+#, c-format
7564
+msgid "filename in tree entry contains backslash: '%s'"
7565
+msgstr ""
7566
+
7567
+#: tree-walk.c:124
7568
msgid "too-short tree file"
7569
msgstr ""
7570
@@ -7318,6 +7754,10 @@ msgid ""
7754
"colliding group is in the working tree:\n"
7755
msgstr ""
7756
7757
+#: unpack-trees.c:1441
7758
+msgid "Updating index flags"
7759
+msgstr ""
7760
+
7761
#: urlmatch.c:163
7762
msgid "invalid URL scheme name or missing '://' suffix"
7763
msgstr ""
@@ -7884,131 +8324,131 @@ msgstr ""
8324
msgid "cannot %s: Your index contains uncommitted changes."
8325
msgstr ""
8326
7887
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
8327
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
8328
#, c-format
8329
msgid "failed to unlink '%s'"
8330
msgstr ""
8331
7892
-#: builtin/add.c:25
8332
+#: builtin/add.c:26
8333
msgid "git add [<options>] [--] <pathspec>..."
8334
msgstr ""
8335
7896
-#: builtin/add.c:84
8336
+#: builtin/add.c:87
8337
#, c-format
8338
msgid "unexpected diff status %c"
8339
msgstr ""
8340
7901
-#: builtin/add.c:89 builtin/commit.c:288
8341
+#: builtin/add.c:92 builtin/commit.c:288
8342
msgid "updating files failed"
8343
msgstr ""
8344
7905
-#: builtin/add.c:99
8345
+#: builtin/add.c:102
8346
#, c-format
8347
msgid "remove '%s'\n"
8348
msgstr ""
8349
7910
-#: builtin/add.c:174
8350
+#: builtin/add.c:177
8351
msgid "Unstaged changes after refreshing the index:"
8352
msgstr ""
8353
7914
-#: builtin/add.c:234 builtin/rev-parse.c:897
8354
+#: builtin/add.c:252 builtin/rev-parse.c:899
8355
msgid "Could not read the index"
8356
msgstr ""
8357
7918
-#: builtin/add.c:245
8358
+#: builtin/add.c:263
8359
#, c-format
8360
msgid "Could not open '%s' for writing."
8361
msgstr ""
8362
7923
-#: builtin/add.c:249
8363
+#: builtin/add.c:267
8364
msgid "Could not write patch"
8365
msgstr ""
8366
7927
-#: builtin/add.c:252
8367
+#: builtin/add.c:270
8368
msgid "editing patch failed"
8369
msgstr ""
8370
7931
-#: builtin/add.c:255
8371
+#: builtin/add.c:273
8372
#, c-format
8373
msgid "Could not stat '%s'"
8374
msgstr ""
8375
7936
-#: builtin/add.c:257
8376
+#: builtin/add.c:275
8377
msgid "Empty patch. Aborted."
8378
msgstr ""
8379
7940
-#: builtin/add.c:262
8380
+#: builtin/add.c:280
8381
#, c-format
8382
msgid "Could not apply '%s'"
8383
msgstr ""
8384
7945
-#: builtin/add.c:270
8385
+#: builtin/add.c:288
8386
msgid "The following paths are ignored by one of your .gitignore files:\n"
8387
msgstr ""
8388
7949
-#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
7950
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
7951
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
8389
+#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
8390
+#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548
8391
+#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165
8392
msgid "dry run"
8393
msgstr ""
8394
7955
-#: builtin/add.c:293
8395
+#: builtin/add.c:311
8396
msgid "interactive picking"
8397
msgstr ""
8398
7959
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
8399
+#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307
8400
msgid "select hunks interactively"
8401
msgstr ""
8402
7963
-#: builtin/add.c:295
8403
+#: builtin/add.c:313
8404
msgid "edit current diff and apply"
8405
msgstr ""
8406
7967
-#: builtin/add.c:296
8407
+#: builtin/add.c:314
8408
msgid "allow adding otherwise ignored files"
8409
msgstr ""
8410
7971
-#: builtin/add.c:297
8411
+#: builtin/add.c:315
8412
msgid "update tracked files"
8413
msgstr ""
8414
7975
-#: builtin/add.c:298
8415
+#: builtin/add.c:316
8416
msgid "renormalize EOL of tracked files (implies -u)"
8417
msgstr ""
8418
7979
-#: builtin/add.c:299
8419
+#: builtin/add.c:317
8420
msgid "record only the fact that the path will be added later"
8421
msgstr ""
8422
7983
-#: builtin/add.c:300
8423
+#: builtin/add.c:318
8424
msgid "add changes from all tracked and untracked files"
8425
msgstr ""
8426
7987
-#: builtin/add.c:303
8427
+#: builtin/add.c:321
8428
msgid "ignore paths removed in the working tree (same as --no-all)"
8429
msgstr ""
8430
7991
-#: builtin/add.c:305
8431
+#: builtin/add.c:323
8432
msgid "don't add, only refresh the index"
8433
msgstr ""
8434
7995
-#: builtin/add.c:306
8435
+#: builtin/add.c:324
8436
msgid "just skip files which cannot be added because of errors"
8437
msgstr ""
8438
7999
-#: builtin/add.c:307
8439
+#: builtin/add.c:325
8440
msgid "check if - even missing - files are ignored in dry run"
8441
msgstr ""
8442
8003
-#: builtin/add.c:309 builtin/update-index.c:1002
8443
+#: builtin/add.c:327 builtin/update-index.c:1004
8444
msgid "override the executable bit of the listed files"
8445
msgstr ""
8446
8007
-#: builtin/add.c:311
8447
+#: builtin/add.c:329
8448
msgid "warn when adding an embedded repository"
8449
msgstr ""
8450
8011
-#: builtin/add.c:326
8451
+#: builtin/add.c:347
8452
#, c-format
8453
msgid ""
8454
"You've added another git repository inside your current repository.\n"
@@ -8026,39 +8466,57 @@ msgid ""
8466
"See \"git help submodule\" for more information."
8467
msgstr ""
8468
8029
-#: builtin/add.c:354
8469
+#: builtin/add.c:375
8470
#, c-format
8471
msgid "adding embedded git repository: %s"
8472
msgstr ""
8473
8034
-#: builtin/add.c:372
8474
+#: builtin/add.c:393
8475
#, c-format
8476
msgid "Use -f if you really want to add them.\n"
8477
msgstr ""
8478
8039
-#: builtin/add.c:379
8479
+#: builtin/add.c:400
8480
msgid "adding files failed"
8481
msgstr ""
8482
8043
-#: builtin/add.c:419
8483
+#: builtin/add.c:428 builtin/commit.c:348
8484
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
8485
+msgstr ""
8486
+
8487
+#: builtin/add.c:434
8488
+msgid "--pathspec-from-file is incompatible with --edit"
8489
+msgstr ""
8490
+
8491
+#: builtin/add.c:446
8492
msgid "-A and -u are mutually incompatible"
8493
msgstr ""
8494
8047
-#: builtin/add.c:426
8495
+#: builtin/add.c:449
8496
msgid "Option --ignore-missing can only be used together with --dry-run"
8497
msgstr ""
8498
8051
-#: builtin/add.c:430
This file is too large to show in full.