l10n: git.pot: v2.20.0 round 1 (254 new, 27 removed)

Generate po/git.pot from v2.20.0-rc0-23-gbb75be6cb9 for git v2.20.0 l10n
round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

diff --git a/po/git.pot b/po/git.pot
index e76b02aee4475c375f52443df0769a0d432e953f..b1179f6982733103af41fb09cc2980046a15d15a 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

-"POT-Creation-Date: 2018-09-04 08:50+0800\n"
+"POT-Creation-Date: 2018-11-20 10:05+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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -18,59 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 

-#: advice.c:97
+#: advice.c:99

 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr ""
 
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr ""
 

-#: advice.c:150
+#: advice.c:152

 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 

-#: advice.c:152
+#: advice.c:154

 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 

-#: advice.c:154
+#: advice.c:156

 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 

-#: advice.c:156
+#: advice.c:158

 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 

-#: advice.c:158
+#: advice.c:160

 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 

-#: advice.c:160
+#: advice.c:162

 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 

-#: advice.c:168
+#: advice.c:170

 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 ""
 
 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:176
+#: advice.c:178

 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 
 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 

-#: advice.c:181 builtin/merge.c:1286
+#: advice.c:183 builtin/merge.c:1289

 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 

-#: advice.c:183
+#: advice.c:185

 msgid "Please, commit your changes before merging."
 msgstr ""
 
 msgid "Please, commit your changes before merging."
 msgstr ""
 

-#: advice.c:184
+#: advice.c:186

 msgid "Exiting because of unfinished merge."
 msgstr ""
 
 msgid "Exiting because of unfinished merge."
 msgstr ""
 

-#: advice.c:190
+#: advice.c:192

 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"


@@ -156,22 +156,22 @@ msgstr ""
 msgid "invalid mode on line %d: %s"
 msgstr ""
 
 msgid "invalid mode on line %d: %s"
 msgstr ""
 

-#: apply.c:1306
+#: apply.c:1307

 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr ""
 
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr ""
 

-#: apply.c:1478
+#: apply.c:1479

 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr ""
 
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr ""
 

-#: apply.c:1547
+#: apply.c:1548

 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 

-#: apply.c:1567
+#: apply.c:1568

 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "


@@ -182,526 +182,527 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apply.c:1580
+#: apply.c:1581

 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 

-#: apply.c:1768
+#: apply.c:1769

 msgid "new file depends on old contents"
 msgstr ""
 
 msgid "new file depends on old contents"
 msgstr ""
 

-#: apply.c:1770
+#: apply.c:1771

 msgid "deleted file still has contents"
 msgstr ""
 
 msgid "deleted file still has contents"
 msgstr ""
 

-#: apply.c:1804
+#: apply.c:1805

 #, c-format
 msgid "corrupt patch at line %d"
 msgstr ""
 
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr ""
 

-#: apply.c:1841
+#: apply.c:1842

 #, c-format
 msgid "new file %s depends on old contents"
 msgstr ""
 
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr ""
 

-#: apply.c:1843
+#: apply.c:1844

 #, c-format
 msgid "deleted file %s still has contents"
 msgstr ""
 
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr ""
 

-#: apply.c:1846
+#: apply.c:1847

 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 

-#: apply.c:1993
+#: apply.c:1994

 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 

-#: apply.c:2030
+#: apply.c:2031

 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr ""
 
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr ""
 

-#: apply.c:2190
+#: apply.c:2193

 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr ""
 
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr ""
 

-#: apply.c:2276
+#: apply.c:2279

 #, c-format
 msgid "unable to read symlink %s"
 msgstr ""
 
 #, c-format
 msgid "unable to read symlink %s"
 msgstr ""
 

-#: apply.c:2280
+#: apply.c:2283

 #, c-format
 msgid "unable to open or read %s"
 msgstr ""
 
 #, c-format
 msgid "unable to open or read %s"
 msgstr ""
 

-#: apply.c:2939
+#: apply.c:2942

 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr ""
 
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr ""
 

-#: apply.c:3060
+#: apply.c:3063

 #, 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] ""
 
 #, 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:3072
+#: apply.c:3075

 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 

-#: apply.c:3078
+#: apply.c:3081

 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
 
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
 

-#: apply.c:3100
+#: apply.c:3103

 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr ""
 
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr ""
 

-#: apply.c:3108
+#: apply.c:3111

 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 

-#: apply.c:3154
+#: apply.c:3158

 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 

-#: apply.c:3164
+#: apply.c:3168

 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 

-#: apply.c:3172
+#: apply.c:3176

 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr ""
 
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr ""
 

-#: apply.c:3190
+#: apply.c:3194

 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 

-#: apply.c:3203
+#: apply.c:3207

 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr ""
 
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr ""
 

-#: apply.c:3209
+#: apply.c:3213

 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 

-#: apply.c:3230
+#: apply.c:3234

 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr ""
 
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr ""
 

-#: apply.c:3352
+#: apply.c:3356

 #, c-format
 msgid "cannot checkout %s"
 msgstr ""
 
 #, c-format
 msgid "cannot checkout %s"
 msgstr ""
 

-#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278
+#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

 #, c-format
 msgid "failed to read %s"
 msgstr ""
 
 #, c-format
 msgid "failed to read %s"
 msgstr ""
 

-#: apply.c:3412
+#: apply.c:3416

 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 

-#: apply.c:3441 apply.c:3681
+#: apply.c:3445 apply.c:3688

 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 

-#: apply.c:3524 apply.c:3696
+#: apply.c:3531 apply.c:3703

 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 
 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 

-#: apply.c:3533 apply.c:3704
+#: apply.c:3540 apply.c:3711

 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 
 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 

-#: apply.c:3568
+#: apply.c:3575

 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 

-#: apply.c:3571
+#: apply.c:3578

 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr ""
 
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr ""
 

-#: apply.c:3587 apply.c:3591
+#: apply.c:3594 apply.c:3598

 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr ""
 

-#: apply.c:3603
+#: apply.c:3610

 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr ""
 

-#: apply.c:3617
+#: apply.c:3624

 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr ""
 
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr ""
 

-#: apply.c:3622
+#: apply.c:3629

 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr ""
 
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr ""
 

-#: apply.c:3648
+#: apply.c:3655

 msgid "removal patch leaves file contents"
 msgstr ""
 
 msgid "removal patch leaves file contents"
 msgstr ""
 

-#: apply.c:3721
+#: apply.c:3728

 #, c-format
 msgid "%s: wrong type"
 msgstr ""
 
 #, c-format
 msgid "%s: wrong type"
 msgstr ""
 

-#: apply.c:3723
+#: apply.c:3730

 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 

-#: apply.c:3874 apply.c:3876
+#: apply.c:3881 apply.c:3883

 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 

-#: apply.c:3932
+#: apply.c:3939

 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 
 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 

-#: apply.c:3935
+#: apply.c:3942

 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 

-#: apply.c:3955
+#: apply.c:3962

 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 

-#: apply.c:3960
+#: apply.c:3967

 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 

-#: apply.c:3980
+#: apply.c:3987

 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 

-#: apply.c:3984
+#: apply.c:3991

 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 
 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 

-#: apply.c:3999
+#: apply.c:4006

 #, c-format
 msgid "Checking patch %s..."
 msgstr ""
 
 #, c-format
 msgid "Checking patch %s..."
 msgstr ""
 

-#: apply.c:4091
+#: apply.c:4098

 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 

-#: apply.c:4098
+#: apply.c:4105

 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr ""
 
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr ""
 

-#: apply.c:4101
+#: apply.c:4108

 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 

-#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140
+#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr ""
 
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr ""
 

-#: apply.c:4110
+#: apply.c:4117

 #, c-format
 msgid "could not add %s to temporary index"
 msgstr ""
 
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr ""
 

-#: apply.c:4120
+#: apply.c:4127

 #, c-format
 msgid "could not write temporary index to %s"
 msgstr ""
 
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr ""
 

-#: apply.c:4258
+#: apply.c:4265

 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 
 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 

-#: apply.c:4292
+#: apply.c:4299

 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr ""
 
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr ""
 

-#: apply.c:4298
+#: apply.c:4305

 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 

-#: apply.c:4306
+#: apply.c:4313

 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 

-#: apply.c:4312 apply.c:4457
+#: apply.c:4319 apply.c:4464

 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr ""
 
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr ""
 

-#: apply.c:4355
+#: apply.c:4362

 #, c-format
 msgid "failed to write to '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to write to '%s'"
 msgstr ""
 

-#: apply.c:4359
+#: apply.c:4366

 #, c-format
 msgid "closing file '%s'"
 msgstr ""
 
 #, c-format
 msgid "closing file '%s'"
 msgstr ""
 

-#: apply.c:4429
+#: apply.c:4436

 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr ""
 
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr ""
 

-#: apply.c:4527
+#: apply.c:4534

 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr ""
 
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr ""
 

-#: apply.c:4535
+#: apply.c:4542

 msgid "internal error"
 msgstr ""
 
 msgid "internal error"
 msgstr ""
 

-#: apply.c:4538
+#: apply.c:4545

 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: apply.c:4549
+#: apply.c:4556

 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 

-#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048
+#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

 #, c-format
 msgid "cannot open %s"
 msgstr ""
 
 #, c-format
 msgid "cannot open %s"
 msgstr ""
 

-#: apply.c:4571
+#: apply.c:4578

 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr ""
 
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr ""
 

-#: apply.c:4575
+#: apply.c:4582

 #, c-format
 msgid "Rejected hunk #%d."
 msgstr ""
 
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr ""
 

-#: apply.c:4685
+#: apply.c:4692

 #, c-format
 msgid "Skipped patch '%s'."
 msgstr ""
 
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr ""
 

-#: apply.c:4693
+#: apply.c:4700

 msgid "unrecognized input"
 msgstr ""
 
 msgid "unrecognized input"
 msgstr ""
 

-#: apply.c:4712
+#: apply.c:4719

 msgid "unable to read index file"
 msgstr ""
 
 msgid "unable to read index file"
 msgstr ""
 

-#: apply.c:4849
+#: apply.c:4874

 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr ""
 

-#: apply.c:4876
+#: apply.c:4901

 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] ""
 msgstr[1] ""
 

-#: apply.c:4882 apply.c:4897
+#: apply.c:4907 apply.c:4922

 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 

-#: apply.c:4890
+#: apply.c:4915

 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
 #, 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:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

 msgid "Unable to write new index file"
 msgstr ""
 
 msgid "Unable to write new index file"
 msgstr ""
 

-#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257
-#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260
-#: builtin/pull.c:198 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
-#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197
+#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
+#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
+#: builtin/pull.c:199 builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

 msgid "path"
 msgstr ""
 
 msgid "path"
 msgstr ""
 

-#: apply.c:4934
+#: apply.c:4959

 msgid "don't apply changes matching the given path"
 msgstr ""
 
 msgid "don't apply changes matching the given path"
 msgstr ""
 

-#: apply.c:4937
+#: apply.c:4962

 msgid "apply changes matching the given path"
 msgstr ""
 
 msgid "apply changes matching the given path"
 msgstr ""
 

-#: apply.c:4939 builtin/am.c:2263
+#: apply.c:4964 builtin/am.c:2218

 msgid "num"
 msgstr ""
 
 msgid "num"
 msgstr ""
 

-#: apply.c:4940
+#: apply.c:4965

 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 

-#: apply.c:4943
+#: apply.c:4968

 msgid "ignore additions made by the patch"
 msgstr ""
 
 msgid "ignore additions made by the patch"
 msgstr ""
 

-#: apply.c:4945
+#: apply.c:4970

 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 

-#: apply.c:4949
+#: apply.c:4974

 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 

-#: apply.c:4951
+#: apply.c:4976

 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 

-#: apply.c:4953
+#: apply.c:4978

 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 

-#: apply.c:4955
+#: apply.c:4980

 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 

-#: apply.c:4957
+#: apply.c:4982

 msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 
 msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 

-#: apply.c:4959
+#: apply.c:4984

 msgid "apply a patch without touching the working tree"
 msgstr ""
 
 msgid "apply a patch without touching the working tree"
 msgstr ""
 

-#: apply.c:4961
+#: apply.c:4986

 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 

-#: apply.c:4964
+#: apply.c:4989

 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 

-#: apply.c:4966
+#: apply.c:4991

 msgid "attempt three-way merge if a patch does not apply"
 msgstr ""
 
 msgid "attempt three-way merge if a patch does not apply"
 msgstr ""
 

-#: apply.c:4968
+#: apply.c:4993

 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 

-#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516
+#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

 msgid "paths are separated with NUL character"
 msgstr ""
 
 msgid "paths are separated with NUL character"
 msgstr ""
 

-#: apply.c:4973
+#: apply.c:4998

 msgid "ensure at least <n> lines of context match"
 msgstr ""
 
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 

-#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95
-#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3202
+#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3310 builtin/rebase.c:839

 msgid "action"
 msgstr ""
 
 msgid "action"
 msgstr ""
 

-#: apply.c:4975
+#: apply.c:5000

 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 

-#: apply.c:4978 apply.c:4981
+#: apply.c:5003 apply.c:5006

 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 

-#: apply.c:4984
+#: apply.c:5009

 msgid "apply the patch in reverse"
 msgstr ""
 
 msgid "apply the patch in reverse"
 msgstr ""
 

-#: apply.c:4986
+#: apply.c:5011

 msgid "don't expect at least one line of context"
 msgstr ""
 
 msgid "don't expect at least one line of context"
 msgstr ""
 

-#: apply.c:4988
+#: apply.c:5013

 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 

-#: apply.c:4990
+#: apply.c:5015

 msgid "allow overlapping hunks"
 msgstr ""
 
 msgid "allow overlapping hunks"
 msgstr ""
 

-#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671
-#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124
+#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
+#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
+#: builtin/rebase--interactive.c:157

 msgid "be verbose"
 msgstr ""
 
 msgid "be verbose"
 msgstr ""
 

-#: apply.c:4993
+#: apply.c:5018

 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 

-#: apply.c:4996
+#: apply.c:5021

 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 

-#: apply.c:4998 builtin/am.c:2251
+#: apply.c:5023 builtin/am.c:2206

 msgid "root"
 msgstr ""
 
 msgid "root"
 msgstr ""
 

-#: apply.c:4999
+#: apply.c:5024

 msgid "prepend <root> to all filenames"
 msgstr ""
 
 msgid "prepend <root> to all filenames"
 msgstr ""
 


@@ -722,114 +723,114 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 

-#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298
+#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr ""
 
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr ""
 

-#: archive.c:446
+#: archive.c:453

 msgid "fmt"
 msgstr ""
 
 msgid "fmt"
 msgstr ""
 

-#: archive.c:446
+#: archive.c:453

 msgid "archive format"
 msgstr ""
 
 msgid "archive format"
 msgstr ""
 

-#: archive.c:447 builtin/log.c:1473
+#: archive.c:454 builtin/log.c:1536

 msgid "prefix"
 msgstr ""
 
 msgid "prefix"
 msgstr ""
 

-#: archive.c:448
+#: archive.c:455

 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 

-#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873
-#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555
-#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119
-#: parse-options.h:165
+#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
+#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
+#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
+#: parse-options.h:162

 msgid "file"
 msgstr ""
 
 msgid "file"
 msgstr ""
 

-#: archive.c:450 builtin/archive.c:89
+#: archive.c:457 builtin/archive.c:89

 msgid "write the archive to this file"
 msgstr ""
 
 msgid "write the archive to this file"
 msgstr ""
 

-#: archive.c:452
+#: archive.c:459

 msgid "read .gitattributes in working directory"
 msgstr ""
 
 msgid "read .gitattributes in working directory"
 msgstr ""
 

-#: archive.c:453
+#: archive.c:460

 msgid "report archived files on stderr"
 msgstr ""
 
 msgid "report archived files on stderr"
 msgstr ""
 

-#: archive.c:454
+#: archive.c:461

 msgid "store only"
 msgstr ""
 
 msgid "store only"
 msgstr ""
 

-#: archive.c:455
+#: archive.c:462

 msgid "compress faster"
 msgstr ""
 
 msgid "compress faster"
 msgstr ""
 

-#: archive.c:463
+#: archive.c:470

 msgid "compress better"
 msgstr ""
 
 msgid "compress better"
 msgstr ""
 

-#: archive.c:466
+#: archive.c:473

 msgid "list supported archive formats"
 msgstr ""
 
 msgid "list supported archive formats"
 msgstr ""
 

-#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738
+#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
+#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

 msgid "repo"
 msgstr ""
 
 msgid "repo"
 msgstr ""
 

-#: archive.c:469 builtin/archive.c:91
+#: archive.c:476 builtin/archive.c:91

 msgid "retrieve the archive from remote repository <repo>"
 msgstr ""
 
 msgid "retrieve the archive from remote repository <repo>"
 msgstr ""
 

-#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:491
+#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
+#: builtin/notes.c:496

 msgid "command"
 msgstr ""
 
 msgid "command"
 msgstr ""
 

-#: archive.c:471 builtin/archive.c:93
+#: archive.c:478 builtin/archive.c:93

 msgid "path to the remote git-upload-archive command"
 msgstr ""
 
 msgid "path to the remote git-upload-archive command"
 msgstr ""
 

-#: archive.c:478
+#: archive.c:485

 msgid "Unexpected option --remote"
 msgstr ""
 
 msgid "Unexpected option --remote"
 msgstr ""
 

-#: archive.c:480
+#: archive.c:487

 msgid "Option --exec can only be used together with --remote"
 msgstr ""
 
 msgid "Option --exec can only be used together with --remote"
 msgstr ""
 

-#: archive.c:482
+#: archive.c:489

 msgid "Unexpected option --output"
 msgstr ""
 
 msgid "Unexpected option --output"
 msgstr ""
 

-#: archive.c:504
+#: archive.c:511

 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr ""
 

-#: archive.c:511
+#: archive.c:518

 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr ""
 
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr ""
 

-#: archive-tar.c:125 archive-zip.c:344
+#: archive-tar.c:125 archive-zip.c:345

 #, c-format
 msgid "cannot stream blob %s"
 msgstr ""
 
 #, c-format
 msgid "cannot stream blob %s"
 msgstr ""
 

-#: archive-tar.c:260 archive-zip.c:361
+#: archive-tar.c:260 archive-zip.c:363

 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr ""
 
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr ""
 

-#: archive-tar.c:287 archive-zip.c:352
+#: archive-tar.c:287 archive-zip.c:353

 #, c-format
 msgid "cannot read %s"
 msgstr ""
 #, c-format
 msgid "cannot read %s"
 msgstr ""


@@ -848,74 +849,74 @@ msgstr ""
 msgid "'%s' filter reported error"
 msgstr ""
 
 msgid "'%s' filter reported error"
 msgstr ""
 

-#: archive-zip.c:313
+#: archive-zip.c:314

 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr ""
 
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr ""
 

-#: archive-zip.c:317
+#: archive-zip.c:318

 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr ""
 
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr ""
 

-#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219
+#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

 #, c-format
 msgid "deflate error (%d)"
 msgstr ""
 
 #, c-format
 msgid "deflate error (%d)"
 msgstr ""
 

-#: archive-zip.c:605
+#: archive-zip.c:609

 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr ""
 
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr ""
 

-#: attr.c:218
+#: attr.c:212

 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr ""
 
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr ""
 

-#: attr.c:415
+#: attr.c:409

 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 

-#: bisect.c:467
+#: bisect.c:468

 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr ""
 

-#: bisect.c:675
+#: bisect.c:676

 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr ""
 
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr ""
 

-#: bisect.c:729
+#: bisect.c:730

 #, c-format
 msgid "Not a valid commit name %s"
 msgstr ""
 
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr ""
 

-#: bisect.c:753
+#: bisect.c:754

 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
 

-#: bisect.c:758
+#: bisect.c:759

 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr ""
 

-#: bisect.c:763
+#: bisect.c:764

 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
 

-#: bisect.c:771
+#: bisect.c:772

 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"


@@ -923,7 +924,7 @@ msgid ""
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""
 
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""
 

-#: bisect.c:784
+#: bisect.c:785

 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"


@@ -931,43 +932,43 @@ msgid ""
 "We continue anyway."
 msgstr ""
 
 "We continue anyway."
 msgstr ""
 

-#: bisect.c:817
+#: bisect.c:818

 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 

-#: bisect.c:857
+#: bisect.c:858

 #, c-format
 msgid "a %s revision is needed"
 msgstr ""
 
 #, c-format
 msgid "a %s revision is needed"
 msgstr ""
 

-#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

 #, c-format
 msgid "could not create file '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not create file '%s'"
 msgstr ""
 

-#: bisect.c:927 builtin/merge.c:137
+#: bisect.c:928 builtin/merge.c:138

 #, c-format
 msgid "could not read file '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not read file '%s'"
 msgstr ""
 

-#: bisect.c:957
+#: bisect.c:958

 msgid "reading bisect refs failed"
 msgstr ""
 
 msgid "reading bisect refs failed"
 msgstr ""
 

-#: bisect.c:976
+#: bisect.c:977

 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr ""
 
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr ""
 

-#: bisect.c:984
+#: bisect.c:985

 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path parameters?\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path parameters?\n"
 msgstr ""
 

-#: bisect.c:1003
+#: bisect.c:1004

 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"


@@ -977,44 +978,44 @@ msgstr[1] ""
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.

-#: bisect.c:1009
+#: bisect.c:1010

 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: blame.c:1784
+#: blame.c:1787

 msgid "--contents and --reverse do not blend well."
 msgstr ""
 
 msgid "--contents and --reverse do not blend well."
 msgstr ""
 

-#: blame.c:1798
+#: blame.c:1801

 msgid "cannot use --contents with final commit object name"
 msgstr ""
 
 msgid "cannot use --contents with final commit object name"
 msgstr ""
 

-#: blame.c:1819
+#: blame.c:1822

 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 

-#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
-#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926
-#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404
-#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044
+#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
+#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
+#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
+#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150

 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr ""
 
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr ""
 

-#: blame.c:1846
+#: blame.c:1849

 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 

-#: blame.c:1857
+#: blame.c:1860

 #, c-format
 msgid "no such path %s in %s"
 msgstr ""
 
 #, c-format
 msgid "no such path %s in %s"
 msgstr ""
 

-#: blame.c:1868
+#: blame.c:1871

 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr ""
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr ""


@@ -1153,7 +1154,8 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 

-#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
+#: builtin/commit.c:774

 #, c-format
 msgid "could not open '%s'"
 msgstr ""
 #, c-format
 msgid "could not open '%s'"
 msgstr ""


@@ -1180,38 +1182,42 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: bundle.c:260
+#: bundle.c:267
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:274

 msgid "Could not spawn pack-objects"
 msgstr ""
 
 msgid "Could not spawn pack-objects"
 msgstr ""
 

-#: bundle.c:271
+#: bundle.c:285

 msgid "pack-objects died"
 msgstr ""
 
 msgid "pack-objects died"
 msgstr ""
 

-#: bundle.c:313
+#: bundle.c:327

 msgid "rev-list died"
 msgstr ""
 
 msgid "rev-list died"
 msgstr ""
 

-#: bundle.c:362
+#: bundle.c:376

 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 

-#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304
+#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
 

-#: bundle.c:461
+#: bundle.c:464

 msgid "Refusing to create empty bundle."
 msgstr ""
 
 msgid "Refusing to create empty bundle."
 msgstr ""
 

-#: bundle.c:473
+#: bundle.c:474

 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 

-#: bundle.c:501
+#: bundle.c:498

 msgid "index-pack died"
 msgstr ""
 
 msgid "index-pack died"
 msgstr ""
 


@@ -1220,19 +1226,19 @@ msgstr ""
 msgid "invalid color value: %.*s"
 msgstr ""
 
 msgid "invalid color value: %.*s"
 msgstr ""
 

-#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466
-#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376
+#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
+#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

 #: builtin/replace.c:448
 #, c-format
 msgid "could not parse %s"
 msgstr ""
 
 #: builtin/replace.c:448
 #, c-format
 msgid "could not parse %s"
 msgstr ""
 

-#: commit.c:50
+#: commit.c:52

 #, c-format
 msgid "%s %s is not a commit!"
 msgstr ""
 
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr ""
 

-#: commit.c:191
+#: commit.c:193

 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"


@@ -1244,81 +1250,117 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 

-#: commit.c:1629
+#: commit.c:1115
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1118
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1121
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1124
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c:1378

 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"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 
 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"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 

-#: commit-graph.c:83
+#: commit-graph.c:108

 #, c-format
 msgid "graph file %s is too small"
 msgstr ""
 
 #, c-format
 msgid "graph file %s is too small"
 msgstr ""
 

-#: commit-graph.c:90
+#: commit-graph.c:115

 #, c-format
 msgid "graph signature %X does not match signature %X"
 msgstr ""
 
 #, c-format
 msgid "graph signature %X does not match signature %X"
 msgstr ""
 

-#: commit-graph.c:97
+#: commit-graph.c:122

 #, c-format
 msgid "graph version %X does not match version %X"
 msgstr ""
 
 #, c-format
 msgid "graph version %X does not match version %X"
 msgstr ""
 

-#: commit-graph.c:104
+#: commit-graph.c:129

 #, c-format
 msgid "hash version %X does not match version %X"
 msgstr ""
 
 #, c-format
 msgid "hash version %X does not match version %X"
 msgstr ""
 

-#: commit-graph.c:128
+#: commit-graph.c:153

 #, c-format
 msgid "improper chunk offset %08x%08x"
 msgstr ""
 
 #, c-format
 msgid "improper chunk offset %08x%08x"
 msgstr ""
 

-#: commit-graph.c:164
+#: commit-graph.c:189

 #, c-format
 msgid "chunk id %08x appears multiple times"
 msgstr ""
 
 #, c-format
 msgid "chunk id %08x appears multiple times"
 msgstr ""
 

-#: commit-graph.c:261
+#: commit-graph.c:308

 #, c-format
 msgid "could not find commit %s"
 msgstr ""
 
 #, c-format
 msgid "could not find commit %s"
 msgstr ""
 

-#: commit-graph.c:565 builtin/pack-objects.c:2568
+#: commit-graph.c:617 builtin/pack-objects.c:2652

 #, c-format
 msgid "unable to get type of object %s"
 msgstr ""
 
 #, c-format
 msgid "unable to get type of object %s"
 msgstr ""
 

-#: commit-graph.c:730
+#: commit-graph.c:651
+msgid "Annotating commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:691
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
+msgid "Finding commits for commit graph"
+msgstr ""
+
+#: commit-graph.c:812

 #, c-format
 msgid "error adding pack %s"
 msgstr ""
 
 #, c-format
 msgid "error adding pack %s"
 msgstr ""
 

-#: commit-graph.c:732
+#: commit-graph.c:814

 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 
 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 

-#: commit-graph.c:773
+#: commit-graph.c:868

 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr ""
 
 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr ""
 

-#: commit-graph.c:800
+#: commit-graph.c:895

 msgid "too many commits to write graph"
 msgstr ""
 
 msgid "too many commits to write graph"
 msgstr ""
 

-#: commit-graph.c:806
+#: commit-graph.c:902 midx.c:769

 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr ""
 

-#: commit-graph.c:904
+#: commit-graph.c:1002

 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 

+#: commit-graph.c:1046
+msgid "Verifying commits in commit graph"
+msgstr ""
+

 #: compat/obstack.c:405 compat/obstack.c:407
 msgid "memory exhausted"
 msgstr ""
 #: compat/obstack.c:405 compat/obstack.c:407
 msgid "memory exhausted"
 msgstr ""


@@ -1356,7 +1398,7 @@ msgstr ""
 msgid "key does not contain variable name: %s"
 msgstr ""
 
 msgid "key does not contain variable name: %s"
 msgstr ""
 

-#: config.c:378 sequencer.c:2206
+#: config.c:378 sequencer.c:2296

 #, c-format
 msgid "invalid key: %s"
 msgstr ""
 #, c-format
 msgid "invalid key: %s"
 msgstr ""


@@ -1478,149 +1520,149 @@ msgstr ""
 msgid "invalid mode for object creation: %s"
 msgstr ""
 
 msgid "invalid mode for object creation: %s"
 msgstr ""
 

-#: config.c:1403
+#: config.c:1395

 #, c-format
 msgid "malformed value for %s"
 msgstr ""
 
 #, c-format
 msgid "malformed value for %s"
 msgstr ""
 

-#: config.c:1429
+#: config.c:1421

 #, c-format
 msgid "malformed value for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr ""
 

-#: config.c:1430
+#: config.c:1422

 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 

-#: config.c:1489 builtin/pack-objects.c:3279
+#: config.c:1481 builtin/pack-objects.c:3389

 #, c-format
 msgid "bad pack compression level %d"
 msgstr ""
 
 #, c-format
 msgid "bad pack compression level %d"
 msgstr ""
 

-#: config.c:1610
+#: config.c:1602

 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr ""
 

-#: config.c:1613
+#: config.c:1605

 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr ""
 
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr ""
 

-#: config.c:1630
+#: config.c:1622

 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr ""
 

-#: config.c:1660
+#: config.c:1652

 #, c-format
 msgid "failed to parse %s"
 msgstr ""
 
 #, c-format
 msgid "failed to parse %s"
 msgstr ""
 

-#: config.c:1700
+#: config.c:1705

 msgid "unable to parse command-line config"
 msgstr ""
 
 msgid "unable to parse command-line config"
 msgstr ""
 

-#: config.c:2032
+#: config.c:2037

 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 

-#: config.c:2202
+#: config.c:2207

 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr ""
 

-#: config.c:2245
+#: config.c:2250

 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 

-#: config.c:2271
+#: config.c:2276

 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 

-#: config.c:2296
+#: config.c:2319

 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 

-#: config.c:2298
+#: config.c:2321

 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 

-#: config.c:2379
+#: config.c:2402

 #, c-format
 msgid "invalid section name '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid section name '%s'"
 msgstr ""
 

-#: config.c:2411
+#: config.c:2434

 #, c-format
 msgid "%s has multiple values"
 msgstr ""
 
 #, c-format
 msgid "%s has multiple values"
 msgstr ""
 

-#: config.c:2440
+#: config.c:2463

 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr ""
 
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr ""
 

-#: config.c:2691 config.c:3015
+#: config.c:2714 config.c:3038

 #, c-format
 msgid "could not lock config file %s"
 msgstr ""
 
 #, c-format
 msgid "could not lock config file %s"
 msgstr ""
 

-#: config.c:2702
+#: config.c:2725

 #, c-format
 msgid "opening %s"
 msgstr ""
 
 #, c-format
 msgid "opening %s"
 msgstr ""
 

-#: config.c:2737 builtin/config.c:324
+#: config.c:2760 builtin/config.c:327

 #, c-format
 msgid "invalid pattern: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid pattern: %s"
 msgstr ""
 

-#: config.c:2762
+#: config.c:2785

 #, c-format
 msgid "invalid config file %s"
 msgstr ""
 
 #, c-format
 msgid "invalid config file %s"
 msgstr ""
 

-#: config.c:2775 config.c:3028
+#: config.c:2798 config.c:3051

 #, c-format
 msgid "fstat on %s failed"
 msgstr ""
 
 #, c-format
 msgid "fstat on %s failed"
 msgstr ""
 

-#: config.c:2786
+#: config.c:2809

 #, c-format
 msgid "unable to mmap '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr ""
 

-#: config.c:2795 config.c:3033
+#: config.c:2818 config.c:3056

 #, c-format
 msgid "chmod on %s failed"
 msgstr ""
 
 #, c-format
 msgid "chmod on %s failed"
 msgstr ""
 

-#: config.c:2880 config.c:3130
+#: config.c:2903 config.c:3153

 #, c-format
 msgid "could not write config file %s"
 msgstr ""
 
 #, c-format
 msgid "could not write config file %s"
 msgstr ""
 

-#: config.c:2914
+#: config.c:2937

 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr ""
 

-#: config.c:2916 builtin/remote.c:781
+#: config.c:2939 builtin/remote.c:782

 #, c-format
 msgid "could not unset '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not unset '%s'"
 msgstr ""
 

-#: config.c:3006
+#: config.c:3029

 #, c-format
 msgid "invalid section name: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid section name: %s"
 msgstr ""
 

-#: config.c:3173
+#: config.c:3196

 #, c-format
 msgid "missing value for '%s'"
 msgstr ""
 #, c-format
 msgid "missing value for '%s'"
 msgstr ""


@@ -1669,7 +1711,7 @@ msgstr ""
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 

-#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63
+#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

 #, c-format
 msgid "remote error: %s"
 msgstr ""
 #, c-format
 msgid "remote error: %s"
 msgstr ""


@@ -1781,7 +1823,7 @@ msgstr ""
 msgid "unable to fork"
 msgstr ""
 
 msgid "unable to fork"
 msgstr ""
 

-#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146
+#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

 msgid "Checking connectivity"
 msgstr ""
 
 msgid "Checking connectivity"
 msgstr ""
 


@@ -1904,12 +1946,12 @@ msgstr ""
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 

-#: convert.c:1402 convert.c:1436
+#: convert.c:1398 convert.c:1432

 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr ""
 
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr ""
 

-#: convert.c:1480
+#: convert.c:1476

 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr ""
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr ""


@@ -1982,12 +2024,36 @@ msgid_plural "%<PRIuMAX> years ago"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

+#: delta-islands.c:268
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:286
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c:330
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c:386
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c:462
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+

 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
 msgstr ""
 
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
 msgstr ""
 

-#: diffcore-rename.c:536
+#: diffcore-rename.c:544

 msgid "Performing inexact rename detection"
 msgstr ""
 
 msgid "Performing inexact rename detection"
 msgstr ""
 


@@ -2035,88 +2101,88 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: diff.c:4096
+#: diff.c:4140

 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 

-#: diff.c:4427
+#: diff.c:4482

 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 

-#: diff.c:4430
+#: diff.c:4485

 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr ""
 
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr ""
 

-#: diff.c:4508
+#: diff.c:4563

 msgid "--follow requires exactly one pathspec"
 msgstr ""
 
 msgid "--follow requires exactly one pathspec"
 msgstr ""
 

-#: diff.c:4674
+#: diff.c:4729

 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 

-#: diff.c:4688
+#: diff.c:4743

 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr ""
 

-#: diff.c:5766
+#: diff.c:5823

 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 

-#: diff.c:5769
+#: diff.c:5826

 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 

-#: diff.c:5772
+#: diff.c:5829

 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 

-#: dir.c:569
+#: dir.c:576

 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 

-#: dir.c:958
+#: dir.c:965

 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 

-#: dir.c:1873
+#: dir.c:1880

 #, c-format
 msgid "could not open directory '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not open directory '%s'"
 msgstr ""
 

-#: dir.c:2115
+#: dir.c:2122

 msgid "failed to get kernel name and information"
 msgstr ""
 
 msgid "failed to get kernel name and information"
 msgstr ""
 

-#: dir.c:2239
+#: dir.c:2246

 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 

-#: dir.c:3037
+#: dir.c:3047

 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 

-#: dir.c:3082 dir.c:3087
+#: dir.c:3092 dir.c:3097

 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 

-#: dir.c:3116
+#: dir.c:3126

 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
 

-#: editor.c:61
+#: editor.c:73

 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""


@@ -2125,7 +2191,7 @@ msgstr ""
 msgid "Filtering content"
 msgstr ""
 
 msgid "Filtering content"
 msgstr ""
 

-#: entry.c:437
+#: entry.c:465

 #, c-format
 msgid "could not stat file '%s'"
 msgstr ""
 #, c-format
 msgid "could not stat file '%s'"
 msgstr ""


@@ -2149,77 +2215,77 @@ msgstr ""
 msgid "Remote with no URL"
 msgstr ""
 
 msgid "Remote with no URL"
 msgstr ""
 

-#: fetch-pack.c:152
+#: fetch-pack.c:151

 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 

-#: fetch-pack.c:164
+#: fetch-pack.c:163

 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 

-#: fetch-pack.c:184
+#: fetch-pack.c:183

 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 

-#: fetch-pack.c:254
+#: fetch-pack.c:253

 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr ""
 
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr ""
 

-#: fetch-pack.c:342 fetch-pack.c:1257
+#: fetch-pack.c:347 fetch-pack.c:1277

 #, c-format
 msgid "invalid shallow line: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr ""
 

-#: fetch-pack.c:348 fetch-pack.c:1263
+#: fetch-pack.c:353 fetch-pack.c:1283

 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr ""
 

-#: fetch-pack.c:350 fetch-pack.c:1265
+#: fetch-pack.c:355 fetch-pack.c:1285

 #, c-format
 msgid "object not found: %s"
 msgstr ""
 
 #, c-format
 msgid "object not found: %s"
 msgstr ""
 

-#: fetch-pack.c:353 fetch-pack.c:1268
+#: fetch-pack.c:358 fetch-pack.c:1288

 #, c-format
 msgid "error in object: %s"
 msgstr ""
 
 #, c-format
 msgid "error in object: %s"
 msgstr ""
 

-#: fetch-pack.c:355 fetch-pack.c:1270
+#: fetch-pack.c:360 fetch-pack.c:1290

 #, c-format
 msgid "no shallow found: %s"
 msgstr ""
 
 #, c-format
 msgid "no shallow found: %s"
 msgstr ""
 

-#: fetch-pack.c:358 fetch-pack.c:1273
+#: fetch-pack.c:363 fetch-pack.c:1293

 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr ""
 
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr ""
 

-#: fetch-pack.c:399
+#: fetch-pack.c:404

 #, c-format
 msgid "got %s %d %s"
 msgstr ""
 
 #, c-format
 msgid "got %s %d %s"
 msgstr ""
 

-#: fetch-pack.c:416
+#: fetch-pack.c:421

 #, c-format
 msgid "invalid commit %s"
 msgstr ""
 
 #, c-format
 msgid "invalid commit %s"
 msgstr ""
 

-#: fetch-pack.c:447
+#: fetch-pack.c:452

 msgid "giving up"
 msgstr ""
 
 msgid "giving up"
 msgstr ""
 

-#: fetch-pack.c:459 progress.c:229
+#: fetch-pack.c:464 progress.c:229

 msgid "done"
 msgstr ""
 
 msgid "done"
 msgstr ""
 

-#: fetch-pack.c:471
+#: fetch-pack.c:476

 #, c-format
 msgid "got %s (%d) %s"
 msgstr ""
 
 #, c-format
 msgid "got %s (%d) %s"
 msgstr ""
 

-#: fetch-pack.c:517
+#: fetch-pack.c:522

 #, c-format
 msgid "Marking %s as complete"
 msgstr ""
 #, c-format
 msgid "Marking %s as complete"
 msgstr ""


@@ -2287,7 +2353,7 @@ msgstr ""
 msgid "Server supports ofs-delta"
 msgstr ""
 
 msgid "Server supports ofs-delta"
 msgstr ""
 

-#: fetch-pack.c:971 fetch-pack.c:1150
+#: fetch-pack.c:971 fetch-pack.c:1158

 msgid "Server supports filter"
 msgstr ""
 
 msgid "Server supports filter"
 msgstr ""
 


@@ -2308,85 +2374,93 @@ msgstr ""
 msgid "Server does not support --deepen"
 msgstr ""
 
 msgid "Server does not support --deepen"
 msgstr ""
 

-#: fetch-pack.c:1004
+#: fetch-pack.c:1008

 msgid "no common commits"
 msgstr ""
 
 msgid "no common commits"
 msgstr ""
 

-#: fetch-pack.c:1016 fetch-pack.c:1393
+#: fetch-pack.c:1020 fetch-pack.c:1418

 msgid "git fetch-pack: fetch failed."
 msgstr ""
 
 msgid "git fetch-pack: fetch failed."
 msgstr ""
 

-#: fetch-pack.c:1145
+#: fetch-pack.c:1153

 msgid "Server does not support shallow requests"
 msgstr ""
 
 msgid "Server does not support shallow requests"
 msgstr ""
 

-#: fetch-pack.c:1191
+#: fetch-pack.c:1199

 #, c-format
 msgid "error reading section header '%s'"
 msgstr ""
 
 #, c-format
 msgid "error reading section header '%s'"
 msgstr ""
 

-#: fetch-pack.c:1197
+#: fetch-pack.c:1205

 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr ""
 
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr ""
 

-#: fetch-pack.c:1236
+#: fetch-pack.c:1244

 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 

-#: fetch-pack.c:1241
+#: fetch-pack.c:1249

 #, c-format
 msgid "error processing acks: %d"
 msgstr ""
 
 #, c-format
 msgid "error processing acks: %d"
 msgstr ""
 

-#: fetch-pack.c:1278
+#: fetch-pack.c:1259
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1261
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1298

 #, c-format
 msgid "error processing shallow info: %d"
 msgstr ""
 
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr ""
 

-#: fetch-pack.c:1294
+#: fetch-pack.c:1314

 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr ""
 
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr ""
 

-#: fetch-pack.c:1304
+#: fetch-pack.c:1324

 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 

-#: fetch-pack.c:1308
+#: fetch-pack.c:1328

 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr ""
 
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr ""
 

-#: fetch-pack.c:1603
+#: fetch-pack.c:1642

 msgid "no matching remote head"
 msgstr ""
 
 msgid "no matching remote head"
 msgstr ""
 

-#: fetch-pack.c:1621 builtin/clone.c:664
+#: fetch-pack.c:1660 builtin/clone.c:664

 msgid "remote did not send all necessary objects"
 msgstr ""
 
 msgid "remote did not send all necessary objects"
 msgstr ""
 

-#: fetch-pack.c:1647
+#: fetch-pack.c:1686

 #, c-format
 msgid "no such remote ref %s"
 msgstr ""
 
 #, c-format
 msgid "no such remote ref %s"
 msgstr ""
 

-#: fetch-pack.c:1650
+#: fetch-pack.c:1689

 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 

-#: gpg-interface.c:253
+#: gpg-interface.c:318

 msgid "gpg failed to sign the data"
 msgstr ""
 
 msgid "gpg failed to sign the data"
 msgstr ""
 

-#: gpg-interface.c:279
+#: gpg-interface.c:344

 msgid "could not create temporary file"
 msgstr ""
 
 msgid "could not create temporary file"
 msgstr ""
 

-#: gpg-interface.c:282
+#: gpg-interface.c:347

 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr ""
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr ""


@@ -2396,18 +2470,18 @@ msgstr ""
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr ""
 
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr ""
 

-#: grep.c:2115
+#: grep.c:2113

 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 

-#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
+#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

 #: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr ""
 
 #: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr ""
 

-#: grep.c:2143
+#: grep.c:2141

 #, c-format
 msgid "'%s': short read"
 msgstr ""
 #, c-format
 msgid "'%s': short read"
 msgstr ""


@@ -2464,60 +2538,72 @@ msgstr ""
 msgid "Low-level Commands / Internal Helpers"
 msgstr ""
 
 msgid "Low-level Commands / Internal Helpers"
 msgstr ""
 

-#: help.c:293
+#: help.c:296

 #, c-format
 msgid "available git commands in '%s'"
 msgstr ""
 
 #, c-format
 msgid "available git commands in '%s'"
 msgstr ""
 

-#: help.c:300
+#: help.c:303

 msgid "git commands available from elsewhere on your $PATH"
 msgstr ""
 
 msgid "git commands available from elsewhere on your $PATH"
 msgstr ""
 

-#: help.c:309
+#: help.c:312

 msgid "These are common Git commands used in various situations:"
 msgstr ""
 
 msgid "These are common Git commands used in various situations:"
 msgstr ""
 

-#: help.c:358 git.c:90
+#: help.c:361 git.c:90

 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr ""
 
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr ""
 

-#: help.c:405
+#: help.c:408

 msgid "The common Git guides are:"
 msgstr ""
 
 msgid "The common Git guides are:"
 msgstr ""
 

-#: help.c:552
+#: help.c:517
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+
+#: help.c:522
+msgid "External commands"
+msgstr ""
+
+#: help.c:530
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:594

 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 "able to execute it. Maybe git-%s is broken?"
 msgstr ""
 
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 "able to execute it. Maybe git-%s is broken?"
 msgstr ""
 

-#: help.c:611
+#: help.c:653

 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr ""
 
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr ""
 

-#: help.c:633
+#: help.c:675

 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 

-#: help.c:638
+#: help.c:680

 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr ""
 
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr ""
 

-#: help.c:643
+#: help.c:685

 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 

-#: help.c:651
+#: help.c:693

 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr ""
 
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr ""
 

-#: help.c:655
+#: help.c:697

 msgid ""
 "\n"
 "The most similar command is"
 msgid ""
 "\n"
 "The most similar command is"


@@ -2527,16 +2613,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: help.c:670
+#: help.c:712

 msgid "git version [<options>]"
 msgstr ""
 
 msgid "git version [<options>]"
 msgstr ""
 

-#: help.c:738
+#: help.c:780

 #, c-format
 msgid "%s: %s - %s"
 msgstr ""
 
 #, c-format
 msgid "%s: %s - %s"
 msgstr ""
 

-#: help.c:742
+#: help.c:784

 msgid ""
 "\n"
 "Did you mean this?"
 msgid ""
 "\n"
 "Did you mean this?"


@@ -2546,7 +2632,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ident.c:342
+#: ident.c:345

 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"


@@ -2561,44 +2647,48 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: ident.c:366
+#: ident.c:369

 msgid "no email was given and auto-detection is disabled"
 msgstr ""
 
 msgid "no email was given and auto-detection is disabled"
 msgstr ""
 

-#: ident.c:371
+#: ident.c:374

 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr ""
 
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr ""
 

-#: ident.c:381
+#: ident.c:384

 msgid "no name was given and auto-detection is disabled"
 msgstr ""
 
 msgid "no name was given and auto-detection is disabled"
 msgstr ""
 

-#: ident.c:387
+#: ident.c:390

 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr ""
 
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr ""
 

-#: ident.c:395
+#: ident.c:398

 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr ""
 
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr ""
 

-#: ident.c:401
+#: ident.c:404

 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 

-#: ident.c:416 builtin/commit.c:600
+#: ident.c:419 builtin/commit.c:606

 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
 

-#: list-objects-filter-options.c:36
+#: list-objects-filter-options.c:35

 msgid "multiple filter-specs cannot be combined"
 msgstr ""
 
 msgid "multiple filter-specs cannot be combined"
 msgstr ""
 

-#: list-objects-filter-options.c:126
+#: list-objects-filter-options.c:58
+msgid "only 'tree:0' is supported"
+msgstr ""
+
+#: list-objects-filter-options.c:137

 msgid "cannot change partial clone promisor remote"
 msgstr ""
 
 msgid "cannot change partial clone promisor remote"
 msgstr ""
 


@@ -2619,117 +2709,117 @@ msgstr ""
 msgid "Unable to create '%s.lock': %s"
 msgstr ""
 
 msgid "Unable to create '%s.lock': %s"
 msgstr ""
 

-#: merge.c:40
+#: merge.c:41

 msgid "failed to read the cache"
 msgstr ""
 
 msgid "failed to read the cache"
 msgstr ""
 

-#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380
-#: builtin/checkout.c:608 builtin/clone.c:763
+#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
+#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

 msgid "unable to write new index file"
 msgstr ""
 
 msgid "unable to write new index file"
 msgstr ""
 

-#: merge-recursive.c:303
+#: merge-recursive.c:323

 msgid "(bad commit)\n"
 msgstr ""
 
 msgid "(bad commit)\n"
 msgstr ""
 

-#: merge-recursive.c:325
+#: merge-recursive.c:345

 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 

-#: merge-recursive.c:333
+#: merge-recursive.c:353

 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 

-#: merge-recursive.c:415
+#: merge-recursive.c:435

 msgid "error building trees"
 msgstr ""
 
 msgid "error building trees"
 msgstr ""
 

-#: merge-recursive.c:886
+#: merge-recursive.c:906

 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr ""
 
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr ""
 

-#: merge-recursive.c:897
+#: merge-recursive.c:917

 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 

-#: merge-recursive.c:911 merge-recursive.c:930
+#: merge-recursive.c:931 merge-recursive.c:950

 msgid ": perhaps a D/F conflict?"
 msgstr ""
 
 msgid ": perhaps a D/F conflict?"
 msgstr ""
 

-#: merge-recursive.c:920
+#: merge-recursive.c:940

 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 

-#: merge-recursive.c:962 builtin/cat-file.c:39
+#: merge-recursive.c:982 builtin/cat-file.c:39

 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr ""
 

-#: merge-recursive.c:964
+#: merge-recursive.c:984

 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr ""
 
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr ""
 

-#: merge-recursive.c:988
+#: merge-recursive.c:1008

 #, c-format
 msgid "failed to open '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr ""
 

-#: merge-recursive.c:999
+#: merge-recursive.c:1019

 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr ""
 

-#: merge-recursive.c:1004
+#: merge-recursive.c:1024

 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 

-#: merge-recursive.c:1191
+#: merge-recursive.c:1212

 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr ""
 
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr ""
 

-#: merge-recursive.c:1198
+#: merge-recursive.c:1219

 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr ""
 
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr ""
 

-#: merge-recursive.c:1205
+#: merge-recursive.c:1226

 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 

-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1234 merge-recursive.c:1246

 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 

-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: merge-recursive.c:1237 merge-recursive.c:1249

 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr ""
 
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr ""
 

-#: merge-recursive.c:1250
+#: merge-recursive.c:1271

 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 

-#: merge-recursive.c:1254
+#: merge-recursive.c:1275

 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 

-#: merge-recursive.c:1255
+#: merge-recursive.c:1276

 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 

-#: merge-recursive.c:1258
+#: merge-recursive.c:1279

 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"


@@ -2740,109 +2830,109 @@ msgid ""
 "which will accept this suggestion.\n"
 msgstr ""
 
 "which will accept this suggestion.\n"
 msgstr ""
 

-#: merge-recursive.c:1267
+#: merge-recursive.c:1288

 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 

-#: merge-recursive.c:1326
+#: merge-recursive.c:1358

 msgid "Failed to execute internal merge"
 msgstr ""
 
 msgid "Failed to execute internal merge"
 msgstr ""
 

-#: merge-recursive.c:1331
+#: merge-recursive.c:1363

 #, c-format
 msgid "Unable to add %s to database"
 msgstr ""
 
 #, c-format
 msgid "Unable to add %s to database"
 msgstr ""
 

-#: merge-recursive.c:1363
+#: merge-recursive.c:1395

 #, c-format
 msgid "Auto-merging %s"
 msgstr ""
 
 #, c-format
 msgid "Auto-merging %s"
 msgstr ""
 

-#: merge-recursive.c:1434
+#: merge-recursive.c:1416

 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 

-#: merge-recursive.c:1501
+#: merge-recursive.c:1483

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
 
 #, 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:1506
+#: merge-recursive.c:1488

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr ""
 
 #, 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:1513
+#: merge-recursive.c:1495

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr ""
 
 #, 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:1518
+#: merge-recursive.c:1500

 #, 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 ""
 
 #, 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:1552
+#: merge-recursive.c:1534

 msgid "rename"
 msgstr ""
 
 msgid "rename"
 msgstr ""
 

-#: merge-recursive.c:1552
+#: merge-recursive.c:1534

 msgid "renamed"
 msgstr ""
 
 msgid "renamed"
 msgstr ""
 

-#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394
-#: merge-recursive.c:3129
+#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
+#: merge-recursive.c:3124

 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr ""
 
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr ""
 

-#: merge-recursive.c:1620
+#: merge-recursive.c:1602

 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 

-#: merge-recursive.c:1625
+#: merge-recursive.c:1607

 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 

-#: merge-recursive.c:1651
+#: merge-recursive.c:1633

 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
 

-#: merge-recursive.c:1656
+#: merge-recursive.c:1638

 msgid " (left unresolved)"
 msgstr ""
 
 msgid " (left unresolved)"
 msgstr ""
 

-#: merge-recursive.c:1720
+#: merge-recursive.c:1699

 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 

-#: merge-recursive.c:1759
+#: merge-recursive.c:1734

 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr ""
 
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr ""
 

-#: merge-recursive.c:1771
+#: merge-recursive.c:1746

 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 

-#: merge-recursive.c:1977
+#: merge-recursive.c:1952

 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "


@@ -2850,153 +2940,280 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 
 "getting a majority of the files."
 msgstr ""
 

-#: merge-recursive.c:2009
+#: merge-recursive.c:1984

 #, 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 ""
 
 #, 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-recursive.c:2019
+#: merge-recursive.c:1994

 #, 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 ""
 
 #, 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-recursive.c:2111
+#: merge-recursive.c:2086

 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
 ">%s in %s"
 msgstr ""
 
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
 ">%s in %s"
 msgstr ""
 

-#: merge-recursive.c:2356
+#: merge-recursive.c:2331

 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
 
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
 

-#: merge-recursive.c:2762
+#: merge-recursive.c:2737

 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 

-#: merge-recursive.c:2777
+#: merge-recursive.c:2763

 #, c-format
 msgid "Adding merged %s"
 msgstr ""
 
 #, c-format
 msgid "Adding merged %s"
 msgstr ""
 

-#: merge-recursive.c:2784 merge-recursive.c:3132
+#: merge-recursive.c:2770 merge-recursive.c:3127

 #, c-format
 msgid "Adding as %s instead"
 msgstr ""
 
 #, c-format
 msgid "Adding as %s instead"
 msgstr ""
 

-#: merge-recursive.c:2941
+#: merge-recursive.c:2934

 #, c-format
 msgid "cannot read object %s"
 msgstr ""
 
 #, c-format
 msgid "cannot read object %s"
 msgstr ""
 

-#: merge-recursive.c:2944
+#: merge-recursive.c:2937

 #, c-format
 msgid "object %s is not a blob"
 msgstr ""
 
 #, c-format
 msgid "object %s is not a blob"
 msgstr ""
 

-#: merge-recursive.c:3013
+#: merge-recursive.c:3006

 msgid "modify"
 msgstr ""
 
 msgid "modify"
 msgstr ""
 

-#: merge-recursive.c:3013
+#: merge-recursive.c:3006

 msgid "modified"
 msgstr ""
 
 msgid "modified"
 msgstr ""
 

-#: merge-recursive.c:3024
+#: merge-recursive.c:3017

 msgid "content"
 msgstr ""
 
 msgid "content"
 msgstr ""
 

-#: merge-recursive.c:3031
+#: merge-recursive.c:3024

 msgid "add/add"
 msgstr ""
 
 msgid "add/add"
 msgstr ""
 

-#: merge-recursive.c:3076
+#: merge-recursive.c:3071

 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr ""
 
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr ""
 

-#: merge-recursive.c:3098 git-submodule.sh:865
+#: merge-recursive.c:3093 git-submodule.sh:858

 msgid "submodule"
 msgstr ""
 
 msgid "submodule"
 msgstr ""
 

-#: merge-recursive.c:3099
+#: merge-recursive.c:3094

 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 

-#: merge-recursive.c:3221
+#: merge-recursive.c:3216

 #, c-format
 msgid "Removing %s"
 msgstr ""
 
 #, c-format
 msgid "Removing %s"
 msgstr ""
 

-#: merge-recursive.c:3247
+#: merge-recursive.c:3242

 msgid "file/directory"
 msgstr ""
 
 msgid "file/directory"
 msgstr ""
 

-#: merge-recursive.c:3253
+#: merge-recursive.c:3248

 msgid "directory/file"
 msgstr ""
 
 msgid "directory/file"
 msgstr ""
 

-#: merge-recursive.c:3260
+#: merge-recursive.c:3255

 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 

-#: merge-recursive.c:3269
+#: merge-recursive.c:3264

 #, c-format
 msgid "Adding %s"
 msgstr ""
 
 #, c-format
 msgid "Adding %s"
 msgstr ""
 

-#: merge-recursive.c:3303
+#: merge-recursive.c:3300

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "  %s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "  %s"
 msgstr ""
 

-#: merge-recursive.c:3314
+#: merge-recursive.c:3311

 msgid "Already up to date!"
 msgstr ""
 
 msgid "Already up to date!"
 msgstr ""
 

-#: merge-recursive.c:3323
+#: merge-recursive.c:3320

 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 

-#: merge-recursive.c:3422
+#: merge-recursive.c:3419

 msgid "Merging:"
 msgstr ""
 
 msgid "Merging:"
 msgstr ""
 

-#: merge-recursive.c:3435
+#: merge-recursive.c:3432

 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: merge-recursive.c:3474
+#: merge-recursive.c:3471

 msgid "merge returned no commit"
 msgstr ""
 
 msgid "merge returned no commit"
 msgstr ""
 

-#: merge-recursive.c:3540
+#: merge-recursive.c:3537

 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 

-#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846
+#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

 msgid "Unable to write index."
 msgstr ""
 
 msgid "Unable to write index."
 msgstr ""
 

-#: notes-merge.c:274
+#: midx.c:65
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr ""
+
+#: midx.c:81
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#: midx.c:86
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr ""
+
+#: midx.c:91
+#, c-format
+msgid "hash version %u does not match"
+msgstr ""
+
+#: midx.c:105
+msgid "invalid chunk offset (too large)"
+msgstr ""
+
+#: midx.c:129
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr ""
+
+#: midx.c:142
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+#: midx.c:144
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:146
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+#: midx.c:148
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:162
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#: midx.c:205
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs"
+msgstr ""
+
+#: midx.c:246
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:271
+msgid "error preparing packfile from multi-pack-index"
+msgstr ""
+
+#: midx.c:407
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
+
+#: midx.c:413
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
+
+#: midx.c:507
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr ""
+
+#: midx.c:943
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
+
+#: midx.c:981
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:992
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+#: midx.c:996
+msgid "Verifying object offsets"
+msgstr ""
+
+#: midx.c:1004
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr ""
+
+#: midx.c:1010
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
+
+#: midx.c:1019
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+#: name-hash.c:532
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr ""
+
+#: name-hash.c:554
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr ""
+
+#: name-hash.c:560
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr ""
+
+#: notes-merge.c:275

 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"


@@ -3004,7 +3221,7 @@ msgid ""
 "commit/abort the previous merge before you start a new notes merge."
 msgstr ""
 
 "commit/abort the previous merge before you start a new notes merge."
 msgstr ""
 

-#: notes-merge.c:281
+#: notes-merge.c:282

 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""


@@ -3057,16 +3274,16 @@ msgstr ""
 msgid "sha1 mismatch %s"
 msgstr ""
 
 msgid "sha1 mismatch %s"
 msgstr ""
 

-#: packfile.c:563
+#: packfile.c:607

 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 

-#: packfile.c:1745
+#: packfile.c:1864

 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 

-#: packfile.c:1749
+#: packfile.c:1868

 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""


@@ -3097,17 +3314,17 @@ msgstr ""
 msgid "-NUM"
 msgstr ""
 
 msgid "-NUM"
 msgstr ""
 

-#: parse-options-cb.c:44
+#: parse-options-cb.c:37

 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr ""
 

-#: parse-options-cb.c:112
+#: parse-options-cb.c:109

 #, c-format
 msgid "malformed object name '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed object name '%s'"
 msgstr ""
 

-#: path.c:892
+#: path.c:894

 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""


@@ -3221,175 +3438,281 @@ msgstr ""
 msgid "protocol error: bad line length %d"
 msgstr ""
 
 msgid "protocol error: bad line length %d"
 msgstr ""
 

+#: preload-index.c:118
+msgid "Refreshing index"
+msgstr ""
+
+#: preload-index.c:137
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr ""
+

 #: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr ""
 
 #: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr ""
 

-#: range-diff.c:48
+#: range-diff.c:56

 msgid "could not start `log`"
 msgstr ""
 
 msgid "could not start `log`"
 msgstr ""
 

-#: range-diff.c:51
+#: range-diff.c:59

 msgid "could not read `log` output"
 msgstr ""
 
 msgid "could not read `log` output"
 msgstr ""
 

-#: range-diff.c:66 sequencer.c:4540
+#: range-diff.c:74 sequencer.c:4764

 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
 

-#: range-diff.c:196
+#: range-diff.c:224

 msgid "failed to generate diff"
 msgstr ""
 
 msgid "failed to generate diff"
 msgstr ""
 

-#: range-diff.c:421 range-diff.c:423
+#: range-diff.c:455 range-diff.c:457

 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
 

-#: read-cache.c:1579
+#: read-cache.c:1490
+msgid "Refresh index"
+msgstr ""
+
+#: read-cache.c:1604

 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 

-#: read-cache.c:1589
+#: read-cache.c:1614

 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 

-#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083
+#: read-cache.c:1792
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
+#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
+#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
+#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
+#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+msgid "index file corrupt"
+msgstr ""
+
+#: read-cache.c:2101
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2114
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2200
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2227
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 

-#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374
+#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592

 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 

-#: read-cache.c:2666
+#: read-cache.c:3039

 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 

-#: read-cache.c:2678
+#: read-cache.c:3051

 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 

+#: rebase-interactive.c:10
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"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"
+"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"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"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"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+
+#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+
+#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+
+#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+
+#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr ""
+
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
+#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+

 #: refs.c:192
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr ""
 
 #: refs.c:192
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr ""
 

-#: refs.c:579
+#: refs.c:583

 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr ""
 
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr ""
 

-#: refs.c:581 ref-filter.c:2067
+#: refs.c:585 ref-filter.c:1951

 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 

-#: refs.c:685
+#: refs.c:711

 #, c-format
 msgid "could not open '%s' for writing: %s"
 msgstr ""
 
 #, c-format
 msgid "could not open '%s' for writing: %s"
 msgstr ""
 

-#: refs.c:695 refs.c:746
+#: refs.c:721 refs.c:772

 #, c-format
 msgid "could not read ref '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not read ref '%s'"
 msgstr ""
 

-#: refs.c:701
+#: refs.c:727

 #, c-format
 msgid "ref '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "ref '%s' already exists"
 msgstr ""
 

-#: refs.c:706
+#: refs.c:732

 #, c-format
 msgid "unexpected object ID when writing '%s'"
 msgstr ""
 
 #, c-format
 msgid "unexpected object ID when writing '%s'"
 msgstr ""
 

-#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492
-#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564
+#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
+#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

 #: wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr ""
 
 #: wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr ""
 

-#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:780
+#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:728

 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
 
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
 

-#: refs.c:748
+#: refs.c:774

 #, c-format
 msgid "unexpected object ID when deleting '%s'"
 msgstr ""
 
 #, c-format
 msgid "unexpected object ID when deleting '%s'"
 msgstr ""
 

-#: refs.c:879
+#: refs.c:905

 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr ""
 
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr ""
 

-#: refs.c:885
+#: refs.c:911

 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 

-#: refs.c:943
+#: refs.c:969

 #, c-format
 msgid "log for %s is empty"
 msgstr ""
 
 #, c-format
 msgid "log for %s is empty"
 msgstr ""
 

-#: refs.c:1035
+#: refs.c:1061

 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr ""
 
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr ""
 

-#: refs.c:1111
+#: refs.c:1137

 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 

-#: refs.c:1853
+#: refs.c:1911

 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 

-#: refs.c:1885
+#: refs.c:1943

 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 

-#: refs.c:1981 refs.c:2011
+#: refs.c:2039 refs.c:2069

 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 

-#: refs.c:1987 refs.c:2022
+#: refs.c:2045 refs.c:2080

 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 

-#: refs/files-backend.c:1191
+#: refs/files-backend.c:1227

 #, c-format
 msgid "could not remove reference %s"
 msgstr ""
 
 #, c-format
 msgid "could not remove reference %s"
 msgstr ""
 

-#: refs/files-backend.c:1205 refs/packed-backend.c:1532
+#: refs/files-backend.c:1241 refs/packed-backend.c:1532

 #: refs/packed-backend.c:1542
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 
 #: refs/packed-backend.c:1542
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 

-#: refs/files-backend.c:1208 refs/packed-backend.c:1545
+#: refs/files-backend.c:1244 refs/packed-backend.c:1545

 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""


@@ -3399,191 +3722,197 @@ msgstr ""
 msgid "invalid refspec '%s'"
 msgstr ""
 
 msgid "invalid refspec '%s'"
 msgstr ""
 

-#: ref-filter.c:38 wt-status.c:1850
+#: ref-filter.c:39 wt-status.c:1855

 msgid "gone"
 msgstr ""
 
 msgid "gone"
 msgstr ""
 

-#: ref-filter.c:39
+#: ref-filter.c:40

 #, c-format
 msgid "ahead %d"
 msgstr ""
 
 #, c-format
 msgid "ahead %d"
 msgstr ""
 

-#: ref-filter.c:40
+#: ref-filter.c:41

 #, c-format
 msgid "behind %d"
 msgstr ""
 
 #, c-format
 msgid "behind %d"
 msgstr ""
 

-#: ref-filter.c:41
+#: ref-filter.c:42

 #, c-format
 msgid "ahead %d, behind %d"
 msgstr ""
 
 #, c-format
 msgid "ahead %d, behind %d"
 msgstr ""
 

-#: ref-filter.c:137
+#: ref-filter.c:138

 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr ""
 
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr ""
 

-#: ref-filter.c:139
+#: ref-filter.c:140

 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 

-#: ref-filter.c:161
+#: ref-filter.c:162

 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 

-#: ref-filter.c:165
+#: ref-filter.c:166

 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 

-#: ref-filter.c:167
+#: ref-filter.c:168

 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr ""
 

-#: ref-filter.c:222
+#: ref-filter.c:223

 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:234
+#: ref-filter.c:235

 #, c-format
 msgid "%%(objectsize) does not take arguments"
 msgstr ""
 
 #, c-format
 msgid "%%(objectsize) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:246
+#: ref-filter.c:247

 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:255
+#: ref-filter.c:256

 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr ""
 
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:275
+#: ref-filter.c:278

 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 

-#: ref-filter.c:304
+#: ref-filter.c:307

 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 

-#: ref-filter.c:306
+#: ref-filter.c:309

 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr ""
 

-#: ref-filter.c:321
+#: ref-filter.c:324

 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr ""
 
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr ""
 

-#: ref-filter.c:325
+#: ref-filter.c:328

 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr ""
 

-#: ref-filter.c:355
+#: ref-filter.c:358

 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 

-#: ref-filter.c:367
+#: ref-filter.c:370

 #, c-format
 msgid "unrecognized position:%s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized position:%s"
 msgstr ""
 

-#: ref-filter.c:374
+#: ref-filter.c:377

 #, c-format
 msgid "unrecognized width:%s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized width:%s"
 msgstr ""
 

-#: ref-filter.c:383
+#: ref-filter.c:386

 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr ""
 

-#: ref-filter.c:391
+#: ref-filter.c:394

 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 

-#: ref-filter.c:409
+#: ref-filter.c:412

 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr ""
 

-#: ref-filter.c:505
+#: ref-filter.c:508

 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 

-#: ref-filter.c:532
+#: ref-filter.c:535

 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 

-#: ref-filter.c:656
+#: ref-filter.c:539
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+
+#: ref-filter.c:663

 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr ""
 

-#: ref-filter.c:719
+#: ref-filter.c:726

 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr ""
 

-#: ref-filter.c:721
+#: ref-filter.c:728

 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr ""
 
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr ""
 

-#: ref-filter.c:723
+#: ref-filter.c:730

 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 

-#: ref-filter.c:751
+#: ref-filter.c:758

 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr ""
 

-#: ref-filter.c:753
+#: ref-filter.c:760

 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr ""
 

-#: ref-filter.c:755
+#: ref-filter.c:762

 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr ""
 
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr ""
 

-#: ref-filter.c:770
+#: ref-filter.c:777

 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 

-#: ref-filter.c:827
+#: ref-filter.c:834

 #, c-format
 msgid "malformed format string %s"
 msgstr ""
 
 #, c-format
 msgid "malformed format string %s"
 msgstr ""
 

-#: ref-filter.c:1416
+#: ref-filter.c:1424

 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 

-#: ref-filter.c:1419
+#: ref-filter.c:1427

 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr ""
 
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr ""
 

-#: ref-filter.c:1422
+#: ref-filter.c:1430

 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""


@@ -3591,7 +3920,7 @@ msgstr ""
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.

-#: ref-filter.c:1430
+#: ref-filter.c:1438

 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""


@@ -3599,142 +3928,142 @@ msgstr ""
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.

-#: ref-filter.c:1437
+#: ref-filter.c:1445

 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 

-#: ref-filter.c:1441
+#: ref-filter.c:1449

 msgid "(no branch)"
 msgstr ""
 
 msgid "(no branch)"
 msgstr ""
 

-#: ref-filter.c:1475 ref-filter.c:1623
+#: ref-filter.c:1483 ref-filter.c:1638

 #, c-format
 msgid "missing object %s for %s"
 msgstr ""
 
 #, c-format
 msgid "missing object %s for %s"
 msgstr ""
 

-#: ref-filter.c:1483
+#: ref-filter.c:1491

 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 

-#: ref-filter.c:1980
+#: ref-filter.c:1857

 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 

-#: ref-filter.c:2062
+#: ref-filter.c:1946

 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 

-#: ref-filter.c:2340
+#: ref-filter.c:2232

 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 

-#: ref-filter.c:2444
+#: ref-filter.c:2338

 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 

-#: remote.c:606
+#: remote.c:607

 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 

-#: remote.c:610
+#: remote.c:611

 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 

-#: remote.c:614
+#: remote.c:615

 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 

-#: remote.c:622
+#: remote.c:623

 msgid "Internal error"
 msgstr ""
 
 msgid "Internal error"
 msgstr ""
 

-#: remote.c:1536 remote.c:1637
+#: remote.c:1569 remote.c:1670

 msgid "HEAD does not point to a branch"
 msgstr ""
 
 msgid "HEAD does not point to a branch"
 msgstr ""
 

-#: remote.c:1545
+#: remote.c:1578

 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 
 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 

-#: remote.c:1548
+#: remote.c:1581

 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 

-#: remote.c:1554
+#: remote.c:1587

 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 

-#: remote.c:1569
+#: remote.c:1602

 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 

-#: remote.c:1581
+#: remote.c:1614

 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 

-#: remote.c:1591
+#: remote.c:1624

 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 

-#: remote.c:1604
+#: remote.c:1637

 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 

-#: remote.c:1626
+#: remote.c:1659

 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 

-#: remote.c:1951
+#: remote.c:1935

 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 

-#: remote.c:1955
+#: remote.c:1939

 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 

-#: remote.c:1958
+#: remote.c:1942

 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr ""
 

-#: remote.c:1962
+#: remote.c:1946

 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr ""
 
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr ""
 

-#: remote.c:1965
+#: remote.c:1949

 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 

-#: remote.c:1969
+#: remote.c:1953

 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:1975
+#: remote.c:1959

 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 

-#: remote.c:1978
+#: remote.c:1962

 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""


@@ -3742,11 +4071,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:1986
+#: remote.c:1970

 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 

-#: remote.c:1989
+#: remote.c:1973

 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"


@@ -3757,43 +4086,146 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:1999
+#: remote.c:1983

 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 

-#: replace-object.c:20
+#: replace-object.c:21

 #, c-format
 msgid "bad replace ref name: %s"
 msgstr ""
 
 #, c-format
 msgid "bad replace ref name: %s"
 msgstr ""
 

-#: replace-object.c:29
+#: replace-object.c:30

 #, c-format
 msgid "duplicate replace ref: %s"
 msgstr ""
 
 #, c-format
 msgid "duplicate replace ref: %s"
 msgstr ""
 

-#: replace-object.c:72
+#: replace-object.c:73

 #, c-format
 msgid "replace depth too high for object %s"
 msgstr ""
 
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr ""
 

-#: revision.c:2305
-msgid "your current branch appears to be broken"
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"

 msgstr ""
 
 msgstr ""
 

-#: revision.c:2308
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"

 msgstr ""
 
 msgstr ""
 

-#: revision.c:2505
-msgid "--first-parent is incompatible with --bisect"
+#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
+#, c-format
+msgid "could not write '%s'"

 msgstr ""
 
 msgstr ""
 

-#: run-command.c:728
-msgid "open /dev/null failed"
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"

 msgstr ""
 
 msgstr ""
 

-#: run-command.c:1271
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
+msgstr ""
+
+#: rerere.c:503 rerere.c:1039
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr ""
+
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr ""
+
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
+msgstr ""
+
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr ""
+
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr ""
+
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr ""
+
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr ""
+
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr ""
+
+#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1423
+#, c-format
+msgid "could not create directory '%s'"
+msgstr ""
+
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr ""
+
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr ""
+
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr ""
+
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr ""
+
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr ""
+
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
+msgstr ""
+
+#: revision.c:2324
+msgid "your current branch appears to be broken"
+msgstr ""
+
+#: revision.c:2327
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr ""
+
+#: revision.c:2523
+msgid "--first-parent is incompatible with --bisect"
+msgstr ""
+
+#: run-command.c:740
+msgid "open /dev/null failed"
+msgstr ""
+
+#: run-command.c:1229
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr ""
+
+#: run-command.c:1293

 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"


@@ -3814,101 +4246,101 @@ msgstr ""
 msgid "remote unpack failed: %s"
 msgstr ""
 
 msgid "remote unpack failed: %s"
 msgstr ""
 

-#: send-pack.c:309
+#: send-pack.c:308

 msgid "failed to sign the push certificate"
 msgstr ""
 
 msgid "failed to sign the push certificate"
 msgstr ""
 

-#: send-pack.c:422
+#: send-pack.c:421

 msgid "the receiving end does not support --signed push"
 msgstr ""
 
 msgid "the receiving end does not support --signed push"
 msgstr ""
 

-#: send-pack.c:424
+#: send-pack.c:423

 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 

-#: send-pack.c:436
+#: send-pack.c:435

 msgid "the receiving end does not support --atomic push"
 msgstr ""
 
 msgid "the receiving end does not support --atomic push"
 msgstr ""
 

-#: send-pack.c:441
+#: send-pack.c:440

 msgid "the receiving end does not support push options"
 msgstr ""
 
 msgid "the receiving end does not support push options"
 msgstr ""
 

-#: sequencer.c:177
+#: sequencer.c:183

 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 

-#: sequencer.c:278
+#: sequencer.c:287

 #, c-format
 msgid "could not delete '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not delete '%s'"
 msgstr ""
 

-#: sequencer.c:304
+#: sequencer.c:313

 msgid "revert"
 msgstr ""
 
 msgid "revert"
 msgstr ""
 

-#: sequencer.c:306
+#: sequencer.c:315

 msgid "cherry-pick"
 msgstr ""
 
 msgid "cherry-pick"
 msgstr ""
 

-#: sequencer.c:308
+#: sequencer.c:317

 msgid "rebase -i"
 msgstr ""
 
 msgid "rebase -i"
 msgstr ""
 

-#: sequencer.c:310
+#: sequencer.c:319

 #, c-format
 msgid "unknown action: %d"
 msgstr ""
 
 #, c-format
 msgid "unknown action: %d"
 msgstr ""
 

-#: sequencer.c:367
+#: sequencer.c:376

 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 

-#: sequencer.c:370
+#: sequencer.c:379

 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 ""
 
 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:383 sequencer.c:2488
+#: sequencer.c:392 sequencer.c:2632

 #, c-format
 msgid "could not lock '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not lock '%s'"
 msgstr ""
 

-#: sequencer.c:390
+#: sequencer.c:399

 #, c-format
 msgid "could not write eol to '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr ""
 

-#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508
-#: sequencer.c:2741
+#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
+#: sequencer.c:2885

 #, c-format
 msgid "failed to finalize '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr ""
 

-#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391
-#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740
-#: builtin/merge.c:1081
+#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
+#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
+#: builtin/merge.c:1084 builtin/rebase.c:152

 #, c-format
 msgid "could not read '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not read '%s'"
 msgstr ""
 

-#: sequencer.c:444
+#: sequencer.c:453

 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr ""
 
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr ""
 

-#: sequencer.c:448
+#: sequencer.c:457

 msgid "commit your changes or stash them to proceed."
 msgstr ""
 
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 

-#: sequencer.c:477
+#: sequencer.c:486

 #, c-format
 msgid "%s: fast-forward"
 msgstr ""
 #, c-format
 msgid "%s: fast-forward"
 msgstr ""


@@ -3916,35 +4348,70 @@ msgstr ""
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.

-#: sequencer.c:566
+#: sequencer.c:575

 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 

-#: sequencer.c:582
+#: sequencer.c:591

 msgid "unable to update cache tree"
 msgstr ""
 
 msgid "unable to update cache tree"
 msgstr ""
 

-#: sequencer.c:595
+#: sequencer.c:604

 msgid "could not resolve HEAD commit"
 msgstr ""
 
 msgid "could not resolve HEAD commit"
 msgstr ""
 

-#: sequencer.c:723 sequencer.c:740
+#: sequencer.c:684

 #, c-format
 #, c-format

-msgid "could not parse '%s' (looking for '%s')"
+msgid "no key present in '%.*s'"

 msgstr ""
 
 msgstr ""
 

-#: sequencer.c:731
+#: sequencer.c:695

 #, c-format
 #, c-format

-msgid "bad quoting on %s value in '%s'"
+msgid "unable to dequote value of '%s'"
+msgstr ""
+
+#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
+#: builtin/am.c:811 builtin/merge.c:1081
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#: sequencer.c:742
+msgid "'GIT_AUTHOR_NAME' already given"

 msgstr ""
 
 #: sequencer.c:747
 msgstr ""
 
 #: sequencer.c:747

+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+#: sequencer.c:752
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
+
+#: sequencer.c:756

 #, c-format
 #, c-format

-msgid "invalid date format '%s' in '%s'"
+msgid "unknown variable '%s'"

 msgstr ""
 
 #: sequencer.c:761
 msgstr ""
 
 #: sequencer.c:761

+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+#: sequencer.c:763
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:765
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#: sequencer.c:825
+#, c-format
+msgid "invalid date format '%s' in '%s'"
+msgstr ""
+
+#: sequencer.c:842

 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"


@@ -3961,15 +4428,15 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:830
+#: sequencer.c:935

 msgid "writing root commit"
 msgstr ""
 
 msgid "writing root commit"
 msgstr ""
 

-#: sequencer.c:1055
+#: sequencer.c:1142

 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 

-#: sequencer.c:1062
+#: sequencer.c:1149

 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"


@@ -3984,7 +4451,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
 "    git commit --amend --reset-author\n"
 msgstr ""
 

-#: sequencer.c:1075
+#: sequencer.c:1162

 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"


@@ -3998,304 +4465,299 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
 "    git commit --amend --reset-author\n"
 msgstr ""
 

-#: sequencer.c:1115
+#: sequencer.c:1202

 msgid "couldn't look up newly created commit"
 msgstr ""
 
 msgid "couldn't look up newly created commit"
 msgstr ""
 

-#: sequencer.c:1117
+#: sequencer.c:1204

 msgid "could not parse newly created commit"
 msgstr ""
 
 msgid "could not parse newly created commit"
 msgstr ""
 

-#: sequencer.c:1163
+#: sequencer.c:1250

 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 

-#: sequencer.c:1165
+#: sequencer.c:1252

 msgid "detached HEAD"
 msgstr ""
 
 msgid "detached HEAD"
 msgstr ""
 

-#: sequencer.c:1169
+#: sequencer.c:1256

 msgid " (root-commit)"
 msgstr ""
 
 msgid " (root-commit)"
 msgstr ""
 

-#: sequencer.c:1190
+#: sequencer.c:1277

 msgid "could not parse HEAD"
 msgstr ""
 
 msgid "could not parse HEAD"
 msgstr ""
 

-#: sequencer.c:1192
+#: sequencer.c:1279

 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr ""
 
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr ""
 

-#: sequencer.c:1196 builtin/commit.c:1528
+#: sequencer.c:1283 builtin/commit.c:1543

 msgid "could not parse HEAD commit"
 msgstr ""
 
 msgid "could not parse HEAD commit"
 msgstr ""
 

-#: sequencer.c:1247 sequencer.c:1845
+#: sequencer.c:1334 sequencer.c:1934

 msgid "unable to parse commit author"
 msgstr ""
 
 msgid "unable to parse commit author"
 msgstr ""
 

-#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675
+#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

 msgid "git write-tree failed to write a tree"
 msgstr ""
 
 msgid "git write-tree failed to write a tree"
 msgstr ""
 

-#: sequencer.c:1274 sequencer.c:1329
+#: sequencer.c:1361 sequencer.c:1416

 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 

-#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855
-#: builtin/merge.c:880
+#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
+#: builtin/merge.c:883

 msgid "failed to write commit object"
 msgstr ""
 
 msgid "failed to write commit object"
 msgstr ""
 

-#: sequencer.c:1356
+#: sequencer.c:1443

 #, c-format
 msgid "could not parse commit %s"
 msgstr ""
 
 #, c-format
 msgid "could not parse commit %s"
 msgstr ""
 

-#: sequencer.c:1361
+#: sequencer.c:1448

 #, c-format
 msgid "could not parse parent commit %s"
 msgstr ""
 
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr ""
 

-#: sequencer.c:1457 sequencer.c:1565
+#: sequencer.c:1546 sequencer.c:1654

 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 

-#: sequencer.c:1512 sequencer.c:1537
+#: sequencer.c:1601 sequencer.c:1626

 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 

-#: sequencer.c:1522 sequencer.c:4520
+#: sequencer.c:1611 sequencer.c:4744

 msgid "need a HEAD to fixup"
 msgstr ""
 
 msgid "need a HEAD to fixup"
 msgstr ""
 

-#: sequencer.c:1524 sequencer.c:2768
+#: sequencer.c:1613 sequencer.c:2912

 msgid "could not read HEAD"
 msgstr ""
 
 msgid "could not read HEAD"
 msgstr ""
 

-#: sequencer.c:1526
+#: sequencer.c:1615

 msgid "could not read HEAD's commit message"
 msgstr ""
 
 msgid "could not read HEAD's commit message"
 msgstr ""
 

-#: sequencer.c:1532
+#: sequencer.c:1621

 #, c-format
 msgid "cannot write '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot write '%s'"
 msgstr ""
 

-#: sequencer.c:1539 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

 msgid "This is the 1st commit message:"
 msgstr ""
 
 msgid "This is the 1st commit message:"
 msgstr ""
 

-#: sequencer.c:1547
+#: sequencer.c:1636

 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 
 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 

-#: sequencer.c:1554
+#: sequencer.c:1643

 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 

-#: sequencer.c:1560
+#: sequencer.c:1649

 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 

-#: sequencer.c:1643
+#: sequencer.c:1732

 msgid "your index file is unmerged."
 msgstr ""
 
 msgid "your index file is unmerged."
 msgstr ""
 

-#: sequencer.c:1650
+#: sequencer.c:1739

 msgid "cannot fixup root commit"
 msgstr ""
 
 msgid "cannot fixup root commit"
 msgstr ""
 

-#: sequencer.c:1669
+#: sequencer.c:1758

 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 

-#: sequencer.c:1677
+#: sequencer.c:1766

 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 

-#: sequencer.c:1681
+#: sequencer.c:1770

 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 

-#: sequencer.c:1687
+#: sequencer.c:1776

 #, 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.
 #, 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:1706
+#: sequencer.c:1795

 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 

-#: sequencer.c:1771
+#: sequencer.c:1860

 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr ""
 

-#: sequencer.c:1826
+#: sequencer.c:1915

 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 

-#: sequencer.c:1827
+#: sequencer.c:1916

 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 

-#: sequencer.c:1885
+#: sequencer.c:1974

 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 

-#: sequencer.c:1892
+#: sequencer.c:1981

 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 

-#: sequencer.c:1972
+#: sequencer.c:2062

 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 

-#: sequencer.c:1981
+#: sequencer.c:2071

 #, c-format
 msgid "missing arguments for %s"
 msgstr ""
 
 #, c-format
 msgid "missing arguments for %s"
 msgstr ""
 

-#: sequencer.c:2040
+#: sequencer.c:2130

 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 

-#: sequencer.c:2048
+#: sequencer.c:2138

 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 

-#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333
-#, c-format
-msgid "could not read '%s'."
-msgstr ""
-
-#: sequencer.c:2119
+#: sequencer.c:2209

 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 

-#: sequencer.c:2121
+#: sequencer.c:2211

 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 

-#: sequencer.c:2126
+#: sequencer.c:2216

 msgid "no commits parsed."
 msgstr ""
 
 msgid "no commits parsed."
 msgstr ""
 

-#: sequencer.c:2137
+#: sequencer.c:2227

 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 

-#: sequencer.c:2139
+#: sequencer.c:2229

 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 

-#: sequencer.c:2209
+#: sequencer.c:2299

 #, c-format
 msgid "invalid value for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr ""
 

-#: sequencer.c:2285
+#: sequencer.c:2380

 msgid "unusable squash-onto"
 msgstr ""
 
 msgid "unusable squash-onto"
 msgstr ""
 

-#: sequencer.c:2301
+#: sequencer.c:2396

 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 

-#: sequencer.c:2335 sequencer.c:3775
+#: sequencer.c:2479 sequencer.c:4005

 msgid "empty commit set passed"
 msgstr ""
 
 msgid "empty commit set passed"
 msgstr ""
 

-#: sequencer.c:2343
+#: sequencer.c:2487

 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 

-#: sequencer.c:2344
+#: sequencer.c:2488

 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 

-#: sequencer.c:2347
+#: sequencer.c:2491

 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 

-#: sequencer.c:2361
+#: sequencer.c:2505

 msgid "could not lock HEAD"
 msgstr ""
 
 msgid "could not lock HEAD"
 msgstr ""
 

-#: sequencer.c:2416 sequencer.c:3543
+#: sequencer.c:2560 sequencer.c:3761

 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 

-#: sequencer.c:2418
+#: sequencer.c:2562

 msgid "cannot resolve HEAD"
 msgstr ""
 
 msgid "cannot resolve HEAD"
 msgstr ""
 

-#: sequencer.c:2420 sequencer.c:2455
+#: sequencer.c:2564 sequencer.c:2599

 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 

-#: sequencer.c:2441 builtin/grep.c:721
+#: sequencer.c:2585 builtin/grep.c:721

 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 

-#: sequencer.c:2443
+#: sequencer.c:2587

 #, c-format
 msgid "cannot read '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr ""
 

-#: sequencer.c:2444
+#: sequencer.c:2588

 msgid "unexpected end of file"
 msgstr ""
 
 msgid "unexpected end of file"
 msgstr ""
 

-#: sequencer.c:2450
+#: sequencer.c:2594

 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 

-#: sequencer.c:2461
+#: sequencer.c:2605

 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 

-#: sequencer.c:2565 sequencer.c:3461
+#: sequencer.c:2709 sequencer.c:3679

 #, c-format
 msgid "could not update %s"
 msgstr ""
 
 #, c-format
 msgid "could not update %s"
 msgstr ""
 

-#: sequencer.c:2603 sequencer.c:3441
+#: sequencer.c:2747 sequencer.c:3659

 msgid "cannot read HEAD"
 msgstr ""
 
 msgid "cannot read HEAD"
 msgstr ""
 

-#: sequencer.c:2618
+#: sequencer.c:2762

 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr ""
 

-#: sequencer.c:2626
+#: sequencer.c:2770

 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"


@@ -4307,26 +4769,27 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:2636
+#: sequencer.c:2780

 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 

-#: sequencer.c:2643
+#: sequencer.c:2787

 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 
 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 

-#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640
+#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr ""
 

-#: sequencer.c:2680 sequencer.c:3095
+#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:999
+#: builtin/rebase.c:1350 builtin/rebase.c:1404

 msgid "could not read index"
 msgstr ""
 
 msgid "could not read index"
 msgstr ""
 

-#: sequencer.c:2685
+#: sequencer.c:2829

 #, c-format
 msgid ""
 "execution failed: %s\n"
 #, c-format
 msgid ""
 "execution failed: %s\n"


@@ -4336,11 +4799,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:2691
+#: sequencer.c:2835

 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 

-#: sequencer.c:2697
+#: sequencer.c:2841

 #, c-format
 msgid ""
 "execution succeeded: %s\n"
 #, c-format
 msgid ""
 "execution succeeded: %s\n"


@@ -4351,81 +4814,76 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:2758
+#: sequencer.c:2902

 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 

-#: sequencer.c:2810
+#: sequencer.c:2954

 msgid "writing fake root commit"
 msgstr ""
 
 msgid "writing fake root commit"
 msgstr ""
 

-#: sequencer.c:2815
+#: sequencer.c:2959

 msgid "writing squash-onto"
 msgstr ""
 
 msgid "writing squash-onto"
 msgstr ""
 

-#: sequencer.c:2850
+#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:590

 #, c-format
 msgid "failed to find tree of %s"
 msgstr ""
 
 #, c-format
 msgid "failed to find tree of %s"
 msgstr ""
 

-#: sequencer.c:2868
+#: sequencer.c:3015 builtin/rebase.c:603

 msgid "could not write index"
 msgstr ""
 
 msgid "could not write index"
 msgstr ""
 

-#: sequencer.c:2895
+#: sequencer.c:3042

 #, c-format
 msgid "could not resolve '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not resolve '%s'"
 msgstr ""
 

-#: sequencer.c:2921
+#: sequencer.c:3068

 msgid "cannot merge without a current revision"
 msgstr ""
 
 msgid "cannot merge without a current revision"
 msgstr ""
 

-#: sequencer.c:2943
+#: sequencer.c:3090

 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 

-#: sequencer.c:2952
+#: sequencer.c:3099

 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 

-#: sequencer.c:2964
+#: sequencer.c:3111

 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 

-#: sequencer.c:2979
+#: sequencer.c:3126

 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr ""
 

-#: sequencer.c:2989 sequencer.c:3015
-#, c-format
-msgid "could not write '%s'"
-msgstr ""
-
-#: sequencer.c:3127
+#: sequencer.c:3274

 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 

-#: sequencer.c:3143
+#: sequencer.c:3290

 msgid "merge: Unable to write new index file"
 msgstr ""
 
 msgid "merge: Unable to write new index file"
 msgstr ""
 

-#: sequencer.c:3211
+#: sequencer.c:3358 builtin/rebase.c:268

 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 

-#: sequencer.c:3223
+#: sequencer.c:3370

 #, c-format
 msgid "cannot store %s"
 msgstr ""
 
 #, c-format
 msgid "cannot store %s"
 msgstr ""
 

-#: sequencer.c:3226 git-rebase.sh:188
+#: sequencer.c:3373 builtin/rebase.c:284

 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"


@@ -4433,7 +4891,31 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 

-#: sequencer.c:3257
+#: sequencer.c:3427
+#, c-format
+msgid "could not checkout %s"
+msgstr ""
+
+#: sequencer.c:3441
+#, c-format
+msgid "%s: not a valid OID"
+msgstr ""
+
+#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr ""
+
+#: sequencer.c:3461
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr ""
+
+#: sequencer.c:3463
+#, c-format
+msgid "Stopped at %s\n"
+msgstr ""
+
+#: sequencer.c:3471

 #, c-format
 msgid ""
 "Could not execute the todo command\n"
 #, c-format
 msgid ""
 "Could not execute the todo command\n"


@@ -4446,108 +4928,108 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
 "    git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:3325
+#: sequencer.c:3543

 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 

-#: sequencer.c:3404
+#: sequencer.c:3622

 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 

-#: sequencer.c:3449
+#: sequencer.c:3667

 msgid "could not read orig-head"
 msgstr ""
 
 msgid "could not read orig-head"
 msgstr ""
 

-#: sequencer.c:3454 sequencer.c:4517
+#: sequencer.c:3672 sequencer.c:4741

 msgid "could not read 'onto'"
 msgstr ""
 
 msgid "could not read 'onto'"
 msgstr ""
 

-#: sequencer.c:3468
+#: sequencer.c:3686

 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 

-#: sequencer.c:3554
+#: sequencer.c:3772

 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 

-#: sequencer.c:3563
+#: sequencer.c:3781

 msgid "cannot amend non-existing commit"
 msgstr ""
 
 msgid "cannot amend non-existing commit"
 msgstr ""
 

-#: sequencer.c:3565
+#: sequencer.c:3783

 #, c-format
 msgid "invalid file: '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid file: '%s'"
 msgstr ""
 

-#: sequencer.c:3567
+#: sequencer.c:3785

 #, c-format
 msgid "invalid contents: '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr ""
 

-#: sequencer.c:3570
+#: sequencer.c:3788

 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 
 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:3595 sequencer.c:3633
+#: sequencer.c:3824 sequencer.c:3862

 #, c-format
 msgid "could not write file: '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not write file: '%s'"
 msgstr ""
 

-#: sequencer.c:3648
+#: sequencer.c:3877

 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 

-#: sequencer.c:3655
+#: sequencer.c:3884

 msgid "could not commit staged changes."
 msgstr ""
 
 msgid "could not commit staged changes."
 msgstr ""
 

-#: sequencer.c:3752
+#: sequencer.c:3982

 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 

-#: sequencer.c:3756
+#: sequencer.c:3986

 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 
 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 

-#: sequencer.c:3791
+#: sequencer.c:4021

 msgid "can't revert as initial commit"
 msgstr ""
 
 msgid "can't revert as initial commit"
 msgstr ""
 

-#: sequencer.c:4238
+#: sequencer.c:4466

 msgid "make_script: unhandled options"
 msgstr ""
 
 msgid "make_script: unhandled options"
 msgstr ""
 

-#: sequencer.c:4241
+#: sequencer.c:4469

 msgid "make_script: error preparing revisions"
 msgstr ""
 
 msgid "make_script: error preparing revisions"
 msgstr ""
 

-#: sequencer.c:4281 sequencer.c:4337
+#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 

-#: sequencer.c:4396
+#: sequencer.c:4620

 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 

-#: sequencer.c:4466
+#: sequencer.c:4690

 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
 

-#: sequencer.c:4473
+#: sequencer.c:4697

 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"


@@ -4558,7 +5040,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:4486
+#: sequencer.c:4710

 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"


@@ -4566,7 +5048,31 @@ msgid ""
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
 
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
 

-#: sequencer.c:4660
+#: sequencer.c:4848 sequencer.c:4886
+msgid "nothing to do"
+msgstr ""
+
+#: sequencer.c:4852
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: sequencer.c:4864
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr ""
+
+#: sequencer.c:4868 sequencer.c:4897
+msgid "could not transform the todo list"
+msgstr ""
+
+#: sequencer.c:4900
+msgid "could not skip unnecessary pick commands"
+msgstr ""
+
+#: sequencer.c:4983

 msgid "the script was already rearranged."
 msgstr ""
 
 msgid "the script was already rearranged."
 msgstr ""
 


@@ -4611,106 +5117,106 @@ msgstr ""
 msgid "this operation must be run in a work tree"
 msgstr ""
 
 msgid "this operation must be run in a work tree"
 msgstr ""
 

-#: setup.c:503
+#: setup.c:527

 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 

-#: setup.c:511
+#: setup.c:535

 msgid "unknown repository extensions found:"
 msgstr ""
 
 msgid "unknown repository extensions found:"
 msgstr ""
 

-#: setup.c:530
+#: setup.c:554

 #, c-format
 msgid "error opening '%s'"
 msgstr ""
 
 #, c-format
 msgid "error opening '%s'"
 msgstr ""
 

-#: setup.c:532
+#: setup.c:556

 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 

-#: setup.c:534
+#: setup.c:558

 #, c-format
 msgid "error reading %s"
 msgstr ""
 
 #, c-format
 msgid "error reading %s"
 msgstr ""
 

-#: setup.c:536
+#: setup.c:560

 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr ""
 

-#: setup.c:538
+#: setup.c:562

 #, c-format
 msgid "no path in gitfile: %s"
 msgstr ""
 
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr ""
 

-#: setup.c:540
+#: setup.c:564

 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 
 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 

-#: setup.c:639
+#: setup.c:663

 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 

-#: setup.c:653
+#: setup.c:677

 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 

-#: setup.c:682 setup.c:684 setup.c:715
+#: setup.c:706 setup.c:708 setup.c:739

 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr ""
 

-#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839

 msgid "cannot come back to cwd"
 msgstr ""
 
 msgid "cannot come back to cwd"
 msgstr ""
 

-#: setup.c:813
+#: setup.c:837

 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 

-#: setup.c:824
+#: setup.c:848

 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr ""
 

-#: setup.c:1054
+#: setup.c:1078

 msgid "Unable to read current working directory"
 msgstr ""
 
 msgid "Unable to read current working directory"
 msgstr ""
 

-#: setup.c:1066 setup.c:1072
+#: setup.c:1090 setup.c:1096

 #, c-format
 msgid "cannot change to '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot change to '%s'"
 msgstr ""
 

-#: setup.c:1085
+#: setup.c:1109

 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 

-#: setup.c:1168
+#: setup.c:1192

 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 
 #, 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:1211
+#: setup.c:1235

 msgid "open /dev/null or dup failed"
 msgstr ""
 
 msgid "open /dev/null or dup failed"
 msgstr ""
 

-#: setup.c:1226
+#: setup.c:1250

 msgid "fork failed"
 msgstr ""
 
 msgid "fork failed"
 msgstr ""
 

-#: setup.c:1231
+#: setup.c:1255

 msgid "setsid failed"
 msgstr ""
 
 msgid "setsid failed"
 msgstr ""
 


@@ -4785,12 +5291,12 @@ msgstr ""
 msgid "object file %s is empty"
 msgstr ""
 
 msgid "object file %s is empty"
 msgstr ""
 

-#: sha1-file.c:1093 sha1-file.c:2206
+#: sha1-file.c:1093 sha1-file.c:2215

 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 

-#: sha1-file.c:1095 sha1-file.c:2210
+#: sha1-file.c:1095 sha1-file.c:2219

 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""


@@ -4885,7 +5391,7 @@ msgstr ""
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
 msgid "confused by unstable object source data for %s"
 msgstr ""
 

-#: sha1-file.c:1685 builtin/pack-objects.c:899
+#: sha1-file.c:1685 builtin/pack-objects.c:918

 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 #, c-format
 msgid "failed utime() on %s"
 msgstr ""


@@ -4903,76 +5409,76 @@ msgstr ""
 msgid "corrupt tag"
 msgstr ""
 
 msgid "corrupt tag"
 msgstr ""
 

-#: sha1-file.c:1906
+#: sha1-file.c:1912

 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 
 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 

-#: sha1-file.c:1909
+#: sha1-file.c:1915

 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 
 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 

-#: sha1-file.c:1980 sha1-file.c:1989
+#: sha1-file.c:1988 sha1-file.c:1997

 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 

-#: sha1-file.c:1995
+#: sha1-file.c:2003

 #, c-format
 msgid "%s: unsupported file type"
 msgstr ""
 
 #, c-format
 msgid "%s: unsupported file type"
 msgstr ""
 

-#: sha1-file.c:2019
+#: sha1-file.c:2027

 #, c-format
 msgid "%s is not a valid object"
 msgstr ""
 
 #, c-format
 msgid "%s is not a valid object"
 msgstr ""
 

-#: sha1-file.c:2021
+#: sha1-file.c:2029

 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr ""
 
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr ""
 

-#: sha1-file.c:2048 builtin/index-pack.c:158
+#: sha1-file.c:2056 builtin/index-pack.c:154

 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 

-#: sha1-file.c:2217 sha1-file.c:2269
+#: sha1-file.c:2226 sha1-file.c:2278

 #, c-format
 msgid "sha1 mismatch for %s (expected %s)"
 msgstr ""
 
 #, c-format
 msgid "sha1 mismatch for %s (expected %s)"
 msgstr ""
 

-#: sha1-file.c:2241
+#: sha1-file.c:2250

 #, c-format
 msgid "unable to mmap %s"
 msgstr ""
 
 #, c-format
 msgid "unable to mmap %s"
 msgstr ""
 

-#: sha1-file.c:2246
+#: sha1-file.c:2255

 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 

-#: sha1-file.c:2252
+#: sha1-file.c:2261

 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 

-#: sha1-file.c:2263
+#: sha1-file.c:2272

 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
 

-#: sha1-name.c:444
+#: sha1-name.c:476

 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr ""
 
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr ""
 

-#: sha1-name.c:455
+#: sha1-name.c:487

 msgid "The candidates are:"
 msgstr ""
 
 msgid "The candidates are:"
 msgstr ""
 

-#: sha1-name.c:699
+#: sha1-name.c:770

 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"


@@ -4985,96 +5491,80 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 

-#: submodule.c:97 submodule.c:131
+#: submodule.c:116 submodule.c:145

 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 

-#: submodule.c:101 submodule.c:135
+#: submodule.c:120 submodule.c:149

 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr ""
 
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr ""
 

-#: submodule.c:109
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ""
-
-#: submodule.c:142
+#: submodule.c:156

 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 

-#: submodule.c:153
+#: submodule.c:167

 msgid "staging updated .gitmodules failed"
 msgstr ""
 
 msgid "staging updated .gitmodules failed"
 msgstr ""
 

-#: submodule.c:315
+#: submodule.c:329

 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr ""
 

-#: submodule.c:346
+#: submodule.c:360

 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 

-#: submodule.c:839
+#: submodule.c:857

 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 

-#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888
+#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985

 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 

-#: submodule.c:1377
+#: submodule.c:1404

 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 

-#: submodule.c:1515
+#: submodule.c:1542

 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 

-#: submodule.c:1528
+#: submodule.c:1555

 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 

-#: submodule.c:1543
-#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr ""
-
-#: submodule.c:1633
+#: submodule.c:1648

 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 

-#: submodule.c:1685
+#: submodule.c:1700

 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr ""
 
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr ""
 

-#: submodule.c:1734
+#: submodule.c:1747

 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 

-#: submodule.c:1746 submodule.c:1802
+#: submodule.c:1759 submodule.c:1815

 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 

-#: submodule.c:1750 builtin/submodule--helper.c:1406
-#: builtin/submodule--helper.c:1416
-#, c-format
-msgid "could not create directory '%s'"
-msgstr ""
-
-#: submodule.c:1753
+#: submodule.c:1766

 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"


@@ -5082,34 +5572,44 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
 "'%s'\n"
 msgstr ""
 

-#: submodule.c:1837
+#: submodule.c:1850

 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 

-#: submodule.c:1881
+#: submodule.c:1894

 msgid "could not start ls-files in .."
 msgstr ""
 
 msgid "could not start ls-files in .."
 msgstr ""
 

-#: submodule.c:1920
+#: submodule.c:1933

 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
 
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
 

-#: submodule-config.c:231
+#: submodule-config.c:232

 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr ""
 
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr ""
 

-#: submodule-config.c:295
+#: submodule-config.c:296

 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr ""
 
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr ""
 

-#: submodule-config.c:468
+#: submodule-config.c:390
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+
+#: submodule-config.c:479

 #, c-format
 msgid "invalid value for %s"
 msgstr ""
 
 #, c-format
 msgid "invalid value for %s"
 msgstr ""
 

+#: submodule-config.c:754
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ""
+

 #: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 #: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"


@@ -5121,7 +5621,7 @@ msgstr ""
 msgid "unknown value '%s' for key '%s'"
 msgstr ""
 
 msgid "unknown value '%s' for key '%s'"
 msgstr ""
 

-#: trailer.c:539 trailer.c:544 builtin/remote.c:294
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295

 #, c-format
 msgid "more than one %s"
 msgstr ""
 #, c-format
 msgid "more than one %s"
 msgstr ""


@@ -5140,26 +5640,26 @@ msgstr ""
 msgid "could not read from stdin"
 msgstr ""
 
 msgid "could not read from stdin"
 msgstr ""
 

-#: trailer.c:1008 builtin/am.c:47
+#: trailer.c:1011 builtin/am.c:47

 #, c-format
 msgid "could not stat %s"
 msgstr ""
 
 #, c-format
 msgid "could not stat %s"
 msgstr ""
 

-#: trailer.c:1010
+#: trailer.c:1013

 #, c-format
 msgid "file %s is not a regular file"
 msgstr ""
 
 #, c-format
 msgid "file %s is not a regular file"
 msgstr ""
 

-#: trailer.c:1012
+#: trailer.c:1015

 #, c-format
 msgid "file %s is not writable by user"
 msgstr ""
 
 #, c-format
 msgid "file %s is not writable by user"
 msgstr ""
 

-#: trailer.c:1024
+#: trailer.c:1027

 msgid "could not open temporary file"
 msgstr ""
 
 msgid "could not open temporary file"
 msgstr ""
 

-#: trailer.c:1064
+#: trailer.c:1067

 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr ""
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr ""


@@ -5179,36 +5679,36 @@ msgstr ""
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 

-#: transport.c:586
+#: transport.c:616

 msgid "could not parse transport.color.* config"
 msgstr ""
 
 msgid "could not parse transport.color.* config"
 msgstr ""
 

-#: transport.c:659
+#: transport.c:689

 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 

-#: transport.c:785
+#: transport.c:816

 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr ""
 

-#: transport.c:851
+#: transport.c:882

 #, c-format
 msgid "transport '%s' not allowed"
 msgstr ""
 
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr ""
 

-#: transport.c:903
+#: transport.c:936

 msgid "git-over-rsync is no longer supported"
 msgstr ""
 
 msgid "git-over-rsync is no longer supported"
 msgstr ""
 

-#: transport.c:998
+#: transport.c:1031

 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
 

-#: transport.c:1002
+#: transport.c:1035

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -5224,19 +5724,19 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: transport.c:1010
+#: transport.c:1043

 msgid "Aborting."
 msgstr ""
 
 msgid "Aborting."
 msgstr ""
 

-#: transport.c:1148
+#: transport.c:1182

 msgid "failed to push all needed submodules"
 msgstr ""
 
 msgid "failed to push all needed submodules"
 msgstr ""
 

-#: transport.c:1270 transport-helper.c:643
+#: transport.c:1315 transport-helper.c:643

 msgid "operation not supported by protocol"
 msgstr ""
 
 msgid "operation not supported by protocol"
 msgstr ""
 

-#: transport.c:1352
+#: transport.c:1419

 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""


@@ -5365,42 +5865,42 @@ msgstr ""
 msgid "malformed response in ref list: %s"
 msgstr ""
 
 msgid "malformed response in ref list: %s"
 msgstr ""
 

-#: transport-helper.c:1230
+#: transport-helper.c:1231

 #, c-format
 msgid "read(%s) failed"
 msgstr ""
 
 #, c-format
 msgid "read(%s) failed"
 msgstr ""
 

-#: transport-helper.c:1257
+#: transport-helper.c:1258

 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 
 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 

-#: transport-helper.c:1306
+#: transport-helper.c:1307

 #, c-format
 msgid "%s thread failed"
 msgstr ""
 
 #, c-format
 msgid "%s thread failed"
 msgstr ""
 

-#: transport-helper.c:1310
+#: transport-helper.c:1311

 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 

-#: transport-helper.c:1329 transport-helper.c:1333
+#: transport-helper.c:1330 transport-helper.c:1334

 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 

-#: transport-helper.c:1370
+#: transport-helper.c:1371

 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 
 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 

-#: transport-helper.c:1374
+#: transport-helper.c:1375

 #, c-format
 msgid "%s process failed"
 msgstr ""
 
 #, c-format
 msgid "%s process failed"
 msgstr ""
 

-#: transport-helper.c:1392 transport-helper.c:1401
+#: transport-helper.c:1393 transport-helper.c:1402

 msgid "can't start thread for copying data"
 msgstr ""
 
 msgid "can't start thread for copying data"
 msgstr ""
 


@@ -5599,6 +6099,13 @@ msgstr ""
 msgid "Checking out files"
 msgstr ""
 
 msgid "Checking out files"
 msgstr ""
 

+#: unpack-trees.c:368
+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 ""
+

 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr ""
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr ""


@@ -5628,32 +6135,32 @@ msgstr ""
 msgid "invalid '..' path segment"
 msgstr ""
 
 msgid "invalid '..' path segment"
 msgstr ""
 

-#: worktree.c:245 builtin/am.c:2147
+#: worktree.c:249 builtin/am.c:2100

 #, c-format
 msgid "failed to read '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to read '%s'"
 msgstr ""
 

-#: worktree.c:291
+#: worktree.c:295

 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 

-#: worktree.c:302
+#: worktree.c:306

 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 

-#: worktree.c:314
+#: worktree.c:318

 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 

-#: worktree.c:320
+#: worktree.c:324

 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr ""
 

-#: worktree.c:328
+#: worktree.c:332

 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr ""
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr ""


@@ -5663,12 +6170,6 @@ msgstr ""
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 

-#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771
-#: builtin/am.c:863 builtin/merge.c:1078
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr ""
-

 #: wrapper.c:424 wrapper.c:624
 #, c-format
 msgid "unable to access '%s'"
 #: wrapper.c:424 wrapper.c:624
 #, c-format
 msgid "unable to access '%s'"


@@ -5703,11 +6204,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 

-#: wt-status.c:202 wt-status.c:1015
+#: wt-status.c:202 wt-status.c:1042

 msgid "Changes to be committed:"
 msgstr ""
 
 msgid "Changes to be committed:"
 msgstr ""
 

-#: wt-status.c:220 wt-status.c:1024
+#: wt-status.c:220 wt-status.c:1051

 msgid "Changes not staged for commit:"
 msgstr ""
 
 msgid "Changes not staged for commit:"
 msgstr ""
 


@@ -5805,247 +6306,247 @@ msgstr ""
 msgid "untracked content, "
 msgstr ""
 
 msgid "untracked content, "
 msgstr ""
 

-#: wt-status.c:853
+#: wt-status.c:880

 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] ""
 msgstr[1] ""
 

-#: wt-status.c:885
+#: wt-status.c:912

 msgid "Submodules changed but not updated:"
 msgstr ""
 
 msgid "Submodules changed but not updated:"
 msgstr ""
 

-#: wt-status.c:887
+#: wt-status.c:914

 msgid "Submodule changes to be committed:"
 msgstr ""
 
 msgid "Submodule changes to be committed:"
 msgstr ""
 

-#: wt-status.c:969
+#: wt-status.c:996

 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
 
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
 

-#: wt-status.c:1084
+#: wt-status.c:1097

 msgid "You have unmerged paths."
 msgstr ""
 
 msgid "You have unmerged paths."
 msgstr ""
 

-#: wt-status.c:1087
+#: wt-status.c:1100

 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 

-#: wt-status.c:1089
+#: wt-status.c:1102

 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 

-#: wt-status.c:1094
+#: wt-status.c:1106

 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 

-#: wt-status.c:1097
+#: wt-status.c:1109

 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 

-#: wt-status.c:1107
+#: wt-status.c:1118

 msgid "You are in the middle of an am session."
 msgstr ""
 
 msgid "You are in the middle of an am session."
 msgstr ""
 

-#: wt-status.c:1110
+#: wt-status.c:1121

 msgid "The current patch is empty."
 msgstr ""
 
 msgid "The current patch is empty."
 msgstr ""
 

-#: wt-status.c:1114
+#: wt-status.c:1125

 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 

-#: wt-status.c:1116
+#: wt-status.c:1127

 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 

-#: wt-status.c:1118
+#: wt-status.c:1129

 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 

-#: wt-status.c:1250
+#: wt-status.c:1260

 msgid "git-rebase-todo is missing."
 msgstr ""
 
 msgid "git-rebase-todo is missing."
 msgstr ""
 

-#: wt-status.c:1252
+#: wt-status.c:1262

 msgid "No commands done."
 msgstr ""
 
 msgid "No commands done."
 msgstr ""
 

-#: wt-status.c:1255
+#: wt-status.c:1265

 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] ""
 msgstr[1] ""
 

-#: wt-status.c:1266
+#: wt-status.c:1276

 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 
 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 

-#: wt-status.c:1271
+#: wt-status.c:1281

 msgid "No commands remaining."
 msgstr ""
 
 msgid "No commands remaining."
 msgstr ""
 

-#: wt-status.c:1274
+#: wt-status.c:1284

 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] ""
 msgstr[1] ""
 
 #, 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:1282
+#: wt-status.c:1292

 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 

-#: wt-status.c:1295
+#: wt-status.c:1304

 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr ""
 
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr ""
 

-#: wt-status.c:1300
+#: wt-status.c:1309

 msgid "You are currently rebasing."
 msgstr ""
 
 msgid "You are currently rebasing."
 msgstr ""
 

-#: wt-status.c:1314
+#: wt-status.c:1322

 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1316
+#: wt-status.c:1324

 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 

-#: wt-status.c:1318
+#: wt-status.c:1326

 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 

-#: wt-status.c:1324
+#: wt-status.c:1333

 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1328
+#: wt-status.c:1337

 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 

-#: wt-status.c:1333
+#: wt-status.c:1342

 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 

-#: wt-status.c:1336
+#: wt-status.c:1345

 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1340
+#: wt-status.c:1349

 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 

-#: wt-status.c:1345
+#: wt-status.c:1354

 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 

-#: wt-status.c:1348
+#: wt-status.c:1357

 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 

-#: wt-status.c:1350
+#: wt-status.c:1359

 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 

-#: wt-status.c:1360
+#: wt-status.c:1368

 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr ""
 
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr ""
 

-#: wt-status.c:1365
+#: wt-status.c:1373

 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 

-#: wt-status.c:1368
+#: wt-status.c:1376

 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 

-#: wt-status.c:1370
+#: wt-status.c:1378

 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 

-#: wt-status.c:1379
+#: wt-status.c:1386

 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 

-#: wt-status.c:1384
+#: wt-status.c:1391

 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 

-#: wt-status.c:1387
+#: wt-status.c:1394

 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 

-#: wt-status.c:1389
+#: wt-status.c:1396

 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 

-#: wt-status.c:1400
+#: wt-status.c:1406

 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 

-#: wt-status.c:1404
+#: wt-status.c:1410

 msgid "You are currently bisecting."
 msgstr ""
 
 msgid "You are currently bisecting."
 msgstr ""
 

-#: wt-status.c:1407
+#: wt-status.c:1413

 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 

-#: wt-status.c:1604
+#: wt-status.c:1611

 msgid "On branch "
 msgstr ""
 
 msgid "On branch "
 msgstr ""
 

-#: wt-status.c:1610
+#: wt-status.c:1618

 msgid "interactive rebase in progress; onto "
 msgstr ""
 
 msgid "interactive rebase in progress; onto "
 msgstr ""
 

-#: wt-status.c:1612
+#: wt-status.c:1620

 msgid "rebase in progress; onto "
 msgstr ""
 
 msgid "rebase in progress; onto "
 msgstr ""
 

-#: wt-status.c:1617
+#: wt-status.c:1625

 msgid "HEAD detached at "
 msgstr ""
 
 msgid "HEAD detached at "
 msgstr ""
 

-#: wt-status.c:1619
+#: wt-status.c:1627

 msgid "HEAD detached from "
 msgstr ""
 
 msgid "HEAD detached from "
 msgstr ""
 

-#: wt-status.c:1622
+#: wt-status.c:1630

 msgid "Not currently on any branch."
 msgstr ""
 
 msgid "Not currently on any branch."
 msgstr ""
 

-#: wt-status.c:1642
+#: wt-status.c:1647

 msgid "Initial commit"
 msgstr ""
 
 msgid "Initial commit"
 msgstr ""
 

-#: wt-status.c:1643
+#: wt-status.c:1648

 msgid "No commits yet"
 msgstr ""
 
 msgid "No commits yet"
 msgstr ""
 

-#: wt-status.c:1657
+#: wt-status.c:1662

 msgid "Untracked files"
 msgstr ""
 
 msgid "Untracked files"
 msgstr ""
 

-#: wt-status.c:1659
+#: wt-status.c:1664

 msgid "Ignored files"
 msgstr ""
 
 msgid "Ignored files"
 msgstr ""
 

-#: wt-status.c:1663
+#: wt-status.c:1668

 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"


@@ -6053,101 +6554,96 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
 "new files yourself (see 'git help status')."
 msgstr ""
 

-#: wt-status.c:1669
+#: wt-status.c:1674

 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 

-#: wt-status.c:1671
+#: wt-status.c:1676

 msgid " (use -u option to show untracked files)"
 msgstr ""
 
 msgid " (use -u option to show untracked files)"
 msgstr ""
 

-#: wt-status.c:1677
+#: wt-status.c:1682

 msgid "No changes"
 msgstr ""
 
 msgid "No changes"
 msgstr ""
 

-#: wt-status.c:1682
+#: wt-status.c:1687

 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 

-#: wt-status.c:1685
+#: wt-status.c:1690

 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 

-#: wt-status.c:1688
+#: wt-status.c:1693

 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
 

-#: wt-status.c:1691
+#: wt-status.c:1696

 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 

-#: wt-status.c:1694
+#: wt-status.c:1699

 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 

-#: wt-status.c:1697 wt-status.c:1702
+#: wt-status.c:1702 wt-status.c:1707

 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 

-#: wt-status.c:1700
+#: wt-status.c:1705

 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 

-#: wt-status.c:1704
+#: wt-status.c:1709

 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr ""
 
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr ""
 

-#: wt-status.c:1817
+#: wt-status.c:1822

 msgid "No commits yet on "
 msgstr ""
 
 msgid "No commits yet on "
 msgstr ""
 

-#: wt-status.c:1821
+#: wt-status.c:1826

 msgid "HEAD (no branch)"
 msgstr ""
 
 msgid "HEAD (no branch)"
 msgstr ""
 

-#: wt-status.c:1852
+#: wt-status.c:1857

 msgid "different"
 msgstr ""
 
 msgid "different"
 msgstr ""
 

-#: wt-status.c:1854 wt-status.c:1862
+#: wt-status.c:1859 wt-status.c:1867

 msgid "behind "
 msgstr ""
 
 msgid "behind "
 msgstr ""
 

-#: wt-status.c:1857 wt-status.c:1860
+#: wt-status.c:1862 wt-status.c:1865

 msgid "ahead "
 msgstr ""
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
 msgid "ahead "
 msgstr ""
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"

-#: wt-status.c:2376
+#: wt-status.c:2374

 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 

-#: wt-status.c:2382
+#: wt-status.c:2380

 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 

-#: wt-status.c:2384
+#: wt-status.c:2382

 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 

-#: compat/precompose_utf8.c:58 builtin/clone.c:443
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-

 #: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr ""
 #: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr ""


@@ -6157,7 +6653,7 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr ""
 
 msgid "unexpected diff status %c"
 msgstr ""
 

-#: builtin/add.c:88 builtin/commit.c:279
+#: builtin/add.c:88 builtin/commit.c:284

 msgid "updating files failed"
 msgstr ""
 
 msgid "updating files failed"
 msgstr ""
 


@@ -6170,7 +6666,7 @@ msgstr ""
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 

-#: builtin/add.c:233 builtin/rev-parse.c:893
+#: builtin/add.c:233 builtin/rev-parse.c:895

 msgid "Could not read the index"
 msgstr ""
 
 msgid "Could not read the index"
 msgstr ""
 


@@ -6205,9 +6701,9 @@ msgstr ""
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 

-#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557
-#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
+#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
+#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165

 msgid "dry run"
 msgstr ""
 
 msgid "dry run"
 msgstr ""
 


@@ -6215,7 +6711,7 @@ msgstr ""
 msgid "interactive picking"
 msgstr ""
 
 msgid "interactive picking"
 msgstr ""
 

-#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302
+#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305

 msgid "select hunks interactively"
 msgstr ""
 
 msgid "select hunks interactively"
 msgstr ""
 


@@ -6259,7 +6755,7 @@ msgstr ""
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 

-#: builtin/add.c:308 builtin/update-index.c:973
+#: builtin/add.c:308 builtin/update-index.c:990

 msgid "override the executable bit of the listed files"
 msgstr ""
 
 msgid "override the executable bit of the listed files"
 msgstr ""
 


@@ -6322,139 +6818,136 @@ msgstr ""
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 

-#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282
-#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338
-#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144
-#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329
-msgid "index file corrupt"
-msgstr ""
-
-#: builtin/am.c:415
+#: builtin/am.c:363

 msgid "could not parse author script"
 msgstr ""
 
 msgid "could not parse author script"
 msgstr ""
 

-#: builtin/am.c:499
+#: builtin/am.c:447

 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr ""
 
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr ""
 

-#: builtin/am.c:540
+#: builtin/am.c:488

 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 

-#: builtin/am.c:577
+#: builtin/am.c:525

 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 

-#: builtin/am.c:603
+#: builtin/am.c:551

 msgid "fseek failed"
 msgstr ""
 
 msgid "fseek failed"
 msgstr ""
 

-#: builtin/am.c:791
+#: builtin/am.c:739

 #, c-format
 msgid "could not parse patch '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr ""
 

-#: builtin/am.c:856
+#: builtin/am.c:804

 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 

-#: builtin/am.c:904
+#: builtin/am.c:852

 msgid "invalid timestamp"
 msgstr ""
 
 msgid "invalid timestamp"
 msgstr ""
 

-#: builtin/am.c:909 builtin/am.c:921
+#: builtin/am.c:857 builtin/am.c:869

 msgid "invalid Date line"
 msgstr ""
 
 msgid "invalid Date line"
 msgstr ""
 

-#: builtin/am.c:916
+#: builtin/am.c:864

 msgid "invalid timezone offset"
 msgstr ""
 
 msgid "invalid timezone offset"
 msgstr ""
 

-#: builtin/am.c:1009
+#: builtin/am.c:957

 msgid "Patch format detection failed."
 msgstr ""
 
 msgid "Patch format detection failed."
 msgstr ""
 

-#: builtin/am.c:1014 builtin/clone.c:408
+#: builtin/am.c:962 builtin/clone.c:408

 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 

-#: builtin/am.c:1019
+#: builtin/am.c:967

 msgid "Failed to split patches."
 msgstr ""
 
 msgid "Failed to split patches."
 msgstr ""
 

-#: builtin/am.c:1149 builtin/commit.c:364
+#: builtin/am.c:1097 builtin/commit.c:369

 msgid "unable to write index file"
 msgstr ""
 
 msgid "unable to write index file"
 msgstr ""
 

-#: builtin/am.c:1163
+#: builtin/am.c:1111

 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 

-#: builtin/am.c:1164
+#: builtin/am.c:1112

 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 

-#: builtin/am.c:1165
+#: builtin/am.c:1113

 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 

-#: builtin/am.c:1272
+#: builtin/am.c:1196
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+
+#: builtin/am.c:1224

 msgid "Patch is empty."
 msgstr ""
 
 msgid "Patch is empty."
 msgstr ""
 

-#: builtin/am.c:1338
+#: builtin/am.c:1290

 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 

-#: builtin/am.c:1360
+#: builtin/am.c:1312

 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 

-#: builtin/am.c:1556
+#: builtin/am.c:1508

 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 

-#: builtin/am.c:1558
+#: builtin/am.c:1510

 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 

-#: builtin/am.c:1577
+#: builtin/am.c:1529

 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 

-#: builtin/am.c:1583
+#: builtin/am.c:1535

 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 

-#: builtin/am.c:1608
+#: builtin/am.c:1561

 msgid "Failed to merge in the changes."
 msgstr ""
 
 msgid "Failed to merge in the changes."
 msgstr ""
 

-#: builtin/am.c:1640
+#: builtin/am.c:1593

 msgid "applying to an empty history"
 msgstr ""
 
 msgid "applying to an empty history"
 msgstr ""
 

-#: builtin/am.c:1686 builtin/am.c:1690
+#: builtin/am.c:1639 builtin/am.c:1643

 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 

-#: builtin/am.c:1706
+#: builtin/am.c:1659

 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 

-#: builtin/am.c:1711
+#: builtin/am.c:1664

 msgid "Commit Body is:"
 msgstr ""
 
 msgid "Commit Body is:"
 msgstr ""
 


@@ -6462,41 +6955,41 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
 #. in your translation. The program will only accept English
 #. input at this point.
 #.

-#: builtin/am.c:1721
+#: builtin/am.c:1674

 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 

-#: builtin/am.c:1771
+#: builtin/am.c:1724

 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 

-#: builtin/am.c:1811 builtin/am.c:1879
+#: builtin/am.c:1764 builtin/am.c:1832

 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 

-#: builtin/am.c:1828
+#: builtin/am.c:1781

 msgid "No changes -- Patch already applied."
 msgstr ""
 
 msgid "No changes -- Patch already applied."
 msgstr ""
 

-#: builtin/am.c:1834
+#: builtin/am.c:1787

 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 

-#: builtin/am.c:1838
+#: builtin/am.c:1791

 msgid "Use 'git am --show-current-patch' to see the failed patch"
 msgstr ""
 
 msgid "Use 'git am --show-current-patch' to see the failed patch"
 msgstr ""
 

-#: builtin/am.c:1882
+#: builtin/am.c:1835

 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 ""
 
 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:1889
+#: builtin/am.c:1842

 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "


@@ -6504,180 +6997,181 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 

-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
+#: builtin/reset.c:336

 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 

-#: builtin/am.c:2048
+#: builtin/am.c:2001

 msgid "failed to clean index"
 msgstr ""
 
 msgid "failed to clean index"
 msgstr ""
 

-#: builtin/am.c:2083
+#: builtin/am.c:2036

 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 

-#: builtin/am.c:2174
+#: builtin/am.c:2129

 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 

-#: builtin/am.c:2210
+#: builtin/am.c:2165

 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 

-#: builtin/am.c:2211
+#: builtin/am.c:2166

 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 

-#: builtin/am.c:2217
+#: builtin/am.c:2172

 msgid "run interactively"
 msgstr ""
 
 msgid "run interactively"
 msgstr ""
 

-#: builtin/am.c:2219
+#: builtin/am.c:2174

 msgid "historical option -- no-op"
 msgstr ""
 
 msgid "historical option -- no-op"
 msgstr ""
 

-#: builtin/am.c:2221
+#: builtin/am.c:2176

 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 

-#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58
-#: builtin/repack.c:299
+#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/repack.c:306

 msgid "be quiet"
 msgstr ""
 
 msgid "be quiet"
 msgstr ""
 

-#: builtin/am.c:2224
+#: builtin/am.c:2179

 msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 
 msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 

-#: builtin/am.c:2227
+#: builtin/am.c:2182

 msgid "recode into utf8 (default)"
 msgstr ""
 
 msgid "recode into utf8 (default)"
 msgstr ""
 

-#: builtin/am.c:2229
+#: builtin/am.c:2184

 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2231
+#: builtin/am.c:2186

 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2233
+#: builtin/am.c:2188

 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2235
+#: builtin/am.c:2190

 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 

-#: builtin/am.c:2238
+#: builtin/am.c:2193

 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 

-#: builtin/am.c:2241
+#: builtin/am.c:2196

 msgid "strip everything before a scissors line"
 msgstr ""
 
 msgid "strip everything before a scissors line"
 msgstr ""
 

-#: builtin/am.c:2243 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:2270
+#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
+#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
+#: builtin/am.c:2225

 msgid "pass it through git-apply"
 msgstr ""
 
 msgid "pass it through git-apply"
 msgstr ""
 

-#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237
-#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308
-#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650
-#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144
-#: parse-options.h:146 parse-options.h:258
+#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
+#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:836
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
+#: parse-options.h:144 parse-options.h:146 parse-options.h:268

 msgid "n"
 msgstr ""
 
 msgid "n"
 msgstr ""
 

-#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
+#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/replace.c:543 builtin/tag.c:422 builtin/verify-tag.c:39

 msgid "format"
 msgstr ""
 
 msgid "format"
 msgstr ""
 

-#: builtin/am.c:2267
+#: builtin/am.c:2222

 msgid "format the patch(es) are in"
 msgstr ""
 
 msgid "format the patch(es) are in"
 msgstr ""
 

-#: builtin/am.c:2273
+#: builtin/am.c:2228

 msgid "override error message when patch failure occurs"
 msgstr ""
 
 msgid "override error message when patch failure occurs"
 msgstr ""
 

-#: builtin/am.c:2275
+#: builtin/am.c:2230

 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 

-#: builtin/am.c:2278
+#: builtin/am.c:2233

 msgid "synonyms for --continue"
 msgstr ""
 
 msgid "synonyms for --continue"
 msgstr ""
 

-#: builtin/am.c:2281
+#: builtin/am.c:2236

 msgid "skip the current patch"
 msgstr ""
 
 msgid "skip the current patch"
 msgstr ""
 

-#: builtin/am.c:2284
+#: builtin/am.c:2239

 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 

-#: builtin/am.c:2287
+#: builtin/am.c:2242

 msgid "abort the patching operation but keep HEAD where it is."
 msgstr ""
 
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr ""
 

-#: builtin/am.c:2290
+#: builtin/am.c:2245

 msgid "show the patch being applied."
 msgstr ""
 
 msgid "show the patch being applied."
 msgstr ""
 

-#: builtin/am.c:2294
+#: builtin/am.c:2249

 msgid "lie about committer date"
 msgstr ""
 
 msgid "lie about committer date"
 msgstr ""
 

-#: builtin/am.c:2296
+#: builtin/am.c:2251

 msgid "use current timestamp for author date"
 msgstr ""
 
 msgid "use current timestamp for author date"
 msgstr ""
 

-#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271
-#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400
+#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
+#: builtin/pull.c:184 builtin/rebase.c:880 builtin/rebase--interactive.c:183
+#: builtin/revert.c:113 builtin/tag.c:402

 msgid "key-id"
 msgstr ""
 
 msgid "key-id"
 msgstr ""
 

-#: builtin/am.c:2299
+#: builtin/am.c:2254 builtin/rebase.c:881 builtin/rebase--interactive.c:184

 msgid "GPG-sign commits"
 msgstr ""
 
 msgid "GPG-sign commits"
 msgstr ""
 

-#: builtin/am.c:2302
+#: builtin/am.c:2257

 msgid "(internal use for git-rebase)"
 msgstr ""
 
 msgid "(internal use for git-rebase)"
 msgstr ""
 

-#: builtin/am.c:2320
+#: builtin/am.c:2275

 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 ""
 
 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:2327
+#: builtin/am.c:2282

 msgid "failed to read the index"
 msgstr ""
 
 msgid "failed to read the index"
 msgstr ""
 

-#: builtin/am.c:2342
+#: builtin/am.c:2297

 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 

-#: builtin/am.c:2366
+#: builtin/am.c:2321

 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 

-#: builtin/am.c:2372
+#: builtin/am.c:2327

 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 


@@ -6804,115 +7298,115 @@ msgstr ""
 msgid "invalid value for blame.coloring"
 msgstr ""
 
 msgid "invalid value for blame.coloring"
 msgstr ""
 

-#: builtin/blame.c:789
+#: builtin/blame.c:793

 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 

-#: builtin/blame.c:790
+#: builtin/blame.c:794

 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:791
+#: builtin/blame.c:795

 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:792
+#: builtin/blame.c:796

 msgid "Show work cost statistics"
 msgstr ""
 
 msgid "Show work cost statistics"
 msgstr ""
 

-#: builtin/blame.c:793
+#: builtin/blame.c:797

 msgid "Force progress reporting"
 msgstr ""
 
 msgid "Force progress reporting"
 msgstr ""
 

-#: builtin/blame.c:794
+#: builtin/blame.c:798

 msgid "Show output score for blame entries"
 msgstr ""
 
 msgid "Show output score for blame entries"
 msgstr ""
 

-#: builtin/blame.c:795
+#: builtin/blame.c:799

 msgid "Show original filename (Default: auto)"
 msgstr ""
 
 msgid "Show original filename (Default: auto)"
 msgstr ""
 

-#: builtin/blame.c:796
+#: builtin/blame.c:800

 msgid "Show original linenumber (Default: off)"
 msgstr ""
 
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:797
+#: builtin/blame.c:801

 msgid "Show in a format designed for machine consumption"
 msgstr ""
 
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 

-#: builtin/blame.c:798
+#: builtin/blame.c:802

 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 

-#: builtin/blame.c:799
+#: builtin/blame.c:803

 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:800
+#: builtin/blame.c:804

 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 
 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:801
+#: builtin/blame.c:805

 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:802
+#: builtin/blame.c:806

 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:803
+#: builtin/blame.c:807

 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:804
+#: builtin/blame.c:808

 msgid "Ignore whitespace differences"
 msgstr ""
 
 msgid "Ignore whitespace differences"
 msgstr ""
 

-#: builtin/blame.c:805
+#: builtin/blame.c:809

 msgid "color redundant metadata from previous line differently"
 msgstr ""
 
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 

-#: builtin/blame.c:806
+#: builtin/blame.c:810

 msgid "color lines by age"
 msgstr ""
 
 msgid "color lines by age"
 msgstr ""
 

-#: builtin/blame.c:813
+#: builtin/blame.c:817

 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 
 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 

-#: builtin/blame.c:815
+#: builtin/blame.c:819

 msgid "Spend extra cycles to find better match"
 msgstr ""
 
 msgid "Spend extra cycles to find better match"
 msgstr ""
 

-#: builtin/blame.c:816
+#: builtin/blame.c:820

 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 

-#: builtin/blame.c:817
+#: builtin/blame.c:821

 msgid "Use <file>'s contents as the final image"
 msgstr ""
 
 msgid "Use <file>'s contents as the final image"
 msgstr ""
 

-#: builtin/blame.c:818 builtin/blame.c:819
+#: builtin/blame.c:822 builtin/blame.c:823

 msgid "score"
 msgstr ""
 
 msgid "score"
 msgstr ""
 

-#: builtin/blame.c:818
+#: builtin/blame.c:822

 msgid "Find line copies within and across files"
 msgstr ""
 
 msgid "Find line copies within and across files"
 msgstr ""
 

-#: builtin/blame.c:819
+#: builtin/blame.c:823

 msgid "Find line movements within and across files"
 msgstr ""
 
 msgid "Find line movements within and across files"
 msgstr ""
 

-#: builtin/blame.c:820
+#: builtin/blame.c:824

 msgid "n,m"
 msgstr ""
 
 msgid "n,m"
 msgstr ""
 

-#: builtin/blame.c:820
+#: builtin/blame.c:824

 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 

-#: builtin/blame.c:869
+#: builtin/blame.c:873

 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 


@@ -6924,46 +7418,46 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
 #. your language may need more or fewer display
 #. columns.
 #.

-#: builtin/blame.c:920
+#: builtin/blame.c:924

 msgid "4 years, 11 months ago"
 msgstr ""
 
 msgid "4 years, 11 months ago"
 msgstr ""
 

-#: builtin/blame.c:1007
+#: builtin/blame.c:1011

 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/blame.c:1053
+#: builtin/blame.c:1057

 msgid "Blaming lines"
 msgstr ""
 
 msgid "Blaming lines"
 msgstr ""
 

-#: builtin/branch.c:28
+#: builtin/branch.c:29

 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr ""
 
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr ""
 

-#: builtin/branch.c:29
+#: builtin/branch.c:30

 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr ""
 
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr ""
 

-#: builtin/branch.c:30
+#: builtin/branch.c:31

 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr ""
 
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr ""
 

-#: builtin/branch.c:31
+#: builtin/branch.c:32

 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr ""
 
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr ""
 

-#: builtin/branch.c:32
+#: builtin/branch.c:33

 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr ""
 
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr ""
 

-#: builtin/branch.c:33
+#: builtin/branch.c:34

 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr ""
 
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr ""
 

-#: builtin/branch.c:34
+#: builtin/branch.c:35

 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr ""
 
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr ""
 


@@ -7106,223 +7600,219 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 

-#: builtin/branch.c:602
+#: builtin/branch.c:594

 msgid "Generic options"
 msgstr ""
 
 msgid "Generic options"
 msgstr ""
 

-#: builtin/branch.c:604
+#: builtin/branch.c:596

 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 

-#: builtin/branch.c:605
+#: builtin/branch.c:597

 msgid "suppress informational messages"
 msgstr ""
 
 msgid "suppress informational messages"
 msgstr ""
 

-#: builtin/branch.c:606
+#: builtin/branch.c:598

 msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
 msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 

-#: builtin/branch.c:608
+#: builtin/branch.c:600

 msgid "do not use"
 msgstr ""
 
 msgid "do not use"
 msgstr ""
 

-#: builtin/branch.c:610
+#: builtin/branch.c:602 builtin/rebase--interactive.c:180

 msgid "upstream"
 msgstr ""
 
 msgid "upstream"
 msgstr ""
 

-#: builtin/branch.c:610
+#: builtin/branch.c:602

 msgid "change the upstream info"
 msgstr ""
 
 msgid "change the upstream info"
 msgstr ""
 

-#: builtin/branch.c:611
+#: builtin/branch.c:603

 msgid "Unset the upstream info"
 msgstr ""
 
 msgid "Unset the upstream info"
 msgstr ""
 

-#: builtin/branch.c:612
+#: builtin/branch.c:604

 msgid "use colored output"
 msgstr ""
 
 msgid "use colored output"
 msgstr ""
 

-#: builtin/branch.c:613
+#: builtin/branch.c:605

 msgid "act on remote-tracking branches"
 msgstr ""
 
 msgid "act on remote-tracking branches"
 msgstr ""
 

-#: builtin/branch.c:615 builtin/branch.c:617
+#: builtin/branch.c:607 builtin/branch.c:609

 msgid "print only branches that contain the commit"
 msgstr ""
 
 msgid "print only branches that contain the commit"
 msgstr ""
 

-#: builtin/branch.c:616 builtin/branch.c:618
+#: builtin/branch.c:608 builtin/branch.c:610

 msgid "print only branches that don't contain the commit"
 msgstr ""
 
 msgid "print only branches that don't contain the commit"
 msgstr ""
 

-#: builtin/branch.c:621
+#: builtin/branch.c:613

 msgid "Specific git-branch actions:"
 msgstr ""
 
 msgid "Specific git-branch actions:"
 msgstr ""
 

-#: builtin/branch.c:622
+#: builtin/branch.c:614

 msgid "list both remote-tracking and local branches"
 msgstr ""
 
 msgid "list both remote-tracking and local branches"
 msgstr ""
 

-#: builtin/branch.c:624
+#: builtin/branch.c:616

 msgid "delete fully merged branch"
 msgstr ""
 
 msgid "delete fully merged branch"
 msgstr ""
 

-#: builtin/branch.c:625
+#: builtin/branch.c:617

 msgid "delete branch (even if not merged)"
 msgstr ""
 
 msgid "delete branch (even if not merged)"
 msgstr ""
 

-#: builtin/branch.c:626
+#: builtin/branch.c:618

 msgid "move/rename a branch and its reflog"
 msgstr ""
 
 msgid "move/rename a branch and its reflog"
 msgstr ""
 

-#: builtin/branch.c:627
+#: builtin/branch.c:619

 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 

-#: builtin/branch.c:628
+#: builtin/branch.c:620

 msgid "copy a branch and its reflog"
 msgstr ""
 
 msgid "copy a branch and its reflog"
 msgstr ""
 

-#: builtin/branch.c:629
+#: builtin/branch.c:621

 msgid "copy a branch, even if target exists"
 msgstr ""
 
 msgid "copy a branch, even if target exists"
 msgstr ""
 

-#: builtin/branch.c:630
+#: builtin/branch.c:622

 msgid "list branch names"
 msgstr ""
 
 msgid "list branch names"
 msgstr ""
 

-#: builtin/branch.c:631
+#: builtin/branch.c:623

 msgid "create the branch's reflog"
 msgstr ""
 
 msgid "create the branch's reflog"
 msgstr ""
 

-#: builtin/branch.c:634
-msgid "deprecated synonym for --create-reflog"
-msgstr ""
-
-#: builtin/branch.c:639
+#: builtin/branch.c:625

 msgid "edit the description for the branch"
 msgstr ""
 
 msgid "edit the description for the branch"
 msgstr ""
 

-#: builtin/branch.c:640
+#: builtin/branch.c:626

 msgid "force creation, move/rename, deletion"
 msgstr ""
 
 msgid "force creation, move/rename, deletion"
 msgstr ""
 

-#: builtin/branch.c:641
+#: builtin/branch.c:627

 msgid "print only branches that are merged"
 msgstr ""
 
 msgid "print only branches that are merged"
 msgstr ""
 

-#: builtin/branch.c:642
+#: builtin/branch.c:628

 msgid "print only branches that are not merged"
 msgstr ""
 
 msgid "print only branches that are not merged"
 msgstr ""
 

-#: builtin/branch.c:643
+#: builtin/branch.c:629

 msgid "list branches in columns"
 msgstr ""
 
 msgid "list branches in columns"
 msgstr ""
 

-#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:413
+#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:415

 msgid "key"
 msgstr ""
 
 msgid "key"
 msgstr ""
 

-#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:414
+#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:416

 msgid "field name to sort on"
 msgstr ""
 
 msgid "field name to sort on"
 msgstr ""
 

-#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410
-#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576
-#: builtin/tag.c:416
+#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
+#: builtin/tag.c:418

 msgid "object"
 msgstr ""
 
 msgid "object"
 msgstr ""
 

-#: builtin/branch.c:648
+#: builtin/branch.c:634

 msgid "print only branches of the object"
 msgstr ""
 
 msgid "print only branches of the object"
 msgstr ""
 

-#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423
+#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425

 msgid "sorting and filtering are case insensitive"
 msgstr ""
 
 msgid "sorting and filtering are case insensitive"
 msgstr ""
 

-#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421
+#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423

 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr ""
 
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr ""
 

-#: builtin/branch.c:674 builtin/clone.c:739
+#: builtin/branch.c:660 builtin/clone.c:739

 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 

-#: builtin/branch.c:697
+#: builtin/branch.c:683

 msgid "--column and --verbose are incompatible"
 msgstr ""
 
 msgid "--column and --verbose are incompatible"
 msgstr ""
 

-#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758

 msgid "branch name required"
 msgstr ""
 
 msgid "branch name required"
 msgstr ""
 

-#: builtin/branch.c:745
+#: builtin/branch.c:725

 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 

-#: builtin/branch.c:750
+#: builtin/branch.c:730

 msgid "cannot edit description of more than one branch"
 msgstr ""
 
 msgid "cannot edit description of more than one branch"
 msgstr ""
 

-#: builtin/branch.c:757
+#: builtin/branch.c:737

 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 

-#: builtin/branch.c:760
+#: builtin/branch.c:740

 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 

-#: builtin/branch.c:775
+#: builtin/branch.c:755

 msgid "too many branches for a copy operation"
 msgstr ""
 
 msgid "too many branches for a copy operation"
 msgstr ""
 

-#: builtin/branch.c:784
+#: builtin/branch.c:764

 msgid "too many arguments for a rename operation"
 msgstr ""
 
 msgid "too many arguments for a rename operation"
 msgstr ""
 

-#: builtin/branch.c:789
+#: builtin/branch.c:769

 msgid "too many arguments to set new upstream"
 msgstr ""
 
 msgid "too many arguments to set new upstream"
 msgstr ""
 

-#: builtin/branch.c:793
+#: builtin/branch.c:773

 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 

-#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834
+#: builtin/branch.c:776 builtin/branch.c:798

 #, c-format
 msgid "no such branch '%s'"
 msgstr ""
 
 #, c-format
 msgid "no such branch '%s'"
 msgstr ""
 

-#: builtin/branch.c:800
+#: builtin/branch.c:780

 #, c-format
 msgid "branch '%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr ""
 

-#: builtin/branch.c:812
+#: builtin/branch.c:792

 msgid "too many arguments to unset upstream"
 msgstr ""
 
 msgid "too many arguments to unset upstream"
 msgstr ""
 

-#: builtin/branch.c:816
+#: builtin/branch.c:796

 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 

-#: builtin/branch.c:822
+#: builtin/branch.c:802

 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 

-#: builtin/branch.c:837
+#: builtin/branch.c:812

 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 

-#: builtin/branch.c:840
+#: builtin/branch.c:815

 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."


@@ -7341,79 +7831,83 @@ msgstr ""
 msgid "Need a repository to unbundle."
 msgstr ""
 
 msgid "Need a repository to unbundle."
 msgstr ""
 

-#: builtin/cat-file.c:577
+#: builtin/cat-file.c:587

 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
 
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
 

-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:588

 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgstr ""
 
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgstr ""
 

-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:609
+msgid "only one batch option may be specified"
+msgstr ""
+
+#: builtin/cat-file.c:627

 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 

-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:628

 msgid "show object type"
 msgstr ""
 
 msgid "show object type"
 msgstr ""
 

-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:629

 msgid "show object size"
 msgstr ""
 
 msgid "show object size"
 msgstr ""
 

-#: builtin/cat-file.c:619
+#: builtin/cat-file.c:631

 msgid "exit with zero when there's no error"
 msgstr ""
 
 msgid "exit with zero when there's no error"
 msgstr ""
 

-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:632

 msgid "pretty-print object's content"
 msgstr ""
 
 msgid "pretty-print object's content"
 msgstr ""
 

-#: builtin/cat-file.c:622
+#: builtin/cat-file.c:634

 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 

-#: builtin/cat-file.c:624
+#: builtin/cat-file.c:636

 msgid "for blob objects, run filters on object's content"
 msgstr ""
 
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 

-#: builtin/cat-file.c:625 git-submodule.sh:864
+#: builtin/cat-file.c:637 git-submodule.sh:857

 msgid "blob"
 msgstr ""
 
 msgid "blob"
 msgstr ""
 

-#: builtin/cat-file.c:626
+#: builtin/cat-file.c:638

 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 

-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:640

 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 

-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:641

 msgid "buffer --batch output"
 msgstr ""
 
 msgid "buffer --batch output"
 msgstr ""
 

-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:643

 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 

-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:647

 msgid "show info about objects fed from the standard input"
 msgstr ""
 
 msgid "show info about objects fed from the standard input"
 msgstr ""
 

-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:651

 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 

-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:653

 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 

-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:655

 msgid "do not order --batch-all-objects output"
 msgstr ""
 
 msgid "do not order --batch-all-objects output"
 msgstr ""
 


@@ -7441,8 +7935,8 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 

-#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
-#: builtin/worktree.c:447
+#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
+#: builtin/worktree.c:495

 msgid "suppress progress reporting"
 msgstr ""
 
 msgid "suppress progress reporting"
 msgstr ""
 


@@ -7499,160 +7993,160 @@ msgstr ""
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr ""
 
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr ""
 

-#: builtin/checkout-index.c:143
+#: builtin/checkout-index.c:145

 msgid "stage should be between 1 and 3 or all"
 msgstr ""
 
 msgid "stage should be between 1 and 3 or all"
 msgstr ""
 

-#: builtin/checkout-index.c:159
+#: builtin/checkout-index.c:161

 msgid "check out all files in the index"
 msgstr ""
 
 msgid "check out all files in the index"
 msgstr ""
 

-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:162

 msgid "force overwrite of existing files"
 msgstr ""
 
 msgid "force overwrite of existing files"
 msgstr ""
 

-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:164

 msgid "no warning for existing files and files not in index"
 msgstr ""
 
 msgid "no warning for existing files and files not in index"
 msgstr ""
 

-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:166

 msgid "don't checkout new files"
 msgstr ""
 
 msgid "don't checkout new files"
 msgstr ""
 

-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:168

 msgid "update stat information in the index file"
 msgstr ""
 
 msgid "update stat information in the index file"
 msgstr ""
 

-#: builtin/checkout-index.c:170
+#: builtin/checkout-index.c:172

 msgid "read list of paths from the standard input"
 msgstr ""
 
 msgid "read list of paths from the standard input"
 msgstr ""
 

-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:174

 msgid "write the content to temporary files"
 msgstr ""
 
 msgid "write the content to temporary files"
 msgstr ""
 

-#: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
-#: builtin/worktree.c:620
+#: builtin/checkout-index.c:175 builtin/column.c:31
+#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
+#: builtin/worktree.c:668

 msgid "string"
 msgstr ""
 
 msgid "string"
 msgstr ""
 

-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:176

 msgid "when creating files, prepend <string>"
 msgstr ""
 
 msgid "when creating files, prepend <string>"
 msgstr ""
 

-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:178

 msgid "copy out the files from named stage"
 msgstr ""
 
 msgid "copy out the files from named stage"
 msgstr ""
 

-#: builtin/checkout.c:29
+#: builtin/checkout.c:31

 msgid "git checkout [<options>] <branch>"
 msgstr ""
 
 msgid "git checkout [<options>] <branch>"
 msgstr ""
 

-#: builtin/checkout.c:30
+#: builtin/checkout.c:32

 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr ""
 
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr ""
 

-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: builtin/checkout.c:144 builtin/checkout.c:177

 #, c-format
 msgid "path '%s' does not have our version"
 msgstr ""
 
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr ""
 

-#: builtin/checkout.c:140 builtin/checkout.c:173
+#: builtin/checkout.c:146 builtin/checkout.c:179

 #, c-format
 msgid "path '%s' does not have their version"
 msgstr ""
 
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr ""
 

-#: builtin/checkout.c:156
+#: builtin/checkout.c:162

 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr ""
 
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr ""
 

-#: builtin/checkout.c:200
+#: builtin/checkout.c:206

 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr ""
 
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr ""
 

-#: builtin/checkout.c:217
+#: builtin/checkout.c:224

 #, c-format
 msgid "path '%s': cannot merge"
 msgstr ""
 
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr ""
 

-#: builtin/checkout.c:233
+#: builtin/checkout.c:240

 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 

-#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
-#: builtin/checkout.c:264
+#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:271

 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr ""
 

-#: builtin/checkout.c:267 builtin/checkout.c:270
+#: builtin/checkout.c:274 builtin/checkout.c:277

 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 

-#: builtin/checkout.c:273
+#: builtin/checkout.c:280

 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 

-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/checkout.c:349 builtin/checkout.c:356

 #, c-format
 msgid "path '%s' is unmerged"
 msgstr ""
 
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr ""
 

-#: builtin/checkout.c:508
+#: builtin/checkout.c:608

 msgid "you need to resolve your current index first"
 msgstr ""
 
 msgid "you need to resolve your current index first"
 msgstr ""
 

-#: builtin/checkout.c:645
+#: builtin/checkout.c:745

 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 

-#: builtin/checkout.c:686
+#: builtin/checkout.c:786

 msgid "HEAD is now at"
 msgstr ""
 
 msgid "HEAD is now at"
 msgstr ""
 

-#: builtin/checkout.c:690 builtin/clone.c:692
+#: builtin/checkout.c:790 builtin/clone.c:692

 msgid "unable to update HEAD"
 msgstr ""
 
 msgid "unable to update HEAD"
 msgstr ""
 

-#: builtin/checkout.c:694
+#: builtin/checkout.c:794

 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:697
+#: builtin/checkout.c:797

 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:701
+#: builtin/checkout.c:801

 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:703 builtin/checkout.c:1052
+#: builtin/checkout.c:803 builtin/checkout.c:1166

 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:705
+#: builtin/checkout.c:805

 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:756
+#: builtin/checkout.c:856

 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 

-#: builtin/checkout.c:762
+#: builtin/checkout.c:862

 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"


@@ -7667,7 +8161,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:781
+#: builtin/checkout.c:881

 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"


@@ -7684,166 +8178,166 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:813
+#: builtin/checkout.c:913

 msgid "internal error in revision walk"
 msgstr ""
 
 msgid "internal error in revision walk"
 msgstr ""
 

-#: builtin/checkout.c:817
+#: builtin/checkout.c:917

 msgid "Previous HEAD position was"
 msgstr ""
 
 msgid "Previous HEAD position was"
 msgstr ""
 

-#: builtin/checkout.c:845 builtin/checkout.c:1047
+#: builtin/checkout.c:945 builtin/checkout.c:1161

 msgid "You are on a branch yet to be born"
 msgstr ""
 
 msgid "You are on a branch yet to be born"
 msgstr ""
 

-#: builtin/checkout.c:952
+#: builtin/checkout.c:1066

 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 

-#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396
+#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444

 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 

-#: builtin/checkout.c:1022
+#: builtin/checkout.c:1136

 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 

-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1175

 msgid "paths cannot be used with switching branches"
 msgstr ""
 
 msgid "paths cannot be used with switching branches"
 msgstr ""
 

-#: builtin/checkout.c:1064 builtin/checkout.c:1068
+#: builtin/checkout.c:1178 builtin/checkout.c:1182

 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr ""
 

-#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080
-#: builtin/checkout.c:1083
+#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
+#: builtin/checkout.c:1197

 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 

-#: builtin/checkout.c:1088
+#: builtin/checkout.c:1202

 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 

-#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
-#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440
-#: builtin/worktree.c:442
+#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
+#: builtin/worktree.c:490

 msgid "branch"
 msgstr ""
 
 msgid "branch"
 msgstr ""
 

-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1236

 msgid "create and checkout a new branch"
 msgstr ""
 
 msgid "create and checkout a new branch"
 msgstr ""
 

-#: builtin/checkout.c:1124
+#: builtin/checkout.c:1238

 msgid "create/reset and checkout a branch"
 msgstr ""
 
 msgid "create/reset and checkout a branch"
 msgstr ""
 

-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1239

 msgid "create reflog for new branch"
 msgstr ""
 
 msgid "create reflog for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1126 builtin/worktree.c:444
+#: builtin/checkout.c:1240 builtin/worktree.c:492

 msgid "detach HEAD at named commit"
 msgstr ""
 
 msgid "detach HEAD at named commit"
 msgstr ""
 

-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1241

 msgid "set upstream info for new branch"
 msgstr ""
 
 msgid "set upstream info for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1129
+#: builtin/checkout.c:1243

 msgid "new-branch"
 msgstr ""
 
 msgid "new-branch"
 msgstr ""
 

-#: builtin/checkout.c:1129
+#: builtin/checkout.c:1243

 msgid "new unparented branch"
 msgstr ""
 
 msgid "new unparented branch"
 msgstr ""
 

-#: builtin/checkout.c:1131
+#: builtin/checkout.c:1245

 msgid "checkout our version for unmerged files"
 msgstr ""
 
 msgid "checkout our version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1134
+#: builtin/checkout.c:1248

 msgid "checkout their version for unmerged files"
 msgstr ""
 
 msgid "checkout their version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1250

 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 

-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1252

 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 
 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 

-#: builtin/checkout.c:1140 builtin/merge.c:273
+#: builtin/checkout.c:1254 builtin/merge.c:275

 msgid "update ignored files (default)"
 msgstr ""
 
 msgid "update ignored files (default)"
 msgstr ""
 

-#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264
+#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274

 msgid "style"
 msgstr ""
 
 msgid "style"
 msgstr ""
 

-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1257

 msgid "conflict style (merge or diff3)"
 msgstr ""
 
 msgid "conflict style (merge or diff3)"
 msgstr ""
 

-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1260

 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 

-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1262

 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 

-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1264

 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 

-#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138
-#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572
+#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
+#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572

 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr ""
 
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr ""
 

-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1298

 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 

-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1315

 msgid "--track needs a branch name"
 msgstr ""
 
 msgid "--track needs a branch name"
 msgstr ""
 

-#: builtin/checkout.c:1206
+#: builtin/checkout.c:1320

 msgid "missing branch name; try -b"
 msgstr ""
 
 msgid "missing branch name; try -b"
 msgstr ""
 

-#: builtin/checkout.c:1243
+#: builtin/checkout.c:1357

 msgid "invalid path specification"
 msgstr ""
 
 msgid "invalid path specification"
 msgstr ""
 

-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1364

 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 

-#: builtin/checkout.c:1254
+#: builtin/checkout.c:1368

 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 

-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1372

 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 

-#: builtin/checkout.c:1278
+#: builtin/checkout.c:1392

 #, c-format
 msgid ""
 "'%s' matched more than one remote tracking branch.\n"
 #, c-format
 msgid ""
 "'%s' matched more than one remote tracking branch.\n"


@@ -7890,7 +8384,7 @@ msgstr ""
 msgid "failed to remove %s"
 msgstr ""
 
 msgid "failed to remove %s"
 msgstr ""
 

-#: builtin/clean.c:297 git-add--interactive.perl:579
+#: builtin/clean.c:298 git-add--interactive.perl:579

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -7899,7 +8393,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr ""
 
 "           - (empty) select nothing\n"
 msgstr ""
 

-#: builtin/clean.c:301 git-add--interactive.perl:588
+#: builtin/clean.c:302 git-add--interactive.perl:588

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -7912,38 +8406,38 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr ""
 
 "           - (empty) finish selecting\n"
 msgstr ""
 

-#: builtin/clean.c:517 git-add--interactive.perl:554
+#: builtin/clean.c:518 git-add--interactive.perl:554

 #: git-add--interactive.perl:559
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr ""
 
 #: git-add--interactive.perl:559
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr ""
 

-#: builtin/clean.c:659
+#: builtin/clean.c:660

 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 

-#: builtin/clean.c:696
+#: builtin/clean.c:697

 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 

-#: builtin/clean.c:717
+#: builtin/clean.c:718

 msgid "Select items to delete"
 msgstr ""
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
 msgid "Select items to delete"
 msgstr ""
 
 #. TRANSLATORS: Make sure to keep [y/N] as is

-#: builtin/clean.c:758
+#: builtin/clean.c:759

 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 

-#: builtin/clean.c:783 git-add--interactive.perl:1717
+#: builtin/clean.c:784 git-add--interactive.perl:1717

 #, c-format
 msgid "Bye.\n"
 msgstr ""
 
 #, c-format
 msgid "Bye.\n"
 msgstr ""
 

-#: builtin/clean.c:791
+#: builtin/clean.c:792

 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"


@@ -7954,70 +8448,70 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
 "?                   - help for prompt selection"
 msgstr ""
 

-#: builtin/clean.c:818 git-add--interactive.perl:1793
+#: builtin/clean.c:819 git-add--interactive.perl:1793

 msgid "*** Commands ***"
 msgstr ""
 
 msgid "*** Commands ***"
 msgstr ""
 

-#: builtin/clean.c:819 git-add--interactive.perl:1790
+#: builtin/clean.c:820 git-add--interactive.perl:1790

 msgid "What now"
 msgstr ""
 
 msgid "What now"
 msgstr ""
 

-#: builtin/clean.c:827
+#: builtin/clean.c:828

 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/clean.c:843
+#: builtin/clean.c:844

 msgid "No more files to clean, exiting."
 msgstr ""
 
 msgid "No more files to clean, exiting."
 msgstr ""
 

-#: builtin/clean.c:905
+#: builtin/clean.c:906

 msgid "do not print names of files removed"
 msgstr ""
 
 msgid "do not print names of files removed"
 msgstr ""
 

-#: builtin/clean.c:907
+#: builtin/clean.c:908

 msgid "force"
 msgstr ""
 
 msgid "force"
 msgstr ""
 

-#: builtin/clean.c:908
+#: builtin/clean.c:909

 msgid "interactive cleaning"
 msgstr ""
 
 msgid "interactive cleaning"
 msgstr ""
 

-#: builtin/clean.c:910
+#: builtin/clean.c:911

 msgid "remove whole directories"
 msgstr ""
 
 msgid "remove whole directories"
 msgstr ""
 

-#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163
-#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:177
+#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
+#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
+#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:178

 msgid "pattern"
 msgstr ""
 
 msgid "pattern"
 msgstr ""
 

-#: builtin/clean.c:912
+#: builtin/clean.c:913

 msgid "add <pattern> to ignore rules"
 msgstr ""
 
 msgid "add <pattern> to ignore rules"
 msgstr ""
 

-#: builtin/clean.c:913
+#: builtin/clean.c:914

 msgid "remove ignored files, too"
 msgstr ""
 
 msgid "remove ignored files, too"
 msgstr ""
 

-#: builtin/clean.c:915
+#: builtin/clean.c:916

 msgid "remove only ignored files"
 msgstr ""
 
 msgid "remove only ignored files"
 msgstr ""
 

-#: builtin/clean.c:933
+#: builtin/clean.c:934

 msgid "-x and -X cannot be used together"
 msgstr ""
 
 msgid "-x and -X cannot be used together"
 msgstr ""
 

-#: builtin/clean.c:937
+#: builtin/clean.c:938

 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 

-#: builtin/clean.c:940
+#: builtin/clean.c:941

 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"


@@ -8031,7 +8525,7 @@ msgstr ""
 msgid "don't create a checkout"
 msgstr ""
 
 msgid "don't create a checkout"
 msgstr ""
 

-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480
+#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481

 msgid "create a bare repository"
 msgstr ""
 
 msgid "create a bare repository"
 msgstr ""
 


@@ -8063,26 +8557,26 @@ msgstr ""
 msgid "number of submodules cloned in parallel"
 msgstr ""
 
 msgid "number of submodules cloned in parallel"
 msgstr ""
 

-#: builtin/clone.c:109 builtin/init-db.c:477
+#: builtin/clone.c:109 builtin/init-db.c:478

 msgid "template-directory"
 msgstr ""
 
 msgid "template-directory"
 msgstr ""
 

-#: builtin/clone.c:110 builtin/init-db.c:478
+#: builtin/clone.c:110 builtin/init-db.c:479

 msgid "directory from which templates will be used"
 msgstr ""
 
 msgid "directory from which templates will be used"
 msgstr ""
 

-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368
-#: builtin/submodule--helper.c:1739
+#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1856

 msgid "reference repository"
 msgstr ""
 
 msgid "reference repository"
 msgstr ""
 

-#: builtin/clone.c:116 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1741
+#: builtin/clone.c:116 builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1858

 msgid "use --reference only while cloning"
 msgstr ""
 
 msgid "use --reference only while cloning"
 msgstr ""
 

-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
-#: builtin/pack-objects.c:3191 builtin/repack.c:320
+#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3299 builtin/repack.c:329

 msgid "name"
 msgstr ""
 
 msgid "name"
 msgstr ""
 


@@ -8098,8 +8592,8 @@ msgstr ""
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 

-#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814
-#: builtin/pull.c:216
+#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
+#: builtin/pull.c:217

 msgid "depth"
 msgstr ""
 
 msgid "depth"
 msgstr ""
 


@@ -8107,8 +8601,7 @@ msgstr ""
 msgid "create a shallow clone of that depth"
 msgstr ""
 
 msgid "create a shallow clone of that depth"
 msgstr ""
 

-#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182
-#: parse-options.h:154
+#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3290

 msgid "time"
 msgstr ""
 
 msgid "time"
 msgstr ""
 


@@ -8116,11 +8609,12 @@ msgstr ""
 msgid "create a shallow clone since a specific time"
 msgstr ""
 
 msgid "create a shallow clone since a specific time"
 msgstr ""
 

-#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166
+#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:813

 msgid "revision"
 msgstr ""
 
 msgid "revision"
 msgstr ""
 

-#: builtin/clone.c:128 builtin/fetch.c:144
+#: builtin/clone.c:128 builtin/fetch.c:147

 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 


@@ -8136,11 +8630,11 @@ msgstr ""
 msgid "any cloned submodules will be shallow"
 msgstr ""
 
 msgid "any cloned submodules will be shallow"
 msgstr ""
 

-#: builtin/clone.c:135 builtin/init-db.c:486
+#: builtin/clone.c:135 builtin/init-db.c:487

 msgid "gitdir"
 msgstr ""
 
 msgid "gitdir"
 msgstr ""
 

-#: builtin/clone.c:136 builtin/init-db.c:487
+#: builtin/clone.c:136 builtin/init-db.c:488

 msgid "separate git dir from working tree"
 msgstr ""
 
 msgid "separate git dir from working tree"
 msgstr ""
 


@@ -8152,12 +8646,12 @@ msgstr ""
 msgid "set config inside the new repository"
 msgstr ""
 
 msgid "set config inside the new repository"
 msgstr ""
 

-#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229
+#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230

 #: builtin/push.c:583
 msgid "use IPv4 addresses only"
 msgstr ""
 
 #: builtin/push.c:583
 msgid "use IPv4 addresses only"
 msgstr ""
 

-#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232
+#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233

 #: builtin/push.c:585
 msgid "use IPv6 addresses only"
 msgstr ""
 #: builtin/push.c:585
 msgid "use IPv6 addresses only"
 msgstr ""


@@ -8188,6 +8682,11 @@ msgstr ""
 msgid "failed to stat %s\n"
 msgstr ""
 
 msgid "failed to stat %s\n"
 msgstr ""
 

+#: builtin/clone.c:443
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+

 #: builtin/clone.c:448
 #, c-format
 msgid "failed to create link '%s'"
 #: builtin/clone.c:448
 #, c-format
 msgid "failed to create link '%s'"


@@ -8224,116 +8723,116 @@ msgstr ""
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 

-#: builtin/clone.c:760
+#: builtin/clone.c:761

 msgid "unable to checkout working tree"
 msgstr ""
 
 msgid "unable to checkout working tree"
 msgstr ""
 

-#: builtin/clone.c:805
+#: builtin/clone.c:806

 msgid "unable to write parameters to config file"
 msgstr ""
 
 msgid "unable to write parameters to config file"
 msgstr ""
 

-#: builtin/clone.c:868
+#: builtin/clone.c:869

 msgid "cannot repack to clean up"
 msgstr ""
 
 msgid "cannot repack to clean up"
 msgstr ""
 

-#: builtin/clone.c:870
+#: builtin/clone.c:871

 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 

-#: builtin/clone.c:910 builtin/receive-pack.c:1935
+#: builtin/clone.c:911 builtin/receive-pack.c:1941

 msgid "Too many arguments."
 msgstr ""
 
 msgid "Too many arguments."
 msgstr ""
 

-#: builtin/clone.c:914
+#: builtin/clone.c:915

 msgid "You must specify a repository to clone."
 msgstr ""
 
 msgid "You must specify a repository to clone."
 msgstr ""
 

-#: builtin/clone.c:927
+#: builtin/clone.c:928

 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 

-#: builtin/clone.c:930
+#: builtin/clone.c:931

 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 

-#: builtin/clone.c:943
+#: builtin/clone.c:944

 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 

-#: builtin/clone.c:949 builtin/fetch.c:1512
+#: builtin/clone.c:950 builtin/fetch.c:1606

 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 

-#: builtin/clone.c:959
+#: builtin/clone.c:960

 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 

-#: builtin/clone.c:969
+#: builtin/clone.c:970

 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 

-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
-#: builtin/worktree.c:247 builtin/worktree.c:277
+#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
+#: builtin/worktree.c:295 builtin/worktree.c:325

 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 

-#: builtin/clone.c:989
+#: builtin/clone.c:990

 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 

-#: builtin/clone.c:1009
+#: builtin/clone.c:1010

 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:1011
+#: builtin/clone.c:1012

 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:1035
+#: builtin/clone.c:1036

 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 

-#: builtin/clone.c:1096
+#: builtin/clone.c:1097

 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 

-#: builtin/clone.c:1098
+#: builtin/clone.c:1099

 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 

-#: builtin/clone.c:1100
+#: builtin/clone.c:1101

 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 

-#: builtin/clone.c:1102
+#: builtin/clone.c:1103

 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 

-#: builtin/clone.c:1105
+#: builtin/clone.c:1106

 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 

-#: builtin/clone.c:1110
+#: builtin/clone.c:1111

 msgid "--local is ignored"
 msgstr ""
 
 msgid "--local is ignored"
 msgstr ""
 

-#: builtin/clone.c:1180 builtin/clone.c:1188
+#: builtin/clone.c:1181 builtin/clone.c:1189

 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 

-#: builtin/clone.c:1191
+#: builtin/clone.c:1192

 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 


@@ -8369,22 +8868,22 @@ msgstr ""
 msgid "--command must be the first argument"
 msgstr ""
 
 msgid "--command must be the first argument"
 msgstr ""
 

-#: builtin/commit.c:38
+#: builtin/commit.c:40

 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr ""
 
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/commit.c:43
+#: builtin/commit.c:45

 msgid "git status [<options>] [--] <pathspec>..."
 msgstr ""
 
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/commit.c:48
+#: builtin/commit.c:50

 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 

-#: builtin/commit.c:53
+#: builtin/commit.c:55

 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"


@@ -8393,11 +8892,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: builtin/commit.c:60
+#: builtin/commit.c:62

 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 
 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 

-#: builtin/commit.c:63
+#: builtin/commit.c:65

 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"


@@ -8407,98 +8906,98 @@ msgid ""
 "the remaining commits.\n"
 msgstr ""
 
 "the remaining commits.\n"
 msgstr ""
 

-#: builtin/commit.c:306
+#: builtin/commit.c:311

 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 

-#: builtin/commit.c:347
+#: builtin/commit.c:352

 msgid "unable to create temporary index"
 msgstr ""
 
 msgid "unable to create temporary index"
 msgstr ""
 

-#: builtin/commit.c:353
+#: builtin/commit.c:358

 msgid "interactive add failed"
 msgstr ""
 
 msgid "interactive add failed"
 msgstr ""
 

-#: builtin/commit.c:366
+#: builtin/commit.c:371

 msgid "unable to update temporary index"
 msgstr ""
 
 msgid "unable to update temporary index"
 msgstr ""
 

-#: builtin/commit.c:368
+#: builtin/commit.c:373

 msgid "Failed to update main cache tree"
 msgstr ""
 
 msgid "Failed to update main cache tree"
 msgstr ""
 

-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462
+#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467

 msgid "unable to write new_index file"
 msgstr ""
 
 msgid "unable to write new_index file"
 msgstr ""
 

-#: builtin/commit.c:445
+#: builtin/commit.c:450

 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 

-#: builtin/commit.c:447
+#: builtin/commit.c:452

 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 

-#: builtin/commit.c:455
+#: builtin/commit.c:460

 msgid "cannot read the index"
 msgstr ""
 
 msgid "cannot read the index"
 msgstr ""
 

-#: builtin/commit.c:474
+#: builtin/commit.c:479

 msgid "unable to write temporary index file"
 msgstr ""
 
 msgid "unable to write temporary index file"
 msgstr ""
 

-#: builtin/commit.c:571
+#: builtin/commit.c:577

 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 

-#: builtin/commit.c:573
+#: builtin/commit.c:579

 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 

-#: builtin/commit.c:592
+#: builtin/commit.c:598

 msgid "malformed --author parameter"
 msgstr ""
 
 msgid "malformed --author parameter"
 msgstr ""
 

-#: builtin/commit.c:644
+#: builtin/commit.c:650

 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 

-#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042
+#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049

 #, c-format
 msgid "could not lookup commit %s"
 msgstr ""
 
 #, c-format
 msgid "could not lookup commit %s"
 msgstr ""
 

-#: builtin/commit.c:693 builtin/shortlog.c:317
+#: builtin/commit.c:699 builtin/shortlog.c:317

 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 

-#: builtin/commit.c:695
+#: builtin/commit.c:701

 msgid "could not read log from standard input"
 msgstr ""
 
 msgid "could not read log from standard input"
 msgstr ""
 

-#: builtin/commit.c:699
+#: builtin/commit.c:705

 #, c-format
 msgid "could not read log file '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not read log file '%s'"
 msgstr ""
 

-#: builtin/commit.c:728 builtin/commit.c:736
+#: builtin/commit.c:734 builtin/commit.c:742

 msgid "could not read SQUASH_MSG"
 msgstr ""
 
 msgid "could not read SQUASH_MSG"
 msgstr ""
 

-#: builtin/commit.c:733
+#: builtin/commit.c:739

 msgid "could not read MERGE_MSG"
 msgstr ""
 
 msgid "could not read MERGE_MSG"
 msgstr ""
 

-#: builtin/commit.c:787
+#: builtin/commit.c:793

 msgid "could not write commit template"
 msgstr ""
 
 msgid "could not write commit template"
 msgstr ""
 

-#: builtin/commit.c:805
+#: builtin/commit.c:811

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -8508,7 +9007,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:810
+#: builtin/commit.c:816

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -8518,14 +9017,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:823
+#: builtin/commit.c:829

 #, 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 ""
 
 #, 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:831
+#: builtin/commit.c:837

 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"


@@ -8533,345 +9032,346 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
 "An empty message aborts the commit.\n"
 msgstr ""
 

-#: builtin/commit.c:848
+#: builtin/commit.c:854

 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:856
+#: builtin/commit.c:862

 #, c-format
 msgid "%sDate:      %s"
 msgstr ""
 
 #, c-format
 msgid "%sDate:      %s"
 msgstr ""
 

-#: builtin/commit.c:863
+#: builtin/commit.c:869

 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:880
+#: builtin/commit.c:887

 msgid "Cannot read index"
 msgstr ""
 
 msgid "Cannot read index"
 msgstr ""
 

-#: builtin/commit.c:946
+#: builtin/commit.c:953

 msgid "Error building trees"
 msgstr ""
 
 msgid "Error building trees"
 msgstr ""
 

-#: builtin/commit.c:960 builtin/tag.c:258
+#: builtin/commit.c:967 builtin/tag.c:258

 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 

-#: builtin/commit.c:1004
+#: builtin/commit.c:1011

 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 

-#: builtin/commit.c:1018
+#: builtin/commit.c:1025

 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr ""
 

-#: builtin/commit.c:1032 builtin/commit.c:1269
+#: builtin/commit.c:1039 builtin/commit.c:1276

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 

-#: builtin/commit.c:1070
+#: builtin/commit.c:1077

 msgid "--long and -z are incompatible"
 msgstr ""
 
 msgid "--long and -z are incompatible"
 msgstr ""
 

-#: builtin/commit.c:1103
+#: builtin/commit.c:1110

 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 

-#: builtin/commit.c:1112
+#: builtin/commit.c:1119

 msgid "You have nothing to amend."
 msgstr ""
 
 msgid "You have nothing to amend."
 msgstr ""
 

-#: builtin/commit.c:1115
+#: builtin/commit.c:1122

 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 

-#: builtin/commit.c:1117
+#: builtin/commit.c:1124

 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 

-#: builtin/commit.c:1120
+#: builtin/commit.c:1127

 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 

-#: builtin/commit.c:1130
+#: builtin/commit.c:1137

 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 

-#: builtin/commit.c:1132
+#: builtin/commit.c:1139

 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 

-#: builtin/commit.c:1140
+#: builtin/commit.c:1147

 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 

-#: builtin/commit.c:1157
+#: builtin/commit.c:1164

 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 

-#: builtin/commit.c:1159
+#: builtin/commit.c:1166

 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1173 builtin/tag.c:544
+#: builtin/commit.c:1180 builtin/tag.c:546

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 

-#: builtin/commit.c:1178
+#: builtin/commit.c:1185

 msgid "Paths with -a does not make sense."
 msgstr ""
 
 msgid "Paths with -a does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1303 builtin/commit.c:1480
+#: builtin/commit.c:1311 builtin/commit.c:1495

 msgid "show status concisely"
 msgstr ""
 
 msgid "show status concisely"
 msgstr ""
 

-#: builtin/commit.c:1305 builtin/commit.c:1482
+#: builtin/commit.c:1313 builtin/commit.c:1497

 msgid "show branch information"
 msgstr ""
 
 msgid "show branch information"
 msgstr ""
 

-#: builtin/commit.c:1307
+#: builtin/commit.c:1315

 msgid "show stash information"
 msgstr ""
 
 msgid "show stash information"
 msgstr ""
 

-#: builtin/commit.c:1309 builtin/commit.c:1484
+#: builtin/commit.c:1317 builtin/commit.c:1499

 msgid "compute full ahead/behind values"
 msgstr ""
 
 msgid "compute full ahead/behind values"
 msgstr ""
 

-#: builtin/commit.c:1311
+#: builtin/commit.c:1319

 msgid "version"
 msgstr ""
 
 msgid "version"
 msgstr ""
 

-#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
-#: builtin/worktree.c:591
+#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
+#: builtin/worktree.c:639

 msgid "machine-readable output"
 msgstr ""
 
 msgid "machine-readable output"
 msgstr ""
 

-#: builtin/commit.c:1314 builtin/commit.c:1488
+#: builtin/commit.c:1322 builtin/commit.c:1503

 msgid "show status in long format (default)"
 msgstr ""
 
 msgid "show status in long format (default)"
 msgstr ""
 

-#: builtin/commit.c:1317 builtin/commit.c:1491
+#: builtin/commit.c:1325 builtin/commit.c:1506

 msgid "terminate entries with NUL"
 msgstr ""
 
 msgid "terminate entries with NUL"
 msgstr ""
 

-#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398
+#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:892
+#: builtin/tag.c:400

 msgid "mode"
 msgstr ""
 
 msgid "mode"
 msgstr ""
 

-#: builtin/commit.c:1320 builtin/commit.c:1494
+#: builtin/commit.c:1328 builtin/commit.c:1509

 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 

-#: builtin/commit.c:1324
+#: builtin/commit.c:1332

 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 

-#: builtin/commit.c:1326 parse-options.h:167
+#: builtin/commit.c:1334 parse-options.h:164

 msgid "when"
 msgstr ""
 
 msgid "when"
 msgstr ""
 

-#: builtin/commit.c:1327
+#: builtin/commit.c:1335

 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 

-#: builtin/commit.c:1329
+#: builtin/commit.c:1337

 msgid "list untracked files in columns"
 msgstr ""
 
 msgid "list untracked files in columns"
 msgstr ""
 

-#: builtin/commit.c:1330
+#: builtin/commit.c:1338

 msgid "do not detect renames"
 msgstr ""
 
 msgid "do not detect renames"
 msgstr ""
 

-#: builtin/commit.c:1332
+#: builtin/commit.c:1340

 msgid "detect renames, optionally set similarity index"
 msgstr ""
 
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 

-#: builtin/commit.c:1352
+#: builtin/commit.c:1360

 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 

-#: builtin/commit.c:1450
+#: builtin/commit.c:1465

 msgid "suppress summary after successful commit"
 msgstr ""
 
 msgid "suppress summary after successful commit"
 msgstr ""
 

-#: builtin/commit.c:1451
+#: builtin/commit.c:1466

 msgid "show diff in commit message template"
 msgstr ""
 
 msgid "show diff in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1453
+#: builtin/commit.c:1468

 msgid "Commit message options"
 msgstr ""
 
 msgid "Commit message options"
 msgstr ""
 

-#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395
+#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397

 msgid "read message from file"
 msgstr ""
 
 msgid "read message from file"
 msgstr ""
 

-#: builtin/commit.c:1455
+#: builtin/commit.c:1470

 msgid "author"
 msgstr ""
 
 msgid "author"
 msgstr ""
 

-#: builtin/commit.c:1455
+#: builtin/commit.c:1470

 msgid "override author for commit"
 msgstr ""
 
 msgid "override author for commit"
 msgstr ""
 

-#: builtin/commit.c:1456 builtin/gc.c:504
+#: builtin/commit.c:1471 builtin/gc.c:518

 msgid "date"
 msgstr ""
 
 msgid "date"
 msgstr ""
 

-#: builtin/commit.c:1456
+#: builtin/commit.c:1471

 msgid "override date for commit"
 msgstr ""
 
 msgid "override date for commit"
 msgstr ""
 

-#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404
-#: builtin/notes.c:567 builtin/tag.c:393
+#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
+#: builtin/notes.c:572 builtin/tag.c:395

 msgid "message"
 msgstr ""
 
 msgid "message"
 msgstr ""
 

-#: builtin/commit.c:1457
+#: builtin/commit.c:1472

 msgid "commit message"
 msgstr ""
 
 msgid "commit message"
 msgstr ""
 

-#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
-#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
+#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
+#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280

 msgid "commit"
 msgstr ""
 
 msgid "commit"
 msgstr ""
 

-#: builtin/commit.c:1458
+#: builtin/commit.c:1473

 msgid "reuse and edit message from specified commit"
 msgstr ""
 
 msgid "reuse and edit message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1459
+#: builtin/commit.c:1474

 msgid "reuse message from specified commit"
 msgstr ""
 
 msgid "reuse message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1460
+#: builtin/commit.c:1475

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 

-#: builtin/commit.c:1461
+#: builtin/commit.c:1476

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 

-#: builtin/commit.c:1462
+#: builtin/commit.c:1477

 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 

-#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274
-#: builtin/pull.c:154 builtin/revert.c:106
+#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
+#: builtin/pull.c:155 builtin/revert.c:106

 msgid "add Signed-off-by:"
 msgstr ""
 
 msgid "add Signed-off-by:"
 msgstr ""
 

-#: builtin/commit.c:1464
+#: builtin/commit.c:1479

 msgid "use specified template file"
 msgstr ""
 
 msgid "use specified template file"
 msgstr ""
 

-#: builtin/commit.c:1465
+#: builtin/commit.c:1480

 msgid "force edit of commit"
 msgstr ""
 
 msgid "force edit of commit"
 msgstr ""
 

-#: builtin/commit.c:1466
+#: builtin/commit.c:1481

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: builtin/commit.c:1466 builtin/tag.c:399
+#: builtin/commit.c:1481 builtin/tag.c:401

 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 

-#: builtin/commit.c:1467
+#: builtin/commit.c:1482

 msgid "include status in commit message template"
 msgstr ""
 
 msgid "include status in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184
+#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185

 #: builtin/revert.c:114
 msgid "GPG sign commit"
 msgstr ""
 
 #: builtin/revert.c:114
 msgid "GPG sign commit"
 msgstr ""
 

-#: builtin/commit.c:1472
+#: builtin/commit.c:1487

 msgid "Commit contents options"
 msgstr ""
 
 msgid "Commit contents options"
 msgstr ""
 

-#: builtin/commit.c:1473
+#: builtin/commit.c:1488

 msgid "commit all changed files"
 msgstr ""
 
 msgid "commit all changed files"
 msgstr ""
 

-#: builtin/commit.c:1474
+#: builtin/commit.c:1489

 msgid "add specified files to index for commit"
 msgstr ""
 
 msgid "add specified files to index for commit"
 msgstr ""
 

-#: builtin/commit.c:1475
+#: builtin/commit.c:1490

 msgid "interactively add files"
 msgstr ""
 
 msgid "interactively add files"
 msgstr ""
 

-#: builtin/commit.c:1476
+#: builtin/commit.c:1491

 msgid "interactively add changes"
 msgstr ""
 
 msgid "interactively add changes"
 msgstr ""
 

-#: builtin/commit.c:1477
+#: builtin/commit.c:1492

 msgid "commit only specified files"
 msgstr ""
 
 msgid "commit only specified files"
 msgstr ""
 

-#: builtin/commit.c:1478
+#: builtin/commit.c:1493

 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 

-#: builtin/commit.c:1479
+#: builtin/commit.c:1494

 msgid "show what would be committed"
 msgstr ""
 
 msgid "show what would be committed"
 msgstr ""
 

-#: builtin/commit.c:1492
+#: builtin/commit.c:1507

 msgid "amend previous commit"
 msgstr ""
 
 msgid "amend previous commit"
 msgstr ""
 

-#: builtin/commit.c:1493
+#: builtin/commit.c:1508

 msgid "bypass post-rewrite hook"
 msgstr ""
 
 msgid "bypass post-rewrite hook"
 msgstr ""
 

-#: builtin/commit.c:1498
+#: builtin/commit.c:1513

 msgid "ok to record an empty change"
 msgstr ""
 
 msgid "ok to record an empty change"
 msgstr ""
 

-#: builtin/commit.c:1500
+#: builtin/commit.c:1515

 msgid "ok to record a change with an empty message"
 msgstr ""
 
 msgid "ok to record a change with an empty message"
 msgstr ""
 

-#: builtin/commit.c:1573
+#: builtin/commit.c:1588

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 

-#: builtin/commit.c:1580
+#: builtin/commit.c:1595

 msgid "could not read MERGE_MODE"
 msgstr ""
 
 msgid "could not read MERGE_MODE"
 msgstr ""
 

-#: builtin/commit.c:1599
+#: builtin/commit.c:1614

 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 

-#: builtin/commit.c:1610
+#: builtin/commit.c:1625

 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 

-#: builtin/commit.c:1615
+#: builtin/commit.c:1630

 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 

-#: builtin/commit.c:1650
+#: builtin/commit.c:1665

 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"


@@ -8896,236 +9396,240 @@ msgid ""
 "stdin-packs|--stdin-commits]"
 msgstr ""
 
 "stdin-packs|--stdin-commits]"
 msgstr ""
 

-#: builtin/commit-graph.c:48 builtin/commit-graph.c:77
-#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150
-#: builtin/log.c:1477
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
+#: builtin/log.c:1540

 msgid "dir"
 msgstr ""
 
 msgid "dir"
 msgstr ""
 

-#: builtin/commit-graph.c:49 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:185
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
+#: builtin/commit-graph.c:133 builtin/commit-graph.c:191

 msgid "The object directory to store the graph"
 msgstr ""
 
 msgid "The object directory to store the graph"
 msgstr ""
 

-#: builtin/commit-graph.c:134
+#: builtin/commit-graph.c:135

 msgid "start walk at all refs"
 msgstr ""
 
 msgid "start walk at all refs"
 msgstr ""
 

-#: builtin/commit-graph.c:136
+#: builtin/commit-graph.c:137

 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 

-#: builtin/commit-graph.c:138
+#: builtin/commit-graph.c:139

 msgid "start walk at commits listed by stdin"
 msgstr ""
 
 msgid "start walk at commits listed by stdin"
 msgstr ""
 

-#: builtin/commit-graph.c:140
+#: builtin/commit-graph.c:141

 msgid "include all commits already in the commit-graph file"
 msgstr ""
 
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 

-#: builtin/commit-graph.c:149
+#: builtin/commit-graph.c:150

 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 

-#: builtin/config.c:10
+#: builtin/config.c:11

 msgid "git config [<options>]"
 msgstr ""
 
 msgid "git config [<options>]"
 msgstr ""
 

-#: builtin/config.c:101
+#: builtin/config.c:103

 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr ""
 
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr ""
 

-#: builtin/config.c:113
+#: builtin/config.c:115

 msgid "only one type at a time"
 msgstr ""
 
 msgid "only one type at a time"
 msgstr ""
 

-#: builtin/config.c:122
+#: builtin/config.c:124

 msgid "Config file location"
 msgstr ""
 
 msgid "Config file location"
 msgstr ""
 

-#: builtin/config.c:123
+#: builtin/config.c:125

 msgid "use global config file"
 msgstr ""
 
 msgid "use global config file"
 msgstr ""
 

-#: builtin/config.c:124
+#: builtin/config.c:126

 msgid "use system config file"
 msgstr ""
 
 msgid "use system config file"
 msgstr ""
 

-#: builtin/config.c:125
+#: builtin/config.c:127

 msgid "use repository config file"
 msgstr ""
 
 msgid "use repository config file"
 msgstr ""
 

-#: builtin/config.c:126
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr ""
+
+#: builtin/config.c:129

 msgid "use given config file"
 msgstr ""
 
 msgid "use given config file"
 msgstr ""
 

-#: builtin/config.c:127
+#: builtin/config.c:130

 msgid "blob-id"
 msgstr ""
 
 msgid "blob-id"
 msgstr ""
 

-#: builtin/config.c:127
+#: builtin/config.c:130

 msgid "read config from given blob object"
 msgstr ""
 
 msgid "read config from given blob object"
 msgstr ""
 

-#: builtin/config.c:128
+#: builtin/config.c:131

 msgid "Action"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 

-#: builtin/config.c:129
+#: builtin/config.c:132

 msgid "get value: name [value-regex]"
 msgstr ""
 
 msgid "get value: name [value-regex]"
 msgstr ""
 

-#: builtin/config.c:130
+#: builtin/config.c:133

 msgid "get all values: key [value-regex]"
 msgstr ""
 
 msgid "get all values: key [value-regex]"
 msgstr ""
 

-#: builtin/config.c:131
+#: builtin/config.c:134

 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 

-#: builtin/config.c:132
+#: builtin/config.c:135

 msgid "get value specific for the URL: section[.var] URL"
 msgstr ""
 
 msgid "get value specific for the URL: section[.var] URL"
 msgstr ""
 

-#: builtin/config.c:133
+#: builtin/config.c:136

 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 

-#: builtin/config.c:134
+#: builtin/config.c:137

 msgid "add a new variable: name value"
 msgstr ""
 
 msgid "add a new variable: name value"
 msgstr ""
 

-#: builtin/config.c:135
+#: builtin/config.c:138

 msgid "remove a variable: name [value-regex]"
 msgstr ""
 
 msgid "remove a variable: name [value-regex]"
 msgstr ""
 

-#: builtin/config.c:136
+#: builtin/config.c:139

 msgid "remove all matches: name [value-regex]"
 msgstr ""
 
 msgid "remove all matches: name [value-regex]"
 msgstr ""
 

-#: builtin/config.c:137
+#: builtin/config.c:140

 msgid "rename section: old-name new-name"
 msgstr ""
 
 msgid "rename section: old-name new-name"
 msgstr ""
 

-#: builtin/config.c:138
+#: builtin/config.c:141

 msgid "remove a section: name"
 msgstr ""
 
 msgid "remove a section: name"
 msgstr ""
 

-#: builtin/config.c:139
+#: builtin/config.c:142

 msgid "list all"
 msgstr ""
 
 msgid "list all"
 msgstr ""
 

-#: builtin/config.c:140
+#: builtin/config.c:143

 msgid "open an editor"
 msgstr ""
 
 msgid "open an editor"
 msgstr ""
 

-#: builtin/config.c:141
+#: builtin/config.c:144

 msgid "find the color configured: slot [default]"
 msgstr ""
 
 msgid "find the color configured: slot [default]"
 msgstr ""
 

-#: builtin/config.c:142
+#: builtin/config.c:145

 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr ""
 
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr ""
 

-#: builtin/config.c:143
+#: builtin/config.c:146

 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 

-#: builtin/config.c:144
+#: builtin/config.c:147

 msgid "value is given this type"
 msgstr ""
 
 msgid "value is given this type"
 msgstr ""
 

-#: builtin/config.c:145
+#: builtin/config.c:148

 msgid "value is \"true\" or \"false\""
 msgstr ""
 
 msgid "value is \"true\" or \"false\""
 msgstr ""
 

-#: builtin/config.c:146
+#: builtin/config.c:149

 msgid "value is decimal number"
 msgstr ""
 
 msgid "value is decimal number"
 msgstr ""
 

-#: builtin/config.c:147
+#: builtin/config.c:150

 msgid "value is --bool or --int"
 msgstr ""
 
 msgid "value is --bool or --int"
 msgstr ""
 

-#: builtin/config.c:148
+#: builtin/config.c:151

 msgid "value is a path (file or directory name)"
 msgstr ""
 
 msgid "value is a path (file or directory name)"
 msgstr ""
 

-#: builtin/config.c:149
+#: builtin/config.c:152

 msgid "value is an expiry date"
 msgstr ""
 
 msgid "value is an expiry date"
 msgstr ""
 

-#: builtin/config.c:150
+#: builtin/config.c:153

 msgid "Other"
 msgstr ""
 
 msgid "Other"
 msgstr ""
 

-#: builtin/config.c:151
+#: builtin/config.c:154

 msgid "terminate values with NUL byte"
 msgstr ""
 
 msgid "terminate values with NUL byte"
 msgstr ""
 

-#: builtin/config.c:152
+#: builtin/config.c:155

 msgid "show variable names only"
 msgstr ""
 
 msgid "show variable names only"
 msgstr ""
 

-#: builtin/config.c:153
+#: builtin/config.c:156

 msgid "respect include directives on lookup"
 msgstr ""
 
 msgid "respect include directives on lookup"
 msgstr ""
 

-#: builtin/config.c:154
+#: builtin/config.c:157

 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 

-#: builtin/config.c:155
+#: builtin/config.c:158

 msgid "value"
 msgstr ""
 
 msgid "value"
 msgstr ""
 

-#: builtin/config.c:155
+#: builtin/config.c:158

 msgid "with --get, use default value when missing entry"
 msgstr ""
 
 msgid "with --get, use default value when missing entry"
 msgstr ""
 

-#: builtin/config.c:168
+#: builtin/config.c:171

 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr ""
 
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr ""
 

-#: builtin/config.c:170
+#: builtin/config.c:173

 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr ""
 
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr ""
 

-#: builtin/config.c:304
+#: builtin/config.c:307

 #, c-format
 msgid "invalid key pattern: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr ""
 

-#: builtin/config.c:340
+#: builtin/config.c:343

 #, c-format
 msgid "failed to format default config value: %s"
 msgstr ""
 
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr ""
 

-#: builtin/config.c:397
+#: builtin/config.c:400

 #, c-format
 msgid "cannot parse color '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr ""
 

-#: builtin/config.c:439
+#: builtin/config.c:442

 msgid "unable to parse default color value"
 msgstr ""
 
 msgid "unable to parse default color value"
 msgstr ""
 

-#: builtin/config.c:492 builtin/config.c:724
+#: builtin/config.c:495 builtin/config.c:741

 msgid "not in a git directory"
 msgstr ""
 
 msgid "not in a git directory"
 msgstr ""
 

-#: builtin/config.c:495
+#: builtin/config.c:498

 msgid "writing to stdin is not supported"
 msgstr ""
 
 msgid "writing to stdin is not supported"
 msgstr ""
 

-#: builtin/config.c:498
+#: builtin/config.c:501

 msgid "writing config blobs is not supported"
 msgstr ""
 
 msgid "writing config blobs is not supported"
 msgstr ""
 

-#: builtin/config.c:583
+#: builtin/config.c:586

 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"


@@ -9135,74 +9639,81 @@ msgid ""
 "#\temail = %s\n"
 msgstr ""
 
 "#\temail = %s\n"
 msgstr ""
 

-#: builtin/config.c:606
+#: builtin/config.c:610

 msgid "only one config file at a time"
 msgstr ""
 
 msgid "only one config file at a time"
 msgstr ""
 

-#: builtin/config.c:611
+#: builtin/config.c:615

 msgid "--local can only be used inside a git repository"
 msgstr ""
 
 msgid "--local can only be used inside a git repository"
 msgstr ""
 

-#: builtin/config.c:614
+#: builtin/config.c:618

 msgid "--blob can only be used inside a git repository"
 msgstr ""
 
 msgid "--blob can only be used inside a git repository"
 msgstr ""
 

-#: builtin/config.c:633
+#: builtin/config.c:637

 msgid "$HOME not set"
 msgstr ""
 
 msgid "$HOME not set"
 msgstr ""
 

-#: builtin/config.c:670
+#: builtin/config.c:657
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
+msgstr ""
+
+#: builtin/config.c:687

 msgid "--get-color and variable type are incoherent"
 msgstr ""
 
 msgid "--get-color and variable type are incoherent"
 msgstr ""
 

-#: builtin/config.c:675
+#: builtin/config.c:692

 msgid "only one action at a time"
 msgstr ""
 
 msgid "only one action at a time"
 msgstr ""
 

-#: builtin/config.c:688
+#: builtin/config.c:705

 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 

-#: builtin/config.c:694
+#: builtin/config.c:711

 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 

-#: builtin/config.c:700
+#: builtin/config.c:717

 msgid "--default is only applicable to --get"
 msgstr ""
 
 msgid "--default is only applicable to --get"
 msgstr ""
 

-#: builtin/config.c:713
+#: builtin/config.c:730

 #, c-format
 msgid "unable to read config file '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr ""
 

-#: builtin/config.c:716
+#: builtin/config.c:733

 msgid "error processing config file(s)"
 msgstr ""
 
 msgid "error processing config file(s)"
 msgstr ""
 

-#: builtin/config.c:726
+#: builtin/config.c:743

 msgid "editing stdin is not supported"
 msgstr ""
 
 msgid "editing stdin is not supported"
 msgstr ""
 

-#: builtin/config.c:728
+#: builtin/config.c:745

 msgid "editing blobs is not supported"
 msgstr ""
 
 msgid "editing blobs is not supported"
 msgstr ""
 

-#: builtin/config.c:742
+#: builtin/config.c:759

 #, c-format
 msgid "cannot create configuration file %s"
 msgstr ""
 
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr ""
 

-#: builtin/config.c:755
+#: builtin/config.c:772

 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 

-#: builtin/config.c:829 builtin/config.c:840
+#: builtin/config.c:846 builtin/config.c:857

 #, c-format
 msgid "no such section: %s"
 msgstr ""
 #, c-format
 msgid "no such section: %s"
 msgstr ""


@@ -9296,7 +9807,7 @@ msgstr ""
 msgid "describe %s\n"
 msgstr ""
 
 msgid "describe %s\n"
 msgstr ""
 

-#: builtin/describe.c:512 builtin/log.c:508
+#: builtin/describe.c:512 builtin/log.c:513

 #, c-format
 msgid "Not a valid object name %s"
 msgstr ""
 #, c-format
 msgid "Not a valid object name %s"
 msgstr ""


@@ -9541,7 +10052,7 @@ msgstr ""
 msgid "Skip output of blob data"
 msgstr ""
 
 msgid "Skip output of blob data"
 msgstr ""
 

-#: builtin/fast-export.c:1024
+#: builtin/fast-export.c:1024 builtin/log.c:1588

 msgid "refspec"
 msgstr ""
 
 msgid "refspec"
 msgstr ""
 


@@ -9553,316 +10064,320 @@ msgstr ""
 msgid "anonymize output"
 msgstr ""
 
 msgid "anonymize output"
 msgstr ""
 

-#: builtin/fetch.c:27
+#: builtin/fetch.c:28

 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 

-#: builtin/fetch.c:28
+#: builtin/fetch.c:29

 msgid "git fetch [<options>] <group>"
 msgstr ""
 
 msgid "git fetch [<options>] <group>"
 msgstr ""
 

-#: builtin/fetch.c:29
+#: builtin/fetch.c:30

 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 

-#: builtin/fetch.c:30
+#: builtin/fetch.c:31

 msgid "git fetch --all [<options>]"
 msgstr ""
 
 msgid "git fetch --all [<options>]"
 msgstr ""
 

-#: builtin/fetch.c:112 builtin/pull.c:193
+#: builtin/fetch.c:115 builtin/pull.c:194

 msgid "fetch from all remotes"
 msgstr ""
 
 msgid "fetch from all remotes"
 msgstr ""
 

-#: builtin/fetch.c:114 builtin/pull.c:196
+#: builtin/fetch.c:117 builtin/pull.c:197

 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 

-#: builtin/fetch.c:116 builtin/pull.c:199
+#: builtin/fetch.c:119 builtin/pull.c:200

 msgid "path to upload pack on remote end"
 msgstr ""
 
 msgid "path to upload pack on remote end"
 msgstr ""
 

-#: builtin/fetch.c:117 builtin/pull.c:201
-msgid "force overwrite of local branch"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"

 msgstr ""
 
 msgstr ""
 

-#: builtin/fetch.c:119
+#: builtin/fetch.c:122

 msgid "fetch from multiple remotes"
 msgstr ""
 
 msgid "fetch from multiple remotes"
 msgstr ""
 

-#: builtin/fetch.c:121 builtin/pull.c:203
+#: builtin/fetch.c:124 builtin/pull.c:204

 msgid "fetch all tags and associated objects"
 msgstr ""
 
 msgid "fetch all tags and associated objects"
 msgstr ""
 

-#: builtin/fetch.c:123
+#: builtin/fetch.c:126

 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 

-#: builtin/fetch.c:125
+#: builtin/fetch.c:128

 msgid "number of submodules fetched in parallel"
 msgstr ""
 
 msgid "number of submodules fetched in parallel"
 msgstr ""
 

-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:130 builtin/pull.c:207

 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 

-#: builtin/fetch.c:129
+#: builtin/fetch.c:132

 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 

-#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132

 msgid "on-demand"
 msgstr ""
 
 msgid "on-demand"
 msgstr ""
 

-#: builtin/fetch.c:131
+#: builtin/fetch.c:134

 msgid "control recursive fetching of submodules"
 msgstr ""
 
 msgid "control recursive fetching of submodules"
 msgstr ""
 

-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:138 builtin/pull.c:215

 msgid "keep downloaded pack"
 msgstr ""
 
 msgid "keep downloaded pack"
 msgstr ""
 

-#: builtin/fetch.c:137
+#: builtin/fetch.c:140

 msgid "allow updating of HEAD ref"
 msgstr ""
 
 msgid "allow updating of HEAD ref"
 msgstr ""
 

-#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218

 msgid "deepen history of shallow clone"
 msgstr ""
 
 msgid "deepen history of shallow clone"
 msgstr ""
 

-#: builtin/fetch.c:142
+#: builtin/fetch.c:145

 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 

-#: builtin/fetch.c:148 builtin/pull.c:220
+#: builtin/fetch.c:151 builtin/pull.c:221

 msgid "convert to a complete repository"
 msgstr ""
 
 msgid "convert to a complete repository"
 msgstr ""
 

-#: builtin/fetch.c:151
+#: builtin/fetch.c:154

 msgid "prepend this to submodule path output"
 msgstr ""
 
 msgid "prepend this to submodule path output"
 msgstr ""
 

-#: builtin/fetch.c:154
+#: builtin/fetch.c:157

 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 

-#: builtin/fetch.c:158 builtin/pull.c:223
+#: builtin/fetch.c:161 builtin/pull.c:224

 msgid "accept refs that update .git/shallow"
 msgstr ""
 
 msgid "accept refs that update .git/shallow"
 msgstr ""
 

-#: builtin/fetch.c:159 builtin/pull.c:225
+#: builtin/fetch.c:162 builtin/pull.c:226

 msgid "refmap"
 msgstr ""
 
 msgid "refmap"
 msgstr ""
 

-#: builtin/fetch.c:160 builtin/pull.c:226
+#: builtin/fetch.c:163 builtin/pull.c:227

 msgid "specify fetch refmap"
 msgstr ""
 
 msgid "specify fetch refmap"
 msgstr ""
 

-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582

 #: builtin/send-pack.c:172
 msgid "server-specific"
 msgstr ""
 
 #: builtin/send-pack.c:172
 msgid "server-specific"
 msgstr ""
 

-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582

 #: builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr ""
 
 #: builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr ""
 

-#: builtin/fetch.c:167
+#: builtin/fetch.c:170

 msgid "report that we have only objects reachable from this object"
 msgstr ""
 
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 

-#: builtin/fetch.c:418
+#: builtin/fetch.c:470

 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 

-#: builtin/fetch.c:552
+#: builtin/fetch.c:609

 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 

-#: builtin/fetch.c:645
+#: builtin/fetch.c:702

 #, c-format
 msgid "object %s not found"
 msgstr ""
 
 #, c-format
 msgid "object %s not found"
 msgstr ""
 

-#: builtin/fetch.c:649
+#: builtin/fetch.c:706

 msgid "[up to date]"
 msgstr ""
 
 msgid "[up to date]"
 msgstr ""
 

-#: builtin/fetch.c:662 builtin/fetch.c:744
+#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807

 msgid "[rejected]"
 msgstr ""
 
 msgid "[rejected]"
 msgstr ""
 

-#: builtin/fetch.c:663
+#: builtin/fetch.c:720

 msgid "can't fetch in current branch"
 msgstr ""
 
 msgid "can't fetch in current branch"
 msgstr ""
 

-#: builtin/fetch.c:672
+#: builtin/fetch.c:730

 msgid "[tag update]"
 msgstr ""
 
 msgid "[tag update]"
 msgstr ""
 

-#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724
-#: builtin/fetch.c:739
+#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
+#: builtin/fetch.c:802

 msgid "unable to update local ref"
 msgstr ""
 
 msgid "unable to update local ref"
 msgstr ""
 

-#: builtin/fetch.c:694
+#: builtin/fetch.c:735
+msgid "would clobber existing tag"
+msgstr ""
+
+#: builtin/fetch.c:757

 msgid "[new tag]"
 msgstr ""
 
 msgid "[new tag]"
 msgstr ""
 

-#: builtin/fetch.c:697
+#: builtin/fetch.c:760

 msgid "[new branch]"
 msgstr ""
 
 msgid "[new branch]"
 msgstr ""
 

-#: builtin/fetch.c:700
+#: builtin/fetch.c:763

 msgid "[new ref]"
 msgstr ""
 
 msgid "[new ref]"
 msgstr ""
 

-#: builtin/fetch.c:739
+#: builtin/fetch.c:802

 msgid "forced update"
 msgstr ""
 
 msgid "forced update"
 msgstr ""
 

-#: builtin/fetch.c:744
+#: builtin/fetch.c:807

 msgid "non-fast-forward"
 msgstr ""
 
 msgid "non-fast-forward"
 msgstr ""
 

-#: builtin/fetch.c:790
+#: builtin/fetch.c:853

 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr ""
 
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr ""
 

-#: builtin/fetch.c:811
+#: builtin/fetch.c:874

 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 

-#: builtin/fetch.c:900 builtin/fetch.c:1011
+#: builtin/fetch.c:963 builtin/fetch.c:1085

 #, c-format
 msgid "From %.*s\n"
 msgstr ""
 
 #, c-format
 msgid "From %.*s\n"
 msgstr ""
 

-#: builtin/fetch.c:911
+#: builtin/fetch.c:974

 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 " 'git remote prune %s' to remove any old, conflicting branches"
 msgstr ""
 
 #, 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:981
+#: builtin/fetch.c:1055

 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:982
+#: builtin/fetch.c:1056

 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:1014
+#: builtin/fetch.c:1088

 msgid "[deleted]"
 msgstr ""
 
 msgid "[deleted]"
 msgstr ""
 

-#: builtin/fetch.c:1015 builtin/remote.c:1035
+#: builtin/fetch.c:1089 builtin/remote.c:1036

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1112

 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 

-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1131

 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr ""
 
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr ""
 

-#: builtin/fetch.c:1060
+#: builtin/fetch.c:1134

 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr ""
 
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr ""
 

-#: builtin/fetch.c:1339
+#: builtin/fetch.c:1433

 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 

-#: builtin/fetch.c:1341 builtin/remote.c:99
+#: builtin/fetch.c:1435 builtin/remote.c:100

 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 
 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 

-#: builtin/fetch.c:1387 builtin/fetch.c:1555
+#: builtin/fetch.c:1481 builtin/fetch.c:1649

 msgid ""
 "--filter can only be used with the remote configured in core.partialClone"
 msgstr ""
 
 msgid ""
 "--filter can only be used with the remote configured in core.partialClone"
 msgstr ""
 

-#: builtin/fetch.c:1410
+#: builtin/fetch.c:1504

 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgstr ""
 
 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:1447
+#: builtin/fetch.c:1541

 msgid "You need to specify a tag name."
 msgstr ""
 
 msgid "You need to specify a tag name."
 msgstr ""
 

-#: builtin/fetch.c:1496
+#: builtin/fetch.c:1590

 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 

-#: builtin/fetch.c:1498
+#: builtin/fetch.c:1592

 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 

-#: builtin/fetch.c:1503
+#: builtin/fetch.c:1597

 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 

-#: builtin/fetch.c:1505
+#: builtin/fetch.c:1599

 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 

-#: builtin/fetch.c:1521
+#: builtin/fetch.c:1615

 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 

-#: builtin/fetch.c:1523
+#: builtin/fetch.c:1617

 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 

-#: builtin/fetch.c:1532
+#: builtin/fetch.c:1626

 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr ""
 
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr ""
 

-#: builtin/fetch.c:1539
+#: builtin/fetch.c:1633

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:18

 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672

 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:675

 msgid "alias for --log (deprecated)"
 msgstr ""
 
 msgid "alias for --log (deprecated)"
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:678

 msgid "text"
 msgstr ""
 
 msgid "text"
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:679

 msgid "use <text> as start of message"
 msgstr ""
 
 msgid "use <text> as start of message"
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:680

 msgid "file to read from"
 msgstr ""
 
 msgid "file to read from"
 msgstr ""
 


@@ -9902,7 +10417,7 @@ msgstr ""
 msgid "show only <n> matched refs"
 msgstr ""
 
 msgid "show only <n> matched refs"
 msgstr ""
 

-#: builtin/for-each-ref.c:39 builtin/tag.c:422
+#: builtin/for-each-ref.c:39 builtin/tag.c:424

 msgid "respect format colors"
 msgstr ""
 
 msgid "respect format colors"
 msgstr ""
 


@@ -9926,63 +10441,63 @@ msgstr ""
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
 msgid "print only refs which don't contain the commit"
 msgstr ""
 

-#: builtin/fsck.c:574
+#: builtin/fsck.c:598

 msgid "Checking object directories"
 msgstr ""
 
 msgid "Checking object directories"
 msgstr ""
 

-#: builtin/fsck.c:666
+#: builtin/fsck.c:693

 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 

-#: builtin/fsck.c:672
+#: builtin/fsck.c:699

 msgid "show unreachable objects"
 msgstr ""
 
 msgid "show unreachable objects"
 msgstr ""
 

-#: builtin/fsck.c:673
+#: builtin/fsck.c:700

 msgid "show dangling objects"
 msgstr ""
 
 msgid "show dangling objects"
 msgstr ""
 

-#: builtin/fsck.c:674
+#: builtin/fsck.c:701

 msgid "report tags"
 msgstr ""
 
 msgid "report tags"
 msgstr ""
 

-#: builtin/fsck.c:675
+#: builtin/fsck.c:702

 msgid "report root nodes"
 msgstr ""
 
 msgid "report root nodes"
 msgstr ""
 

-#: builtin/fsck.c:676
+#: builtin/fsck.c:703

 msgid "make index objects head nodes"
 msgstr ""
 
 msgid "make index objects head nodes"
 msgstr ""
 

-#: builtin/fsck.c:677
+#: builtin/fsck.c:704

 msgid "make reflogs head nodes (default)"
 msgstr ""
 
 msgid "make reflogs head nodes (default)"
 msgstr ""
 

-#: builtin/fsck.c:678
+#: builtin/fsck.c:705

 msgid "also consider packs and alternate objects"
 msgstr ""
 
 msgid "also consider packs and alternate objects"
 msgstr ""
 

-#: builtin/fsck.c:679
+#: builtin/fsck.c:706

 msgid "check only connectivity"
 msgstr ""
 
 msgid "check only connectivity"
 msgstr ""
 

-#: builtin/fsck.c:680
+#: builtin/fsck.c:707

 msgid "enable more strict checking"
 msgstr ""
 
 msgid "enable more strict checking"
 msgstr ""
 

-#: builtin/fsck.c:682
+#: builtin/fsck.c:709

 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 

-#: builtin/fsck.c:683 builtin/prune.c:110
+#: builtin/fsck.c:710 builtin/prune.c:110

 msgid "show progress"
 msgstr ""
 
 msgid "show progress"
 msgstr ""
 

-#: builtin/fsck.c:684
+#: builtin/fsck.c:711

 msgid "show verbose names for reachable objects"
 msgstr ""
 
 msgid "show verbose names for reachable objects"
 msgstr ""
 

-#: builtin/fsck.c:750
+#: builtin/fsck.c:776

 msgid "Checking objects"
 msgstr ""
 
 msgid "Checking objects"
 msgstr ""
 


@@ -9995,12 +10510,17 @@ msgstr ""
 msgid "Failed to fstat %s: %s"
 msgstr ""
 
 msgid "Failed to fstat %s: %s"
 msgstr ""
 

-#: builtin/gc.c:455
+#: builtin/gc.c:461 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510

 #, c-format
 #, c-format

-msgid "Can't stat %s"
+msgid "cannot read '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/gc.c:464
+#: builtin/gc.c:477

 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"


@@ -10010,58 +10530,58 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: builtin/gc.c:505
+#: builtin/gc.c:519

 msgid "prune unreferenced objects"
 msgstr ""
 
 msgid "prune unreferenced objects"
 msgstr ""
 

-#: builtin/gc.c:507
+#: builtin/gc.c:521

 msgid "be more thorough (increased runtime)"
 msgstr ""
 
 msgid "be more thorough (increased runtime)"
 msgstr ""
 

-#: builtin/gc.c:508
+#: builtin/gc.c:522

 msgid "enable auto-gc mode"
 msgstr ""
 
 msgid "enable auto-gc mode"
 msgstr ""
 

-#: builtin/gc.c:511
+#: builtin/gc.c:525

 msgid "force running gc even if there may be another gc running"
 msgstr ""
 
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 

-#: builtin/gc.c:514
+#: builtin/gc.c:528

 msgid "repack all other packs except the largest pack"
 msgstr ""
 
 msgid "repack all other packs except the largest pack"
 msgstr ""
 

-#: builtin/gc.c:531
+#: builtin/gc.c:545

 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr ""
 
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr ""
 

-#: builtin/gc.c:542
+#: builtin/gc.c:556

 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr ""
 
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr ""
 

-#: builtin/gc.c:562
+#: builtin/gc.c:576

 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 

-#: builtin/gc.c:564
+#: builtin/gc.c:578

 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 

-#: builtin/gc.c:565
+#: builtin/gc.c:579

 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 

-#: builtin/gc.c:601
+#: builtin/gc.c:619

 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 

-#: builtin/gc.c:652
+#: builtin/gc.c:670

 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""


@@ -10070,12 +10590,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 

-#: builtin/grep.c:226
+#: builtin/grep.c:224

 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 

-#: builtin/grep.c:284
+#: builtin/grep.c:278

 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""


@@ -10084,250 +10604,258 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
 #. variable for tweaking threads, currently
 #. grep.threads
 #.

-#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
-#: builtin/pack-objects.c:2636
+#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2719

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 

-#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
+#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620

 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 

-#: builtin/grep.c:638
+#: builtin/grep.c:635

 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr ""
 
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr ""
 

-#: builtin/grep.c:704
+#: builtin/grep.c:701

 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 

-#: builtin/grep.c:791
+#: builtin/grep.c:800

 msgid "search in index instead of in the work tree"
 msgstr ""
 
 msgid "search in index instead of in the work tree"
 msgstr ""
 

-#: builtin/grep.c:793
+#: builtin/grep.c:802

 msgid "find in contents not managed by git"
 msgstr ""
 
 msgid "find in contents not managed by git"
 msgstr ""
 

-#: builtin/grep.c:795
+#: builtin/grep.c:804

 msgid "search in both tracked and untracked files"
 msgstr ""
 
 msgid "search in both tracked and untracked files"
 msgstr ""
 

-#: builtin/grep.c:797
+#: builtin/grep.c:806

 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 

-#: builtin/grep.c:799
+#: builtin/grep.c:808

 msgid "recursively search in each submodule"
 msgstr ""
 
 msgid "recursively search in each submodule"
 msgstr ""
 

-#: builtin/grep.c:802
+#: builtin/grep.c:811

 msgid "show non-matching lines"
 msgstr ""
 
 msgid "show non-matching lines"
 msgstr ""
 

-#: builtin/grep.c:804
+#: builtin/grep.c:813

 msgid "case insensitive matching"
 msgstr ""
 
 msgid "case insensitive matching"
 msgstr ""
 

-#: builtin/grep.c:806
+#: builtin/grep.c:815

 msgid "match patterns only at word boundaries"
 msgstr ""
 
 msgid "match patterns only at word boundaries"
 msgstr ""
 

-#: builtin/grep.c:808
+#: builtin/grep.c:817

 msgid "process binary files as text"
 msgstr ""
 
 msgid "process binary files as text"
 msgstr ""
 

-#: builtin/grep.c:810
+#: builtin/grep.c:819

 msgid "don't match patterns in binary files"
 msgstr ""
 
 msgid "don't match patterns in binary files"
 msgstr ""
 

-#: builtin/grep.c:813
+#: builtin/grep.c:822

 msgid "process binary files with textconv filters"
 msgstr ""
 
 msgid "process binary files with textconv filters"
 msgstr ""
 

-#: builtin/grep.c:815
+#: builtin/grep.c:824
+msgid "search in subdirectories (default)"
+msgstr ""
+
+#: builtin/grep.c:826

 msgid "descend at most <depth> levels"
 msgstr ""
 
 msgid "descend at most <depth> levels"
 msgstr ""
 

-#: builtin/grep.c:819
+#: builtin/grep.c:830

 msgid "use extended POSIX regular expressions"
 msgstr ""
 
 msgid "use extended POSIX regular expressions"
 msgstr ""
 

-#: builtin/grep.c:822
+#: builtin/grep.c:833

 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 

-#: builtin/grep.c:825
+#: builtin/grep.c:836

 msgid "interpret patterns as fixed strings"
 msgstr ""
 
 msgid "interpret patterns as fixed strings"
 msgstr ""
 

-#: builtin/grep.c:828
+#: builtin/grep.c:839

 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 

-#: builtin/grep.c:831
+#: builtin/grep.c:842

 msgid "show line numbers"
 msgstr ""
 
 msgid "show line numbers"
 msgstr ""
 

-#: builtin/grep.c:832
+#: builtin/grep.c:843

 msgid "show column number of first match"
 msgstr ""
 
 msgid "show column number of first match"
 msgstr ""
 

-#: builtin/grep.c:833
+#: builtin/grep.c:844

 msgid "don't show filenames"
 msgstr ""
 
 msgid "don't show filenames"
 msgstr ""
 

-#: builtin/grep.c:834
+#: builtin/grep.c:845

 msgid "show filenames"
 msgstr ""
 
 msgid "show filenames"
 msgstr ""
 

-#: builtin/grep.c:836
+#: builtin/grep.c:847

 msgid "show filenames relative to top directory"
 msgstr ""
 
 msgid "show filenames relative to top directory"
 msgstr ""
 

-#: builtin/grep.c:838
+#: builtin/grep.c:849

 msgid "show only filenames instead of matching lines"
 msgstr ""
 
 msgid "show only filenames instead of matching lines"
 msgstr ""
 

-#: builtin/grep.c:840
+#: builtin/grep.c:851

 msgid "synonym for --files-with-matches"
 msgstr ""
 
 msgid "synonym for --files-with-matches"
 msgstr ""
 

-#: builtin/grep.c:843
+#: builtin/grep.c:854

 msgid "show only the names of files without match"
 msgstr ""
 
 msgid "show only the names of files without match"
 msgstr ""
 

-#: builtin/grep.c:845
+#: builtin/grep.c:856

 msgid "print NUL after filenames"
 msgstr ""
 
 msgid "print NUL after filenames"
 msgstr ""
 

-#: builtin/grep.c:848
+#: builtin/grep.c:859

 msgid "show only matching parts of a line"
 msgstr ""
 
 msgid "show only matching parts of a line"
 msgstr ""
 

-#: builtin/grep.c:850
+#: builtin/grep.c:861

 msgid "show the number of matches instead of matching lines"
 msgstr ""
 
 msgid "show the number of matches instead of matching lines"
 msgstr ""
 

-#: builtin/grep.c:851
+#: builtin/grep.c:862

 msgid "highlight matches"
 msgstr ""
 
 msgid "highlight matches"
 msgstr ""
 

-#: builtin/grep.c:853
+#: builtin/grep.c:864

 msgid "print empty line between matches from different files"
 msgstr ""
 
 msgid "print empty line between matches from different files"
 msgstr ""
 

-#: builtin/grep.c:855
+#: builtin/grep.c:866

 msgid "show filename only once above matches from same file"
 msgstr ""
 
 msgid "show filename only once above matches from same file"
 msgstr ""
 

-#: builtin/grep.c:858
+#: builtin/grep.c:869

 msgid "show <n> context lines before and after matches"
 msgstr ""
 
 msgid "show <n> context lines before and after matches"
 msgstr ""
 

-#: builtin/grep.c:861
+#: builtin/grep.c:872

 msgid "show <n> context lines before matches"
 msgstr ""
 
 msgid "show <n> context lines before matches"
 msgstr ""
 

-#: builtin/grep.c:863
+#: builtin/grep.c:874

 msgid "show <n> context lines after matches"
 msgstr ""
 
 msgid "show <n> context lines after matches"
 msgstr ""
 

-#: builtin/grep.c:865
+#: builtin/grep.c:876

 msgid "use <n> worker threads"
 msgstr ""
 
 msgid "use <n> worker threads"
 msgstr ""
 

-#: builtin/grep.c:866
+#: builtin/grep.c:877

 msgid "shortcut for -C NUM"
 msgstr ""
 
 msgid "shortcut for -C NUM"
 msgstr ""
 

-#: builtin/grep.c:869
+#: builtin/grep.c:880

 msgid "show a line with the function name before matches"
 msgstr ""
 
 msgid "show a line with the function name before matches"
 msgstr ""
 

-#: builtin/grep.c:871
+#: builtin/grep.c:882

 msgid "show the surrounding function"
 msgstr ""
 
 msgid "show the surrounding function"
 msgstr ""
 

-#: builtin/grep.c:874
+#: builtin/grep.c:885

 msgid "read patterns from file"
 msgstr ""
 
 msgid "read patterns from file"
 msgstr ""
 

-#: builtin/grep.c:876
+#: builtin/grep.c:887

 msgid "match <pattern>"
 msgstr ""
 
 msgid "match <pattern>"
 msgstr ""
 

-#: builtin/grep.c:878
+#: builtin/grep.c:889

 msgid "combine patterns specified with -e"
 msgstr ""
 
 msgid "combine patterns specified with -e"
 msgstr ""
 

-#: builtin/grep.c:890
+#: builtin/grep.c:901

 msgid "indicate hit with exit status without output"
 msgstr ""
 
 msgid "indicate hit with exit status without output"
 msgstr ""
 

-#: builtin/grep.c:892
+#: builtin/grep.c:903

 msgid "show only matches from files that match all patterns"
 msgstr ""
 
 msgid "show only matches from files that match all patterns"
 msgstr ""
 

-#: builtin/grep.c:894
+#: builtin/grep.c:905

 msgid "show parse tree for grep expression"
 msgstr ""
 
 msgid "show parse tree for grep expression"
 msgstr ""
 

-#: builtin/grep.c:898
+#: builtin/grep.c:909

 msgid "pager"
 msgstr ""
 
 msgid "pager"
 msgstr ""
 

-#: builtin/grep.c:898
+#: builtin/grep.c:909

 msgid "show matching files in the pager"
 msgstr ""
 
 msgid "show matching files in the pager"
 msgstr ""
 

-#: builtin/grep.c:902
+#: builtin/grep.c:913

 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 

-#: builtin/grep.c:966
+#: builtin/grep.c:977

 msgid "no pattern given"
 msgstr ""
 
 msgid "no pattern given"
 msgstr ""
 

-#: builtin/grep.c:1002
+#: builtin/grep.c:1013

 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 

-#: builtin/grep.c:1009
+#: builtin/grep.c:1020

 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 

-#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632
-#, c-format
-msgid "invalid number of threads specified (%d)"
+#: builtin/grep.c:1051
+msgid "invalid option combination, ignoring --threads"

 msgstr ""
 
 msgstr ""
 

-#: builtin/grep.c:1049 builtin/pack-objects.c:3286
+#: builtin/grep.c:1054 builtin/pack-objects.c:3395

 msgid "no threads support, ignoring --threads"
 msgstr ""
 
 msgid "no threads support, ignoring --threads"
 msgstr ""
 

-#: builtin/grep.c:1073
+#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr ""
+
+#: builtin/grep.c:1080

 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 

-#: builtin/grep.c:1096
+#: builtin/grep.c:1103

 msgid "option not supported with --recurse-submodules"
 msgstr ""
 
 msgid "option not supported with --recurse-submodules"
 msgstr ""
 

-#: builtin/grep.c:1102
+#: builtin/grep.c:1109

 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr ""
 
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr ""
 

-#: builtin/grep.c:1108
+#: builtin/grep.c:1115

 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 

-#: builtin/grep.c:1116
+#: builtin/grep.c:1123

 msgid "both --cached and trees are given"
 msgstr ""
 
 msgid "both --cached and trees are given"
 msgstr ""
 


@@ -10456,317 +10984,317 @@ msgstr ""
 msgid "no info viewer handled the request"
 msgstr ""
 
 msgid "no info viewer handled the request"
 msgstr ""
 

-#: builtin/help.c:418
+#: builtin/help.c:430 builtin/help.c:441 git.c:322

 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr ""
 

-#: builtin/help.c:445 builtin/help.c:475
+#: builtin/help.c:444
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr ""
+
+#: builtin/help.c:473 builtin/help.c:503

 #, c-format
 msgid "usage: %s%s"
 msgstr ""
 
 #, c-format
 msgid "usage: %s%s"
 msgstr ""
 

-#: builtin/help.c:459
+#: builtin/help.c:487

 msgid "'git help config' for more information"
 msgstr ""
 
 msgid "'git help config' for more information"
 msgstr ""
 

-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:184

 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 

-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:204

 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 
 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 

-#: builtin/index-pack.c:231
+#: builtin/index-pack.c:207

 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr ""
 
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr ""
 

-#: builtin/index-pack.c:273
+#: builtin/index-pack.c:249

 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:283
+#: builtin/index-pack.c:259

 msgid "early EOF"
 msgstr ""
 
 msgid "early EOF"
 msgstr ""
 

-#: builtin/index-pack.c:284
+#: builtin/index-pack.c:260

 msgid "read error on input"
 msgstr ""
 
 msgid "read error on input"
 msgstr ""
 

-#: builtin/index-pack.c:296
+#: builtin/index-pack.c:272

 msgid "used more bytes than were available"
 msgstr ""
 
 msgid "used more bytes than were available"
 msgstr ""
 

-#: builtin/index-pack.c:303 builtin/pack-objects.c:590
+#: builtin/index-pack.c:279 builtin/pack-objects.c:598

 msgid "pack too large for current definition of off_t"
 msgstr ""
 
 msgid "pack too large for current definition of off_t"
 msgstr ""
 

-#: builtin/index-pack.c:306 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:282 builtin/unpack-objects.c:94

 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 

-#: builtin/index-pack.c:321
+#: builtin/index-pack.c:297

 #, c-format
 msgid "unable to create '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to create '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:303

 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:317

 msgid "pack signature mismatch"
 msgstr ""
 
 msgid "pack signature mismatch"
 msgstr ""
 

-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:319

 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 

-#: builtin/index-pack.c:361
+#: builtin/index-pack.c:337

 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 

-#: builtin/index-pack.c:482
+#: builtin/index-pack.c:457

 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 

-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:506

 msgid "offset value overflow for delta base object"
 msgstr ""
 
 msgid "offset value overflow for delta base object"
 msgstr ""
 

-#: builtin/index-pack.c:539
+#: builtin/index-pack.c:514

 msgid "delta base offset is out of bound"
 msgstr ""
 
 msgid "delta base offset is out of bound"
 msgstr ""
 

-#: builtin/index-pack.c:547
+#: builtin/index-pack.c:522

 #, c-format
 msgid "unknown object type %d"
 msgstr ""
 
 #, c-format
 msgid "unknown object type %d"
 msgstr ""
 

-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:553

 msgid "cannot pread pack file"
 msgstr ""
 
 msgid "cannot pread pack file"
 msgstr ""
 

-#: builtin/index-pack.c:580
+#: builtin/index-pack.c:555

 #, 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] ""
 
 #, 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:606
+#: builtin/index-pack.c:581

 msgid "serious inflate inconsistency"
 msgstr ""
 
 msgid "serious inflate inconsistency"
 msgstr ""
 

-#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
-#: builtin/index-pack.c:819 builtin/index-pack.c:828
+#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
+#: builtin/index-pack.c:794 builtin/index-pack.c:803

 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 

-#: builtin/index-pack.c:754 builtin/pack-objects.c:143
-#: builtin/pack-objects.c:203 builtin/pack-objects.c:297
+#: builtin/index-pack.c:729 builtin/pack-objects.c:151
+#: builtin/pack-objects.c:211 builtin/pack-objects.c:305

 #, c-format
 msgid "unable to read %s"
 msgstr ""
 
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 

-#: builtin/index-pack.c:817
+#: builtin/index-pack.c:792

 #, c-format
 msgid "cannot read existing object info %s"
 msgstr ""
 
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr ""
 

-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:800

 #, c-format
 msgid "cannot read existing object %s"
 msgstr ""
 
 #, c-format
 msgid "cannot read existing object %s"
 msgstr ""
 

-#: builtin/index-pack.c:839
+#: builtin/index-pack.c:814

 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 

-#: builtin/index-pack.c:842 builtin/index-pack.c:861
+#: builtin/index-pack.c:817 builtin/index-pack.c:836

 msgid "fsck error in packed object"
 msgstr ""
 
 msgid "fsck error in packed object"
 msgstr ""
 

-#: builtin/index-pack.c:858
+#: builtin/index-pack.c:833

 #, c-format
 msgid "invalid %s"
 msgstr ""
 
 #, c-format
 msgid "invalid %s"
 msgstr ""
 

-#: builtin/index-pack.c:863
+#: builtin/index-pack.c:838

 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 

-#: builtin/index-pack.c:935 builtin/index-pack.c:966
+#: builtin/index-pack.c:910 builtin/index-pack.c:941

 msgid "failed to apply delta"
 msgstr ""
 
 msgid "failed to apply delta"
 msgstr ""
 

-#: builtin/index-pack.c:1136
+#: builtin/index-pack.c:1109

 msgid "Receiving objects"
 msgstr ""
 
 msgid "Receiving objects"
 msgstr ""
 

-#: builtin/index-pack.c:1136
+#: builtin/index-pack.c:1109

 msgid "Indexing objects"
 msgstr ""
 
 msgid "Indexing objects"
 msgstr ""
 

-#: builtin/index-pack.c:1170
+#: builtin/index-pack.c:1143

 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 

-#: builtin/index-pack.c:1175
+#: builtin/index-pack.c:1148

 msgid "cannot fstat packfile"
 msgstr ""
 
 msgid "cannot fstat packfile"
 msgstr ""
 

-#: builtin/index-pack.c:1178
+#: builtin/index-pack.c:1151

 msgid "pack has junk at the end"
 msgstr ""
 
 msgid "pack has junk at the end"
 msgstr ""
 

-#: builtin/index-pack.c:1190
+#: builtin/index-pack.c:1163

 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 

-#: builtin/index-pack.c:1213
+#: builtin/index-pack.c:1186

 msgid "Resolving deltas"
 msgstr ""
 
 msgid "Resolving deltas"
 msgstr ""
 

-#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492

 #, c-format
 msgid "unable to create thread: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to create thread: %s"
 msgstr ""
 

-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1237

 msgid "confusion beyond insanity"
 msgstr ""
 
 msgid "confusion beyond insanity"
 msgstr ""
 

-#: builtin/index-pack.c:1272
+#: builtin/index-pack.c:1243

 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:1284
+#: builtin/index-pack.c:1255

 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 

-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c:1259

 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:1312
+#: builtin/index-pack.c:1283

 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 

-#: builtin/index-pack.c:1389
+#: builtin/index-pack.c:1360

 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 

-#: builtin/index-pack.c:1403
+#: builtin/index-pack.c:1374

 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr ""
 
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr ""
 

-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1399

 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1407

 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1460
+#: builtin/index-pack.c:1431

 msgid "error while closing pack file"
 msgstr ""
 
 msgid "error while closing pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1445

 msgid "cannot store pack file"
 msgstr ""
 
 msgid "cannot store pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1482
+#: builtin/index-pack.c:1453

 msgid "cannot store index file"
 msgstr ""
 
 msgid "cannot store index file"
 msgstr ""
 

-#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 

-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1565

 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1567

 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1645
+#: builtin/index-pack.c:1615

 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:1652
+#: builtin/index-pack.c:1622

 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1659

 msgid "Cannot come back to cwd"
 msgstr ""
 
 msgid "Cannot come back to cwd"
 msgstr ""
 

-#: builtin/index-pack.c:1740 builtin/index-pack.c:1743
-#: builtin/index-pack.c:1759 builtin/index-pack.c:1763
+#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
+#: builtin/index-pack.c:1727 builtin/index-pack.c:1731

 #, c-format
 msgid "bad %s"
 msgstr ""
 
 #, c-format
 msgid "bad %s"
 msgstr ""
 

-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1747

 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 

-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1749

 msgid "--stdin requires a git repository"
 msgstr ""
 
 msgid "--stdin requires a git repository"
 msgstr ""
 

-#: builtin/index-pack.c:1787
+#: builtin/index-pack.c:1755

 msgid "--verify with no packfile name given"
 msgstr ""
 
 msgid "--verify with no packfile name given"
 msgstr ""
 

-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580

 msgid "fsck error in pack objects"
 msgstr ""
 
 msgid "fsck error in pack objects"
 msgstr ""
 

-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
-msgstr ""
-

 #: builtin/init-db.c:61
 #, c-format
 msgid "cannot stat template '%s'"
 #: builtin/init-db.c:61
 #, c-format
 msgid "cannot stat template '%s'"


@@ -10842,38 +11370,38 @@ msgstr ""
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr ""
 
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr ""
 

-#: builtin/init-db.c:459
+#: builtin/init-db.c:460

 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgstr ""
 
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgstr ""
 

-#: builtin/init-db.c:482
+#: builtin/init-db.c:483

 msgid "permissions"
 msgstr ""
 
 msgid "permissions"
 msgstr ""
 

-#: builtin/init-db.c:483
+#: builtin/init-db.c:484

 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 

-#: builtin/init-db.c:517 builtin/init-db.c:522
+#: builtin/init-db.c:518 builtin/init-db.c:523

 #, c-format
 msgid "cannot mkdir %s"
 msgstr ""
 
 #, c-format
 msgid "cannot mkdir %s"
 msgstr ""
 

-#: builtin/init-db.c:526
+#: builtin/init-db.c:527

 #, c-format
 msgid "cannot chdir to %s"
 msgstr ""
 
 #, c-format
 msgid "cannot chdir to %s"
 msgstr ""
 

-#: builtin/init-db.c:547
+#: builtin/init-db.c:548

 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
 

-#: builtin/init-db.c:575
+#: builtin/init-db.c:576

 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr ""
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr ""


@@ -10884,398 +11412,452 @@ msgid ""
 "<token>[(=|:)<value>])...] [<file>...]"
 msgstr ""
 
 "<token>[(=|:)<value>])...] [<file>...]"
 msgstr ""
 

-#: builtin/interpret-trailers.c:92
+#: builtin/interpret-trailers.c:94

 msgid "edit files in place"
 msgstr ""
 
 msgid "edit files in place"
 msgstr ""
 

-#: builtin/interpret-trailers.c:93
+#: builtin/interpret-trailers.c:95

 msgid "trim empty trailers"
 msgstr ""
 
 msgid "trim empty trailers"
 msgstr ""
 

-#: builtin/interpret-trailers.c:96
+#: builtin/interpret-trailers.c:98

 msgid "where to place the new trailer"
 msgstr ""
 
 msgid "where to place the new trailer"
 msgstr ""
 

-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100

 msgid "action if trailer already exists"
 msgstr ""
 
 msgid "action if trailer already exists"
 msgstr ""
 

-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102

 msgid "action if trailer is missing"
 msgstr ""
 
 msgid "action if trailer is missing"
 msgstr ""
 

-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:104

 msgid "output only the trailers"
 msgstr ""
 
 msgid "output only the trailers"
 msgstr ""
 

-#: builtin/interpret-trailers.c:103
+#: builtin/interpret-trailers.c:105

 msgid "do not apply config rules"
 msgstr ""
 
 msgid "do not apply config rules"
 msgstr ""
 

-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:106

 msgid "join whitespace-continued values"
 msgstr ""
 
 msgid "join whitespace-continued values"
 msgstr ""
 

-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:107

 msgid "set parsing options"
 msgstr ""
 
 msgid "set parsing options"
 msgstr ""
 

-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110

 msgid "trailer"
 msgstr ""
 
 msgid "trailer"
 msgstr ""
 

-#: builtin/interpret-trailers.c:108
+#: builtin/interpret-trailers.c:111

 msgid "trailer(s) to add"
 msgstr ""
 
 msgid "trailer(s) to add"
 msgstr ""
 

-#: builtin/interpret-trailers.c:117
+#: builtin/interpret-trailers.c:120

 msgid "--trailer with --only-input does not make sense"
 msgstr ""
 
 msgid "--trailer with --only-input does not make sense"
 msgstr ""
 

-#: builtin/interpret-trailers.c:127
+#: builtin/interpret-trailers.c:130

 msgid "no input file given for in-place editing"
 msgstr ""
 
 msgid "no input file given for in-place editing"
 msgstr ""
 

-#: builtin/log.c:51
+#: builtin/log.c:54

 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 

-#: builtin/log.c:52
+#: builtin/log.c:55

 msgid "git show [<options>] <object>..."
 msgstr ""
 
 msgid "git show [<options>] <object>..."
 msgstr ""
 

-#: builtin/log.c:96
+#: builtin/log.c:99

 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr ""
 

-#: builtin/log.c:157
+#: builtin/log.c:162

 msgid "suppress diff output"
 msgstr ""
 
 msgid "suppress diff output"
 msgstr ""
 

-#: builtin/log.c:158
+#: builtin/log.c:163

 msgid "show source"
 msgstr ""
 
 msgid "show source"
 msgstr ""
 

-#: builtin/log.c:159
+#: builtin/log.c:164

 msgid "Use mail map file"
 msgstr ""
 
 msgid "Use mail map file"
 msgstr ""
 

-#: builtin/log.c:161
+#: builtin/log.c:166

 msgid "only decorate refs that match <pattern>"
 msgstr ""
 
 msgid "only decorate refs that match <pattern>"
 msgstr ""
 

-#: builtin/log.c:163
+#: builtin/log.c:168

 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 
 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 

-#: builtin/log.c:164
+#: builtin/log.c:169

 msgid "decorate options"
 msgstr ""
 
 msgid "decorate options"
 msgstr ""
 

-#: builtin/log.c:167
+#: builtin/log.c:172

 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 

-#: builtin/log.c:265
+#: builtin/log.c:270

 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 

-#: builtin/log.c:516
+#: builtin/log.c:522

 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 

-#: builtin/log.c:531 builtin/log.c:625
+#: builtin/log.c:537 builtin/log.c:631

 #, c-format
 msgid "Could not read object %s"
 msgstr ""
 
 #, c-format
 msgid "Could not read object %s"
 msgstr ""
 

-#: builtin/log.c:649
+#: builtin/log.c:655

 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 
 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 

-#: builtin/log.c:770
+#: builtin/log.c:776

 msgid "format.headers without value"
 msgstr ""
 
 msgid "format.headers without value"
 msgstr ""
 

-#: builtin/log.c:871
+#: builtin/log.c:877

 msgid "name of output directory is too long"
 msgstr ""
 
 msgid "name of output directory is too long"
 msgstr ""
 

-#: builtin/log.c:887
+#: builtin/log.c:893

 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 

-#: builtin/log.c:904
+#: builtin/log.c:910

 msgid "Need exactly one range."
 msgstr ""
 
 msgid "Need exactly one range."
 msgstr ""
 

-#: builtin/log.c:914
+#: builtin/log.c:920

 msgid "Not a range."
 msgstr ""
 
 msgid "Not a range."
 msgstr ""
 

-#: builtin/log.c:1020
+#: builtin/log.c:1043

 msgid "Cover letter needs email format"
 msgstr ""
 
 msgid "Cover letter needs email format"
 msgstr ""
 

-#: builtin/log.c:1101
+#: builtin/log.c:1119

 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 

-#: builtin/log.c:1128
+#: builtin/log.c:1146

 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 

-#: builtin/log.c:1178
+#: builtin/log.c:1204

 msgid "Two output directories?"
 msgstr ""
 
 msgid "Two output directories?"
 msgstr ""
 

-#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959
+#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068

 #, c-format
 msgid "Unknown commit %s"
 msgstr ""
 
 #, c-format
 msgid "Unknown commit %s"
 msgstr ""
 

-#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524
+#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526

 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 

-#: builtin/log.c:1300
+#: builtin/log.c:1326

 msgid "Could not find exact merge base."
 msgstr ""
 
 msgid "Could not find exact merge base."
 msgstr ""
 

-#: builtin/log.c:1304
+#: builtin/log.c:1330

 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 ""
 
 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:1324
+#: builtin/log.c:1350

 msgid "Failed to find exact merge base"
 msgstr ""
 
 msgid "Failed to find exact merge base"
 msgstr ""
 

-#: builtin/log.c:1335
+#: builtin/log.c:1361

 msgid "base commit should be the ancestor of revision list"
 msgstr ""
 
 msgid "base commit should be the ancestor of revision list"
 msgstr ""
 

-#: builtin/log.c:1339
+#: builtin/log.c:1365

 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 

-#: builtin/log.c:1392
+#: builtin/log.c:1418

 msgid "cannot get patch id"
 msgstr ""
 
 msgid "cannot get patch id"
 msgstr ""
 

-#: builtin/log.c:1452
+#: builtin/log.c:1470
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1515

 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 

-#: builtin/log.c:1455
+#: builtin/log.c:1518

 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 

-#: builtin/log.c:1459
+#: builtin/log.c:1522

 msgid "print patches to standard out"
 msgstr ""
 
 msgid "print patches to standard out"
 msgstr ""
 

-#: builtin/log.c:1461
+#: builtin/log.c:1524

 msgid "generate a cover letter"
 msgstr ""
 
 msgid "generate a cover letter"
 msgstr ""
 

-#: builtin/log.c:1463
+#: builtin/log.c:1526

 msgid "use simple number sequence for output file names"
 msgstr ""
 
 msgid "use simple number sequence for output file names"
 msgstr ""
 

-#: builtin/log.c:1464
+#: builtin/log.c:1527

 msgid "sfx"
 msgstr ""
 
 msgid "sfx"
 msgstr ""
 

-#: builtin/log.c:1465
+#: builtin/log.c:1528

 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 

-#: builtin/log.c:1467
+#: builtin/log.c:1530

 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 

-#: builtin/log.c:1469
+#: builtin/log.c:1532

 msgid "mark the series as Nth re-roll"
 msgstr ""
 
 msgid "mark the series as Nth re-roll"
 msgstr ""
 

-#: builtin/log.c:1471
+#: builtin/log.c:1534

 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1474
+#: builtin/log.c:1537

 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1477
+#: builtin/log.c:1540

 msgid "store resulting files in <dir>"
 msgstr ""
 
 msgid "store resulting files in <dir>"
 msgstr ""
 

-#: builtin/log.c:1480
+#: builtin/log.c:1543

 msgid "don't strip/add [PATCH]"
 msgstr ""
 
 msgid "don't strip/add [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1483
+#: builtin/log.c:1546

 msgid "don't output binary diffs"
 msgstr ""
 
 msgid "don't output binary diffs"
 msgstr ""
 

-#: builtin/log.c:1485
+#: builtin/log.c:1548

 msgid "output all-zero hash in From header"
 msgstr ""
 
 msgid "output all-zero hash in From header"
 msgstr ""
 

-#: builtin/log.c:1487
+#: builtin/log.c:1550

 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 

-#: builtin/log.c:1489
+#: builtin/log.c:1552

 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 

-#: builtin/log.c:1491
+#: builtin/log.c:1554

 msgid "Messaging"
 msgstr ""
 
 msgid "Messaging"
 msgstr ""
 

-#: builtin/log.c:1492
+#: builtin/log.c:1555

 msgid "header"
 msgstr ""
 
 msgid "header"
 msgstr ""
 

-#: builtin/log.c:1493
+#: builtin/log.c:1556

 msgid "add email header"
 msgstr ""
 
 msgid "add email header"
 msgstr ""
 

-#: builtin/log.c:1494 builtin/log.c:1496
+#: builtin/log.c:1557 builtin/log.c:1559

 msgid "email"
 msgstr ""
 
 msgid "email"
 msgstr ""
 

-#: builtin/log.c:1494
+#: builtin/log.c:1557

 msgid "add To: header"
 msgstr ""
 
 msgid "add To: header"
 msgstr ""
 

-#: builtin/log.c:1496
+#: builtin/log.c:1559

 msgid "add Cc: header"
 msgstr ""
 
 msgid "add Cc: header"
 msgstr ""
 

-#: builtin/log.c:1498
+#: builtin/log.c:1561

 msgid "ident"
 msgstr ""
 
 msgid "ident"
 msgstr ""
 

-#: builtin/log.c:1499
+#: builtin/log.c:1562

 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 

-#: builtin/log.c:1501
+#: builtin/log.c:1564

 msgid "message-id"
 msgstr ""
 
 msgid "message-id"
 msgstr ""
 

-#: builtin/log.c:1502
+#: builtin/log.c:1565

 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 

-#: builtin/log.c:1503 builtin/log.c:1506
+#: builtin/log.c:1566 builtin/log.c:1569

 msgid "boundary"
 msgstr ""
 
 msgid "boundary"
 msgstr ""
 

-#: builtin/log.c:1504
+#: builtin/log.c:1567

 msgid "attach the patch"
 msgstr ""
 
 msgid "attach the patch"
 msgstr ""
 

-#: builtin/log.c:1507
+#: builtin/log.c:1570

 msgid "inline the patch"
 msgstr ""
 
 msgid "inline the patch"
 msgstr ""
 

-#: builtin/log.c:1511
+#: builtin/log.c:1574

 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 

-#: builtin/log.c:1513
+#: builtin/log.c:1576

 msgid "signature"
 msgstr ""
 
 msgid "signature"
 msgstr ""
 

-#: builtin/log.c:1514
+#: builtin/log.c:1577

 msgid "add a signature"
 msgstr ""
 
 msgid "add a signature"
 msgstr ""
 

-#: builtin/log.c:1515
+#: builtin/log.c:1578

 msgid "base-commit"
 msgstr ""
 
 msgid "base-commit"
 msgstr ""
 

-#: builtin/log.c:1516
+#: builtin/log.c:1579

 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 

-#: builtin/log.c:1518
+#: builtin/log.c:1581

 msgid "add a signature from a file"
 msgstr ""
 
 msgid "add a signature from a file"
 msgstr ""
 

-#: builtin/log.c:1519
+#: builtin/log.c:1582

 msgid "don't print the patch filenames"
 msgstr ""
 
 msgid "don't print the patch filenames"
 msgstr ""
 

-#: builtin/log.c:1521
+#: builtin/log.c:1584

 msgid "show progress while generating patches"
 msgstr ""
 
 msgid "show progress while generating patches"
 msgstr ""
 

-#: builtin/log.c:1596
+#: builtin/log.c:1585
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1586
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1589
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1591
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1666

 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 

-#: builtin/log.c:1611
+#: builtin/log.c:1681

 msgid "-n and -k are mutually exclusive"
 msgstr ""
 
 msgid "-n and -k are mutually exclusive"
 msgstr ""
 

-#: builtin/log.c:1613
+#: builtin/log.c:1683

 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr ""
 
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr ""
 

-#: builtin/log.c:1621
+#: builtin/log.c:1691

 msgid "--name-only does not make sense"
 msgstr ""
 
 msgid "--name-only does not make sense"
 msgstr ""
 

-#: builtin/log.c:1623
+#: builtin/log.c:1693

 msgid "--name-status does not make sense"
 msgstr ""
 
 msgid "--name-status does not make sense"
 msgstr ""
 

-#: builtin/log.c:1625
+#: builtin/log.c:1695

 msgid "--check does not make sense"
 msgstr ""
 
 msgid "--check does not make sense"
 msgstr ""
 

-#: builtin/log.c:1657
+#: builtin/log.c:1727

 msgid "standard output, or directory, which one?"
 msgstr ""
 
 msgid "standard output, or directory, which one?"
 msgstr ""
 

-#: builtin/log.c:1659
+#: builtin/log.c:1729

 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 

-#: builtin/log.c:1752
-#, c-format
-msgid "unable to read signature file '%s'"
+#: builtin/log.c:1816
+msgid "--interdiff requires --cover-letter or single patch"

 msgstr ""
 
 msgstr ""
 

-#: builtin/log.c:1785
+#: builtin/log.c:1820
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1821
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1827
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1831
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1839
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1840
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1851
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1887

 msgid "Generating patches"
 msgstr ""
 
 msgid "Generating patches"
 msgstr ""
 

-#: builtin/log.c:1829
+#: builtin/log.c:1931

 msgid "Failed to create output files"
 msgstr ""
 
 msgid "Failed to create output files"
 msgstr ""
 

-#: builtin/log.c:1880
+#: builtin/log.c:1989

 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 

-#: builtin/log.c:1934
+#: builtin/log.c:2043

 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"


@@ -11285,103 +11867,103 @@ msgstr ""
 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
 
 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
 

-#: builtin/ls-files.c:518
+#: builtin/ls-files.c:525

 msgid "identify the file status with tags"
 msgstr ""
 
 msgid "identify the file status with tags"
 msgstr ""
 

-#: builtin/ls-files.c:520
+#: builtin/ls-files.c:527

 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 

-#: builtin/ls-files.c:522
+#: builtin/ls-files.c:529

 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr ""
 
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr ""
 

-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:531

 msgid "show cached files in the output (default)"
 msgstr ""
 
 msgid "show cached files in the output (default)"
 msgstr ""
 

-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:533

 msgid "show deleted files in the output"
 msgstr ""
 
 msgid "show deleted files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:535

 msgid "show modified files in the output"
 msgstr ""
 
 msgid "show modified files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:537

 msgid "show other files in the output"
 msgstr ""
 
 msgid "show other files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:539

 msgid "show ignored files in the output"
 msgstr ""
 
 msgid "show ignored files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:542

 msgid "show staged contents' object name in the output"
 msgstr ""
 
 msgid "show staged contents' object name in the output"
 msgstr ""
 

-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:544

 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 

-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:546

 msgid "show 'other' directories' names only"
 msgstr ""
 
 msgid "show 'other' directories' names only"
 msgstr ""
 

-#: builtin/ls-files.c:541
+#: builtin/ls-files.c:548

 msgid "show line endings of files"
 msgstr ""
 
 msgid "show line endings of files"
 msgstr ""
 

-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:550

 msgid "don't show empty directories"
 msgstr ""
 
 msgid "don't show empty directories"
 msgstr ""
 

-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:553

 msgid "show unmerged files in the output"
 msgstr ""
 
 msgid "show unmerged files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:555

 msgid "show resolve-undo information"
 msgstr ""
 
 msgid "show resolve-undo information"
 msgstr ""
 

-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:557

 msgid "skip files matching pattern"
 msgstr ""
 
 msgid "skip files matching pattern"
 msgstr ""
 

-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:560

 msgid "exclude patterns are read from <file>"
 msgstr ""
 
 msgid "exclude patterns are read from <file>"
 msgstr ""
 

-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:563

 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 

-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:565

 msgid "add the standard git exclusions"
 msgstr ""
 
 msgid "add the standard git exclusions"
 msgstr ""
 

-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:569

 msgid "make the output relative to the project top directory"
 msgstr ""
 
 msgid "make the output relative to the project top directory"
 msgstr ""
 

-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:572

 msgid "recurse through submodules"
 msgstr ""
 
 msgid "recurse through submodules"
 msgstr ""
 

-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:574

 msgid "if any <file> is not in the index, treat this as an error"
 msgstr ""
 
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr ""
 

-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:575

 msgid "tree-ish"
 msgstr ""
 
 msgid "tree-ish"
 msgstr ""
 

-#: builtin/ls-files.c:568
+#: builtin/ls-files.c:576

 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 

-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:578

 msgid "show debugging data"
 msgstr ""
 
 msgid "show debugging data"
 msgstr ""
 


@@ -11396,7 +11978,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr ""
 
 msgid "do not print remote URL"
 msgstr ""
 

-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:885

 msgid "exec"
 msgstr ""
 
 msgid "exec"
 msgstr ""
 


@@ -11469,180 +12051,180 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr ""
 
 msgid "empty mbox: '%s'"
 msgstr ""
 

-#: builtin/merge.c:51
+#: builtin/merge.c:52

 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 

-#: builtin/merge.c:52
+#: builtin/merge.c:53

 msgid "git merge --abort"
 msgstr ""
 
 msgid "git merge --abort"
 msgstr ""
 

-#: builtin/merge.c:53
+#: builtin/merge.c:54

 msgid "git merge --continue"
 msgstr ""
 
 msgid "git merge --continue"
 msgstr ""
 

-#: builtin/merge.c:110
+#: builtin/merge.c:111

 msgid "switch `m' requires a value"
 msgstr ""
 
 msgid "switch `m' requires a value"
 msgstr ""
 

-#: builtin/merge.c:176
+#: builtin/merge.c:177

 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 

-#: builtin/merge.c:177
+#: builtin/merge.c:178

 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 

-#: builtin/merge.c:182
+#: builtin/merge.c:183

 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 

-#: builtin/merge.c:232 builtin/pull.c:142
+#: builtin/merge.c:234 builtin/pull.c:143

 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 
 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 

-#: builtin/merge.c:235 builtin/pull.c:145
+#: builtin/merge.c:237 builtin/pull.c:146

 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 

-#: builtin/merge.c:236 builtin/pull.c:148
+#: builtin/merge.c:238 builtin/pull.c:149

 msgid "(synonym to --stat)"
 msgstr ""
 
 msgid "(synonym to --stat)"
 msgstr ""
 

-#: builtin/merge.c:238 builtin/pull.c:151
+#: builtin/merge.c:240 builtin/pull.c:152

 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 

-#: builtin/merge.c:241 builtin/pull.c:157
+#: builtin/merge.c:243 builtin/pull.c:158

 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 

-#: builtin/merge.c:243 builtin/pull.c:160
+#: builtin/merge.c:245 builtin/pull.c:161

 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 

-#: builtin/merge.c:245 builtin/pull.c:163
+#: builtin/merge.c:247 builtin/pull.c:164

 msgid "edit message before committing"
 msgstr ""
 
 msgid "edit message before committing"
 msgstr ""
 

-#: builtin/merge.c:246
+#: builtin/merge.c:248

 msgid "allow fast-forward (default)"
 msgstr ""
 
 msgid "allow fast-forward (default)"
 msgstr ""
 

-#: builtin/merge.c:248 builtin/pull.c:169
+#: builtin/merge.c:250 builtin/pull.c:170

 msgid "abort if fast-forward is not possible"
 msgstr ""
 
 msgid "abort if fast-forward is not possible"
 msgstr ""
 

-#: builtin/merge.c:252 builtin/pull.c:172
+#: builtin/merge.c:254 builtin/pull.c:173

 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 
 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 

-#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176
-#: builtin/revert.c:110
+#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
+#: builtin/rebase.c:898 builtin/rebase--interactive.c:186 builtin/revert.c:110

 msgid "strategy"
 msgstr ""
 
 msgid "strategy"
 msgstr ""
 

-#: builtin/merge.c:254 builtin/pull.c:177
+#: builtin/merge.c:256 builtin/pull.c:178

 msgid "merge strategy to use"
 msgstr ""
 
 msgid "merge strategy to use"
 msgstr ""
 

-#: builtin/merge.c:255 builtin/pull.c:180
+#: builtin/merge.c:257 builtin/pull.c:181

 msgid "option=value"
 msgstr ""
 
 msgid "option=value"
 msgstr ""
 

-#: builtin/merge.c:256 builtin/pull.c:181
+#: builtin/merge.c:258 builtin/pull.c:182

 msgid "option for selected merge strategy"
 msgstr ""
 
 msgid "option for selected merge strategy"
 msgstr ""
 

-#: builtin/merge.c:258
+#: builtin/merge.c:260

 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 

-#: builtin/merge.c:265
+#: builtin/merge.c:267

 msgid "abort the current in-progress merge"
 msgstr ""
 
 msgid "abort the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:267
+#: builtin/merge.c:269

 msgid "continue the current in-progress merge"
 msgstr ""
 
 msgid "continue the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:269 builtin/pull.c:188
+#: builtin/merge.c:271 builtin/pull.c:189

 msgid "allow merging unrelated histories"
 msgstr ""
 
 msgid "allow merging unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:275
+#: builtin/merge.c:277

 msgid "verify commit-msg hook"
 msgstr ""
 
 msgid "verify commit-msg hook"
 msgstr ""
 

-#: builtin/merge.c:300
+#: builtin/merge.c:302

 msgid "could not run stash."
 msgstr ""
 
 msgid "could not run stash."
 msgstr ""
 

-#: builtin/merge.c:305
+#: builtin/merge.c:307

 msgid "stash failed"
 msgstr ""
 
 msgid "stash failed"
 msgstr ""
 

-#: builtin/merge.c:310
+#: builtin/merge.c:312

 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 
 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 

-#: builtin/merge.c:332 builtin/merge.c:349
+#: builtin/merge.c:334 builtin/merge.c:351

 msgid "read-tree failed"
 msgstr ""
 
 msgid "read-tree failed"
 msgstr ""
 

-#: builtin/merge.c:379
+#: builtin/merge.c:381

 msgid " (nothing to squash)"
 msgstr ""
 
 msgid " (nothing to squash)"
 msgstr ""
 

-#: builtin/merge.c:390
+#: builtin/merge.c:392

 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 

-#: builtin/merge.c:440
+#: builtin/merge.c:442

 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 

-#: builtin/merge.c:491
+#: builtin/merge.c:493

 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr ""
 
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr ""
 

-#: builtin/merge.c:578
+#: builtin/merge.c:580

 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 

-#: builtin/merge.c:699
+#: builtin/merge.c:701

 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 

-#: builtin/merge.c:713
+#: builtin/merge.c:715

 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 

-#: builtin/merge.c:728
+#: builtin/merge.c:730

 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 

-#: builtin/merge.c:779
+#: builtin/merge.c:782

 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 

-#: builtin/merge.c:788
+#: builtin/merge.c:791

 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 

-#: builtin/merge.c:794
+#: builtin/merge.c:797

 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"


@@ -11652,226 +12234,206 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
 "the commit.\n"
 msgstr ""
 

-#: builtin/merge.c:830
+#: builtin/merge.c:833

 msgid "Empty commit message."
 msgstr ""
 
 msgid "Empty commit message."
 msgstr ""
 

-#: builtin/merge.c:849
+#: builtin/merge.c:852

 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 

-#: builtin/merge.c:902
+#: builtin/merge.c:905

 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 

-#: builtin/merge.c:941
+#: builtin/merge.c:944

 msgid "No current branch."
 msgstr ""
 
 msgid "No current branch."
 msgstr ""
 

-#: builtin/merge.c:943
+#: builtin/merge.c:946

 msgid "No remote for the current branch."
 msgstr ""
 
 msgid "No remote for the current branch."
 msgstr ""
 

-#: builtin/merge.c:945
+#: builtin/merge.c:948

 msgid "No default upstream defined for the current branch."
 msgstr ""
 
 msgid "No default upstream defined for the current branch."
 msgstr ""
 

-#: builtin/merge.c:950
+#: builtin/merge.c:953

 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 

-#: builtin/merge.c:1007
+#: builtin/merge.c:1010

 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 

-#: builtin/merge.c:1110
+#: builtin/merge.c:1113

 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr ""
 
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr ""
 

-#: builtin/merge.c:1144
+#: builtin/merge.c:1147

 msgid "not something we can merge"
 msgstr ""
 
 msgid "not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1247
+#: builtin/merge.c:1250

 msgid "--abort expects no arguments"
 msgstr ""
 
 msgid "--abort expects no arguments"
 msgstr ""
 

-#: builtin/merge.c:1251
+#: builtin/merge.c:1254

 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 

-#: builtin/merge.c:1263
+#: builtin/merge.c:1266

 msgid "--continue expects no arguments"
 msgstr ""
 
 msgid "--continue expects no arguments"
 msgstr ""
 

-#: builtin/merge.c:1267
+#: builtin/merge.c:1270

 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 

-#: builtin/merge.c:1283
+#: builtin/merge.c:1286

 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 

-#: builtin/merge.c:1290
+#: builtin/merge.c:1293

 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 

-#: builtin/merge.c:1293
+#: builtin/merge.c:1296

 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 

-#: builtin/merge.c:1302
+#: builtin/merge.c:1305

 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 

-#: builtin/merge.c:1310
+#: builtin/merge.c:1313

 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 

-#: builtin/merge.c:1327
+#: builtin/merge.c:1330

 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 

-#: builtin/merge.c:1329
+#: builtin/merge.c:1332

 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 

-#: builtin/merge.c:1334
+#: builtin/merge.c:1337

 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1336
+#: builtin/merge.c:1339

 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 

-#: builtin/merge.c:1370
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr ""
-
-#: builtin/merge.c:1373
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
-
-#: builtin/merge.c:1376
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr ""
-
-#: builtin/merge.c:1379
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr ""
-
-#: builtin/merge.c:1438
+#: builtin/merge.c:1421

 msgid "refusing to merge unrelated histories"
 msgstr ""
 
 msgid "refusing to merge unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:1447
+#: builtin/merge.c:1430

 msgid "Already up to date."
 msgstr ""
 
 msgid "Already up to date."
 msgstr ""
 

-#: builtin/merge.c:1457
+#: builtin/merge.c:1440

 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 

-#: builtin/merge.c:1498
+#: builtin/merge.c:1482

 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 

-#: builtin/merge.c:1505
+#: builtin/merge.c:1489

 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 

-#: builtin/merge.c:1530
+#: builtin/merge.c:1514

 msgid "Already up to date. Yeeah!"
 msgstr ""
 
 msgid "Already up to date. Yeeah!"
 msgstr ""
 

-#: builtin/merge.c:1536
+#: builtin/merge.c:1520

 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 

-#: builtin/merge.c:1559 builtin/merge.c:1638
+#: builtin/merge.c:1543 builtin/merge.c:1622

 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 

-#: builtin/merge.c:1563
+#: builtin/merge.c:1547

 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 

-#: builtin/merge.c:1629
+#: builtin/merge.c:1613

 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 

-#: builtin/merge.c:1631
+#: builtin/merge.c:1615

 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 

-#: builtin/merge.c:1640
+#: builtin/merge.c:1624

 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 

-#: builtin/merge.c:1652
+#: builtin/merge.c:1636

 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 

-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32

 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr ""
 
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr ""
 

-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33

 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr ""
 
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr ""
 

-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34

 msgid "git merge-base --independent <commit>..."
 msgstr ""
 
 msgid "git merge-base --independent <commit>..."
 msgstr ""
 

-#: builtin/merge-base.c:34
+#: builtin/merge-base.c:35

 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr ""
 
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr ""
 

-#: builtin/merge-base.c:35
+#: builtin/merge-base.c:36

 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr ""
 
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr ""
 

-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:153

 msgid "output all common ancestors"
 msgstr ""
 
 msgid "output all common ancestors"
 msgstr ""
 

-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:155

 msgid "find ancestors for a single n-way merge"
 msgstr ""
 
 msgid "find ancestors for a single n-way merge"
 msgstr ""
 

-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:157

 msgid "list revs not reachable from others"
 msgstr ""
 
 msgid "list revs not reachable from others"
 msgstr ""
 

-#: builtin/merge-base.c:227
+#: builtin/merge-base.c:159

 msgid "is the first one ancestor of the other?"
 msgstr ""
 
 msgid "is the first one ancestor of the other?"
 msgstr ""
 

-#: builtin/merge-base.c:229
+#: builtin/merge-base.c:161

 msgid "find where <commit> forked from reflog of <ref>"
 msgstr ""
 
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr ""
 


@@ -11881,35 +12443,35 @@ msgid ""
 "<orig-file> <file2>"
 msgstr ""
 
 "<orig-file> <file2>"
 msgstr ""
 

-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:35

 msgid "send results to standard output"
 msgstr ""
 
 msgid "send results to standard output"
 msgstr ""
 

-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:36

 msgid "use a diff3 based merge"
 msgstr ""
 
 msgid "use a diff3 based merge"
 msgstr ""
 

-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:37

 msgid "for conflicts, use our version"
 msgstr ""
 
 msgid "for conflicts, use our version"
 msgstr ""
 

-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:39

 msgid "for conflicts, use their version"
 msgstr ""
 
 msgid "for conflicts, use their version"
 msgstr ""
 

-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41

 msgid "for conflicts, use a union version"
 msgstr ""
 
 msgid "for conflicts, use a union version"
 msgstr ""
 

-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:44

 msgid "for conflicts, use this marker size"
 msgstr ""
 
 msgid "for conflicts, use this marker size"
 msgstr ""
 

-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:45

 msgid "do not warn about conflicts"
 msgstr ""
 
 msgid "do not warn about conflicts"
 msgstr ""
 

-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47

 msgid "set labels for file1/orig-file/file2"
 msgstr ""
 
 msgid "set labels for file1/orig-file/file2"
 msgstr ""
 


@@ -11960,6 +12522,23 @@ msgstr ""
 msgid "allow creation of more than one tree"
 msgstr ""
 
 msgid "allow creation of more than one tree"
 msgstr ""
 

+#: builtin/multi-pack-index.c:8
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:21
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:39
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:48
+#, c-format
+msgid "unrecognized verb: %s"
+msgstr ""
+

 #: builtin/mv.c:17
 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""
 #: builtin/mv.c:17
 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""


@@ -12047,7 +12626,7 @@ msgstr ""
 msgid "Renaming %s to %s\n"
 msgstr ""
 
 msgid "Renaming %s to %s\n"
 msgstr ""
 

-#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494
+#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511

 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""
 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""


@@ -12232,39 +12811,34 @@ msgstr ""
 msgid "the note contents have been left in %s"
 msgstr ""
 
 msgid "the note contents have been left in %s"
 msgstr ""
 

-#: builtin/notes.c:236 builtin/tag.c:508
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
-
-#: builtin/notes.c:238 builtin/tag.c:511
+#: builtin/notes.c:242 builtin/tag.c:513

 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
 

-#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310
-#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519
-#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669

 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr ""
 
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr ""
 

-#: builtin/notes.c:260
+#: builtin/notes.c:265

 #, c-format
 msgid "failed to read object '%s'."
 msgstr ""
 
 #, c-format
 msgid "failed to read object '%s'."
 msgstr ""
 

-#: builtin/notes.c:264
+#: builtin/notes.c:268

 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr ""
 
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr ""
 

-#: builtin/notes.c:304
+#: builtin/notes.c:309

 #, c-format
 msgid "malformed input line: '%s'."
 msgstr ""
 
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr ""
 

-#: builtin/notes.c:319
+#: builtin/notes.c:324

 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr ""
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr ""


@@ -12272,185 +12846,185 @@ msgstr ""
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.

-#: builtin/notes.c:351
+#: builtin/notes.c:356

 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 

-#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502
-#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657
-#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
+#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980

 msgid "too many parameters"
 msgstr ""
 
 msgid "too many parameters"
 msgstr ""
 

-#: builtin/notes.c:384 builtin/notes.c:670
+#: builtin/notes.c:389 builtin/notes.c:675

 #, c-format
 msgid "no note found for object %s."
 msgstr ""
 
 #, c-format
 msgid "no note found for object %s."
 msgstr ""
 

-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:410 builtin/notes.c:573

 msgid "note contents as a string"
 msgstr ""
 
 msgid "note contents as a string"
 msgstr ""
 

-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:413 builtin/notes.c:576

 msgid "note contents in a file"
 msgstr ""
 
 msgid "note contents in a file"
 msgstr ""
 

-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:416 builtin/notes.c:579

 msgid "reuse and edit specified note object"
 msgstr ""
 
 msgid "reuse and edit specified note object"
 msgstr ""
 

-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:419 builtin/notes.c:582

 msgid "reuse specified note object"
 msgstr ""
 
 msgid "reuse specified note object"
 msgstr ""
 

-#: builtin/notes.c:417 builtin/notes.c:580
+#: builtin/notes.c:422 builtin/notes.c:585

 msgid "allow storing empty note"
 msgstr ""
 
 msgid "allow storing empty note"
 msgstr ""
 

-#: builtin/notes.c:418 builtin/notes.c:489
+#: builtin/notes.c:423 builtin/notes.c:494

 msgid "replace existing notes"
 msgstr ""
 
 msgid "replace existing notes"
 msgstr ""
 

-#: builtin/notes.c:443
+#: builtin/notes.c:448

 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 

-#: builtin/notes.c:458 builtin/notes.c:537
+#: builtin/notes.c:463 builtin/notes.c:542

 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 

-#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894
+#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899

 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 

-#: builtin/notes.c:490
+#: builtin/notes.c:495

 msgid "read objects from stdin"
 msgstr ""
 
 msgid "read objects from stdin"
 msgstr ""
 

-#: builtin/notes.c:492
+#: builtin/notes.c:497

 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 

-#: builtin/notes.c:510
+#: builtin/notes.c:515

 msgid "too few parameters"
 msgstr ""
 
 msgid "too few parameters"
 msgstr ""
 

-#: builtin/notes.c:531
+#: builtin/notes.c:536

 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 

-#: builtin/notes.c:543
+#: builtin/notes.c:548

 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr ""
 
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr ""
 

-#: builtin/notes.c:595
+#: builtin/notes.c:600

 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 

-#: builtin/notes.c:690
+#: builtin/notes.c:695

 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr ""
 

-#: builtin/notes.c:692
+#: builtin/notes.c:697

 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr ""
 
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr ""
 

-#: builtin/notes.c:694
+#: builtin/notes.c:699

 msgid "failed to remove 'git notes merge' worktree"
 msgstr ""
 
 msgid "failed to remove 'git notes merge' worktree"
 msgstr ""
 

-#: builtin/notes.c:714
+#: builtin/notes.c:719

 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr ""
 

-#: builtin/notes.c:716
+#: builtin/notes.c:721

 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 

-#: builtin/notes.c:718
+#: builtin/notes.c:723

 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 

-#: builtin/notes.c:731
+#: builtin/notes.c:736

 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr ""
 
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr ""
 

-#: builtin/notes.c:734
+#: builtin/notes.c:739

 msgid "failed to finalize notes merge"
 msgstr ""
 
 msgid "failed to finalize notes merge"
 msgstr ""
 

-#: builtin/notes.c:760
+#: builtin/notes.c:765

 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr ""
 
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr ""
 

-#: builtin/notes.c:776
+#: builtin/notes.c:781

 msgid "General options"
 msgstr ""
 
 msgid "General options"
 msgstr ""
 

-#: builtin/notes.c:778
+#: builtin/notes.c:783

 msgid "Merge options"
 msgstr ""
 
 msgid "Merge options"
 msgstr ""
 

-#: builtin/notes.c:780
+#: builtin/notes.c:785

 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
 
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
 

-#: builtin/notes.c:782
+#: builtin/notes.c:787

 msgid "Committing unmerged notes"
 msgstr ""
 
 msgid "Committing unmerged notes"
 msgstr ""
 

-#: builtin/notes.c:784
+#: builtin/notes.c:789

 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 

-#: builtin/notes.c:786
+#: builtin/notes.c:791

 msgid "Aborting notes merge resolution"
 msgstr ""
 
 msgid "Aborting notes merge resolution"
 msgstr ""
 

-#: builtin/notes.c:788
+#: builtin/notes.c:793

 msgid "abort notes merge"
 msgstr ""
 
 msgid "abort notes merge"
 msgstr ""
 

-#: builtin/notes.c:799
+#: builtin/notes.c:804

 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr ""
 
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr ""
 

-#: builtin/notes.c:804
+#: builtin/notes.c:809

 msgid "must specify a notes ref to merge"
 msgstr ""
 
 msgid "must specify a notes ref to merge"
 msgstr ""
 

-#: builtin/notes.c:828
+#: builtin/notes.c:833

 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 

-#: builtin/notes.c:865
+#: builtin/notes.c:870

 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr ""
 
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr ""
 

-#: builtin/notes.c:868
+#: builtin/notes.c:873

 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 

-#: builtin/notes.c:870
+#: builtin/notes.c:875

 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "


@@ -12458,405 +13032,409 @@ msgid ""
 "abort'.\n"
 msgstr ""
 
 "abort'.\n"
 msgstr ""
 

-#: builtin/notes.c:892
+#: builtin/notes.c:897

 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 

-#: builtin/notes.c:904
+#: builtin/notes.c:909

 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 

-#: builtin/notes.c:907
+#: builtin/notes.c:912

 msgid "read object names from the standard input"
 msgstr ""
 
 msgid "read object names from the standard input"
 msgstr ""
 

-#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152
+#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164

 msgid "do not remove, show only"
 msgstr ""
 
 msgid "do not remove, show only"
 msgstr ""
 

-#: builtin/notes.c:946
+#: builtin/notes.c:951

 msgid "report pruned notes"
 msgstr ""
 
 msgid "report pruned notes"
 msgstr ""
 

-#: builtin/notes.c:988
+#: builtin/notes.c:993

 msgid "notes-ref"
 msgstr ""
 
 msgid "notes-ref"
 msgstr ""
 

-#: builtin/notes.c:989
+#: builtin/notes.c:994

 msgid "use notes from <notes-ref>"
 msgstr ""
 
 msgid "use notes from <notes-ref>"
 msgstr ""
 

-#: builtin/notes.c:1024
+#: builtin/notes.c:1029

 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
 
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
 

-#: builtin/pack-objects.c:48
+#: builtin/pack-objects.c:51

 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 

-#: builtin/pack-objects.c:49
+#: builtin/pack-objects.c:52

 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 

-#: builtin/pack-objects.c:414
+#: builtin/pack-objects.c:422

 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 

-#: builtin/pack-objects.c:425
+#: builtin/pack-objects.c:433

 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 

-#: builtin/pack-objects.c:556
+#: builtin/pack-objects.c:564

 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 

-#: builtin/pack-objects.c:756
+#: builtin/pack-objects.c:775

 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 

-#: builtin/pack-objects.c:769
+#: builtin/pack-objects.c:788

 #, c-format
 msgid "packfile is invalid: %s"
 msgstr ""
 
 #, c-format
 msgid "packfile is invalid: %s"
 msgstr ""
 

-#: builtin/pack-objects.c:773
+#: builtin/pack-objects.c:792

 #, c-format
 msgid "unable to open packfile for reuse: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to open packfile for reuse: %s"
 msgstr ""
 

-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:796

 msgid "unable to seek in reused packfile"
 msgstr ""
 
 msgid "unable to seek in reused packfile"
 msgstr ""
 

-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:807

 msgid "unable to read from reused packfile"
 msgstr ""
 
 msgid "unable to read from reused packfile"
 msgstr ""
 

-#: builtin/pack-objects.c:816
+#: builtin/pack-objects.c:835

 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 

-#: builtin/pack-objects.c:829
+#: builtin/pack-objects.c:848

 msgid "Writing objects"
 msgstr ""
 
 msgid "Writing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:891 builtin/update-index.c:88
+#: builtin/pack-objects.c:910 builtin/update-index.c:88

 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 

-#: builtin/pack-objects.c:944
+#: builtin/pack-objects.c:963

 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 

-#: builtin/pack-objects.c:1112
+#: builtin/pack-objects.c:1157

 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 

-#: builtin/pack-objects.c:1489
+#: builtin/pack-objects.c:1585

 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr ""
 
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr ""
 

-#: builtin/pack-objects.c:1498
+#: builtin/pack-objects.c:1594

 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr ""
 
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr ""
 

-#: builtin/pack-objects.c:1771
+#: builtin/pack-objects.c:1863

 msgid "Counting objects"
 msgstr ""
 
 msgid "Counting objects"
 msgstr ""
 

-#: builtin/pack-objects.c:1913
+#: builtin/pack-objects.c:1998

 #, c-format
 msgid "unable to get size of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to get size of %s"
 msgstr ""
 

-#: builtin/pack-objects.c:1928
+#: builtin/pack-objects.c:2013

 #, c-format
 msgid "unable to parse object header of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr ""
 

-#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011
-#: builtin/pack-objects.c:2021
+#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
+#: builtin/pack-objects.c:2109

 #, c-format
 msgid "object %s cannot be read"
 msgstr ""
 
 #, c-format
 msgid "object %s cannot be read"
 msgstr ""
 

-#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025
+#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113

 #, c-format
 #, c-format

-msgid "object %s inconsistent object length (%lu vs %lu)"
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"

 msgstr ""
 
 msgstr ""
 

-#: builtin/pack-objects.c:2035
+#: builtin/pack-objects.c:2123

 msgid "suboptimal pack - out of memory"
 msgstr ""
 
 msgid "suboptimal pack - out of memory"
 msgstr ""
 

-#: builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2451

 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr ""
 
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr ""
 

-#: builtin/pack-objects.c:2502
+#: builtin/pack-objects.c:2583

 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2586
+#: builtin/pack-objects.c:2670

 msgid "Compressing objects"
 msgstr ""
 
 msgid "Compressing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2676

 msgid "inconsistency with delta count"
 msgstr ""
 
 msgid "inconsistency with delta count"
 msgstr ""
 

-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2753

 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2759

 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2855

 msgid "invalid value for --missing"
 msgstr ""
 
 msgid "invalid value for --missing"
 msgstr ""
 

-#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924
+#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022

 msgid "cannot open pack index"
 msgstr ""
 
 msgid "cannot open pack index"
 msgstr ""
 

-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2945

 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 

-#: builtin/pack-objects.c:2932
+#: builtin/pack-objects.c:3030

 msgid "unable to force loose object"
 msgstr ""
 
 msgid "unable to force loose object"
 msgstr ""
 

-#: builtin/pack-objects.c:3019
+#: builtin/pack-objects.c:3120

 #, c-format
 msgid "not a rev '%s'"
 msgstr ""
 
 #, c-format
 msgid "not a rev '%s'"
 msgstr ""
 

-#: builtin/pack-objects.c:3022
+#: builtin/pack-objects.c:3123

 #, c-format
 msgid "bad revision '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad revision '%s'"
 msgstr ""
 

-#: builtin/pack-objects.c:3042
+#: builtin/pack-objects.c:3148

 msgid "unable to add recent objects"
 msgstr ""
 
 msgid "unable to add recent objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3092
+#: builtin/pack-objects.c:3201

 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 

-#: builtin/pack-objects.c:3096
+#: builtin/pack-objects.c:3205

 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 

-#: builtin/pack-objects.c:3127
+#: builtin/pack-objects.c:3235

 msgid "do not show progress meter"
 msgstr ""
 
 msgid "do not show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:3129
+#: builtin/pack-objects.c:3237

 msgid "show progress meter"
 msgstr ""
 
 msgid "show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:3131
+#: builtin/pack-objects.c:3239

 msgid "show progress meter during object writing phase"
 msgstr ""
 
 msgid "show progress meter during object writing phase"
 msgstr ""
 

-#: builtin/pack-objects.c:3134
+#: builtin/pack-objects.c:3242

 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 

-#: builtin/pack-objects.c:3135
+#: builtin/pack-objects.c:3243

 msgid "<version>[,<offset>]"
 msgstr ""
 
 msgid "<version>[,<offset>]"
 msgstr ""
 

-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3244

 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 

-#: builtin/pack-objects.c:3139
+#: builtin/pack-objects.c:3247

 msgid "maximum size of each output pack file"
 msgstr ""
 
 msgid "maximum size of each output pack file"
 msgstr ""
 

-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3249

 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 

-#: builtin/pack-objects.c:3143
+#: builtin/pack-objects.c:3251

 msgid "ignore packed objects"
 msgstr ""
 
 msgid "ignore packed objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3145
+#: builtin/pack-objects.c:3253

 msgid "limit pack window by objects"
 msgstr ""
 
 msgid "limit pack window by objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3147
+#: builtin/pack-objects.c:3255

 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 

-#: builtin/pack-objects.c:3149
+#: builtin/pack-objects.c:3257

 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 

-#: builtin/pack-objects.c:3151
+#: builtin/pack-objects.c:3259

 msgid "reuse existing deltas"
 msgstr ""
 
 msgid "reuse existing deltas"
 msgstr ""
 

-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3261

 msgid "reuse existing objects"
 msgstr ""
 
 msgid "reuse existing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3155
+#: builtin/pack-objects.c:3263

 msgid "use OFS_DELTA objects"
 msgstr ""
 
 msgid "use OFS_DELTA objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3157
+#: builtin/pack-objects.c:3265

 msgid "use threads when searching for best delta matches"
 msgstr ""
 
 msgid "use threads when searching for best delta matches"
 msgstr ""
 

-#: builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3267

 msgid "do not create an empty pack output"
 msgstr ""
 
 msgid "do not create an empty pack output"
 msgstr ""
 

-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3269

 msgid "read revision arguments from standard input"
 msgstr ""
 
 msgid "read revision arguments from standard input"
 msgstr ""
 

-#: builtin/pack-objects.c:3163
+#: builtin/pack-objects.c:3271

 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 

-#: builtin/pack-objects.c:3166
+#: builtin/pack-objects.c:3274

 msgid "include objects reachable from any reference"
 msgstr ""
 
 msgid "include objects reachable from any reference"
 msgstr ""
 

-#: builtin/pack-objects.c:3169
+#: builtin/pack-objects.c:3277

 msgid "include objects referred by reflog entries"
 msgstr ""
 
 msgid "include objects referred by reflog entries"
 msgstr ""
 

-#: builtin/pack-objects.c:3172
+#: builtin/pack-objects.c:3280

 msgid "include objects referred to by the index"
 msgstr ""
 
 msgid "include objects referred to by the index"
 msgstr ""
 

-#: builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3283

 msgid "output pack to stdout"
 msgstr ""
 
 msgid "output pack to stdout"
 msgstr ""
 

-#: builtin/pack-objects.c:3177
+#: builtin/pack-objects.c:3285

 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 

-#: builtin/pack-objects.c:3179
+#: builtin/pack-objects.c:3287

 msgid "keep unreachable objects"
 msgstr ""
 
 msgid "keep unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3181
+#: builtin/pack-objects.c:3289

 msgid "pack loose unreachable objects"
 msgstr ""
 
 msgid "pack loose unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3183
+#: builtin/pack-objects.c:3291

 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 

-#: builtin/pack-objects.c:3186
+#: builtin/pack-objects.c:3294

 msgid "create thin packs"
 msgstr ""
 
 msgid "create thin packs"
 msgstr ""
 

-#: builtin/pack-objects.c:3188
+#: builtin/pack-objects.c:3296

 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 

-#: builtin/pack-objects.c:3190
+#: builtin/pack-objects.c:3298

 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 

-#: builtin/pack-objects.c:3192
+#: builtin/pack-objects.c:3300

 msgid "ignore this pack"
 msgstr ""
 
 msgid "ignore this pack"
 msgstr ""
 

-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3302

 msgid "pack compression level"
 msgstr ""
 
 msgid "pack compression level"
 msgstr ""
 

-#: builtin/pack-objects.c:3196
+#: builtin/pack-objects.c:3304

 msgid "do not hide commits by grafts"
 msgstr ""
 
 msgid "do not hide commits by grafts"
 msgstr ""
 

-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3306

 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3200
+#: builtin/pack-objects.c:3308

 msgid "write a bitmap index together with the pack index"
 msgstr ""
 
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 

-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3311

 msgid "handling for missing objects"
 msgstr ""
 
 msgid "handling for missing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3314

 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 

-#: builtin/pack-objects.c:3230
+#: builtin/pack-objects.c:3316
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3340

 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr ""
 
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr ""
 

-#: builtin/pack-objects.c:3235
+#: builtin/pack-objects.c:3345

 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 

-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3399

 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 

-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3401

 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 

-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3406

 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 

-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3409

 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr ""
 
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr ""
 

-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3415

 msgid "cannot use --filter without --stdout"
 msgstr ""
 
 msgid "cannot use --filter without --stdout"
 msgstr ""
 

-#: builtin/pack-objects.c:3363
+#: builtin/pack-objects.c:3474

 msgid "Enumerating objects"
 msgstr ""
 
 msgid "Enumerating objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3382
+#: builtin/pack-objects.c:3493

 #, c-format
 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
 msgstr ""
 #, c-format
 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
 msgstr ""


@@ -12897,70 +13475,74 @@ msgstr ""
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 

-#: builtin/prune.c:128
+#: builtin/prune.c:129

 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 

-#: builtin/pull.c:59 builtin/pull.c:61
+#: builtin/pull.c:60 builtin/pull.c:62

 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr ""
 

-#: builtin/pull.c:81
+#: builtin/pull.c:82

 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 

-#: builtin/pull.c:132
+#: builtin/pull.c:133

 msgid "control for recursive fetching of submodules"
 msgstr ""
 
 msgid "control for recursive fetching of submodules"
 msgstr ""
 

-#: builtin/pull.c:136
+#: builtin/pull.c:137

 msgid "Options related to merging"
 msgstr ""
 
 msgid "Options related to merging"
 msgstr ""
 

-#: builtin/pull.c:139
+#: builtin/pull.c:140

 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 
 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 

-#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122
+#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122

 msgid "allow fast-forward"
 msgstr ""
 
 msgid "allow fast-forward"
 msgstr ""
 

-#: builtin/pull.c:175
+#: builtin/pull.c:176

 msgid "automatically stash/stash pop before and after rebase"
 msgstr ""
 
 msgid "automatically stash/stash pop before and after rebase"
 msgstr ""
 

-#: builtin/pull.c:191
+#: builtin/pull.c:192

 msgid "Options related to fetching"
 msgstr ""
 
 msgid "Options related to fetching"
 msgstr ""
 

-#: builtin/pull.c:209
+#: builtin/pull.c:202
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:210

 msgid "number of submodules pulled in parallel"
 msgstr ""
 
 msgid "number of submodules pulled in parallel"
 msgstr ""
 

-#: builtin/pull.c:304
+#: builtin/pull.c:305

 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 

-#: builtin/pull.c:420
+#: builtin/pull.c:421

 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 

-#: builtin/pull.c:422
+#: builtin/pull.c:423

 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 

-#: builtin/pull.c:423
+#: builtin/pull.c:424

 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
 
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
 

-#: builtin/pull.c:426
+#: builtin/pull.c:427

 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"


@@ -12968,69 +13550,74 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 

-#: builtin/pull.c:431 git-parse-remote.sh:73
+#: builtin/pull.c:432 builtin/rebase.c:760 git-parse-remote.sh:73

 msgid "You are not currently on a branch."
 msgstr ""
 
 msgid "You are not currently on a branch."
 msgstr ""
 

-#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
+#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79

 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 

-#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
+#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82

 msgid "Please specify which branch you want to merge with."
 msgstr ""
 
 msgid "Please specify which branch you want to merge with."
 msgstr ""
 

-#: builtin/pull.c:436 builtin/pull.c:451
+#: builtin/pull.c:437 builtin/pull.c:452

 msgid "See git-pull(1) for details."
 msgstr ""
 
 msgid "See git-pull(1) for details."
 msgstr ""
 

-#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
-#: git-parse-remote.sh:64
+#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
+#: builtin/rebase.c:766 git-parse-remote.sh:64

 msgid "<remote>"
 msgstr ""
 
 msgid "<remote>"
 msgstr ""
 

-#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576
-#: git-parse-remote.sh:65
+#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
+#: git-legacy-rebase.sh:548 git-parse-remote.sh:65

 msgid "<branch>"
 msgstr ""
 
 msgid "<branch>"
 msgstr ""
 

-#: builtin/pull.c:446 git-parse-remote.sh:75
+#: builtin/pull.c:447 builtin/rebase.c:758 git-parse-remote.sh:75

 msgid "There is no tracking information for the current branch."
 msgstr ""
 
 msgid "There is no tracking information for the current branch."
 msgstr ""
 

-#: builtin/pull.c:455 git-parse-remote.sh:95
+#: builtin/pull.c:456 git-parse-remote.sh:95

 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 

-#: builtin/pull.c:460
+#: builtin/pull.c:461

 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
 

-#: builtin/pull.c:829
+#: builtin/pull.c:565
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:843

 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 

-#: builtin/pull.c:877
+#: builtin/pull.c:891

 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 

-#: builtin/pull.c:885
+#: builtin/pull.c:899

 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 

-#: builtin/pull.c:888
+#: builtin/pull.c:902

 msgid "pull with rebase"
 msgstr ""
 
 msgid "pull with rebase"
 msgstr ""
 

-#: builtin/pull.c:889
+#: builtin/pull.c:903

 msgid "please commit or stash them."
 msgstr ""
 
 msgid "please commit or stash them."
 msgstr ""
 

-#: builtin/pull.c:914
+#: builtin/pull.c:928

 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"


@@ -13038,7 +13625,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
 "commit %s."
 msgstr ""
 

-#: builtin/pull.c:919
+#: builtin/pull.c:934

 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"


@@ -13049,15 +13636,15 @@ msgid ""
 "to recover."
 msgstr ""
 
 "to recover."
 msgstr ""
 

-#: builtin/pull.c:934
+#: builtin/pull.c:949

 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 

-#: builtin/pull.c:938
+#: builtin/pull.c:953

 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 

-#: builtin/pull.c:945
+#: builtin/pull.c:960

 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 


@@ -13308,24 +13895,24 @@ msgstr ""
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr ""
 
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr ""
 

-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:21

 msgid "Percentage by which creation is weighted"
 msgstr ""
 
 msgid "Percentage by which creation is weighted"
 msgstr ""
 

-#: builtin/range-diff.c:28
+#: builtin/range-diff.c:23

 msgid "use simple diff colors"
 msgstr ""
 
 msgid "use simple diff colors"
 msgstr ""
 

-#: builtin/range-diff.c:75 builtin/range-diff.c:79
+#: builtin/range-diff.c:61 builtin/range-diff.c:65

 #, c-format
 msgid "no .. in range: '%s'"
 msgstr ""
 
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr ""
 

-#: builtin/range-diff.c:89
+#: builtin/range-diff.c:75

 msgid "single arg format must be symmetric range"
 msgstr ""
 
 msgid "single arg format must be symmetric range"
 msgstr ""
 

-#: builtin/range-diff.c:104
+#: builtin/range-diff.c:90

 msgid "need two commit ranges"
 msgstr ""
 
 msgid "need two commit ranges"
 msgstr ""
 


@@ -13336,342 +13923,855 @@ msgid ""
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 

-#: builtin/read-tree.c:120
+#: builtin/read-tree.c:123

 msgid "write resulting index to <file>"
 msgstr ""
 
 msgid "write resulting index to <file>"
 msgstr ""
 

-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:126

 msgid "only empty the index"
 msgstr ""
 
 msgid "only empty the index"
 msgstr ""
 

-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:128

 msgid "Merging"
 msgstr ""
 
 msgid "Merging"
 msgstr ""
 

-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:130

 msgid "perform a merge in addition to a read"
 msgstr ""
 
 msgid "perform a merge in addition to a read"
 msgstr ""
 

-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:132

 msgid "3-way merge if no file level merging required"
 msgstr ""
 
 msgid "3-way merge if no file level merging required"
 msgstr ""
 

-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:134

 msgid "3-way merge in presence of adds and removes"
 msgstr ""
 
 msgid "3-way merge in presence of adds and removes"
 msgstr ""
 

-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:136

 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 
 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 

-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:137

 msgid "<subdirectory>/"
 msgstr ""
 
 msgid "<subdirectory>/"
 msgstr ""
 

-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:138

 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 
 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 

-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:141

 msgid "update working tree with merge result"
 msgstr ""
 
 msgid "update working tree with merge result"
 msgstr ""
 

-#: builtin/read-tree.c:140
+#: builtin/read-tree.c:143

 msgid "gitignore"
 msgstr ""
 
 msgid "gitignore"
 msgstr ""
 

-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:144

 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 
 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 

-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:147

 msgid "don't check the working tree after merging"
 msgstr ""
 
 msgid "don't check the working tree after merging"
 msgstr ""
 

-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:148

 msgid "don't update the index or the work tree"
 msgstr ""
 
 msgid "don't update the index or the work tree"
 msgstr ""
 

-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:150

 msgid "skip applying sparse checkout filter"
 msgstr ""
 
 msgid "skip applying sparse checkout filter"
 msgstr ""
 

-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:152

 msgid "debug unpack-trees"
 msgstr ""
 
 msgid "debug unpack-trees"
 msgstr ""
 

-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
-msgstr ""
-
-#: builtin/rebase--helper.c:24
-msgid "keep empty commits"
-msgstr ""
-
-#: builtin/rebase--helper.c:26 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr ""
-
-#: builtin/rebase--helper.c:27
-msgid "rebase merge commits"
-msgstr ""
-
-#: builtin/rebase--helper.c:29
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase--helper.c:30
-msgid "continue rebase"
+#: builtin/rebase.c:29
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:32
-msgid "abort rebase"
+#: builtin/rebase.c:31
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:35
-msgid "make rebase script"
+#: builtin/rebase.c:33
+msgid "git rebase --continue | --abort | --skip | --edit-todo"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:37
-msgid "shorten commit ids in the todo list"
+#: builtin/rebase.c:119
+#, c-format
+msgid "%s requires an interactive rebase"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:39
-msgid "expand commit ids in the todo list"
+#: builtin/rebase.c:171
+#, c-format
+msgid "could not get 'onto': '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:41
-msgid "check the todo list"
+#: builtin/rebase.c:186
+#, c-format
+msgid "invalid orig-head: '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:43
-msgid "skip unnecessary picks"
+#: builtin/rebase.c:214
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:45
-msgid "rearrange fixup/squash lines"
+#: builtin/rebase.c:259
+#, c-format
+msgid "Could not read '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:47
-msgid "insert exec commands in todo list"
+#: builtin/rebase.c:277
+#, c-format
+msgid "Cannot store %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase--helper.c:68
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#: builtin/rebase.c:337
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."

 msgstr ""
 
 msgstr ""
 

-#: builtin/receive-pack.c:32
-msgid "git receive-pack <git-dir>"
+#: builtin/rebase.c:561
+msgid "could not determine HEAD revision"

 msgstr ""
 
 msgstr ""
 

-#: builtin/receive-pack.c:830
+#: builtin/rebase.c:752
+#, c-format

 msgid ""
 msgid ""

-"By default, updating the current branch in a non-bare repository\n"
-"is denied, because it will make the index and work tree inconsistent\n"
-"with what you pushed, and will require 'git reset --hard' to match\n"
-"the work tree to HEAD.\n"
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"

 "\n"
 "\n"

-"You can set the 'receive.denyCurrentBranch' configuration variable\n"
-"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
-"its current branch; however, this is not recommended unless you\n"
-"arranged to update its work tree to match what you pushed in some\n"
-"other way.\n"
+"    git rebase '<branch>'\n"

 "\n"
 "\n"

-"To squelch this message and still keep the default behaviour, set\n"
-"'receive.denyCurrentBranch' configuration variable to 'refuse'."

 msgstr ""
 
 msgstr ""
 

-#: builtin/receive-pack.c:850
+#: builtin/rebase.c:768
+#, c-format

 msgid ""
 msgid ""

-"By default, deleting the current branch is denied, because the next\n"
-"'git clone' won't result in any file checked out, causing confusion.\n"
+"If you wish to set tracking information for this branch you can do so with:\n"

 "\n"
 "\n"

-"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
-"'warn' or 'ignore' in the remote repository to allow deleting the\n"
-"current branch, with or without a warning message.\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"

 "\n"
 "\n"

-"To squelch this message, you can set it to 'refuse'."
-msgstr ""
-
-#: builtin/receive-pack.c:1923
-msgid "quiet"
-msgstr ""
-
-#: builtin/receive-pack.c:1937
-msgid "You must specify a directory."

 msgstr ""
 
 msgstr ""
 

-#: builtin/reflog.c:536 builtin/reflog.c:541
-#, c-format
-msgid "'%s' is not a valid timestamp"
+#: builtin/rebase.c:814
+msgid "rebase onto given branch instead of upstream"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:15
-msgid "git remote [-v | --verbose]"
+#: builtin/rebase.c:816
+msgid "allow pre-rebase hook to run"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:16
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+#: builtin/rebase.c:818
+msgid "be quiet. implies --no-stat"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:17 builtin/remote.c:37
-msgid "git remote rename <old> <new>"
+#: builtin/rebase.c:821
+msgid "display a diffstat of what changed upstream"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:18 builtin/remote.c:42
-msgid "git remote remove <name>"
+#: builtin/rebase.c:824
+msgid "do not show diffstat of what changed upstream"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:19 builtin/remote.c:47
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/rebase.c:827
+msgid "add a Signed-off-by: line to each commit"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:20
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/rebase.c:829 builtin/rebase.c:833 builtin/rebase.c:835
+msgid "passed to 'git am'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:21
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/rebase.c:837 builtin/rebase.c:839
+msgid "passed to 'git apply'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:22
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/rebase.c:841 builtin/rebase.c:844
+msgid "cherry-pick all commits, even if unchanged"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:23
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/rebase.c:846
+msgid "continue"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:24 builtin/remote.c:73
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/rebase.c:849
+msgid "skip current patch and continue"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:25 builtin/remote.c:78
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/rebase.c:851
+msgid "abort and check out the original branch"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:26 builtin/remote.c:79
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/rebase.c:854
+msgid "abort but keep HEAD where it is"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:27 builtin/remote.c:80
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/rebase.c:855
+msgid "edit the todo list during an interactive rebase"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:32
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/rebase.c:858
+msgid "show the patch file being applied or merged"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:52
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/rebase.c:861
+msgid "use merging strategies to rebase"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:53
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/rebase.c:865
+msgid "let the user edit the list of commits to rebase"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:58
-msgid "git remote show [<options>] <name>"
+#: builtin/rebase.c:869
+msgid "try to recreate merges instead of ignoring them"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:63
-msgid "git remote prune [<options>] <name>"
+#: builtin/rebase.c:873
+msgid "allow rerere to update index  with resolved conflict"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:68
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/rebase.c:876
+msgid "preserve empty commits during rebase"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:97
-#, c-format
-msgid "Updating %s"
+#: builtin/rebase.c:878
+msgid "move commits that begin with squash!/fixup! under -i"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:129
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/rebase.c:884
+msgid "automatically stash/stash pop before and after"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:146
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/rebase.c:886
+msgid "add exec lines after each commit of the editable list"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:162
-msgid "fetch the remote branches"
+#: builtin/rebase.c:890
+msgid "allow rebasing commits with empty messages"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:164
-msgid "import all tags and associated objects when fetching"
+#: builtin/rebase.c:893
+msgid "try to rebase merges instead of skipping them"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:167
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/rebase.c:896
+msgid "use 'merge-base --fork-point' to refine upstream"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:169
-msgid "branch(es) to track"
+#: builtin/rebase.c:898
+msgid "use the given merge strategy"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:170
-msgid "master branch"
+#: builtin/rebase.c:900 builtin/revert.c:111
+msgid "option"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:172
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/rebase.c:901
+msgid "pass the argument through to the merge strategy"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:184
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/rebase.c:904
+msgid "rebase all reachable commits up to the root(s)"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:186
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/rebase.c:920
+#, c-format
+msgid "could not exec %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:193 builtin/remote.c:635
-#, c-format
-msgid "remote %s already exists."
+#: builtin/rebase.c:938 git-legacy-rebase.sh:213
+msgid "It looks like 'git am' is in progress. Cannot rebase."

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:197 builtin/remote.c:639
-#, c-format
-msgid "'%s' is not a valid remote name"
+#: builtin/rebase.c:979 git-legacy-rebase.sh:387
+msgid "No rebase in progress?"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:237
-#, c-format
-msgid "Could not setup master '%s'"
+#: builtin/rebase.c:982 git-legacy-rebase.sh:398
+msgid "The --edit-todo action can only be used during interactive rebase."

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:343
-#, c-format
-msgid "Could not get fetch map for refspec %s"
+#: builtin/rebase.c:995 git-legacy-rebase.sh:405
+msgid "Cannot read HEAD"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:442 builtin/remote.c:450
-msgid "(matching)"
+#: builtin/rebase.c:1008 git-legacy-rebase.sh:408
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:454
-msgid "(delete)"
+#: builtin/rebase.c:1026
+msgid "could not discard worktree changes"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863
+#: builtin/rebase.c:1044

 #, c-format
 #, c-format

-msgid "No such remote: %s"
+msgid "could not move back to %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:645
+#: builtin/rebase.c:1055 builtin/rm.c:368

 #, c-format
 #, c-format

-msgid "Could not rename config section '%s' to '%s'"
+msgid "could not remove '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/remote.c:665
+#: builtin/rebase.c:1081
+#, c-format
+msgid ""
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase.  If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+
+#: builtin/rebase.c:1102
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1139
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1161
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1204
+#, c-format
+msgid ""
+"error: cannot combine interactive options (--interactive, --exec, --rebase-"
+"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
+"(%s)"
+msgstr ""
+
+#: builtin/rebase.c:1209
+#, c-format
+msgid ""
+"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
+"with am options (%s)"
+msgstr ""
+
+#: builtin/rebase.c:1229 git-legacy-rebase.sh:528
+msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1234 git-legacy-rebase.sh:534
+msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1237 git-legacy-rebase.sh:536
+msgid "error: cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1261
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1267
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1285
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1292
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1317
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1325 builtin/submodule--helper.c:37
+#: builtin/submodule--helper.c:1930
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/rebase.c:1337
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1377 git-legacy-rebase.sh:657
+msgid "Cannot autostash"
+msgstr ""
+
+#: builtin/rebase.c:1380
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1386
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1389
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1392
+msgid "could not reset --hard"
+msgstr ""
+
+#: builtin/rebase.c:1393 builtin/reset.c:113
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/rebase.c:1409 git-legacy-rebase.sh:666
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:1436
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1447
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:1458 git-legacy-rebase.sh:689
+#, sh-format
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:1460
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:1468 git-legacy-rebase.sh:699
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:1470
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:1478 git-legacy-rebase.sh:208
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:1484
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1507
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:1513
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1522
+#, c-format
+msgid "Fast-forwarded %s to %s. \n"
+msgstr ""
+
+#: builtin/rebase--interactive.c:24
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase--interactive.c:51
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:57
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase--interactive.c:101
+#, c-format
+msgid "could not open %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:114
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:129
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase--interactive.c:148
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:150 builtin/revert.c:124
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase--interactive.c:151
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:153
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase--interactive.c:155
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase--interactive.c:156
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:158
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase--interactive.c:160
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:161
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:163
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase--interactive.c:166
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:168
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:170
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:172
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase--interactive.c:174
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:175
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:178
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:181
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:182
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:182
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:187
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase--interactive.c:188
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase--interactive.c:189
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase--interactive.c:190
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase--interactive.c:191
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:193
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase--interactive.c:193
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase--interactive.c:220
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase--interactive.c:226
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:830
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:850
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:1929
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1943
+msgid "You must specify a directory."
+msgstr ""
+
+#: builtin/reflog.c:563 builtin/reflog.c:568
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr ""
+
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:23
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
+msgstr ""
+
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:170
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:171
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:194 builtin/remote.c:636
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:198 builtin/remote.c:640
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/remote.c:238
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:344
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:443 builtin/remote.c:451
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:455
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#, c-format
+msgid "No such remote: '%s'"
+msgstr ""
+
+#: builtin/remote.c:646
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:666

 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"


@@ -13679,17 +14779,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 

-#: builtin/remote.c:701
+#: builtin/remote.c:702

 #, c-format
 msgid "deleting '%s' failed"
 msgstr ""
 
 #, c-format
 msgid "deleting '%s' failed"
 msgstr ""
 

-#: builtin/remote.c:735
+#: builtin/remote.c:736

 #, c-format
 msgid "creating '%s' failed"
 msgstr ""
 
 #, c-format
 msgid "creating '%s' failed"
 msgstr ""
 

-#: builtin/remote.c:801
+#: builtin/remote.c:802

 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"


@@ -13699,118 +14799,118 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:815
+#: builtin/remote.c:816

 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 

-#: builtin/remote.c:916
+#: builtin/remote.c:917

 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 

-#: builtin/remote.c:919
+#: builtin/remote.c:920

 msgid " tracked"
 msgstr ""
 
 msgid " tracked"
 msgstr ""
 

-#: builtin/remote.c:921
+#: builtin/remote.c:922

 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 

-#: builtin/remote.c:923
+#: builtin/remote.c:924

 msgid " ???"
 msgstr ""
 
 msgid " ???"
 msgstr ""
 

-#: builtin/remote.c:964
+#: builtin/remote.c:965

 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 

-#: builtin/remote.c:973
+#: builtin/remote.c:974

 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr ""
 
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr ""
 

-#: builtin/remote.c:975
+#: builtin/remote.c:976

 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 

-#: builtin/remote.c:978
+#: builtin/remote.c:979

 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 
 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 

-#: builtin/remote.c:982
+#: builtin/remote.c:983

 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 
 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 

-#: builtin/remote.c:985
+#: builtin/remote.c:986

 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 
 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 

-#: builtin/remote.c:988
+#: builtin/remote.c:989

 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr ""
 
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr ""
 

-#: builtin/remote.c:1031
+#: builtin/remote.c:1032

 msgid "create"
 msgstr ""
 
 msgid "create"
 msgstr ""
 

-#: builtin/remote.c:1034
+#: builtin/remote.c:1035

 msgid "delete"
 msgstr ""
 
 msgid "delete"
 msgstr ""
 

-#: builtin/remote.c:1038
+#: builtin/remote.c:1039

 msgid "up to date"
 msgstr ""
 
 msgid "up to date"
 msgstr ""
 

-#: builtin/remote.c:1041
+#: builtin/remote.c:1042

 msgid "fast-forwardable"
 msgstr ""
 
 msgid "fast-forwardable"
 msgstr ""
 

-#: builtin/remote.c:1044
+#: builtin/remote.c:1045

 msgid "local out of date"
 msgstr ""
 
 msgid "local out of date"
 msgstr ""
 

-#: builtin/remote.c:1051
+#: builtin/remote.c:1052

 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 

-#: builtin/remote.c:1054
+#: builtin/remote.c:1055

 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 

-#: builtin/remote.c:1058
+#: builtin/remote.c:1059

 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 

-#: builtin/remote.c:1061
+#: builtin/remote.c:1062

 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 

-#: builtin/remote.c:1129
+#: builtin/remote.c:1130

 msgid "do not query remotes"
 msgstr ""
 
 msgid "do not query remotes"
 msgstr ""
 

-#: builtin/remote.c:1156
+#: builtin/remote.c:1157

 #, c-format
 msgid "* remote %s"
 msgstr ""
 
 #, c-format
 msgid "* remote %s"
 msgstr ""
 

-#: builtin/remote.c:1157
+#: builtin/remote.c:1158

 #, c-format
 msgid "  Fetch URL: %s"
 msgstr ""
 
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr ""
 

-#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314

 msgid "(no URL)"
 msgstr ""
 
 msgid "(no URL)"
 msgstr ""
 


@@ -13818,283 +14918,287 @@ msgstr ""
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.

-#: builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1173 builtin/remote.c:1175

 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 
 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 

-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181

 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 

-#: builtin/remote.c:1176
+#: builtin/remote.c:1177

 msgid "(not queried)"
 msgstr ""
 
 msgid "(not queried)"
 msgstr ""
 

-#: builtin/remote.c:1178
+#: builtin/remote.c:1179

 msgid "(unknown)"
 msgstr ""
 
 msgid "(unknown)"
 msgstr ""
 

-#: builtin/remote.c:1182
+#: builtin/remote.c:1183

 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 

-#: builtin/remote.c:1194
+#: builtin/remote.c:1195

 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:1197 builtin/remote.c:1223
+#: builtin/remote.c:1198 builtin/remote.c:1224

 msgid " (status not queried)"
 msgstr ""
 
 msgid " (status not queried)"
 msgstr ""
 

-#: builtin/remote.c:1206
+#: builtin/remote.c:1207

 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:1214
+#: builtin/remote.c:1215

 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 

-#: builtin/remote.c:1220
+#: builtin/remote.c:1221

 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:1241
+#: builtin/remote.c:1242

 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 

-#: builtin/remote.c:1243
+#: builtin/remote.c:1244

 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 

-#: builtin/remote.c:1258
+#: builtin/remote.c:1259

 msgid "Cannot determine remote HEAD"
 msgstr ""
 
 msgid "Cannot determine remote HEAD"
 msgstr ""
 

-#: builtin/remote.c:1260
+#: builtin/remote.c:1261

 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 

-#: builtin/remote.c:1270
+#: builtin/remote.c:1271

 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 
 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 

-#: builtin/remote.c:1278
+#: builtin/remote.c:1279

 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 

-#: builtin/remote.c:1280
+#: builtin/remote.c:1281

 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 
 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 

-#: builtin/remote.c:1298
+#: builtin/remote.c:1299

 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 

-#: builtin/remote.c:1299
+#: builtin/remote.c:1300

 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 

-#: builtin/remote.c:1309
+#: builtin/remote.c:1310

 #, c-format
 msgid "Pruning %s"
 msgstr ""
 
 #, c-format
 msgid "Pruning %s"
 msgstr ""
 

-#: builtin/remote.c:1310
+#: builtin/remote.c:1311

 #, c-format
 msgid "URL: %s"
 msgstr ""
 
 #, c-format
 msgid "URL: %s"
 msgstr ""
 

-#: builtin/remote.c:1326
+#: builtin/remote.c:1327

 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 

-#: builtin/remote.c:1329
+#: builtin/remote.c:1330

 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 

-#: builtin/remote.c:1374
+#: builtin/remote.c:1375

 msgid "prune remotes after fetching"
 msgstr ""
 
 msgid "prune remotes after fetching"
 msgstr ""
 

-#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560

 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 
 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 

-#: builtin/remote.c:1453
+#: builtin/remote.c:1454

 msgid "add branch"
 msgstr ""
 
 msgid "add branch"
 msgstr ""
 

-#: builtin/remote.c:1460
+#: builtin/remote.c:1461

 msgid "no remote specified"
 msgstr ""
 
 msgid "no remote specified"
 msgstr ""
 

-#: builtin/remote.c:1477
+#: builtin/remote.c:1478

 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 
 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 

-#: builtin/remote.c:1479
+#: builtin/remote.c:1480

 msgid "return all URLs"
 msgstr ""
 
 msgid "return all URLs"
 msgstr ""
 

-#: builtin/remote.c:1507
+#: builtin/remote.c:1508

 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 

-#: builtin/remote.c:1533
+#: builtin/remote.c:1534

 msgid "manipulate push URLs"
 msgstr ""
 
 msgid "manipulate push URLs"
 msgstr ""
 

-#: builtin/remote.c:1535
+#: builtin/remote.c:1536

 msgid "add URL"
 msgstr ""
 
 msgid "add URL"
 msgstr ""
 

-#: builtin/remote.c:1537
+#: builtin/remote.c:1538

 msgid "delete URLs"
 msgstr ""
 
 msgid "delete URLs"
 msgstr ""
 

-#: builtin/remote.c:1544
+#: builtin/remote.c:1545

 msgid "--add --delete doesn't make sense"
 msgstr ""
 
 msgid "--add --delete doesn't make sense"
 msgstr ""
 

-#: builtin/remote.c:1583
+#: builtin/remote.c:1584

 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 

-#: builtin/remote.c:1591
+#: builtin/remote.c:1592

 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 

-#: builtin/remote.c:1593
+#: builtin/remote.c:1594

 msgid "Will not delete all non-push URLs"
 msgstr ""
 
 msgid "Will not delete all non-push URLs"
 msgstr ""
 

-#: builtin/remote.c:1609
+#: builtin/remote.c:1610

 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 
 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 

-#: builtin/remote.c:1640
+#: builtin/remote.c:1641

 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr ""
 
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr ""
 

-#: builtin/repack.c:20
+#: builtin/repack.c:22

 msgid "git repack [<options>]"
 msgstr ""
 
 msgid "git repack [<options>]"
 msgstr ""
 

-#: builtin/repack.c:25
+#: builtin/repack.c:27

 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 

-#: builtin/repack.c:287
+#: builtin/repack.c:294

 msgid "pack everything in a single pack"
 msgstr ""
 
 msgid "pack everything in a single pack"
 msgstr ""
 

-#: builtin/repack.c:289
+#: builtin/repack.c:296

 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 

-#: builtin/repack.c:292
+#: builtin/repack.c:299

 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 

-#: builtin/repack.c:294
+#: builtin/repack.c:301

 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:296
+#: builtin/repack.c:303

 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:298
+#: builtin/repack.c:305

 msgid "do not run git-update-server-info"
 msgstr ""
 
 msgid "do not run git-update-server-info"
 msgstr ""
 

-#: builtin/repack.c:301
+#: builtin/repack.c:308

 msgid "pass --local to git-pack-objects"
 msgstr ""
 
 msgid "pass --local to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:303
+#: builtin/repack.c:310

 msgid "write bitmap index"
 msgstr ""
 
 msgid "write bitmap index"
 msgstr ""
 

-#: builtin/repack.c:304
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313

 msgid "approxidate"
 msgstr ""
 
 msgid "approxidate"
 msgstr ""
 

-#: builtin/repack.c:305
+#: builtin/repack.c:314

 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 

-#: builtin/repack.c:307
+#: builtin/repack.c:316

 msgid "with -a, repack unreachable objects"
 msgstr ""
 
 msgid "with -a, repack unreachable objects"
 msgstr ""
 

-#: builtin/repack.c:309
+#: builtin/repack.c:318

 msgid "size of the window used for delta compression"
 msgstr ""
 
 msgid "size of the window used for delta compression"
 msgstr ""
 

-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:319 builtin/repack.c:325

 msgid "bytes"
 msgstr ""
 
 msgid "bytes"
 msgstr ""
 

-#: builtin/repack.c:311
+#: builtin/repack.c:320

 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 

-#: builtin/repack.c:313
+#: builtin/repack.c:322

 msgid "limits the maximum delta depth"
 msgstr ""
 
 msgid "limits the maximum delta depth"
 msgstr ""
 

-#: builtin/repack.c:315
+#: builtin/repack.c:324

 msgid "limits the maximum number of threads"
 msgstr ""
 
 msgid "limits the maximum number of threads"
 msgstr ""
 

-#: builtin/repack.c:317
+#: builtin/repack.c:326

 msgid "maximum size of each packfile"
 msgstr ""
 
 msgid "maximum size of each packfile"
 msgstr ""
 

-#: builtin/repack.c:319
+#: builtin/repack.c:328

 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 

-#: builtin/repack.c:321
+#: builtin/repack.c:330

 msgid "do not repack this pack"
 msgstr ""
 
 msgid "do not repack this pack"
 msgstr ""
 

-#: builtin/repack.c:331
+#: builtin/repack.c:340

 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 

-#: builtin/repack.c:335
+#: builtin/repack.c:344

 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 

-#: builtin/repack.c:510 builtin/worktree.c:140
+#: builtin/repack.c:527

 #, c-format
 msgid "failed to remove '%s'"
 msgstr ""
 #, c-format
 msgid "failed to remove '%s'"
 msgstr ""


@@ -14123,7 +15227,7 @@ msgstr ""
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 

-#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206
+#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206

 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr ""
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr ""


@@ -14342,173 +15446,186 @@ msgstr ""
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 

-#: builtin/rerere.c:59
+#: builtin/rerere.c:60

 msgid "register clean resolutions in index"
 msgstr ""
 
 msgid "register clean resolutions in index"
 msgstr ""
 

-#: builtin/reset.c:29
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:111
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:31

 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 

-#: builtin/reset.c:30
+#: builtin/reset.c:32

 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr ""
 
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr ""
 

-#: builtin/reset.c:31
+#: builtin/reset.c:33

 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr ""
 
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr ""
 

-#: builtin/reset.c:37
+#: builtin/reset.c:39

 msgid "mixed"
 msgstr ""
 
 msgid "mixed"
 msgstr ""
 

-#: builtin/reset.c:37
+#: builtin/reset.c:39

 msgid "soft"
 msgstr ""
 
 msgid "soft"
 msgstr ""
 

-#: builtin/reset.c:37
+#: builtin/reset.c:39

 msgid "hard"
 msgstr ""
 
 msgid "hard"
 msgstr ""
 

-#: builtin/reset.c:37
+#: builtin/reset.c:39

 msgid "merge"
 msgstr ""
 
 msgid "merge"
 msgstr ""
 

-#: builtin/reset.c:37
+#: builtin/reset.c:39

 msgid "keep"
 msgstr ""
 
 msgid "keep"
 msgstr ""
 

-#: builtin/reset.c:78
+#: builtin/reset.c:80

 msgid "You do not have a valid HEAD."
 msgstr ""
 
 msgid "You do not have a valid HEAD."
 msgstr ""
 

-#: builtin/reset.c:80
+#: builtin/reset.c:82

 msgid "Failed to find tree of HEAD."
 msgstr ""
 
 msgid "Failed to find tree of HEAD."
 msgstr ""
 

-#: builtin/reset.c:86
+#: builtin/reset.c:88

 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 

-#: builtin/reset.c:111
-#, c-format
-msgid "HEAD is now at %s"
-msgstr ""
-
-#: builtin/reset.c:189
+#: builtin/reset.c:192

 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 

-#: builtin/reset.c:289
+#: builtin/reset.c:292

 msgid "be quiet, only report errors"
 msgstr ""
 
 msgid "be quiet, only report errors"
 msgstr ""
 

-#: builtin/reset.c:291
+#: builtin/reset.c:294

 msgid "reset HEAD and index"
 msgstr ""
 
 msgid "reset HEAD and index"
 msgstr ""
 

-#: builtin/reset.c:292
+#: builtin/reset.c:295

 msgid "reset only HEAD"
 msgstr ""
 
 msgid "reset only HEAD"
 msgstr ""
 

-#: builtin/reset.c:294 builtin/reset.c:296
+#: builtin/reset.c:297 builtin/reset.c:299

 msgid "reset HEAD, index and working tree"
 msgstr ""
 
 msgid "reset HEAD, index and working tree"
 msgstr ""
 

-#: builtin/reset.c:298
+#: builtin/reset.c:301

 msgid "reset HEAD but keep local changes"
 msgstr ""
 
 msgid "reset HEAD but keep local changes"
 msgstr ""
 

-#: builtin/reset.c:304
+#: builtin/reset.c:307

 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 

-#: builtin/reset.c:321
+#: builtin/reset.c:325

 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 

-#: builtin/reset.c:329
+#: builtin/reset.c:333

 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 

-#: builtin/reset.c:338
+#: builtin/reset.c:342

 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 

-#: builtin/reset.c:347
+#: builtin/reset.c:351

 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 

-#: builtin/reset.c:349
+#: builtin/reset.c:353

 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 

-#: builtin/reset.c:359
+#: builtin/reset.c:363

 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 

-#: builtin/reset.c:363
+#: builtin/reset.c:367

 msgid "-N can only be used with --mixed"
 msgstr ""
 
 msgid "-N can only be used with --mixed"
 msgstr ""
 

-#: builtin/reset.c:380
+#: builtin/reset.c:387

 msgid "Unstaged changes after reset:"
 msgstr ""
 
 msgid "Unstaged changes after reset:"
 msgstr ""
 

-#: builtin/reset.c:386
+#: builtin/reset.c:390
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset.  You can\n"
+"use '--quiet' to avoid this.  Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+
+#: builtin/reset.c:400

 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 

-#: builtin/reset.c:390
+#: builtin/reset.c:404

 msgid "Could not write new index file."
 msgstr ""
 
 msgid "Could not write new index file."
 msgstr ""
 

-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:403

 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 

-#: builtin/rev-list.c:457
+#: builtin/rev-list.c:461

 msgid "object filtering requires --objects"
 msgstr ""
 
 msgid "object filtering requires --objects"
 msgstr ""
 

-#: builtin/rev-list.c:460
+#: builtin/rev-list.c:464

 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr ""
 

-#: builtin/rev-list.c:501
+#: builtin/rev-list.c:505

 msgid "rev-list does not support display of notes"
 msgstr ""
 
 msgid "rev-list does not support display of notes"
 msgstr ""
 

-#: builtin/rev-list.c:504
+#: builtin/rev-list.c:508

 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr ""
 
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr ""
 

-#: builtin/rev-parse.c:406
+#: builtin/rev-parse.c:407

 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr ""
 
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr ""
 

-#: builtin/rev-parse.c:411
+#: builtin/rev-parse.c:412

 msgid "keep the `--` passed as an arg"
 msgstr ""
 
 msgid "keep the `--` passed as an arg"
 msgstr ""
 

-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414

 msgid "stop parsing after the first non-option argument"
 msgstr ""
 
 msgid "stop parsing after the first non-option argument"
 msgstr ""
 

-#: builtin/rev-parse.c:416
+#: builtin/rev-parse.c:417

 msgid "output in stuck long form"
 msgstr ""
 
 msgid "output in stuck long form"
 msgstr ""
 

-#: builtin/rev-parse.c:549
+#: builtin/rev-parse.c:550

 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"


@@ -14570,10 +15687,6 @@ msgstr ""
 msgid "merge strategy"
 msgstr ""
 
 msgid "merge strategy"
 msgstr ""
 

-#: builtin/revert.c:111
-msgid "option"
-msgstr ""
-

 #: builtin/revert.c:112
 msgid "option for merge strategy"
 msgstr ""
 #: builtin/revert.c:112
 msgid "option for merge strategy"
 msgstr ""


@@ -14670,11 +15783,6 @@ msgstr ""
 msgid "git rm: unable to remove %s"
 msgstr ""
 
 msgid "git rm: unable to remove %s"
 msgstr ""
 

-#: builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr ""
-

 #: builtin/send-pack.c:20
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 #: builtin/send-pack.c:20
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"


@@ -14771,108 +15879,108 @@ msgstr[1] ""
 msgid "no matching refs with %s"
 msgstr ""
 
 msgid "no matching refs with %s"
 msgstr ""
 

-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:646

 msgid "show remote-tracking and local branches"
 msgstr ""
 
 msgid "show remote-tracking and local branches"
 msgstr ""
 

-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:648

 msgid "show remote-tracking branches"
 msgstr ""
 
 msgid "show remote-tracking branches"
 msgstr ""
 

-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:650

 msgid "color '*!+-' corresponding to the branch"
 msgstr ""
 
 msgid "color '*!+-' corresponding to the branch"
 msgstr ""
 

-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:652

 msgid "show <n> more commits after the common ancestor"
 msgstr ""
 
 msgid "show <n> more commits after the common ancestor"
 msgstr ""
 

-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:654

 msgid "synonym to more=-1"
 msgstr ""
 
 msgid "synonym to more=-1"
 msgstr ""
 

-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:655

 msgid "suppress naming strings"
 msgstr ""
 
 msgid "suppress naming strings"
 msgstr ""
 

-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:657

 msgid "include the current branch"
 msgstr ""
 
 msgid "include the current branch"
 msgstr ""
 

-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:659

 msgid "name commits with their object names"
 msgstr ""
 
 msgid "name commits with their object names"
 msgstr ""
 

-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:661

 msgid "show possible merge bases"
 msgstr ""
 
 msgid "show possible merge bases"
 msgstr ""
 

-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:663

 msgid "show refs unreachable from any other ref"
 msgstr ""
 
 msgid "show refs unreachable from any other ref"
 msgstr ""
 

-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:665

 msgid "show commits in topological order"
 msgstr ""
 
 msgid "show commits in topological order"
 msgstr ""
 

-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:668

 msgid "show only commits not on the first branch"
 msgstr ""
 
 msgid "show only commits not on the first branch"
 msgstr ""
 

-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:670

 msgid "show merges reachable from only one tip"
 msgstr ""
 
 msgid "show merges reachable from only one tip"
 msgstr ""
 

-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:672

 msgid "topologically sort, maintaining date order where possible"
 msgstr ""
 
 msgid "topologically sort, maintaining date order where possible"
 msgstr ""
 

-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:675

 msgid "<n>[,<base>]"
 msgstr ""
 
 msgid "<n>[,<base>]"
 msgstr ""
 

-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:676

 msgid "show <n> most recent ref-log entries starting at base"
 msgstr ""
 
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr ""
 

-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:712

 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 

-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:736

 msgid "no branches given, and HEAD is not valid"
 msgstr ""
 
 msgid "no branches given, and HEAD is not valid"
 msgstr ""
 

-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:739

 msgid "--reflog option needs one branch name"
 msgstr ""
 
 msgid "--reflog option needs one branch name"
 msgstr ""
 

-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:742

 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:746

 #, c-format
 msgid "no such ref %s"
 msgstr ""
 
 #, c-format
 msgid "no such ref %s"
 msgstr ""
 

-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:830

 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:834

 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr ""
 

-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:837

 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr ""
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr ""


@@ -14887,35 +15995,35 @@ msgstr ""
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr ""
 
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr ""
 

-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:161

 msgid "only show tags (can be combined with heads)"
 msgstr ""
 
 msgid "only show tags (can be combined with heads)"
 msgstr ""
 

-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162

 msgid "only show heads (can be combined with tags)"
 msgstr ""
 
 msgid "only show heads (can be combined with tags)"
 msgstr ""
 

-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163

 msgid "stricter reference checking, requires exact ref path"
 msgstr ""
 
 msgid "stricter reference checking, requires exact ref path"
 msgstr ""
 

-#: builtin/show-ref.c:165 builtin/show-ref.c:167
+#: builtin/show-ref.c:166 builtin/show-ref.c:168

 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr ""
 
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr ""
 

-#: builtin/show-ref.c:169
+#: builtin/show-ref.c:170

 msgid "dereference tags into object IDs"
 msgstr ""
 
 msgid "dereference tags into object IDs"
 msgstr ""
 

-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:172

 msgid "only show SHA1 hash using <n> digits"
 msgstr ""
 
 msgid "only show SHA1 hash using <n> digits"
 msgstr ""
 

-#: builtin/show-ref.c:175
+#: builtin/show-ref.c:176

 msgid "do not print results to stdout (useful with --verify)"
 msgstr ""
 
 msgid "do not print results to stdout (useful with --verify)"
 msgstr ""
 

-#: builtin/show-ref.c:177
+#: builtin/show-ref.c:178

 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 


@@ -14935,12 +16043,7 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
 msgid "prepend comment character and space to each line"
 msgstr ""
 

-#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833
-#, c-format
-msgid "No such ref: %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939

 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""


@@ -14954,7 +16057,7 @@ msgstr ""
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356
+#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363

 msgid "alternative anchor for relative paths"
 msgstr ""
 
 msgid "alternative anchor for relative paths"
 msgstr ""
 


@@ -14962,8 +16065,8 @@ msgstr ""
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606
-#: builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:649

 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ""
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ""


@@ -14992,7 +16095,7 @@ msgstr ""
 msgid "Suppress output of entering each submodule command"
 msgstr ""
 
 msgid "Suppress output of entering each submodule command"
 msgstr ""
 

-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048

 msgid "Recurse into nested submodules"
 msgstr ""
 
 msgid "Recurse into nested submodules"
 msgstr ""
 


@@ -15000,294 +16103,326 @@ msgstr ""
 msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
 msgstr ""
 
 msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
 msgstr ""
 

-#: builtin/submodule--helper.c:644
+#: builtin/submodule--helper.c:595

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"could not lookup configuration '%s'. Assuming this repository is its own "
+"could not look up configuration '%s'. Assuming this repository is its own "

 "authoritative upstream."
 msgstr ""
 
 "authoritative upstream."
 msgstr ""
 

-#: builtin/submodule--helper.c:655
+#: builtin/submodule--helper.c:663

 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:659
+#: builtin/submodule--helper.c:667

 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:677

 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:676
+#: builtin/submodule--helper.c:684

 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:698
+#: builtin/submodule--helper.c:706

 msgid "Suppress output for initializing a submodule"
 msgstr ""
 
 msgid "Suppress output for initializing a submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:703
+#: builtin/submodule--helper.c:711

 msgid "git submodule--helper init [<path>]"
 msgstr ""
 
 msgid "git submodule--helper init [<path>]"
 msgstr ""
 

-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901
+#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909

 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:822

 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010
+#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018

 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176
+#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182

 msgid "Suppress submodule status output"
 msgstr ""
 
 msgid "Suppress submodule status output"
 msgstr ""
 

-#: builtin/submodule--helper.c:866
+#: builtin/submodule--helper.c:874

 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 

-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:875

 msgid "recurse into nested submodules"
 msgstr ""
 
 msgid "recurse into nested submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:872
+#: builtin/submodule--helper.c:880

 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:896
+#: builtin/submodule--helper.c:904

 msgid "git submodule--helper name <path>"
 msgstr ""
 
 msgid "git submodule--helper name <path>"
 msgstr ""
 

-#: builtin/submodule--helper.c:960
+#: builtin/submodule--helper.c:968

 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:966
+#: builtin/submodule--helper.c:974

 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:988

 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:999

 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:1038
+#: builtin/submodule--helper.c:1046

 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 
 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 

-#: builtin/submodule--helper.c:1045
+#: builtin/submodule--helper.c:1053

 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1099
+#: builtin/submodule--helper.c:1107

 #, 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 ""
 
 #, 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:1111
+#: builtin/submodule--helper.c:1119

 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 

-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1127

 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1129

 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:1132
+#: builtin/submodule--helper.c:1138

 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:1148
+#: builtin/submodule--helper.c:1154

 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:1177
+#: builtin/submodule--helper.c:1183

 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 

-#: builtin/submodule--helper.c:1178
+#: builtin/submodule--helper.c:1184

 msgid "Unregister all submodules"
 msgstr ""
 
 msgid "Unregister all submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1189

 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1203

 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293
+#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300

 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:1329
+#: builtin/submodule--helper.c:1336

 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 

-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1343

 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr ""
 
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr ""
 

-#: builtin/submodule--helper.c:1359
+#: builtin/submodule--helper.c:1366

 msgid "where the new submodule will be cloned to"
 msgstr ""
 
 msgid "where the new submodule will be cloned to"
 msgstr ""
 

-#: builtin/submodule--helper.c:1362
+#: builtin/submodule--helper.c:1369

 msgid "name of the new submodule"
 msgstr ""
 
 msgid "name of the new submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1372

 msgid "url where to clone the submodule from"
 msgstr ""
 
 msgid "url where to clone the submodule from"
 msgstr ""
 

-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1380

 msgid "depth for shallow clones"
 msgstr ""
 
 msgid "depth for shallow clones"
 msgstr ""
 

-#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868

 msgid "force cloning progress"
 msgstr ""
 
 msgid "force cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1388

 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
 
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
 

-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1419

 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr ""
 
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr ""
 

-#: builtin/submodule--helper.c:1426
+#: builtin/submodule--helper.c:1433

 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1469
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1566

 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 

-#: builtin/submodule--helper.c:1496
+#: builtin/submodule--helper.c:1570

 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 

-#: builtin/submodule--helper.c:1525
+#: builtin/submodule--helper.c:1600

 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:1554
+#: builtin/submodule--helper.c:1629

 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:1689
+#: builtin/submodule--helper.c:1773

 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 

-#: builtin/submodule--helper.c:1700
+#: builtin/submodule--helper.c:1784

 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 

-#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089

 msgid "path into the working tree"
 msgstr ""
 
 msgid "path into the working tree"
 msgstr ""
 

-#: builtin/submodule--helper.c:1733
+#: builtin/submodule--helper.c:1850

 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 

-#: builtin/submodule--helper.c:1737
+#: builtin/submodule--helper.c:1854

 msgid "rebase, merge, checkout or none"
 msgstr ""
 
 msgid "rebase, merge, checkout or none"
 msgstr ""
 

-#: builtin/submodule--helper.c:1743
+#: builtin/submodule--helper.c:1860

 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 

-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1863

 msgid "parallel jobs"
 msgstr ""
 
 msgid "parallel jobs"
 msgstr ""
 

-#: builtin/submodule--helper.c:1748
+#: builtin/submodule--helper.c:1865

 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 

-#: builtin/submodule--helper.c:1749
+#: builtin/submodule--helper.c:1866

 msgid "don't print cloning progress"
 msgstr ""
 
 msgid "don't print cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1873

 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1769
+#: builtin/submodule--helper.c:1886

 msgid "bad value for update parameter"
 msgstr ""
 
 msgid "bad value for update parameter"
 msgstr ""
 

-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1934

 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr ""
 
 #, 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:1954
+#: builtin/submodule--helper.c:2057
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2090

 msgid "recurse into submodules"
 msgstr ""
 
 msgid "recurse into submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:1960
+#: builtin/submodule--helper.c:2096

 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:2071
+#: builtin/submodule--helper.c:2152
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2157
+msgid "git submodule--helper config name [value]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2158
+msgid "git submodule--helper config --check-writeable"
+msgstr ""
+
+#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:2225

 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 

-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2231

 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""


@@ -15391,125 +16526,125 @@ msgstr ""
 msgid "The tag message has been left in %s\n"
 msgstr ""
 
 msgid "The tag message has been left in %s\n"
 msgstr ""
 

-#: builtin/tag.c:383
+#: builtin/tag.c:385

 msgid "list tag names"
 msgstr ""
 
 msgid "list tag names"
 msgstr ""
 

-#: builtin/tag.c:385
+#: builtin/tag.c:387

 msgid "print <n> lines of each tag message"
 msgstr ""
 
 msgid "print <n> lines of each tag message"
 msgstr ""
 

-#: builtin/tag.c:387
+#: builtin/tag.c:389

 msgid "delete tags"
 msgstr ""
 
 msgid "delete tags"
 msgstr ""
 

-#: builtin/tag.c:388
+#: builtin/tag.c:390

 msgid "verify tags"
 msgstr ""
 
 msgid "verify tags"
 msgstr ""
 

-#: builtin/tag.c:390
+#: builtin/tag.c:392

 msgid "Tag creation options"
 msgstr ""
 
 msgid "Tag creation options"
 msgstr ""
 

-#: builtin/tag.c:392
+#: builtin/tag.c:394

 msgid "annotated tag, needs a message"
 msgstr ""
 
 msgid "annotated tag, needs a message"
 msgstr ""
 

-#: builtin/tag.c:394
+#: builtin/tag.c:396

 msgid "tag message"
 msgstr ""
 
 msgid "tag message"
 msgstr ""
 

-#: builtin/tag.c:396
+#: builtin/tag.c:398

 msgid "force edit of tag message"
 msgstr ""
 
 msgid "force edit of tag message"
 msgstr ""
 

-#: builtin/tag.c:397
+#: builtin/tag.c:399

 msgid "annotated and GPG-signed tag"
 msgstr ""
 
 msgid "annotated and GPG-signed tag"
 msgstr ""
 

-#: builtin/tag.c:401
+#: builtin/tag.c:403

 msgid "use another key to sign the tag"
 msgstr ""
 
 msgid "use another key to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:402
+#: builtin/tag.c:404

 msgid "replace the tag if exists"
 msgstr ""
 
 msgid "replace the tag if exists"
 msgstr ""
 

-#: builtin/tag.c:403 builtin/update-ref.c:369
+#: builtin/tag.c:405 builtin/update-ref.c:369

 msgid "create a reflog"
 msgstr ""
 
 msgid "create a reflog"
 msgstr ""
 

-#: builtin/tag.c:405
+#: builtin/tag.c:407

 msgid "Tag listing options"
 msgstr ""
 
 msgid "Tag listing options"
 msgstr ""
 

-#: builtin/tag.c:406
+#: builtin/tag.c:408

 msgid "show tag list in columns"
 msgstr ""
 
 msgid "show tag list in columns"
 msgstr ""
 

-#: builtin/tag.c:407 builtin/tag.c:409
+#: builtin/tag.c:409 builtin/tag.c:411

 msgid "print only tags that contain the commit"
 msgstr ""
 
 msgid "print only tags that contain the commit"
 msgstr ""
 

-#: builtin/tag.c:408 builtin/tag.c:410
+#: builtin/tag.c:410 builtin/tag.c:412

 msgid "print only tags that don't contain the commit"
 msgstr ""
 
 msgid "print only tags that don't contain the commit"
 msgstr ""
 

-#: builtin/tag.c:411
+#: builtin/tag.c:413

 msgid "print only tags that are merged"
 msgstr ""
 
 msgid "print only tags that are merged"
 msgstr ""
 

-#: builtin/tag.c:412
+#: builtin/tag.c:414

 msgid "print only tags that are not merged"
 msgstr ""
 
 msgid "print only tags that are not merged"
 msgstr ""
 

-#: builtin/tag.c:417
+#: builtin/tag.c:419

 msgid "print only tags of the object"
 msgstr ""
 
 msgid "print only tags of the object"
 msgstr ""
 

-#: builtin/tag.c:461
+#: builtin/tag.c:463

 msgid "--column and -n are incompatible"
 msgstr ""
 
 msgid "--column and -n are incompatible"
 msgstr ""
 

-#: builtin/tag.c:483
+#: builtin/tag.c:485

 msgid "-n option is only allowed in list mode"
 msgstr ""
 
 msgid "-n option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:485
+#: builtin/tag.c:487

 msgid "--contains option is only allowed in list mode"
 msgstr ""
 
 msgid "--contains option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:487
+#: builtin/tag.c:489

 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 
 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:489
+#: builtin/tag.c:491

 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 
 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:491
+#: builtin/tag.c:493

 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:502
+#: builtin/tag.c:504

 msgid "only one -F or -m option is allowed."
 msgstr ""
 
 msgid "only one -F or -m option is allowed."
 msgstr ""
 

-#: builtin/tag.c:521
+#: builtin/tag.c:523

 msgid "too many params"
 msgstr ""
 
 msgid "too many params"
 msgstr ""
 

-#: builtin/tag.c:527
+#: builtin/tag.c:529

 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 

-#: builtin/tag.c:532
+#: builtin/tag.c:534

 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 

-#: builtin/tag.c:563
+#: builtin/tag.c:565

 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""


@@ -15575,185 +16710,185 @@ msgstr ""
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 

-#: builtin/update-index.c:944
+#: builtin/update-index.c:961

 msgid "continue refresh even when index needs update"
 msgstr ""
 
 msgid "continue refresh even when index needs update"
 msgstr ""
 

-#: builtin/update-index.c:947
+#: builtin/update-index.c:964

 msgid "refresh: ignore submodules"
 msgstr ""
 
 msgid "refresh: ignore submodules"
 msgstr ""
 

-#: builtin/update-index.c:950
+#: builtin/update-index.c:967

 msgid "do not ignore new files"
 msgstr ""
 
 msgid "do not ignore new files"
 msgstr ""
 

-#: builtin/update-index.c:952
+#: builtin/update-index.c:969

 msgid "let files replace directories and vice-versa"
 msgstr ""
 
 msgid "let files replace directories and vice-versa"
 msgstr ""
 

-#: builtin/update-index.c:954
+#: builtin/update-index.c:971

 msgid "notice files missing from worktree"
 msgstr ""
 
 msgid "notice files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:956
+#: builtin/update-index.c:973

 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 

-#: builtin/update-index.c:959
+#: builtin/update-index.c:976

 msgid "refresh stat information"
 msgstr ""
 
 msgid "refresh stat information"
 msgstr ""
 

-#: builtin/update-index.c:963
+#: builtin/update-index.c:980

 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 

-#: builtin/update-index.c:967
+#: builtin/update-index.c:984

 msgid "<mode>,<object>,<path>"
 msgstr ""
 
 msgid "<mode>,<object>,<path>"
 msgstr ""
 

-#: builtin/update-index.c:968
+#: builtin/update-index.c:985

 msgid "add the specified entry to the index"
 msgstr ""
 
 msgid "add the specified entry to the index"
 msgstr ""
 

-#: builtin/update-index.c:977
+#: builtin/update-index.c:994

 msgid "mark files as \"not changing\""
 msgstr ""
 
 msgid "mark files as \"not changing\""
 msgstr ""
 

-#: builtin/update-index.c:980
+#: builtin/update-index.c:997

 msgid "clear assumed-unchanged bit"
 msgstr ""
 
 msgid "clear assumed-unchanged bit"
 msgstr ""
 

-#: builtin/update-index.c:983
+#: builtin/update-index.c:1000

 msgid "mark files as \"index-only\""
 msgstr ""
 
 msgid "mark files as \"index-only\""
 msgstr ""
 

-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003

 msgid "clear skip-worktree bit"
 msgstr ""
 
 msgid "clear skip-worktree bit"
 msgstr ""
 

-#: builtin/update-index.c:989
+#: builtin/update-index.c:1006

 msgid "add to index only; do not add content to object database"
 msgstr ""
 
 msgid "add to index only; do not add content to object database"
 msgstr ""
 

-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008

 msgid "remove named paths even if present in worktree"
 msgstr ""
 
 msgid "remove named paths even if present in worktree"
 msgstr ""
 

-#: builtin/update-index.c:993
+#: builtin/update-index.c:1010

 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 

-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012

 msgid "read list of paths to be updated from standard input"
 msgstr ""
 
 msgid "read list of paths to be updated from standard input"
 msgstr ""
 

-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016

 msgid "add entries from standard input to the index"
 msgstr ""
 
 msgid "add entries from standard input to the index"
 msgstr ""
 

-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1020

 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 

-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1024

 msgid "only update entries that differ from HEAD"
 msgstr ""
 
 msgid "only update entries that differ from HEAD"
 msgstr ""
 

-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1028

 msgid "ignore files missing from worktree"
 msgstr ""
 
 msgid "ignore files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1031

 msgid "report actions to standard output"
 msgstr ""
 
 msgid "report actions to standard output"
 msgstr ""
 

-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033

 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 

-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1037

 msgid "write index in this format"
 msgstr ""
 
 msgid "write index in this format"
 msgstr ""
 

-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039

 msgid "enable or disable split index"
 msgstr ""
 
 msgid "enable or disable split index"
 msgstr ""
 

-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041

 msgid "enable/disable untracked cache"
 msgstr ""
 
 msgid "enable/disable untracked cache"
 msgstr ""
 

-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043

 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 

-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045

 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 

-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047

 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 
 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 

-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1049

 msgid "enable or disable file system monitor"
 msgstr ""
 
 msgid "enable or disable file system monitor"
 msgstr ""
 

-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051

 msgid "mark files as fsmonitor valid"
 msgstr ""
 
 msgid "mark files as fsmonitor valid"
 msgstr ""
 

-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1054

 msgid "clear fsmonitor valid bit"
 msgstr ""
 
 msgid "clear fsmonitor valid bit"
 msgstr ""
 

-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1153

 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 

-#: builtin/update-index.c:1145
+#: builtin/update-index.c:1162

 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 

-#: builtin/update-index.c:1156
+#: builtin/update-index.c:1173

 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
 
 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:1160
+#: builtin/update-index.c:1177

 msgid "Untracked cache disabled"
 msgstr ""
 
 msgid "Untracked cache disabled"
 msgstr ""
 

-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1185

 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
 
 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:1172
+#: builtin/update-index.c:1189

 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 

-#: builtin/update-index.c:1180
+#: builtin/update-index.c:1197

 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 

-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1201

 msgid "fsmonitor enabled"
 msgstr ""
 
 msgid "fsmonitor enabled"
 msgstr ""
 

-#: builtin/update-index.c:1187
+#: builtin/update-index.c:1204

 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 

-#: builtin/update-index.c:1191
+#: builtin/update-index.c:1208

 msgid "fsmonitor disabled"
 msgstr ""
 
 msgid "fsmonitor disabled"
 msgstr ""
 


@@ -15869,213 +17004,244 @@ msgstr ""
 msgid "git worktree unlock <path>"
 msgstr ""
 
 msgid "git worktree unlock <path>"
 msgstr ""
 

-#: builtin/worktree.c:59
+#: builtin/worktree.c:60 builtin/worktree.c:871
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:79

 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr ""
 

-#: builtin/worktree.c:65
+#: builtin/worktree.c:85

 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr ""
 

-#: builtin/worktree.c:70 builtin/worktree.c:79
+#: builtin/worktree.c:90 builtin/worktree.c:99

 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 

-#: builtin/worktree.c:89
+#: builtin/worktree.c:109

 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr ""
 

-#: builtin/worktree.c:97
+#: builtin/worktree.c:117

 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 

-#: builtin/worktree.c:106
+#: builtin/worktree.c:126

 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 

-#: builtin/worktree.c:153
+#: builtin/worktree.c:165

 msgid "report pruned working trees"
 msgstr ""
 
 msgid "report pruned working trees"
 msgstr ""
 

-#: builtin/worktree.c:155
+#: builtin/worktree.c:167

 msgid "expire working trees older than <time>"
 msgstr ""
 
 msgid "expire working trees older than <time>"
 msgstr ""
 

-#: builtin/worktree.c:230
+#: builtin/worktree.c:234

 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 

-#: builtin/worktree.c:261
+#: builtin/worktree.c:251
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr ""
+
+#: builtin/worktree.c:256
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:258
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:309

 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 

-#: builtin/worktree.c:380 builtin/worktree.c:386
+#: builtin/worktree.c:428 builtin/worktree.c:434

 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 

-#: builtin/worktree.c:382
+#: builtin/worktree.c:430

 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 

-#: builtin/worktree.c:391
+#: builtin/worktree.c:439

 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 

-#: builtin/worktree.c:397
+#: builtin/worktree.c:445

 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 

-#: builtin/worktree.c:438
+#: builtin/worktree.c:486

 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 

-#: builtin/worktree.c:441
+#: builtin/worktree.c:489

 msgid "create a new branch"
 msgstr ""
 
 msgid "create a new branch"
 msgstr ""
 

-#: builtin/worktree.c:443
+#: builtin/worktree.c:491

 msgid "create or reset a branch"
 msgstr ""
 
 msgid "create or reset a branch"
 msgstr ""
 

-#: builtin/worktree.c:445
+#: builtin/worktree.c:493

 msgid "populate the new working tree"
 msgstr ""
 
 msgid "populate the new working tree"
 msgstr ""
 

-#: builtin/worktree.c:446
+#: builtin/worktree.c:494

 msgid "keep the new working tree locked"
 msgstr ""
 
 msgid "keep the new working tree locked"
 msgstr ""
 

-#: builtin/worktree.c:449
+#: builtin/worktree.c:497

 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 

-#: builtin/worktree.c:452
+#: builtin/worktree.c:500

 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 

-#: builtin/worktree.c:460
+#: builtin/worktree.c:508

 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 

-#: builtin/worktree.c:521
+#: builtin/worktree.c:569

 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 

-#: builtin/worktree.c:621
+#: builtin/worktree.c:669

 msgid "reason for locking"
 msgstr ""
 
 msgid "reason for locking"
 msgstr ""
 

-#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720
-#: builtin/worktree.c:860
+#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
+#: builtin/worktree.c:899

 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 

-#: builtin/worktree.c:635 builtin/worktree.c:668
+#: builtin/worktree.c:683 builtin/worktree.c:716

 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 

-#: builtin/worktree.c:640
+#: builtin/worktree.c:688

 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 

-#: builtin/worktree.c:642
+#: builtin/worktree.c:690

 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 

-#: builtin/worktree.c:670
+#: builtin/worktree.c:718

 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 

-#: builtin/worktree.c:695
+#: builtin/worktree.c:743

 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 

-#: builtin/worktree.c:722 builtin/worktree.c:862
+#: builtin/worktree.c:751
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:774 builtin/worktree.c:901

 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 

-#: builtin/worktree.c:727
+#: builtin/worktree.c:779

 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 

-#: builtin/worktree.c:733
+#: builtin/worktree.c:785

 #, c-format
 msgid "target '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "target '%s' already exists"
 msgstr ""
 

-#: builtin/worktree.c:740
+#: builtin/worktree.c:793

 #, c-format
 #, c-format

-msgid "cannot move a locked working tree, lock reason: %s"
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"

 msgstr ""
 
 msgstr ""
 

-#: builtin/worktree.c:742
-msgid "cannot move a locked working tree"
+#: builtin/worktree.c:795
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"

 msgstr ""
 
 msgstr ""
 

-#: builtin/worktree.c:745
+#: builtin/worktree.c:798

 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 

-#: builtin/worktree.c:750
+#: builtin/worktree.c:803

 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 

-#: builtin/worktree.c:798
+#: builtin/worktree.c:851

 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 

-#: builtin/worktree.c:802
+#: builtin/worktree.c:855

 #, c-format
 msgid "'%s' is dirty, use --force to delete it"
 msgstr ""
 
 #, c-format
 msgid "'%s' is dirty, use --force to delete it"
 msgstr ""
 

-#: builtin/worktree.c:807
+#: builtin/worktree.c:860

 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 

-#: builtin/worktree.c:818 builtin/worktree.c:832
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/worktree.c:844
-msgid "force removing even if the worktree is dirty"
+#: builtin/worktree.c:883
+msgid "force removal even if worktree is dirty or locked"

 msgstr ""
 
 msgstr ""
 

-#: builtin/worktree.c:866
+#: builtin/worktree.c:906

 #, c-format
 #, c-format

-msgid "cannot remove a locked working tree, lock reason: %s"
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"

 msgstr ""
 
 msgstr ""
 

-#: builtin/worktree.c:868
-msgid "cannot remove a locked working tree"
+#: builtin/worktree.c:908
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"

 msgstr ""
 
 msgstr ""
 

-#: builtin/worktree.c:871
+#: builtin/worktree.c:911

 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""


@@ -16109,6 +17275,15 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr ""
 
 msgid "print debugging messages to stderr"
 msgstr ""
 

+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr ""
+

 #: git.c:27
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
 #: git.c:27
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"


@@ -16161,30 +17336,58 @@ msgstr ""
 msgid "unknown option: %s\n"
 msgstr ""
 
 msgid "unknown option: %s\n"
 msgstr ""
 

-#: git.c:770
+#: git.c:719
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:802

 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 

-#: git.c:782
+#: git.c:814

 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 

-#: http.c:348
+#: http.c:374

 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 

-#: http.c:369
+#: http.c:395

 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 

-#: http.c:378
+#: http.c:404

 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 

-#: http.c:1854
+#: http.c:837
+msgid "CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:910
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr ""
+
+#: http.c:1046
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1053
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1057
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:1921

 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"


@@ -16197,31 +17400,31 @@ msgstr ""
 msgid "redirecting to %s"
 msgstr ""
 
 msgid "redirecting to %s"
 msgstr ""
 

-#: list-objects-filter-options.h:59
+#: list-objects-filter-options.h:60

 msgid "args"
 msgstr ""
 
 msgid "args"
 msgstr ""
 

-#: list-objects-filter-options.h:60
+#: list-objects-filter-options.h:61

 msgid "object filtering"
 msgstr ""
 
 msgid "object filtering"
 msgstr ""
 

-#: parse-options.h:157
+#: parse-options.h:154

 msgid "expiry-date"
 msgstr ""
 
 msgid "expiry-date"
 msgstr ""
 

-#: parse-options.h:172
+#: parse-options.h:169

 msgid "no-op (backward compatibility)"
 msgstr ""
 
 msgid "no-op (backward compatibility)"
 msgstr ""
 

-#: parse-options.h:251
+#: parse-options.h:261

 msgid "be more verbose"
 msgstr ""
 
 msgid "be more verbose"
 msgstr ""
 

-#: parse-options.h:253
+#: parse-options.h:263

 msgid "be more quiet"
 msgstr ""
 
 msgid "be more quiet"
 msgstr ""
 

-#: parse-options.h:259
+#: parse-options.h:269

 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 
 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 


@@ -16242,7 +17445,7 @@ msgid "Apply a patch to files and/or to the index"
 msgstr ""
 
 #: command-list.h:54
 msgstr ""
 
 #: command-list.h:54

-msgid "Import an Arch repository into Git"
+msgid "Import a GNU Arch repository into Git"

 msgstr ""
 
 #: command-list.h:55
 msgstr ""
 
 #: command-list.h:55


@@ -16322,7 +17525,7 @@ msgid "Record changes to the repository"
 msgstr ""
 
 #: command-list.h:74
 msgstr ""
 
 #: command-list.h:74

-msgid "Write and verify Git commit graph files"
+msgid "Write and verify Git commit-graph files"

 msgstr ""
 
 #: command-list.h:75
 msgstr ""
 
 #: command-list.h:75


@@ -16538,326 +17741,330 @@ msgid "Show three-way merge without touching index"
 msgstr ""
 
 #: command-list.h:128
 msgstr ""
 
 #: command-list.h:128

-msgid "Creates a tag object"
+msgid "Write and verify multi-pack-indexes"

 msgstr ""
 
 #: command-list.h:129
 msgstr ""
 
 #: command-list.h:129

-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Creates a tag object"

 msgstr ""
 
 #: command-list.h:130
 msgstr ""
 
 #: command-list.h:130

-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Build a tree-object from ls-tree formatted text"

 msgstr ""
 
 #: command-list.h:131
 msgstr ""
 
 #: command-list.h:131

-msgid "Find symbolic names for given revs"
+msgid "Move or rename a file, a directory, or a symlink"

 msgstr ""
 
 #: command-list.h:132
 msgstr ""
 
 #: command-list.h:132

-msgid "Add or inspect object notes"
+msgid "Find symbolic names for given revs"

 msgstr ""
 
 #: command-list.h:133
 msgstr ""
 
 #: command-list.h:133

-msgid "Import from and submit to Perforce repositories"
+msgid "Add or inspect object notes"

 msgstr ""
 
 #: command-list.h:134
 msgstr ""
 
 #: command-list.h:134

-msgid "Create a packed archive of objects"
+msgid "Import from and submit to Perforce repositories"

 msgstr ""
 
 #: command-list.h:135
 msgstr ""
 
 #: command-list.h:135

-msgid "Find redundant pack files"
+msgid "Create a packed archive of objects"

 msgstr ""
 
 #: command-list.h:136
 msgstr ""
 
 #: command-list.h:136

-msgid "Pack heads and tags for efficient repository access"
+msgid "Find redundant pack files"

 msgstr ""
 
 #: command-list.h:137
 msgstr ""
 
 #: command-list.h:137

-msgid "Routines to help parsing remote repository access parameters"
+msgid "Pack heads and tags for efficient repository access"

 msgstr ""
 
 #: command-list.h:138
 msgstr ""
 
 #: command-list.h:138

-msgid "Compute unique ID for a patch"
+msgid "Routines to help parsing remote repository access parameters"

 msgstr ""
 
 #: command-list.h:139
 msgstr ""
 
 #: command-list.h:139

-msgid "Prune all unreachable objects from the object database"
+msgid "Compute unique ID for a patch"

 msgstr ""
 
 #: command-list.h:140
 msgstr ""
 
 #: command-list.h:140

-msgid "Remove extra objects that are already in pack files"
+msgid "Prune all unreachable objects from the object database"

 msgstr ""
 
 #: command-list.h:141
 msgstr ""
 
 #: command-list.h:141

-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Remove extra objects that are already in pack files"

 msgstr ""
 
 #: command-list.h:142
 msgstr ""
 
 #: command-list.h:142

-msgid "Update remote refs along with associated objects"
+msgid "Fetch from and integrate with another repository or a local branch"

 msgstr ""
 
 #: command-list.h:143
 msgstr ""
 
 #: command-list.h:143

-msgid "Applies a quilt patchset onto the current branch"
+msgid "Update remote refs along with associated objects"

 msgstr ""
 
 #: command-list.h:144
 msgstr ""
 
 #: command-list.h:144

-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Applies a quilt patchset onto the current branch"

 msgstr ""
 
 #: command-list.h:145
 msgstr ""
 
 #: command-list.h:145

-msgid "Reads tree information into the index"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"

 msgstr ""
 
 #: command-list.h:146
 msgstr ""
 
 #: command-list.h:146

-msgid "Reapply commits on top of another base tip"
+msgid "Reads tree information into the index"

 msgstr ""
 
 #: command-list.h:147
 msgstr ""
 
 #: command-list.h:147

-msgid "Receive what is pushed into the repository"
+msgid "Reapply commits on top of another base tip"

 msgstr ""
 
 #: command-list.h:148
 msgstr ""
 
 #: command-list.h:148

-msgid "Manage reflog information"
+msgid "Receive what is pushed into the repository"

 msgstr ""
 
 #: command-list.h:149
 msgstr ""
 
 #: command-list.h:149

-msgid "Manage set of tracked repositories"
+msgid "Manage reflog information"

 msgstr ""
 
 #: command-list.h:150
 msgstr ""
 
 #: command-list.h:150

-msgid "Pack unpacked objects in a repository"
+msgid "Manage set of tracked repositories"

 msgstr ""
 
 #: command-list.h:151
 msgstr ""
 
 #: command-list.h:151

-msgid "Create, list, delete refs to replace objects"
+msgid "Pack unpacked objects in a repository"

 msgstr ""
 
 #: command-list.h:152
 msgstr ""
 
 #: command-list.h:152

-msgid "Generates a summary of pending changes"
+msgid "Create, list, delete refs to replace objects"

 msgstr ""
 
 #: command-list.h:153
 msgstr ""
 
 #: command-list.h:153

-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Generates a summary of pending changes"

 msgstr ""
 
 #: command-list.h:154
 msgstr ""
 
 #: command-list.h:154

-msgid "Reset current HEAD to the specified state"
+msgid "Reuse recorded resolution of conflicted merges"

 msgstr ""
 
 #: command-list.h:155
 msgstr ""
 
 #: command-list.h:155

-msgid "Revert some existing commits"
+msgid "Reset current HEAD to the specified state"

 msgstr ""
 
 #: command-list.h:156
 msgstr ""
 
 #: command-list.h:156

-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"

 msgstr ""
 
 #: command-list.h:157
 msgstr ""
 
 #: command-list.h:157

-msgid "Pick out and massage parameters"
+msgid "Lists commit objects in reverse chronological order"

 msgstr ""
 
 #: command-list.h:158
 msgstr ""
 
 #: command-list.h:158

-msgid "Remove files from the working tree and from the index"
+msgid "Pick out and massage parameters"

 msgstr ""
 
 #: command-list.h:159
 msgstr ""
 
 #: command-list.h:159

-msgid "Send a collection of patches as emails"
+msgid "Remove files from the working tree and from the index"

 msgstr ""
 
 #: command-list.h:160
 msgstr ""
 
 #: command-list.h:160

-msgid "Push objects over Git protocol to another repository"
+msgid "Send a collection of patches as emails"

 msgstr ""
 
 #: command-list.h:161
 msgstr ""
 
 #: command-list.h:161

-msgid "Restricted login shell for Git-only SSH access"
+msgid "Push objects over Git protocol to another repository"

 msgstr ""
 
 #: command-list.h:162
 msgstr ""
 
 #: command-list.h:162

-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"

 msgstr ""
 
 #: command-list.h:163
 msgstr ""
 
 #: command-list.h:163

-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"

 msgstr ""
 
 #: command-list.h:164
 msgstr ""
 
 #: command-list.h:164

+msgid "Show various types of objects"
+msgstr ""
+
+#: command-list.h:165

 msgid "Show branches and their commits"
 msgstr ""
 
 msgid "Show branches and their commits"
 msgstr ""
 

-#: command-list.h:165
+#: command-list.h:166

 msgid "Show packed archive index"
 msgstr ""
 
 msgid "Show packed archive index"
 msgstr ""
 

-#: command-list.h:166
+#: command-list.h:167

 msgid "List references in a local repository"
 msgstr ""
 
 msgid "List references in a local repository"
 msgstr ""
 

-#: command-list.h:167
+#: command-list.h:168

 msgid "Git's i18n setup code for shell scripts"
 msgstr ""
 
 msgid "Git's i18n setup code for shell scripts"
 msgstr ""
 

-#: command-list.h:168
+#: command-list.h:169

 msgid "Common Git shell script setup code"
 msgstr ""
 
 msgid "Common Git shell script setup code"
 msgstr ""
 

-#: command-list.h:169
+#: command-list.h:170

 msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 
 msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 

-#: command-list.h:170
+#: command-list.h:171

 msgid "Add file contents to the staging area"
 msgstr ""
 
 msgid "Add file contents to the staging area"
 msgstr ""
 

-#: command-list.h:171
+#: command-list.h:172

 msgid "Show the working tree status"
 msgstr ""
 
 msgid "Show the working tree status"
 msgstr ""
 

-#: command-list.h:172
+#: command-list.h:173

 msgid "Remove unnecessary whitespace"
 msgstr ""
 
 msgid "Remove unnecessary whitespace"
 msgstr ""
 

-#: command-list.h:173
+#: command-list.h:174

 msgid "Initialize, update or inspect submodules"
 msgstr ""
 
 msgid "Initialize, update or inspect submodules"
 msgstr ""
 

-#: command-list.h:174
+#: command-list.h:175

 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 

-#: command-list.h:175
+#: command-list.h:176

 msgid "Read, modify and delete symbolic refs"
 msgstr ""
 
 msgid "Read, modify and delete symbolic refs"
 msgstr ""
 

-#: command-list.h:176
+#: command-list.h:177

 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 

-#: command-list.h:177
+#: command-list.h:178

 msgid "Creates a temporary file with a blob's contents"
 msgstr ""
 
 msgid "Creates a temporary file with a blob's contents"
 msgstr ""
 

-#: command-list.h:178
+#: command-list.h:179

 msgid "Unpack objects from a packed archive"
 msgstr ""
 
 msgid "Unpack objects from a packed archive"
 msgstr ""
 

-#: command-list.h:179
+#: command-list.h:180

 msgid "Register file contents in the working tree to the index"
 msgstr ""
 
 msgid "Register file contents in the working tree to the index"
 msgstr ""
 

-#: command-list.h:180
+#: command-list.h:181

 msgid "Update the object name stored in a ref safely"
 msgstr ""
 
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 

-#: command-list.h:181
+#: command-list.h:182

 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 

-#: command-list.h:182
+#: command-list.h:183

 msgid "Send archive back to git-archive"
 msgstr ""
 
 msgid "Send archive back to git-archive"
 msgstr ""
 

-#: command-list.h:183
+#: command-list.h:184

 msgid "Send objects packed back to git-fetch-pack"
 msgstr ""
 
 msgid "Send objects packed back to git-fetch-pack"
 msgstr ""
 

-#: command-list.h:184
+#: command-list.h:185

 msgid "Show a Git logical variable"
 msgstr ""
 
 msgid "Show a Git logical variable"
 msgstr ""
 

-#: command-list.h:185
+#: command-list.h:186

 msgid "Check the GPG signature of commits"
 msgstr ""
 
 msgid "Check the GPG signature of commits"
 msgstr ""
 

-#: command-list.h:186
+#: command-list.h:187

 msgid "Validate packed Git archive files"
 msgstr ""
 
 msgid "Validate packed Git archive files"
 msgstr ""
 

-#: command-list.h:187
+#: command-list.h:188

 msgid "Check the GPG signature of tags"
 msgstr ""
 
 msgid "Check the GPG signature of tags"
 msgstr ""
 

-#: command-list.h:188
+#: command-list.h:189

 msgid "Git web interface (web frontend to Git repositories)"
 msgstr ""
 
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr ""
 

-#: command-list.h:189
+#: command-list.h:190

 msgid "Show logs with difference each commit introduces"
 msgstr ""
 
 msgid "Show logs with difference each commit introduces"
 msgstr ""
 

-#: command-list.h:190
+#: command-list.h:191

 msgid "Manage multiple working trees"
 msgstr ""
 
 msgid "Manage multiple working trees"
 msgstr ""
 

-#: command-list.h:191
+#: command-list.h:192

 msgid "Create a tree object from the current index"
 msgstr ""
 
 msgid "Create a tree object from the current index"
 msgstr ""
 

-#: command-list.h:192
+#: command-list.h:193

 msgid "Defining attributes per path"
 msgstr ""
 
 msgid "Defining attributes per path"
 msgstr ""
 

-#: command-list.h:193
+#: command-list.h:194

 msgid "Git command-line interface and conventions"
 msgstr ""
 
 msgid "Git command-line interface and conventions"
 msgstr ""
 

-#: command-list.h:194
+#: command-list.h:195

 msgid "A Git core tutorial for developers"
 msgstr ""
 
 msgid "A Git core tutorial for developers"
 msgstr ""
 

-#: command-list.h:195
+#: command-list.h:196

 msgid "Git for CVS users"
 msgstr ""
 
 msgid "Git for CVS users"
 msgstr ""
 

-#: command-list.h:196
+#: command-list.h:197

 msgid "Tweaking diff output"
 msgstr ""
 
 msgid "Tweaking diff output"
 msgstr ""
 

-#: command-list.h:197
+#: command-list.h:198

 msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 

-#: command-list.h:198
+#: command-list.h:199

 msgid "A Git Glossary"
 msgstr ""
 
 msgid "A Git Glossary"
 msgstr ""
 

-#: command-list.h:199
+#: command-list.h:200

 msgid "Hooks used by Git"
 msgstr ""
 
 msgid "Hooks used by Git"
 msgstr ""
 

-#: command-list.h:200
+#: command-list.h:201

 msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
 
 msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
 

-#: command-list.h:201
+#: command-list.h:202

 msgid "Defining submodule properties"
 msgstr ""
 
 msgid "Defining submodule properties"
 msgstr ""
 

-#: command-list.h:202
+#: command-list.h:203

 msgid "Git namespaces"
 msgstr ""
 
 msgid "Git namespaces"
 msgstr ""
 

-#: command-list.h:203
+#: command-list.h:204

 msgid "Git Repository Layout"
 msgstr ""
 
 msgid "Git Repository Layout"
 msgstr ""
 

-#: command-list.h:204
+#: command-list.h:205

 msgid "Specifying revisions and ranges for Git"
 msgstr ""
 
 msgid "Specifying revisions and ranges for Git"
 msgstr ""
 

-#: command-list.h:205
+#: command-list.h:206

 msgid "A tutorial introduction to Git: part two"
 msgstr ""
 
 msgid "A tutorial introduction to Git: part two"
 msgstr ""
 

-#: command-list.h:206
+#: command-list.h:207

 msgid "A tutorial introduction to Git"
 msgstr ""
 
 msgid "A tutorial introduction to Git"
 msgstr ""
 

-#: command-list.h:207
+#: command-list.h:208

 msgid "An overview of recommended workflows with Git"
 msgstr ""
 
 msgid "An overview of recommended workflows with Git"
 msgstr ""
 

-#: rerere.h:40
+#: rerere.h:44

 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 


@@ -17066,56 +18273,12 @@ msgstr ""
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 

-#: git-rebase.sh:61
-msgid ""
-"Resolve all conflicts manually, mark them as resolved with\n"
-"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
-"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --"
-"abort\"."
-msgstr ""
-
-#: git-rebase.sh:173 git-rebase.sh:454
+#: git-legacy-rebase.sh:426

 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 

-#: git-rebase.sh:184
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase.sh:187
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase.sh:236
-msgid "The pre-rebase hook refused to rebase."
-msgstr ""
-
-#: git-rebase.sh:241
-msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr ""
-
-#: git-rebase.sh:415
-msgid "No rebase in progress?"
-msgstr ""
-
-#: git-rebase.sh:426
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr ""
-
-#: git-rebase.sh:433
-msgid "Cannot read HEAD"
-msgstr ""
-
-#: git-rebase.sh:436
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr ""
-
-#: git-rebase.sh:480
+#: git-legacy-rebase.sh:452

 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"


@@ -17128,90 +18291,60 @@ msgid ""
 "valuable there."
 msgstr ""
 
 "valuable there."
 msgstr ""
 

-#: git-rebase.sh:545
+#: git-legacy-rebase.sh:517

 msgid "error: cannot combine '--signoff' with '--preserve-merges'"
 msgstr ""
 
 msgid "error: cannot combine '--signoff' with '--preserve-merges'"
 msgstr ""
 

-#: git-rebase.sh:556
-msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'"
-msgstr ""
-
-#: git-rebase.sh:562
-msgid "error: cannot combine '--rebase_merges' with '--strategy-option'"
-msgstr ""
-
-#: git-rebase.sh:564
-msgid "error: cannot combine '--rebase_merges' with '--strategy'"
-msgstr ""
-
-#: git-rebase.sh:590
+#: git-legacy-rebase.sh:562

 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 

-#: git-rebase.sh:614
+#: git-legacy-rebase.sh:586

 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 

-#: git-rebase.sh:617 git-rebase.sh:621
+#: git-legacy-rebase.sh:589 git-legacy-rebase.sh:593

 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 

-#: git-rebase.sh:626
+#: git-legacy-rebase.sh:598

 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr ""
 
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr ""
 

-#: git-rebase.sh:652
+#: git-legacy-rebase.sh:624

 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 

-#: git-rebase.sh:685
-msgid "Cannot autostash"
-msgstr ""
-
-#: git-rebase.sh:690
+#: git-legacy-rebase.sh:662

 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 

-#: git-rebase.sh:694
-msgid "Please commit or stash them."
-msgstr ""
-
-#: git-rebase.sh:717
-#, sh-format
-msgid "HEAD is up to date."
-msgstr ""
-
-#: git-rebase.sh:719
+#: git-legacy-rebase.sh:691

 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr ""
 
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr ""
 

-#: git-rebase.sh:727
-#, sh-format
-msgid "HEAD is up to date, rebase forced."
-msgstr ""
-
-#: git-rebase.sh:729
+#: git-legacy-rebase.sh:701

 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 

-#: git-rebase.sh:741
+#: git-legacy-rebase.sh:713

 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 

-#: git-rebase.sh:750
+#: git-legacy-rebase.sh:722

 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 

-#: git-rebase.sh:760
+#: git-legacy-rebase.sh:732

 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""


@@ -17362,26 +18495,26 @@ msgstr ""
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 

-#: git-submodule.sh:188
+#: git-submodule.sh:198

 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 

-#: git-submodule.sh:198
+#: git-submodule.sh:208

 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 

-#: git-submodule.sh:217
+#: git-submodule.sh:227

 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr ""
 
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr ""
 

-#: git-submodule.sh:220
+#: git-submodule.sh:230

 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr ""
 
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr ""
 

-#: git-submodule.sh:226
+#: git-submodule.sh:236

 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"


@@ -17389,22 +18522,22 @@ msgid ""
 "Use -f if you really want to add it."
 msgstr ""
 
 "Use -f if you really want to add it."
 msgstr ""
 

-#: git-submodule.sh:249
+#: git-submodule.sh:259

 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr ""
 
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr ""
 

-#: git-submodule.sh:251
+#: git-submodule.sh:261

 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr ""
 
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr ""
 

-#: git-submodule.sh:259
+#: git-submodule.sh:269

 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 

-#: git-submodule.sh:261
+#: git-submodule.sh:271

 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"


@@ -17415,120 +18548,120 @@ msgid ""
 "option."
 msgstr ""
 
 "option."
 msgstr ""
 

-#: git-submodule.sh:267
+#: git-submodule.sh:277

 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 

-#: git-submodule.sh:279
+#: git-submodule.sh:289

 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:284
+#: git-submodule.sh:294

 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:293
+#: git-submodule.sh:303

 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:565
+#: git-submodule.sh:563

 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:575
+#: git-submodule.sh:573

 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:580
+#: git-submodule.sh:578

 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:603
+#: git-submodule.sh:596

 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:609
+#: git-submodule.sh:602

 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
 
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
 

-#: git-submodule.sh:616
+#: git-submodule.sh:609

 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:617
+#: git-submodule.sh:610

 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:621
+#: git-submodule.sh:614

 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:622
+#: git-submodule.sh:615

 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:627
+#: git-submodule.sh:620

 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:628
+#: git-submodule.sh:621

 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:633
+#: git-submodule.sh:626

 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:634
+#: git-submodule.sh:627

 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 

-#: git-submodule.sh:665
+#: git-submodule.sh:658

 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:761
+#: git-submodule.sh:754

 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 

-#: git-submodule.sh:813
+#: git-submodule.sh:806

 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 

-#: git-submodule.sh:833
+#: git-submodule.sh:826

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 

-#: git-submodule.sh:836
+#: git-submodule.sh:829

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 

-#: git-submodule.sh:839
+#: git-submodule.sh:832

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""


@@ -17538,98 +18671,6 @@ msgstr ""
 msgid "See git-${cmd}(1) for details."
 msgstr ""
 
 msgid "See git-${cmd}(1) for details."
 msgstr ""
 

-#: git-rebase--interactive.sh:43
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"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"
-"x, exec <command> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"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"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724
-msgid "could not detach HEAD"
-msgstr ""
-
-#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--interactive.sh:224
-msgid ""
-"\n"
-"\tHowever, if you remove everything, the rebase will be aborted.\n"
-"\n"
-"\t"
-msgstr ""
-
-#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--interactive.sh:280
-msgid "Could not generate todo list"
-msgstr ""
-

 #: git-rebase--preserve-merges.sh:136
 #, sh-format
 msgid "Rebasing ($new_count/$total)"
 #: git-rebase--preserve-merges.sh:136
 #, sh-format
 msgid "Rebasing ($new_count/$total)"


@@ -17846,13 +18887,35 @@ msgstr ""
 msgid "Could not commit staged changes."
 msgstr ""
 
 msgid "Could not commit staged changes."
 msgstr ""
 

-#: git-rebase--preserve-merges.sh:893
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:853
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"

 msgstr ""
 
 msgstr ""
 

+#: git-rebase--preserve-merges.sh:888
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] ""
+msgstr[1] ""
+

 #: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
 msgid "Could not init rewritten commits"
 msgstr ""
 #: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
 msgid "Could not init rewritten commits"
 msgstr ""


@@ -18368,74 +19431,74 @@ msgstr ""
 msgid "invalid argument %s, expecting --"
 msgstr ""
 
 msgid "invalid argument %s, expecting --"
 msgstr ""
 

-#: git-send-email.perl:130
+#: git-send-email.perl:138

 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 

-#: git-send-email.perl:137 git-send-email.perl:143
+#: git-send-email.perl:145 git-send-email.perl:151

 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 

-#: git-send-email.perl:211 git-send-email.perl:217
+#: git-send-email.perl:219 git-send-email.perl:225

 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 

-#: git-send-email.perl:294
+#: git-send-email.perl:302

 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 

-#: git-send-email.perl:299
+#: git-send-email.perl:307

 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 

-#: git-send-email.perl:317
+#: git-send-email.perl:326

 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 
 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 

-#: git-send-email.perl:383 git-send-email.perl:638
+#: git-send-email.perl:395 git-send-email.perl:650

 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 

-#: git-send-email.perl:386
+#: git-send-email.perl:398

 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
 
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
 

-#: git-send-email.perl:456
+#: git-send-email.perl:468

 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:485
+#: git-send-email.perl:497

 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:513
+#: git-send-email.perl:525

 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 

-#: git-send-email.perl:515
+#: git-send-email.perl:527

 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 

-#: git-send-email.perl:517
+#: git-send-email.perl:529

 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 

-#: git-send-email.perl:522
+#: git-send-email.perl:534

 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 

-#: git-send-email.perl:604
+#: git-send-email.perl:616

 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"


@@ -18445,36 +19508,36 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 

-#: git-send-email.perl:625
+#: git-send-email.perl:637

 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 

-#: git-send-email.perl:649
+#: git-send-email.perl:661

 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr ""
 

-#: git-send-email.perl:660
+#: git-send-email.perl:672

 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 

-#: git-send-email.perl:673
+#: git-send-email.perl:685

 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 
 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 

-#: git-send-email.perl:683
+#: git-send-email.perl:695

 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 

-#: git-send-email.perl:694
+#: git-send-email.perl:706

 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"


@@ -18483,37 +19546,37 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 

-#: git-send-email.perl:718
+#: git-send-email.perl:730

 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 

-#: git-send-email.perl:735
+#: git-send-email.perl:747

 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr ""
 
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr ""
 

-#: git-send-email.perl:778
+#: git-send-email.perl:790

 msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
 #. TRANSLATORS: please keep [y/N] as is.
 msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
 #. TRANSLATORS: please keep [y/N] as is.

-#: git-send-email.perl:813
+#: git-send-email.perl:825

 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 

-#: git-send-email.perl:868
+#: git-send-email.perl:880

 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 

-#: git-send-email.perl:873
+#: git-send-email.perl:885

 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 

-#: git-send-email.perl:881
+#: git-send-email.perl:893

 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"


@@ -18522,20 +19585,20 @@ msgid ""
 "want to send.\n"
 msgstr ""
 
 "want to send.\n"
 msgstr ""
 

-#: git-send-email.perl:900
+#: git-send-email.perl:912

 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 

-#: git-send-email.perl:918
+#: git-send-email.perl:930

 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 

-#: git-send-email.perl:930
+#: git-send-email.perl:942

 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 

-#: git-send-email.perl:988 git-send-email.perl:996
+#: git-send-email.perl:1000 git-send-email.perl:1008

 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""


@@ -18543,16 +19606,16 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
 #. 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:1000
+#: git-send-email.perl:1012

 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 

-#: git-send-email.perl:1317
+#: git-send-email.perl:1329

 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 

-#: git-send-email.perl:1400
+#: git-send-email.perl:1412

 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"


@@ -18569,128 +19632,128 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
 #. 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:1415
+#: git-send-email.perl:1427

 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 

-#: git-send-email.perl:1418
+#: git-send-email.perl:1430

 msgid "Send this email reply required"
 msgstr ""
 
 msgid "Send this email reply required"
 msgstr ""
 

-#: git-send-email.perl:1446
+#: git-send-email.perl:1458

 msgid "The required SMTP server is not properly defined."
 msgstr ""
 
 msgid "The required SMTP server is not properly defined."
 msgstr ""
 

-#: git-send-email.perl:1493
+#: git-send-email.perl:1505

 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 

-#: git-send-email.perl:1498 git-send-email.perl:1502
+#: git-send-email.perl:1510 git-send-email.perl:1514

 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 

-#: git-send-email.perl:1511
+#: git-send-email.perl:1523

 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 

-#: git-send-email.perl:1529
+#: git-send-email.perl:1541

 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 

-#: git-send-email.perl:1532
+#: git-send-email.perl:1544

 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 

-#: git-send-email.perl:1532
+#: git-send-email.perl:1544

 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 

-#: git-send-email.perl:1534
+#: git-send-email.perl:1546

 msgid "Dry-OK. Log says:\n"
 msgstr ""
 
 msgid "Dry-OK. Log says:\n"
 msgstr ""
 

-#: git-send-email.perl:1534
+#: git-send-email.perl:1546

 msgid "OK. Log says:\n"
 msgstr ""
 
 msgid "OK. Log says:\n"
 msgstr ""
 

-#: git-send-email.perl:1546
+#: git-send-email.perl:1558

 msgid "Result: "
 msgstr ""
 
 msgid "Result: "
 msgstr ""
 

-#: git-send-email.perl:1549
+#: git-send-email.perl:1561

 msgid "Result: OK\n"
 msgstr ""
 
 msgid "Result: OK\n"
 msgstr ""
 

-#: git-send-email.perl:1567
+#: git-send-email.perl:1579

 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 
 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 

-#: git-send-email.perl:1614 git-send-email.perl:1634
+#: git-send-email.perl:1626 git-send-email.perl:1646

 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1620
+#: git-send-email.perl:1632

 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1673
+#: git-send-email.perl:1685

 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1698
+#: git-send-email.perl:1720

 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1809
+#: git-send-email.perl:1831

 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 

-#: git-send-email.perl:1816
+#: git-send-email.perl:1838

 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1820
+#: git-send-email.perl:1842

 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 

-#: git-send-email.perl:1850
+#: git-send-email.perl:1872

 msgid "cannot send message as 7bit"
 msgstr ""
 
 msgid "cannot send message as 7bit"
 msgstr ""
 

-#: git-send-email.perl:1858
+#: git-send-email.perl:1880

 msgid "invalid transfer encoding"
 msgstr ""
 
 msgid "invalid transfer encoding"
 msgstr ""
 

-#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961
+#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983

 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 

-#: git-send-email.perl:1902
+#: git-send-email.perl:1924

 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 

-#: git-send-email.perl:1919
+#: git-send-email.perl:1941

 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.

-#: git-send-email.perl:1923
+#: git-send-email.perl:1945

 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""