l10n: git.pot: v2.33.0 round 2 (11 new, 8 removed)
Generate po/git.pot from v2.33.0-rc2 for git v2.33.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Aug 14, 2021 at 07:57 UTC
bbc7dccd9daf01470a6ce29d60354dc634a397f0
1 file changed
+504
-484
po/git.pot
+504
-484
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: PACKAGE VERSION\n"
10
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11
-"POT-Creation-Date: 2021-08-03 17:06+0800\n"
11
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
23
msgid "Huh (%s)?"
24
msgstr ""
25
26
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
26
+#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
27
#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
28
#: builtin/rebase.c:1953
29
msgid "could not read index"
@@ -53,7 +53,7 @@ msgstr ""
53
msgid "could not stage '%s'"
54
msgstr ""
55
56
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
56
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
57
msgid "could not write index"
58
msgstr ""
59
@@ -212,9 +212,10 @@ msgstr ""
212
#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
213
#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
214
#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
215
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
216
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
217
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
215
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
216
+#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
217
+#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
218
+#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
219
#: git-add--interactive.perl:213
220
msgid "path"
221
msgstr ""
@@ -707,7 +708,7 @@ msgstr ""
708
msgid "Exiting because of an unresolved conflict."
709
msgstr ""
710
710
-#: advice.c:283 builtin/merge.c:1374
711
+#: advice.c:283 builtin/merge.c:1375
712
msgid "You have not concluded your merge (MERGE_HEAD exists)."
713
msgstr ""
714
@@ -1440,7 +1441,7 @@ msgstr ""
1441
1442
#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
1443
#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
1443
-#: builtin/merge.c:1143
1444
+#: builtin/merge.c:1144
1445
#, c-format
1446
msgid "could not read '%s'"
1447
msgstr ""
@@ -1529,7 +1530,8 @@ msgid "list supported archive formats"
1530
msgstr ""
1531
1532
#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
1532
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
1533
+#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
1534
+#: builtin/submodule--helper.c:2902
1535
msgid "repo"
1536
msgstr ""
1537
@@ -1705,7 +1707,7 @@ msgstr ""
1707
msgid "--reverse and --first-parent together require specified latest commit"
1708
msgstr ""
1709
1708
-#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
1710
+#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
1711
#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
1712
#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
1713
#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
@@ -2888,23 +2890,23 @@ msgstr ""
2890
msgid "path name too long for external filter"
2891
msgstr ""
2892
2891
-#: convert.c:934
2893
+#: convert.c:935
2894
#, c-format
2895
msgid ""
2896
"external filter '%s' is not available anymore although not all paths have "
2897
"been filtered"
2898
msgstr ""
2899
2898
-#: convert.c:1234
2900
+#: convert.c:1236
2901
msgid "true/false are no valid working-tree-encodings"
2902
msgstr ""
2903
2902
-#: convert.c:1414 convert.c:1447
2904
+#: convert.c:1416 convert.c:1449
2905
#, c-format
2906
msgid "%s: clean filter '%s' failed"
2907
msgstr ""
2908
2907
-#: convert.c:1490
2909
+#: convert.c:1492
2910
#, c-format
2911
msgid "%s: smudge filter %s failed"
2912
msgstr ""
@@ -3125,7 +3127,7 @@ msgstr ""
3127
3128
#: diff.c:4643
3129
msgid ""
3128
-"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3130
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3131
"with -G and -S"
3132
msgstr ""
3133
@@ -3664,7 +3666,7 @@ msgstr ""
3666
msgid "failed to read orderfile '%s'"
3667
msgstr ""
3668
3667
-#: diffcore-rename.c:1510
3669
+#: diffcore-rename.c:1514
3670
msgid "Performing inexact rename detection"
3671
msgstr ""
3672
@@ -3683,49 +3685,49 @@ msgstr ""
3685
msgid "unrecognized pattern: '%s'"
3686
msgstr ""
3687
3686
-#: dir.c:792 dir.c:806
3688
+#: dir.c:790 dir.c:804
3689
#, c-format
3690
msgid "unrecognized negative pattern: '%s'"
3691
msgstr ""
3692
3691
-#: dir.c:824
3693
+#: dir.c:820
3694
#, c-format
3695
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3696
msgstr ""
3697
3696
-#: dir.c:834
3698
+#: dir.c:830
3699
msgid "disabling cone pattern matching"
3700
msgstr ""
3701
3700
-#: dir.c:1221
3702
+#: dir.c:1214
3703
#, c-format
3704
msgid "cannot use %s as an exclude file"
3705
msgstr ""
3706
3705
-#: dir.c:2358
3707
+#: dir.c:2351
3708
#, c-format
3709
msgid "could not open directory '%s'"
3710
msgstr ""
3711
3710
-#: dir.c:2660
3712
+#: dir.c:2653
3713
msgid "failed to get kernel name and information"
3714
msgstr ""
3715
3714
-#: dir.c:2784
3716
+#: dir.c:2777
3717
msgid "untracked cache is disabled on this system or location"
3718
msgstr ""
3719
3718
-#: dir.c:3617
3720
+#: dir.c:3610
3721
#, c-format
3722
msgid "index file corrupt in repo %s"
3723
msgstr ""
3724
3723
-#: dir.c:3664 dir.c:3669
3725
+#: dir.c:3657 dir.c:3662
3726
#, c-format
3727
msgid "could not create directories for %s"
3728
msgstr ""
3729
3728
-#: dir.c:3698
3730
+#: dir.c:3691
3731
#, c-format
3732
msgid "could not migrate git directory from '%s' to '%s'"
3733
msgstr ""
@@ -3749,7 +3751,7 @@ msgstr ""
3751
msgid "bad git namespace path \"%s\""
3752
msgstr ""
3753
3752
-#: environment.c:335
3754
+#: environment.c:334
3755
#, c-format
3756
msgid "could not set GIT_DIR to '%s'"
3757
msgstr ""
@@ -4351,39 +4353,39 @@ msgstr ""
4353
msgid "bad action '%s' for '%s'"
4354
msgstr ""
4355
4354
-#: merge-ort.c:1228 merge-recursive.c:1206
4356
+#: merge-ort.c:1569 merge-recursive.c:1201
4357
#, c-format
4358
msgid "Failed to merge submodule %s (not checked out)"
4359
msgstr ""
4360
4359
-#: merge-ort.c:1237 merge-recursive.c:1213
4361
+#: merge-ort.c:1578 merge-recursive.c:1208
4362
#, c-format
4363
msgid "Failed to merge submodule %s (commits not present)"
4364
msgstr ""
4365
4364
-#: merge-ort.c:1246 merge-recursive.c:1220
4366
+#: merge-ort.c:1587 merge-recursive.c:1215
4367
#, c-format
4368
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4369
msgstr ""
4370
4369
-#: merge-ort.c:1256 merge-ort.c:1263
4371
+#: merge-ort.c:1597 merge-ort.c:1604
4372
#, c-format
4373
msgid "Note: Fast-forwarding submodule %s to %s"
4374
msgstr ""
4375
4374
-#: merge-ort.c:1284
4376
+#: merge-ort.c:1625
4377
#, c-format
4378
msgid "Failed to merge submodule %s"
4379
msgstr ""
4380
4379
-#: merge-ort.c:1291
4381
+#: merge-ort.c:1632
4382
#, c-format
4383
msgid ""
4384
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
4385
"%s\n"
4386
msgstr ""
4387
4386
-#: merge-ort.c:1295 merge-recursive.c:1274
4388
+#: merge-ort.c:1636 merge-recursive.c:1269
4389
#, c-format
4390
msgid ""
4391
"If this is correct simply add it to the index for example\n"
@@ -4394,42 +4396,42 @@ msgid ""
4396
"which will accept this suggestion.\n"
4397
msgstr ""
4398
4397
-#: merge-ort.c:1308
4399
+#: merge-ort.c:1649
4400
#, c-format
4401
msgid ""
4402
"Failed to merge submodule %s, but multiple possible merges exist:\n"
4403
"%s"
4404
msgstr ""
4405
4404
-#: merge-ort.c:1527 merge-recursive.c:1363
4406
+#: merge-ort.c:1868 merge-recursive.c:1358
4407
msgid "Failed to execute internal merge"
4408
msgstr ""
4409
4408
-#: merge-ort.c:1532 merge-recursive.c:1368
4410
+#: merge-ort.c:1873 merge-recursive.c:1363
4411
#, c-format
4412
msgid "Unable to add %s to database"
4413
msgstr ""
4414
4413
-#: merge-ort.c:1539 merge-recursive.c:1401
4415
+#: merge-ort.c:1880 merge-recursive.c:1396
4416
#, c-format
4417
msgid "Auto-merging %s"
4418
msgstr ""
4419
4418
-#: merge-ort.c:1678 merge-recursive.c:2123
4420
+#: merge-ort.c:2019 merge-recursive.c:2118
4421
#, c-format
4422
msgid ""
4423
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4424
"implicit directory rename(s) putting the following path(s) there: %s."
4425
msgstr ""
4426
4425
-#: merge-ort.c:1688 merge-recursive.c:2133
4427
+#: merge-ort.c:2029 merge-recursive.c:2128
4428
#, c-format
4429
msgid ""
4430
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4431
"implicit directory renames tried to put these paths there: %s"
4432
msgstr ""
4433
4432
-#: merge-ort.c:1746
4434
+#: merge-ort.c:2087
4435
#, c-format
4436
msgid ""
4437
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4437,47 +4439,47 @@ msgid ""
4439
"majority of the files."
4440
msgstr ""
4441
4440
-#: merge-ort.c:1900 merge-recursive.c:2469
4442
+#: merge-ort.c:2241 merge-recursive.c:2464
4443
#, c-format
4444
msgid ""
4445
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4446
"renamed."
4447
msgstr ""
4448
4447
-#: merge-ort.c:2044 merge-recursive.c:3252
4449
+#: merge-ort.c:2385 merge-recursive.c:3247
4450
#, c-format
4451
msgid ""
4452
"Path updated: %s added in %s inside a directory that was renamed in %s; "
4453
"moving it to %s."
4454
msgstr ""
4455
4454
-#: merge-ort.c:2051 merge-recursive.c:3259
4456
+#: merge-ort.c:2392 merge-recursive.c:3254
4457
#, c-format
4458
msgid ""
4459
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4460
"%s; moving it to %s."
4461
msgstr ""
4462
4461
-#: merge-ort.c:2064 merge-recursive.c:3255
4463
+#: merge-ort.c:2405 merge-recursive.c:3250
4464
#, c-format
4465
msgid ""
4466
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4467
"in %s, suggesting it should perhaps be moved to %s."
4468
msgstr ""
4469
4468
-#: merge-ort.c:2072 merge-recursive.c:3262
4470
+#: merge-ort.c:2413 merge-recursive.c:3257
4471
#, c-format
4472
msgid ""
4473
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4474
"was renamed in %s, suggesting it should perhaps be moved to %s."
4475
msgstr ""
4476
4475
-#: merge-ort.c:2228
4477
+#: merge-ort.c:2569
4478
#, c-format
4479
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4480
msgstr ""
4481
4480
-#: merge-ort.c:2323
4482
+#: merge-ort.c:2664
4483
#, c-format
4484
msgid ""
4485
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4485,67 +4487,67 @@ msgid ""
4487
"markers."
4488
msgstr ""
4489
4488
-#: merge-ort.c:2342 merge-ort.c:2366
4490
+#: merge-ort.c:2683 merge-ort.c:2707
4491
#, c-format
4492
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4493
msgstr ""
4494
4493
-#: merge-ort.c:2819 merge-recursive.c:3013
4495
+#: merge-ort.c:3182 merge-recursive.c:3008
4496
#, c-format
4497
msgid "cannot read object %s"
4498
msgstr ""
4499
4498
-#: merge-ort.c:2822 merge-recursive.c:3016
4500
+#: merge-ort.c:3185 merge-recursive.c:3011
4501
#, c-format
4502
msgid "object %s is not a blob"
4503
msgstr ""
4504
4503
-#: merge-ort.c:3250
4505
+#: merge-ort.c:3613
4506
#, c-format
4507
msgid ""
4508
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4509
"%s instead."
4510
msgstr ""
4511
4510
-#: merge-ort.c:3326
4512
+#: merge-ort.c:3689
4513
#, c-format
4514
msgid ""
4515
"CONFLICT (distinct types): %s had different types on each side; renamed both "
4516
"of them so each can be recorded somewhere."
4517
msgstr ""
4518
4517
-#: merge-ort.c:3333
4519
+#: merge-ort.c:3696
4520
#, c-format
4521
msgid ""
4522
"CONFLICT (distinct types): %s had different types on each side; renamed one "
4523
"of them so each can be recorded somewhere."
4524
msgstr ""
4525
4524
-#: merge-ort.c:3433 merge-recursive.c:3092
4526
+#: merge-ort.c:3796 merge-recursive.c:3087
4527
msgid "content"
4528
msgstr ""
4529
4528
-#: merge-ort.c:3435 merge-recursive.c:3096
4530
+#: merge-ort.c:3798 merge-recursive.c:3091
4531
msgid "add/add"
4532
msgstr ""
4533
4532
-#: merge-ort.c:3437 merge-recursive.c:3141
4534
+#: merge-ort.c:3800 merge-recursive.c:3136
4535
msgid "submodule"
4536
msgstr ""
4537
4536
-#: merge-ort.c:3439 merge-recursive.c:3142
4538
+#: merge-ort.c:3802 merge-recursive.c:3137
4539
#, c-format
4540
msgid "CONFLICT (%s): Merge conflict in %s"
4541
msgstr ""
4542
4541
-#: merge-ort.c:3470
4543
+#: merge-ort.c:3833
4544
#, c-format
4545
msgid ""
4546
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
4547
"of %s left in tree."
4548
msgstr ""
4549
4548
-#: merge-ort.c:3757
4550
+#: merge-ort.c:4120
4551
#, c-format
4552
msgid ""
4553
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4555,192 +4557,192 @@ msgstr ""
4557
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4558
#. base, and 2-3) the trees for the two trees we're merging.
4559
#.
4558
-#: merge-ort.c:4116
4560
+#: merge-ort.c:4487
4561
#, c-format
4562
msgid "collecting merge info failed for trees %s, %s, %s"
4563
msgstr ""
4564
4563
-#: merge-ort-wrappers.c:13 merge-recursive.c:3707
4565
+#: merge-ort-wrappers.c:13 merge-recursive.c:3702
4566
#, c-format
4567
msgid ""
4568
"Your local changes to the following files would be overwritten by merge:\n"
4569
" %s"
4570
msgstr ""
4571
4570
-#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
4572
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
4573
msgid "Already up to date."
4574
msgstr ""
4575
4574
-#: merge-recursive.c:357
4576
+#: merge-recursive.c:352
4577
msgid "(bad commit)\n"
4578
msgstr ""
4579
4578
-#: merge-recursive.c:380
4580
+#: merge-recursive.c:375
4581
#, c-format
4582
msgid "add_cacheinfo failed for path '%s'; merge aborting."
4583
msgstr ""
4584
4583
-#: merge-recursive.c:389
4585
+#: merge-recursive.c:384
4586
#, c-format
4587
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4588
msgstr ""
4589
4588
-#: merge-recursive.c:877
4590
+#: merge-recursive.c:872
4591
#, c-format
4592
msgid "failed to create path '%s'%s"
4593
msgstr ""
4594
4593
-#: merge-recursive.c:888
4595
+#: merge-recursive.c:883
4596
#, c-format
4597
msgid "Removing %s to make room for subdirectory\n"
4598
msgstr ""
4599
4598
-#: merge-recursive.c:902 merge-recursive.c:921
4600
+#: merge-recursive.c:897 merge-recursive.c:916
4601
msgid ": perhaps a D/F conflict?"
4602
msgstr ""
4603
4602
-#: merge-recursive.c:911
4604
+#: merge-recursive.c:906
4605
#, c-format
4606
msgid "refusing to lose untracked file at '%s'"
4607
msgstr ""
4608
4607
-#: merge-recursive.c:952 builtin/cat-file.c:41
4609
+#: merge-recursive.c:947 builtin/cat-file.c:41
4610
#, c-format
4611
msgid "cannot read object %s '%s'"
4612
msgstr ""
4613
4612
-#: merge-recursive.c:957
4614
+#: merge-recursive.c:952
4615
#, c-format
4616
msgid "blob expected for %s '%s'"
4617
msgstr ""
4618
4617
-#: merge-recursive.c:982
4619
+#: merge-recursive.c:977
4620
#, c-format
4621
msgid "failed to open '%s': %s"
4622
msgstr ""
4623
4622
-#: merge-recursive.c:993
4624
+#: merge-recursive.c:988
4625
#, c-format
4626
msgid "failed to symlink '%s': %s"
4627
msgstr ""
4628
4627
-#: merge-recursive.c:998
4629
+#: merge-recursive.c:993
4630
#, c-format
4631
msgid "do not know what to do with %06o %s '%s'"
4632
msgstr ""
4633
4632
-#: merge-recursive.c:1228 merge-recursive.c:1240
4634
+#: merge-recursive.c:1223 merge-recursive.c:1235
4635
#, c-format
4636
msgid "Fast-forwarding submodule %s to the following commit:"
4637
msgstr ""
4638
4637
-#: merge-recursive.c:1231 merge-recursive.c:1243
4639
+#: merge-recursive.c:1226 merge-recursive.c:1238
4640
#, c-format
4641
msgid "Fast-forwarding submodule %s"
4642
msgstr ""
4643
4642
-#: merge-recursive.c:1266
4644
+#: merge-recursive.c:1261
4645
#, c-format
4646
msgid "Failed to merge submodule %s (merge following commits not found)"
4647
msgstr ""
4648
4647
-#: merge-recursive.c:1270
4649
+#: merge-recursive.c:1265
4650
#, c-format
4651
msgid "Failed to merge submodule %s (not fast-forward)"
4652
msgstr ""
4653
4652
-#: merge-recursive.c:1271
4654
+#: merge-recursive.c:1266
4655
msgid "Found a possible merge resolution for the submodule:\n"
4656
msgstr ""
4657
4656
-#: merge-recursive.c:1283
4658
+#: merge-recursive.c:1278
4659
#, c-format
4660
msgid "Failed to merge submodule %s (multiple merges found)"
4661
msgstr ""
4662
4661
-#: merge-recursive.c:1425
4663
+#: merge-recursive.c:1420
4664
#, c-format
4665
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4666
msgstr ""
4667
4666
-#: merge-recursive.c:1497
4668
+#: merge-recursive.c:1492
4669
#, c-format
4670
msgid ""
4671
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4672
"in tree."
4673
msgstr ""
4674
4673
-#: merge-recursive.c:1502
4675
+#: merge-recursive.c:1497
4676
#, c-format
4677
msgid ""
4678
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4679
"left in tree."
4680
msgstr ""
4681
4680
-#: merge-recursive.c:1509
4682
+#: merge-recursive.c:1504
4683
#, c-format
4684
msgid ""
4685
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4686
"in tree at %s."
4687
msgstr ""
4688
4687
-#: merge-recursive.c:1514
4689
+#: merge-recursive.c:1509
4690
#, c-format
4691
msgid ""
4692
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4693
"left in tree at %s."
4694
msgstr ""
4695
4694
-#: merge-recursive.c:1549
4696
+#: merge-recursive.c:1544
4697
msgid "rename"
4698
msgstr ""
4699
4698
-#: merge-recursive.c:1549
4700
+#: merge-recursive.c:1544
4701
msgid "renamed"
4702
msgstr ""
4703
4702
-#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
4704
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
4705
#, c-format
4706
msgid "Refusing to lose dirty file at %s"
4707
msgstr ""
4708
4707
-#: merge-recursive.c:1610
4709
+#: merge-recursive.c:1605
4710
#, c-format
4711
msgid "Refusing to lose untracked file at %s, even though it's in the way."
4712
msgstr ""
4713
4712
-#: merge-recursive.c:1668
4714
+#: merge-recursive.c:1663
4715
#, c-format
4716
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4717
msgstr ""
4718
4717
-#: merge-recursive.c:1699
4719
+#: merge-recursive.c:1694
4720
#, c-format
4721
msgid "%s is a directory in %s adding as %s instead"
4722
msgstr ""
4723
4722
-#: merge-recursive.c:1704
4724
+#: merge-recursive.c:1699
4725
#, c-format
4726
msgid "Refusing to lose untracked file at %s; adding as %s instead"
4727
msgstr ""
4728
4727
-#: merge-recursive.c:1731
4729
+#: merge-recursive.c:1726
4730
#, c-format
4731
msgid ""
4732
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4733
"\"->\"%s\" in \"%s\"%s"
4734
msgstr ""
4735
4734
-#: merge-recursive.c:1736
4736
+#: merge-recursive.c:1731
4737
msgid " (left unresolved)"
4738
msgstr ""
4739
4738
-#: merge-recursive.c:1828
4740
+#: merge-recursive.c:1823
4741
#, c-format
4742
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4743
msgstr ""
4744
4743
-#: merge-recursive.c:2091
4745
+#: merge-recursive.c:2086
4746
#, c-format
4747
msgid ""
4748
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4748,85 +4750,85 @@ msgid ""
4750
"getting a majority of the files."
4751
msgstr ""
4752
4751
-#: merge-recursive.c:2225
4753
+#: merge-recursive.c:2220
4754
#, c-format
4755
msgid ""
4756
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4757
">%s in %s"
4758
msgstr ""
4759
4758
-#: merge-recursive.c:3080
4760
+#: merge-recursive.c:3075
4761
msgid "modify"
4762
msgstr ""
4763
4762
-#: merge-recursive.c:3080
4764
+#: merge-recursive.c:3075
4765
msgid "modified"
4766
msgstr ""
4767
4766
-#: merge-recursive.c:3119
4768
+#: merge-recursive.c:3114
4769
#, c-format
4770
msgid "Skipped %s (merged same as existing)"
4771
msgstr ""
4772
4771
-#: merge-recursive.c:3172
4773
+#: merge-recursive.c:3167
4774
#, c-format
4775
msgid "Adding as %s instead"
4776
msgstr ""
4777
4776
-#: merge-recursive.c:3376
4778
+#: merge-recursive.c:3371
4779
#, c-format
4780
msgid "Removing %s"
4781
msgstr ""
4782
4781
-#: merge-recursive.c:3399
4783
+#: merge-recursive.c:3394
4784
msgid "file/directory"
4785
msgstr ""
4786
4785
-#: merge-recursive.c:3404
4787
+#: merge-recursive.c:3399
4788
msgid "directory/file"
4789
msgstr ""
4790
4789
-#: merge-recursive.c:3411
4791
+#: merge-recursive.c:3406
4792
#, c-format
4793
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4794
msgstr ""
4795
4794
-#: merge-recursive.c:3420
4796
+#: merge-recursive.c:3415
4797
#, c-format
4798
msgid "Adding %s"
4799
msgstr ""
4800
4799
-#: merge-recursive.c:3429
4801
+#: merge-recursive.c:3424
4802
#, c-format
4803
msgid "CONFLICT (add/add): Merge conflict in %s"
4804
msgstr ""
4805
4804
-#: merge-recursive.c:3482
4806
+#: merge-recursive.c:3477
4807
#, c-format
4808
msgid "merging of trees %s and %s failed"
4809
msgstr ""
4810
4809
-#: merge-recursive.c:3576
4811
+#: merge-recursive.c:3571
4812
msgid "Merging:"
4813
msgstr ""
4814
4813
-#: merge-recursive.c:3589
4815
+#: merge-recursive.c:3584
4816
#, c-format
4817
msgid "found %u common ancestor:"
4818
msgid_plural "found %u common ancestors:"
4819
msgstr[0] ""
4820
msgstr[1] ""
4821
4820
-#: merge-recursive.c:3639
4822
+#: merge-recursive.c:3634
4823
msgid "merge returned no commit"
4824
msgstr ""
4825
4824
-#: merge-recursive.c:3804
4826
+#: merge-recursive.c:3799
4827
#, c-format
4828
msgid "Could not parse object '%s'"
4829
msgstr ""
4830
4829
-#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
4831
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
4832
#: builtin/stash.c:473
4833
msgid "Unable to write index."
4834
msgstr ""
@@ -4836,7 +4838,7 @@ msgid "failed to read the cache"
4838
msgstr ""
4839
4840
#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
4839
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
4841
+#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
4842
#: builtin/stash.c:267
4843
msgid "unable to write new index file"
4844
msgstr ""
@@ -5933,10 +5935,10 @@ msgstr ""
5935
5936
#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
5937
#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
5936
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
5938
+#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
5939
#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
5940
#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
5939
-#: builtin/submodule--helper.c:331
5941
+#: builtin/submodule--helper.c:333
5942
msgid "index file corrupt"
5943
msgstr ""
5944
@@ -5990,36 +5992,36 @@ msgstr ""
5992
msgid "broken index, expect %s in %s, got %s"
5993
msgstr ""
5994
5993
-#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
5995
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
5996
#, c-format
5997
msgid "could not close '%s'"
5998
msgstr ""
5999
5998
-#: read-cache.c:3074
6000
+#: read-cache.c:3075
6001
msgid "failed to convert to a sparse-index"
6002
msgstr ""
6003
6002
-#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
6004
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
6005
#, c-format
6006
msgid "could not stat '%s'"
6007
msgstr ""
6008
6007
-#: read-cache.c:3158
6009
+#: read-cache.c:3159
6010
#, c-format
6011
msgid "unable to open git dir: %s"
6012
msgstr ""
6013
6012
-#: read-cache.c:3170
6014
+#: read-cache.c:3171
6015
#, c-format
6016
msgid "unable to unlink: %s"
6017
msgstr ""
6018
6017
-#: read-cache.c:3199
6019
+#: read-cache.c:3200
6020
#, c-format
6021
msgid "cannot fix permission bits on '%s'"
6022
msgstr ""
6023
6022
-#: read-cache.c:3348
6024
+#: read-cache.c:3349
6025
#, c-format
6026
msgid "%s: cannot drop to stage #0"
6027
msgstr ""
@@ -6383,17 +6385,17 @@ msgstr ""
6385
msgid "ignoring broken ref %s"
6386
msgstr ""
6387
6386
-#: ref-filter.c:2498
6388
+#: ref-filter.c:2502
6389
#, c-format
6390
msgid "format: %%(end) atom missing"
6391
msgstr ""
6392
6391
-#: ref-filter.c:2592
6393
+#: ref-filter.c:2596
6394
#, c-format
6395
msgid "malformed object name %s"
6396
msgstr ""
6397
6396
-#: ref-filter.c:2597
6398
+#: ref-filter.c:2601
6399
#, c-format
6400
msgid "option `%s' must point to a commit"
6401
msgstr ""
@@ -6813,7 +6815,7 @@ msgid "Recorded preimage for '%s'"
6815
msgstr ""
6816
6817
#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
6816
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
6818
+#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
6819
#, c-format
6820
msgid "could not create directory '%s'"
6821
msgstr ""
@@ -6851,7 +6853,7 @@ msgstr ""
6853
msgid "could not determine HEAD revision"
6854
msgstr ""
6855
6854
-#: reset.c:70 reset.c:76 sequencer.c:3689
6856
+#: reset.c:69 reset.c:75 sequencer.c:3689
6857
#, c-format
6858
msgid "failed to find tree of %s"
6859
msgstr ""
@@ -7050,7 +7052,7 @@ msgid "unable to dequote value of '%s'"
7052
msgstr ""
7053
7054
#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
7053
-#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
7055
+#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
7056
#, c-format
7057
msgid "could not open '%s' for reading"
7058
msgstr ""
@@ -7163,7 +7165,7 @@ msgstr ""
7165
msgid "HEAD %s is not a commit!"
7166
msgstr ""
7167
7166
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
7168
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
7169
msgid "could not parse HEAD commit"
7170
msgstr ""
7171
@@ -7171,7 +7173,7 @@ msgstr ""
7173
msgid "unable to parse commit author"
7174
msgstr ""
7175
7174
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
7176
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
7177
msgid "git write-tree failed to write a tree"
7178
msgstr ""
7179
@@ -7189,8 +7191,8 @@ msgstr ""
7191
msgid "corrupt author: missing date information"
7192
msgstr ""
7193
7192
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
7193
-#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
7194
+#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
7195
+#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
7196
msgid "failed to write commit object"
7197
msgstr ""
7198
@@ -7930,11 +7932,11 @@ msgstr ""
7932
msgid "attempting to use sparse-index without cone mode"
7933
msgstr ""
7934
7933
-#: sparse-index.c:174
7935
+#: sparse-index.c:176
7936
msgid "unable to update cache-tree, staying full"
7937
msgstr ""
7938
7937
-#: sparse-index.c:261
7939
+#: sparse-index.c:263
7940
#, c-format
7941
msgid "index entry is a directory, but not sparse (%08x)"
7942
msgstr ""
@@ -8083,7 +8085,7 @@ msgstr ""
8085
msgid "process for submodule '%s' failed"
8086
msgstr ""
8087
8086
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
8088
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
8089
msgid "Failed to resolve HEAD as a valid ref."
8090
msgstr ""
8091
@@ -8744,7 +8746,7 @@ msgstr ""
8746
msgid "Updating index flags"
8747
msgstr ""
8748
8747
-#: unpack-trees.c:2707
8749
+#: unpack-trees.c:2718
8750
#, c-format
8751
msgid "worktree and untracked commit have duplicate entries: %s"
8752
msgstr ""
@@ -9501,7 +9503,7 @@ msgstr ""
9503
msgid "interactive picking"
9504
msgstr ""
9505
9504
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
9506
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
9507
msgid "select hunks interactively"
9508
msgstr ""
9509
@@ -9616,12 +9618,12 @@ msgstr ""
9618
msgid "--chmod param '%s' must be either -x or +x"
9619
msgstr ""
9620
9619
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
9621
+#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
9622
#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
9623
msgid "--pathspec-from-file is incompatible with pathspec arguments"
9624
msgstr ""
9625
9624
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
9626
+#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
9627
#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
9628
msgid "--pathspec-file-nul requires --pathspec-from-file"
9629
msgstr ""
@@ -10399,7 +10401,7 @@ msgstr ""
10401
msgid "show work cost statistics"
10402
msgstr ""
10403
10402
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
10404
+#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
10405
#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
10406
#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
10407
#: builtin/push.c:566 builtin/send-pack.c:198
@@ -11155,7 +11157,7 @@ msgstr ""
11157
msgid "terminate input and output records by a NUL character"
11158
msgstr ""
11159
11158
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
11160
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
11161
#: builtin/worktree.c:493
11162
msgid "suppress progress reporting"
11163
msgstr ""
@@ -11214,9 +11216,10 @@ msgid "git checkout--worker [<options>]"
11216
msgstr ""
11217
11218
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
11217
-#: builtin/column.c:31 builtin/submodule--helper.c:1824
11218
-#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
11219
-#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
11219
+#: builtin/column.c:31 builtin/submodule--helper.c:1892
11220
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
11221
+#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
11222
+#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
11223
#: builtin/worktree.c:728
11224
msgid "string"
11225
msgstr ""
@@ -11311,118 +11314,118 @@ msgstr ""
11314
msgid "Unable to add merge result for '%s'"
11315
msgstr ""
11316
11314
-#: builtin/checkout.c:414
11317
+#: builtin/checkout.c:411
11318
#, c-format
11319
msgid "Recreated %d merge conflict"
11320
msgid_plural "Recreated %d merge conflicts"
11321
msgstr[0] ""
11322
msgstr[1] ""
11323
11321
-#: builtin/checkout.c:419
11324
+#: builtin/checkout.c:416
11325
#, c-format
11326
msgid "Updated %d path from %s"
11327
msgid_plural "Updated %d paths from %s"
11328
msgstr[0] ""
11329
msgstr[1] ""
11330
11328
-#: builtin/checkout.c:426
11331
+#: builtin/checkout.c:423
11332
#, c-format
11333
msgid "Updated %d path from the index"
11334
msgid_plural "Updated %d paths from the index"
11335
msgstr[0] ""
11336
msgstr[1] ""
11337
11335
-#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
11336
-#: builtin/checkout.c:459
11338
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
11339
+#: builtin/checkout.c:456
11340
#, c-format
11341
msgid "'%s' cannot be used with updating paths"
11342
msgstr ""
11343
11341
-#: builtin/checkout.c:462 builtin/checkout.c:465
11344
+#: builtin/checkout.c:459 builtin/checkout.c:462
11345
#, c-format
11346
msgid "'%s' cannot be used with %s"
11347
msgstr ""
11348
11346
-#: builtin/checkout.c:469
11349
+#: builtin/checkout.c:466
11350
#, c-format
11351
msgid "Cannot update paths and switch to branch '%s' at the same time."
11352
msgstr ""
11353
11351
-#: builtin/checkout.c:473
11354
+#: builtin/checkout.c:470
11355
#, c-format
11356
msgid "neither '%s' or '%s' is specified"
11357
msgstr ""
11358
11356
-#: builtin/checkout.c:477
11359
+#: builtin/checkout.c:474
11360
#, c-format
11361
msgid "'%s' must be used when '%s' is not specified"
11362
msgstr ""
11363
11361
-#: builtin/checkout.c:482 builtin/checkout.c:487
11364
+#: builtin/checkout.c:479 builtin/checkout.c:484
11365
#, c-format
11366
msgid "'%s' or '%s' cannot be used with %s"
11367
msgstr ""
11368
11366
-#: builtin/checkout.c:563 builtin/checkout.c:570
11369
+#: builtin/checkout.c:558 builtin/checkout.c:565
11370
#, c-format
11371
msgid "path '%s' is unmerged"
11372
msgstr ""
11373
11371
-#: builtin/checkout.c:739
11374
+#: builtin/checkout.c:734
11375
msgid "you need to resolve your current index first"
11376
msgstr ""
11377
11375
-#: builtin/checkout.c:793
11378
+#: builtin/checkout.c:788
11379
#, c-format
11380
msgid ""
11381
"cannot continue with staged changes in the following files:\n"
11382
"%s"
11383
msgstr ""
11384
11382
-#: builtin/checkout.c:886
11385
+#: builtin/checkout.c:881
11386
#, c-format
11387
msgid "Can not do reflog for '%s': %s\n"
11388
msgstr ""
11389
11387
-#: builtin/checkout.c:928
11390
+#: builtin/checkout.c:923
11391
msgid "HEAD is now at"
11392
msgstr ""
11393
11391
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
11394
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
11395
msgid "unable to update HEAD"
11396
msgstr ""
11397
11395
-#: builtin/checkout.c:936
11398
+#: builtin/checkout.c:931
11399
#, c-format
11400
msgid "Reset branch '%s'\n"
11401
msgstr ""
11402
11400
-#: builtin/checkout.c:939
11403
+#: builtin/checkout.c:934
11404
#, c-format
11405
msgid "Already on '%s'\n"
11406
msgstr ""
11407
11405
-#: builtin/checkout.c:943
11408
+#: builtin/checkout.c:938
11409
#, c-format
11410
msgid "Switched to and reset branch '%s'\n"
11411
msgstr ""
11412
11410
-#: builtin/checkout.c:945 builtin/checkout.c:1376
11413
+#: builtin/checkout.c:940 builtin/checkout.c:1371
11414
#, c-format
11415
msgid "Switched to a new branch '%s'\n"
11416
msgstr ""
11417
11415
-#: builtin/checkout.c:947
11418
+#: builtin/checkout.c:942
11419
#, c-format
11420
msgid "Switched to branch '%s'\n"
11421
msgstr ""
11422
11420
-#: builtin/checkout.c:998
11423
+#: builtin/checkout.c:993
11424
#, c-format
11425
msgid " ... and %d more.\n"
11426
msgstr ""
11427
11425
-#: builtin/checkout.c:1004
11428
+#: builtin/checkout.c:999
11429
#, c-format
11430
msgid ""
11431
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11437,7 +11440,7 @@ msgid_plural ""
11440
msgstr[0] ""
11441
msgstr[1] ""
11442
11440
-#: builtin/checkout.c:1023
11443
+#: builtin/checkout.c:1018
11444
#, c-format
11445
msgid ""
11446
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11454,26 +11457,26 @@ msgid_plural ""
11457
msgstr[0] ""
11458
msgstr[1] ""
11459
11457
-#: builtin/checkout.c:1058
11460
+#: builtin/checkout.c:1053
11461
msgid "internal error in revision walk"
11462
msgstr ""
11463
11461
-#: builtin/checkout.c:1062
11464
+#: builtin/checkout.c:1057
11465
msgid "Previous HEAD position was"
11466
msgstr ""
11467
11465
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
11468
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
11469
msgid "You are on a branch yet to be born"
11470
msgstr ""
11471
11469
-#: builtin/checkout.c:1184
11472
+#: builtin/checkout.c:1179
11473
#, c-format
11474
msgid ""
11475
"'%s' could be both a local file and a tracking branch.\n"
11476
"Please use -- (and optionally --no-guess) to disambiguate"
11477
msgstr ""
11478
11476
-#: builtin/checkout.c:1191
11479
+#: builtin/checkout.c:1186
11480
msgid ""
11481
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
11482
"you can do so by fully qualifying the name with the --track option:\n"
@@ -11485,280 +11488,281 @@ msgid ""
11488
"checkout.defaultRemote=origin in your config."
11489
msgstr ""
11490
11488
-#: builtin/checkout.c:1201
11491
+#: builtin/checkout.c:1196
11492
#, c-format
11493
msgid "'%s' matched multiple (%d) remote tracking branches"
11494
msgstr ""
11495
11493
-#: builtin/checkout.c:1267
11496
+#: builtin/checkout.c:1262
11497
msgid "only one reference expected"
11498
msgstr ""
11499
11497
-#: builtin/checkout.c:1284
11500
+#: builtin/checkout.c:1279
11501
#, c-format
11502
msgid "only one reference expected, %d given."
11503
msgstr ""
11504
11502
-#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
11505
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
11506
#, c-format
11507
msgid "invalid reference: %s"
11508
msgstr ""
11509
11507
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
11510
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
11511
#, c-format
11512
msgid "reference is not a tree: %s"
11513
msgstr ""
11514
11512
-#: builtin/checkout.c:1390
11515
+#: builtin/checkout.c:1385
11516
#, c-format
11517
msgid "a branch is expected, got tag '%s'"
11518
msgstr ""
11519
11517
-#: builtin/checkout.c:1392
11520
+#: builtin/checkout.c:1387
11521
#, c-format
11522
msgid "a branch is expected, got remote branch '%s'"
11523
msgstr ""
11524
11522
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
11525
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
11526
#, c-format
11527
msgid "a branch is expected, got '%s'"
11528
msgstr ""
11529
11527
-#: builtin/checkout.c:1396
11530
+#: builtin/checkout.c:1391
11531
#, c-format
11532
msgid "a branch is expected, got commit '%s'"
11533
msgstr ""
11534
11532
-#: builtin/checkout.c:1412
11535
+#: builtin/checkout.c:1407
11536
msgid ""
11537
"cannot switch branch while merging\n"
11538
"Consider \"git merge --quit\" or \"git worktree add\"."
11539
msgstr ""
11540
11538
-#: builtin/checkout.c:1416
11541
+#: builtin/checkout.c:1411
11542
msgid ""
11543
"cannot switch branch in the middle of an am session\n"
11544
"Consider \"git am --quit\" or \"git worktree add\"."
11545
msgstr ""
11546
11544
-#: builtin/checkout.c:1420
11547
+#: builtin/checkout.c:1415
11548
msgid ""
11549
"cannot switch branch while rebasing\n"
11550
"Consider \"git rebase --quit\" or \"git worktree add\"."
11551
msgstr ""
11552
11550
-#: builtin/checkout.c:1424
11553
+#: builtin/checkout.c:1419
11554
msgid ""
11555
"cannot switch branch while cherry-picking\n"
11556
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
11557
msgstr ""
11558
11556
-#: builtin/checkout.c:1428
11559
+#: builtin/checkout.c:1423
11560
msgid ""
11561
"cannot switch branch while reverting\n"
11562
"Consider \"git revert --quit\" or \"git worktree add\"."
11563
msgstr ""
11564
11562
-#: builtin/checkout.c:1432
11565
+#: builtin/checkout.c:1427
11566
msgid "you are switching branch while bisecting"
11567
msgstr ""
11568
11566
-#: builtin/checkout.c:1439
11569
+#: builtin/checkout.c:1434
11570
msgid "paths cannot be used with switching branches"
11571
msgstr ""
11572
11570
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
11573
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
11574
#, c-format
11575
msgid "'%s' cannot be used with switching branches"
11576
msgstr ""
11577
11575
-#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
11576
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
11578
+#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
11579
+#: builtin/checkout.c:1460 builtin/checkout.c:1465
11580
#, c-format
11581
msgid "'%s' cannot be used with '%s'"
11582
msgstr ""
11583
11581
-#: builtin/checkout.c:1467
11584
+#: builtin/checkout.c:1462
11585
#, c-format
11586
msgid "'%s' cannot take <start-point>"
11587
msgstr ""
11588
11586
-#: builtin/checkout.c:1475
11589
+#: builtin/checkout.c:1470
11590
#, c-format
11591
msgid "Cannot switch branch to a non-commit '%s'"
11592
msgstr ""
11593
11591
-#: builtin/checkout.c:1482
11594
+#: builtin/checkout.c:1477
11595
msgid "missing branch or commit argument"
11596
msgstr ""
11597
11595
-#: builtin/checkout.c:1525
11598
+#: builtin/checkout.c:1520
11599
msgid "perform a 3-way merge with the new branch"
11600
msgstr ""
11601
11599
-#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
11602
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
11603
msgid "style"
11604
msgstr ""
11605
11603
-#: builtin/checkout.c:1527
11606
+#: builtin/checkout.c:1522
11607
msgid "conflict style (merge or diff3)"
11608
msgstr ""
11609
11607
-#: builtin/checkout.c:1539 builtin/worktree.c:488
11610
+#: builtin/checkout.c:1534 builtin/worktree.c:488
11611
msgid "detach HEAD at named commit"
11612
msgstr ""
11613
11611
-#: builtin/checkout.c:1540
11614
+#: builtin/checkout.c:1535
11615
msgid "set upstream info for new branch"
11616
msgstr ""
11617
11615
-#: builtin/checkout.c:1542
11618
+#: builtin/checkout.c:1537
11619
msgid "force checkout (throw away local modifications)"
11620
msgstr ""
11621
11619
-#: builtin/checkout.c:1544
11622
+#: builtin/checkout.c:1539
11623
msgid "new-branch"
11624
msgstr ""
11625
11623
-#: builtin/checkout.c:1544
11626
+#: builtin/checkout.c:1539
11627
msgid "new unparented branch"
11628
msgstr ""
11629
11627
-#: builtin/checkout.c:1546 builtin/merge.c:301
11630
+#: builtin/checkout.c:1541 builtin/merge.c:301
11631
msgid "update ignored files (default)"
11632
msgstr ""
11633
11631
-#: builtin/checkout.c:1549
11634
+#: builtin/checkout.c:1544
11635
msgid "do not check if another worktree is holding the given ref"
11636
msgstr ""
11637
11635
-#: builtin/checkout.c:1562
11638
+#: builtin/checkout.c:1557
11639
msgid "checkout our version for unmerged files"
11640
msgstr ""
11641
11639
-#: builtin/checkout.c:1565
11642
+#: builtin/checkout.c:1560
11643
msgid "checkout their version for unmerged files"
11644
msgstr ""
11645
11643
-#: builtin/checkout.c:1569
11646
+#: builtin/checkout.c:1564
11647
msgid "do not limit pathspecs to sparse entries only"
11648
msgstr ""
11649
11647
-#: builtin/checkout.c:1624
11650
+#: builtin/checkout.c:1622
11651
#, c-format
11652
msgid "-%c, -%c and --orphan are mutually exclusive"
11653
msgstr ""
11654
11652
-#: builtin/checkout.c:1628
11655
+#: builtin/checkout.c:1626
11656
msgid "-p and --overlay are mutually exclusive"
11657
msgstr ""
11658
11656
-#: builtin/checkout.c:1665
11659
+#: builtin/checkout.c:1663
11660
msgid "--track needs a branch name"
11661
msgstr ""
11662
11660
-#: builtin/checkout.c:1670
11663
+#: builtin/checkout.c:1668
11664
#, c-format
11665
msgid "missing branch name; try -%c"
11666
msgstr ""
11667
11665
-#: builtin/checkout.c:1702
11668
+#: builtin/checkout.c:1700
11669
#, c-format
11670
msgid "could not resolve %s"
11671
msgstr ""
11672
11670
-#: builtin/checkout.c:1718
11673
+#: builtin/checkout.c:1716
11674
msgid "invalid path specification"
11675
msgstr ""
11676
11674
-#: builtin/checkout.c:1725
11677
+#: builtin/checkout.c:1723
11678
#, c-format
11679
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11680
msgstr ""
11681
11679
-#: builtin/checkout.c:1729
11682
+#: builtin/checkout.c:1727
11683
#, c-format
11684
msgid "git checkout: --detach does not take a path argument '%s'"
11685
msgstr ""
11686
11684
-#: builtin/checkout.c:1738
11687
+#: builtin/checkout.c:1736
11688
msgid "--pathspec-from-file is incompatible with --detach"
11689
msgstr ""
11690
11688
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
11691
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
11692
msgid "--pathspec-from-file is incompatible with --patch"
11693
msgstr ""
11694
11692
-#: builtin/checkout.c:1754
11695
+#: builtin/checkout.c:1752
11696
msgid ""
11697
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
11698
"checking out of the index."
11699
msgstr ""
11700
11698
-#: builtin/checkout.c:1759
11701
+#: builtin/checkout.c:1757
11702
msgid "you must specify path(s) to restore"
11703
msgstr ""
11704
11702
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
11703
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
11704
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
11705
+#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
11706
+#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
11707
+#: builtin/remote.c:172 builtin/submodule--helper.c:2736
11708
+#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
11709
#: builtin/worktree.c:486
11710
msgid "branch"
11711
msgstr ""
11712
11709
-#: builtin/checkout.c:1786
11713
+#: builtin/checkout.c:1784
11714
msgid "create and checkout a new branch"
11715
msgstr ""
11716
11713
-#: builtin/checkout.c:1788
11717
+#: builtin/checkout.c:1786
11718
msgid "create/reset and checkout a branch"
11719
msgstr ""
11720
11717
-#: builtin/checkout.c:1789
11721
+#: builtin/checkout.c:1787
11722
msgid "create reflog for new branch"
11723
msgstr ""
11724
11721
-#: builtin/checkout.c:1791
11725
+#: builtin/checkout.c:1789
11726
msgid "second guess 'git checkout <no-such-branch>' (default)"
11727
msgstr ""
11728
11725
-#: builtin/checkout.c:1792
11729
+#: builtin/checkout.c:1790
11730
msgid "use overlay mode (default)"
11731
msgstr ""
11732
11729
-#: builtin/checkout.c:1837
11733
+#: builtin/checkout.c:1835
11734
msgid "create and switch to a new branch"
11735
msgstr ""
11736
11733
-#: builtin/checkout.c:1839
11737
+#: builtin/checkout.c:1837
11738
msgid "create/reset and switch to a branch"
11739
msgstr ""
11740
11737
-#: builtin/checkout.c:1841
11741
+#: builtin/checkout.c:1839
11742
msgid "second guess 'git switch <no-such-branch>'"
11743
msgstr ""
11744
11741
-#: builtin/checkout.c:1843
11745
+#: builtin/checkout.c:1841
11746
msgid "throw away local modifications"
11747
msgstr ""
11748
11745
-#: builtin/checkout.c:1877
11749
+#: builtin/checkout.c:1875
11750
msgid "which tree-ish to checkout from"
11751
msgstr ""
11752
11749
-#: builtin/checkout.c:1879
11753
+#: builtin/checkout.c:1877
11754
msgid "restore the index"
11755
msgstr ""
11756
11753
-#: builtin/checkout.c:1881
11757
+#: builtin/checkout.c:1879
11758
msgid "restore the working tree (default)"
11759
msgstr ""
11760
11757
-#: builtin/checkout.c:1883
11761
+#: builtin/checkout.c:1881
11762
msgid "ignore unmerged entries"
11763
msgstr ""
11764
11761
-#: builtin/checkout.c:1884
11765
+#: builtin/checkout.c:1882
11766
msgid "use overlay mode"
11767
msgstr ""
11768
@@ -11964,13 +11968,13 @@ msgstr ""
11968
msgid "directory from which templates will be used"
11969
msgstr ""
11970
11967
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
11968
-#: builtin/submodule--helper.c:2336
11971
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
11972
+#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
11973
msgid "reference repository"
11974
msgstr ""
11975
11972
-#: builtin/clone.c:123 builtin/submodule--helper.c:1833
11973
-#: builtin/submodule--helper.c:2338
11976
+#: builtin/clone.c:123 builtin/submodule--helper.c:1901
11977
+#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
11978
msgid "use --reference only while cloning"
11979
msgstr ""
11980
@@ -12019,8 +12023,8 @@ msgstr ""
12023
msgid "deepen history of shallow clone, excluding rev"
12024
msgstr ""
12025
12022
-#: builtin/clone.c:137 builtin/submodule--helper.c:1843
12023
-#: builtin/submodule--helper.c:2352
12026
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
12027
+#: builtin/submodule--helper.c:2369
12028
msgid "clone only one branch, HEAD or --branch"
12029
msgstr ""
12030
@@ -12999,36 +13003,36 @@ msgstr ""
13003
msgid "ok to record a change with an empty message"
13004
msgstr ""
13005
13002
-#: builtin/commit.c:1747
13006
+#: builtin/commit.c:1750
13007
#, c-format
13008
msgid "Corrupt MERGE_HEAD file (%s)"
13009
msgstr ""
13010
13007
-#: builtin/commit.c:1754
13011
+#: builtin/commit.c:1757
13012
msgid "could not read MERGE_MODE"
13013
msgstr ""
13014
13011
-#: builtin/commit.c:1775
13015
+#: builtin/commit.c:1778
13016
#, c-format
13017
msgid "could not read commit message: %s"
13018
msgstr ""
13019
13016
-#: builtin/commit.c:1782
13020
+#: builtin/commit.c:1785
13021
#, c-format
13022
msgid "Aborting commit due to empty commit message.\n"
13023
msgstr ""
13024
13021
-#: builtin/commit.c:1787
13025
+#: builtin/commit.c:1790
13026
#, c-format
13027
msgid "Aborting commit; you did not edit the message.\n"
13028
msgstr ""
13029
13026
-#: builtin/commit.c:1798
13030
+#: builtin/commit.c:1801
13031
#, c-format
13032
msgid "Aborting commit due to empty commit message body.\n"
13033
msgstr ""
13034
13031
-#: builtin/commit.c:1834
13035
+#: builtin/commit.c:1837
13036
msgid ""
13037
"repository has been updated, but unable to write\n"
13038
"new_index file. Check that disk is not full and quota is\n"
@@ -14329,15 +14333,15 @@ msgstr ""
14333
msgid "git for-each-repo --config=<config> <command-args>"
14334
msgstr ""
14335
14332
-#: builtin/for-each-repo.c:37
14336
+#: builtin/for-each-repo.c:34
14337
msgid "config"
14338
msgstr ""
14339
14336
-#: builtin/for-each-repo.c:38
14340
+#: builtin/for-each-repo.c:35
14341
msgid "config key storing a list of repository paths"
14342
msgstr ""
14343
14340
-#: builtin/for-each-repo.c:46
14344
+#: builtin/for-each-repo.c:43
14345
msgid "missing --config=<config>"
14346
msgstr ""
14347
@@ -16653,212 +16657,212 @@ msgstr ""
16657
msgid "'%s' does not point to a commit"
16658
msgstr ""
16659
16656
-#: builtin/merge.c:602
16660
+#: builtin/merge.c:603
16661
#, c-format
16662
msgid "Bad branch.%s.mergeoptions string: %s"
16663
msgstr ""
16664
16661
-#: builtin/merge.c:728
16665
+#: builtin/merge.c:729
16666
msgid "Not handling anything other than two heads merge."
16667
msgstr ""
16668
16665
-#: builtin/merge.c:741
16669
+#: builtin/merge.c:742
16670
#, c-format
16671
msgid "Unknown option for merge-recursive: -X%s"
16672
msgstr ""
16673
16670
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
16674
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
16675
#, c-format
16676
msgid "unable to write %s"
16677
msgstr ""
16678
16675
-#: builtin/merge.c:812
16679
+#: builtin/merge.c:813
16680
#, c-format
16681
msgid "Could not read from '%s'"
16682
msgstr ""
16683
16680
-#: builtin/merge.c:821
16684
+#: builtin/merge.c:822
16685
#, c-format
16686
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
16687
msgstr ""
16688
16685
-#: builtin/merge.c:827
16689
+#: builtin/merge.c:828
16690
msgid ""
16691
"Please enter a commit message to explain why this merge is necessary,\n"
16692
"especially if it merges an updated upstream into a topic branch.\n"
16693
"\n"
16694
msgstr ""
16695
16692
-#: builtin/merge.c:832
16696
+#: builtin/merge.c:833
16697
msgid "An empty message aborts the commit.\n"
16698
msgstr ""
16699
16696
-#: builtin/merge.c:835
16700
+#: builtin/merge.c:836
16701
#, c-format
16702
msgid ""
16703
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
16704
"the commit.\n"
16705
msgstr ""
16706
16703
-#: builtin/merge.c:888
16707
+#: builtin/merge.c:889
16708
msgid "Empty commit message."
16709
msgstr ""
16710
16707
-#: builtin/merge.c:903
16711
+#: builtin/merge.c:904
16712
#, c-format
16713
msgid "Wonderful.\n"
16714
msgstr ""
16715
16712
-#: builtin/merge.c:964
16716
+#: builtin/merge.c:965
16717
#, c-format
16718
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
16719
msgstr ""
16720
16717
-#: builtin/merge.c:1003
16721
+#: builtin/merge.c:1004
16722
msgid "No current branch."
16723
msgstr ""
16724
16721
-#: builtin/merge.c:1005
16725
+#: builtin/merge.c:1006
16726
msgid "No remote for the current branch."
16727
msgstr ""
16728
16725
-#: builtin/merge.c:1007
16729
+#: builtin/merge.c:1008
16730
msgid "No default upstream defined for the current branch."
16731
msgstr ""
16732
16729
-#: builtin/merge.c:1012
16733
+#: builtin/merge.c:1013
16734
#, c-format
16735
msgid "No remote-tracking branch for %s from %s"
16736
msgstr ""
16737
16734
-#: builtin/merge.c:1069
16738
+#: builtin/merge.c:1070
16739
#, c-format
16740
msgid "Bad value '%s' in environment '%s'"
16741
msgstr ""
16742
16739
-#: builtin/merge.c:1172
16743
+#: builtin/merge.c:1173
16744
#, c-format
16745
msgid "not something we can merge in %s: %s"
16746
msgstr ""
16747
16744
-#: builtin/merge.c:1206
16748
+#: builtin/merge.c:1207
16749
msgid "not something we can merge"
16750
msgstr ""
16751
16748
-#: builtin/merge.c:1316
16752
+#: builtin/merge.c:1317
16753
msgid "--abort expects no arguments"
16754
msgstr ""
16755
16752
-#: builtin/merge.c:1320
16756
+#: builtin/merge.c:1321
16757
msgid "There is no merge to abort (MERGE_HEAD missing)."
16758
msgstr ""
16759
16756
-#: builtin/merge.c:1338
16760
+#: builtin/merge.c:1339
16761
msgid "--quit expects no arguments"
16762
msgstr ""
16763
16760
-#: builtin/merge.c:1351
16764
+#: builtin/merge.c:1352
16765
msgid "--continue expects no arguments"
16766
msgstr ""
16767
16764
-#: builtin/merge.c:1355
16768
+#: builtin/merge.c:1356
16769
msgid "There is no merge in progress (MERGE_HEAD missing)."
16770
msgstr ""
16771
16768
-#: builtin/merge.c:1371
16772
+#: builtin/merge.c:1372
16773
msgid ""
16774
"You have not concluded your merge (MERGE_HEAD exists).\n"
16775
"Please, commit your changes before you merge."
16776
msgstr ""
16777
16774
-#: builtin/merge.c:1378
16778
+#: builtin/merge.c:1379
16779
msgid ""
16780
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
16781
"Please, commit your changes before you merge."
16782
msgstr ""
16783
16780
-#: builtin/merge.c:1381
16784
+#: builtin/merge.c:1382
16785
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
16786
msgstr ""
16787
16784
-#: builtin/merge.c:1395
16788
+#: builtin/merge.c:1396
16789
msgid "You cannot combine --squash with --no-ff."
16790
msgstr ""
16791
16788
-#: builtin/merge.c:1397
16792
+#: builtin/merge.c:1398
16793
msgid "You cannot combine --squash with --commit."
16794
msgstr ""
16795
16792
-#: builtin/merge.c:1413
16796
+#: builtin/merge.c:1414
16797
msgid "No commit specified and merge.defaultToUpstream not set."
16798
msgstr ""
16799
16796
-#: builtin/merge.c:1430
16800
+#: builtin/merge.c:1431
16801
msgid "Squash commit into empty head not supported yet"
16802
msgstr ""
16803
16800
-#: builtin/merge.c:1432
16804
+#: builtin/merge.c:1433
16805
msgid "Non-fast-forward commit does not make sense into an empty head"
16806
msgstr ""
16807
16804
-#: builtin/merge.c:1437
16808
+#: builtin/merge.c:1438
16809
#, c-format
16810
msgid "%s - not something we can merge"
16811
msgstr ""
16812
16809
-#: builtin/merge.c:1439
16813
+#: builtin/merge.c:1440
16814
msgid "Can merge only exactly one commit into empty head"
16815
msgstr ""
16816
16813
-#: builtin/merge.c:1520
16817
+#: builtin/merge.c:1521
16818
msgid "refusing to merge unrelated histories"
16819
msgstr ""
16820
16817
-#: builtin/merge.c:1539
16821
+#: builtin/merge.c:1540
16822
#, c-format
16823
msgid "Updating %s..%s\n"
16824
msgstr ""
16825
16822
-#: builtin/merge.c:1585
16826
+#: builtin/merge.c:1587
16827
#, c-format
16828
msgid "Trying really trivial in-index merge...\n"
16829
msgstr ""
16830
16827
-#: builtin/merge.c:1592
16831
+#: builtin/merge.c:1594
16832
#, c-format
16833
msgid "Nope.\n"
16834
msgstr ""
16835
16832
-#: builtin/merge.c:1623
16836
+#: builtin/merge.c:1625
16837
msgid "Not possible to fast-forward, aborting."
16838
msgstr ""
16839
16836
-#: builtin/merge.c:1651 builtin/merge.c:1716
16840
+#: builtin/merge.c:1653 builtin/merge.c:1719
16841
#, c-format
16842
msgid "Rewinding the tree to pristine...\n"
16843
msgstr ""
16844
16841
-#: builtin/merge.c:1655
16845
+#: builtin/merge.c:1657
16846
#, c-format
16847
msgid "Trying merge strategy %s...\n"
16848
msgstr ""
16849
16846
-#: builtin/merge.c:1707
16850
+#: builtin/merge.c:1709
16851
#, c-format
16852
msgid "No merge strategy handled the merge.\n"
16853
msgstr ""
16854
16851
-#: builtin/merge.c:1709
16855
+#: builtin/merge.c:1711
16856
#, c-format
16857
msgid "Merge with strategy %s failed.\n"
16858
msgstr ""
16859
16856
-#: builtin/merge.c:1718
16860
+#: builtin/merge.c:1721
16861
#, c-format
16858
-msgid "Using the %s to prepare resolving by hand.\n"
16862
+msgid "Using the %s strategy to prepare resolving by hand.\n"
16863
msgstr ""
16864
16861
-#: builtin/merge.c:1732
16865
+#: builtin/merge.c:1735
16866
#, c-format
16867
msgid "Automatic merge went well; stopped before committing as requested\n"
16868
msgstr ""
@@ -19007,7 +19011,7 @@ msgid "fatal: no such branch/commit '%s'"
19011
msgstr ""
19012
19013
#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
19010
-#: builtin/submodule--helper.c:2414
19014
+#: builtin/submodule--helper.c:2431
19015
#, c-format
19016
msgid "No such ref: %s"
19017
msgstr ""
@@ -20768,37 +20772,37 @@ msgstr ""
20772
msgid "failed to open '%s'"
20773
msgstr ""
20774
20771
-#: builtin/sparse-checkout.c:419
20775
+#: builtin/sparse-checkout.c:413
20776
#, c-format
20777
msgid "could not normalize path %s"
20778
msgstr ""
20779
20776
-#: builtin/sparse-checkout.c:431
20780
+#: builtin/sparse-checkout.c:425
20781
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
20782
msgstr ""
20783
20780
-#: builtin/sparse-checkout.c:456
20784
+#: builtin/sparse-checkout.c:450
20785
#, c-format
20786
msgid "unable to unquote C-style string '%s'"
20787
msgstr ""
20788
20785
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
20789
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
20790
msgid "unable to load existing sparse-checkout patterns"
20791
msgstr ""
20792
20789
-#: builtin/sparse-checkout.c:579
20793
+#: builtin/sparse-checkout.c:573
20794
msgid "read patterns from standard in"
20795
msgstr ""
20796
20793
-#: builtin/sparse-checkout.c:594
20797
+#: builtin/sparse-checkout.c:588
20798
msgid "git sparse-checkout reapply"
20799
msgstr ""
20800
20797
-#: builtin/sparse-checkout.c:613
20801
+#: builtin/sparse-checkout.c:607
20802
msgid "git sparse-checkout disable"
20803
msgstr ""
20804
20801
-#: builtin/sparse-checkout.c:644
20805
+#: builtin/sparse-checkout.c:638
20806
msgid "error while refreshing working directory"
20807
msgstr ""
20808
@@ -21067,7 +21071,7 @@ msgstr ""
21071
msgid "prepend comment character and space to each line"
21072
msgstr ""
21073
21070
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
21074
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
21075
#, c-format
21076
msgid "Expecting a full ref name, got %s"
21077
msgstr ""
@@ -21081,33 +21085,34 @@ msgstr ""
21085
msgid "cannot strip one component off url '%s'"
21086
msgstr ""
21087
21084
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
21088
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
21089
+#: builtin/submodule--helper.c:2891
21090
msgid "alternative anchor for relative paths"
21091
msgstr ""
21092
21088
-#: builtin/submodule--helper.c:414
21093
+#: builtin/submodule--helper.c:416
21094
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
21095
msgstr ""
21096
21092
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
21093
-#: builtin/submodule--helper.c:652
21097
+#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
21098
+#: builtin/submodule--helper.c:654
21099
#, c-format
21100
msgid "No url found for submodule path '%s' in .gitmodules"
21101
msgstr ""
21102
21098
-#: builtin/submodule--helper.c:524
21103
+#: builtin/submodule--helper.c:526
21104
#, c-format
21105
msgid "Entering '%s'\n"
21106
msgstr ""
21107
21103
-#: builtin/submodule--helper.c:527
21108
+#: builtin/submodule--helper.c:529
21109
#, c-format
21110
msgid ""
21111
"run_command returned non-zero status for %s\n"
21112
"."
21113
msgstr ""
21114
21110
-#: builtin/submodule--helper.c:549
21115
+#: builtin/submodule--helper.c:551
21116
#, c-format
21117
msgid ""
21118
"run_command returned non-zero status while recursing in the nested "
@@ -21115,220 +21120,220 @@ msgid ""
21120
"."
21121
msgstr ""
21122
21118
-#: builtin/submodule--helper.c:565
21123
+#: builtin/submodule--helper.c:567
21124
msgid "suppress output of entering each submodule command"
21125
msgstr ""
21126
21122
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
21123
-#: builtin/submodule--helper.c:1487
21127
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
21128
+#: builtin/submodule--helper.c:1489
21129
msgid "recurse into nested submodules"
21130
msgstr ""
21131
21127
-#: builtin/submodule--helper.c:572
21132
+#: builtin/submodule--helper.c:574
21133
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
21134
msgstr ""
21135
21131
-#: builtin/submodule--helper.c:599
21136
+#: builtin/submodule--helper.c:601
21137
#, c-format
21138
msgid ""
21139
"could not look up configuration '%s'. Assuming this repository is its own "
21140
"authoritative upstream."
21141
msgstr ""
21142
21138
-#: builtin/submodule--helper.c:666
21143
+#: builtin/submodule--helper.c:668
21144
#, c-format
21145
msgid "Failed to register url for submodule path '%s'"
21146
msgstr ""
21147
21143
-#: builtin/submodule--helper.c:670
21148
+#: builtin/submodule--helper.c:672
21149
#, c-format
21150
msgid "Submodule '%s' (%s) registered for path '%s'\n"
21151
msgstr ""
21152
21148
-#: builtin/submodule--helper.c:680
21153
+#: builtin/submodule--helper.c:682
21154
#, c-format
21155
msgid "warning: command update mode suggested for submodule '%s'\n"
21156
msgstr ""
21157
21153
-#: builtin/submodule--helper.c:687
21158
+#: builtin/submodule--helper.c:689
21159
#, c-format
21160
msgid "Failed to register update mode for submodule path '%s'"
21161
msgstr ""
21162
21158
-#: builtin/submodule--helper.c:709
21163
+#: builtin/submodule--helper.c:711
21164
msgid "suppress output for initializing a submodule"
21165
msgstr ""
21166
21162
-#: builtin/submodule--helper.c:714
21167
+#: builtin/submodule--helper.c:716
21168
msgid "git submodule--helper init [<options>] [<path>]"
21169
msgstr ""
21170
21166
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
21171
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
21172
#, c-format
21173
msgid "no submodule mapping found in .gitmodules for path '%s'"
21174
msgstr ""
21175
21171
-#: builtin/submodule--helper.c:835
21176
+#: builtin/submodule--helper.c:837
21177
#, c-format
21178
msgid "could not resolve HEAD ref inside the submodule '%s'"
21179
msgstr ""
21180
21176
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
21181
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
21182
#, c-format
21183
msgid "failed to recurse into submodule '%s'"
21184
msgstr ""
21185
21181
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
21186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
21187
msgid "suppress submodule status output"
21188
msgstr ""
21189
21185
-#: builtin/submodule--helper.c:887
21190
+#: builtin/submodule--helper.c:889
21191
msgid ""
21192
"use commit stored in the index instead of the one stored in the submodule "
21193
"HEAD"
21194
msgstr ""
21195
21191
-#: builtin/submodule--helper.c:893
21196
+#: builtin/submodule--helper.c:895
21197
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
21198
msgstr ""
21199
21195
-#: builtin/submodule--helper.c:917
21200
+#: builtin/submodule--helper.c:919
21201
msgid "git submodule--helper name <path>"
21202
msgstr ""
21203
21199
-#: builtin/submodule--helper.c:989
21204
+#: builtin/submodule--helper.c:991
21205
#, c-format
21206
msgid "* %s %s(blob)->%s(submodule)"
21207
msgstr ""
21208
21204
-#: builtin/submodule--helper.c:992
21209
+#: builtin/submodule--helper.c:994
21210
#, c-format
21211
msgid "* %s %s(submodule)->%s(blob)"
21212
msgstr ""
21213
21209
-#: builtin/submodule--helper.c:1005
21214
+#: builtin/submodule--helper.c:1007
21215
#, c-format
21216
msgid "%s"
21217
msgstr ""
21218
21214
-#: builtin/submodule--helper.c:1055
21219
+#: builtin/submodule--helper.c:1057
21220
#, c-format
21221
msgid "couldn't hash object from '%s'"
21222
msgstr ""
21223
21219
-#: builtin/submodule--helper.c:1059
21224
+#: builtin/submodule--helper.c:1061
21225
#, c-format
21226
msgid "unexpected mode %o\n"
21227
msgstr ""
21228
21224
-#: builtin/submodule--helper.c:1300
21229
+#: builtin/submodule--helper.c:1302
21230
msgid "use the commit stored in the index instead of the submodule HEAD"
21231
msgstr ""
21232
21228
-#: builtin/submodule--helper.c:1302
21233
+#: builtin/submodule--helper.c:1304
21234
msgid "compare the commit in the index with that in the submodule HEAD"
21235
msgstr ""
21236
21232
-#: builtin/submodule--helper.c:1304
21237
+#: builtin/submodule--helper.c:1306
21238
msgid "skip submodules with 'ignore_config' value set to 'all'"
21239
msgstr ""
21240
21236
-#: builtin/submodule--helper.c:1306
21241
+#: builtin/submodule--helper.c:1308
21242
msgid "limit the summary size"
21243
msgstr ""
21244
21240
-#: builtin/submodule--helper.c:1311
21245
+#: builtin/submodule--helper.c:1313
21246
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
21247
msgstr ""
21248
21244
-#: builtin/submodule--helper.c:1335
21249
+#: builtin/submodule--helper.c:1337
21250
msgid "could not fetch a revision for HEAD"
21251
msgstr ""
21252
21248
-#: builtin/submodule--helper.c:1340
21253
+#: builtin/submodule--helper.c:1342
21254
msgid "--cached and --files are mutually exclusive"
21255
msgstr ""
21256
21252
-#: builtin/submodule--helper.c:1407
21257
+#: builtin/submodule--helper.c:1409
21258
#, c-format
21259
msgid "Synchronizing submodule url for '%s'\n"
21260
msgstr ""
21261
21257
-#: builtin/submodule--helper.c:1413
21262
+#: builtin/submodule--helper.c:1415
21263
#, c-format
21264
msgid "failed to register url for submodule path '%s'"
21265
msgstr ""
21266
21262
-#: builtin/submodule--helper.c:1427
21267
+#: builtin/submodule--helper.c:1429
21268
#, c-format
21269
msgid "failed to get the default remote for submodule '%s'"
21270
msgstr ""
21271
21267
-#: builtin/submodule--helper.c:1438
21272
+#: builtin/submodule--helper.c:1440
21273
#, c-format
21274
msgid "failed to update remote for submodule '%s'"
21275
msgstr ""
21276
21272
-#: builtin/submodule--helper.c:1485
21277
+#: builtin/submodule--helper.c:1487
21278
msgid "suppress output of synchronizing submodule url"
21279
msgstr ""
21280
21276
-#: builtin/submodule--helper.c:1492
21281
+#: builtin/submodule--helper.c:1494
21282
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
21283
msgstr ""
21284
21280
-#: builtin/submodule--helper.c:1546
21285
+#: builtin/submodule--helper.c:1548
21286
#, c-format
21287
msgid ""
21288
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
21289
"really want to remove it including all of its history)"
21290
msgstr ""
21291
21287
-#: builtin/submodule--helper.c:1558
21292
+#: builtin/submodule--helper.c:1560
21293
#, c-format
21294
msgid ""
21295
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
21296
"them"
21297
msgstr ""
21298
21294
-#: builtin/submodule--helper.c:1566
21299
+#: builtin/submodule--helper.c:1568
21300
#, c-format
21301
msgid "Cleared directory '%s'\n"
21302
msgstr ""
21303
21299
-#: builtin/submodule--helper.c:1568
21304
+#: builtin/submodule--helper.c:1570
21305
#, c-format
21306
msgid "Could not remove submodule work tree '%s'\n"
21307
msgstr ""
21308
21304
-#: builtin/submodule--helper.c:1579
21309
+#: builtin/submodule--helper.c:1581
21310
#, c-format
21311
msgid "could not create empty submodule directory %s"
21312
msgstr ""
21313
21309
-#: builtin/submodule--helper.c:1595
21314
+#: builtin/submodule--helper.c:1597
21315
#, c-format
21316
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
21317
msgstr ""
21318
21314
-#: builtin/submodule--helper.c:1624
21319
+#: builtin/submodule--helper.c:1626
21320
msgid "remove submodule working trees even if they contain local changes"
21321
msgstr ""
21322
21318
-#: builtin/submodule--helper.c:1625
21323
+#: builtin/submodule--helper.c:1627
21324
msgid "unregister all submodules"
21325
msgstr ""
21326
21322
-#: builtin/submodule--helper.c:1630
21327
+#: builtin/submodule--helper.c:1632
21328
msgid ""
21329
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
21330
msgstr ""
21331
21327
-#: builtin/submodule--helper.c:1644
21332
+#: builtin/submodule--helper.c:1646
21333
msgid "Use '--all' if you really want to deinitialize all submodules"
21334
msgstr ""
21335
21331
-#: builtin/submodule--helper.c:1713
21336
+#: builtin/submodule--helper.c:1690
21337
msgid ""
21338
"An alternate computed from a superproject's alternate is invalid.\n"
21339
"To allow Git to clone without an alternate in such a case, set\n"
@@ -21336,231 +21341,282 @@ msgid ""
21341
"'--reference-if-able' instead of '--reference'."
21342
msgstr ""
21343
21339
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
21344
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
21345
#, c-format
21346
msgid "submodule '%s' cannot add alternate: %s"
21347
msgstr ""
21348
21344
-#: builtin/submodule--helper.c:1791
21349
+#: builtin/submodule--helper.c:1768
21350
#, c-format
21351
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
21352
msgstr ""
21353
21349
-#: builtin/submodule--helper.c:1798
21354
+#: builtin/submodule--helper.c:1775
21355
#, c-format
21356
msgid "Value '%s' for submodule.alternateLocation is not recognized"
21357
msgstr ""
21358
21354
-#: builtin/submodule--helper.c:1822
21359
+#: builtin/submodule--helper.c:1800
21360
+#, c-format
21361
+msgid "refusing to create/use '%s' in another submodule's git dir"
21362
+msgstr ""
21363
+
21364
+#: builtin/submodule--helper.c:1841
21365
+#, c-format
21366
+msgid "clone of '%s' into submodule path '%s' failed"
21367
+msgstr ""
21368
+
21369
+#: builtin/submodule--helper.c:1846
21370
+#, c-format
21371
+msgid "directory not empty: '%s'"
21372
+msgstr ""
21373
+
21374
+#: builtin/submodule--helper.c:1858
21375
+#, c-format
21376
+msgid "could not get submodule directory for '%s'"
21377
+msgstr ""
21378
+
21379
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
21380
msgid "where the new submodule will be cloned to"
21381
msgstr ""
21382
21358
-#: builtin/submodule--helper.c:1825
21383
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
21384
msgid "name of the new submodule"
21385
msgstr ""
21386
21362
-#: builtin/submodule--helper.c:1828
21387
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
21388
msgid "url where to clone the submodule from"
21389
msgstr ""
21390
21366
-#: builtin/submodule--helper.c:1836
21391
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
21392
msgid "depth for shallow clones"
21393
msgstr ""
21394
21370
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
21395
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
21396
+#: builtin/submodule--helper.c:2909
21397
msgid "force cloning progress"
21398
msgstr ""
21399
21374
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
21400
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
21401
msgid "disallow cloning into non-empty directory"
21402
msgstr ""
21403
21378
-#: builtin/submodule--helper.c:1848
21404
+#: builtin/submodule--helper.c:1916
21405
msgid ""
21406
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
21407
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
21408
"<url> --path <path>"
21409
msgstr ""
21410
21385
-#: builtin/submodule--helper.c:1873
21386
-#, c-format
21387
-msgid "refusing to create/use '%s' in another submodule's git dir"
21388
-msgstr ""
21389
-
21390
-#: builtin/submodule--helper.c:1884
21391
-#, c-format
21392
-msgid "clone of '%s' into submodule path '%s' failed"
21393
-msgstr ""
21394
-
21395
-#: builtin/submodule--helper.c:1888
21396
-#, c-format
21397
-msgid "directory not empty: '%s'"
21398
-msgstr ""
21399
-
21400
-#: builtin/submodule--helper.c:1900
21401
-#, c-format
21402
-msgid "could not get submodule directory for '%s'"
21403
-msgstr ""
21404
-
21405
-#: builtin/submodule--helper.c:1936
21411
+#: builtin/submodule--helper.c:1953
21412
#, c-format
21413
msgid "Invalid update mode '%s' for submodule path '%s'"
21414
msgstr ""
21415
21410
-#: builtin/submodule--helper.c:1940
21416
+#: builtin/submodule--helper.c:1957
21417
#, c-format
21418
msgid "Invalid update mode '%s' configured for submodule path '%s'"
21419
msgstr ""
21420
21415
-#: builtin/submodule--helper.c:2041
21421
+#: builtin/submodule--helper.c:2058
21422
#, c-format
21423
msgid "Submodule path '%s' not initialized"
21424
msgstr ""
21425
21420
-#: builtin/submodule--helper.c:2045
21426
+#: builtin/submodule--helper.c:2062
21427
msgid "Maybe you want to use 'update --init'?"
21428
msgstr ""
21429
21424
-#: builtin/submodule--helper.c:2075
21430
+#: builtin/submodule--helper.c:2092
21431
#, c-format
21432
msgid "Skipping unmerged submodule %s"
21433
msgstr ""
21434
21429
-#: builtin/submodule--helper.c:2104
21435
+#: builtin/submodule--helper.c:2121
21436
#, c-format
21437
msgid "Skipping submodule '%s'"
21438
msgstr ""
21439
21434
-#: builtin/submodule--helper.c:2254
21440
+#: builtin/submodule--helper.c:2271
21441
#, c-format
21442
msgid "Failed to clone '%s'. Retry scheduled"
21443
msgstr ""
21444
21439
-#: builtin/submodule--helper.c:2265
21445
+#: builtin/submodule--helper.c:2282
21446
#, c-format
21447
msgid "Failed to clone '%s' a second time, aborting"
21448
msgstr ""
21449
21444
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
21450
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
21451
msgid "path into the working tree"
21452
msgstr ""
21453
21448
-#: builtin/submodule--helper.c:2330
21454
+#: builtin/submodule--helper.c:2347
21455
msgid "path into the working tree, across nested submodule boundaries"
21456
msgstr ""
21457
21452
-#: builtin/submodule--helper.c:2334
21458
+#: builtin/submodule--helper.c:2351
21459
msgid "rebase, merge, checkout or none"
21460
msgstr ""
21461
21456
-#: builtin/submodule--helper.c:2340
21462
+#: builtin/submodule--helper.c:2357
21463
msgid "create a shallow clone truncated to the specified number of revisions"
21464
msgstr ""
21465
21460
-#: builtin/submodule--helper.c:2343
21466
+#: builtin/submodule--helper.c:2360
21467
msgid "parallel jobs"
21468
msgstr ""
21469
21464
-#: builtin/submodule--helper.c:2345
21470
+#: builtin/submodule--helper.c:2362
21471
msgid "whether the initial clone should follow the shallow recommendation"
21472
msgstr ""
21473
21468
-#: builtin/submodule--helper.c:2346
21474
+#: builtin/submodule--helper.c:2363
21475
msgid "don't print cloning progress"
21476
msgstr ""
21477
21472
-#: builtin/submodule--helper.c:2357
21478
+#: builtin/submodule--helper.c:2374
21479
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
21480
msgstr ""
21481
21476
-#: builtin/submodule--helper.c:2370
21482
+#: builtin/submodule--helper.c:2387
21483
msgid "bad value for update parameter"
21484
msgstr ""
21485
21480
-#: builtin/submodule--helper.c:2418
21486
+#: builtin/submodule--helper.c:2435
21487
#, c-format
21488
msgid ""
21489
"Submodule (%s) branch configured to inherit branch from superproject, but "
21490
"the superproject is not on any branch"
21491
msgstr ""
21492
21487
-#: builtin/submodule--helper.c:2541
21493
+#: builtin/submodule--helper.c:2558
21494
#, c-format
21495
msgid "could not get a repository handle for submodule '%s'"
21496
msgstr ""
21497
21492
-#: builtin/submodule--helper.c:2574
21498
+#: builtin/submodule--helper.c:2591
21499
msgid "recurse into submodules"
21500
msgstr ""
21501
21496
-#: builtin/submodule--helper.c:2580
21502
+#: builtin/submodule--helper.c:2597
21503
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
21504
msgstr ""
21505
21500
-#: builtin/submodule--helper.c:2636
21506
+#: builtin/submodule--helper.c:2653
21507
msgid "check if it is safe to write to the .gitmodules file"
21508
msgstr ""
21509
21504
-#: builtin/submodule--helper.c:2639
21510
+#: builtin/submodule--helper.c:2656
21511
msgid "unset the config in the .gitmodules file"
21512
msgstr ""
21513
21508
-#: builtin/submodule--helper.c:2644
21514
+#: builtin/submodule--helper.c:2661
21515
msgid "git submodule--helper config <name> [<value>]"
21516
msgstr ""
21517
21512
-#: builtin/submodule--helper.c:2645
21518
+#: builtin/submodule--helper.c:2662
21519
msgid "git submodule--helper config --unset <name>"
21520
msgstr ""
21521
21516
-#: builtin/submodule--helper.c:2646
21522
+#: builtin/submodule--helper.c:2663
21523
msgid "git submodule--helper config --check-writeable"
21524
msgstr ""
21525
21520
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
21526
+#: builtin/submodule--helper.c:2682 git-submodule.sh:150
21527
#, sh-format
21528
msgid "please make sure that the .gitmodules file is in the working tree"
21529
msgstr ""
21530
21525
-#: builtin/submodule--helper.c:2681
21531
+#: builtin/submodule--helper.c:2698
21532
msgid "suppress output for setting url of a submodule"
21533
msgstr ""
21534
21529
-#: builtin/submodule--helper.c:2685
21535
+#: builtin/submodule--helper.c:2702
21536
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
21537
msgstr ""
21538
21533
-#: builtin/submodule--helper.c:2718
21539
+#: builtin/submodule--helper.c:2735
21540
msgid "set the default tracking branch to master"
21541
msgstr ""
21542
21537
-#: builtin/submodule--helper.c:2720
21543
+#: builtin/submodule--helper.c:2737
21544
msgid "set the default tracking branch"
21545
msgstr ""
21546
21541
-#: builtin/submodule--helper.c:2724
21547
+#: builtin/submodule--helper.c:2741
21548
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
21549
msgstr ""
21550
21545
-#: builtin/submodule--helper.c:2725
21551
+#: builtin/submodule--helper.c:2742
21552
msgid ""
21553
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
21554
msgstr ""
21555
21550
-#: builtin/submodule--helper.c:2732
21556
+#: builtin/submodule--helper.c:2749
21557
msgid "--branch or --default required"
21558
msgstr ""
21559
21554
-#: builtin/submodule--helper.c:2735
21560
+#: builtin/submodule--helper.c:2752
21561
msgid "--branch and --default are mutually exclusive"
21562
msgstr ""
21563
21558
-#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
21564
+#: builtin/submodule--helper.c:2815
21565
+#, c-format
21566
+msgid "Adding existing repo at '%s' to the index\n"
21567
+msgstr ""
21568
+
21569
+#: builtin/submodule--helper.c:2818
21570
+#, c-format
21571
+msgid "'%s' already exists and is not a valid git repo"
21572
+msgstr ""
21573
+
21574
+#: builtin/submodule--helper.c:2828
21575
+#, c-format
21576
+msgid "A git directory for '%s' is found locally with remote(s):"
21577
+msgstr ""
21578
+
21579
+#: builtin/submodule--helper.c:2833
21580
+#, c-format
21581
+msgid ""
21582
+"If you want to reuse this local git directory instead of cloning again from\n"
21583
+" %s\n"
21584
+"use the '--force' option. If the local git directory is not the correct "
21585
+"repo\n"
21586
+"or if you are unsure what this means, choose another name with the '--name' "
21587
+"option.\n"
21588
+msgstr ""
21589
+
21590
+#: builtin/submodule--helper.c:2842
21591
+#, c-format
21592
+msgid "Reactivating local git directory for submodule '%s'\n"
21593
+msgstr ""
21594
+
21595
+#: builtin/submodule--helper.c:2875
21596
+#, c-format
21597
+msgid "unable to checkout submodule '%s'"
21598
+msgstr ""
21599
+
21600
+#: builtin/submodule--helper.c:2888
21601
+msgid "branch of repository to checkout on cloning"
21602
+msgstr ""
21603
+
21604
+#: builtin/submodule--helper.c:2910
21605
+msgid "allow adding an otherwise ignored submodule path"
21606
+msgstr ""
21607
+
21608
+#: builtin/submodule--helper.c:2917
21609
+msgid ""
21610
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
21611
+"name <name>"
21612
+msgstr ""
21613
+
21614
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
21615
#, c-format
21616
msgid "%s doesn't support --super-prefix"
21617
msgstr ""
21618
21563
-#: builtin/submodule--helper.c:2798
21619
+#: builtin/submodule--helper.c:2991
21620
#, c-format
21621
msgid "'%s' is not a valid submodule--helper subcommand"
21622
msgstr ""
@@ -23684,124 +23740,88 @@ msgstr ""
23740
msgid "'$sm_path' does not have a commit checked out"
23741
msgstr ""
23742
23687
-#: git-submodule.sh:249
23688
-#, sh-format
23689
-msgid "Adding existing repo at '$sm_path' to the index"
23690
-msgstr ""
23691
-
23692
-#: git-submodule.sh:251
23693
-#, sh-format
23694
-msgid "'$sm_path' already exists and is not a valid git repo"
23695
-msgstr ""
23696
-
23697
-#: git-submodule.sh:259
23698
-#, sh-format
23699
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
23700
-msgstr ""
23701
-
23702
-#: git-submodule.sh:261
23703
-#, sh-format
23704
-msgid ""
23705
-"If you want to reuse this local git directory instead of cloning again from\n"
23706
-" $realrepo\n"
23707
-"use the '--force' option. If the local git directory is not the correct "
23708
-"repo\n"
23709
-"or you are unsure what this means choose another name with the '--name' "
23710
-"option."
23711
-msgstr ""
23712
-
23713
-#: git-submodule.sh:267
23714
-#, sh-format
23715
-msgid "Reactivating local git directory for submodule '$sm_name'."
23716
-msgstr ""
23717
-
23718
-#: git-submodule.sh:279
23719
-#, sh-format
23720
-msgid "Unable to checkout submodule '$sm_path'"
23721
-msgstr ""
23722
-
23723
-#: git-submodule.sh:284
23743
+#: git-submodule.sh:248
23744
#, sh-format
23745
msgid "Failed to add submodule '$sm_path'"
23746
msgstr ""
23747
23728
-#: git-submodule.sh:293
23748
+#: git-submodule.sh:257
23749
#, sh-format
23750
msgid "Failed to register submodule '$sm_path'"
23751
msgstr ""
23752
23733
-#: git-submodule.sh:568
23753
+#: git-submodule.sh:532
23754
#, sh-format
23755
msgid "Unable to find current revision in submodule path '$displaypath'"
23756
msgstr ""
23757
23738
-#: git-submodule.sh:578
23758
+#: git-submodule.sh:542
23759
#, sh-format
23760
msgid "Unable to fetch in submodule path '$sm_path'"
23761
msgstr ""
23762
23743
-#: git-submodule.sh:583
23763
+#: git-submodule.sh:547
23764
#, sh-format
23765
msgid ""
23766
"Unable to find current ${remote_name}/${branch} revision in submodule path "
23767
"'$sm_path'"
23768
msgstr ""
23769
23750
-#: git-submodule.sh:601
23770
+#: git-submodule.sh:565
23771
#, sh-format
23772
msgid ""
23773
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
23774
"$sha1:"
23775
msgstr ""
23776
23757
-#: git-submodule.sh:607
23777
+#: git-submodule.sh:571
23778
#, sh-format
23779
msgid ""
23780
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
23781
"Direct fetching of that commit failed."
23782
msgstr ""
23783
23764
-#: git-submodule.sh:614
23784
+#: git-submodule.sh:578
23785
#, sh-format
23786
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
23787
msgstr ""
23788
23769
-#: git-submodule.sh:615
23789
+#: git-submodule.sh:579
23790
#, sh-format
23791
msgid "Submodule path '$displaypath': checked out '$sha1'"
23792
msgstr ""
23793
23774
-#: git-submodule.sh:619
23794
+#: git-submodule.sh:583
23795
#, sh-format
23796
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
23797
msgstr ""
23798
23779
-#: git-submodule.sh:620
23799
+#: git-submodule.sh:584
23800
#, sh-format
23801
msgid "Submodule path '$displaypath': rebased into '$sha1'"
23802
msgstr ""
23803
23784
-#: git-submodule.sh:625
23804
+#: git-submodule.sh:589
23805
#, sh-format
23806
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
23807
msgstr ""
23808
23789
-#: git-submodule.sh:626
23809
+#: git-submodule.sh:590
23810
#, sh-format
23811
msgid "Submodule path '$displaypath': merged in '$sha1'"
23812
msgstr ""
23813
23794
-#: git-submodule.sh:631
23814
+#: git-submodule.sh:595
23815
#, sh-format
23816
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
23817
msgstr ""
23818
23799
-#: git-submodule.sh:632
23819
+#: git-submodule.sh:596
23820
#, sh-format
23821
msgid "Submodule path '$displaypath': '$command $sha1'"
23822
msgstr ""
23823
23804
-#: git-submodule.sh:663
23824
+#: git-submodule.sh:627
23825
#, sh-format
23826
msgid "Failed to recurse into submodule path '$displaypath'"
23827
msgstr ""