msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"POT-Creation-Date: 2022-01-11 09:38+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Huh (%s)?"
msgstr ""
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
#: builtin/rebase.c:1642
msgid "could not read index"
msgstr ""
msgid "could not stage '%s'"
msgstr ""
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr ""
msgid "note: %s is untracked now.\n"
msgstr ""
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
msgid "ignoring unmerged: %s"
msgstr ""
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr ""
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr ""
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr ""
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr ""
msgid "(empty) select nothing"
msgstr ""
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr ""
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr ""
msgid "unstaged"
msgstr ""
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr ""
msgid "could not refresh index"
msgstr ""
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr ""
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
msgid "The selected hunks do not apply to the index!"
msgstr ""
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr ""
msgid "No other hunks to goto"
msgstr ""
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr ""
msgid "No other hunks to search"
msgstr ""
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr ""
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr ""
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr ""
-
-#: apply.c:150
-msgid "--index outside a repository"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
+#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
msgstr ""
-#: apply.c:153
-msgid "--cached outside a repository"
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
msgstr ""
#: apply.c:800
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr ""
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3593
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
-#: apply.c:3596
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr ""
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3628
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr ""
-#: apply.c:3642
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3647
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3664
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr ""
-#: apply.c:3676
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3749
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3751
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3978
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3998
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:4023
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:4027
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:4042
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4134
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4141
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4144
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4153
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4163
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4301
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4335
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4341
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4349
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4402
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4472
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4570
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4578
+#: apply.c:4580
msgid "internal error"
msgstr ""
-#: apply.c:4581
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4592
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4614
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4618
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4747
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4755
-msgid "unrecognized input"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
msgstr ""
-#: apply.c:4775
+#: apply.c:4779
msgid "unable to read index file"
msgstr ""
-#: apply.c:4932
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4959
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4973
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:5017
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:5020
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr ""
-#: apply.c:5023
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:5026
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:5028
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:5032
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:5034
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:5036
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:5038
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:5040
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:5042
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:5044
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:5047
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:5049
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
-#: apply.c:5051
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:5056
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
#: builtin/rebase.c:1051
msgid "action"
msgstr ""
-#: apply.c:5058
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:5067
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:5069
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:5071
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:5073
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr ""
-
-#: apply.c:5076
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:5079
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr ""
-#: apply.c:5082
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr ""
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr ""
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr ""
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr ""
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr ""
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr ""
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr ""
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
msgid "archive format"
msgstr ""
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr ""
#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr ""
msgstr ""
#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr ""
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
#: builtin/notes.c:496
msgid "command"
msgstr ""
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
msgstr ""
#: archive.c:582
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-
#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr ""
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgid "cannot read blob %s for path %s"
msgstr ""
-#: branch.c:53
-#, c-format
+#: branch.c:77
msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-#: branch.c:67
+#: branch.c:88
#, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "not setting branch '%s' as its own upstream"
msgstr ""
-#: branch.c:93
+#: branch.c:144
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid "branch '%s' set up to track '%s' by rebasing."
msgstr ""
-#: branch.c:94
+#: branch.c:145
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgid "branch '%s' set up to track '%s'."
msgstr ""
-#: branch.c:98
+#: branch.c:148
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgid "branch '%s' set up to track:"
msgstr ""
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
msgstr ""
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-#: branch.c:105
+#: branch.c:203
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr ""
-#: branch.c:109
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-#: branch.c:110
+#: branch.c:252
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr ""
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
+msgid "not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:156
+#: branch.c:287
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+msgid "'%s' is not a valid branch name"
msgstr ""
-#: branch.c:189
+#: branch.c:307
#, c-format
-msgid "'%s' is not a valid branch name."
+msgid "a branch named '%s' already exists"
msgstr ""
-#: branch.c:208
+#: branch.c:313
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr ""
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
+msgid "cannot force update the branch '%s'checked out at '%s'"
msgstr ""
-#: branch.c:233
+#: branch.c:336
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
msgstr ""
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
+msgid "not a valid object name: '%s'"
msgstr ""
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
+msgid "ambiguous object name: '%s'"
msgstr ""
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
+msgid "not a valid branch point: '%s'"
msgstr ""
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr ""
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
msgid "final chunk has non-zero id %<PRIx32>"
msgstr ""
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:767
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:800
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1398
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1415
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1435
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1454
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr ""
-#: commit-graph.c:1507
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1588
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr ""
-#: commit-graph.c:1665
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr ""
-#: commit-graph.c:1690
+#: commit-graph.c:1693
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1703
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1707
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1744
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1762
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1811
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1855
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr ""
-#: commit-graph.c:1860
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr ""
-#: commit-graph.c:1917
+#: commit-graph.c:1920
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1953
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1969
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1989
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:2122
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:2166
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:2274
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
-#: commit-graph.c:2381
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:2479
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2489
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2506
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:2524
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2539
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2546
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2556
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2565
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2579
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2584
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2588
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2605
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2611
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr ""
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1239
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1243
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1246
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1249
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1503
+#: commit.c:1505
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr ""
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1581
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1607
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1608
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1792
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1795
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1813
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1858
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1914
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2282
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2456
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2501
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2547
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2549
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2633
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2665
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2694
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2957
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:3019
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:3043
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr ""
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:3172
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3264
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3431
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr ""
msgid "unable to fork"
msgstr ""
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr ""
"tree"
msgstr ""
-#: diff.c:157
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:162
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:298
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:326
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:334
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
-#: diff.c:411
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:471
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:4290
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
msgstr ""
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
msgstr ""
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr ""
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-#: diff.c:4730
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4778
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4815
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4900
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4924
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4938
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:5006
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:5027
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:5046
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:5086
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5246
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr ""
-#: diff.c:5295
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5351
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5387
+#: diff.c:5338
msgid "Diff output format options"
msgstr ""
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr ""
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr ""
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr ""
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5403
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5406
+#: diff.c:5357
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5410
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5414
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5417
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5420
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5424
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5428
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5432
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5435
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5438
+#: diff.c:5389
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5441
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5443
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5444
+#: diff.c:5395
msgid "generate diffstat"
msgstr ""
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr ""
-#: diff.c:5447
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5450
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5453
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5455
+#: diff.c:5406
msgid "<count>"
msgstr ""
-#: diff.c:5456
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5459
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5462
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5465
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5467
+#: diff.c:5418
msgid "show colored diff"
msgstr ""
-#: diff.c:5468
+#: diff.c:5419
msgid "<kind>"
msgstr ""
-#: diff.c:5469
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5472
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr ""
-#: diff.c:5476
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5479
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5482
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5485
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5488
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr ""
-#: diff.c:5493
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5498
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5503
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5506
+#: diff.c:5457
msgid "Diff rename options"
msgstr ""
-#: diff.c:5507
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5508
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5512
+#: diff.c:5463
msgid "detect renames"
msgstr ""
-#: diff.c:5516
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5519
+#: diff.c:5470
msgid "detect copies"
msgstr ""
-#: diff.c:5523
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5525
+#: diff.c:5476
msgid "disable rename detection"
msgstr ""
-#: diff.c:5528
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5530
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5533
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5535
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5537
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5540
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5543
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5546
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5549
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5552
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr ""
-#: diff.c:5555
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr ""
-#: diff.c:5558
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5561
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5565
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5567
+#: diff.c:5518
msgid "<algorithm>"
msgstr ""
-#: diff.c:5568
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5570
+#: diff.c:5521
msgid "<text>"
msgstr ""
-#: diff.c:5571
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr ""
-#: diff.c:5574
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5577
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5580
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5583
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5586
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5589
+#: diff.c:5540
msgid "Other diff options"
msgstr ""
-#: diff.c:5591
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5595
+#: diff.c:5546
msgid "treat all files as text"
msgstr ""
-#: diff.c:5597
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5599
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5601
+#: diff.c:5552
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5603
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5605
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5607
+#: diff.c:5558
msgid "<when>"
msgstr ""
-#: diff.c:5608
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5611
+#: diff.c:5562
msgid "<format>"
msgstr ""
-#: diff.c:5612
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5616
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5619
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5621
+#: diff.c:5572
msgid "<string>"
msgstr ""
-#: diff.c:5622
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5625
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5628
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5631
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5634
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr ""
-#: diff.c:5636
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr ""
-#: diff.c:5639
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr ""
-#: diff.c:5641
+#: diff.c:5592
msgid "<object-id>"
msgstr ""
-#: diff.c:5642
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5644
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5645
+#: diff.c:5596
msgid "select files by diff type"
msgstr ""
-#: diff.c:5647
+#: diff.c:5598
msgid "<file>"
msgstr ""
-#: diff.c:5648
+#: diff.c:5599
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6306
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6309
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6312
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2464
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2766
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2890
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3158
+#: dir.c:3112
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: dir.c:3837
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3918
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: editor.c:77
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr ""
-#: entry.c:498
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: environment.c:143
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:193
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:207
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:227
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:238
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:450
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:467
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:498
+#: fetch-pack.c:499
msgid "giving up"
msgstr ""
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr ""
-#: fetch-pack.c:523
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:559
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:774
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:860
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:868
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:962
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:968
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr ""
-#: fetch-pack.c:985
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:987
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr ""
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr ""
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr ""
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr ""
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr ""
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr ""
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
-#: gpg-interface.c:445
+#: gpg-interface.c:451
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
msgstr ""
-#: gpg-interface.c:469
+#: gpg-interface.c:480
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
msgstr ""
-#: gpg-interface.c:523
+#: gpg-interface.c:536
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr ""
-#: gpg-interface.c:576
+#: gpg-interface.c:624
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr ""
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr ""
-#: gpg-interface.c:762
+#: gpg-interface.c:829
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr ""
-#: gpg-interface.c:780
+#: gpg-interface.c:851
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr ""
-#: gpg-interface.c:786
+#: gpg-interface.c:857
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr ""
-#: gpg-interface.c:874
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:895
+#: gpg-interface.c:967
msgid "user.signingkey needs to be set for ssh signing"
msgstr ""
-#: gpg-interface.c:906
+#: gpg-interface.c:978
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr ""
-#: gpg-interface.c:924
+#: gpg-interface.c:996
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr ""
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
msgstr ""
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr ""
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:533
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-#: grep.c:1928
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:1956
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr ""
#: help.c:646
#, c-format
-msgid "Run '%s' instead? (y/N)"
+msgid "Run '%s' instead [y/N]? "
msgstr ""
#: help.c:654
msgid "quoted CRLF detected"
msgstr ""
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr ""
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-ort.c:3856
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-#: merge-ort.c:4152
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
" %s"
msgstr ""
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr ""
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr ""
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr ""
-#: midx.c:109
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:125
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:130
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:135
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-#: midx.c:152
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:154
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:156
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:158
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:174
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:221
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:271
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:502
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:508
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:576
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:892
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr ""
-#: midx.c:990
+#: midx.c:993
#, c-format
msgid "could not parse line: %s"
msgstr ""
-#: midx.c:992
+#: midx.c:995
#, c-format
msgid "malformed line: %s"
msgstr ""
-#: midx.c:1159
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
-#: midx.c:1184
+#: midx.c:1187
msgid "could not load pack"
msgstr ""
-#: midx.c:1190
+#: midx.c:1193
#, c-format
msgid "could not open index for %s"
msgstr ""
-#: midx.c:1201
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:1244
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr ""
-#: midx.c:1289
+#: midx.c:1292
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr ""
-#: midx.c:1321
+#: midx.c:1324
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
-#: midx.c:1367
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr ""
-#: midx.c:1380
+#: midx.c:1383
msgid "no pack files to index."
msgstr ""
-#: midx.c:1417
+#: midx.c:1420
msgid "could not write multi-pack bitmap"
msgstr ""
-#: midx.c:1427
+#: midx.c:1430
msgid "could not write multi-pack-index"
msgstr ""
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: midx.c:1517
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1577
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
-#: midx.c:1585
+#: midx.c:1593
msgid "incorrect checksum"
msgstr ""
-#: midx.c:1588
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1603
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1608
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr ""
-#: midx.c:1617
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1626
+#: midx.c:1634
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1646
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1653
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1669
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1675
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1684
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1709
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr ""
-#: midx.c:1719
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1911
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr ""
-#: midx.c:1931
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object-file.c:459
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:517
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: object-file.c:591
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:598
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: object-file.c:641
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: object-file.c:659
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr ""
-#: object-file.c:666
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr ""
-#: object-file.c:701
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: object-file.c:722
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: object-file.c:728
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: object-file.c:734
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: object-file.c:742
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: object-file.c:773
+#: object-file.c:813
#, c-format
msgid "could not find object directory matching %s"
msgstr ""
-#: object-file.c:823
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:973
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:1008
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr ""
-#: object-file.c:1174
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: object-file.c:1417
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: object-file.c:1419
+#: object-file.c:1459
msgid "invalid object type"
msgstr ""
-#: object-file.c:1430
+#: object-file.c:1470
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: object-file.c:1434
+#: object-file.c:1474
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr ""
-#: object-file.c:1664
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: object-file.c:1668
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: object-file.c:1672
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1676
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1781
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: object-file.c:1788
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: object-file.c:1795
+#: object-file.c:1835
msgid "file write error"
msgstr ""
-#: object-file.c:1815
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr ""
-#: object-file.c:1882
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1884
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr ""
-#: object-file.c:1908
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr ""
-#: object-file.c:1914
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: object-file.c:1918
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: object-file.c:1922
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: object-file.c:2011
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: object-file.c:2062
+#: object-file.c:2105
msgid "corrupt commit"
msgstr ""
-#: object-file.c:2070
+#: object-file.c:2113
msgid "corrupt tag"
msgstr ""
-#: object-file.c:2170
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2173
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: object-file.c:2262
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1448
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: object-file.c:2288
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: object-file.c:2315
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr ""
-#: object-file.c:2510
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2533
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: object-file.c:2539
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: object-file.c:2544
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: object-file.c:2555
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
msgid "multi-pack bitmap is missing required reverse index"
msgstr ""
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
msgid "load_reverse_index: could not open pack"
msgstr ""
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr ""
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr ""
msgid "could not write '%s' promisor file"
msgstr ""
-#: packfile.c:626
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:656
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr ""
-#: packfile.c:1923
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1927
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr ""
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr ""
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr ""
+
#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr ""
-#: parse-options.c:891
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:893
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:895
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:919
+#: parse-options.c:920
msgid "..."
msgstr ""
-#: parse-options.c:933
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:948
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr ""
#. translated) N_() usage string, which contained embedded
#. newlines before we split it up.
#.
-#: parse-options.c:969
+#: parse-options.c:970
#, c-format
msgid "%*s%s"
msgstr ""
-#: parse-options.c:992
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:1039
+#: parse-options.c:1040
msgid "-NUM"
msgstr ""
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr ""
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr ""
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr ""
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr ""
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr ""
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr ""
-#: read-cache.c:1373
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1588
+#: read-cache.c:1601
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1720
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1730
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1786
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1789
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1798
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1832
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1834
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1871
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1887
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1944
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1947
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1950
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2209
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2222
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2255
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2259
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2263
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2267
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr ""
-#: read-cache.c:2310
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2337
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2375
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2434
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3108
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr ""
-#: read-cache.c:3179
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3192
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3204
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3233
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3390
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
"\n"
msgstr ""
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgid "%s: 'preserve' superseded by 'merges'"
msgstr ""
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr ""
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr ""
-
#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr ""
-
#: ref-filter.c:568
#, c-format
msgid "%%(rest) does not take arguments"
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
msgstr ""
#: ref-filter.c:912
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr ""
-
#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2623
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2726
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2731
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
msgid "invalid branch name: %s = %s"
msgstr ""
-#: refs.c:671
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:920
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:927
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:992
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1084
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1155
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:2062
+#: refs.c:2069
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:2142
+#: refs.c:2152
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2153
+#: refs.c:2163
msgid "ref updates aborted by hook"
msgstr ""
-#: refs.c:2253 refs.c:2283
+#: refs.c:2271 refs.c:2301
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2259 refs.c:2294
+#: refs.c:2277 refs.c:2312
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1268
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1282 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1285 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr ""
msgid "invalid refspec '%s'"
msgstr ""
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr ""
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr ""
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr ""
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"'%s:refs/heads/%s'?"
msgstr ""
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr ""
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr ""
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2137
+#: remote.c:2254
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr ""
msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr ""
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr ""
msgid "could not determine HEAD revision"
msgstr ""
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr ""
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr ""
-
-#: revision.c:2346
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr ""
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr ""
-
-#: revision.c:2690
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2693
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2895
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:1278
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr ""
"run \"git revert --abort\"."
msgstr ""
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr ""
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:1229
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1235
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1248
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1290
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1292
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1338
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1340
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1344
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1365
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1367
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr ""
-#: sequencer.c:1508
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:1623
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1628
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1753
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1754
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1755
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr ""
-#: sequencer.c:1756
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1757
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1951
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1955
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1979
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:2089
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:2096
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:2115
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:2137
+#: sequencer.c:2139
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:2222
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:2282
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:2283
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:2304
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2362
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2370
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2450
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2459
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2502
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2563
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2574
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:2660
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2669
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2709
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2711
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2716
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2727
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2729
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2807
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2916
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2936
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:3048
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:3050
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:3053
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr ""
-#: sequencer.c:3055
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:3069
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:3084
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:3180
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:3181
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:3187
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:3198
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:3239
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:3248
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:3258
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:3265
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:3268
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3447
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3455
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3465
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3472
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3502
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr ""
-#: sequencer.c:3517
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3523
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3529
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3591
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3664
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3669
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3748
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3780
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3802
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3811
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3823
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3878
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:4024
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:4040
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:4121
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr ""
-#: sequencer.c:4124
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: sequencer.c:4130
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: sequencer.c:4133
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: sequencer.c:4137
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr ""
-#: sequencer.c:4162
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:4174
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:4177
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:4182
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr ""
-#: sequencer.c:4183
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr ""
-#: sequencer.c:4255
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:4270
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:4272
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:4304
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4350
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4396
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:4466
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:4514
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4519
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4533
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4593
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr ""
-#: sequencer.c:4645
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4654
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4656
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4658
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4661
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4752
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4762
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4882
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4886
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4921
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
#, c-format
msgid "skipped previously applied commit %s"
msgstr ""
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr ""
-#: sequencer.c:5408
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5411
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5705
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5805
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr ""
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr ""
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr ""
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] ""
msgstr[1] ""
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] ""
msgstr[1] ""
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr ""
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr ""
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr ""
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-#: setup.c:1443
+#: setup.c:1508
msgid "fork failed"
msgstr ""
-#: setup.c:1448
+#: setup.c:1513
msgid "setsid failed"
msgstr ""
-#: sparse-index.c:273
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: strbuf.c:1183
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr ""
msgid "process for submodule '%s' failed"
msgstr ""
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1474
msgid "operation not supported by protocol"
msgstr ""
msgid "Aborting."
msgstr ""
-#: transport.c:1344
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr ""
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%s"
msgstr ""
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"%s"
msgstr ""
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"%s"
msgstr ""
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr ""
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"colliding group is in the working tree:\n"
msgstr ""
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr ""
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
-#: upload-pack.c:1561
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr ""
msgid "Fetching objects"
msgstr ""
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr ""
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr ""
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr ""
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr ""
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr ""
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr ""
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr ""
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr ""
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr ""
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr ""
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr ""
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr ""
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr ""
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr ""
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr ""
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr ""
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr ""
msgid "untracked content, "
msgstr ""
-#: wt-status.c:958
+#: wt-status.c:964
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+
+#: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr ""
-#: wt-status.c:1365
+#: wt-status.c:1377
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1384
+#: wt-status.c:1396
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr ""
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr ""
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr ""
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr ""
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr ""
-#: wt-status.c:1870
+#: wt-status.c:1882
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr ""
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr ""
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:330
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:333
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:336
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:338
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:343
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:351
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr ""
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr ""
+
+#: builtin/add.c:371
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:376
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:377
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:378
+#: builtin/add.c:375
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:379
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:380
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:381
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:384
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:386
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:387
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:388
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
msgstr ""
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:393
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:395
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr ""
-#: builtin/add.c:413
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:442
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:462
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"\"git config advice.addIgnoredFile false\""
msgstr ""
-#: builtin/add.c:477
+#: builtin/add.c:474
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr ""
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr ""
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-
-#: builtin/add.c:551
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
msgstr ""
-#: builtin/add.c:583
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:585
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"\"git config advice.addEmptyPathspec false\""
msgstr ""
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr ""
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:456
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:498
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:536
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:562
+#: builtin/am.c:588
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:750
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:815
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:863
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:875
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:968
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:978
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1127
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1128
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1129
+#: builtin/am.c:1159
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
msgstr ""
-#: builtin/am.c:1224
-msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+#: builtin/am.c:1161
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1252
-msgid "Patch is empty."
+#: builtin/am.c:1256
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1317
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr ""
-#: builtin/am.c:1320
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1539
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1541
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1560
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1566
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1592
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1624
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1698
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1758
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr ""
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr ""
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr ""
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1815
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1821
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1825
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr ""
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2079
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2187
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2229
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr ""
-#: builtin/am.c:2233
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
msgstr ""
-#: builtin/am.c:2264
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2265
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2271
+#: builtin/am.c:2327
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2273
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2275
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr ""
-#: builtin/am.c:2281
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2283
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2285
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2287
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2289
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2292
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2295
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2297
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr ""
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
msgid "n"
msgstr ""
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2324
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2330
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2332
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2335
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2338
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2341
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr ""
-#: builtin/am.c:2344
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-#: builtin/am.c:2348
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr ""
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr ""
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2355
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr ""
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr ""
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2379
+#: builtin/am.c:2441
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2386
+#: builtin/am.c:2448
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2401
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2425
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2431
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/am.c:2441
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr ""
msgid "show work cost statistics"
msgstr ""
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr ""
msgid "ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr ""
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr ""
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr ""
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:472
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr ""
-#: builtin/branch.c:478
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/branch.c:493
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:497
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:514
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:516
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:527
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:556
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:558
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:562
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:565
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:571
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:580
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:582
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:598
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:632
+#: builtin/branch.c:637
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:634
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:635
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
msgstr ""
-#: builtin/branch.c:638
+#: builtin/branch.c:645
msgid "do not use"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "upstream"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:641
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:649
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:643
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:651
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:652
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:654
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:655
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:656
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:657
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:658
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:659
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:660
+#: builtin/branch.c:667
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:661
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr ""
-#: builtin/branch.c:662
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:664
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:665
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:666
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:667
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:668
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
#: builtin/tag.c:475
msgid "object"
msgstr ""
-#: builtin/branch.c:671
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr ""
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:768
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:773
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:780
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:783
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:798
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:807
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:812
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:816
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:823
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:836
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:840
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:846
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:856
+#: builtin/branch.c:862
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-#: builtin/branch.c:860
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr ""
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr ""
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr ""
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr ""
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr ""
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr ""
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr ""
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
msgstr ""
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
msgstr ""
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr ""
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr ""
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr ""
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr ""
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr ""
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr ""
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr ""
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr ""
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr ""
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr ""
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr ""
msgid "could not lstat %s\n"
msgstr ""
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr ""
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr ""
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr ""
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr ""
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr ""
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
#: builtin/pull.c:212
msgid "depth"
msgstr ""
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
#: builtin/pull.c:215
msgid "time"
msgstr ""
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr ""
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr ""
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr ""
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr ""
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr ""
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr ""
#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr ""
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
+msgid "options '%s' and '%s %s' cannot be used together"
msgstr ""
#: builtin/clone.c:920
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2047
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
msgstr ""
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr ""
msgid "Collecting commits from input"
msgstr ""
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
#, c-format
msgid "unrecognized subcommand: %s"
msgstr ""
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr ""
msgid "id of a parent commit object"
msgstr ""
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
#: builtin/tag.c:454
msgid "message"
msgstr ""
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr ""
msgid "read commit log message from file"
msgstr ""
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr ""
-
#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr ""
#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
msgstr ""
#: builtin/commit.c:814 builtin/commit.c:830
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr ""
-
#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr ""
#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
#: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
msgstr ""
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
msgid "You are in the middle of a rebase -- cannot amend."
msgstr ""
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr ""
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
msgid "version"
msgstr ""
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr ""
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr ""
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr ""
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "author"
msgstr ""
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr ""
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr ""
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr ""
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr ""
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
msgstr ""
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr ""
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr ""
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr ""
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr ""
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr ""
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr ""
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
msgstr ""
#: builtin/diff-tree.c:157
msgid "%s...%s: no merge base"
msgstr ""
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr ""
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
msgid ""
"combined diff formats ('-c' and '--cc') are not supported in\n"
"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "tool"
msgstr ""
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr ""
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr ""
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr ""
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr ""
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr ""
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr ""
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr ""
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr ""
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr ""
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr ""
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr ""
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
msgid "Lockfile created but not reported: %s"
msgstr ""
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr ""
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr ""
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr ""
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr ""
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr ""
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr ""
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr ""
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:587
+msgid "couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:760
+#: builtin/fetch.c:761
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
msgid "[rejected]"
msgstr ""
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:890
+#: builtin/fetch.c:881
+msgid "checked out in another worktree"
+msgstr ""
+
+#: builtin/fetch.c:891
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
+#: builtin/fetch.c:963
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:895
+#: builtin/fetch.c:896
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:917
+#: builtin/fetch.c:918
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:920
+#: builtin/fetch.c:921
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:923
+#: builtin/fetch.c:924
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:962
+#: builtin/fetch.c:963
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:967
+#: builtin/fetch.c:968
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1071
msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1075
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1107
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1136
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1226 builtin/fetch.c:1374
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1247
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1344
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1345
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1377
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1378 builtin/remote.c:1128
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1400
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1420
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1423
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1450
#, c-format
msgid "the object %s does not exist"
msgstr ""
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1638
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1650
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+
+#: builtin/fetch.c:1663
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1665
msgid "not setting upstream for a remote tag"
msgstr ""
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1667
msgid "unknown branch type"
msgstr ""
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1669
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1799 builtin/fetch.c:1862
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1809 builtin/fetch.c:1864
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1821
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr ""
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1925
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
+#: builtin/fetch.c:1961
+msgid "you need to specify a tag name"
msgstr ""
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2027
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr ""
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr ""
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr ""
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/fetch.c:2031
+msgid "negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2040
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2059
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2068
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "no such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2076
+msgid "fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2092
msgid "must supply remote when using --negotiate-only"
msgstr ""
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
+#: builtin/fetch.c:2097
+msgid "protocol does not support --negotiate-only, exiting"
msgstr ""
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2116
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2120
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2124
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr ""
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr ""
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr ""
msgid "%s: object is of unknown type '%s': %s"
msgstr ""
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr ""
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr ""
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr ""
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr ""
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr ""
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"%s"
msgstr ""
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr ""
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr ""
-#: builtin/gc.c:868
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr ""
-#: builtin/gc.c:904
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr ""
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr ""
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr ""
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr ""
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr ""
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr ""
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr ""
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr ""
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr ""
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr ""
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr ""
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
msgid "frequency"
msgstr ""
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr ""
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr ""
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
msgid "task"
msgstr ""
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr ""
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr ""
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr ""
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr ""
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr ""
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr ""
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr ""
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr ""
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr ""
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr ""
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr ""
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
msgid "failed to start systemctl"
msgstr ""
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
msgid "failed to run systemctl"
msgstr ""
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
#, c-format
msgid "failed to delete '%s'"
msgstr ""
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
#, c-format
msgid "unrecognized --scheduler argument '%s'"
msgstr ""
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
msgid "neither systemd timers nor crontab are available"
msgstr ""
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
#, c-format
msgid "%s scheduler is not available"
msgstr ""
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr ""
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
msgid "git maintenance start [--scheduler=<scheduler>]"
msgstr ""
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
msgid "scheduler"
msgstr ""
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
msgid "scheduler to trigger git maintenance run"
msgstr ""
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr ""
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr ""
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr ""
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:223
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:236
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:244
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:340
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:352
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:467
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:483
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:490
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/help.c:581
+#: builtin/help.c:580
msgid "this option doesn't take any other arguments"
msgstr ""
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:624
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr ""
msgid "unknown hash algorithm '%s'"
msgstr ""
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr ""
-
#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr ""
-
#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr ""
msgid "specify the hash algorithm to use"
msgstr ""
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr ""
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr ""
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr ""
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/log.c:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1532
+#: builtin/log.c:1547
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr ""
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr ""
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr ""
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr ""
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr ""
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr ""
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr ""
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr ""
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr ""
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr ""
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr ""
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr ""
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
msgid "separate paths with the NUL character"
msgstr ""
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
msgid "read exclude patterns from <file>"
msgstr ""
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr ""
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr ""
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr ""
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
msgstr ""
#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
+msgid "use a zealous diff3 based merge"
msgstr ""
#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
+msgid "for conflicts, use our version"
msgstr ""
#: builtin/merge-file.c:41
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr ""
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr ""
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:124
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:147
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr ""
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:201
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:206
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:272
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr ""
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr ""
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:284
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr ""
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:293
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr ""
-#: builtin/merge.c:295
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:304
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr ""
-#: builtin/merge.c:321
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:326
+#: builtin/merge.c:328
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:331
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:401
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr ""
-#: builtin/merge.c:415
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:465
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:730
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:743
+#: builtin/merge.c:745
#, c-format
msgid "unknown strategy option: -X%s"
msgstr ""
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:814
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:823
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:829
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
-#: builtin/merge.c:834
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/merge.c:837
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:892
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:907
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:968
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr ""
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr ""
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr ""
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "tag on stdin did not refer to a valid object"
msgstr ""
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr ""
msgid "refs snapshot for selecting bitmap commits"
msgstr ""
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr ""
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr ""
msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr ""
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:195
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:204
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr ""
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:871
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:874
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:876
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"abort'.\n"
msgstr ""
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:898
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:910
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:913
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:953
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr ""
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr ""
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:151
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr ""
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr ""
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr ""
msgstr ""
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr ""
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:942
+#: builtin/pull.c:969
msgid ""
"You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
"invocation.\n"
msgstr ""
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr ""
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
msgid "Cannot fast-forward to multiple branches."
msgstr ""
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
msgid "Need to specify how to reconcile divergent branches."
msgstr ""
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr ""
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr ""
" git push <name>\n"
msgstr ""
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr ""
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr ""
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr ""
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr ""
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr ""
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr ""
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr ""
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr ""
-
#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr ""
msgstr ""
#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
+msgid "apply options and merge options cannot be used together"
msgstr ""
#: builtin/rebase.c:1476
msgstr ""
#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr ""
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
msgstr ""
#: builtin/reflog.c:17
msgid "git reflog exists <ref>"
msgstr ""
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr ""
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr ""
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr ""
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr ""
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr ""
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr ""
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr ""
msgid "Updating %s"
msgstr ""
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:312
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr ""
-#: builtin/repack.c:371
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr ""
-#: builtin/repack.c:496
+#: builtin/repack.c:498
#, c-format
msgid "could not open tempfile %s for writing"
msgstr ""
-#: builtin/repack.c:514
+#: builtin/repack.c:516
msgid "could not close refs snapshot tempfile"
msgstr ""
-#: builtin/repack.c:628
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:630
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:633
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:635
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:637
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:639
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:642
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:644
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:646
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:647
+#: builtin/repack.c:649
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:648
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:650
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:652
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr ""
-#: builtin/repack.c:654
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:656
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:658
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:660
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:662
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:664
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:666
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr ""
-#: builtin/repack.c:668
+#: builtin/repack.c:670
msgid "write a multi-pack index of the resulting packs"
msgstr ""
-#: builtin/repack.c:678
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr ""
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr ""
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:855
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr ""
-#: builtin/repack.c:857
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr ""
msgid "unable to open %s for reading"
msgstr ""
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr ""
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr ""
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr ""
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr ""
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr ""
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr ""
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr ""
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr ""
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr ""
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr ""
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr ""
msgid "unable to generate diff for '%s'"
msgstr ""
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr ""
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr ""
-#: builtin/reset.c:89
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:91
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:97
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:122
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/reset.c:201
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:303
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:304
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:310
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:316
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:350
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:358
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:379
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:394
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr ""
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:422
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
"to make this the default.\n"
msgstr ""
-#: builtin/reset.c:440
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:445
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr ""
msgstr ""
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
msgstr ""
#: builtin/rev-parse.c:409
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-
#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr ""
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
msgid "git sparse-checkout list"
msgstr ""
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr ""
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"cone"
msgstr ""
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
#, c-format
msgid "failed to remove directory '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr ""
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr ""
+
+#: builtin/sparse-checkout.c:422
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
msgid "toggle the use of a sparse index"
msgstr ""
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:667
-msgid "read patterns from standard in"
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
msgstr ""
#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr ""
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr ""
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr ""
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
msgid "Index was not unstashed."
msgstr ""
-#: builtin/stash.c:575
+#: builtin/stash.c:576
msgid "could not restore untracked files from stash"
msgstr ""
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr ""
-#: builtin/stash.c:651
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr ""
-#: builtin/stash.c:654
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr ""
-#: builtin/stash.c:667
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr ""
-#: builtin/stash.c:717
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: builtin/stash.c:740
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr ""
-#: builtin/stash.c:824
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr ""
-#: builtin/stash.c:835
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr ""
-#: builtin/stash.c:855
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr ""
-#: builtin/stash.c:858
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr ""
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr ""
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr ""
-#: builtin/stash.c:973
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr ""
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr ""
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr ""
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr ""
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr ""
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr ""
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr ""
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr ""
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr ""
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
msgid "alternative anchor for relative paths"
msgstr ""
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr ""
msgid "could not fetch a revision for HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr ""
-
#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
#, c-format
msgid "directory not empty: '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr ""
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"of that commit failed."
msgstr ""
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
msgid "suppress output for update by rebase or merge"
msgstr ""
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
msgid "force checkout updates"
msgstr ""
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
msgid "don't fetch new objects from the remote site"
msgstr ""
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
msgid "overrides update mode in case the repository is a fresh clone"
msgstr ""
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
msgid "depth for shallow fetch"
msgstr ""
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
msgid "sha1"
msgstr ""
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
msgid "SHA1 expected by superproject"
msgstr ""
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
msgid "subsha1"
msgstr ""
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
msgid "SHA1 of submodule's HEAD"
msgstr ""
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
msgid "git submodule--helper run-update-procedure [<options>] <path>"
msgstr ""
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr ""
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr ""
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr ""
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr ""
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr ""
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr ""
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr ""
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr ""
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr ""
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
#, c-format
msgid "Failed to add submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
#, c-format
msgid "Failed to register submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
#, c-format
msgid "'%s' already exists in the index"
msgstr ""
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr ""
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
msgid "branch of repository to add as submodule"
msgstr ""
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
msgid "allow adding an otherwise ignored submodule path"
msgstr ""
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
msgid "print only error messages"
msgstr ""
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
msgid "borrow the objects from reference repositories"
msgstr ""
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
msgstr ""
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr ""
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr ""
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
"want to.\n"
msgstr ""
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\tgit tag -f %s %s^{}"
msgstr ""
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:326
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:333
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr ""
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:593
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:598
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:629
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
msgid "initializing"
msgstr ""
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr ""
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
msgid "added with --lock"
msgstr ""
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
#, c-format
msgid "repair: %s: %s"
msgstr ""
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
#, c-format
msgid "error: %s: %s"
msgstr ""
"See 'git help git' for an overview of the system."
msgstr ""
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
+msgid "no directory given for '%s' option\n"
msgstr ""
#: git.c:202
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr ""
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgid "no config key given for --config-env\n"
msgstr ""
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr ""
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgid "recursive alias: %s"
msgstr ""
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr ""
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr ""
-#: git.c:832
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:882
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:895
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:915
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:927
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr ""
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr ""
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr ""
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr ""
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr ""
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr ""
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr ""
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr ""
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr ""
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr ""
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr ""
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr ""
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:308
+#: parse-options.h:310
msgid "be more verbose"
msgstr ""
-#: parse-options.h:310
+#: parse-options.h:312
msgid "be more quiet"
msgstr ""
-#: parse-options.h:316
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr ""
-#: parse-options.h:335
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: parse-options.h:336
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr ""
-#: parse-options.h:337
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "key"
msgstr ""
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr ""
msgstr ""
#: command-list.h:65
-msgid "Switch branches or restore working tree files"
+msgid "Ensures that a reference name is well formed"
msgstr ""
#: command-list.h:66
-msgid "Copy files from the index to the working tree"
+msgid "Switch branches or restore working tree files"
msgstr ""
#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
msgstr ""
#: command-list.h:68
msgstr ""
#: command-list.h:116
-msgid "The Git repository browser"
+msgid "Show commit logs"
msgstr ""
#: command-list.h:117
-msgid "Show commit logs"
+msgid "Show information about files in the index and the working tree"
msgstr ""
#: command-list.h:118
-msgid "Show information about files in the index and the working tree"
+msgid "List references in a remote repository"
msgstr ""
#: command-list.h:119
-msgid "List references in a remote repository"
+msgid "List the contents of a tree object"
msgstr ""
#: command-list.h:120
-msgid "List the contents of a tree object"
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
#: command-list.h:121
-msgid "Extracts patch and authorship from a single e-mail message"
+msgid "Simple UNIX mbox splitter program"
msgstr ""
#: command-list.h:122
-msgid "Simple UNIX mbox splitter program"
+msgid "Run tasks to optimize Git repository data"
msgstr ""
#: command-list.h:123
-msgid "Run tasks to optimize Git repository data"
+msgid "Join two or more development histories together"
msgstr ""
#: command-list.h:124
-msgid "Join two or more development histories together"
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
#: command-list.h:125
-msgid "Find as good common ancestors as possible for a merge"
+msgid "Run a three-way file merge"
msgstr ""
#: command-list.h:126
-msgid "Run a three-way file merge"
+msgid "Run a merge for files needing merging"
msgstr ""
#: command-list.h:127
-msgid "Run a merge for files needing merging"
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
#: command-list.h:128
-msgid "The standard helper program to use with git-merge-index"
+msgid "Show three-way merge without touching index"
msgstr ""
#: command-list.h:129
msgstr ""
#: command-list.h:130
-msgid "Show three-way merge without touching index"
+msgid "Creates a tag object with extra validation"
msgstr ""
#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:132
-msgid "Creates a tag object with extra validation"
+msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:133
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: command-list.h:134
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:135
-msgid "Find symbolic names for given revs"
+msgid "Add or inspect object notes"
msgstr ""
#: command-list.h:136
-msgid "Add or inspect object notes"
+msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:137
-msgid "Import from and submit to Perforce repositories"
+msgid "Create a packed archive of objects"
msgstr ""
#: command-list.h:138
-msgid "Create a packed archive of objects"
+msgid "Find redundant pack files"
msgstr ""
#: command-list.h:139
-msgid "Find redundant pack files"
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
#: command-list.h:140
-msgid "Pack heads and tags for efficient repository access"
+msgid "Compute unique ID for a patch"
msgstr ""
#: command-list.h:141
-msgid "Compute unique ID for a patch"
+msgid "Prune all unreachable objects from the object database"
msgstr ""
#: command-list.h:142
-msgid "Prune all unreachable objects from the object database"
+msgid "Remove extra objects that are already in pack files"
msgstr ""
#: command-list.h:143
-msgid "Remove extra objects that are already in pack files"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
#: command-list.h:144
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Update remote refs along with associated objects"
msgstr ""
#: command-list.h:145
-msgid "Update remote refs along with associated objects"
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
#: command-list.h:146
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:147
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Reads tree information into the index"
msgstr ""
#: command-list.h:148
-msgid "Reads tree information into the index"
+msgid "Reapply commits on top of another base tip"
msgstr ""
#: command-list.h:149
-msgid "Reapply commits on top of another base tip"
+msgid "Receive what is pushed into the repository"
msgstr ""
#: command-list.h:150
-msgid "Receive what is pushed into the repository"
+msgid "Manage reflog information"
msgstr ""
#: command-list.h:151
-msgid "Manage reflog information"
+msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:152
-msgid "Manage set of tracked repositories"
+msgid "Pack unpacked objects in a repository"
msgstr ""
#: command-list.h:153
-msgid "Pack unpacked objects in a repository"
+msgid "Create, list, delete refs to replace objects"
msgstr ""
#: command-list.h:154
-msgid "Create, list, delete refs to replace objects"
+msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:155
-msgid "Generates a summary of pending changes"
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:156
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Reset current HEAD to the specified state"
msgstr ""
#: command-list.h:157
-msgid "Reset current HEAD to the specified state"
+msgid "Restore working tree files"
msgstr ""
#: command-list.h:158
-msgid "Restore working tree files"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:159
-msgid "Revert some existing commits"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:160
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:161
-msgid "Pick out and massage parameters"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:162
-msgid "Remove files from the working tree and from the index"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:163
-msgid "Send a collection of patches as emails"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:164
-msgid "Push objects over Git protocol to another repository"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:166
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:167
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:168
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:169
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:170
-msgid "List references in a local repository"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:172
-msgid "Common Git shell script setup code"
+msgid "Initialize and modify the sparse-checkout"
msgstr ""
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:174
msgstr ""
#: command-list.h:175
-msgid "Add file contents to the staging area"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:176
-msgid "Show the working tree status"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:177
-msgid "Remove unnecessary whitespace"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:178
-msgid "Initialize, update or inspect submodules"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:179
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Switch branches"
msgstr ""
#: command-list.h:180
-msgid "Switch branches"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:181
-msgid "Read, modify and delete symbolic refs"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:182
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:183
-msgid "Creates a temporary file with a blob's contents"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:184
-msgid "Unpack objects from a packed archive"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:185
-msgid "Register file contents in the working tree to the index"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:186
-msgid "Update the object name stored in a ref safely"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:187
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:188
-msgid "Send archive back to git-archive"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:189
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:190
-msgid "Show a Git logical variable"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:191
-msgid "Check the GPG signature of commits"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:192
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:193
-msgid "Check the GPG signature of tags"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:195
-msgid "Show logs with difference each commit introduces"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:196
-msgid "Manage multiple working trees"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:197
-msgid "Create a tree object from the current index"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:198
-msgid "Defining attributes per path"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:199
-msgid "Git command-line interface and conventions"
+msgid "Providing usernames and passwords to Git"
msgstr ""
#: command-list.h:200
-msgid "A Git core tutorial for developers"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:201
-msgid "Providing usernames and passwords to Git"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:202
-msgid "Git for CVS users"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:203
-msgid "Tweaking diff output"
+msgid "Frequently asked questions about using Git"
msgstr ""
#: command-list.h:204
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:205
-msgid "Frequently asked questions about using Git"
+msgid "Hooks used by Git"
msgstr ""
#: command-list.h:206
-msgid "A Git Glossary"
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:207
-msgid "Hooks used by Git"
+msgid "The Git repository browser"
msgstr ""
#: command-list.h:208
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Map author/committer names and/or E-Mail addresses"
msgstr ""
#: command-list.h:209
-msgid "Map author/committer names and/or E-Mail addresses"
+msgid "Defining submodule properties"
msgstr ""
#: command-list.h:210
-msgid "Defining submodule properties"
+msgid "Git namespaces"
msgstr ""
#: command-list.h:211
-msgid "Git namespaces"
+msgid "Helper programs to interact with remote repositories"
msgstr ""
#: command-list.h:212
-msgid "Helper programs to interact with remote repositories"
+msgid "Git Repository Layout"
msgstr ""
#: command-list.h:213
-msgid "Git Repository Layout"
+msgid "Specifying revisions and ranges for Git"
msgstr ""
#: command-list.h:214
-msgid "Specifying revisions and ranges for Git"
+msgid "Mounting one repository inside another"
msgstr ""
#: command-list.h:215
-msgid "Mounting one repository inside another"
+msgid "A tutorial introduction to Git"
msgstr ""
#: command-list.h:216
msgstr ""
#: command-list.h:217
-msgid "A tutorial introduction to Git"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:218
msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr ""
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr ""
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""
projects / thirdparty / git.git / commitdiff
