summaryrefslogtreecommitdiff
path: root/po/git.pot
diff options
context:
space:
mode:
Diffstat (limited to 'po/git.pot')
-rw-r--r--po/git.pot6731
1 files changed, 3590 insertions, 3141 deletions
diff --git a/po/git.pot b/po/git.pot
index ee9ba62..7889c2c 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"POT-Creation-Date: 2021-05-17 16:02+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"
@@ -23,9 +23,9 @@ msgstr ""
msgid "Huh (%s)?"
msgstr ""
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
-#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
-#: builtin/rebase.c:1963
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
+#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
+#: builtin/rebase.c:1953
msgid "could not read index"
msgstr ""
@@ -53,7 +53,7 @@ msgstr ""
msgid "could not stage '%s'"
msgstr ""
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
msgid "could not write index"
msgstr ""
@@ -69,7 +69,7 @@ msgstr[1] ""
msgid "note: %s is untracked now.\n"
msgstr ""
-#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
+#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
@@ -209,12 +209,12 @@ msgstr ""
msgid "unstaged"
msgstr ""
-#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
-#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
-#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
+#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
+#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
+#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
+#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
#: git-add--interactive.perl:213
msgid "path"
msgstr ""
@@ -660,66 +660,79 @@ msgstr ""
msgid "'git apply' failed"
msgstr ""
-#: advice.c:143
+#: advice.c:145
#, c-format
msgid ""
"\n"
"Disable this message with \"git config advice.%s false\""
msgstr ""
-#: advice.c:159
+#: advice.c:161
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:250
+#: advice.c:252
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:252
+#: advice.c:254
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:254
+#: advice.c:256
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:256
+#: advice.c:258
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:258
+#: advice.c:260
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:260
+#: advice.c:262
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:268
+#: advice.c:270
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:276
+#: advice.c:278
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:281 builtin/merge.c:1370
+#: advice.c:283 builtin/merge.c:1374
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:283
+#: advice.c:285
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:284
+#: advice.c:286
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:290
+#: advice.c:296
+#, c-format
+msgid ""
+"The following pathspecs didn't match any eligible path, but they do match "
+"index\n"
+"entries outside the current sparse checkout:\n"
+msgstr ""
+
+#: advice.c:303
+msgid ""
+"Disable or modify the sparsity rules if you intend to update such entries."
+msgstr ""
+
+#: advice.c:310
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -750,82 +763,78 @@ msgstr ""
msgid "unclosed quote"
msgstr ""
-#: apply.c:69
+#: apply.c:70
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:85
+#: apply.c:86
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:135
+#: apply.c:136
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr ""
-
-#: apply.c:140
+#: apply.c:139
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:151
+#: apply.c:150
msgid "--index outside a repository"
msgstr ""
-#: apply.c:154
+#: apply.c:153
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:801
+#: apply.c:800
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:810
+#: apply.c:809
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:884
+#: apply.c:883
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:922
+#: apply.c:921
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:928
+#: apply.c:927
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:934
+#: apply.c:933
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:963
+#: apply.c:962
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1282
+#: apply.c:1281
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1372
+#: apply.c:1371
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -836,524 +845,530 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1385
+#: apply.c:1384
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1481
+#: apply.c:1480
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1550
+#: apply.c:1549
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1753
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1755
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1789
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1826
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1828
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1831
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1978
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2015
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2177
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2263
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2267
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2936
+#: apply.c:2935
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3057
+#: apply.c:3056
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:3069
+#: apply.c:3068
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3075
+#: apply.c:3074
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3097
+#: apply.c:3096
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3105
+#: apply.c:3104
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3152
+#: apply.c:3151
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3163
+#: apply.c:3162
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3171
+#: apply.c:3170
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3189
+#: apply.c:3188
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3202
+#: apply.c:3201
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3209
+#: apply.c:3208
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3230
+#: apply.c:3229
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3353
+#: apply.c:3352
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3413
+#: apply.c:3412
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3442 apply.c:3685
+#: apply.c:3441 apply.c:3687
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3528 apply.c:3700
+#: apply.c:3527 apply.c:3702
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3537 apply.c:3708 apply.c:3952
+#: apply.c:3536 apply.c:3710 apply.c:3954
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3572
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
+#: apply.c:3571
+msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
-#: apply.c:3575
+#: apply.c:3574
#, c-format
-msgid "Falling back to three-way merge...\n"
+msgid "Performing three-way merge...\n"
msgstr ""
-#: apply.c:3591 apply.c:3595
+#: apply.c:3590 apply.c:3594
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3607
+#: apply.c:3606
#, c-format
-msgid "Failed to fall back on three-way merge...\n"
+msgid "Failed to perform three-way merge...\n"
msgstr ""
-#: apply.c:3621
+#: apply.c:3620
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3626
+#: apply.c:3625
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3652
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr ""
+
+#: apply.c:3654
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3725
+#: apply.c:3727
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3727
+#: apply.c:3729
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
-#: read-cache.c:1313
+#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
+#: read-cache.c:1351
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3950
+#: apply.c:3952
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3954
+#: apply.c:3956
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3979
+#: apply.c:3981
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3999
+#: apply.c:4001
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:4018
+#: apply.c:4020
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4110
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4117
+#: apply.c:4119
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4120
+#: apply.c:4122
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4129
+#: apply.c:4131
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4139
+#: apply.c:4141
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4277
+#: apply.c:4279
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4311
+#: apply.c:4313
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4317
+#: apply.c:4319
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4325
+#: apply.c:4327
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4331 apply.c:4476
+#: apply.c:4333 apply.c:4478
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4374 builtin/bisect--helper.c:523
+#: apply.c:4376 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4378
+#: apply.c:4380
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4448
+#: apply.c:4450
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4546
+#: apply.c:4548
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4554
+#: apply.c:4556
msgid "internal error"
msgstr ""
-#: apply.c:4557
+#: apply.c:4559
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4568
+#: apply.c:4570
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4590
+#: apply.c:4592
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4594
+#: apply.c:4596
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4718
+#: apply.c:4725
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4726
+#: apply.c:4733
msgid "unrecognized input"
msgstr ""
-#: apply.c:4746
+#: apply.c:4753
msgid "unable to read index file"
msgstr ""
-#: apply.c:4903
+#: apply.c:4910
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4930
+#: apply.c:4937
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4936 apply.c:4951
+#: apply.c:4943 apply.c:4958
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4944
+#: apply.c:4951
#, 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:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
+#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4988
+#: apply.c:4995
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4991
+#: apply.c:4998
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4993 builtin/am.c:2266
+#: apply.c:5000 builtin/am.c:2317
msgid "num"
msgstr ""
-#: apply.c:4994
+#: apply.c:5001
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4997
+#: apply.c:5004
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4999
+#: apply.c:5006
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:5003
+#: apply.c:5010
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:5005
+#: apply.c:5012
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:5007
+#: apply.c:5014
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:5009
+#: apply.c:5016
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:5011
+#: apply.c:5018
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:5013
+#: apply.c:5020
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:5015
+#: apply.c:5022
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:5018
+#: apply.c:5025
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:5020
-msgid "attempt three-way merge if a patch does not apply"
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
-#: apply.c:5022
+#: apply.c:5029
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:5027
+#: apply.c:5034
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
+#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
+#: builtin/rebase.c:1347
msgid "action"
msgstr ""
-#: apply.c:5029
+#: apply.c:5036
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:5032 apply.c:5035
+#: apply.c:5039 apply.c:5042
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:5038
+#: apply.c:5045
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:5040
+#: apply.c:5047
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:5042
+#: apply.c:5049
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:5044
+#: apply.c:5051
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
-#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
-#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
+#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
+#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
-#: apply.c:5047
+#: apply.c:5054
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:5050
+#: apply.c:5057
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5052 builtin/am.c:2254
+#: apply.c:5059 builtin/am.c:2305
msgid "root"
msgstr ""
-#: apply.c:5053
+#: apply.c:5060
msgid "prepend <root> to all filenames"
msgstr ""
@@ -1418,141 +1433,141 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:192
+#: archive.c:188
#, c-format
msgid "cannot read %s"
msgstr ""
-#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
-#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
-#: builtin/merge.c:1139
+#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
+#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
+#: builtin/merge.c:1143
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
+#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:454
+#: archive.c:451
#, c-format
msgid "no such ref: %.*s"
msgstr ""
-#: archive.c:460
+#: archive.c:457
#, c-format
msgid "not a valid object name: %s"
msgstr ""
-#: archive.c:473
+#: archive.c:470
#, c-format
msgid "not a tree object: %s"
msgstr ""
-#: archive.c:485
+#: archive.c:482
msgid "current working directory is untracked"
msgstr ""
-#: archive.c:526
+#: archive.c:523
#, c-format
msgid "File not found: %s"
msgstr ""
-#: archive.c:528
+#: archive.c:525
#, c-format
msgid "Not a regular file: %s"
msgstr ""
-#: archive.c:555
+#: archive.c:552
msgid "fmt"
msgstr ""
-#: archive.c:555
+#: archive.c:552
msgid "archive format"
msgstr ""
-#: archive.c:556 builtin/log.c:1764
+#: archive.c:553 builtin/log.c:1772
msgid "prefix"
msgstr ""
-#: archive.c:557
+#: archive.c:554
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
-#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
+#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
msgid "file"
msgstr ""
-#: archive.c:559
+#: archive.c:556
msgid "add untracked file to archive"
msgstr ""
-#: archive.c:562 builtin/archive.c:90
+#: archive.c:559 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:564
+#: archive.c:561
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:565
+#: archive.c:562
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:567
+#: archive.c:564
msgid "set compression level"
msgstr ""
-#: archive.c:570
+#: archive.c:567
msgid "list supported archive formats"
msgstr ""
-#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
msgid "repo"
msgstr ""
-#: archive.c:573 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
#: builtin/notes.c:498
msgid "command"
msgstr ""
-#: archive.c:575 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:582
+#: archive.c:579
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:584
+#: archive.c:581
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:586
+#: archive.c:583
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:588
+#: archive.c:585
msgid "Options --add-file and --remote cannot be used together"
msgstr ""
-#: archive.c:610
+#: archive.c:607
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:619
+#: archive.c:616
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
@@ -1562,12 +1577,12 @@ msgstr ""
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:359
+#: attr.c:363
#, c-format
msgid "%s not allowed: %s:%d"
msgstr ""
-#: attr.c:399
+#: attr.c:403
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1635,7 +1650,7 @@ msgstr ""
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
#, c-format
msgid "could not create file '%s'"
msgstr ""
@@ -1678,37 +1693,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] ""
msgstr[1] ""
-#: blame.c:2777
+#: blame.c:2776
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:2791
+#: blame.c:2790
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:2812
+#: blame.c:2811
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
-#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
-#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
-#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
-#: builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
+#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
+#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
+#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
+#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:2839
+#: blame.c:2838
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:2850
+#: blame.c:2849
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:2861
+#: blame.c:2860
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
@@ -1827,12 +1842,12 @@ msgstr ""
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:365
+#: branch.c:366
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:388
+#: branch.c:389
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
@@ -1857,8 +1872,8 @@ msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
-#: builtin/commit.c:814
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
+#: builtin/commit.c:861
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -1916,7 +1931,7 @@ msgstr ""
msgid "cannot write bundle version %d with algorithm %s"
msgstr ""
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -1958,252 +1973,252 @@ msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit-graph.c:197 midx.c:46
+#: commit-graph.c:204 midx.c:47
msgid "invalid hash version"
msgstr ""
-#: commit-graph.c:255
+#: commit-graph.c:262
msgid "commit-graph file is too small"
msgstr ""
-#: commit-graph.c:348
+#: commit-graph.c:355
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr ""
-#: commit-graph.c:355
+#: commit-graph.c:362
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr ""
-#: commit-graph.c:362
+#: commit-graph.c:369
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr ""
-#: commit-graph.c:379
+#: commit-graph.c:386
#, c-format
msgid "commit-graph file is too small to hold %u chunks"
msgstr ""
-#: commit-graph.c:472
+#: commit-graph.c:482
msgid "commit-graph has no base graphs chunk"
msgstr ""
-#: commit-graph.c:482
+#: commit-graph.c:492
msgid "commit-graph chain does not match"
msgstr ""
-#: commit-graph.c:530
+#: commit-graph.c:540
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr ""
-#: commit-graph.c:554
+#: commit-graph.c:564
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:735 commit-graph.c:772
+#: commit-graph.c:745 commit-graph.c:782
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:756
+#: commit-graph.c:766
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:789
+#: commit-graph.c:799
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
-#: commit-graph.c:1065 builtin/am.c:1292
+#: commit-graph.c:1075 builtin/am.c:1340
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#: commit-graph.c:1337 builtin/pack-objects.c:2897
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1358
+#: commit-graph.c:1368
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1375
+#: commit-graph.c:1385
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1395
+#: commit-graph.c:1405
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1414
+#: commit-graph.c:1424
msgid "Computing commit graph topological levels"
msgstr ""
-#: commit-graph.c:1467
+#: commit-graph.c:1477
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1548
+#: commit-graph.c:1558
msgid "Computing commit changed paths Bloom filters"
msgstr ""
-#: commit-graph.c:1625
+#: commit-graph.c:1635
msgid "Collecting referenced commits"
msgstr ""
-#: commit-graph.c:1650
+#: commit-graph.c:1660
#, 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:1663
+#: commit-graph.c:1673
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1667
+#: commit-graph.c:1677
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1704
+#: commit-graph.c:1714
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1722
+#: commit-graph.c:1732
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1771
+#: commit-graph.c:1781
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1802 midx.c:794
+#: commit-graph.c:1812 midx.c:906
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1815
+#: commit-graph.c:1825
msgid "unable to create temporary graph layer"
msgstr ""
-#: commit-graph.c:1820
+#: commit-graph.c:1830
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr ""
-#: commit-graph.c:1879
+#: commit-graph.c:1887
#, 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:1915
+#: commit-graph.c:1923
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1931
+#: commit-graph.c:1939
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1951
+#: commit-graph.c:1959
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:2084
+#: commit-graph.c:2092
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:2128
+#: commit-graph.c:2136
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:2235
+#: commit-graph.c:2244
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
-#: commit-graph.c:2342
+#: commit-graph.c:2351
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:2440
+#: commit-graph.c:2450
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2450
+#: commit-graph.c:2460
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2460 commit-graph.c:2475
+#: commit-graph.c:2470 commit-graph.c:2485
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2467
+#: commit-graph.c:2477
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:2485
+#: commit-graph.c:2495
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2500
+#: commit-graph.c:2510
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2507
+#: commit-graph.c:2517
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2517
+#: commit-graph.c:2527
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2526
+#: commit-graph.c:2536
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2540
+#: commit-graph.c:2550
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2545
+#: commit-graph.c:2555
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2549
+#: commit-graph.c:2559
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2566
+#: commit-graph.c:2576
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2572
+#: commit-graph.c:2582
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
+#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
+#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr ""
@@ -2225,27 +2240,27 @@ msgid ""
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1223
+#: commit.c:1237
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1227
+#: commit.c:1241
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1230
+#: commit.c:1244
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1233
+#: commit.c:1247
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1487
+#: commit.c:1501
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"
@@ -2304,7 +2319,7 @@ msgstr ""
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:472 sequencer.c:2588
+#: config.c:472 sequencer.c:2785
#, c-format
msgid "invalid key: %s"
msgstr ""
@@ -2421,70 +2436,70 @@ msgstr ""
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:1194
+#: config.c:1257
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr ""
-#: config.c:1289
+#: config.c:1275
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1298
+#: config.c:1284
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1391
+#: config.c:1377
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1405 config.c:1416
+#: config.c:1391 config.c:1402
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1508
+#: config.c:1494
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1541
+#: config.c:1527
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1613
+#: config.c:1599
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1639
+#: config.c:1625
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1640
+#: config.c:1626
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1701 builtin/pack-objects.c:3666
+#: config.c:1687 builtin/pack-objects.c:3924
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1823
+#: config.c:1809
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1826
+#: config.c:1812
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1843
+#: config.c:1829
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
@@ -2494,105 +2509,105 @@ msgstr ""
msgid "failed to parse %s"
msgstr ""
-#: config.c:1927
+#: config.c:1929
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2290
+#: config.c:2293
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2464
+#: config.c:2467
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2509
+#: config.c:2512
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2555
+#: config.c:2558
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2557
+#: config.c:2560
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2641
+#: config.c:2644
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2673
+#: config.c:2676
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2702
+#: config.c:2705
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2954 config.c:3280
+#: config.c:2957 config.c:3283
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2965
+#: config.c:2968
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:3002 builtin/config.c:361
+#: config.c:3005 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:3027
+#: config.c:3030
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:3040 config.c:3293
+#: config.c:3043 config.c:3296
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:3051
+#: config.c:3054
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:3060 config.c:3298
+#: config.c:3063 config.c:3301
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:3145 config.c:3395
+#: config.c:3148 config.c:3398
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:3179
+#: config.c:3182
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3271
+#: config.c:3274
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3438
+#: config.c:3441
#, c-format
msgid "missing value for '%s'"
msgstr ""
@@ -2761,7 +2776,7 @@ msgstr ""
msgid "unable to fork"
msgstr ""
-#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
+#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
msgid "Checking connectivity"
msgstr ""
@@ -2777,119 +2792,119 @@ msgstr ""
msgid "failed to close rev-list's stdin"
msgstr ""
-#: convert.c:194
+#: convert.c:183
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
-#: convert.c:207
+#: convert.c:196
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: convert.c:209
+#: convert.c:198
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
-#: convert.c:217
+#: convert.c:206
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: convert.c:219
+#: convert.c:208
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
-#: convert.c:284
+#: convert.c:273
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: convert.c:291
+#: convert.c:280
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
"working-tree-encoding."
msgstr ""
-#: convert.c:304
+#: convert.c:293
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: convert.c:306
+#: convert.c:295
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
-#: convert.c:419 convert.c:490
+#: convert.c:408 convert.c:479
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: convert.c:462
+#: convert.c:451
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: convert.c:665
+#: convert.c:654
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: convert.c:685
+#: convert.c:674
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: convert.c:692
+#: convert.c:681
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
-#: convert.c:727 convert.c:730
+#: convert.c:716 convert.c:719
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
-#: convert.c:733 convert.c:788
+#: convert.c:722 convert.c:777
#, c-format
msgid "external filter '%s' failed"
msgstr ""
-#: convert.c:837
+#: convert.c:826
msgid "unexpected filter type"
msgstr ""
-#: convert.c:848
+#: convert.c:837
msgid "path name too long for external filter"
msgstr ""
-#: convert.c:940
+#: convert.c:934
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
-#: convert.c:1240
+#: convert.c:1234
msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: convert.c:1428 convert.c:1462
+#: convert.c:1414 convert.c:1447
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1508
+#: convert.c:1490
#, c-format
msgid "%s: smudge filter %s failed"
msgstr ""
@@ -3014,28 +3029,28 @@ msgstr ""
msgid "Marked %d islands, done.\n"
msgstr ""
-#: diff-merges.c:70
+#: diff-merges.c:80
#, c-format
msgid "unknown value for --diff-merges: %s"
msgstr ""
-#: diff-lib.c:534
+#: diff-lib.c:538
msgid "--merge-base does not work with ranges"
msgstr ""
-#: diff-lib.c:536
+#: diff-lib.c:540
msgid "--merge-base only works with commits"
msgstr ""
-#: diff-lib.c:553
+#: diff-lib.c:557
msgid "unable to get HEAD"
msgstr ""
-#: diff-lib.c:560
+#: diff-lib.c:564
msgid "no merge base found"
msgstr ""
-#: diff-lib.c:562
+#: diff-lib.c:566
msgid "multiple merge bases found"
msgstr ""
@@ -3090,544 +3105,544 @@ msgid ""
"%s"
msgstr ""
-#: diff.c:4276
+#: diff.c:4278
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4628
+#: diff.c:4630
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4631
+#: diff.c:4633
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4710
+#: diff.c:4712
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4758
+#: diff.c:4760
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4795
+#: diff.c:4797
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4880
+#: diff.c:4882
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4904
+#: diff.c:4906
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4918
+#: diff.c:4920
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4968 diff.c:4974
+#: diff.c:4970 diff.c:4976
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4986
+#: diff.c:4988
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:5007
+#: diff.c:5009
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:5026
+#: diff.c:5028
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:5066
+#: diff.c:5068
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5102 diff.c:5122
+#: diff.c:5104 diff.c:5124
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5226
+#: diff.c:5228
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr ""
-#: diff.c:5275
+#: diff.c:5277
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5331
+#: diff.c:5333
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5367
+#: diff.c:5369
msgid "Diff output format options"
msgstr ""
-#: diff.c:5369 diff.c:5375
+#: diff.c:5371 diff.c:5377
msgid "generate patch"
msgstr ""
-#: diff.c:5372 builtin/log.c:179
+#: diff.c:5374 builtin/log.c:179
msgid "suppress diff output"
msgstr ""
-#: diff.c:5377 diff.c:5491 diff.c:5498
+#: diff.c:5379 diff.c:5493 diff.c:5500
msgid "<n>"
msgstr ""
-#: diff.c:5378 diff.c:5381
+#: diff.c:5380 diff.c:5383
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5383
+#: diff.c:5385
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5386
+#: diff.c:5388
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5390
+#: diff.c:5392
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5394
+#: diff.c:5396
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5397
+#: diff.c:5399
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5399 diff.c:5407
+#: diff.c:5401 diff.c:5409
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5400
+#: diff.c:5402
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5404
+#: diff.c:5406
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5408
+#: diff.c:5410
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5412
+#: diff.c:5414
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5415
+#: diff.c:5417
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5418
+#: diff.c:5420
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5421
+#: diff.c:5423
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5423
+#: diff.c:5425
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5424
+#: diff.c:5426
msgid "generate diffstat"
msgstr ""
-#: diff.c:5426 diff.c:5429 diff.c:5432
+#: diff.c:5428 diff.c:5431 diff.c:5434
msgid "<width>"
msgstr ""
-#: diff.c:5427
+#: diff.c:5429
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5430
+#: diff.c:5432
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5433
+#: diff.c:5435
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5435
+#: diff.c:5437
msgid "<count>"
msgstr ""
-#: diff.c:5436
+#: diff.c:5438
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5439
+#: diff.c:5441
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5442
+#: diff.c:5444
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5445
+#: diff.c:5447
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5447
+#: diff.c:5449
msgid "show colored diff"
msgstr ""
-#: diff.c:5448
+#: diff.c:5450
msgid "<kind>"
msgstr ""
-#: diff.c:5449
+#: diff.c:5451
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5452
+#: diff.c:5454
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
+#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
msgid "<prefix>"
msgstr ""
-#: diff.c:5456
+#: diff.c:5458
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5459
+#: diff.c:5461
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5462
+#: diff.c:5464
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5465
+#: diff.c:5467
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5468
+#: diff.c:5470
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5472 diff.c:5477 diff.c:5482
+#: diff.c:5474 diff.c:5479 diff.c:5484
msgid "<char>"
msgstr ""
-#: diff.c:5473
+#: diff.c:5475
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5478
+#: diff.c:5480
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5483
+#: diff.c:5485
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5486
+#: diff.c:5488
msgid "Diff rename options"
msgstr ""
-#: diff.c:5487
+#: diff.c:5489
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5488
+#: diff.c:5490
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5492
+#: diff.c:5494
msgid "detect renames"
msgstr ""
-#: diff.c:5496
+#: diff.c:5498
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5499
+#: diff.c:5501
msgid "detect copies"
msgstr ""
-#: diff.c:5503
+#: diff.c:5505
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5505
+#: diff.c:5507
msgid "disable rename detection"
msgstr ""
-#: diff.c:5508
+#: diff.c:5510
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5510
+#: diff.c:5512
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5513
+#: diff.c:5515
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5515
+#: diff.c:5517
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5517
+#: diff.c:5519
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5520
+#: diff.c:5522
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5523
+#: diff.c:5525
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5526
+#: diff.c:5528
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5529
+#: diff.c:5531
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5532
+#: diff.c:5534
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
msgid "<regex>"
msgstr ""
-#: diff.c:5535
+#: diff.c:5537
msgid "ignore changes whose all lines match <regex>"
msgstr ""
-#: diff.c:5538
+#: diff.c:5540
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5541
+#: diff.c:5543
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5545
+#: diff.c:5547
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5547
+#: diff.c:5549
msgid "<algorithm>"
msgstr ""
-#: diff.c:5548
+#: diff.c:5550
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5550
+#: diff.c:5552
msgid "<text>"
msgstr ""
-#: diff.c:5551
+#: diff.c:5553
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5553 diff.c:5562 diff.c:5565
+#: diff.c:5555 diff.c:5564 diff.c:5567
msgid "<mode>"
msgstr ""
-#: diff.c:5554
+#: diff.c:5556
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5557
+#: diff.c:5559
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5560
+#: diff.c:5562
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5563
+#: diff.c:5565
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5566
+#: diff.c:5568
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5569
+#: diff.c:5571
msgid "Other diff options"
msgstr ""
-#: diff.c:5571
+#: diff.c:5573
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5575
+#: diff.c:5577
msgid "treat all files as text"
msgstr ""
-#: diff.c:5577
+#: diff.c:5579
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5579
+#: diff.c:5581
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5581
+#: diff.c:5583
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5583
+#: diff.c:5585
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5585
+#: diff.c:5587
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5587
+#: diff.c:5589
msgid "<when>"
msgstr ""
-#: diff.c:5588
+#: diff.c:5590
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5591
+#: diff.c:5593
msgid "<format>"
msgstr ""
-#: diff.c:5592
+#: diff.c:5594
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5596
+#: diff.c:5598
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5599
+#: diff.c:5601
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5601
+#: diff.c:5603
msgid "<string>"
msgstr ""
-#: diff.c:5602
+#: diff.c:5604
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5605
+#: diff.c:5607
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5608
+#: diff.c:5610
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5611
+#: diff.c:5613
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5614
+#: diff.c:5616
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5615 diff.c:5618
+#: diff.c:5617 diff.c:5620
msgid "<path>"
msgstr ""
-#: diff.c:5616
+#: diff.c:5618
msgid "show the change in the specified path first"
msgstr ""
-#: diff.c:5619
+#: diff.c:5621
msgid "skip the output to the specified path"
msgstr ""
-#: diff.c:5621
+#: diff.c:5623
msgid "<object-id>"
msgstr ""
-#: diff.c:5622
+#: diff.c:5624
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5624
+#: diff.c:5626
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5625
+#: diff.c:5627
msgid "select files by diff type"
msgstr ""
-#: diff.c:5627
+#: diff.c:5629
msgid "<file>"
msgstr ""
-#: diff.c:5628
+#: diff.c:5630
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6285
+#: diff.c:6287
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6288
+#: diff.c:6290
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6291
+#: diff.c:6293
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3638,7 +3653,7 @@ msgstr ""
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:786
+#: diffcore-rename.c:1418
msgid "Performing inexact rename detection"
msgstr ""
@@ -3671,35 +3686,35 @@ msgstr ""
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1198
+#: dir.c:1206
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2305
+#: dir.c:2314
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2605
+#: dir.c:2614
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2729
+#: dir.c:2738
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3534
+#: dir.c:3543
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3579 dir.c:3584
+#: dir.c:3590 dir.c:3595
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3613
+#: dir.c:3624
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
@@ -3709,11 +3724,11 @@ msgstr ""
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr ""
-#: entry.c:478
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr ""
@@ -3733,249 +3748,257 @@ msgstr ""
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:177
+#: fetch-pack.c:182
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:180
+#: fetch-pack.c:185
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:191
+#: fetch-pack.c:196
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:211
+#: fetch-pack.c:216
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:222
+#: fetch-pack.c:227
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:283
+#: fetch-pack.c:288
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:378 fetch-pack.c:1457
+#: fetch-pack.c:383 fetch-pack.c:1423
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:384 fetch-pack.c:1463
+#: fetch-pack.c:389 fetch-pack.c:1429
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:386 fetch-pack.c:1465
+#: fetch-pack.c:391 fetch-pack.c:1431
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:389 fetch-pack.c:1468
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:391 fetch-pack.c:1470
+#: fetch-pack.c:396 fetch-pack.c:1436
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:394 fetch-pack.c:1474
+#: fetch-pack.c:399 fetch-pack.c:1440
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:434
+#: fetch-pack.c:439
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:451
+#: fetch-pack.c:456
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:482
+#: fetch-pack.c:487
msgid "giving up"
msgstr ""
-#: fetch-pack.c:495 progress.c:339
+#: fetch-pack.c:500 progress.c:339
msgid "done"
msgstr ""
-#: fetch-pack.c:507
+#: fetch-pack.c:512
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:543
+#: fetch-pack.c:548
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:758
+#: fetch-pack.c:763
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:844
+#: fetch-pack.c:849
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:852
+#: fetch-pack.c:857
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:946
+#: fetch-pack.c:951
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:952
+#: fetch-pack.c:957
msgid "fetch-pack: invalid index-pack output"
msgstr ""
-#: fetch-pack.c:969
+#: fetch-pack.c:974
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:971
+#: fetch-pack.c:976
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:1031
+#: fetch-pack.c:1019
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
-#: 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:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
+#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
+#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
#, c-format
msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:1041
+#: fetch-pack.c:1029
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:1101
+#: fetch-pack.c:1089
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1106
+#: fetch-pack.c:1094
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1110
+#: fetch-pack.c:1098
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1112
+#: fetch-pack.c:1100
msgid "Server does not support this repository's object format"
msgstr ""
-#: fetch-pack.c:1125
+#: fetch-pack.c:1113
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1138 fetch-pack.c:1682
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr ""
+
+#: fetch-pack.c:1128 fetch-pack.c:1651
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1265
+#: fetch-pack.c:1242
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr ""
-#: fetch-pack.c:1269
+#: fetch-pack.c:1246
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr ""
-#: fetch-pack.c:1289
+#: fetch-pack.c:1279
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1296
+#: fetch-pack.c:1286
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1335
+#: fetch-pack.c:1329 fetch-pack.c:2034
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1353
+#: fetch-pack.c:1347
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1359
+#: fetch-pack.c:1353
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1420
+#: fetch-pack.c:1387
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1425
+#: fetch-pack.c:1392
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1435
+#: fetch-pack.c:1402
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1437
+#: fetch-pack.c:1404
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1479
+#: fetch-pack.c:1445
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1526
+#: fetch-pack.c:1494
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1531
+#: fetch-pack.c:1499
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1536
+#: fetch-pack.c:1504
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1566
+#: fetch-pack.c:1534
msgid "git fetch-pack: expected response end packet"
msgstr ""
-#: fetch-pack.c:1960
+#: fetch-pack.c:1930
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1983 builtin/clone.c:693
+#: fetch-pack.c:1953 builtin/clone.c:697
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:2010
+#: fetch-pack.c:2056
+msgid "unexpected 'ready' from remote"
+msgstr ""
+
+#: fetch-pack.c:2079
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:2013
+#: fetch-pack.c:2082
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
@@ -3998,24 +4021,24 @@ msgstr ""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:543
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-#: grep.c:1906
+#: grep.c:1893
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
-#: builtin/rm.c:135
+#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:1934
+#: grep.c:1921
#, c-format
msgid "'%s': short read"
msgstr ""
@@ -4217,47 +4240,52 @@ msgstr ""
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:454 builtin/commit.c:634
+#: ident.c:454 builtin/commit.c:647
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: list-objects-filter-options.c:81
+#: list-objects-filter-options.c:83
msgid "expected 'tree:<depth>'"
msgstr ""
-#: list-objects-filter-options.c:96
+#: list-objects-filter-options.c:98
msgid "sparse:path filters support has been dropped"
msgstr ""
-#: list-objects-filter-options.c:109
+#: list-objects-filter-options.c:105
+#, c-format
+msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgstr ""
+
+#: list-objects-filter-options.c:124
#, c-format
msgid "invalid filter-spec '%s'"
msgstr ""
-#: list-objects-filter-options.c:125
+#: list-objects-filter-options.c:140
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr ""
-#: list-objects-filter-options.c:167
+#: list-objects-filter-options.c:182
msgid "expected something after combine:"
msgstr ""
-#: list-objects-filter-options.c:249
+#: list-objects-filter-options.c:264
msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: list-objects-filter-options.c:361
+#: list-objects-filter-options.c:376
msgid "unable to upgrade repository format to support partial clone"
msgstr ""
-#: list-objects-filter.c:492
+#: list-objects-filter.c:532
#, c-format
msgid "unable to access sparse blob in '%s'"
msgstr ""
-#: list-objects-filter.c:495
+#: list-objects-filter.c:535
#, c-format
msgid "unable to parse sparse filter data in %s"
msgstr ""
@@ -4272,7 +4300,7 @@ msgstr ""
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: list-objects.c:375
+#: list-objects.c:395
#, c-format
msgid "unable to load root tree for commit %s"
msgstr ""
@@ -4303,39 +4331,48 @@ msgstr ""
msgid "expected flush after ls-refs arguments"
msgstr ""
-#: merge-ort.c:888 merge-recursive.c:1191
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr ""
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr ""
+
+#: merge-ort.c:1116 merge-recursive.c:1205
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-ort.c:897 merge-recursive.c:1198
+#: merge-ort.c:1125 merge-recursive.c:1212
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-ort.c:906 merge-recursive.c:1205
+#: merge-ort.c:1134 merge-recursive.c:1219
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-ort.c:916 merge-ort.c:923
+#: merge-ort.c:1144 merge-ort.c:1151
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr ""
-#: merge-ort.c:944
+#: merge-ort.c:1172
#, c-format
msgid "Failed to merge submodule %s"
msgstr ""
-#: merge-ort.c:951
+#: merge-ort.c:1179
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"%s\n"
msgstr ""
-#: merge-ort.c:955 merge-recursive.c:1259
+#: merge-ort.c:1183 merge-recursive.c:1273
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4346,42 +4383,42 @@ msgid ""
"which will accept this suggestion.\n"
msgstr ""
-#: merge-ort.c:968
+#: merge-ort.c:1196
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-#: merge-ort.c:1127 merge-recursive.c:1341
+#: merge-ort.c:1415 merge-recursive.c:1362
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-ort.c:1132 merge-recursive.c:1346
+#: merge-ort.c:1420 merge-recursive.c:1367
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-ort.c:1139 merge-recursive.c:1378
+#: merge-ort.c:1427 merge-recursive.c:1400
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-ort.c:1278 merge-recursive.c:2100
+#: merge-ort.c:1566 merge-recursive.c:2122
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-ort.c:1288 merge-recursive.c:2110
+#: merge-ort.c:1576 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-ort.c:1471
+#: merge-ort.c:1634
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4389,47 +4426,47 @@ msgid ""
"majority of the files."
msgstr ""
-#: merge-ort.c:1637 merge-recursive.c:2447
+#: merge-ort.c:1788 merge-recursive.c:2468
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-ort.c:1781 merge-recursive.c:3215
+#: merge-ort.c:1932 merge-recursive.c:3244
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-#: merge-ort.c:1788 merge-recursive.c:3222
+#: merge-ort.c:1939 merge-recursive.c:3251
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
-#: merge-ort.c:1801 merge-recursive.c:3218
+#: merge-ort.c:1952 merge-recursive.c:3247
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:1809 merge-recursive.c:3225
+#: merge-ort.c:1960 merge-recursive.c:3254
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:1952
+#: merge-ort.c:2103
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
-#: merge-ort.c:2047
+#: merge-ort.c:2198
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4437,75 +4474,90 @@ msgid ""
"markers."
msgstr ""
-#: merge-ort.c:2066 merge-ort.c:2090
+#: merge-ort.c:2217 merge-ort.c:2241
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-#: merge-ort.c:2735
+#: merge-ort.c:2550 merge-recursive.c:3002
+#, c-format
+msgid "cannot read object %s"
+msgstr ""
+
+#: merge-ort.c:2553 merge-recursive.c:3005
+#, c-format
+msgid "object %s is not a blob"
+msgstr ""
+
+#: merge-ort.c:2981
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
-#: merge-ort.c:2808
+#: merge-ort.c:3055
#, c-format
msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:2812
-msgid "both"
-msgstr ""
-
-#: merge-ort.c:2812
-msgid "one"
+#: merge-ort.c:3062
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:2907 merge-recursive.c:3052
+#: merge-ort.c:3162 merge-recursive.c:3081
msgid "content"
msgstr ""
-#: merge-ort.c:2909 merge-recursive.c:3056
+#: merge-ort.c:3164 merge-recursive.c:3085
msgid "add/add"
msgstr ""
-#: merge-ort.c:2911 merge-recursive.c:3101
+#: merge-ort.c:3166 merge-recursive.c:3130
msgid "submodule"
msgstr ""
-#: merge-ort.c:2913 merge-recursive.c:3102
+#: merge-ort.c:3168 merge-recursive.c:3131
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-ort.c:2938
+#: merge-ort.c:3198
#, 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:3433
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+
#. 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:3406
+#: merge-ort.c:3730
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
-#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#: merge-ort-wrappers.c:13 merge-recursive.c:3699
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-#: merge-ort-wrappers.c:33 merge-recursive.c:3436
-#, c-format
-msgid "Already up to date!"
+#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+msgid "Already up to date."
msgstr ""
#: merge-recursive.c:356
@@ -4522,162 +4574,162 @@ msgstr ""
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:874
+#: merge-recursive.c:876
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:885
+#: merge-recursive.c:887
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:899 merge-recursive.c:918
+#: merge-recursive.c:901 merge-recursive.c:920
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:908
+#: merge-recursive.c:910
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:949 builtin/cat-file.c:41
+#: merge-recursive.c:951 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:954
+#: merge-recursive.c:956
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:990
+#: merge-recursive.c:992
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:995
+#: merge-recursive.c:997
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1227 merge-recursive.c:1239
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: merge-recursive.c:1230 merge-recursive.c:1242
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
-#: merge-recursive.c:1251
+#: merge-recursive.c:1265
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1255
+#: merge-recursive.c:1269
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1256
+#: merge-recursive.c:1270
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1268
+#: merge-recursive.c:1282
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1402
+#: merge-recursive.c:1424
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: merge-recursive.c:1474
+#: merge-recursive.c:1496
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1479
+#: merge-recursive.c:1501
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
-#: merge-recursive.c:1486
+#: merge-recursive.c:1508
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1491
+#: merge-recursive.c:1513
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
-#: merge-recursive.c:1526
+#: merge-recursive.c:1548
msgid "rename"
msgstr ""
-#: merge-recursive.c:1526
+#: merge-recursive.c:1548
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
+#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: merge-recursive.c:1587
+#: merge-recursive.c:1609
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: merge-recursive.c:1645
+#: merge-recursive.c:1667
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: merge-recursive.c:1676
+#: merge-recursive.c:1698
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1681
+#: merge-recursive.c:1703
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: merge-recursive.c:1708
+#: merge-recursive.c:1730
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1713
+#: merge-recursive.c:1735
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1805
+#: merge-recursive.c:1827
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:2068
+#: merge-recursive.c:2090
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4685,96 +4737,86 @@ msgid ""
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2202
+#: merge-recursive.c:2224
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
-#: merge-recursive.c:2973
-#, c-format
-msgid "cannot read object %s"
-msgstr ""
-
-#: merge-recursive.c:2976
-#, c-format
-msgid "object %s is not a blob"
-msgstr ""
-
-#: merge-recursive.c:3040
+#: merge-recursive.c:3069
msgid "modify"
msgstr ""
-#: merge-recursive.c:3040
+#: merge-recursive.c:3069
msgid "modified"
msgstr ""
-#: merge-recursive.c:3079
+#: merge-recursive.c:3108
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3132
+#: merge-recursive.c:3161
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:3339
+#: merge-recursive.c:3368
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3362
+#: merge-recursive.c:3391
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3367
+#: merge-recursive.c:3396
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3374
+#: merge-recursive.c:3403
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:3383
+#: merge-recursive.c:3412
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3392
+#: merge-recursive.c:3421
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3445
+#: merge-recursive.c:3474
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3539
+#: merge-recursive.c:3568
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3552
+#: merge-recursive.c:3581
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3602
+#: merge-recursive.c:3631
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3758
+#: merge-recursive.c:3796
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
-#: builtin/stash.c:471
+#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
+#: builtin/stash.c:473
msgid "Unable to write index."
msgstr ""
@@ -4782,176 +4824,195 @@ msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
-#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
-#: builtin/stash.c:265
+#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
+#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
+#: builtin/stash.c:267
msgid "unable to write new index file"
msgstr ""
-#: midx.c:62
+#: midx.c:74
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr ""
-#: midx.c:93
+#: midx.c:105
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:109
+#: midx.c:121
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:114
+#: midx.c:126
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:119
+#: midx.c:131
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-#: midx.c:136
+#: midx.c:148
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:138
+#: midx.c:150
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:140
+#: midx.c:152
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:142
+#: midx.c:154
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:158
+#: midx.c:170
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:202
+#: midx.c:214
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:252
+#: midx.c:264
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:467
+#: midx.c:490
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:473
+#: midx.c:496
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:533
+#: midx.c:564
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:821
+#: midx.c:880 builtin/index-pack.c:1535
+msgid "cannot store reverse index file"
+msgstr ""
+
+#: midx.c:933
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:855
+#: midx.c:979
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
-#: midx.c:904
+#: midx.c:1024
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr ""
+
+#: midx.c:1029
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr ""
+
+#: midx.c:1045
msgid "no pack files to index."
msgstr ""
-#: midx.c:965
+#: midx.c:1125 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: midx.c:1156
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1021
+#: midx.c:1214
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
-#: midx.c:1029
+#: midx.c:1222
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1044
+#: midx.c:1237
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1049
+#: midx.c:1242
msgid "the midx contains no oid"
msgstr ""
-#: midx.c:1058
+#: midx.c:1251
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1067
+#: midx.c:1260
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1087
+#: midx.c:1280
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1094
+#: midx.c:1287
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1110
+#: midx.c:1303
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1116
+#: midx.c:1309
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1125
+#: midx.c:1318
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1150
+#: midx.c:1343
msgid "Counting referenced objects"
msgstr ""
-#: midx.c:1160
+#: midx.c:1353
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1351
+#: midx.c:1544
msgid "could not start pack-objects"
msgstr ""
-#: midx.c:1371
+#: midx.c:1564
msgid "could not finish pack-objects"
msgstr ""
-#: name-hash.c:538
+#: name-hash.c:542
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: name-hash.c:560
+#: name-hash.c:564
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: name-hash.c:566
+#: name-hash.c:570
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr ""
@@ -4992,256 +5053,256 @@ msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object-file.c:480
+#: object-file.c:526
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:531
+#: object-file.c:577
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: object-file.c:603
+#: object-file.c:649
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:610
+#: object-file.c:656
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: object-file.c:653
+#: object-file.c:699
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: object-file.c:671
+#: object-file.c:717
msgid "unable to read alternates file"
msgstr ""
-#: object-file.c:678
+#: object-file.c:724
msgid "unable to move new alternates file into place"
msgstr ""
-#: object-file.c:713
+#: object-file.c:759
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: object-file.c:734
+#: object-file.c:780
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: object-file.c:740
+#: object-file.c:786
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: object-file.c:746
+#: object-file.c:792
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: object-file.c:754
+#: object-file.c:800
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: object-file.c:814
+#: object-file.c:860
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:964
+#: object-file.c:1010
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:985
+#: object-file.c:1031
msgid "mmap failed"
msgstr ""
-#: object-file.c:1149
+#: object-file.c:1195
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: object-file.c:1284 object-file.c:2477
+#: object-file.c:1330 object-file.c:2524
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: object-file.c:1286 object-file.c:2481
+#: object-file.c:1332 object-file.c:2528
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: object-file.c:1328
+#: object-file.c:1374
msgid "invalid object type"
msgstr ""
-#: object-file.c:1412
+#: object-file.c:1458
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: object-file.c:1415
+#: object-file.c:1461
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: object-file.c:1421
+#: object-file.c:1467
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: object-file.c:1424
+#: object-file.c:1470
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: object-file.c:1651
+#: object-file.c:1697
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: object-file.c:1655
+#: object-file.c:1701
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: object-file.c:1659
+#: object-file.c:1705
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1663
+#: object-file.c:1709
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1768
+#: object-file.c:1814
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: object-file.c:1775
+#: object-file.c:1821
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: object-file.c:1782
+#: object-file.c:1828
msgid "file write error"
msgstr ""
-#: object-file.c:1802
+#: object-file.c:1848
msgid "error when closing loose object file"
msgstr ""
-#: object-file.c:1867
+#: object-file.c:1913
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1869
+#: object-file.c:1915
msgid "unable to create temporary file"
msgstr ""
-#: object-file.c:1893
+#: object-file.c:1939
msgid "unable to write loose object file"
msgstr ""
-#: object-file.c:1899
+#: object-file.c:1945
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: object-file.c:1903
+#: object-file.c:1949
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: object-file.c:1907
+#: object-file.c:1953
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1917 builtin/pack-objects.c:1097
+#: object-file.c:1963 builtin/pack-objects.c:1097
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: object-file.c:1994
+#: object-file.c:2040
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: object-file.c:2045
+#: object-file.c:2091
msgid "corrupt commit"
msgstr ""
-#: object-file.c:2053
+#: object-file.c:2099
msgid "corrupt tag"
msgstr ""
-#: object-file.c:2153
+#: object-file.c:2199
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2156
+#: object-file.c:2202
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: object-file.c:2229 object-file.c:2239
+#: object-file.c:2275 object-file.c:2285
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: object-file.c:2245
+#: object-file.c:2291
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: object-file.c:2269
+#: object-file.c:2315
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: object-file.c:2271
+#: object-file.c:2317
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: object-file.c:2298 builtin/index-pack.c:192
+#: object-file.c:2344 builtin/index-pack.c:192
#, c-format
msgid "unable to open %s"
msgstr ""
-#: object-file.c:2488 object-file.c:2541
+#: object-file.c:2535 object-file.c:2588
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2512
+#: object-file.c:2559
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: object-file.c:2517
+#: object-file.c:2564
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: object-file.c:2523
+#: object-file.c:2570
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: object-file.c:2534
+#: object-file.c:2581
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
@@ -5338,71 +5399,71 @@ msgstr ""
msgid "object %s is a %s, not a %s"
msgstr ""
-#: object.c:233
+#: object.c:232
#, c-format
msgid "object %s has unknown type id %d"
msgstr ""
-#: object.c:246
+#: object.c:245
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: object.c:266 object.c:278
+#: object.c:265 object.c:277
#, c-format
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#: pack-bitmap.c:1547 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr ""
-#: pack-revindex.c:220
+#: pack-revindex.c:221
#, c-format
msgid "reverse-index file %s is too small"
msgstr ""
-#: pack-revindex.c:225
+#: pack-revindex.c:226
#, c-format
msgid "reverse-index file %s is corrupt"
msgstr ""
-#: pack-revindex.c:233
+#: pack-revindex.c:234
#, c-format
msgid "reverse-index file %s has unknown signature"
msgstr ""
-#: pack-revindex.c:237
+#: pack-revindex.c:238
#, c-format
msgid "reverse-index file %s has unsupported version %<PRIu32>"
msgstr ""
-#: pack-revindex.c:242
+#: pack-revindex.c:243
#, c-format
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr ""
-#: pack-write.c:236
+#: pack-write.c:250
msgid "cannot both write and verify reverse index"
msgstr ""
-#: pack-write.c:257
+#: pack-write.c:271
#, c-format
msgid "could not stat: %s"
msgstr ""
-#: pack-write.c:269
+#: pack-write.c:283
#, c-format
msgid "failed to make %s readable"
msgstr ""
-#: pack-write.c:508
+#: pack-write.c:522
#, c-format
msgid "could not write '%s' promisor file"
msgstr ""
@@ -5411,12 +5472,12 @@ msgstr ""
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:1934
+#: packfile.c:1937
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1938
+#: packfile.c:1941
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@ -5481,31 +5542,31 @@ msgstr ""
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:666 parse-options.c:971
+#: parse-options.c:668 parse-options.c:988
#, c-format
msgid "alias of --%s"
msgstr ""
-#: parse-options.c:862
+#: parse-options.c:879
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:864
+#: parse-options.c:881
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:866
+#: parse-options.c:883
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:890
+#: parse-options.c:907
msgid "..."
msgstr ""
-#: parse-options.c:909
+#: parse-options.c:926
#, c-format
msgid "usage: %s"
msgstr ""
@@ -5513,17 +5574,17 @@ msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:915
+#: parse-options.c:932
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:918
+#: parse-options.c:935
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:957
+#: parse-options.c:974
msgid "-NUM"
msgstr ""
@@ -5532,78 +5593,78 @@ msgstr ""
msgid "Could not make %s writable by group"
msgstr ""
-#: pathspec.c:130
+#: pathspec.c:151
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: pathspec.c:148
+#: pathspec.c:169
msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: pathspec.c:151
+#: pathspec.c:172
msgid "attr spec must not be empty"
msgstr ""
-#: pathspec.c:194
+#: pathspec.c:215
#, c-format
msgid "invalid attribute name %s"
msgstr ""
-#: pathspec.c:259
+#: pathspec.c:280
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: pathspec.c:266
+#: pathspec.c:287
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-#: pathspec.c:306
+#: pathspec.c:327
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: pathspec.c:327
+#: pathspec.c:348
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: pathspec.c:332
+#: pathspec.c:353
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: pathspec.c:370
+#: pathspec.c:391
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: pathspec.c:429
+#: pathspec.c:450
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: pathspec.c:445
+#: pathspec.c:466
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr ""
-#: pathspec.c:521
+#: pathspec.c:542
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: pathspec.c:531
+#: pathspec.c:552
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:598
+#: pathspec.c:619
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:643
+#: pathspec.c:664
#, c-format
msgid "line is badly quoted: %s"
msgstr ""
@@ -5624,7 +5685,7 @@ msgstr ""
msgid "flush packet write failed"
msgstr ""
-#: pkt-line.c:153 pkt-line.c:239
+#: pkt-line.c:153 pkt-line.c:265
msgid "protocol error: impossibly long line"
msgstr ""
@@ -5632,33 +5693,34 @@ msgstr ""
msgid "packet write with format failed"
msgstr ""
-#: pkt-line.c:203
+#: pkt-line.c:204
msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: pkt-line.c:210 pkt-line.c:217
-msgid "packet write failed"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
msgstr ""
-#: pkt-line.c:302
+#: pkt-line.c:328 pkt-line.c:329
msgid "read error"
msgstr ""
-#: pkt-line.c:310
+#: pkt-line.c:339 pkt-line.c:340
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:338
+#: pkt-line.c:369 pkt-line.c:371
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:352 pkt-line.c:357
+#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:373 sideband.c:165
+#: pkt-line.c:413 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr ""
@@ -5672,7 +5734,7 @@ msgstr ""
msgid "unable to create threaded lstat: %s"
msgstr ""
-#: pretty.c:984
+#: pretty.c:988
msgid "unable to parse --pretty format"
msgstr ""
@@ -5693,6 +5755,10 @@ msgstr ""
msgid "promisor remote name cannot begin with '/': %s"
msgstr ""
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr ""
+
#: prune-packed.c:35
msgid "Removing duplicate objects"
msgstr ""
@@ -5705,7 +5771,7 @@ msgstr ""
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:101 sequencer.c:5318
+#: range-diff.c:101 sequencer.c:5551
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
@@ -5735,196 +5801,200 @@ msgstr ""
msgid "could not parse log for '%s'"
msgstr ""
-#: read-cache.c:682
+#: read-cache.c:708
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: read-cache.c:698
+#: read-cache.c:724
msgid "cannot create an empty blob in the object database"
msgstr ""
-#: read-cache.c:720
+#: read-cache.c:746
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:725
+#: read-cache.c:751
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr ""
-#: read-cache.c:777
+#: read-cache.c:803
#, c-format
msgid "unable to index file '%s'"
msgstr ""
-#: read-cache.c:796
+#: read-cache.c:822
#, c-format
msgid "unable to add '%s' to index"
msgstr ""
-#: read-cache.c:807
+#: read-cache.c:833
#, c-format
msgid "unable to stat '%s'"
msgstr ""
-#: read-cache.c:1318
+#: read-cache.c:1356
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1532
+#: read-cache.c:1571
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1657
+#: read-cache.c:1700
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1667
+#: read-cache.c:1710
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1723
+#: read-cache.c:1766
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1726
+#: read-cache.c:1769
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1735
+#: read-cache.c:1778
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1765
+#: read-cache.c:1812
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1767
+#: read-cache.c:1814
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1804
+#: read-cache.c:1851
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1820
+#: read-cache.c:1867
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1877
+#: read-cache.c:1924
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1880
+#: read-cache.c:1927
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1883
+#: read-cache.c:1930
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
-#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
-#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
+#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
+#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
+#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
+#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2133
+#: read-cache.c:2180
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2146
+#: read-cache.c:2193
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2179
+#: read-cache.c:2226
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2183
+#: read-cache.c:2230
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2187
+#: read-cache.c:2234
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2191
+#: read-cache.c:2238
#, c-format
msgid "%s: unable to map index file"
msgstr ""
-#: read-cache.c:2233
+#: read-cache.c:2280
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2260
+#: read-cache.c:2307
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2292
+#: read-cache.c:2345
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2339
+#: read-cache.c:2392
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
+#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
+#: read-cache.c:3138
+msgid "failed to convert to a sparse-index"
+msgstr ""
+
+#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3151
+#: read-cache.c:3222
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3163
+#: read-cache.c:3234
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3188
+#: read-cache.c:3263
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3337
+#: read-cache.c:3412
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
@@ -5950,7 +6020,10 @@ msgid ""
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
+" commit's log message, unless -C is used, in which case\n"
+" keep only this commit's message; -c is same as -C but\n"
+" opens the editor\n"
"x, exec <command> = run command (the rest of the line) using shell\n"
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
"d, drop <commit> = remove commit\n"
@@ -5959,31 +6032,31 @@ msgid ""
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
+". specified); use -c <commit> to reword the commit message\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: rebase-interactive.c:63
+#: rebase-interactive.c:66
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] ""
msgstr[1] ""
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5992,33 +6065,33 @@ msgid ""
"\n"
msgstr ""
-#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
-#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
+#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
#, c-format
msgid "could not write '%s'"
msgstr ""
-#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
-#: builtin/rebase.c:254
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
#, c-format
msgid "could not write '%s'."
msgstr ""
-#: rebase-interactive.c:193
+#: rebase-interactive.c:196
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
-#: rebase-interactive.c:200
+#: rebase-interactive.c:203
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -6029,14 +6102,14 @@ msgid ""
"\n"
msgstr ""
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
-#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
-#: builtin/rebase.c:266
+#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
+#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
+#: builtin/rebase.c:265
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: ref-filter.c:42 wt-status.c:1975
+#: ref-filter.c:42 wt-status.c:1978
msgid "gone"
msgstr ""
@@ -6191,111 +6264,111 @@ msgstr ""
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:806
+#: ref-filter.c:807
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:808
+#: ref-filter.c:809
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:810
+#: ref-filter.c:811
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:838
+#: ref-filter.c:839
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:840
+#: ref-filter.c:841
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:842
+#: ref-filter.c:843
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:857
+#: ref-filter.c:858
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:914
+#: ref-filter.c:915
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1555
+#: ref-filter.c:1556
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1558
+#: ref-filter.c:1559
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: ref-filter.c:1561
+#: ref-filter.c:1562
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: ref-filter.c:1565
+#: ref-filter.c:1566
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
-#: ref-filter.c:1568
+#: ref-filter.c:1569
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1571
+#: ref-filter.c:1572
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1603 ref-filter.c:1812
+#: ref-filter.c:1604 ref-filter.c:1813
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1613
+#: ref-filter.c:1614
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1996
+#: ref-filter.c:1997
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:2085
+#: ref-filter.c:2086
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2090 refs.c:676
+#: ref-filter.c:2091 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2430
+#: ref-filter.c:2431
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2529
+#: ref-filter.c:2525
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2534
+#: ref-filter.c:2530
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
@@ -6714,8 +6787,8 @@ msgstr ""
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
#, c-format
msgid "could not create directory '%s'"
msgstr ""
@@ -6753,25 +6826,25 @@ msgstr ""
msgid "could not determine HEAD revision"
msgstr ""
-#: reset.c:70 reset.c:76 sequencer.c:3468
+#: reset.c:70 reset.c:76 sequencer.c:3669
#, c-format
msgid "failed to find tree of %s"
msgstr ""
-#: revision.c:2338
+#: revision.c:2343
msgid "--unpacked=<packfile> no longer supported"
msgstr ""
-#: revision.c:2668
+#: revision.c:2683
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2671
+#: revision.c:2686
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2877
+#: revision.c:2892
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
@@ -6779,140 +6852,148 @@ msgstr ""
msgid "open /dev/null failed"
msgstr ""
-#: run-command.c:1274
+#: run-command.c:1275
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
-#: run-command.c:1338
+#: run-command.c:1345
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: send-pack.c:146
+#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: send-pack.c:148
+#: send-pack.c:152
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: send-pack.c:150
+#: send-pack.c:154
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:374
+#: send-pack.c:378
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:467
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr ""
+
+#: send-pack.c:455
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr ""
+
+#: send-pack.c:520
msgid "the receiving end does not support this repository's hash algorithm"
msgstr ""
-#: send-pack.c:476
+#: send-pack.c:529
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:478
+#: send-pack.c:531
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:490
+#: send-pack.c:543
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:495
+#: send-pack.c:548
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:195
+#: sequencer.c:196
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: sequencer.c:323
+#: sequencer.c:324
#, c-format
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
#, c-format
msgid "could not remove '%s'"
msgstr ""
-#: sequencer.c:353
+#: sequencer.c:354
msgid "revert"
msgstr ""
-#: sequencer.c:355
+#: sequencer.c:356
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:357
+#: sequencer.c:358
msgid "rebase"
msgstr ""
-#: sequencer.c:359
+#: sequencer.c:360
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:418
+#: sequencer.c:419
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:421
+#: sequencer.c:422
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:434 sequencer.c:3070
+#: sequencer.c:435 sequencer.c:3271
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
-#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
+#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: sequencer.c:441
+#: sequencer.c:442
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
-#: sequencer.c:3353
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3554
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:485
+#: sequencer.c:486
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:489
+#: sequencer.c:490
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:521
+#: sequencer.c:522
#, c-format
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:560 builtin/tag.c:598
+#: sequencer.c:561 builtin/tag.c:609
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
@@ -6920,65 +7001,65 @@ msgstr ""
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:670
+#: sequencer.c:671
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:684
+#: sequencer.c:685
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:698
+#: sequencer.c:699
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:778
+#: sequencer.c:779
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:789
+#: sequencer.c:790
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
+#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
+#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: sequencer.c:836
+#: sequencer.c:837
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:841
+#: sequencer.c:842
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:846
+#: sequencer.c:847
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:850
+#: sequencer.c:851
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:855
+#: sequencer.c:856
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:857
+#: sequencer.c:858
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:859
+#: sequencer.c:860
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:924
+#: sequencer.c:925
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6995,11 +7076,11 @@ msgid ""
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:1211
+#: sequencer.c:1212
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1217
+#: sequencer.c:1218
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7014,7 +7095,7 @@ msgid ""
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1230
+#: 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"
@@ -7028,354 +7109,358 @@ msgid ""
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1272
+#: sequencer.c:1273
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1274
+#: sequencer.c:1275
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1320
+#: sequencer.c:1321
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1322
+#: sequencer.c:1323
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1326
+#: sequencer.c:1327
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1347
+#: sequencer.c:1348
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1349
+#: sequencer.c:1350
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1409 sequencer.c:2108
+#: sequencer.c:1410 sequencer.c:2295
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
+#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1453 sequencer.c:1573
+#: sequencer.c:1454 sequencer.c:1574
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1484 sequencer.c:1516
+#: sequencer.c:1485 sequencer.c:1517
#, c-format
msgid "invalid author identity '%s'"
msgstr ""
-#: sequencer.c:1490
+#: sequencer.c:1491
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
-#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
+#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:1605
+#: sequencer.c:1606
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1610
+#: sequencer.c:1611
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1693 sequencer.c:1804
+#: sequencer.c:1694 sequencer.c:1975
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1751 sequencer.c:1776
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr ""
+
+#: sequencer.c:1737
#, c-format
-msgid "This is a combination of %d commits."
+msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1761
-msgid "need a HEAD to fixup"
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
msgstr ""
-#: sequencer.c:1763 sequencer.c:3380
-msgid "could not read HEAD"
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1765
-msgid "could not read HEAD's commit message"
+#: sequencer.c:1740
+#, c-format
+msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1771
+#: sequencer.c:1887 sequencer.c:1944
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
-msgid "This is the 1st commit message:"
+#: sequencer.c:1934
+msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1786
-#, c-format
-msgid "could not read commit message of %s"
+#: sequencer.c:1936 sequencer.c:3581
+msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1793
-#, c-format
-msgid "This is the commit message #%d:"
+#: sequencer.c:1938
+msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1799
+#: sequencer.c:1962
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:1887
+#: sequencer.c:2072
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:1894
+#: sequencer.c:2079
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:1913
+#: sequencer.c:2098
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:1921 sequencer.c:1929
+#: sequencer.c:2106 sequencer.c:2114
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:1935
+#: sequencer.c:2120
#, 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:1954
+#: sequencer.c:2139
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:2019
+#: sequencer.c:2205
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:2079
+#: sequencer.c:2265
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:2080
+#: sequencer.c:2266
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:2100
+#: sequencer.c:2287
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2158
+#: sequencer.c:2345
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2165
+#: sequencer.c:2352
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2242
+#: sequencer.c:2425
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2251
+#: sequencer.c:2434
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2282
+#: sequencer.c:2477
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2343
+#: sequencer.c:2538
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2354
+#: sequencer.c:2549
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2440
+#: sequencer.c:2635
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2449
+#: sequencer.c:2644
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2493
+#: sequencer.c:2690
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2495
+#: sequencer.c:2692
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2500
+#: sequencer.c:2697
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2511
+#: sequencer.c:2708
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2513
+#: sequencer.c:2710
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2591
+#: sequencer.c:2788
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2698
+#: sequencer.c:2897
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2718
+#: sequencer.c:2917
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:2811 sequencer.c:4644
+#: sequencer.c:3012 sequencer.c:4869
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:2828
+#: sequencer.c:3029
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:2830
+#: sequencer.c:3031
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2833
+#: sequencer.c:3034
msgid "cherry-pick is already in progress"
msgstr ""
-#: sequencer.c:2835
+#: sequencer.c:3036
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2849
+#: sequencer.c:3050
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:2864
+#: sequencer.c:3065
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:2924 sequencer.c:4379
+#: sequencer.c:3125 sequencer.c:4582
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:2926 sequencer.c:2937
+#: sequencer.c:3127 sequencer.c:3138
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:2928 sequencer.c:2972
+#: sequencer.c:3129 sequencer.c:3173
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:2958 builtin/grep.c:757
+#: sequencer.c:3159 builtin/grep.c:759
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:2960
+#: sequencer.c:3161
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:2961
+#: sequencer.c:3162
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:2967
+#: sequencer.c:3168
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:2978
+#: sequencer.c:3179
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:3019
+#: sequencer.c:3220
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:3028
+#: sequencer.c:3229
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:3038
+#: sequencer.c:3239
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:3045
+#: sequencer.c:3246
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:3048
+#: sequencer.c:3249
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3210 sequencer.c:4271
+#: sequencer.c:3411 sequencer.c:4473
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3227
+#: sequencer.c:3428
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3235
+#: sequencer.c:3436
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7387,27 +7472,27 @@ msgid ""
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3245
+#: sequencer.c:3446
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3252
+#: sequencer.c:3453
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3282
+#: sequencer.c:3483
#, c-format
msgid "Executing: %s\n"
msgstr ""
-#: sequencer.c:3297
+#: sequencer.c:3498
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7417,11 +7502,11 @@ msgid ""
"\n"
msgstr ""
-#: sequencer.c:3303
+#: sequencer.c:3504
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3309
+#: sequencer.c:3510
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7432,90 +7517,90 @@ msgid ""
"\n"
msgstr ""
-#: sequencer.c:3370
+#: sequencer.c:3571
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3424
+#: sequencer.c:3625
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3429
+#: sequencer.c:3630
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3513
+#: sequencer.c:3714
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3546
+#: sequencer.c:3747
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3568
+#: sequencer.c:3769
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3577
+#: sequencer.c:3778
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3589
+#: sequencer.c:3790
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3605
+#: sequencer.c:3806
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:3788
+#: sequencer.c:3989
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:3804
+#: sequencer.c:4005
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:3878
+#: sequencer.c:4079
msgid "Cannot autostash"
msgstr ""
-#: sequencer.c:3881
+#: sequencer.c:4082
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: sequencer.c:3887
+#: sequencer.c:4088
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: sequencer.c:3890
+#: sequencer.c:4091
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: sequencer.c:3894
+#: sequencer.c:4095
msgid "could not reset --hard"
msgstr ""
-#: sequencer.c:3919
+#: sequencer.c:4120
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:3931
+#: sequencer.c:4132
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:3934
+#: sequencer.c:4135
#, c-format
msgid ""
"%s\n"
@@ -7523,29 +7608,29 @@ msgid ""
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:3939
+#: sequencer.c:4140
msgid "Applying autostash resulted in conflicts."
msgstr ""
-#: sequencer.c:3940
+#: sequencer.c:4141
msgid "Autostash exists; creating a new stash entry."
msgstr ""
-#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:4048
+#: sequencer.c:4249
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:4050
+#: sequencer.c:4251
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:4058
+#: sequencer.c:4259
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7558,108 +7643,108 @@ msgid ""
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4104
+#: sequencer.c:4305
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4149
+#: sequencer.c:4351
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:4220
+#: sequencer.c:4422
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:4279
+#: sequencer.c:4481
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4284
+#: sequencer.c:4486
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4298
+#: sequencer.c:4500
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4358
+#: sequencer.c:4560
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr ""
-#: sequencer.c:4391
+#: sequencer.c:4612
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4400
+#: sequencer.c:4621
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4402
+#: sequencer.c:4623
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4404
+#: sequencer.c:4625
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4407
+#: sequencer.c:4628
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:4443 sequencer.c:4482
+#: sequencer.c:4664 sequencer.c:4703
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4498
+#: sequencer.c:4719
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4505
+#: sequencer.c:4726
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4621
+#: sequencer.c:4846
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4625
+#: sequencer.c:4850
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4660
+#: sequencer.c:4885
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:5137
+#: sequencer.c:5362
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5140
+#: sequencer.c:5365
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5382 sequencer.c:5399
+#: sequencer.c:5615 sequencer.c:5632
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5418
+#: sequencer.c:5651
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5512
+#: sequencer.c:5751
msgid "the script was already rearranged."
msgstr ""
@@ -7792,63 +7877,76 @@ msgid ""
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: setup.c:1362
+#: setup.c:1370
#, 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:1409
+#: setup.c:1417
msgid "open /dev/null or dup failed"
msgstr ""
-#: setup.c:1424
+#: setup.c:1432
msgid "fork failed"
msgstr ""
-#: setup.c:1429
+#: setup.c:1437 t/helper/test-simple-ipc.c:285
msgid "setsid failed"
msgstr ""
+#: sparse-index.c:151
+msgid "attempting to use sparse-index without cone mode"
+msgstr ""
+
+#: sparse-index.c:156
+msgid "unable to update cache-tree, staying full"
+msgstr ""
+
+#: sparse-index.c:239
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr ""
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:848
+#: strbuf.c:850
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:850
+#: strbuf.c:852
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:858
+#: strbuf.c:860
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:860
+#: strbuf.c:862
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:867
+#: strbuf.c:869
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:869
+#: strbuf.c:871
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:875
+#: strbuf.c:877
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7856,20 +7954,20 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:877
+#: strbuf.c:879
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
#: builtin/rebase.c:866
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: strbuf.c:1175
+#: strbuf.c:1177
#, c-format
msgid "could not edit '%s'"
msgstr ""
@@ -7916,147 +8014,147 @@ msgstr ""
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:327
+#: submodule.c:328
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr ""
-#: submodule.c:358
+#: submodule.c:359
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: submodule.c:435
+#: submodule.c:436
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr ""
-#: submodule.c:817
+#: submodule.c:818
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-#: submodule.c:920
+#: submodule.c:921
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: submodule.c:1005
+#: submodule.c:1006
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
-#: submodule.c:1128
+#: submodule.c:1129
#, c-format
msgid "process for submodule '%s' failed"
msgstr ""
-#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
+#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: submodule.c:1168
+#: submodule.c:1169
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr ""
-#: submodule.c:1171
+#: submodule.c:1172
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr ""
-#: submodule.c:1463
+#: submodule.c:1464
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr ""
-#: submodule.c:1497
+#: submodule.c:1498
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr ""
-#: submodule.c:1652
+#: submodule.c:1653
#, c-format
msgid ""
"Errors during submodule fetch:\n"
"%s"
msgstr ""
-#: submodule.c:1677
+#: submodule.c:1678
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1694
+#: submodule.c:1695
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr ""
-#: submodule.c:1735
+#: submodule.c:1736
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr ""
-#: submodule.c:1810
+#: submodule.c:1811
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1823
+#: submodule.c:1824
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1838
+#: submodule.c:1839
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: submodule.c:1865 submodule.c:2175
+#: submodule.c:1866 submodule.c:2176
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:1886
+#: submodule.c:1887
msgid "could not reset submodule index"
msgstr ""
-#: submodule.c:1928
+#: submodule.c:1929
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1980
+#: submodule.c:1981
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr ""
-#: submodule.c:2048
+#: submodule.c:2049
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
-#: submodule.c:2069
+#: submodule.c:2070
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:2081 submodule.c:2140
+#: submodule.c:2082 submodule.c:2141
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:2085
+#: submodule.c:2086
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr ""
-#: submodule.c:2092
+#: submodule.c:2093
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8064,65 +8162,71 @@ msgid ""
"'%s'\n"
msgstr ""
-#: submodule.c:2220
+#: submodule.c:2221
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:2260
+#: submodule.c:2261
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: trailer.c:236
+#: symlinks.c:244
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr ""
+
+#: trailer.c:244
#, c-format
msgid "running trailer command '%s' failed"
msgstr ""
-#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
-#: trailer.c:555
+#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
+#: trailer.c:570
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
+#: builtin/remote.c:324
#, c-format
msgid "more than one %s"
msgstr ""
-#: trailer.c:728
+#: trailer.c:743
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: trailer.c:748
+#: trailer.c:763
#, c-format
msgid "could not read input file '%s'"
msgstr ""
-#: trailer.c:751 builtin/mktag.c:91
+#: trailer.c:766 builtin/mktag.c:88
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1009 wrapper.c:676
+#: trailer.c:1024 wrapper.c:676
#, c-format
msgid "could not stat %s"
msgstr ""
-#: trailer.c:1011
+#: trailer.c:1026
#, c-format
msgid "file %s is not a regular file"
msgstr ""
-#: trailer.c:1013
+#: trailer.c:1028
#, c-format
msgid "file %s is not writable by user"
msgstr ""
-#: trailer.c:1025
+#: trailer.c:1040
msgid "could not open temporary file"
msgstr ""
-#: trailer.c:1065
+#: trailer.c:1080
#, c-format
msgid "could not rename temporary file to %s"
msgstr ""
@@ -8169,7 +8273,7 @@ msgstr ""
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:549 transport-helper.c:1237
+#: transport-helper.c:549 transport-helper.c:1247
#, c-format
msgid "could not read ref %s"
msgstr ""
@@ -8187,7 +8291,7 @@ msgstr ""
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:661 transport.c:1447
+#: transport-helper.c:661 transport.c:1471
msgid "operation not supported by protocol"
msgstr ""
@@ -8196,120 +8300,124 @@ msgstr ""
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:745
+#: transport-helper.c:693 transport.c:397
+msgid "--negotiate-only requires protocol v2"
+msgstr ""
+
+#: transport-helper.c:755
msgid "'option' without a matching 'ok/error' directive"
msgstr ""
-#: transport-helper.c:788
+#: transport-helper.c:798
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:845
+#: transport-helper.c:855
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
-#: transport-helper.c:928
+#: transport-helper.c:938
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
-#: transport-helper.c:931
+#: transport-helper.c:941
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
-#: transport-helper.c:934
+#: transport-helper.c:944
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: transport-helper.c:939
+#: transport-helper.c:949
#, c-format
msgid "helper %s does not support --atomic"
msgstr ""
-#: transport-helper.c:943
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --%s"
msgstr ""
-#: transport-helper.c:950
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:1050
+#: transport-helper.c:1060
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:1055
+#: transport-helper.c:1065
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:1102
+#: transport-helper.c:1112
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:1107
+#: transport-helper.c:1117
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1132
+#: transport-helper.c:1142
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch.\n"
msgstr ""
-#: transport-helper.c:1214
+#: transport-helper.c:1224
#, c-format
msgid "unsupported object format '%s'"
msgstr ""
-#: transport-helper.c:1223
+#: transport-helper.c:1233
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1375
+#: transport-helper.c:1385
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1402
+#: transport-helper.c:1412
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1451
+#: transport-helper.c:1461
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1455
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1474 transport-helper.c:1478
+#: transport-helper.c:1484 transport-helper.c:1488
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1515
+#: transport-helper.c:1525
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1519
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1537 transport-helper.c:1546
+#: transport-helper.c:1547 transport-helper.c:1556
msgid "can't start thread for copying data"
msgstr ""
@@ -8328,44 +8436,48 @@ msgstr ""
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:269
+#: transport.c:272
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:270
+#: transport.c:273
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:727
+#: transport.c:400
+msgid "server does not support wait-for-done"
+msgstr ""
+
+#: transport.c:751
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:802
+#: transport.c:826
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:936
+#: transport.c:960
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:1002
+#: transport.c:1026
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:1055
+#: transport.c:1079
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1157
+#: transport.c:1181
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1161
+#: transport.c:1185
#, c-format
msgid ""
"\n"
@@ -8381,11 +8493,11 @@ msgid ""
"\n"
msgstr ""
-#: transport.c:1169
+#: transport.c:1193
msgid "Aborting."
msgstr ""
-#: transport.c:1316
+#: transport.c:1340
msgid "failed to push all needed submodules"
msgstr ""
@@ -8405,98 +8517,98 @@ msgstr ""
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:113
+#: unpack-trees.c:115
#, 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:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:118
+#: unpack-trees.c:120
#, 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:120
+#: unpack-trees.c:122
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:123
+#: unpack-trees.c:125
#, 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:125
+#: unpack-trees.c:127
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:130
+#: unpack-trees.c:132
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:134
+#: unpack-trees.c:136
#, 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:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:139
+#: unpack-trees.c:141
#, 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:141
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:144
+#: unpack-trees.c:146
#, 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:146
+#: unpack-trees.c:148
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:152
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8504,7 +8616,7 @@ msgid ""
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:154
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8512,47 +8624,47 @@ msgid ""
"%%s"
msgstr ""
-#: unpack-trees.c:157
+#: unpack-trees.c:159
#, 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:159
+#: unpack-trees.c:161
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, 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:164
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:172
+#: unpack-trees.c:174
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:175
+#: unpack-trees.c:177
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:178
+#: unpack-trees.c:180
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -8560,14 +8672,14 @@ msgid ""
"%s"
msgstr ""
-#: unpack-trees.c:180
+#: unpack-trees.c:182
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-#: unpack-trees.c:182
+#: unpack-trees.c:184
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -8575,34 +8687,39 @@ msgid ""
"%s"
msgstr ""
-#: unpack-trees.c:262
+#: unpack-trees.c:264
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:289
+#: unpack-trees.c:291
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
-#: unpack-trees.c:350
+#: unpack-trees.c:352
msgid "Updating files"
msgstr ""
-#: unpack-trees.c:382
+#: unpack-trees.c:384
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:1498
+#: unpack-trees.c:1519
msgid "Updating index flags"
msgstr ""
-#: upload-pack.c:1543
+#: unpack-trees.c:2608
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+
+#: upload-pack.c:1548
msgid "expected flush after fetch arguments"
msgstr ""
@@ -8639,7 +8756,7 @@ msgstr ""
msgid "Fetching objects"
msgstr ""
-#: worktree.c:238 builtin/am.c:2103
+#: worktree.c:238 builtin/am.c:2151
#, c-format
msgid "failed to read '%s'"
msgstr ""
@@ -8778,11 +8895,11 @@ msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:211 wt-status.c:1072
+#: wt-status.c:211 wt-status.c:1075
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:234 wt-status.c:1081
+#: wt-status.c:234 wt-status.c:1084
msgid "Changes not staged for commit:"
msgstr ""
@@ -8880,28 +8997,28 @@ msgstr ""
msgid "untracked content, "
msgstr ""
-#: wt-status.c:905
+#: wt-status.c:908
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:936
+#: wt-status.c:939
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:938
+#: wt-status.c:941
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:1020
+#: wt-status.c:1023
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1112
+#: wt-status.c:1115
#, c-format
msgid ""
"\n"
@@ -8909,255 +9026,255 @@ msgid ""
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
-#: wt-status.c:1142
+#: wt-status.c:1145
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1145
+#: wt-status.c:1148
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1147
+#: wt-status.c:1150
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1151
+#: wt-status.c:1154
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1154
+#: wt-status.c:1157
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1163
+#: wt-status.c:1166
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1166
+#: wt-status.c:1169
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1170
+#: wt-status.c:1173
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1172
+#: wt-status.c:1175
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1174
+#: wt-status.c:1177
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1307
+#: wt-status.c:1310
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1309
+#: wt-status.c:1312
msgid "No commands done."
msgstr ""
-#: wt-status.c:1312
+#: wt-status.c:1315
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1323
+#: wt-status.c:1326
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1328
+#: wt-status.c:1331
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1331
+#: wt-status.c:1334
#, 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:1339
+#: wt-status.c:1342
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1351
+#: wt-status.c:1354
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1356
+#: wt-status.c:1359
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1369
+#: wt-status.c:1372
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1371
+#: wt-status.c:1374
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1373
+#: wt-status.c:1376
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1380
+#: wt-status.c:1383
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1384
+#: wt-status.c:1387
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1389
+#: wt-status.c:1392
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1392
+#: wt-status.c:1395
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1396
+#: wt-status.c:1399
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1401
+#: wt-status.c:1404
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1404
+#: wt-status.c:1407
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1406
+#: wt-status.c:1409
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1417
+#: wt-status.c:1420
msgid "Cherry-pick currently in progress."
msgstr ""
-#: wt-status.c:1420
+#: wt-status.c:1423
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1427
+#: wt-status.c:1430
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1430
+#: wt-status.c:1433
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: wt-status.c:1433
+#: wt-status.c:1436
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1435
+#: wt-status.c:1438
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1437
+#: wt-status.c:1440
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1447
+#: wt-status.c:1450
msgid "Revert currently in progress."
msgstr ""
-#: wt-status.c:1450
+#: wt-status.c:1453
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1456
+#: wt-status.c:1459
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1459
+#: wt-status.c:1462
msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: wt-status.c:1462
+#: wt-status.c:1465
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1464
+#: wt-status.c:1467
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1466
+#: wt-status.c:1469
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1476
+#: wt-status.c:1479
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1480
+#: wt-status.c:1483
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1483
+#: wt-status.c:1486
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1494
+#: wt-status.c:1497
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
-#: wt-status.c:1733
+#: wt-status.c:1736
msgid "On branch "
msgstr ""
-#: wt-status.c:1740
+#: wt-status.c:1743
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1742
+#: wt-status.c:1745
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1747
+#: wt-status.c:1750
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1749
+#: wt-status.c:1752
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1752
+#: wt-status.c:1755
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1769
+#: wt-status.c:1772
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1770
+#: wt-status.c:1773
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1784
+#: wt-status.c:1787
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1786
+#: wt-status.c:1789
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1790
+#: wt-status.c:1793
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9165,97 +9282,115 @@ msgid ""
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1796
+#: wt-status.c:1799
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1798
+#: wt-status.c:1801
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1804
+#: wt-status.c:1807
msgid "No changes"
msgstr ""
-#: wt-status.c:1809
+#: wt-status.c:1812
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1813
+#: wt-status.c:1816
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1817
+#: wt-status.c:1820
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1821
+#: wt-status.c:1824
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1825
+#: wt-status.c:1828
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1829 wt-status.c:1835
+#: wt-status.c:1832 wt-status.c:1838
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1832
+#: wt-status.c:1835
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1837
+#: wt-status.c:1840
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1942
+#: wt-status.c:1945
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1946
+#: wt-status.c:1949
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1977
+#: wt-status.c:1980
msgid "different"
msgstr ""
-#: wt-status.c:1979 wt-status.c:1987
+#: wt-status.c:1982 wt-status.c:1990
msgid "behind "
msgstr ""
-#: wt-status.c:1982 wt-status.c:1985
+#: wt-status.c:1985 wt-status.c:1988
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2507
+#: wt-status.c:2511
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2513
+#: wt-status.c:2517
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2515
+#: wt-status.c:2519
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#: compat/simple-ipc/ipc-unix-socket.c:178
+msgid "could not send IPC command"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c:185
+msgid "could not read IPC response"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c:862
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c:874
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr ""
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -9264,131 +9399,131 @@ msgstr ""
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/add.c:58
+#: builtin/add.c:61
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr ""
-#: builtin/add.c:96
+#: builtin/add.c:99
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:101 builtin/commit.c:285
+#: builtin/add.c:104 builtin/commit.c:297
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:111
+#: builtin/add.c:114
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:186
+#: builtin/add.c:198
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:280 builtin/rev-parse.c:991
+#: builtin/add.c:307 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:291
+#: builtin/add.c:318
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:295
+#: builtin/add.c:322
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:298
+#: builtin/add.c:325
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:301
+#: builtin/add.c:328
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:303
+#: builtin/add.c:330
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:308
+#: builtin/add.c:335
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:316
+#: builtin/add.c:343
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
+#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
msgid "dry run"
msgstr ""
-#: builtin/add.c:339
+#: builtin/add.c:366
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
+#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:341
+#: builtin/add.c:368
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:342
+#: builtin/add.c:369
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:343
+#: builtin/add.c:370
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:344
+#: builtin/add.c:371
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:345
+#: builtin/add.c:372
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:346
+#: builtin/add.c:373
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:349
+#: builtin/add.c:376
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:351
+#: builtin/add.c:378
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:352
+#: builtin/add.c:379
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:353
+#: builtin/add.c:380
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:355 builtin/update-index.c:1004
+#: builtin/add.c:382 builtin/update-index.c:1006
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:357
+#: builtin/add.c:384
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:359
+#: builtin/add.c:386
msgid "backend for `git stash -p`"
msgstr ""
-#: builtin/add.c:377
+#: builtin/add.c:404
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9406,187 +9541,191 @@ msgid ""
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:405
+#: builtin/add.c:432
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:424
+#: builtin/add.c:451
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:433
+#: builtin/add.c:460
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:461 builtin/commit.c:345
+#: builtin/add.c:488
+msgid "--dry-run is incompatible with --interactive/--patch"
+msgstr ""
+
+#: builtin/add.c:490 builtin/commit.c:357
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
-#: builtin/add.c:478
+#: builtin/add.c:507
msgid "--pathspec-from-file is incompatible with --edit"
msgstr ""
-#: builtin/add.c:490
+#: builtin/add.c:519
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:493
+#: builtin/add.c:522
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:497
+#: builtin/add.c:526
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
-#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
+#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
+#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
-#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
-#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
+#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
+#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
-#: builtin/add.c:526
+#: builtin/add.c:555
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:528
+#: builtin/add.c:557
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:352
+#: builtin/am.c:364
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:436
+#: builtin/am.c:454
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:478
+#: builtin/am.c:496
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:516
+#: builtin/am.c:534
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:542
+#: builtin/am.c:560
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:730
+#: builtin/am.c:748
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:795
+#: builtin/am.c:813
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:843
+#: builtin/am.c:861
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:848 builtin/am.c:860
+#: builtin/am.c:866 builtin/am.c:878
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:855
+#: builtin/am.c:873
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:948
+#: builtin/am.c:966
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:953 builtin/clone.c:410
+#: builtin/am.c:971 builtin/clone.c:414
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:958
+#: builtin/am.c:976
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1089
+#: builtin/am.c:1125
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1090
+#: builtin/am.c:1126
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1091
+#: builtin/am.c:1127
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1174
+#: builtin/am.c:1222
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1202
+#: builtin/am.c:1250
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:1267
+#: builtin/am.c:1315
#, c-format
msgid "missing author line in commit %s"
msgstr ""
-#: builtin/am.c:1270
+#: builtin/am.c:1318
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1489
+#: builtin/am.c:1537
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1491
+#: builtin/am.c:1539
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1510
+#: builtin/am.c:1558
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1516
+#: builtin/am.c:1564
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1542
+#: builtin/am.c:1590
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1574
+#: builtin/am.c:1622
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1626 builtin/am.c:1630
+#: builtin/am.c:1674 builtin/am.c:1678
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1648
+#: builtin/am.c:1696
msgid "Commit Body is:"
msgstr ""
@@ -9594,46 +9733,46 @@ msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1658
+#: builtin/am.c:1706
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1704 builtin/commit.c:395
+#: builtin/am.c:1752 builtin/commit.c:408
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1708
+#: builtin/am.c:1756
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1748 builtin/am.c:1816
+#: builtin/am.c:1796 builtin/am.c:1864
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1765
+#: builtin/am.c:1813
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1771
+#: builtin/am.c:1819
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1775
+#: builtin/am.c:1823
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1819
+#: builtin/am.c:1867
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:1826
+#: builtin/am.c:1874
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9641,197 +9780,201 @@ msgid ""
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:1985
+#: builtin/am.c:2033
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2029
+#: builtin/am.c:2077
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2136
+#: builtin/am.c:2184
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2178
+#: builtin/am.c:2226
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr ""
-#: builtin/am.c:2182
+#: builtin/am.c:2230
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr ""
-#: builtin/am.c:2213
+#: builtin/am.c:2261
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2214
+#: builtin/am.c:2262
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2220
+#: builtin/am.c:2268
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2222
+#: builtin/am.c:2270
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2224
+#: builtin/am.c:2272
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
-#: builtin/repack.c:334 builtin/stash.c:882
+#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
+#: builtin/repack.c:472 builtin/stash.c:948
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2227
+#: builtin/am.c:2275
msgid "add a Signed-off-by trailer to the commit message"
msgstr ""
-#: builtin/am.c:2230
+#: builtin/am.c:2278
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2232
+#: builtin/am.c:2280
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2234
+#: builtin/am.c:2282
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2236
+#: builtin/am.c:2284
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2238
+#: builtin/am.c:2286
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2241
+#: builtin/am.c:2289
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2244
+#: builtin/am.c:2292
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2294
+msgid "pass it through git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2297 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:2324
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
-#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
-#: parse-options.h:316
+#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
+#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: parse-options.h:317
msgid "n"
msgstr ""
-#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
-#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
#: builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2270
+#: builtin/am.c:2321
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2276
+#: builtin/am.c:2327
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2329
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2281
+#: builtin/am.c:2332
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2284
+#: builtin/am.c:2335
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2287
+#: builtin/am.c:2338
msgid "restore the original branch and abort the patching operation"
msgstr ""
-#: builtin/am.c:2290
+#: builtin/am.c:2341
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-#: builtin/am.c:2294
+#: builtin/am.c:2345
msgid "show the patch being applied"
msgstr ""
-#: builtin/am.c:2299
+#: builtin/am.c:2350
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2301
+#: builtin/am.c:2352
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
-#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
+#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
+#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
msgid "key-id"
msgstr ""
-#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
+#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2307
+#: builtin/am.c:2358
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2325
+#: builtin/am.c:2376
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:2332
+#: builtin/am.c:2383
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2347
+#: builtin/am.c:2398
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2371
+#: builtin/am.c:2422
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2377
+#: builtin/am.c:2428
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/am.c:2387
+#: builtin/am.c:2438
msgid "interactive mode requires patches on the command line"
msgstr ""
@@ -10021,7 +10164,7 @@ msgid ""
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
msgid "revision walk setup failed\n"
msgstr ""
@@ -10087,86 +10230,91 @@ msgstr ""
msgid "'git bisect %s' can take only one argument."
msgstr ""
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
#, c-format
msgid "Bad rev input: %s"
msgstr ""
-#: builtin/bisect--helper.c:912
+#: builtin/bisect--helper.c:887
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:919
msgid "We are not bisecting."
msgstr ""
-#: builtin/bisect--helper.c:962
+#: builtin/bisect--helper.c:969
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr ""
-#: builtin/bisect--helper.c:974
+#: builtin/bisect--helper.c:981
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr ""
-#: builtin/bisect--helper.c:1047
+#: builtin/bisect--helper.c:1054
msgid "reset the bisection state"
msgstr ""
-#: builtin/bisect--helper.c:1049
+#: builtin/bisect--helper.c:1056
msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/bisect--helper.c:1051
+#: builtin/bisect--helper.c:1058
msgid "print out the bisect terms"
msgstr ""
-#: builtin/bisect--helper.c:1053
+#: builtin/bisect--helper.c:1060
msgid "start the bisect session"
msgstr ""
-#: builtin/bisect--helper.c:1055
+#: builtin/bisect--helper.c:1062
msgid "find the next bisection commit"
msgstr ""
-#: builtin/bisect--helper.c:1057
+#: builtin/bisect--helper.c:1064
msgid "mark the state of ref (or refs)"
msgstr ""
-#: builtin/bisect--helper.c:1059
+#: builtin/bisect--helper.c:1066
msgid "list the bisection steps so far"
msgstr ""
-#: builtin/bisect--helper.c:1061
+#: builtin/bisect--helper.c:1068
msgid "replay the bisection process from the given file"
msgstr ""
-#: builtin/bisect--helper.c:1063
+#: builtin/bisect--helper.c:1070
msgid "skip some commits for checkout"
msgstr ""
-#: builtin/bisect--helper.c:1065
+#: builtin/bisect--helper.c:1072
msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/bisect--helper.c:1080
+#: builtin/bisect--helper.c:1087
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/bisect--helper.c:1085
+#: builtin/bisect--helper.c:1092
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:1091
+#: builtin/bisect--helper.c:1098
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1107
msgid "--bisect-next requires 0 arguments"
msgstr ""
-#: builtin/bisect--helper.c:1111
+#: builtin/bisect--helper.c:1118
msgid "--bisect-log requires 0 arguments"
msgstr ""
-#: builtin/bisect--helper.c:1116
+#: builtin/bisect--helper.c:1123
msgid "no logfile given"
msgstr ""
@@ -10217,9 +10365,9 @@ msgstr ""
msgid "show work cost statistics"
msgstr ""
-#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
-#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
+#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
#: builtin/push.c:575 builtin/send-pack.c:198
msgid "force progress reporting"
msgstr ""
@@ -10268,7 +10416,7 @@ msgstr ""
msgid "ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:883 builtin/log.c:1812
+#: builtin/blame.c:883 builtin/log.c:1820
msgid "rev"
msgstr ""
@@ -10438,74 +10586,74 @@ msgstr ""
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:438 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:469
+#: builtin/branch.c:471
msgid "could not resolve HEAD"
msgstr ""
-#: builtin/branch.c:475
+#: builtin/branch.c:477
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/branch.c:490
+#: builtin/branch.c:492
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:494
+#: builtin/branch.c:496
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:511
+#: builtin/branch.c:513
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:513
+#: builtin/branch.c:515
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:524
+#: builtin/branch.c:526
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:553
+#: builtin/branch.c:555
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:555
+#: builtin/branch.c:557
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:559
+#: builtin/branch.c:561
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:562
+#: builtin/branch.c:564
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:568
+#: builtin/branch.c:570
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:577
+#: builtin/branch.c:579
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:579
+#: builtin/branch.c:581
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:595
+#: builtin/branch.c:597
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10513,215 +10661,215 @@ msgid ""
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:629
+#: builtin/branch.c:631
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:631
+#: builtin/branch.c:633
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:632
+#: builtin/branch.c:634
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:633
+#: builtin/branch.c:635
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:635
+#: builtin/branch.c:637
msgid "do not use"
msgstr ""
-#: builtin/branch.c:637 builtin/rebase.c:534
+#: builtin/branch.c:639 builtin/rebase.c:533
msgid "upstream"
msgstr ""
-#: builtin/branch.c:637
+#: builtin/branch.c:639
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:638
+#: builtin/branch.c:640
msgid "unset the upstream info"
msgstr ""
-#: builtin/branch.c:639
+#: builtin/branch.c:641
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:642
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:642 builtin/branch.c:644
+#: builtin/branch.c:644 builtin/branch.c:646
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:643 builtin/branch.c:645
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:648
+#: builtin/branch.c:650
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:649
+#: builtin/branch.c:651
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:651
+#: builtin/branch.c:653
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:652
+#: builtin/branch.c:654
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:653
+#: builtin/branch.c:655
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:654
+#: builtin/branch.c:656
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:655
+#: builtin/branch.c:657
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:656
+#: builtin/branch.c:658
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:657
+#: builtin/branch.c:659
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:658
+#: builtin/branch.c:660
msgid "show current branch name"
msgstr ""
-#: builtin/branch.c:659
+#: builtin/branch.c:661
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:661
+#: builtin/branch.c:663
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:662
+#: builtin/branch.c:664
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:663
+#: builtin/branch.c:665
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:664
+#: builtin/branch.c:666
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:665
+#: builtin/branch.c:667
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:466
+#: builtin/tag.c:477
msgid "object"
msgstr ""
-#: builtin/branch.c:668
+#: builtin/branch.c:670
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471
+#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:693 builtin/clone.c:790
+#: builtin/branch.c:695 builtin/clone.c:794
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:717
+#: builtin/branch.c:719
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:764
+#: builtin/branch.c:766
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:769
+#: builtin/branch.c:771
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:776
+#: builtin/branch.c:778
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:779
+#: builtin/branch.c:781
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:794
+#: builtin/branch.c:796
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:803
+#: builtin/branch.c:805
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:808
+#: builtin/branch.c:810
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:812
+#: builtin/branch.c:814
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:815 builtin/branch.c:838
+#: builtin/branch.c:817 builtin/branch.c:840
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:819
+#: builtin/branch.c:821
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:832
+#: builtin/branch.c:834
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:836
+#: builtin/branch.c:838
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:842
+#: builtin/branch.c:844
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:852
+#: builtin/branch.c:854
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:856
+#: builtin/branch.c:858
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10771,38 +10919,38 @@ msgid ""
"You can delete any lines you don't wish to share.\n"
msgstr ""
-#: builtin/bugreport.c:135
+#: builtin/bugreport.c:136
msgid "specify a destination for the bugreport file"
msgstr ""
-#: builtin/bugreport.c:137
+#: builtin/bugreport.c:138
msgid "specify a strftime format suffix for the filename"
msgstr ""
-#: builtin/bugreport.c:159
+#: builtin/bugreport.c:160
#, c-format
msgid "could not create leading directories for '%s'"
msgstr ""
-#: builtin/bugreport.c:166
+#: builtin/bugreport.c:167
msgid "System Info"
msgstr ""
-#: builtin/bugreport.c:169
+#: builtin/bugreport.c:170
msgid "Enabled Hooks"
msgstr ""
-#: builtin/bugreport.c:176
+#: builtin/bugreport.c:177
#, c-format
msgid "couldn't create a new file at '%s'"
msgstr ""
-#: builtin/bugreport.c:179
+#: builtin/bugreport.c:180
#, c-format
msgid "unable to write to %s"
msgstr ""
-#: builtin/bugreport.c:189
+#: builtin/bugreport.c:190
#, c-format
msgid "Created new report at '%s'.\n"
msgstr ""
@@ -10823,19 +10971,19 @@ msgstr ""
msgid "git bundle unbundle <file> [<refname>...]"
msgstr ""
-#: builtin/bundle.c:67 builtin/pack-objects.c:3495
+#: builtin/bundle.c:67 builtin/pack-objects.c:3747
msgid "do not show progress meter"
msgstr ""
-#: builtin/bundle.c:69 builtin/pack-objects.c:3497
+#: builtin/bundle.c:69 builtin/pack-objects.c:3749
msgid "show progress meter"
msgstr ""
-#: builtin/bundle.c:71 builtin/pack-objects.c:3499
+#: builtin/bundle.c:71 builtin/pack-objects.c:3751
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/bundle.c:74 builtin/pack-objects.c:3502
+#: builtin/bundle.c:74 builtin/pack-objects.c:3754
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
@@ -10973,8 +11121,8 @@ msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
-#: builtin/worktree.c:489
+#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
+#: builtin/worktree.c:491
msgid "suppress progress reporting"
msgstr ""
@@ -10986,27 +11134,27 @@ msgstr ""
msgid "ignore index when checking"
msgstr ""
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:165
msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/check-ignore.c:166
+#: builtin/check-ignore.c:168
msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:170
msgid "no path specified"
msgstr ""
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:174
msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:176
msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/check-ignore.c:177
+#: builtin/check-ignore.c:179
msgid "--non-matching is only valid with --verbose"
msgstr ""
@@ -11027,6 +11175,21 @@ msgstr ""
msgid "no contacts specified"
msgstr ""
+#: builtin/checkout--worker.c:110
+msgid "git checkout--worker [<options>]"
+msgstr ""
+
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
+#: builtin/column.c:31 builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+msgid "string"
+msgstr ""
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr ""
+
#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
@@ -11035,207 +11198,196 @@ msgstr ""
msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/checkout-index.c:186
+#: builtin/checkout-index.c:187
msgid "check out all files in the index"
msgstr ""
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:188
msgid "force overwrite of existing files"
msgstr ""
-#: builtin/checkout-index.c:189
+#: builtin/checkout-index.c:190
msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/checkout-index.c:191
+#: builtin/checkout-index.c:192
msgid "don't checkout new files"
msgstr ""
-#: builtin/checkout-index.c:193
+#: builtin/checkout-index.c:194
msgid "update stat information in the index file"
msgstr ""
-#: builtin/checkout-index.c:197
+#: builtin/checkout-index.c:198
msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/checkout-index.c:199
+#: builtin/checkout-index.c:200
msgid "write the content to temporary files"
msgstr ""
-#: builtin/checkout-index.c:200 builtin/column.c:31
-#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
-#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
-#: builtin/worktree.c:717
-msgid "string"
-msgstr ""
-
-#: builtin/checkout-index.c:201
-msgid "when creating files, prepend <string>"
-msgstr ""
-
-#: builtin/checkout-index.c:203
+#: builtin/checkout-index.c:204
msgid "copy out the files from named stage"
msgstr ""
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
msgid "git switch [<options>] [<branch>]"
msgstr ""
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr ""
-#: builtin/checkout.c:188 builtin/checkout.c:227
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:192 builtin/checkout.c:231
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:206
+#: builtin/checkout.c:208
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:291
+#: builtin/checkout.c:294
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:396
+#: builtin/checkout.c:414
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:401
+#: builtin/checkout.c:419
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:408
+#: builtin/checkout.c:426
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
-#: builtin/checkout.c:441
+#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
+#: builtin/checkout.c:459
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:444 builtin/checkout.c:447
+#: builtin/checkout.c:462 builtin/checkout.c:465
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:451
+#: builtin/checkout.c:469
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:455
+#: builtin/checkout.c:473
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:459
+#: builtin/checkout.c:477
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr ""
-#: builtin/checkout.c:464 builtin/checkout.c:469
+#: builtin/checkout.c:482 builtin/checkout.c:487
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:543 builtin/checkout.c:550
+#: builtin/checkout.c:563 builtin/checkout.c:570
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:718
+#: builtin/checkout.c:739
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:772
+#: builtin/checkout.c:793
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:865
+#: builtin/checkout.c:886
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:907
+#: builtin/checkout.c:928
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:915
+#: builtin/checkout.c:936
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:918
+#: builtin/checkout.c:939
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:922
+#: builtin/checkout.c:943
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:924 builtin/checkout.c:1355
+#: builtin/checkout.c:945 builtin/checkout.c:1376
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:926
+#: builtin/checkout.c:947
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:977
+#: builtin/checkout.c:998
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:983
+#: builtin/checkout.c:1004
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11250,7 +11402,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1002
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11267,26 +11419,26 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1058
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:1041
+#: builtin/checkout.c:1062
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:1081 builtin/checkout.c:1350
+#: builtin/checkout.c:1102 builtin/checkout.c:1371
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1184
#, 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:1170
+#: builtin/checkout.c:1191
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"
@@ -11298,280 +11450,280 @@ msgid ""
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1180
+#: builtin/checkout.c:1201
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr ""
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1267
msgid "only one reference expected"
msgstr ""
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1284
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1322 builtin/checkout.c:1688
+#: builtin/checkout.c:1343 builtin/checkout.c:1709
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1390
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/checkout.c:1371
+#: builtin/checkout.c:1392
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/checkout.c:1372 builtin/checkout.c:1380
+#: builtin/checkout.c:1393 builtin/checkout.c:1401
#, c-format
msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/checkout.c:1375
+#: builtin/checkout.c:1396
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1412
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1416
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1399
+#: builtin/checkout.c:1420
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1403
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1432
msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/checkout.c:1418
+#: builtin/checkout.c:1439
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
+#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
-#: builtin/checkout.c:1444 builtin/checkout.c:1449
+#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
+#: builtin/checkout.c:1465 builtin/checkout.c:1470
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1446
+#: builtin/checkout.c:1467
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/checkout.c:1454
+#: builtin/checkout.c:1475
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1461
+#: builtin/checkout.c:1482
msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1504
+#: builtin/checkout.c:1525
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
+#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
msgid "style"
msgstr ""
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1527
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1518 builtin/worktree.c:486
+#: builtin/checkout.c:1539 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1540
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1521
+#: builtin/checkout.c:1542
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1523
+#: builtin/checkout.c:1544
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1523
+#: builtin/checkout.c:1544
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1525 builtin/merge.c:301
+#: builtin/checkout.c:1546 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1528
+#: builtin/checkout.c:1549
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1541
+#: builtin/checkout.c:1562
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1565
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1548
+#: builtin/checkout.c:1569
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1603
+#: builtin/checkout.c:1624
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1607
+#: builtin/checkout.c:1628
msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1644
+#: builtin/checkout.c:1665
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1649
+#: builtin/checkout.c:1670
#, c-format
msgid "missing branch name; try -%c"
msgstr ""
-#: builtin/checkout.c:1681
+#: builtin/checkout.c:1702
#, c-format
msgid "could not resolve %s"
msgstr ""
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1718
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1704
+#: builtin/checkout.c:1725
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1708
+#: builtin/checkout.c:1729
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1717
+#: builtin/checkout.c:1738
msgid "--pathspec-from-file is incompatible with --detach"
msgstr ""
-#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
+#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
msgid "--pathspec-from-file is incompatible with --patch"
msgstr ""
-#: builtin/checkout.c:1733
+#: builtin/checkout.c:1754
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1759
msgid "you must specify path(s) to restore"
msgstr ""
-#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
-#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
-#: builtin/worktree.c:484
+#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
+#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1765
+#: builtin/checkout.c:1786
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1767
+#: builtin/checkout.c:1788
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1768
+#: builtin/checkout.c:1789
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1770
+#: builtin/checkout.c:1791
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
-#: builtin/checkout.c:1771
+#: builtin/checkout.c:1792
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1816
+#: builtin/checkout.c:1837
msgid "create and switch to a new branch"
msgstr ""
-#: builtin/checkout.c:1818
+#: builtin/checkout.c:1839
msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1841
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1822
+#: builtin/checkout.c:1843
msgid "throw away local modifications"
msgstr ""
-#: builtin/checkout.c:1856
+#: builtin/checkout.c:1877
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1858
+#: builtin/checkout.c:1879
msgid "restore the index"
msgstr ""
-#: builtin/checkout.c:1860
+#: builtin/checkout.c:1881
msgid "restore the working tree (default)"
msgstr ""
-#: builtin/checkout.c:1862
+#: builtin/checkout.c:1883
msgid "ignore unmerged entries"
msgstr ""
-#: builtin/checkout.c:1863
+#: builtin/checkout.c:1884
msgid "use overlay mode"
msgstr ""
@@ -11600,11 +11752,6 @@ msgstr ""
msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr ""
-
#: builtin/clean.c:38
#, c-format
msgid "could not lstat %s\n"
@@ -11696,8 +11843,8 @@ msgid "remove whole directories"
msgstr ""
#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
@@ -11734,347 +11881,352 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:94
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr ""
+
+#: builtin/clone.c:98
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:99
+#: builtin/clone.c:103
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:101
+#: builtin/clone.c:105
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:112 builtin/init-db.c:552
+#: builtin/clone.c:116 builtin/init-db.c:538
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:113 builtin/init-db.c:553
+#: builtin/clone.c:117 builtin/init-db.c:539
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
+#: builtin/submodule--helper.c:2337
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:119 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1834
+#: builtin/submodule--helper.c:2339
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
+#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
msgid "name"
msgstr ""
-#: builtin/clone.c:121
+#: builtin/clone.c:125
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:123
+#: builtin/clone.c:127
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
#: builtin/pull.c:208
msgid "depth"
msgstr ""
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
#: builtin/pull.c:211
msgid "time"
msgstr ""
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
+#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
msgid "revision"
msgstr ""
-#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:133 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1844
+#: builtin/submodule--helper.c:2353
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:135
+#: builtin/clone.c:139
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:137
+#: builtin/clone.c:141
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:138 builtin/init-db.c:561
+#: builtin/clone.c:142 builtin/init-db.c:547
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:139 builtin/init-db.c:562
+#: builtin/clone.c:143 builtin/init-db.c:548
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:140
+#: builtin/clone.c:144
msgid "key=value"
msgstr ""
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr ""
-#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr ""
-#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:150
+#: builtin/clone.c:154
msgid "any cloned submodules will use their remote-tracking branch"
msgstr ""
-#: builtin/clone.c:152
+#: builtin/clone.c:156
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
-#: builtin/clone.c:288
+#: builtin/clone.c:292
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:341
+#: builtin/clone.c:345
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:414
+#: builtin/clone.c:418
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:432
+#: builtin/clone.c:436
#, c-format
msgid "failed to start iterator over '%s'"
msgstr ""
-#: builtin/clone.c:463
+#: builtin/clone.c:467
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:467
+#: builtin/clone.c:471
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:472
+#: builtin/clone.c:476
#, c-format
msgid "failed to iterate over '%s'"
msgstr ""
-#: builtin/clone.c:499
+#: builtin/clone.c:503
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:513
+#: builtin/clone.c:517
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-#: builtin/clone.c:590
+#: builtin/clone.c:594
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:709
+#: builtin/clone.c:713
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:757
+#: builtin/clone.c:761
msgid "failed to initialize sparse-checkout"
msgstr ""
-#: builtin/clone.c:780
+#: builtin/clone.c:784
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:812
+#: builtin/clone.c:816
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:887
+#: builtin/clone.c:894
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:950
+#: builtin/clone.c:957
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:952
+#: builtin/clone.c:959
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:993 builtin/receive-pack.c:2493
+#: builtin/clone.c:1001 builtin/receive-pack.c:2491
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:997
+#: builtin/clone.c:1005
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:1010
+#: builtin/clone.c:1018
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:1013
+#: builtin/clone.c:1021
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:1026
+#: builtin/clone.c:1035
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:1030 builtin/fetch.c:1951
+#: builtin/clone.c:1039 builtin/fetch.c:2011
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:1040
+#: builtin/clone.c:1049
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:1046
+#: builtin/clone.c:1055
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:1060
+#: builtin/clone.c:1069
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
-#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
+#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
+#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:1080
+#: builtin/clone.c:1089
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1100
+#: builtin/clone.c:1109
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1102
+#: builtin/clone.c:1111
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1126
+#: builtin/clone.c:1135
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/clone.c:1211
+#: builtin/clone.c:1229
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1213
+#: builtin/clone.c:1231
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1215
+#: builtin/clone.c:1233
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1217
+#: builtin/clone.c:1235
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1220
+#: builtin/clone.c:1240
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1225
+#: builtin/clone.c:1245
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1315 builtin/clone.c:1323
+#: builtin/clone.c:1337 builtin/clone.c:1345
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1326
+#: builtin/clone.c:1348
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -12091,19 +12243,19 @@ msgid "layout to use"
msgstr ""
#: builtin/column.c:30
-msgid "Maximum width"
+msgid "maximum width"
msgstr ""
#: builtin/column.c:31
-msgid "Padding space on left border"
+msgid "padding space on left border"
msgstr ""
#: builtin/column.c:32
-msgid "Padding space on right border"
+msgid "padding space on right border"
msgstr ""
#: builtin/column.c:33
-msgid "Padding space between columns"
+msgid "padding space between columns"
msgstr ""
#: builtin/column.c:51
@@ -12128,7 +12280,7 @@ msgid "could not find object directory matching %s"
msgstr ""
#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768
+#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
msgid "dir"
msgstr ""
@@ -12220,7 +12372,7 @@ msgstr ""
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
#, c-format
msgid "not a valid object name %s"
msgstr ""
@@ -12248,13 +12400,13 @@ msgstr ""
msgid "id of a parent commit object"
msgstr ""
-#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
-#: builtin/tag.c:445
+#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
+#: builtin/tag.c:456
msgid "message"
msgstr ""
-#: builtin/commit-tree.c:115 builtin/commit.c:1504
+#: builtin/commit-tree.c:115 builtin/commit.c:1614
msgid "commit message"
msgstr ""
@@ -12262,7 +12414,7 @@ msgstr ""
msgid "read commit log message from file"
msgstr ""
-#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
@@ -12320,110 +12472,115 @@ msgid ""
"\n"
msgstr ""
-#: builtin/commit.c:312
+#: builtin/commit.c:324
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:348
+#: builtin/commit.c:360
msgid "--pathspec-from-file with -a does not make sense"
msgstr ""
-#: builtin/commit.c:361
+#: builtin/commit.c:374
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:373
+#: builtin/commit.c:386
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:382
+#: builtin/commit.c:395
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:397
+#: builtin/commit.c:410
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:399
+#: builtin/commit.c:412
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:476
+#: builtin/commit.c:489
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:478
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:480
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a rebase."
msgstr ""
-#: builtin/commit.c:488
+#: builtin/commit.c:501
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:507
+#: builtin/commit.c:520
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:605
+#: builtin/commit.c:618
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:607
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:626
+#: builtin/commit.c:639
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:679
+#: builtin/commit.c:692
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:729 builtin/shortlog.c:413
+#: builtin/commit.c:758 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:731
+#: builtin/commit.c:760
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:735
+#: builtin/commit.c:764
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:766 builtin/commit.c:782
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr ""
+
+#: builtin/commit.c:813 builtin/commit.c:829
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:773
+#: builtin/commit.c:820
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:833
+#: builtin/commit.c:880
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:853
+#: builtin/commit.c:900
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -12432,7 +12589,7 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:858
+#: builtin/commit.c:905
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -12441,14 +12598,14 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:868
+#: builtin/commit.c:915
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:876
+#: builtin/commit.c:923
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12456,320 +12613,369 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:893
+#: builtin/commit.c:940
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:901
+#: builtin/commit.c:948
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:908
+#: builtin/commit.c:955
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:926
+#: builtin/commit.c:973
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:997
+#: builtin/commit.c:1018
+msgid "unable to pass trailers to --trailers"
+msgstr ""
+
+#: builtin/commit.c:1058
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:1011 builtin/tag.c:308
+#: builtin/commit.c:1072 builtin/tag.c:319
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1116
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1069
+#: builtin/commit.c:1130
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1087 builtin/commit.c:1331
+#: builtin/commit.c:1148 builtin/commit.c:1441
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1127
+#: builtin/commit.c:1188
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1171
+#: builtin/commit.c:1219
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr ""
+
+#: builtin/commit.c:1221
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr ""
+
+#: builtin/commit.c:1224
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr ""
+
+#: builtin/commit.c:1226
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+
+#: builtin/commit.c:1245
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1180
+#: builtin/commit.c:1254
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1183
+#: builtin/commit.c:1257
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1185
+#: builtin/commit.c:1259
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1187
+#: builtin/commit.c:1261
msgid "You are in the middle of a rebase -- cannot amend."
msgstr ""
-#: builtin/commit.c:1190
+#: builtin/commit.c:1264
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1200
+#: builtin/commit.c:1274
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1202
+#: builtin/commit.c:1276
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1211
+#: builtin/commit.c:1285
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1229
+#: builtin/commit.c:1303
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1235
+#: builtin/commit.c:1331
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr ""
+
+#: builtin/commit.c:1345
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1366 builtin/commit.c:1527
+#: builtin/commit.c:1476 builtin/commit.c:1642
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1368 builtin/commit.c:1529
+#: builtin/commit.c:1478 builtin/commit.c:1644
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1370
+#: builtin/commit.c:1480
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1372 builtin/commit.c:1531
+#: builtin/commit.c:1482 builtin/commit.c:1646
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1374
+#: builtin/commit.c:1484
msgid "version"
msgstr ""
-#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
-#: builtin/worktree.c:679
+#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
+#: builtin/worktree.c:681
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1377 builtin/commit.c:1535
+#: builtin/commit.c:1487 builtin/commit.c:1650
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1380 builtin/commit.c:1538
+#: builtin/commit.c:1490 builtin/commit.c:1653
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
+#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
msgid "mode"
msgstr ""
-#: builtin/commit.c:1383 builtin/commit.c:1541
+#: builtin/commit.c:1493 builtin/commit.c:1656
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1387
+#: builtin/commit.c:1497
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1389 parse-options.h:192
+#: builtin/commit.c:1499 parse-options.h:193
msgid "when"
msgstr ""
-#: builtin/commit.c:1390
+#: builtin/commit.c:1500
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1392
+#: builtin/commit.c:1502
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1393
+#: builtin/commit.c:1503
msgid "do not detect renames"
msgstr ""
-#: builtin/commit.c:1395
+#: builtin/commit.c:1505
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1415
+#: builtin/commit.c:1525
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1497
+#: builtin/commit.c:1607
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1498
+#: builtin/commit.c:1608
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1500
+#: builtin/commit.c:1610
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
+#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1502
+#: builtin/commit.c:1612
msgid "author"
msgstr ""
-#: builtin/commit.c:1502
+#: builtin/commit.c:1612
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1503 builtin/gc.c:550
+#: builtin/commit.c:1613 builtin/gc.c:550
msgid "date"
msgstr ""
-#: builtin/commit.c:1503
+#: builtin/commit.c:1613
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
-#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
+#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
+#: parse-options.h:329 ref-filter.h:90
msgid "commit"
msgstr ""
-#: builtin/commit.c:1505
+#: builtin/commit.c:1615
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1506
+#: builtin/commit.c:1616
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1507
-msgid "use autosquash formatted message to fixup specified commit"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1621
+msgid "[(amend|reword):]commit"
msgstr ""
-#: builtin/commit.c:1508
+#: builtin/commit.c:1621
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr ""
+
+#: builtin/commit.c:1622
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1509
+#: builtin/commit.c:1623
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr ""
+
+#: builtin/commit.c:1624
+msgid "add custom trailer(s)"
+msgstr ""
+
+#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
#: builtin/pull.c:145 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr ""
-#: builtin/commit.c:1511
+#: builtin/commit.c:1626
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1512
+#: builtin/commit.c:1627
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1514
+#: builtin/commit.c:1629
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1519
+#: builtin/commit.c:1634
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1520
+#: builtin/commit.c:1635
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1521
+#: builtin/commit.c:1636
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1522
+#: builtin/commit.c:1637
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1523
+#: builtin/commit.c:1638
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1524
+#: builtin/commit.c:1639
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1525
+#: builtin/commit.c:1640
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1526
+#: builtin/commit.c:1641
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1539
+#: builtin/commit.c:1654
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1540
+#: builtin/commit.c:1655
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1547
+#: builtin/commit.c:1662
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1549
+#: builtin/commit.c:1664
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1622
+#: builtin/commit.c:1737
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1629
+#: builtin/commit.c:1744
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1650
+#: builtin/commit.c:1765
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1657
+#: builtin/commit.c:1772
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1662
+#: builtin/commit.c:1777
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1696
+#: builtin/commit.c:1788
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr ""
+
+#: builtin/commit.c:1824
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13095,7 +13301,7 @@ msgstr ""
msgid "print sizes in human readable format"
msgstr ""
-#: builtin/credential-cache--daemon.c:226
+#: builtin/credential-cache--daemon.c:227
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -13104,11 +13310,11 @@ msgid ""
"\tchmod 0700 %s"
msgstr ""
-#: builtin/credential-cache--daemon.c:275
+#: builtin/credential-cache--daemon.c:276
msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/credential-cache--daemon.c:315
+#: builtin/credential-cache--daemon.c:316
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
@@ -13306,7 +13512,7 @@ msgstr ""
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:532 builtin/grep.c:682
+#: builtin/diff.c:532 builtin/grep.c:684
#, c-format
msgid "invalid object '%s' given."
msgstr ""
@@ -13326,113 +13532,113 @@ msgstr ""
msgid "%s...%s: multiple merge bases, using %s"
msgstr ""
-#: builtin/difftool.c:30
+#: builtin/difftool.c:31
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:412
+#: builtin/difftool.c:413
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:633
+#: builtin/difftool.c:637
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:635
+#: builtin/difftool.c:639
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:646
+#: builtin/difftool.c:650
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:647
+#: builtin/difftool.c:651
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:696
+#: builtin/difftool.c:700
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:698
+#: builtin/difftool.c:702
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:700
+#: builtin/difftool.c:704
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:705
+#: builtin/difftool.c:709
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:706
+#: builtin/difftool.c:710
msgid "tool"
msgstr ""
-#: builtin/difftool.c:707
+#: builtin/difftool.c:711
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:709
+#: builtin/difftool.c:713
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:712
+#: builtin/difftool.c:716
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:715
+#: builtin/difftool.c:719
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:716
+#: builtin/difftool.c:720
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:731
+#: builtin/difftool.c:735
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:738
+#: builtin/difftool.c:742
msgid "--dir-diff is incompatible with --no-index"
msgstr ""
-#: builtin/difftool.c:741
+#: builtin/difftool.c:745
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
-#: builtin/difftool.c:749
+#: builtin/difftool.c:753
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:756
+#: builtin/difftool.c:760
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
@@ -13520,7 +13726,7 @@ msgstr ""
msgid "skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1222 builtin/log.c:1815
+#: builtin/fast-export.c:1222 builtin/log.c:1823
msgid "refspec"
msgstr ""
@@ -13610,200 +13816,208 @@ msgstr ""
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:120
+#: builtin/fetch.c:122
msgid "fetch.parallel cannot be negative"
msgstr ""
-#: builtin/fetch.c:143 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:145 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr ""
-#: builtin/fetch.c:147 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:149
+#: builtin/fetch.c:151
msgid "use atomic transaction to update references"
msgstr ""
-#: builtin/fetch.c:151 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:152
+#: builtin/fetch.c:154
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:156 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:158
+#: builtin/fetch.c:160
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:162 builtin/pull.c:198
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+
+#: builtin/fetch.c:166 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:164
+#: builtin/fetch.c:168
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:166
+#: builtin/fetch.c:170
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:171
+#: builtin/fetch.c:175
msgid "write fetched references to the FETCH_HEAD file"
msgstr ""
-#: builtin/fetch.c:172 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:174
+#: builtin/fetch.c:178
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:179 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:185 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:188
+#: builtin/fetch.c:192
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:191
+#: builtin/fetch.c:195
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:195 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:196 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:226
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:197 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:204 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:207 builtin/fetch.c:209
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+
+#: builtin/fetch.c:213 builtin/fetch.c:215
msgid "run 'maintenance --auto' after fetching"
msgstr ""
-#: builtin/fetch.c:211 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/fetch.c:213
+#: builtin/fetch.c:219
msgid "write the commit-graph after fetching"
msgstr ""
-#: builtin/fetch.c:215
+#: builtin/fetch.c:221
msgid "accept refspecs from stdin"
msgstr ""
-#: builtin/fetch.c:526
+#: builtin/fetch.c:586
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:697
+#: builtin/fetch.c:757
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:796
+#: builtin/fetch.c:856
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:800
+#: builtin/fetch.c:860
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:814
+#: builtin/fetch.c:874
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:824
+#: builtin/fetch.c:884
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
-#: builtin/fetch.c:896
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:829
+#: builtin/fetch.c:889
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:851
+#: builtin/fetch.c:911
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:854
+#: builtin/fetch.c:914
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:857
+#: builtin/fetch.c:917
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:896
+#: builtin/fetch.c:956
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:901
+#: builtin/fetch.c:961
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:1005
+#: builtin/fetch.c:1065
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'."
msgstr ""
-#: builtin/fetch.c:1009
+#: builtin/fetch.c:1069
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13812,152 +14026,160 @@ msgid ""
" to avoid this check.\n"
msgstr ""
-#: builtin/fetch.c:1041
+#: builtin/fetch.c:1101
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1129
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:1146 builtin/fetch.c:1297
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:1168
+#: builtin/fetch.c:1228
#, 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:1267
+#: builtin/fetch.c:1327
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1268
+#: builtin/fetch.c:1328
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1300
+#: builtin/fetch.c:1360
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1301 builtin/remote.c:1118
+#: builtin/fetch.c:1361 builtin/remote.c:1118
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1324
+#: builtin/fetch.c:1384
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1343
+#: builtin/fetch.c:1403
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1346
+#: builtin/fetch.c:1406
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1558
+#: builtin/fetch.c:1618
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
-#: builtin/fetch.c:1573
+#: builtin/fetch.c:1633
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
-#: builtin/fetch.c:1575
+#: builtin/fetch.c:1635
msgid "not setting upstream for a remote tag"
msgstr ""
-#: builtin/fetch.c:1577
+#: builtin/fetch.c:1637
msgid "unknown branch type"
msgstr ""
-#: builtin/fetch.c:1579
+#: builtin/fetch.c:1639
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
msgstr ""
-#: builtin/fetch.c:1708 builtin/fetch.c:1771
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1790
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr ""
-#: builtin/fetch.c:1834
+#: builtin/fetch.c:1894
msgid ""
"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:1870
+#: builtin/fetch.c:1930
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1935
+#: builtin/fetch.c:1995
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1937
+#: builtin/fetch.c:1997
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1942
+#: builtin/fetch.c:2002
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1944
+#: builtin/fetch.c:2004
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1961
+#: builtin/fetch.c:2021
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1963
+#: builtin/fetch.c:2023
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1972
+#: builtin/fetch.c:2032
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1979
+#: builtin/fetch.c:2039
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:1997
+#: builtin/fetch.c:2055
+msgid "must supply remote when using --negotiate-only"
+msgstr ""
+
+#: builtin/fetch.c:2060
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr ""
+
+#: builtin/fetch.c:2079
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
-#: builtin/fetch.c:2001
+#: builtin/fetch.c:2083
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2087
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
@@ -14002,47 +14224,47 @@ msgstr ""
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:472
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
msgid "respect format colors"
msgstr ""
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
msgid "print only refs that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
msgid "print only refs which don't contain the commit"
msgstr ""
@@ -14062,243 +14284,243 @@ msgstr ""
msgid "missing --config=<config>"
msgstr ""
-#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
+#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
msgid "unknown"
msgstr ""
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:83 builtin/fsck.c:103
+#: builtin/fsck.c:78 builtin/fsck.c:100
#, c-format
msgid "error in %s %s: %s"
msgstr ""
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:97
+#: builtin/fsck.c:94
#, c-format
msgid "warning in %s %s: %s"
msgstr ""
-#: builtin/fsck.c:126 builtin/fsck.c:129
+#: builtin/fsck.c:123 builtin/fsck.c:126
#, c-format
msgid "broken link from %7s %s"
msgstr ""
-#: builtin/fsck.c:138
+#: builtin/fsck.c:135
msgid "wrong object type in link"
msgstr ""
-#: builtin/fsck.c:154
+#: builtin/fsck.c:151
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
-#: builtin/fsck.c:265
+#: builtin/fsck.c:263
#, c-format
msgid "missing %s %s"
msgstr ""
-#: builtin/fsck.c:292
+#: builtin/fsck.c:290
#, c-format
msgid "unreachable %s %s"
msgstr ""
-#: builtin/fsck.c:312
+#: builtin/fsck.c:310
#, c-format
msgid "dangling %s %s"
msgstr ""
-#: builtin/fsck.c:322
+#: builtin/fsck.c:320
msgid "could not create lost-found"
msgstr ""
-#: builtin/fsck.c:333
+#: builtin/fsck.c:331
#, c-format
msgid "could not finish '%s'"
msgstr ""
-#: builtin/fsck.c:350
+#: builtin/fsck.c:348
#, c-format
msgid "Checking %s"
msgstr ""
-#: builtin/fsck.c:388
+#: builtin/fsck.c:386
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr ""
-#: builtin/fsck.c:407
+#: builtin/fsck.c:405
#, c-format
msgid "Checking %s %s"
msgstr ""
-#: builtin/fsck.c:412
+#: builtin/fsck.c:410
msgid "broken links"
msgstr ""
-#: builtin/fsck.c:421
+#: builtin/fsck.c:419
#, c-format
msgid "root %s"
msgstr ""
-#: builtin/fsck.c:429
+#: builtin/fsck.c:427
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/fsck.c:458
+#: builtin/fsck.c:456
#, c-format
msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/fsck.c:483
+#: builtin/fsck.c:481
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/fsck.c:497
+#: builtin/fsck.c:495
#, c-format
msgid "Checking reflog %s->%s"
msgstr ""
-#: builtin/fsck.c:531
+#: builtin/fsck.c:529
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr ""
-#: builtin/fsck.c:538
+#: builtin/fsck.c:536
#, c-format
msgid "%s: not a commit"
msgstr ""
-#: builtin/fsck.c:592
+#: builtin/fsck.c:590
msgid "notice: No default references"
msgstr ""
-#: builtin/fsck.c:607
+#: builtin/fsck.c:605
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/fsck.c:620
+#: builtin/fsck.c:618
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/fsck.c:640
+#: builtin/fsck.c:638
#, c-format
msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/fsck.c:655
+#: builtin/fsck.c:653
msgid "Checking object directory"
msgstr ""
-#: builtin/fsck.c:658
+#: builtin/fsck.c:656
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:673
+#: builtin/fsck.c:671
#, c-format
msgid "Checking %s link"
msgstr ""
-#: builtin/fsck.c:678 builtin/index-pack.c:865
+#: builtin/fsck.c:676 builtin/index-pack.c:866
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/fsck.c:685
+#: builtin/fsck.c:683
#, c-format
msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/fsck.c:691
+#: builtin/fsck.c:689
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/fsck.c:695
+#: builtin/fsck.c:693
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/fsck.c:707
+#: builtin/fsck.c:705
msgid "Checking cache tree"
msgstr ""
-#: builtin/fsck.c:712
+#: builtin/fsck.c:710
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/fsck.c:721
+#: builtin/fsck.c:719
msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/fsck.c:752
+#: builtin/fsck.c:750
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:758
+#: builtin/fsck.c:756
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:759
+#: builtin/fsck.c:757
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:760
+#: builtin/fsck.c:758
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:761
+#: builtin/fsck.c:759
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:762
+#: builtin/fsck.c:760
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:763
+#: builtin/fsck.c:761
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:764
+#: builtin/fsck.c:762
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:765
+#: builtin/fsck.c:763
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:766 builtin/mktag.c:78
+#: builtin/fsck.c:764 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:768
+#: builtin/fsck.c:766
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:769 builtin/prune.c:134
+#: builtin/fsck.c:767 builtin/prune.c:134
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:770
+#: builtin/fsck.c:768
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:829 builtin/index-pack.c:261
+#: builtin/fsck.c:827 builtin/index-pack.c:262
msgid "Checking objects"
msgstr ""
-#: builtin/fsck.c:857
+#: builtin/fsck.c:855
#, c-format
msgid "%s: object missing"
msgstr ""
-#: builtin/fsck.c:868
+#: builtin/fsck.c:866
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
@@ -14317,12 +14539,12 @@ msgstr ""
msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/gc.c:487 builtin/init-db.c:58
+#: builtin/gc.c:487 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
#, c-format
msgid "cannot read '%s'"
msgstr ""
@@ -14411,143 +14633,143 @@ msgstr ""
msgid "failed to write commit-graph"
msgstr ""
-#: builtin/gc.c:914
-msgid "failed to fill remotes"
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
msgstr ""
-#: builtin/gc.c:1037
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr ""
-#: builtin/gc.c:1054
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr ""
-#: builtin/gc.c:1106
+#: builtin/gc.c:1091
msgid "failed to write multi-pack-index"
msgstr ""
-#: builtin/gc.c:1124
+#: builtin/gc.c:1109
msgid "'git multi-pack-index expire' failed"
msgstr ""
-#: builtin/gc.c:1185
+#: builtin/gc.c:1170
msgid "'git multi-pack-index repack' failed"
msgstr ""
-#: builtin/gc.c:1194
+#: builtin/gc.c:1179
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
-#: builtin/gc.c:1298
+#: builtin/gc.c:1283
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr ""
-#: builtin/gc.c:1328
+#: builtin/gc.c:1313
#, c-format
msgid "task '%s' failed"
msgstr ""
-#: builtin/gc.c:1410
+#: builtin/gc.c:1395
#, c-format
msgid "'%s' is not a valid task"
msgstr ""
-#: builtin/gc.c:1415
+#: builtin/gc.c:1400
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr ""
-#: builtin/gc.c:1430
+#: builtin/gc.c:1415
msgid "run tasks based on the state of the repository"
msgstr ""
-#: builtin/gc.c:1431
+#: builtin/gc.c:1416
msgid "frequency"
msgstr ""
-#: builtin/gc.c:1432
+#: builtin/gc.c:1417
msgid "run tasks based on frequency"
msgstr ""
-#: builtin/gc.c:1435
+#: builtin/gc.c:1420
msgid "do not report progress or other information over stderr"
msgstr ""
-#: builtin/gc.c:1436
+#: builtin/gc.c:1421
msgid "task"
msgstr ""
-#: builtin/gc.c:1437
+#: builtin/gc.c:1422
msgid "run a specific task"
msgstr ""
-#: builtin/gc.c:1454
+#: builtin/gc.c:1439
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr ""
-#: builtin/gc.c:1497
+#: builtin/gc.c:1482
msgid "failed to run 'git config'"
msgstr ""
-#: builtin/gc.c:1562
+#: builtin/gc.c:1547
#, c-format
msgid "failed to expand path '%s'"
msgstr ""
-#: builtin/gc.c:1591
+#: builtin/gc.c:1576
msgid "failed to start launchctl"
msgstr ""
-#: builtin/gc.c:1628
+#: builtin/gc.c:1613
#, c-format
msgid "failed to create directories for '%s'"
msgstr ""
-#: builtin/gc.c:1689
+#: builtin/gc.c:1674
#, c-format
msgid "failed to bootstrap service %s"
msgstr ""
-#: builtin/gc.c:1760
+#: builtin/gc.c:1745
msgid "failed to create temp xml file"
msgstr ""
-#: builtin/gc.c:1850
+#: builtin/gc.c:1835
msgid "failed to start schtasks"
msgstr ""
-#: builtin/gc.c:1894
+#: builtin/gc.c:1879
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:1911
+#: builtin/gc.c:1896
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:1915
+#: builtin/gc.c:1900
msgid "failed to open stdin of 'crontab'"
msgstr ""
-#: builtin/gc.c:1956
+#: builtin/gc.c:1942
msgid "'crontab' died"
msgstr ""
-#: builtin/gc.c:1990
+#: builtin/gc.c:1976
msgid "another process is scheduling background maintenance"
msgstr ""
-#: builtin/gc.c:2009
+#: builtin/gc.c:2000
msgid "failed to add repo to global config"
msgstr ""
-#: builtin/gc.c:2019
+#: builtin/gc.c:2010
msgid "git maintenance <subcommand> [<options>]"
msgstr ""
-#: builtin/gc.c:2038
+#: builtin/gc.c:2029
#, c-format
msgid "invalid subcommand: %s"
msgstr ""
@@ -14570,258 +14792,258 @@ msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
-#: builtin/pack-objects.c:2944
+#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
+#: builtin/pack-objects.c:2969
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:656
+#: builtin/grep.c:658
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:737
+#: builtin/grep.c:739
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:836
+#: builtin/grep.c:838
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:838
+#: builtin/grep.c:840
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:840
+#: builtin/grep.c:842
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:842
+#: builtin/grep.c:844
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:849
+#: builtin/grep.c:851
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:851
+#: builtin/grep.c:853
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:866
+#: builtin/grep.c:868
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:869
+#: builtin/grep.c:871
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:878
+#: builtin/grep.c:880
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:879
+#: builtin/grep.c:881
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:880
+#: builtin/grep.c:882
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:881
+#: builtin/grep.c:883
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:890
+#: builtin/grep.c:892
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:892
+#: builtin/grep.c:894
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:895
+#: builtin/grep.c:897
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:897
+#: builtin/grep.c:899
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:902
+#: builtin/grep.c:904
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:905
+#: builtin/grep.c:907
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:908
+#: builtin/grep.c:910
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:910
+#: builtin/grep.c:912
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:913
+#: builtin/grep.c:915
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:918
+#: builtin/grep.c:920
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:921
+#: builtin/grep.c:923
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:923
+#: builtin/grep.c:925
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:925
+#: builtin/grep.c:927
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:937
+#: builtin/grep.c:939
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:939
+#: builtin/grep.c:941
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:942
+#: builtin/grep.c:944
msgid "pager"
msgstr ""
-#: builtin/grep.c:942
+#: builtin/grep.c:944
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:946
+#: builtin/grep.c:948
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:1012
+#: builtin/grep.c:1014
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1048
+#: builtin/grep.c:1050
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1056
+#: builtin/grep.c:1058
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1086
+#: builtin/grep.c:1088
msgid "--untracked not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1090
+#: builtin/grep.c:1092
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1093 builtin/pack-objects.c:3672
+#: builtin/grep.c:1095 builtin/pack-objects.c:3930
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
+#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1130
+#: builtin/grep.c:1132
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1156
+#: builtin/grep.c:1158
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1159
+#: builtin/grep.c:1161
msgid "--untracked cannot be used with --cached"
msgstr ""
-#: builtin/grep.c:1165
+#: builtin/grep.c:1167
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1173
+#: builtin/grep.c:1175
msgid "both --cached and trees are given"
msgstr ""
@@ -14946,12 +15168,12 @@ msgstr ""
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:520 builtin/help.c:531 git.c:340
+#: builtin/help.c:520 builtin/help.c:531 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:534 git.c:372
+#: builtin/help.c:534 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr ""
@@ -14965,448 +15187,444 @@ msgstr ""
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:221
+#: builtin/index-pack.c:222
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:241
+#: builtin/index-pack.c:242
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:244
+#: builtin/index-pack.c:245
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:304
+#: builtin/index-pack.c:305
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:306
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:324 builtin/pack-objects.c:624
+#: builtin/index-pack.c:325 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/index-pack.c:342
+#: builtin/index-pack.c:343
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:348
+#: builtin/index-pack.c:349
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c:363
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c:365
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:382
+#: builtin/index-pack.c:383
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:488
+#: builtin/index-pack.c:489
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:554
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:584
+#: builtin/index-pack.c:585
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:587
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:613
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
-#: builtin/index-pack.c:826 builtin/index-pack.c:835
+#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
+#: builtin/index-pack.c:827 builtin/index-pack.c:836
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:760 builtin/pack-objects.c:171
+#: builtin/index-pack.c:761 builtin/pack-objects.c:171
#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:825
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/index-pack.c:832
+#: builtin/index-pack.c:833
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:849 builtin/index-pack.c:868
+#: builtin/index-pack.c:850 builtin/index-pack.c:869
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:870
+#: builtin/index-pack.c:871
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:931 builtin/index-pack.c:978
+#: builtin/index-pack.c:932 builtin/index-pack.c:979
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1162
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1162
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1196
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c:1201
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c:1204
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c:1216
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c:1239
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
+#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c:1289
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c:1305
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1328
+#: builtin/index-pack.c:1329
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1424
+#: builtin/index-pack.c:1425
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1446
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr ""
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1470
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1478
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1503
+#: builtin/index-pack.c:1504
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1517
+#: builtin/index-pack.c:1518
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1525
+#: builtin/index-pack.c:1526
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1534
-msgid "cannot store reverse index file"
-msgstr ""
-
-#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
+#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1651
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1652
+#: builtin/index-pack.c:1653
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1700
+#: builtin/index-pack.c:1701
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1707
+#: builtin/index-pack.c:1708
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1765
+#: builtin/index-pack.c:1750
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
-#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
+#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
+#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr ""
-#: builtin/index-pack.c:1867
+#: builtin/index-pack.c:1852
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1854
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1856
msgid "--object-format cannot be used with --stdin"
msgstr ""
-#: builtin/index-pack.c:1886
+#: builtin/index-pack.c:1871
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr ""
-#: builtin/init-db.c:64
+#: builtin/init-db.c:63
#, c-format
msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/init-db.c:69
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/init-db.c:81
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/init-db.c:83
+#: builtin/init-db.c:82
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:93
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:124
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr ""
-#: builtin/init-db.c:139
+#: builtin/init-db.c:138
#, c-format
msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:275
+#: builtin/init-db.c:262
#, c-format
msgid "invalid initial branch name: '%s'"
msgstr ""
-#: builtin/init-db.c:367
+#: builtin/init-db.c:353
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:370
+#: builtin/init-db.c:356
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:386
+#: builtin/init-db.c:372
msgid "attempt to reinitialize repository with different hash"
msgstr ""
-#: builtin/init-db.c:410 builtin/init-db.c:413
+#: builtin/init-db.c:396 builtin/init-db.c:399
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:445
+#: builtin/init-db.c:431
#, c-format
msgid "re-init: ignored --initial-branch=%s"
msgstr ""
-#: builtin/init-db.c:476
+#: builtin/init-db.c:462
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:477
+#: builtin/init-db.c:463
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:481
+#: builtin/init-db.c:467
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:482
+#: builtin/init-db.c:468
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:531
+#: builtin/init-db.c:517
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:557
+#: builtin/init-db.c:543
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:558
+#: builtin/init-db.c:544
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:564
+#: builtin/init-db.c:550
msgid "override the name of the initial branch"
msgstr ""
-#: builtin/init-db.c:565 builtin/verify-pack.c:74
+#: builtin/init-db.c:551 builtin/verify-pack.c:74
msgid "hash"
msgstr ""
-#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr ""
-#: builtin/init-db.c:573
+#: builtin/init-db.c:559
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr ""
-#: builtin/init-db.c:602 builtin/init-db.c:607
+#: builtin/init-db.c:590 builtin/init-db.c:595
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:611 builtin/init-db.c:666
+#: builtin/init-db.c:599 builtin/init-db.c:654
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:638
+#: builtin/init-db.c:626
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:690
+#: builtin/init-db.c:678
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/init-db.c:695
+#: builtin/init-db.c:683
msgid "--separate-git-dir incompatible with bare repository"
msgstr ""
@@ -15456,10 +15674,6 @@ msgstr ""
msgid "do not treat --- specially"
msgstr ""
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr ""
-
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr ""
@@ -15520,474 +15734,478 @@ msgstr ""
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:566
+#: builtin/log.c:568
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:581 builtin/log.c:671
+#: builtin/log.c:583 builtin/log.c:673
#, c-format
msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:696
+#: builtin/log.c:698
#, c-format
msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:841
+#: builtin/log.c:843
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
-#: builtin/log.c:848
+#: builtin/log.c:850
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:977
+#: builtin/log.c:979
#, c-format
msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:994
+#: builtin/log.c:996
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:1004
+#: builtin/log.c:1006
msgid "not a range"
msgstr ""
-#: builtin/log.c:1168
+#: builtin/log.c:1170
msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1174
+#: builtin/log.c:1176
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1261
+#: builtin/log.c:1263
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1288
+#: builtin/log.c:1290
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1346
+#: builtin/log.c:1348
msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
+#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
#, c-format
msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1510 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:1517
+#: builtin/log.c:1519
msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1527
+#: builtin/log.c:1529
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:1550
+#: builtin/log.c:1552
msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1567
+#: builtin/log.c:1569
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1577
+#: builtin/log.c:1579
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1635
+#: builtin/log.c:1637
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1692
+#: builtin/log.c:1700
msgid "failed to infer range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1694
+#: builtin/log.c:1702
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1738
+#: builtin/log.c:1746
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1741
+#: builtin/log.c:1749
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1745
+#: builtin/log.c:1753
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1747
+#: builtin/log.c:1755
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1749
+#: builtin/log.c:1757
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1750
+#: builtin/log.c:1758
msgid "sfx"
msgstr ""
-#: builtin/log.c:1751
+#: builtin/log.c:1759
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1753
+#: builtin/log.c:1761
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1755
+#: builtin/log.c:1762
+msgid "reroll-count"
+msgstr ""
+
+#: builtin/log.c:1763
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1757
+#: builtin/log.c:1765
msgid "max length of output filename"
msgstr ""
-#: builtin/log.c:1759
+#: builtin/log.c:1767
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1762
+#: builtin/log.c:1770
msgid "cover-from-description-mode"
msgstr ""
-#: builtin/log.c:1763
+#: builtin/log.c:1771
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-#: builtin/log.c:1765
+#: builtin/log.c:1773
msgid "use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1768
+#: builtin/log.c:1776
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1771
+#: builtin/log.c:1779
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1774
+#: builtin/log.c:1782
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1776
+#: builtin/log.c:1784
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1778
+#: builtin/log.c:1786
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1780
+#: builtin/log.c:1788
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1782
+#: builtin/log.c:1790
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1783
+#: builtin/log.c:1791
msgid "header"
msgstr ""
-#: builtin/log.c:1784
+#: builtin/log.c:1792
msgid "add email header"
msgstr ""
-#: builtin/log.c:1785 builtin/log.c:1786
+#: builtin/log.c:1793 builtin/log.c:1794
msgid "email"
msgstr ""
-#: builtin/log.c:1785
+#: builtin/log.c:1793
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1786
+#: builtin/log.c:1794
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1787
+#: builtin/log.c:1795
msgid "ident"
msgstr ""
-#: builtin/log.c:1788
+#: builtin/log.c:1796
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1790
+#: builtin/log.c:1798
msgid "message-id"
msgstr ""
-#: builtin/log.c:1791
+#: builtin/log.c:1799
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1792 builtin/log.c:1795
+#: builtin/log.c:1800 builtin/log.c:1803
msgid "boundary"
msgstr ""
-#: builtin/log.c:1793
+#: builtin/log.c:1801
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1796
+#: builtin/log.c:1804
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1800
+#: builtin/log.c:1808
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1802
+#: builtin/log.c:1810
msgid "signature"
msgstr ""
-#: builtin/log.c:1803
+#: builtin/log.c:1811
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1804
+#: builtin/log.c:1812
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1805
+#: builtin/log.c:1813
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1808
+#: builtin/log.c:1816
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1809
+#: builtin/log.c:1817
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1811
+#: builtin/log.c:1819
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1813
+#: builtin/log.c:1821
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1816
+#: builtin/log.c:1824
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1818
+#: builtin/log.c:1826 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1904
+#: builtin/log.c:1913
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1919
+#: builtin/log.c:1928
msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1921
+#: builtin/log.c:1930
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1929
+#: builtin/log.c:1938
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1931
+#: builtin/log.c:1940
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1933
+#: builtin/log.c:1942
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1955
+#: builtin/log.c:1964
msgid "--stdout, --output, and --output-directory are mutually exclusive"
msgstr ""
-#: builtin/log.c:2078
+#: builtin/log.c:2087
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2082
+#: builtin/log.c:2091
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:2083
+#: builtin/log.c:2092
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:2089
+#: builtin/log.c:2098
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:2093
+#: builtin/log.c:2102
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2101
+#: builtin/log.c:2110
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:2102
+#: builtin/log.c:2111
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:2113
+#: builtin/log.c:2122
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:2149
+#: builtin/log.c:2158
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:2193
+#: builtin/log.c:2202
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2252
+#: builtin/log.c:2261
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:2306
+#: builtin/log.c:2315
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:486
+#: builtin/ls-files.c:563
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:619
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:623
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:625
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:627
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:552
+#: builtin/ls-files.c:629
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:631
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:633
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:636
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:638
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:640
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:642
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:644
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:647
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:649
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:651
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:654
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:580
+#: builtin/ls-files.c:657
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:582
+#: builtin/ls-files.c:659
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:586
+#: builtin/ls-files.c:663
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:589
+#: builtin/ls-files.c:666
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:591
+#: builtin/ls-files.c:668
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:592
+#: builtin/ls-files.c:669
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:593
+#: builtin/ls-files.c:670
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:595
+#: builtin/ls-files.c:672
msgid "show debugging data"
msgstr ""
-#: builtin/ls-files.c:597
+#: builtin/ls-files.c:674
msgid "suppress duplicate entries"
msgstr ""
@@ -16002,7 +16220,7 @@ msgstr ""
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
msgid "exec"
msgstr ""
@@ -16070,6 +16288,55 @@ msgstr ""
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr ""
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr ""
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr ""
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr ""
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr ""
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr ""
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr ""
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr ""
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr ""
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr ""
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr ""
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr ""
+
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
@@ -16261,7 +16528,7 @@ msgid "verify that the named commit has a valid GPG signature"
msgstr ""
#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
msgid "strategy"
msgstr ""
@@ -16318,239 +16585,231 @@ msgstr ""
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:399
-msgid " (nothing to squash)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
msgstr ""
-#: builtin/merge.c:410
+#: builtin/merge.c:414
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:460
+#: builtin/merge.c:464
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:511
+#: builtin/merge.c:515
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:598
+#: builtin/merge.c:602
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:724
+#: builtin/merge.c:728
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:737
+#: builtin/merge.c:741
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:808
+#: builtin/merge.c:812
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:817
+#: builtin/merge.c:821
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:823
+#: builtin/merge.c:827
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:828
+#: builtin/merge.c:832
msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/merge.c:831
+#: builtin/merge.c:835
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:884
+#: builtin/merge.c:888
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:899
+#: builtin/merge.c:903
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:960
+#: builtin/merge.c:964
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:999
+#: builtin/merge.c:1003
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:1001
+#: builtin/merge.c:1005
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:1003
+#: builtin/merge.c:1007
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:1008
+#: builtin/merge.c:1012
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1065
+#: builtin/merge.c:1069
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1168
+#: builtin/merge.c:1172
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1202
+#: builtin/merge.c:1206
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1312
+#: builtin/merge.c:1316
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1316
+#: builtin/merge.c:1320
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1334
+#: builtin/merge.c:1338
msgid "--quit expects no arguments"
msgstr ""
-#: builtin/merge.c:1347
+#: builtin/merge.c:1351
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1351
+#: builtin/merge.c:1355
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1367
+#: builtin/merge.c:1371
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1374
+#: builtin/merge.c:1378
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1377
+#: builtin/merge.c:1381
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1391
+#: builtin/merge.c:1395
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1393
+#: builtin/merge.c:1397
msgid "You cannot combine --squash with --commit."
msgstr ""
-#: builtin/merge.c:1409
+#: builtin/merge.c:1413
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1426
+#: builtin/merge.c:1430
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1428
+#: builtin/merge.c:1432
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1435
+#: builtin/merge.c:1439
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1516
+#: builtin/merge.c:1520
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1525
-msgid "Already up to date."
-msgstr ""
-
-#: builtin/merge.c:1535
+#: builtin/merge.c:1539
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1581
+#: builtin/merge.c:1585
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1588
+#: builtin/merge.c:1592
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1613
-msgid "Already up to date. Yeeah!"
-msgstr ""
-
-#: builtin/merge.c:1619
+#: builtin/merge.c:1623
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1647 builtin/merge.c:1712
+#: builtin/merge.c:1651 builtin/merge.c:1716
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1651
+#: builtin/merge.c:1655
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1703
+#: builtin/merge.c:1707
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1705
+#: builtin/merge.c:1709
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1714
+#: builtin/merge.c:1718
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1728
+#: builtin/merge.c:1732
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -16559,40 +16818,40 @@ msgstr ""
msgid "git mktag"
msgstr ""
-#: builtin/mktag.c:30
+#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
msgstr ""
-#: builtin/mktag.c:41
+#: builtin/mktag.c:38
#, c-format
msgid "error: tag input does not pass fsck: %s"
msgstr ""
-#: builtin/mktag.c:44
+#: builtin/mktag.c:41
#, c-format
msgid "%d (FSCK_IGNORE?) should never trigger this callback"
msgstr ""
-#: builtin/mktag.c:59
+#: builtin/mktag.c:56
#, c-format
msgid "could not read tagged object '%s'"
msgstr ""
-#: builtin/mktag.c:62
+#: builtin/mktag.c:59
#, c-format
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr ""
-#: builtin/mktag.c:99
+#: builtin/mktag.c:97
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
-#: builtin/mktag.c:102
+#: builtin/mktag.c:100
msgid "tag on stdin did not refer to a valid object"
msgstr ""
-#: builtin/mktag.c:105 builtin/tag.c:232
+#: builtin/mktag.c:103 builtin/tag.c:243
msgid "unable to write tag file"
msgstr ""
@@ -16612,34 +16871,41 @@ msgstr ""
msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+#: builtin/multi-pack-index.c:10
+msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
msgstr ""
-#: builtin/multi-pack-index.c:26
-msgid "object directory containing set of packfile and pack-index pairs"
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
msgstr ""
-#: builtin/multi-pack-index.c:29
-msgid ""
-"during repack, collect pack-files of smaller size into a batch that is "
-"larger than this size"
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
msgstr ""
-#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431
-#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598
-#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963
-#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575
-msgid "too many arguments"
+#: builtin/multi-pack-index.c:19
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr ""
-#: builtin/multi-pack-index.c:60
-msgid "--batch-size option is only for 'repack' subcommand"
+#: builtin/multi-pack-index.c:54
+msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr ""
+
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr ""
+
+#: builtin/multi-pack-index.c:128
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+
+#: builtin/multi-pack-index.c:180
#, c-format
msgid "unrecognized subcommand: %s"
msgstr ""
@@ -16735,7 +17001,7 @@ msgstr ""
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
#, c-format
msgid "renaming '%s' failed"
msgstr ""
@@ -16920,7 +17186,7 @@ msgstr ""
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:242 builtin/tag.c:565
+#: builtin/notes.c:242 builtin/tag.c:576
#, c-format
msgid "could not open or read '%s'"
msgstr ""
@@ -16960,6 +17226,13 @@ msgstr ""
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr ""
+
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
@@ -17135,7 +17408,7 @@ msgid ""
"abort'.\n"
msgstr ""
-#: builtin/notes.c:897 builtin/tag.c:578
+#: builtin/notes.c:897 builtin/tag.c:589
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
@@ -17169,7 +17442,7 @@ msgstr ""
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1034 builtin/stash.c:1671
+#: builtin/notes.c:1034 builtin/stash.c:1739
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
@@ -17234,317 +17507,339 @@ msgstr ""
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1358
+#: builtin/pack-objects.c:1383
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1806
+#: builtin/pack-objects.c:1831
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1815
+#: builtin/pack-objects.c:1840
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:2096
+#: builtin/pack-objects.c:2121
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:2241
+#: builtin/pack-objects.c:2266
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
+#: builtin/pack-objects.c:2362
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2351
+#: builtin/pack-objects.c:2376
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2691
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2830
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2916
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2922
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2976
+#: builtin/pack-objects.c:3001
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
"hash> <uri>' (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3004
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3008
+#: builtin/pack-objects.c:3039
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#, c-format
+msgid "could not find pack '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3218
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3014
+#: builtin/pack-objects.c:3224
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3112
+#: builtin/pack-objects.c:3322
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:3202
+#: builtin/pack-objects.c:3412
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3498
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3380
+#: builtin/pack-objects.c:3628
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3631
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3659
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3712
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3465
+#: builtin/pack-objects.c:3716
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3503
+#: builtin/pack-objects.c:3755
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3504
+#: builtin/pack-objects.c:3756
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3507
+#: builtin/pack-objects.c:3759
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3509
+#: builtin/pack-objects.c:3761
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:3763
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3513
+#: builtin/pack-objects.c:3765
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3515
+#: builtin/pack-objects.c:3767
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3517
+#: builtin/pack-objects.c:3769
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3519
+#: builtin/pack-objects.c:3771
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3521
+#: builtin/pack-objects.c:3773
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3523
+#: builtin/pack-objects.c:3775
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3525
+#: builtin/pack-objects.c:3777
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3779
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3529
+#: builtin/pack-objects.c:3781
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3531
+#: builtin/pack-objects.c:3783
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3534
+#: builtin/pack-objects.c:3786
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3537
+#: builtin/pack-objects.c:3789
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3540
+#: builtin/pack-objects.c:3792
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3543
+#: builtin/pack-objects.c:3795
+msgid "read packs from stdin"
+msgstr ""
+
+#: builtin/pack-objects.c:3797
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3545
+#: builtin/pack-objects.c:3799
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3547
+#: builtin/pack-objects.c:3801
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c:3803
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3805
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3554
+#: builtin/pack-objects.c:3808
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3556
+#: builtin/pack-objects.c:3810
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3812
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3560
+#: builtin/pack-objects.c:3814
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3562
+#: builtin/pack-objects.c:3816
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3564
+#: builtin/pack-objects.c:3818
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3566
+#: builtin/pack-objects.c:3820
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3568
+#: builtin/pack-objects.c:3822
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3570
+#: builtin/pack-objects.c:3824
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3574
+#: builtin/pack-objects.c:3828
msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/pack-objects.c:3578
+#: builtin/pack-objects.c:3832
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3581
+#: builtin/pack-objects.c:3835
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3583
+#: builtin/pack-objects.c:3837
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3585
+#: builtin/pack-objects.c:3839
msgid "protocol"
msgstr ""
-#: builtin/pack-objects.c:3586
+#: builtin/pack-objects.c:3840
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-#: builtin/pack-objects.c:3617
+#: builtin/pack-objects.c:3873
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3622
+#: builtin/pack-objects.c:3878
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3676
+#: builtin/pack-objects.c:3934
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3678
+#: builtin/pack-objects.c:3936
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3683
+#: builtin/pack-objects.c:3941
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3686
+#: builtin/pack-objects.c:3944
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3692
+#: builtin/pack-objects.c:3950
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3752
+#: builtin/pack-objects.c:3952
+msgid "cannot use --filter with --stdin-packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3956
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr ""
+
+#: builtin/pack-objects.c:4015
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:4052
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17617,11 +17912,11 @@ msgstr ""
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:167 parse-options.h:339
+#: builtin/pull.c:167 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr ""
@@ -17667,7 +17962,7 @@ msgid ""
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:456 builtin/rebase.c:1253
+#: builtin/pull.c:456 builtin/rebase.c:1248
msgid "You are not currently on a branch."
msgstr ""
@@ -17684,7 +17979,7 @@ msgid "See git-pull(1) for details."
msgstr ""
#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1259
+#: builtin/rebase.c:1254
msgid "<remote>"
msgstr ""
@@ -17692,7 +17987,7 @@ msgstr ""
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:471 builtin/rebase.c:1251
+#: builtin/pull.c:471 builtin/rebase.c:1246
msgid "There is no tracking information for the current branch."
msgstr ""
@@ -18036,10 +18331,6 @@ msgstr ""
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr ""
-#: builtin/range-diff.c:28
-msgid "Percentage by which creation is weighted"
-msgstr ""
-
#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr ""
@@ -18167,188 +18458,188 @@ msgstr ""
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
-#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
+#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
#, c-format
msgid "unusable todo list: '%s'"
msgstr ""
-#: builtin/rebase.c:312
+#: builtin/rebase.c:311
#, c-format
msgid "could not create temporary %s"
msgstr ""
-#: builtin/rebase.c:318
+#: builtin/rebase.c:317
msgid "could not mark as interactive"
msgstr ""
-#: builtin/rebase.c:371
+#: builtin/rebase.c:370
msgid "could not generate todo list"
msgstr ""
-#: builtin/rebase.c:413
+#: builtin/rebase.c:412
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/rebase.c:482
+#: builtin/rebase.c:481
msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/rebase.c:495 builtin/rebase.c:1394
+#: builtin/rebase.c:494 builtin/rebase.c:1389
msgid "keep commits which start empty"
msgstr ""
-#: builtin/rebase.c:499 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/rebase.c:501
+#: builtin/rebase.c:500
msgid "rebase merge commits"
msgstr ""
-#: builtin/rebase.c:503
+#: builtin/rebase.c:502
msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/rebase.c:505
+#: builtin/rebase.c:504
msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/rebase.c:506
+#: builtin/rebase.c:505
msgid "sign commits"
msgstr ""
-#: builtin/rebase.c:508 builtin/rebase.c:1333
+#: builtin/rebase.c:507 builtin/rebase.c:1328
msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:510
+#: builtin/rebase.c:509
msgid "continue rebase"
msgstr ""
-#: builtin/rebase.c:512
+#: builtin/rebase.c:511
msgid "skip commit"
msgstr ""
-#: builtin/rebase.c:513
+#: builtin/rebase.c:512
msgid "edit the todo list"
msgstr ""
-#: builtin/rebase.c:515
+#: builtin/rebase.c:514
msgid "show the current patch"
msgstr ""
-#: builtin/rebase.c:518
+#: builtin/rebase.c:517
msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:520
+#: builtin/rebase.c:519
msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:522
+#: builtin/rebase.c:521
msgid "check the todo list"
msgstr ""
-#: builtin/rebase.c:524
+#: builtin/rebase.c:523
msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/rebase.c:526
+#: builtin/rebase.c:525
msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/rebase.c:527
+#: builtin/rebase.c:526
msgid "onto"
msgstr ""
-#: builtin/rebase.c:530
+#: builtin/rebase.c:529
msgid "restrict-revision"
msgstr ""
-#: builtin/rebase.c:530
+#: builtin/rebase.c:529
msgid "restrict revision"
msgstr ""
-#: builtin/rebase.c:532
+#: builtin/rebase.c:531
msgid "squash-onto"
msgstr ""
-#: builtin/rebase.c:533
+#: builtin/rebase.c:532
msgid "squash onto"
msgstr ""
-#: builtin/rebase.c:535
+#: builtin/rebase.c:534
msgid "the upstream commit"
msgstr ""
-#: builtin/rebase.c:537
+#: builtin/rebase.c:536
msgid "head-name"
msgstr ""
-#: builtin/rebase.c:537
+#: builtin/rebase.c:536
msgid "head name"
msgstr ""
-#: builtin/rebase.c:542
+#: builtin/rebase.c:541
msgid "rebase strategy"
msgstr ""
-#: builtin/rebase.c:543
+#: builtin/rebase.c:542
msgid "strategy-opts"
msgstr ""
-#: builtin/rebase.c:544
+#: builtin/rebase.c:543
msgid "strategy options"
msgstr ""
-#: builtin/rebase.c:545
+#: builtin/rebase.c:544
msgid "switch-to"
msgstr ""
-#: builtin/rebase.c:546
+#: builtin/rebase.c:545
msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/rebase.c:547
+#: builtin/rebase.c:546
msgid "onto-name"
msgstr ""
-#: builtin/rebase.c:547
+#: builtin/rebase.c:546
msgid "onto name"
msgstr ""
-#: builtin/rebase.c:548
+#: builtin/rebase.c:547
msgid "cmd"
msgstr ""
-#: builtin/rebase.c:548
+#: builtin/rebase.c:547
msgid "the command to run"
msgstr ""
-#: builtin/rebase.c:551 builtin/rebase.c:1427
+#: builtin/rebase.c:550 builtin/rebase.c:1422
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/rebase.c:567
+#: builtin/rebase.c:566
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/rebase.c:583
+#: builtin/rebase.c:582
#, c-format
msgid "%s requires the merge backend"
msgstr ""
-#: builtin/rebase.c:626
+#: builtin/rebase.c:625
#, c-format
msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/rebase.c:643
+#: builtin/rebase.c:642
#, c-format
msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/rebase.c:668
+#: builtin/rebase.c:667
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
@@ -18374,14 +18665,14 @@ msgid ""
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:1227
+#: builtin/rebase.c:1222
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
-#: builtin/rebase.c:1245
+#: builtin/rebase.c:1240
#, c-format
msgid ""
"%s\n"
@@ -18392,7 +18683,7 @@ msgid ""
"\n"
msgstr ""
-#: builtin/rebase.c:1261
+#: builtin/rebase.c:1256
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18401,201 +18692,195 @@ msgid ""
"\n"
msgstr ""
-#: builtin/rebase.c:1291
+#: builtin/rebase.c:1286
msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/rebase.c:1295
+#: builtin/rebase.c:1290
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1324
+#: builtin/rebase.c:1319
msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/rebase.c:1326
+#: builtin/rebase.c:1321
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
-#: builtin/rebase.c:1328
+#: builtin/rebase.c:1323
msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/rebase.c:1330
+#: builtin/rebase.c:1325
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:1336
+#: builtin/rebase.c:1331
msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1334
msgid "add a Signed-off-by trailer to each commit"
msgstr ""
-#: builtin/rebase.c:1342
+#: builtin/rebase.c:1337
msgid "make committer date match author date"
msgstr ""
-#: builtin/rebase.c:1344
+#: builtin/rebase.c:1339
msgid "ignore author date and use current date"
msgstr ""
-#: builtin/rebase.c:1346
+#: builtin/rebase.c:1341
msgid "synonym of --reset-author-date"
msgstr ""
-#: builtin/rebase.c:1348 builtin/rebase.c:1352
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
msgid "passed to 'git apply'"
msgstr ""
-#: builtin/rebase.c:1350
+#: builtin/rebase.c:1345
msgid "ignore changes in whitespace"
msgstr ""
-#: builtin/rebase.c:1354 builtin/rebase.c:1357
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1354
msgid "continue"
msgstr ""
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1357
msgid "skip current patch and continue"
msgstr ""
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1359
msgid "abort and check out the original branch"
msgstr ""
-#: builtin/rebase.c:1367
+#: builtin/rebase.c:1362
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1363
msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/rebase.c:1371
+#: builtin/rebase.c:1366
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:1374
+#: builtin/rebase.c:1369
msgid "use apply strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1378
+#: builtin/rebase.c:1373
msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1382
+#: builtin/rebase.c:1377
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1381
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:1391
+#: builtin/rebase.c:1386
msgid "how to handle commits that become empty"
msgstr ""
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1393
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:1405
+#: builtin/rebase.c:1400
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1404
msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1408
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1411
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1413
msgid "use the given merge strategy"
msgstr ""
-#: builtin/rebase.c:1420 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
msgid "option"
msgstr ""
-#: builtin/rebase.c:1421
+#: builtin/rebase.c:1416
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1419
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1429
+#: builtin/rebase.c:1424
msgid "apply all changes, even those already present upstream"
msgstr ""
-#: builtin/rebase.c:1446
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1442
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1483
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1488
msgid "cannot combine '--keep-base' with '--onto'"
msgstr ""
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1490
msgid "cannot combine '--keep-base' with '--root'"
msgstr ""
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1494
msgid "cannot combine '--root' with '--fork-point'"
msgstr ""
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1497
msgid "No rebase in progress?"
msgstr ""
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:1501
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr ""
-#: builtin/rebase.c:1546
+#: builtin/rebase.c:1536
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: builtin/rebase.c:1565
+#: builtin/rebase.c:1555
msgid "could not discard worktree changes"
msgstr ""
-#: builtin/rebase.c:1584
+#: builtin/rebase.c:1574
#, c-format
msgid "could not move back to %s"
msgstr ""
-#: builtin/rebase.c:1630
+#: builtin/rebase.c:1620
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18608,131 +18893,131 @@ msgid ""
"valuable there.\n"
msgstr ""
-#: builtin/rebase.c:1658
+#: builtin/rebase.c:1648
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1700
+#: builtin/rebase.c:1690
#, c-format
msgid "Unknown mode: %s"
msgstr ""
-#: builtin/rebase.c:1739
+#: builtin/rebase.c:1729
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1769
+#: builtin/rebase.c:1759
msgid "cannot combine apply options with merge options"
msgstr ""
-#: builtin/rebase.c:1782
+#: builtin/rebase.c:1772
#, c-format
msgid "Unknown rebase backend: %s"
msgstr ""
-#: builtin/rebase.c:1812
+#: builtin/rebase.c:1802
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1822
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/rebase.c:1836
+#: builtin/rebase.c:1826
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/rebase.c:1860
+#: builtin/rebase.c:1850
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1866
+#: builtin/rebase.c:1856
msgid "Could not create new root commit"
msgstr ""
-#: builtin/rebase.c:1892
+#: builtin/rebase.c:1882
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr ""
-#: builtin/rebase.c:1895
+#: builtin/rebase.c:1885
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/rebase.c:1903
+#: builtin/rebase.c:1893
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/rebase.c:1931
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2414
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2415
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/rebase.c:1950
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1961
msgid "Please commit or stash them."
msgstr ""
-#: builtin/rebase.c:2007
+#: builtin/rebase.c:1997
#, c-format
msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:2008
msgid "HEAD is up to date."
msgstr ""
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:2010
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:2018
msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/rebase.c:2030
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:2028
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/rebase.c:2045
+#: builtin/rebase.c:2035
#, c-format
msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase.c:2048
+#: builtin/rebase.c:2038
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:2063
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/rebase.c:2082
+#: builtin/rebase.c:2072
msgid "Could not detach HEAD"
msgstr ""
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2081
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr ""
@@ -18770,11 +19055,11 @@ msgid ""
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:2481
+#: builtin/receive-pack.c:2479
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:2495
+#: builtin/receive-pack.c:2493
msgid "You must specify a directory."
msgstr ""
@@ -18996,7 +19281,7 @@ msgid ""
"now names the non-existent remote '%s'"
msgstr ""
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
#, c-format
msgid "No such remote: '%s'"
msgstr ""
@@ -19340,7 +19625,7 @@ msgstr ""
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:270 builtin/repack.c:446
+#: builtin/repack.c:270 builtin/repack.c:630
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
@@ -19348,104 +19633,127 @@ msgstr ""
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:322
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr ""
+
+#: builtin/repack.c:368
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr ""
+
+#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr ""
+
+#: builtin/repack.c:460
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:324
+#: builtin/repack.c:462
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:327
+#: builtin/repack.c:465
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:329
+#: builtin/repack.c:467
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:331
+#: builtin/repack.c:469
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:333
+#: builtin/repack.c:471
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:336
+#: builtin/repack.c:474
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:338
+#: builtin/repack.c:476
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:340
+#: builtin/repack.c:478
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:341
+#: builtin/repack.c:479
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:342
+#: builtin/repack.c:480
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:344
+#: builtin/repack.c:482
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:346
+#: builtin/repack.c:484
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:347 builtin/repack.c:353
+#: builtin/repack.c:485 builtin/repack.c:491
msgid "bytes"
msgstr ""
-#: builtin/repack.c:348
+#: builtin/repack.c:486
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:350
+#: builtin/repack.c:488
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:352
+#: builtin/repack.c:490
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:354
+#: builtin/repack.c:492
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:356
+#: builtin/repack.c:494
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:358
+#: builtin/repack.c:496
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:368
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr ""
+
+#: builtin/repack.c:508
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:372
+#: builtin/repack.c:512
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:455
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr ""
+
+#: builtin/repack.c:639
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:485
+#: builtin/repack.c:669
#, c-format
msgid "missing required file: %s"
msgstr ""
-#: builtin/repack.c:487
+#: builtin/repack.c:671
#, c-format
msgid "could not unlink: %s"
msgstr ""
@@ -19767,8 +20075,8 @@ msgstr ""
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
-#: builtin/stash.c:685
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
msgid "be quiet, only report errors"
msgstr ""
@@ -19846,19 +20154,19 @@ msgstr ""
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:534
+#: builtin/rev-list.c:538
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:595
+#: builtin/rev-list.c:599
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:651
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-list.c:656
+#: builtin/rev-list.c:664
msgid "marked counting is incompatible with --objects"
msgstr ""
@@ -19965,19 +20273,19 @@ msgstr ""
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:239
+#: builtin/revert.c:237
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:252
+#: builtin/revert.c:250
msgid "cherry-pick failed"
msgstr ""
-#: builtin/rm.c:19
+#: builtin/rm.c:20
msgid "git rm [<options>] [--] <file>..."
msgstr ""
-#: builtin/rm.c:207
+#: builtin/rm.c:208
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -19987,64 +20295,64 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:212
+#: builtin/rm.c:213
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:216
+#: builtin/rm.c:217
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:220 builtin/rm.c:229
+#: builtin/rm.c:221 builtin/rm.c:230
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/rm.c:226
+#: builtin/rm.c:227
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:248
+#: builtin/rm.c:249
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:282
+#: builtin/rm.c:283
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
-#: builtin/rm.c:305
+#: builtin/rm.c:310
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rm.c:323
+#: builtin/rm.c:331
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:362
+#: builtin/rm.c:379
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
@@ -20310,102 +20618,110 @@ msgstr ""
msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/sparse-checkout.c:21
+#: builtin/sparse-checkout.c:22
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr ""
-#: builtin/sparse-checkout.c:45
+#: builtin/sparse-checkout.c:46
msgid "git sparse-checkout list"
msgstr ""
-#: builtin/sparse-checkout.c:71
+#: builtin/sparse-checkout.c:72
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:223
+#: builtin/sparse-checkout.c:227
msgid "failed to create directory for sparse-checkout file"
msgstr ""
-#: builtin/sparse-checkout.c:264
+#: builtin/sparse-checkout.c:268
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:270
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:283
-msgid "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:310
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:339
+#: builtin/sparse-checkout.c:312
+msgid "toggle the use of a sparse index"
+msgstr ""
+
+#: builtin/sparse-checkout.c:340
+msgid "failed to modify sparse-index config"
+msgstr ""
+
+#: builtin/sparse-checkout.c:361
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:396
+#: builtin/sparse-checkout.c:419
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:408
+#: builtin/sparse-checkout.c:431
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:433
+#: builtin/sparse-checkout.c:456
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
+#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:556
+#: builtin/sparse-checkout.c:579
msgid "read patterns from standard in"
msgstr ""
-#: builtin/sparse-checkout.c:571
+#: builtin/sparse-checkout.c:594
msgid "git sparse-checkout reapply"
msgstr ""
-#: builtin/sparse-checkout.c:590
+#: builtin/sparse-checkout.c:613
msgid "git sparse-checkout disable"
msgstr ""
-#: builtin/sparse-checkout.c:618
+#: builtin/sparse-checkout.c:644
msgid "error while refreshing working directory"
msgstr ""
-#: builtin/stash.c:22 builtin/stash.c:38
+#: builtin/stash.c:24 builtin/stash.c:40
msgid "git stash list [<options>]"
msgstr ""
-#: builtin/stash.c:23 builtin/stash.c:43
+#: builtin/stash.c:25 builtin/stash.c:45
msgid "git stash show [<options>] [<stash>]"
msgstr ""
-#: builtin/stash.c:24 builtin/stash.c:48
+#: builtin/stash.c:26 builtin/stash.c:50
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/stash.c:25
+#: builtin/stash.c:27
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/stash.c:26 builtin/stash.c:63
+#: builtin/stash.c:28 builtin/stash.c:65
msgid "git stash branch <branchname> [<stash>]"
msgstr ""
-#: builtin/stash.c:27 builtin/stash.c:68
+#: builtin/stash.c:29 builtin/stash.c:70
msgid "git stash clear"
msgstr ""
-#: builtin/stash.c:28
+#: builtin/stash.c:30
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -20413,55 +20729,55 @@ msgid ""
" [--] [<pathspec>...]]"
msgstr ""
-#: builtin/stash.c:32 builtin/stash.c:85
+#: builtin/stash.c:34 builtin/stash.c:87
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-#: builtin/stash.c:53
+#: builtin/stash.c:55
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/stash.c:58
+#: builtin/stash.c:60
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/stash.c:73
+#: builtin/stash.c:75
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr ""
-#: builtin/stash.c:78
+#: builtin/stash.c:80
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<pathspec>...]]"
msgstr ""
-#: builtin/stash.c:128
+#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr ""
-#: builtin/stash.c:148
+#: builtin/stash.c:150
#, c-format
msgid "Too many revisions specified:%s"
msgstr ""
-#: builtin/stash.c:162
+#: builtin/stash.c:164
msgid "No stash entries found."
msgstr ""
-#: builtin/stash.c:176
+#: builtin/stash.c:178
#, c-format
msgid "%s is not a valid reference"
msgstr ""
-#: builtin/stash.c:225
+#: builtin/stash.c:227
msgid "git stash clear with arguments is unimplemented"
msgstr ""
-#: builtin/stash.c:429
+#: builtin/stash.c:431
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -20469,150 +20785,166 @@ msgid ""
" to make room.\n"
msgstr ""
-#: builtin/stash.c:490
+#: builtin/stash.c:492
msgid "cannot apply a stash in the middle of a merge"
msgstr ""
-#: builtin/stash.c:501
+#: builtin/stash.c:503
#, c-format
msgid "could not generate diff %s^!."
msgstr ""
-#: builtin/stash.c:508
+#: builtin/stash.c:510
msgid "conflicts in index. Try without --index."
msgstr ""
-#: builtin/stash.c:514
+#: builtin/stash.c:516
msgid "could not save index tree"
msgstr ""
-#: builtin/stash.c:523
+#: builtin/stash.c:525
msgid "could not restore untracked files from stash"
msgstr ""
-#: builtin/stash.c:537
+#: builtin/stash.c:539
#, c-format
msgid "Merging %s with %s"
msgstr ""
-#: builtin/stash.c:547
+#: builtin/stash.c:549
msgid "Index was not unstashed."
msgstr ""
-#: builtin/stash.c:589 builtin/stash.c:687
+#: builtin/stash.c:591 builtin/stash.c:689
msgid "attempt to recreate the index"
msgstr ""
-#: builtin/stash.c:633
+#: builtin/stash.c:635
#, c-format
msgid "Dropped %s (%s)"
msgstr ""
-#: builtin/stash.c:636
+#: builtin/stash.c:638
#, c-format
msgid "%s: Could not drop stash entry"
msgstr ""
-#: builtin/stash.c:649
+#: builtin/stash.c:651
#, c-format
msgid "'%s' is not a stash reference"
msgstr ""
-#: builtin/stash.c:699
+#: builtin/stash.c:701
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: builtin/stash.c:722
+#: builtin/stash.c:724
msgid "No branch name specified"
msgstr ""
-#: builtin/stash.c:866 builtin/stash.c:903
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr ""
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr ""
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr ""
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr ""
+
+#: builtin/stash.c:932 builtin/stash.c:969
#, c-format
msgid "Cannot update %s with %s"
msgstr ""
-#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
+#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
msgid "stash message"
msgstr ""
-#: builtin/stash.c:894
+#: builtin/stash.c:960
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1109
+#: builtin/stash.c:1175
msgid "No changes selected"
msgstr ""
-#: builtin/stash.c:1209
+#: builtin/stash.c:1275
msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/stash.c:1236
+#: builtin/stash.c:1302
msgid "Cannot save the current index state"
msgstr ""
-#: builtin/stash.c:1245
+#: builtin/stash.c:1311
msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/stash.c:1256 builtin/stash.c:1265
+#: builtin/stash.c:1322 builtin/stash.c:1331
msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/stash.c:1293
+#: builtin/stash.c:1359
msgid "Cannot record working tree state"
msgstr ""
-#: builtin/stash.c:1342
+#: builtin/stash.c:1408
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/stash.c:1358
+#: builtin/stash.c:1426
msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/stash.c:1373
+#: builtin/stash.c:1441
msgid "No local changes to save"
msgstr ""
-#: builtin/stash.c:1380
+#: builtin/stash.c:1448
msgid "Cannot initialize stash"
msgstr ""
-#: builtin/stash.c:1395
+#: builtin/stash.c:1463
msgid "Cannot save the current status"
msgstr ""
-#: builtin/stash.c:1400
+#: builtin/stash.c:1468
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/stash.c:1490
+#: builtin/stash.c:1558
msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/stash.c:1529 builtin/stash.c:1594
+#: builtin/stash.c:1597 builtin/stash.c:1662
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1531 builtin/stash.c:1596
+#: builtin/stash.c:1599 builtin/stash.c:1664
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1532 builtin/stash.c:1597
+#: builtin/stash.c:1600 builtin/stash.c:1665
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1534 builtin/stash.c:1599
+#: builtin/stash.c:1602 builtin/stash.c:1667
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1536 builtin/stash.c:1601
+#: builtin/stash.c:1604 builtin/stash.c:1669
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1636
+#: builtin/stash.c:1704
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -20634,7 +20966,7 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
@@ -20648,7 +20980,7 @@ msgstr ""
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
msgid "alternative anchor for relative paths"
msgstr ""
@@ -20656,25 +20988,25 @@ msgstr ""
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
+#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid "Entering '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:527
+#: builtin/submodule--helper.c:528
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:549
+#: builtin/submodule--helper.c:550
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -20682,220 +21014,220 @@ msgid ""
"."
msgstr ""
-#: builtin/submodule--helper.c:565
+#: builtin/submodule--helper.c:566
msgid "suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:1488
msgid "recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:572
+#: builtin/submodule--helper.c:573
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:600
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:667
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:671
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:681
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:688
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:709
+#: builtin/submodule--helper.c:710
msgid "suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:714
+#: builtin/submodule--helper.c:715
msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:836
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
msgid "suppress submodule status output"
msgstr ""
-#: builtin/submodule--helper.c:887
+#: builtin/submodule--helper.c:888
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:894
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:918
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr ""
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:993
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr ""
-#: builtin/submodule--helper.c:1005
+#: builtin/submodule--helper.c:1006
#, c-format
msgid "%s"
msgstr ""
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1056
#, c-format
msgid "couldn't hash object from '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1059
+#: builtin/submodule--helper.c:1060
#, c-format
msgid "unexpected mode %o\n"
msgstr ""
-#: builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1301
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1303
msgid "to compare the commit in the index with that in the submodule HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1305
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1307
msgid "limit the summary size"
msgstr ""
-#: builtin/submodule--helper.c:1311
+#: builtin/submodule--helper.c:1312
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1335
+#: builtin/submodule--helper.c:1336
msgid "could not fetch a revision for HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
msgid "--cached and --files are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1408
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1414
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1427
+#: builtin/submodule--helper.c:1428
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1439
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1485
+#: builtin/submodule--helper.c:1486
msgid "suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1493
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1547
#, 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)"
msgstr ""
-#: builtin/submodule--helper.c:1558
+#: builtin/submodule--helper.c:1559
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1569
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1580
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c:1596
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1625
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1626
msgid "unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1631
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1645
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1714
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"
@@ -20903,231 +21235,231 @@ msgid ""
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1792
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1799
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1823
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1826
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1829
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1837
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
msgid "disallow cloning into non-empty directory"
msgstr ""
-#: builtin/submodule--helper.c:1848
+#: builtin/submodule--helper.c:1849
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:1873
+#: builtin/submodule--helper.c:1874
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
-#: builtin/submodule--helper.c:1884
+#: builtin/submodule--helper.c:1885
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1888
+#: builtin/submodule--helper.c:1889
#, c-format
msgid "directory not empty: '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1900
+#: builtin/submodule--helper.c:1901
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1936
+#: builtin/submodule--helper.c:1937
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1940
+#: builtin/submodule--helper.c:1941
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2042
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2046
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2076
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2105
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2255
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2266
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2331
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2335
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:2340
+#: builtin/submodule--helper.c:2341
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2344
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2346
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2347
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2358
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2371
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2419
#, 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:2541
+#: builtin/submodule--helper.c:2542
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2575
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2581
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2637
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2639
+#: builtin/submodule--helper.c:2640
msgid "unset the config in the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2644
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config <name> [<value>]"
msgstr ""
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2647
msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
+#: builtin/submodule--helper.c:2666 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2681
+#: builtin/submodule--helper.c:2682
msgid "suppress output for setting url of a submodule"
msgstr ""
-#: builtin/submodule--helper.c:2685
+#: builtin/submodule--helper.c:2686
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr ""
-#: builtin/submodule--helper.c:2718
+#: builtin/submodule--helper.c:2719
msgid "set the default tracking branch to master"
msgstr ""
-#: builtin/submodule--helper.c:2720
+#: builtin/submodule--helper.c:2721
msgid "set the default tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:2724
+#: builtin/submodule--helper.c:2725
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr ""
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2726
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
-#: builtin/submodule--helper.c:2732
+#: builtin/submodule--helper.c:2733
msgid "--branch or --default required"
msgstr ""
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2736
msgid "--branch and --default are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:2792 git.c:441 git.c:714
+#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:2799
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -21140,23 +21472,23 @@ msgstr ""
msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
msgid "delete symbolic ref"
msgstr ""
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
msgid "reason of the update"
msgstr ""
@@ -21182,17 +21514,17 @@ msgstr ""
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/tag.c:89
+#: builtin/tag.c:100
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:124
+#: builtin/tag.c:135
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:159
+#: builtin/tag.c:170
#, c-format
msgid ""
"\n"
@@ -21201,7 +21533,7 @@ msgid ""
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:163
+#: builtin/tag.c:174
#, c-format
msgid ""
"\n"
@@ -21211,11 +21543,11 @@ msgid ""
"want to.\n"
msgstr ""
-#: builtin/tag.c:230
+#: builtin/tag.c:241
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:248
+#: builtin/tag.c:259
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -21224,139 +21556,139 @@ msgid ""
"\tgit tag -f %s %s^{}"
msgstr ""
-#: builtin/tag.c:264
+#: builtin/tag.c:275
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:317
+#: builtin/tag.c:328
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:324
+#: builtin/tag.c:335
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:435
+#: builtin/tag.c:446
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:437
+#: builtin/tag.c:448
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:439
+#: builtin/tag.c:450
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:440
+#: builtin/tag.c:451
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:442
+#: builtin/tag.c:453
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:444
+#: builtin/tag.c:455
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:446
+#: builtin/tag.c:457
msgid "tag message"
msgstr ""
-#: builtin/tag.c:448
+#: builtin/tag.c:459
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:449
+#: builtin/tag.c:460
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:452
+#: builtin/tag.c:463
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:453
+#: builtin/tag.c:464
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:454 builtin/update-ref.c:505
+#: builtin/tag.c:465 builtin/update-ref.c:505
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:456
+#: builtin/tag.c:467
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:457
+#: builtin/tag.c:468
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:458 builtin/tag.c:460
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:459 builtin/tag.c:461
+#: builtin/tag.c:470 builtin/tag.c:472
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:462
+#: builtin/tag.c:473
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:463
+#: builtin/tag.c:474
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:467
+#: builtin/tag.c:478
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:515
+#: builtin/tag.c:526
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:537
+#: builtin/tag.c:548
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:539
+#: builtin/tag.c:550
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:541
+#: builtin/tag.c:552
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:543
+#: builtin/tag.c:554
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:545
+#: builtin/tag.c:556
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:556
+#: builtin/tag.c:567
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:581
+#: builtin/tag.c:592
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:586
+#: builtin/tag.c:597
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:617
+#: builtin/tag.c:628
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/unpack-objects.c:502
+#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr ""
@@ -21417,189 +21749,189 @@ msgstr ""
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:974
+#: builtin/update-index.c:976
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:977
+#: builtin/update-index.c:979
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:980
+#: builtin/update-index.c:982
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:982
+#: builtin/update-index.c:984
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:984
+#: builtin/update-index.c:986
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:986
+#: builtin/update-index.c:988
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:989
+#: builtin/update-index.c:991
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:993
+#: builtin/update-index.c:995
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:999
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1000
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1013
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1016
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1019
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1022
msgid "do not touch index-only entries"
msgstr ""
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1024
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1026
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1028
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1030
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1034
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1038
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1042
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1046
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1049
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1051
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1055
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1057
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1059
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1061
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1063
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1065
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1067
msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1069
msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/update-index.c:1070
+#: builtin/update-index.c:1072
msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1175
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1182
+#: builtin/update-index.c:1184
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1196
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1198
+#: builtin/update-index.c:1200
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1208
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1210
+#: builtin/update-index.c:1212
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1220
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1222
+#: builtin/update-index.c:1224
msgid "fsmonitor enabled"
msgstr ""
-#: builtin/update-index.c:1225
+#: builtin/update-index.c:1227
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1229
+#: builtin/update-index.c:1231
msgid "fsmonitor disabled"
msgstr ""
@@ -21719,7 +22051,7 @@ msgstr ""
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:61 builtin/worktree.c:933
+#: builtin/worktree.c:61 builtin/worktree.c:935
#, c-format
msgid "failed to delete '%s'"
msgstr ""
@@ -21786,167 +22118,167 @@ msgstr ""
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:480
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:483
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:487
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:488
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:491
+#: builtin/worktree.c:493
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:494
+#: builtin/worktree.c:496
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:502
+#: builtin/worktree.c:504
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:563
+#: builtin/worktree.c:565
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:680
+#: builtin/worktree.c:682
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:682
+#: builtin/worktree.c:684
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-#: builtin/worktree.c:691
+#: builtin/worktree.c:693
msgid "--verbose and --porcelain are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:718
+#: builtin/worktree.c:720
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
-#: builtin/worktree.c:961
+#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
+#: builtin/worktree.c:963
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:732 builtin/worktree.c:765
+#: builtin/worktree.c:734 builtin/worktree.c:767
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:737
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:739
+#: builtin/worktree.c:741
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:767
+#: builtin/worktree.c:769
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:808
+#: builtin/worktree.c:810
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:816
+#: builtin/worktree.c:818
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:839 builtin/worktree.c:963
+#: builtin/worktree.c:841 builtin/worktree.c:965
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:844
+#: builtin/worktree.c:846
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:857
+#: builtin/worktree.c:859
#, 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:859
+#: builtin/worktree.c:861
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:862
+#: builtin/worktree.c:864
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:867
+#: builtin/worktree.c:869
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:913
+#: builtin/worktree.c:915
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:917
+#: builtin/worktree.c:919
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:922
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:945
+#: builtin/worktree.c:947
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:968
+#: builtin/worktree.c:970
#, 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:970
+#: builtin/worktree.c:972
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:973
+#: builtin/worktree.c:975
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/worktree.c:997
+#: builtin/worktree.c:999
#, c-format
msgid "repair: %s: %s"
msgstr ""
-#: builtin/worktree.c:1000
+#: builtin/worktree.c:1002
#, c-format
msgid "error: %s: %s"
msgstr ""
@@ -21967,48 +22299,6 @@ msgstr ""
msgid "only useful for debugging"
msgstr ""
-#: http-fetch.c:118
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr ""
-
-#: http-fetch.c:128
-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 ""
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr ""
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr ""
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
#: git.c:28
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -22053,77 +22343,228 @@ msgstr ""
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:292
+#: git.c:260
+#, c-format
+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:318
+#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:367
+#: git.c:375
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: git.c:376
+#: git.c:384
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
-#: git.c:383
+#: git.c:391
#, c-format
msgid "empty alias for %s"
msgstr ""
-#: git.c:386
+#: git.c:394
#, c-format
msgid "recursive alias: %s"
msgstr ""
-#: git.c:468
+#: git.c:476
msgid "write failure on standard output"
msgstr ""
-#: git.c:470
+#: git.c:478
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:472
+#: git.c:480
msgid "close failed on standard output"
msgstr ""
-#: git.c:823
+#: git.c:833
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:873
+#: git.c:883
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:886
+#: git.c:896
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:906
+#: git.c:916
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:918
+#: git.c:928
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
+#: http-fetch.c:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr ""
+
+#: http-fetch.c:128
+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 ""
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr ""
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:262
+#, c-format
+msgid "socket/pipe already in use: '%s'"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:264
+#, c-format
+msgid "could not start server on: '%s'"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
+msgid "could not spawn daemon in the background"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:356
+msgid "waitpid failed"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:376
+msgid "daemon not online yet"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:406
+msgid "daemon failed to start"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:410
+msgid "waitpid is confused"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:541
+msgid "daemon has not shutdown yet"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:682
+msgid "test-helper simple-ipc is-active [<name>] [<options>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:683
+msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:684
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:685
+msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:686
+msgid "test-helper simple-ipc send [<name>] [<token>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:687
+msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:688
+msgid ""
+"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:696
+msgid "name or pathname of unix domain socket"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:698
+msgid "named-pipe name"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:700
+msgid "number of threads in server thread pool"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:701
+msgid "seconds to wait for daemon to start or stop"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:703
+msgid "number of bytes"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:704
+msgid "number of requests per thread"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:707
+msgid "command token to send to the server"
+msgstr ""
+
#: http.c:399
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
@@ -22160,7 +22601,7 @@ msgstr ""
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:2025
+#: http.c:2035
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22308,43 +22749,43 @@ msgstr ""
msgid "no libc information available\n"
msgstr ""
-#: list-objects-filter-options.h:91
+#: list-objects-filter-options.h:94
msgid "args"
msgstr ""
-#: list-objects-filter-options.h:92
+#: list-objects-filter-options.h:95
msgid "object filtering"
msgstr ""
-#: parse-options.h:183
+#: parse-options.h:184
msgid "expiry-date"
msgstr ""
-#: parse-options.h:197
+#: parse-options.h:198
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:309
+#: parse-options.h:310
msgid "be more verbose"
msgstr ""
-#: parse-options.h:311
+#: parse-options.h:312
msgid "be more quiet"
msgstr ""
-#: parse-options.h:317
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr ""
-#: parse-options.h:336
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: parse-options.h:337
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr ""
-#: parse-options.h:338
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
@@ -23846,73 +24287,78 @@ msgstr ""
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:223 git-send-email.perl:229
+#: git-send-email.perl:222
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr ""
+
+#: git-send-email.perl:235
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:312
+#: git-send-email.perl:321
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:317
+#: git-send-email.perl:326
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:410
+#: git-send-email.perl:419
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:484
+#: git-send-email.perl:493
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:489 git-send-email.perl:691
+#: git-send-email.perl:498 git-send-email.perl:700
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:492
+#: git-send-email.perl:501
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:505
+#: git-send-email.perl:514
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:536
+#: git-send-email.perl:545
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:564
+#: git-send-email.perl:573
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:566
+#: git-send-email.perl:575
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:568
+#: git-send-email.perl:577
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:573
+#: git-send-email.perl:582
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:657
+#: git-send-email.perl:666
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -23922,36 +24368,29 @@ msgid ""
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:678
+#: git-send-email.perl:687
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:702
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-
-#: git-send-email.perl:713
+#: git-send-email.perl:720
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:726
+#: git-send-email.perl:733
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:736
+#: git-send-email.perl:743
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:747
+#: git-send-email.perl:754
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -23960,37 +24399,37 @@ msgid ""
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:771
+#: git-send-email.perl:778
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:788
+#: git-send-email.perl:795
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:831
+#: git-send-email.perl:838
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:866
+#: git-send-email.perl:873
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:921
+#: git-send-email.perl:928
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:926
+#: git-send-email.perl:933
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:934
+#: git-send-email.perl:941
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -23999,20 +24438,20 @@ msgid ""
"want to send.\n"
msgstr ""
-#: git-send-email.perl:953
+#: git-send-email.perl:960
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:971
+#: git-send-email.perl:978
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:983
+#: git-send-email.perl:990
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:1041 git-send-email.perl:1049
+#: git-send-email.perl:1048 git-send-email.perl:1056
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
@@ -24020,16 +24459,16 @@ 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:1053
+#: git-send-email.perl:1060
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1370
+#: git-send-email.perl:1377
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1460
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -24046,128 +24485,138 @@ msgstr ""
#. 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:1468
+#: git-send-email.perl:1475
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1471
+#: git-send-email.perl:1478
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1499
+#: git-send-email.perl:1506
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1546
+#: git-send-email.perl:1553
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1551 git-send-email.perl:1555
+#: git-send-email.perl:1558 git-send-email.perl:1562
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1564
+#: git-send-email.perl:1571
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1582
+#: git-send-email.perl:1589
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1585
+#: git-send-email.perl:1592
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1585
+#: git-send-email.perl:1592
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1587
+#: git-send-email.perl:1594
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1587
+#: git-send-email.perl:1594
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1599
+#: git-send-email.perl:1606
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1602
+#: git-send-email.perl:1609
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1620
+#: git-send-email.perl:1627
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1667 git-send-email.perl:1687
+#: git-send-email.perl:1674 git-send-email.perl:1694
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1673
+#: git-send-email.perl:1680
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1730
+#: git-send-email.perl:1737
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1765
+#: git-send-email.perl:1772
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1876
+#: git-send-email.perl:1883
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1883
+#: git-send-email.perl:1890
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1887
+#: git-send-email.perl:1894
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1917
+#: git-send-email.perl:1924
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1925
+#: git-send-email.perl:1932
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
+#: git-send-email.perl:1966
+#, perl-format
+msgid ""
+"fatal: %s: rejected by sendemail-validate hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+
+#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1969
+#: git-send-email.perl:1979
#, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:1986
+#: git-send-email.perl:1997
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1990
+#: git-send-email.perl:2001
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""