l10n: git.pot: v2.21.0 round 1 (214 new, 38 removed)

Generate po/git.pot from v2.21.0-rc0-30-g11ad41d4cb (Seventh batch for 2.21)
for git v2.21.0 l10n round 1.

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

diff --git a/po/git.pot b/po/git.pot
index 1313d20ca77f350297c1e9a1152c02eb794de903..521ca2593262cecfb8d68a2b943b64aa3705e0f6 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-12-02 10:55+0800\n"
+"POT-Creation-Date: 2019-02-09 20:54+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:99
+#: advice.c:101

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

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

 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:154
+#: advice.c:156

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

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

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

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

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

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

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

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

 #, 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:170
+#: advice.c:172

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

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

-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:185 builtin/merge.c:1290

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

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

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

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

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

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

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


@@ -86,6 +86,14 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr ""
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr ""
+

 #: apply.c:59
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 #: apply.c:59
 #, c-format
 msgid "unrecognized whitespace option '%s'"


@@ -116,62 +124,62 @@ msgstr ""
 msgid "--cached outside a repository"
 msgstr ""
 
 msgid "--cached outside a repository"
 msgstr ""
 

-#: apply.c:826
+#: apply.c:825

 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 

-#: apply.c:835
+#: apply.c:834

 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr ""
 
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr ""
 

-#: apply.c:909
+#: apply.c:908

 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr ""
 
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr ""
 

-#: apply.c:947
+#: apply.c:946

 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 

-#: apply.c:953
+#: apply.c:952

 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 

-#: apply.c:954
+#: apply.c:953

 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 

-#: apply.c:959
+#: apply.c:958

 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 

-#: apply.c:988
+#: apply.c:987

 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr ""
 

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

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

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

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

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

 #, 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:1568
+#: apply.c:1567

 #, 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,130 +190,130 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

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

 #, 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:1769
+#: apply.c:1768

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

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

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

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

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

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

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

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

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

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

 #, 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:1994
+#: apply.c:1993

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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:3081
+#: apply.c:3080

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

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

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

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

 #, 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:3158
+#: apply.c:3157

 #, 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:3168
+#: apply.c:3167

 #, 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:3176
+#: apply.c:3175

 #, 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:3194
+#: apply.c:3193

 #, 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:3207
+#: apply.c:3206

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

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

 #, 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:3234
+#: apply.c:3233

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


@@ -383,7 +391,8 @@ msgstr ""
 msgid "%s has type %o, expected %o"
 msgstr ""
 
 msgid "%s has type %o, expected %o"
 msgstr ""
 

-#: apply.c:3881 apply.c:3883
+#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846
+#: read-cache.c:1299

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


@@ -438,7 +447,7 @@ msgstr ""
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 

-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

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


@@ -514,7 +523,7 @@ msgstr[1] ""
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 

-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118

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


@@ -538,171 +547,171 @@ msgstr ""
 msgid "unrecognized input"
 msgstr ""
 
 msgid "unrecognized input"
 msgstr ""
 

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

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

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

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

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

 #, 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:4907 apply.c:4922
+#: apply.c:4908 apply.c:4923

 #, 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:4915
+#: apply.c:4916

 #, 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:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

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

-#: 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
+#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263
+#: builtin/pull.c:200 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197

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

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

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

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

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

-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4965 builtin/am.c:2212

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

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

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

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

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

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

 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:4974
+#: apply.c:4975

 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:4976
+#: apply.c:4977

 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:4978
+#: apply.c:4979

 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:4980
+#: apply.c:4981

 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:4982
+#: apply.c:4983

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

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

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

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

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

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

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

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

 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:4993
+#: apply.c:4994

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

-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524

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

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

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

-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
+#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

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

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

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

-#: apply.c:5003 apply.c:5006
+#: apply.c:5004 apply.c:5007

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

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

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

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

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

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

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

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

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

-#: 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
+#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724
+#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/rebase--interactive.c:159

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

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

 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:5021
+#: apply.c:5022

 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:5023 builtin/am.c:2206
+#: apply.c:5024 builtin/am.c:2200

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

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

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


@@ -723,99 +732,118 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 

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

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

-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr ""
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr ""
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr ""
+
+#: archive.c:424
+msgid "current working directory is untracked"
+msgstr ""
+
+#: archive.c:455

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

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

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

-#: archive.c:454 builtin/log.c:1536
+#: archive.c:456 builtin/log.c:1549

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

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

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

-#: 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
+#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

 #: parse-options.h:162
 msgid "file"
 msgstr ""
 
 #: parse-options.h:162
 msgid "file"
 msgstr ""
 

-#: archive.c:457 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: 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
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

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

-#: archive.c:476 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92

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

-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498

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

-#: archive.c:478 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94

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

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

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

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

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

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

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

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

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

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

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


@@ -859,7 +887,7 @@ msgstr ""
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr ""
 
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr ""
 

-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

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


@@ -869,12 +897,17 @@ msgstr ""
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr ""
 
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr ""
 

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

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

-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
+#: attr.c:408

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


@@ -885,38 +918,38 @@ msgstr ""
 msgid "Badly quoted content in file '%s': %s"
 msgstr ""
 
 msgid "Badly quoted content in file '%s': %s"
 msgstr ""
 

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

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

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

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

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

 #, 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:759
+#: bisect.c:763

 #, 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:764
+#: bisect.c:768

 #, 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:772
+#: bisect.c:776

 #, 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"


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

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

 #, 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"


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

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

 #, 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:858
+#: bisect.c:865

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

-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 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:928 builtin/merge.c:138
+#: bisect.c:937 builtin/merge.c:139

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

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

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

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

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

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

 #, 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:1004
+#: bisect.c:1013

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


@@ -978,44 +1011,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:1010
+#: bisect.c:1019

 #, 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:1787
+#: blame.c:1792

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

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

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

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

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

-#: 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
+#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993
+#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936
+#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr ""
 
 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr ""
 

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

 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:1860
+#: blame.c:1865

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

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

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


@@ -1119,27 +1152,27 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 

-#: branch.c:279
+#: branch.c:280

 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr ""
 
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr ""
 

-#: branch.c:299
+#: branch.c:300

 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr ""
 
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr ""
 

-#: branch.c:304
+#: branch.c:305

 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr ""
 
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr ""
 

-#: branch.c:358
+#: branch.c:359

 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr ""
 

-#: branch.c:381
+#: branch.c:382

 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr ""
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr ""


@@ -1154,70 +1187,70 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 

-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763
+#: builtin/commit.c:776

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

-#: bundle.c:141
+#: bundle.c:143

 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 

-#: bundle.c:192
+#: bundle.c:194

 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: bundle.c:199
+#: bundle.c:201

 msgid "The bundle records a complete history."
 msgstr ""
 
 msgid "The bundle records a complete history."
 msgstr ""
 

-#: bundle.c:201
+#: bundle.c:203

 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: bundle.c:267
+#: bundle.c:269

 msgid "unable to dup bundle descriptor"
 msgstr ""
 
 msgid "unable to dup bundle descriptor"
 msgstr ""
 

-#: bundle.c:274
+#: bundle.c:276

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

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

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

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

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

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

 #, 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:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

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

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

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

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

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

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

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


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

-#: 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
+#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

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


@@ -1250,118 +1283,159 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 

-#: commit.c:1115
+#: commit.c:1122

 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 

-#: commit.c:1118
+#: commit.c:1125

 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 

-#: commit.c:1121
+#: commit.c:1128

 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 

-#: commit.c:1124
+#: commit.c:1131

 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 

-#: commit.c:1378
+#: commit.c:1385

 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:108
+#: commit-graph.c:101

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

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

 #, 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:122
+#: commit-graph.c:143

 #, 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:129
+#: commit-graph.c:150

 #, 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:153
+#: commit-graph.c:173
+msgid "chunk lookup table entry missing; graph file may be incomplete"
+msgstr ""
+
+#: commit-graph.c:184

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

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

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

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

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

-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:671 builtin/pack-objects.c:2646

 #, 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:651
-msgid "Annotating commits in commit graph"
+#: commit-graph.c:704
+msgid "Loading known commits in commit graph"

 msgstr ""
 
 msgstr ""
 

-#: commit-graph.c:691
-msgid "Computing commit graph generation numbers"
+#: commit-graph.c:720
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:732
+msgid "Clearing commit marks in commit graph"

 msgstr ""
 
 msgstr ""
 

-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
+#: commit-graph.c:752
+msgid "Computing commit graph generation numbers"

 msgstr ""
 
 msgstr ""
 

-#: commit-graph.c:812
+#: commit-graph.c:869
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:882

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

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

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

-#: commit-graph.c:868
+#: commit-graph.c:898
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:930
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:943
+msgid "Counting distinct commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:956

 #, 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:895
+#: commit-graph.c:965
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:989

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

-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:996 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:1002
+#: commit-graph.c:1036
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1109

 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
+#: commit-graph.c:1153

 msgid "Verifying commits in commit graph"
 msgstr ""
 
 msgid "Verifying commits in commit graph"
 msgstr ""
 

-#: compat/obstack.c:405 compat/obstack.c:407
+#: compat/obstack.c:406 compat/obstack.c:408

 msgid "memory exhausted"
 msgstr ""
 
 msgid "memory exhausted"
 msgstr ""
 


@@ -1398,7 +1472,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:2296
+#: config.c:378 sequencer.c:2330

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


@@ -1534,7 +1608,7 @@ msgstr ""
 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:1481 builtin/pack-objects.c:3391
+#: config.c:1481 builtin/pack-objects.c:3394

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


@@ -1607,62 +1681,62 @@ msgstr ""
 msgid "failed to write new configuration file %s"
 msgstr ""
 
 msgid "failed to write new configuration file %s"
 msgstr ""
 

-#: config.c:2717 config.c:3041
+#: config.c:2716 config.c:3040

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

-#: config.c:2728
+#: config.c:2727

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

-#: config.c:2763 builtin/config.c:327
+#: config.c:2762 builtin/config.c:328

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

-#: config.c:2788
+#: config.c:2787

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

-#: config.c:2801 config.c:3054
+#: config.c:2800 config.c:3053

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

-#: config.c:2812
+#: config.c:2811

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

-#: config.c:2821 config.c:3059
+#: config.c:2820 config.c:3058

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

-#: config.c:2906 config.c:3156
+#: config.c:2905 config.c:3155

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

-#: config.c:2940
+#: config.c:2939

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

-#: config.c:2942 builtin/remote.c:782
+#: config.c:2941 builtin/remote.c:782

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

-#: config.c:3032
+#: config.c:3031

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

-#: config.c:3199
+#: config.c:3198

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


@@ -1711,57 +1785,52 @@ 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:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: connect.c:316
+#: connect.c:313

 msgid "invalid packet"
 msgstr ""
 
 msgid "invalid packet"
 msgstr ""
 

-#: connect.c:336
+#: connect.c:333

 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr ""
 
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr ""
 

-#: connect.c:444
+#: connect.c:441

 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr ""
 

-#: connect.c:448
+#: connect.c:445

 msgid "expected flush after ref listing"
 msgstr ""
 
 msgid "expected flush after ref listing"
 msgstr ""
 

-#: connect.c:547
+#: connect.c:544

 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr ""
 
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr ""
 

-#: connect.c:598
+#: connect.c:595

 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 

-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698

 #, c-format
 msgid "Looking up %s ... "
 msgstr ""
 
 #, c-format
 msgid "Looking up %s ... "
 msgstr ""
 

-#: connect.c:642
+#: connect.c:639

 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "

-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714

 #, c-format
 msgid ""
 "done.\n"
 "Connecting to %s (port %s) ... "
 msgstr ""
 
 #, c-format
 msgid ""
 "done.\n"
 "Connecting to %s (port %s) ... "
 msgstr ""
 

-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742

 #, c-format
 msgid ""
 "unable to connect to %s:\n"
 #, c-format
 msgid ""
 "unable to connect to %s:\n"


@@ -1769,61 +1838,61 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748

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

-#: connect.c:705
+#: connect.c:702

 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr ""
 
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr ""
 

-#: connect.c:711
+#: connect.c:708

 #, c-format
 msgid "unknown port %s"
 msgstr ""
 
 #, c-format
 msgid "unknown port %s"
 msgstr ""
 

-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171

 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr ""
 
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr ""
 

-#: connect.c:850
+#: connect.c:847

 #, c-format
 msgid "strange port '%s' blocked"
 msgstr ""
 
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr ""
 

-#: connect.c:860
+#: connect.c:857

 #, c-format
 msgid "cannot start proxy %s"
 msgstr ""
 
 #, c-format
 msgid "cannot start proxy %s"
 msgstr ""
 

-#: connect.c:927
+#: connect.c:924

 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 

-#: connect.c:1122
+#: connect.c:1119

 msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 
 msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 

-#: connect.c:1134
+#: connect.c:1131

 msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 
 msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 

-#: connect.c:1151
+#: connect.c:1148

 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 

-#: connect.c:1262
+#: connect.c:1259

 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr ""
 
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr ""
 

-#: connect.c:1307
+#: connect.c:1304

 msgid "unable to fork"
 msgstr ""
 
 msgid "unable to fork"
 msgstr ""
 

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

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


@@ -1839,90 +1908,90 @@ msgstr ""
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
 msgid "failed to close rev-list's stdin"
 msgstr ""
 

-#: convert.c:194
+#: convert.c:193

 #, c-format
 msgid "illegal crlf_action %d"
 msgstr ""
 
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr ""
 

-#: convert.c:207
+#: convert.c:206

 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr ""
 
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr ""
 

-#: convert.c:209
+#: convert.c:208

 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory"
 msgstr ""
 
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory"
 msgstr ""
 

-#: convert.c:217
+#: convert.c:216

 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr ""
 
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr ""
 

-#: convert.c:219
+#: convert.c:218

 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory"
 msgstr ""
 
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory"
 msgstr ""
 

-#: convert.c:280
+#: convert.c:279

 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 

-#: convert.c:287
+#: convert.c:286

 #, c-format
 msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
 "tree-encoding."
 msgstr ""
 
 #, c-format
 msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
 "tree-encoding."
 msgstr ""
 

-#: convert.c:305
+#: convert.c:304

 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr ""
 
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr ""
 

-#: convert.c:307
+#: convert.c:306

 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
 "%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
 
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
 "%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
 

-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495

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

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

 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 

-#: convert.c:674
+#: convert.c:673

 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr ""
 

-#: convert.c:694
+#: convert.c:693

 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr ""
 

-#: convert.c:701
+#: convert.c:700

 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr ""
 
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr ""
 

-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738

 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr ""
 
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr ""
 

-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796

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


@@ -1956,53 +2025,53 @@ msgstr ""
 msgid "%s: smudge filter %s failed"
 msgstr ""
 
 msgid "%s: smudge filter %s failed"
 msgstr ""
 

-#: date.c:116
+#: date.c:137

 msgid "in the future"
 msgstr ""
 
 msgid "in the future"
 msgstr ""
 

-#: date.c:122
+#: date.c:143

 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 

-#: date.c:129
+#: date.c:150

 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 

-#: date.c:136
+#: date.c:157

 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] ""
 msgstr[1] ""
 

-#: date.c:143
+#: date.c:164

 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] ""
 msgstr[1] ""
 

-#: date.c:149
+#: date.c:170

 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] ""
 msgstr[1] ""
 

-#: date.c:156
+#: date.c:177

 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] ""
 msgstr[1] ""
 

-#: date.c:167
+#: date.c:188

 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"


@@ -2010,40 +2079,40 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: "%s" is "<n> years"
 msgstr[1] ""
 
 #. TRANSLATORS: "%s" is "<n> years"

-#: date.c:170
+#: date.c:191

 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] ""
 msgstr[1] ""
 

-#: date.c:175 date.c:180
+#: date.c:196 date.c:201

 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
 msgstr[0] ""
 msgstr[1] ""
 

-#: delta-islands.c:268
+#: delta-islands.c:272

 msgid "Propagating island marks"
 msgstr ""
 
 msgid "Propagating island marks"
 msgstr ""
 

-#: delta-islands.c:286
+#: delta-islands.c:290

 #, c-format
 msgid "bad tree object %s"
 msgstr ""
 
 #, c-format
 msgid "bad tree object %s"
 msgstr ""
 

-#: delta-islands.c:330
+#: delta-islands.c:334

 #, c-format
 msgid "failed to load island regex for '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "failed to load island regex for '%s': %s"
 msgstr ""
 

-#: delta-islands.c:386
+#: delta-islands.c:390

 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
 msgstr ""
 
 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
 msgstr ""
 

-#: delta-islands.c:462
+#: delta-islands.c:466

 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr ""
 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr ""


@@ -2078,106 +2147,108 @@ msgid ""
 "'dimmed-zebra', 'plain'"
 msgstr ""
 
 "'dimmed-zebra', 'plain'"
 msgstr ""
 

-#: diff.c:316
+#: diff.c:319

 #, c-format
 #, c-format

-msgid "ignoring unknown color-moved-ws mode '%s'"
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

 msgstr ""
 
 msgstr ""
 

-#: diff.c:323
+#: diff.c:327

 msgid ""
 msgid ""

-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"

 msgstr ""
 
 msgstr ""
 

-#: diff.c:394
+#: diff.c:400

 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 

-#: diff.c:454
+#: diff.c:460

 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
 

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

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

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

 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:4485
+#: diff.c:4556

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

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

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

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

 #, 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:4743
+#: diff.c:4814

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

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

 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:5826
+#: diff.c:5903

 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:5829
+#: diff.c:5906

 #, 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:576
+#: dir.c:538

 #, 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:965
+#: dir.c:927

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

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

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

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

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

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

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

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

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

-#: dir.c:3092 dir.c:3097
+#: dir.c:3054 dir.c:3059

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

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

 #, 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 ""


@@ -2219,235 +2290,239 @@ msgstr ""
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 

-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+#: fetch-pack.c:165

 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:183
+#: fetch-pack.c:185

 #, 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:253
+#: fetch-pack.c:256

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

-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:358 fetch-pack.c:1264

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

-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:364 fetch-pack.c:1271

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

-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:366 fetch-pack.c:1273

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

-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:369 fetch-pack.c:1276

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

-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:371 fetch-pack.c:1278

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

-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:374 fetch-pack.c:1282

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: fetch-pack.c:764
+#: fetch-pack.c:740

 #, c-format
 msgid "already have %s (%s)"
 msgstr ""
 
 #, c-format
 msgid "already have %s (%s)"
 msgstr ""
 

-#: fetch-pack.c:803
+#: fetch-pack.c:779

 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 

-#: fetch-pack.c:811
+#: fetch-pack.c:787

 msgid "protocol error: bad pack header"
 msgstr ""
 
 msgid "protocol error: bad pack header"
 msgstr ""
 

-#: fetch-pack.c:879
+#: fetch-pack.c:855

 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 

-#: fetch-pack.c:895
+#: fetch-pack.c:871

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

-#: fetch-pack.c:897
+#: fetch-pack.c:873

 msgid "error in sideband demultiplexer"
 msgstr ""
 
 msgid "error in sideband demultiplexer"
 msgstr ""
 

-#: fetch-pack.c:926
+#: fetch-pack.c:902

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

-#: fetch-pack.c:930
+#: fetch-pack.c:906

 msgid "Server supports multi_ack_detailed"
 msgstr ""
 
 msgid "Server supports multi_ack_detailed"
 msgstr ""
 

-#: fetch-pack.c:933
+#: fetch-pack.c:909

 msgid "Server supports no-done"
 msgstr ""
 
 msgid "Server supports no-done"
 msgstr ""
 

-#: fetch-pack.c:939
+#: fetch-pack.c:915

 msgid "Server supports multi_ack"
 msgstr ""
 
 msgid "Server supports multi_ack"
 msgstr ""
 

-#: fetch-pack.c:943
+#: fetch-pack.c:919

 msgid "Server supports side-band-64k"
 msgstr ""
 
 msgid "Server supports side-band-64k"
 msgstr ""
 

-#: fetch-pack.c:947
+#: fetch-pack.c:923

 msgid "Server supports side-band"
 msgstr ""
 
 msgid "Server supports side-band"
 msgstr ""
 

-#: fetch-pack.c:951
+#: fetch-pack.c:927

 msgid "Server supports allow-tip-sha1-in-want"
 msgstr ""
 
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr ""
 

-#: fetch-pack.c:955
+#: fetch-pack.c:931

 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr ""
 
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr ""
 

-#: fetch-pack.c:965
+#: fetch-pack.c:941

 msgid "Server supports ofs-delta"
 msgstr ""
 
 msgid "Server supports ofs-delta"
 msgstr ""
 

-#: fetch-pack.c:971 fetch-pack.c:1158
+#: fetch-pack.c:947 fetch-pack.c:1140

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

-#: fetch-pack.c:979
+#: fetch-pack.c:955

 #, c-format
 msgid "Server version is %.*s"
 msgstr ""
 
 #, c-format
 msgid "Server version is %.*s"
 msgstr ""
 

-#: fetch-pack.c:985
+#: fetch-pack.c:961

 msgid "Server does not support --shallow-since"
 msgstr ""
 
 msgid "Server does not support --shallow-since"
 msgstr ""
 

-#: fetch-pack.c:989
+#: fetch-pack.c:965

 msgid "Server does not support --shallow-exclude"
 msgstr ""
 
 msgid "Server does not support --shallow-exclude"
 msgstr ""
 

-#: fetch-pack.c:991
+#: fetch-pack.c:967

 msgid "Server does not support --deepen"
 msgstr ""
 
 msgid "Server does not support --deepen"
 msgstr ""
 

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

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

-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:996 fetch-pack.c:1419

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

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

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

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

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

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

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

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

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

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

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

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

 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 

-#: fetch-pack.c:1261
+#: fetch-pack.c:1246

 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 

-#: fetch-pack.c:1298
+#: fetch-pack.c:1287

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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 ""


@@ -2475,8 +2550,8 @@ msgstr ""
 msgid "'%s': unable to read %s"
 msgstr ""
 
 msgid "'%s': unable to read %s"
 msgstr ""
 

-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135

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


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

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

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

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

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

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

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

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

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

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

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

-#: help.c:517
+#: help.c:519

 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 

-#: help.c:522
+#: help.c:524

 msgid "External commands"
 msgstr ""
 
 msgid "External commands"
 msgstr ""
 

-#: help.c:530
+#: help.c:539

 msgid "Command aliases"
 msgstr ""
 
 msgid "Command aliases"
 msgstr ""
 

-#: help.c:594
+#: help.c:603

 #, 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:653
+#: help.c:662

 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:675
+#: help.c:684

 #, 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:680
+#: help.c:689

 #, 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:685
+#: help.c:694

 #, 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:693
+#: help.c:702

 #, 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:697
+#: help.c:706

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


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

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

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

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

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

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

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


@@ -2675,20 +2750,20 @@ msgstr ""
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 

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

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

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

 msgid "multiple filter-specs cannot be combined"
 msgstr ""
 
 #: list-objects-filter-options.c:58
 msgid "multiple filter-specs cannot be combined"
 msgstr ""
 
 #: list-objects-filter-options.c:58

-msgid "only 'tree:0' is supported"
+msgid "expected 'tree:<depth>'"

 msgstr ""
 
 msgstr ""
 

-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:152

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


@@ -2713,94 +2788,94 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr ""
 
 msgid "failed to read the cache"
 msgstr ""
 

-#: 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
+#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918
+#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

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

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

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

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

 #, 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:353
+#: merge-recursive.c:364

 #, 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:435
+#: merge-recursive.c:447

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

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

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

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

 #, 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:931 merge-recursive.c:950
+#: merge-recursive.c:927 merge-recursive.c:946

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

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

 #, 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:982 builtin/cat-file.c:39
+#: merge-recursive.c:978 builtin/cat-file.c:40

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

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

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

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

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

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

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

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

 #, 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:1212
+#: merge-recursive.c:1211

 #, 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:1219
+#: merge-recursive.c:1218

 #, 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:1226
+#: merge-recursive.c:1225

 #, 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:1234 merge-recursive.c:1246
+#: merge-recursive.c:1233 merge-recursive.c:1245

 #, 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:1237 merge-recursive.c:1249
+#: merge-recursive.c:1236 merge-recursive.c:1248

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


@@ -2835,104 +2910,103 @@ msgstr ""
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 

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

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

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

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

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

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

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

 #, 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:1483
+#: merge-recursive.c:1486

 #, 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:1488
+#: merge-recursive.c:1491

 #, 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:1495
+#: merge-recursive.c:1498

 #, 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:1500
+#: merge-recursive.c:1503

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

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

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

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

-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

 #, 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:1602
+#: merge-recursive.c:1643
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1706
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
+msgstr ""
+
+#: merge-recursive.c:1734

 #, 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:1607
+#: merge-recursive.c:1739

 #, 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:1633
+#: merge-recursive.c:1759

 #, 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:1638
+#: merge-recursive.c:1764

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

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

 #, 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:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr ""
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2064

 #, 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 "


@@ -2940,149 +3014,144 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 
 "getting a majority of the files."
 msgstr ""
 

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

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

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

 #, 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:2331
+#: merge-recursive.c:2443

 #, 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:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr ""
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:3022

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3182 git-submodule.sh:861

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

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

 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
 #: merge-recursive.c:3216
 #, c-format
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
 #: merge-recursive.c:3216
 #, c-format

+msgid "Adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:3319
+#, c-format

 msgid "Removing %s"
 msgstr ""
 
 msgid "Removing %s"
 msgstr ""
 

-#: merge-recursive.c:3242
+#: merge-recursive.c:3345

 msgid "file/directory"
 msgstr ""
 
 msgid "file/directory"
 msgstr ""
 

-#: merge-recursive.c:3248
+#: merge-recursive.c:3351

 msgid "directory/file"
 msgstr ""
 
 msgid "directory/file"
 msgstr ""
 

-#: merge-recursive.c:3255
+#: merge-recursive.c:3358

 #, 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:3264
+#: merge-recursive.c:3367

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

-#: merge-recursive.c:3300
+#: merge-recursive.c:3376
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
+
+#: merge-recursive.c:3417

 #, 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:3311
+#: merge-recursive.c:3428

 msgid "Already up to date!"
 msgstr ""
 
 msgid "Already up to date!"
 msgstr ""
 

-#: merge-recursive.c:3320
+#: merge-recursive.c:3437

 #, 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:3419
+#: merge-recursive.c:3536

 msgid "Merging:"
 msgstr ""
 
 msgid "Merging:"
 msgstr ""
 

-#: merge-recursive.c:3432
+#: merge-recursive.c:3549

 #, 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:3471
+#: merge-recursive.c:3588

 msgid "merge returned no commit"
 msgstr ""
 
 msgid "merge returned no commit"
 msgstr ""
 

-#: merge-recursive.c:3537
+#: merge-recursive.c:3654

 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 

-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

 msgid "Unable to write index."
 msgstr ""
 
 msgid "Unable to write index."
 msgstr ""
 


@@ -3198,22 +3267,22 @@ msgstr ""
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 

-#: name-hash.c:532
+#: name-hash.c:531

 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr ""
 

-#: name-hash.c:554
+#: name-hash.c:553

 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr ""
 

-#: name-hash.c:560
+#: name-hash.c:559

 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr ""
 

-#: notes-merge.c:275
+#: notes-merge.c:277

 #, 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"


@@ -3221,21 +3290,21 @@ 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:282
+#: notes-merge.c:284

 #, 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 ""
 

-#: notes-utils.c:45
+#: notes-utils.c:46

 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 

-#: notes-utils.c:104
+#: notes-utils.c:105

 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr ""
 

-#: notes-utils.c:114
+#: notes-utils.c:115

 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""


@@ -3244,7 +3313,7 @@ msgstr ""
 #. the environment variable, the second %s is
 #. its value.
 #.
 #. the environment variable, the second %s is
 #. its value.
 #.

-#: notes-utils.c:144
+#: notes-utils.c:145

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


@@ -3254,45 +3323,105 @@ msgstr ""
 msgid "invalid object type \"%s\""
 msgstr ""
 
 msgid "invalid object type \"%s\""
 msgstr ""
 

-#: object.c:173
+#: object.c:174

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

-#: object.c:233
+#: object.c:234

 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr ""
 
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr ""
 

-#: object.c:246
+#: object.c:247

 #, c-format
 msgid "unable to parse object: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to parse object: %s"
 msgstr ""
 

-#: object.c:266 object.c:277
+#: object.c:267 object.c:278

 #, c-format
 #, c-format

-msgid "sha1 mismatch %s"
+msgid "hash mismatch %s"

 msgstr ""
 
 #: packfile.c:607
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
 msgstr ""
 
 #: packfile.c:607
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 

-#: packfile.c:1864
+#: packfile.c:1870

 #, 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:1868
+#: packfile.c:1874

 #, 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 ""
 

-#: parse-options.c:672
+#: parse-options.c:35
+#, c-format
+msgid "%s requires a value"
+msgstr ""
+
+#: parse-options.c:69
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr ""
+
+#: parse-options.c:74
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr ""
+
+#: parse-options.c:88 parse-options.c:92 parse-options.c:260
+#, c-format
+msgid "%s takes no value"
+msgstr ""
+
+#: parse-options.c:90
+#, c-format
+msgid "%s isn't available"
+msgstr ""
+
+#: parse-options.c:178
+#, c-format
+msgid "%s expects a numerical value"
+msgstr ""
+
+#: parse-options.c:194
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+
+#: parse-options.c:322
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr ""
+
+#: parse-options.c:356 parse-options.c:364
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr ""
+
+#: parse-options.c:649
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
+
+#: parse-options.c:651
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
+
+#: parse-options.c:653
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
+
+#: parse-options.c:675

 msgid "..."
 msgstr ""
 
 msgid "..."
 msgstr ""
 

-#: parse-options.c:691
+#: parse-options.c:694

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


@@ -3300,26 +3429,36 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.

-#: parse-options.c:697
+#: parse-options.c:700

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

-#: parse-options.c:700
+#: parse-options.c:703

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

-#: parse-options.c:739
+#: parse-options.c:742

 msgid "-NUM"
 msgstr ""
 
 msgid "-NUM"
 msgstr ""
 

-#: parse-options-cb.c:37
+#: parse-options-cb.c:21
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr ""
+
+#: parse-options-cb.c:38

 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr ""
 

-#: parse-options-cb.c:109
+#: parse-options-cb.c:51
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+
+#: parse-options-cb.c:110

 #, c-format
 msgid "malformed object name '%s'"
 msgstr ""
 #, c-format
 msgid "malformed object name '%s'"
 msgstr ""


@@ -3329,73 +3468,73 @@ msgstr ""
 msgid "Could not make %s writable by group"
 msgstr ""
 
 msgid "Could not make %s writable by group"
 msgstr ""
 

-#: pathspec.c:129
+#: pathspec.c:128

 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 

-#: pathspec.c:147
+#: pathspec.c:146

 msgid "Only one 'attr:' specification is allowed."
 msgstr ""
 
 msgid "Only one 'attr:' specification is allowed."
 msgstr ""
 

-#: pathspec.c:150
+#: pathspec.c:149

 msgid "attr spec must not be empty"
 msgstr ""
 
 msgid "attr spec must not be empty"
 msgstr ""
 

-#: pathspec.c:193
+#: pathspec.c:192

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

-#: pathspec.c:258
+#: pathspec.c:257

 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 

-#: pathspec.c:265
+#: pathspec.c:264

 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
 
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
 

-#: pathspec.c:305
+#: pathspec.c:304

 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr ""
 
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr ""
 

-#: pathspec.c:326
+#: pathspec.c:325

 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 

-#: pathspec.c:331
+#: pathspec.c:330

 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 

-#: pathspec.c:369
+#: pathspec.c:368

 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 

-#: pathspec.c:428
+#: pathspec.c:427

 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 

-#: pathspec.c:441
+#: pathspec.c:440

 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr ""
 
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr ""
 

-#: pathspec.c:515
+#: pathspec.c:514

 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr ""
 
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr ""
 

-#: pathspec.c:525
+#: pathspec.c:524

 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 

-#: pathspec.c:592
+#: pathspec.c:591

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


@@ -3404,50 +3543,55 @@ msgstr ""
 msgid "flush packet write failed"
 msgstr ""
 
 msgid "flush packet write failed"
 msgstr ""
 

-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:144 pkt-line.c:230

 msgid "protocol error: impossibly long line"
 msgstr ""
 
 msgid "protocol error: impossibly long line"
 msgstr ""
 

-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:160 pkt-line.c:162

 msgid "packet write with format failed"
 msgstr ""
 
 msgid "packet write with format failed"
 msgstr ""
 

-#: pkt-line.c:192
+#: pkt-line.c:194

 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 

-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:201 pkt-line.c:208

 msgid "packet write failed"
 msgstr ""
 
 msgid "packet write failed"
 msgstr ""
 

-#: pkt-line.c:291
+#: pkt-line.c:293

 msgid "read error"
 msgstr ""
 
 msgid "read error"
 msgstr ""
 

-#: pkt-line.c:299
+#: pkt-line.c:301

 msgid "the remote end hung up unexpectedly"
 msgstr ""
 
 msgid "the remote end hung up unexpectedly"
 msgstr ""
 

-#: pkt-line.c:327
+#: pkt-line.c:329

 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 

-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:339 pkt-line.c:344

 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr ""
 
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr ""
 

-#: preload-index.c:118
+#: pkt-line.c:353
+#, c-format
+msgid "remote error: %s"
+msgstr ""
+
+#: preload-index.c:119

 msgid "Refreshing index"
 msgstr ""
 
 msgid "Refreshing index"
 msgstr ""
 

-#: preload-index.c:137
+#: preload-index.c:138

 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr ""
 

-#: pretty.c:962
+#: pretty.c:963

 msgid "unable to parse --pretty format"
 msgstr ""
 
 msgid "unable to parse --pretty format"
 msgstr ""
 


@@ -3459,7 +3603,7 @@ msgstr ""
 msgid "could not read `log` output"
 msgstr ""
 
 msgid "could not read `log` output"
 msgstr ""
 

-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:74 sequencer.c:4828

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


@@ -3473,77 +3617,195 @@ msgstr ""
 msgid "could not parse log for '%s'"
 msgstr ""
 
 msgid "could not parse log for '%s'"
 msgstr ""
 

-#: read-cache.c:1490
+#: read-cache.c:673
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+
+#: read-cache.c:689
+msgid "cannot create an empty blob in the object database"
+msgstr ""
+
+#: read-cache.c:710
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+
+#: read-cache.c:765
+#, c-format
+msgid "unable to index file '%s'"
+msgstr ""
+
+#: read-cache.c:784
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr ""
+
+#: read-cache.c:795
+#, c-format
+msgid "unable to stat '%s'"
+msgstr ""
+
+#: read-cache.c:1304
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c:1489

 msgid "Refresh index"
 msgstr ""
 
 msgid "Refresh index"
 msgstr ""
 

-#: read-cache.c:1604
+#: read-cache.c:1603

 #, 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:1614
+#: read-cache.c:1613

 #, 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:1792
+#: read-cache.c:1684
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#: read-cache.c:1687
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+#: read-cache.c:1696
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#: read-cache.c:1726
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+
+#: read-cache.c:1728
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr ""
+
+#: read-cache.c:1765
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr ""
+
+#: read-cache.c:1781

 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
 #, 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
+#: read-cache.c:1836
+msgid "unordered stage entries in index"
+msgstr ""
+
+#: read-cache.c:1839
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
+
+#: read-cache.c:1842
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr ""
+
+#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294
+#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330

 msgid "index file corrupt"
 msgstr ""
 
 msgid "index file corrupt"
 msgstr ""
 

-#: read-cache.c:2101
+#: read-cache.c:2090

 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 

-#: read-cache.c:2114
+#: read-cache.c:2103

 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 

-#: read-cache.c:2201
+#: read-cache.c:2136
+#, c-format
+msgid "%s: index file open failed"
+msgstr ""
+
+#: read-cache.c:2140
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr ""
+
+#: read-cache.c:2144
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#: read-cache.c:2148
+#, c-format
+msgid "%s: unable to map index file"
+msgstr ""
+
+#: read-cache.c:2190

 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 

-#: read-cache.c:2228
+#: read-cache.c:2217

 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 

-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2239
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr ""
+
+#: read-cache.c:2274
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
+
+#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

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

-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

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

-#: read-cache.c:3068
+#: read-cache.c:3057

 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 

-#: read-cache.c:3080
+#: read-cache.c:3069

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

+#: read-cache.c:3088
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
+
+#: read-cache.c:3237
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr ""
+

 #: rebase-interactive.c:10
 msgid ""
 "\n"
 #: rebase-interactive.c:10
 msgid ""
 "\n"


@@ -3598,8 +3860,8 @@ msgstr ""
 msgid "Note that empty commits are commented out"
 msgstr ""
 
 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
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219
+#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

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


@@ -3614,7 +3876,7 @@ msgstr ""
 msgid "ignoring dangling symref %s"
 msgstr ""
 
 msgid "ignoring dangling symref %s"
 msgstr ""
 

-#: refs.c:585 ref-filter.c:1951
+#: refs.c:585 ref-filter.c:1976

 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""


@@ -3639,15 +3901,15 @@ msgstr ""
 msgid "unexpected object ID when writing '%s'"
 msgstr ""
 
 msgid "unexpected object ID when writing '%s'"
 msgstr ""
 

-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
+#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675
+#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

 #: 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:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:713 builtin/rebase.c:575

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


@@ -3722,7 +3984,7 @@ msgstr ""
 msgid "invalid refspec '%s'"
 msgstr ""
 
 msgid "invalid refspec '%s'"
 msgstr ""
 

-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:39 wt-status.c:1861

 msgid "gone"
 msgstr ""
 
 msgid "gone"
 msgstr ""
 


@@ -3771,148 +4033,153 @@ msgstr ""
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:235
+#: ref-filter.c:245
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr ""
+
+#: ref-filter.c:253

 #, c-format
 #, c-format

-msgid "%%(objectsize) does not take arguments"
+msgid "%%(deltabase) does not take arguments"

 msgstr ""
 
 msgstr ""
 

-#: ref-filter.c:247
+#: ref-filter.c:265

 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:256
+#: ref-filter.c:274

 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr ""
 
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:278
+#: ref-filter.c:296

 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 

-#: ref-filter.c:307
+#: ref-filter.c:325

 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 

-#: ref-filter.c:309
+#: ref-filter.c:327

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

-#: ref-filter.c:324
+#: ref-filter.c:342

 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr ""
 
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr ""
 

-#: ref-filter.c:328
+#: ref-filter.c:346

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

-#: ref-filter.c:358
+#: ref-filter.c:376

 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 

-#: ref-filter.c:370
+#: ref-filter.c:388

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

-#: ref-filter.c:377
+#: ref-filter.c:395

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

-#: ref-filter.c:386
+#: ref-filter.c:404

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

-#: ref-filter.c:394
+#: ref-filter.c:412

 #, 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:412
+#: ref-filter.c:430

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

-#: ref-filter.c:508
+#: ref-filter.c:527

 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 

-#: ref-filter.c:535
+#: ref-filter.c:554

 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 

-#: ref-filter.c:539
+#: ref-filter.c:558

 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 

-#: ref-filter.c:663
+#: ref-filter.c:682

 #, 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:726
+#: ref-filter.c:745

 #, 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:728
+#: ref-filter.c:747

 #, 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:730
+#: ref-filter.c:749

 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 

-#: ref-filter.c:758
+#: ref-filter.c:777

 #, 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:760
+#: ref-filter.c:779

 #, 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:762
+#: ref-filter.c:781

 #, 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:777
+#: ref-filter.c:796

 #, 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:834
+#: ref-filter.c:853

 #, c-format
 msgid "malformed format string %s"
 msgstr ""
 
 #, c-format
 msgid "malformed format string %s"
 msgstr ""
 

-#: ref-filter.c:1424
+#: ref-filter.c:1447

 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 

-#: ref-filter.c:1427
+#: ref-filter.c:1450

 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr ""
 
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr ""
 

-#: ref-filter.c:1430
+#: ref-filter.c:1453

 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""


@@ -3920,7 +4187,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:1438
+#: ref-filter.c:1461

 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""


@@ -3928,142 +4195,266 @@ 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:1445
+#: ref-filter.c:1468

 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 

-#: ref-filter.c:1449
+#: ref-filter.c:1472

 msgid "(no branch)"
 msgstr ""
 
 msgid "(no branch)"
 msgstr ""
 

-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1506 ref-filter.c:1663

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

-#: ref-filter.c:1491
+#: ref-filter.c:1516

 #, 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:1857
+#: ref-filter.c:1882

 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 

-#: ref-filter.c:1946
+#: ref-filter.c:1971

 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 

-#: ref-filter.c:2232
+#: ref-filter.c:2257

 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 

-#: ref-filter.c:2338
+#: ref-filter.c:2352

 #, c-format
 #, c-format

-msgid "malformed object name %s"
+msgid "option `%s' is incompatible with --merged"

 msgstr ""
 
 msgstr ""
 

-#: remote.c:607
+#: ref-filter.c:2355

 #, c-format
 #, c-format

-msgid "Cannot fetch both %s and %s to %s"
+msgid "option `%s' is incompatible with --no-merged"

 msgstr ""
 
 msgstr ""
 

-#: remote.c:611
+#: ref-filter.c:2365

 #, c-format
 #, c-format

-msgid "%s usually tracks %s, not %s"
+msgid "malformed object name %s"

 msgstr ""
 
 msgstr ""
 

-#: remote.c:615
+#: ref-filter.c:2370

 #, c-format
 #, c-format

-msgid "%s tracks both %s and %s"
+msgid "option `%s' must point to a commit"

 msgstr ""
 
 msgstr ""
 

-#: remote.c:623
-msgid "Internal error"
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"

 msgstr ""
 
 msgstr ""
 

-#: remote.c:1569 remote.c:1670
-msgid "HEAD does not point to a branch"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"

 msgstr ""
 
 msgstr ""
 

-#: remote.c:1578
-#, c-format
-msgid "no such branch: '%s'"
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"

 msgstr ""
 
 msgstr ""
 

-#: remote.c:1581
+#: remote.c:608

 #, c-format
 #, c-format

-msgid "no upstream configured for branch '%s'"
+msgid "Cannot fetch both %s and %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: remote.c:1587
+#: remote.c:612
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr ""
+
+#: remote.c:616
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr ""
+
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr ""
+
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr ""
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr ""
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr ""
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+
+#: remote.c:1040
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+
+#: remote.c:1045
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+
+#: remote.c:1050
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+
+#: remote.c:1055
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr ""
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr ""
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
+msgstr ""
+
+#: remote.c:1633
+#, c-format
+msgid "no such branch: '%s'"
+msgstr ""
+
+#: remote.c:1636
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr ""
+
+#: remote.c:1642

 #, 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:1602
+#: remote.c:1657

 #, 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:1614
+#: remote.c:1669

 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 

-#: remote.c:1624
+#: remote.c:1679

 #, 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:1637
+#: remote.c:1692

 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 

-#: remote.c:1659
+#: remote.c:1714

 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 

-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr ""
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr ""
+
+#: remote.c:1990

 #, 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:1939
+#: remote.c:1994

 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 

-#: remote.c:1942
+#: remote.c:1997

 #, 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:1946
+#: remote.c:2001

 #, 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:1949
+#: remote.c:2004

 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 

-#: remote.c:1953
+#: remote.c:2008

 #, 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:1959
+#: remote.c:2014

 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 

-#: remote.c:1962
+#: remote.c:2017

 #, 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 ""


@@ -4071,11 +4462,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:1970
+#: remote.c:2025

 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 

-#: remote.c:1973
+#: remote.c:2028

 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"


@@ -4086,10 +4477,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:1983
+#: remote.c:2038

 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 ""
 

+#: remote.c:2221
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr ""
+

 #: replace-object.c:21
 #, c-format
 msgid "bad replace ref name: %s"
 #: replace-object.c:21
 #, c-format
 msgid "bad replace ref name: %s"


@@ -4113,7 +4509,8 @@ msgstr ""
 msgid "unable to write rerere record"
 msgstr ""
 
 msgid "unable to write rerere record"
 msgstr ""
 

-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
+#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212
+#: builtin/fsck.c:314

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


@@ -4168,8 +4565,8 @@ msgstr ""
 msgid "Recorded preimage for '%s'"
 msgstr ""
 
 msgid "Recorded preimage for '%s'"
 msgstr ""
 

-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417
+#: builtin/submodule--helper.c:1427

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


@@ -4203,144 +4600,144 @@ msgstr ""
 msgid "unable to open rr-cache directory"
 msgstr ""
 
 msgid "unable to open rr-cache directory"
 msgstr ""
 

-#: revision.c:2324
+#: revision.c:2484

 msgid "your current branch appears to be broken"
 msgstr ""
 
 msgid "your current branch appears to be broken"
 msgstr ""
 

-#: revision.c:2327
+#: revision.c:2487

 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 

-#: revision.c:2523
+#: revision.c:2684

 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 
 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 

-#: run-command.c:740
+#: run-command.c:742

 msgid "open /dev/null failed"
 msgstr ""
 
 msgid "open /dev/null failed"
 msgstr ""
 

-#: run-command.c:1229
+#: run-command.c:1231

 #, c-format
 msgid "cannot create async thread: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr ""
 

-#: run-command.c:1293
+#: run-command.c:1295

 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 

-#: send-pack.c:142
+#: send-pack.c:141

 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 

-#: send-pack.c:144
+#: send-pack.c:143

 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr ""
 

-#: send-pack.c:146
+#: send-pack.c:145

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

-#: send-pack.c:308
+#: send-pack.c:306

 msgid "failed to sign the push certificate"
 msgstr ""
 
 msgid "failed to sign the push certificate"
 msgstr ""
 

-#: send-pack.c:421
+#: send-pack.c:420

 msgid "the receiving end does not support --signed push"
 msgstr ""
 
 msgid "the receiving end does not support --signed push"
 msgstr ""
 

-#: send-pack.c:423
+#: send-pack.c:422

 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:435
+#: send-pack.c:434

 msgid "the receiving end does not support --atomic push"
 msgstr ""
 
 msgid "the receiving end does not support --atomic push"
 msgstr ""
 

-#: send-pack.c:440
+#: send-pack.c:439

 msgid "the receiving end does not support push options"
 msgstr ""
 
 msgid "the receiving end does not support push options"
 msgstr ""
 

-#: sequencer.c:183
+#: sequencer.c:184

 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 

-#: sequencer.c:287
+#: sequencer.c:288

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

-#: sequencer.c:313
+#: sequencer.c:314

 msgid "revert"
 msgstr ""
 
 msgid "revert"
 msgstr ""
 

-#: sequencer.c:315
+#: sequencer.c:316

 msgid "cherry-pick"
 msgstr ""
 
 msgid "cherry-pick"
 msgstr ""
 

-#: sequencer.c:317
+#: sequencer.c:318

 msgid "rebase -i"
 msgstr ""
 
 msgid "rebase -i"
 msgstr ""
 

-#: sequencer.c:319
+#: sequencer.c:320

 #, c-format
 msgid "unknown action: %d"
 msgstr ""
 
 #, c-format
 msgid "unknown action: %d"
 msgstr ""
 

-#: sequencer.c:376
+#: sequencer.c:378

 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:379
+#: sequencer.c:381

 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:392 sequencer.c:2632
+#: sequencer.c:394 sequencer.c:2671

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

-#: sequencer.c:399
+#: sequencer.c:401

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

-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691
+#: sequencer.c:2931

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

-#: 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
+#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574
+#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748
+#: builtin/merge.c:1085 builtin/rebase.c:154

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

-#: sequencer.c:453
+#: sequencer.c:455

 #, 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:457
+#: sequencer.c:459

 msgid "commit your changes or stash them to proceed."
 msgstr ""
 
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 

-#: sequencer.c:486
+#: sequencer.c:491

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


@@ -4348,70 +4745,70 @@ msgstr ""
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.

-#: sequencer.c:575
+#: sequencer.c:582

 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 

-#: sequencer.c:591
+#: sequencer.c:598

 msgid "unable to update cache tree"
 msgstr ""
 
 msgid "unable to update cache tree"
 msgstr ""
 

-#: sequencer.c:604
+#: sequencer.c:612

 msgid "could not resolve HEAD commit"
 msgstr ""
 
 msgid "could not resolve HEAD commit"
 msgstr ""
 

-#: sequencer.c:684
+#: sequencer.c:692

 #, c-format
 msgid "no key present in '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr ""
 

-#: sequencer.c:695
+#: sequencer.c:703

 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr ""
 
 #, c-format
 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
+#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704
+#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

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

-#: sequencer.c:742
+#: sequencer.c:750

 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr ""
 
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr ""
 

-#: sequencer.c:747
+#: sequencer.c:755

 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr ""
 
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr ""
 

-#: sequencer.c:752
+#: sequencer.c:760

 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr ""
 
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr ""
 

-#: sequencer.c:756
+#: sequencer.c:764

 #, c-format
 msgid "unknown variable '%s'"
 msgstr ""
 
 #, c-format
 msgid "unknown variable '%s'"
 msgstr ""
 

-#: sequencer.c:761
+#: sequencer.c:769

 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr ""
 
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr ""
 

-#: sequencer.c:763
+#: sequencer.c:771

 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr ""
 
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr ""
 

-#: sequencer.c:765
+#: sequencer.c:773

 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr ""
 
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr ""
 

-#: sequencer.c:825
+#: sequencer.c:833

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

-#: sequencer.c:842
+#: sequencer.c:850

 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"


@@ -4428,15 +4825,15 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:935
+#: sequencer.c:945

 msgid "writing root commit"
 msgstr ""
 
 msgid "writing root commit"
 msgstr ""
 

-#: sequencer.c:1142
+#: sequencer.c:1155

 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 

-#: sequencer.c:1149
+#: 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"


@@ -4451,7 +4848,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
 "    git commit --amend --reset-author\n"
 msgstr ""
 

-#: sequencer.c:1162
+#: sequencer.c:1175

 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"


@@ -4465,299 +4862,294 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
 "    git commit --amend --reset-author\n"
 msgstr ""
 

-#: sequencer.c:1202
+#: sequencer.c:1217

 msgid "couldn't look up newly created commit"
 msgstr ""
 
 msgid "couldn't look up newly created commit"
 msgstr ""
 

-#: sequencer.c:1204
+#: sequencer.c:1219

 msgid "could not parse newly created commit"
 msgstr ""
 
 msgid "could not parse newly created commit"
 msgstr ""
 

-#: sequencer.c:1250
+#: sequencer.c:1265

 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 

-#: sequencer.c:1252
+#: sequencer.c:1267

 msgid "detached HEAD"
 msgstr ""
 
 msgid "detached HEAD"
 msgstr ""
 

-#: sequencer.c:1256
+#: sequencer.c:1271

 msgid " (root-commit)"
 msgstr ""
 
 msgid " (root-commit)"
 msgstr ""
 

-#: sequencer.c:1277
+#: sequencer.c:1292

 msgid "could not parse HEAD"
 msgstr ""
 
 msgid "could not parse HEAD"
 msgstr ""
 

-#: sequencer.c:1279
+#: sequencer.c:1294

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

-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1298 builtin/commit.c:1546

 msgid "could not parse HEAD commit"
 msgstr ""
 
 msgid "could not parse HEAD commit"
 msgstr ""
 

-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1350 sequencer.c:1964

 msgid "unable to parse commit author"
 msgstr ""
 
 msgid "unable to parse commit author"
 msgstr ""
 

-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

 msgid "git write-tree failed to write a tree"
 msgstr ""
 
 msgid "git write-tree failed to write a tree"
 msgstr ""
 

-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1377 sequencer.c:1433

 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 

-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859
+#: builtin/merge.c:884

 msgid "failed to write commit object"
 msgstr ""
 
 msgid "failed to write commit object"
 msgstr ""
 

-#: sequencer.c:1443
+#: sequencer.c:1460

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

-#: sequencer.c:1448
+#: sequencer.c:1465

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

-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1565 sequencer.c:1675

 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 

-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1622 sequencer.c:1647

 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 

-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1632 sequencer.c:4808

 msgid "need a HEAD to fixup"
 msgstr ""
 
 msgid "need a HEAD to fixup"
 msgstr ""
 

-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1634 sequencer.c:2958

 msgid "could not read HEAD"
 msgstr ""
 
 msgid "could not read HEAD"
 msgstr ""
 

-#: sequencer.c:1615
+#: sequencer.c:1636

 msgid "could not read HEAD's commit message"
 msgstr ""
 
 msgid "could not read HEAD's commit message"
 msgstr ""
 

-#: sequencer.c:1621
+#: sequencer.c:1642

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

-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

 msgid "This is the 1st commit message:"
 msgstr ""
 
 msgid "This is the 1st commit message:"
 msgstr ""
 

-#: sequencer.c:1636
+#: sequencer.c:1657

 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 
 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 

-#: sequencer.c:1643
+#: sequencer.c:1664

 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 

-#: sequencer.c:1649
+#: sequencer.c:1670

 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 

-#: sequencer.c:1732
+#: sequencer.c:1758

 msgid "your index file is unmerged."
 msgstr ""
 
 msgid "your index file is unmerged."
 msgstr ""
 

-#: sequencer.c:1739
+#: sequencer.c:1765

 msgid "cannot fixup root commit"
 msgstr ""
 
 msgid "cannot fixup root commit"
 msgstr ""
 

-#: sequencer.c:1758
+#: sequencer.c:1784

 #, 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:1766
+#: sequencer.c:1792 sequencer.c:1800

 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 

-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr ""
-
-#: sequencer.c:1776
+#: sequencer.c:1806

 #, 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:1795
+#: sequencer.c:1825

 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 

-#: sequencer.c:1860
+#: sequencer.c:1890

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

-#: sequencer.c:1915
+#: sequencer.c:1945

 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 

-#: sequencer.c:1916
+#: sequencer.c:1946

 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 

-#: sequencer.c:1974
+#: sequencer.c:2005

 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 

-#: sequencer.c:1981
+#: sequencer.c:2012

 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 

-#: sequencer.c:2062
+#: sequencer.c:2094

 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 

-#: sequencer.c:2071
+#: sequencer.c:2103

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

-#: sequencer.c:2130
+#: sequencer.c:2163

 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 

-#: sequencer.c:2138
+#: sequencer.c:2171

 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 

-#: sequencer.c:2209
+#: sequencer.c:2243

 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 

-#: sequencer.c:2211
+#: sequencer.c:2245

 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 

-#: sequencer.c:2216
+#: sequencer.c:2250

 msgid "no commits parsed."
 msgstr ""
 
 msgid "no commits parsed."
 msgstr ""
 

-#: sequencer.c:2227
+#: sequencer.c:2261

 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 

-#: sequencer.c:2229
+#: sequencer.c:2263

 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 

-#: sequencer.c:2299
+#: sequencer.c:2333

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

-#: sequencer.c:2380
+#: sequencer.c:2420

 msgid "unusable squash-onto"
 msgstr ""
 
 msgid "unusable squash-onto"
 msgstr ""
 

-#: sequencer.c:2396
+#: sequencer.c:2436

 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 

-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2518 sequencer.c:4067

 msgid "empty commit set passed"
 msgstr ""
 
 msgid "empty commit set passed"
 msgstr ""
 

-#: sequencer.c:2487
+#: sequencer.c:2526

 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 

-#: sequencer.c:2488
+#: sequencer.c:2527

 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 

-#: sequencer.c:2491
+#: sequencer.c:2530

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

-#: sequencer.c:2505
+#: sequencer.c:2544

 msgid "could not lock HEAD"
 msgstr ""
 
 msgid "could not lock HEAD"
 msgstr ""
 

-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2599 sequencer.c:3819

 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 

-#: sequencer.c:2562
+#: sequencer.c:2601

 msgid "cannot resolve HEAD"
 msgstr ""
 
 msgid "cannot resolve HEAD"
 msgstr ""
 

-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2603 sequencer.c:2638

 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 

-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2624 builtin/grep.c:732

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

-#: sequencer.c:2587
+#: sequencer.c:2626

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

-#: sequencer.c:2588
+#: sequencer.c:2627

 msgid "unexpected end of file"
 msgstr ""
 
 msgid "unexpected end of file"
 msgstr ""
 

-#: sequencer.c:2594
+#: sequencer.c:2633

 #, 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:2605
+#: sequencer.c:2644

 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:2709 sequencer.c:3679
+#: sequencer.c:2750 sequencer.c:3735

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

-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:2788 sequencer.c:3715

 msgid "cannot read HEAD"
 msgstr ""
 
 msgid "cannot read HEAD"
 msgstr ""
 

-#: sequencer.c:2762
+#: sequencer.c:2805

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

-#: sequencer.c:2770
+#: sequencer.c:2813

 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"


@@ -4769,27 +5161,27 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:2780
+#: sequencer.c:2823

 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 

-#: sequencer.c:2787
+#: sequencer.c:2830

 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 
 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 

-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641

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

-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230
+#: builtin/rebase.c:1591 builtin/rebase.c:1646

 msgid "could not read index"
 msgstr ""
 
 msgid "could not read index"
 msgstr ""
 

-#: sequencer.c:2829
+#: sequencer.c:2875

 #, c-format
 msgid ""
 "execution failed: %s\n"
 #, c-format
 msgid ""
 "execution failed: %s\n"


@@ -4799,11 +5191,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:2835
+#: sequencer.c:2881

 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:2841
+#: sequencer.c:2887

 #, c-format
 msgid ""
 "execution succeeded: %s\n"
 #, c-format
 msgid ""
 "execution succeeded: %s\n"


@@ -4814,76 +5206,76 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:2902
+#: sequencer.c:2948

 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 

-#: sequencer.c:2954
+#: sequencer.c:3002

 msgid "writing fake root commit"
 msgstr ""
 
 msgid "writing fake root commit"
 msgstr ""
 

-#: sequencer.c:2959
+#: sequencer.c:3007

 msgid "writing squash-onto"
 msgstr ""
 
 msgid "writing squash-onto"
 msgstr ""
 

-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435

 #, c-format
 msgid "failed to find tree of %s"
 msgstr ""
 
 #, c-format
 msgid "failed to find tree of %s"
 msgstr ""
 

-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3063 builtin/rebase.c:448

 msgid "could not write index"
 msgstr ""
 
 msgid "could not write index"
 msgstr ""
 

-#: sequencer.c:3042
+#: sequencer.c:3090

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

-#: sequencer.c:3068
+#: sequencer.c:3118

 msgid "cannot merge without a current revision"
 msgstr ""
 
 msgid "cannot merge without a current revision"
 msgstr ""
 

-#: sequencer.c:3090
+#: sequencer.c:3140

 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 

-#: sequencer.c:3099
+#: sequencer.c:3149

 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 

-#: sequencer.c:3111
+#: sequencer.c:3161

 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:3126
+#: sequencer.c:3176

 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr ""
 

-#: sequencer.c:3274
+#: sequencer.c:3325

 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 

-#: sequencer.c:3290
+#: sequencer.c:3341

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

-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3409 builtin/rebase.c:298

 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 

-#: sequencer.c:3370
+#: sequencer.c:3421

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

-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3424 builtin/rebase.c:314

 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"


@@ -4891,31 +5283,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:3427
+#: sequencer.c:3478

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

-#: sequencer.c:3441
+#: sequencer.c:3492

 #, c-format
 msgid "%s: not a valid OID"
 msgstr ""
 
 #, c-format
 msgid "%s: not a valid OID"
 msgstr ""
 

-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3497 git-rebase--preserve-merges.sh:724

 msgid "could not detach HEAD"
 msgstr ""
 
 msgid "could not detach HEAD"
 msgstr ""
 

-#: sequencer.c:3461
+#: sequencer.c:3512

 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr ""
 
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr ""
 

-#: sequencer.c:3463
+#: sequencer.c:3514

 #, c-format
 msgid "Stopped at %s\n"
 msgstr ""
 
 #, c-format
 msgid "Stopped at %s\n"
 msgstr ""
 

-#: sequencer.c:3471
+#: sequencer.c:3522

 #, c-format
 msgid ""
 "Could not execute the todo command\n"
 #, c-format
 msgid ""
 "Could not execute the todo command\n"


@@ -4928,108 +5320,108 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
 "    git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:3543
+#: sequencer.c:3597

 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 

-#: sequencer.c:3622
+#: sequencer.c:3677

 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 

-#: sequencer.c:3667
+#: sequencer.c:3723

 msgid "could not read orig-head"
 msgstr ""
 
 msgid "could not read orig-head"
 msgstr ""
 

-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:3728 sequencer.c:4805

 msgid "could not read 'onto'"
 msgstr ""
 
 msgid "could not read 'onto'"
 msgstr ""
 

-#: sequencer.c:3686
+#: sequencer.c:3742

 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 

-#: sequencer.c:3772
+#: sequencer.c:3831

 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 

-#: sequencer.c:3781
+#: sequencer.c:3840

 msgid "cannot amend non-existing commit"
 msgstr ""
 
 msgid "cannot amend non-existing commit"
 msgstr ""
 

-#: sequencer.c:3783
+#: sequencer.c:3842

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

-#: sequencer.c:3785
+#: sequencer.c:3844

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

-#: sequencer.c:3788
+#: sequencer.c:3847

 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:3824 sequencer.c:3862
+#: sequencer.c:3883 sequencer.c:3921

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

-#: sequencer.c:3877
+#: sequencer.c:3936

 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 

-#: sequencer.c:3884
+#: sequencer.c:3943

 msgid "could not commit staged changes."
 msgstr ""
 
 msgid "could not commit staged changes."
 msgstr ""
 

-#: sequencer.c:3982
+#: sequencer.c:4044

 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 

-#: sequencer.c:3986
+#: sequencer.c:4048

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

-#: sequencer.c:4021
+#: sequencer.c:4083

 msgid "can't revert as initial commit"
 msgstr ""
 
 msgid "can't revert as initial commit"
 msgstr ""
 

-#: sequencer.c:4466
+#: sequencer.c:4529

 msgid "make_script: unhandled options"
 msgstr ""
 
 msgid "make_script: unhandled options"
 msgstr ""
 

-#: sequencer.c:4469
+#: sequencer.c:4532

 msgid "make_script: error preparing revisions"
 msgstr ""
 
 msgid "make_script: error preparing revisions"
 msgstr ""
 

-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
+#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904

 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 

-#: sequencer.c:4620
+#: sequencer.c:4684

 #, 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:4690
+#: sequencer.c:4754

 #, 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:4697
+#: sequencer.c:4761

 #, 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"


@@ -5040,7 +5432,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:4710
+#: sequencer.c:4774

 #, 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 --"


@@ -5048,31 +5440,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:4848 sequencer.c:4886
+#: sequencer.c:4912 sequencer.c:4950

 msgid "nothing to do"
 msgstr ""
 
 msgid "nothing to do"
 msgstr ""
 

-#: sequencer.c:4852
+#: sequencer.c:4916

 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: sequencer.c:4864
+#: sequencer.c:4928

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

-#: sequencer.c:4868 sequencer.c:4897
+#: sequencer.c:4932 sequencer.c:4961

 msgid "could not transform the todo list"
 msgstr ""
 
 msgid "could not transform the todo list"
 msgstr ""
 

-#: sequencer.c:4900
+#: sequencer.c:4964

 msgid "could not skip unnecessary pick commands"
 msgstr ""
 
 msgid "could not skip unnecessary pick commands"
 msgstr ""
 

-#: sequencer.c:4983
+#: sequencer.c:5047

 msgid "the script was already rearranged."
 msgstr ""
 
 msgid "the script was already rearranged."
 msgstr ""
 


@@ -5171,314 +5563,314 @@ msgstr ""
 msgid "cannot chdir to '%s'"
 msgstr ""
 
 msgid "cannot chdir to '%s'"
 msgstr ""
 

-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824

 msgid "cannot come back to cwd"
 msgstr ""
 
 msgid "cannot come back to cwd"
 msgstr ""
 

-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr ""
-
-#: setup.c:848
+#: setup.c:838

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

-#: setup.c:1078
+#: setup.c:1068

 msgid "Unable to read current working directory"
 msgstr ""
 
 msgid "Unable to read current working directory"
 msgstr ""
 

-#: setup.c:1090 setup.c:1096
+#: setup.c:1077 setup.c:1083

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

-#: setup.c:1109
+#: setup.c:1088
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+
+#: setup.c:1094

 #, 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:1192
+#: setup.c:1204

 #, 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:1235
+#: setup.c:1247

 msgid "open /dev/null or dup failed"
 msgstr ""
 
 msgid "open /dev/null or dup failed"
 msgstr ""
 

-#: setup.c:1250
+#: setup.c:1262

 msgid "fork failed"
 msgstr ""
 
 msgid "fork failed"
 msgstr ""
 

-#: setup.c:1255
+#: setup.c:1267

 msgid "setsid failed"
 msgstr ""
 
 msgid "setsid failed"
 msgstr ""
 

-#: sha1-file.c:381
+#: sha1-file.c:445

 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 

-#: sha1-file.c:432
+#: sha1-file.c:496

 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr ""
 

-#: sha1-file.c:503
+#: sha1-file.c:568

 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 

-#: sha1-file.c:510
+#: sha1-file.c:575

 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr ""
 

-#: sha1-file.c:565
+#: sha1-file.c:618

 msgid "unable to fdopen alternates lockfile"
 msgstr ""
 
 msgid "unable to fdopen alternates lockfile"
 msgstr ""
 

-#: sha1-file.c:583
+#: sha1-file.c:636

 msgid "unable to read alternates file"
 msgstr ""
 
 msgid "unable to read alternates file"
 msgstr ""
 

-#: sha1-file.c:590
+#: sha1-file.c:643

 msgid "unable to move new alternates file into place"
 msgstr ""
 
 msgid "unable to move new alternates file into place"
 msgstr ""
 

-#: sha1-file.c:625
+#: sha1-file.c:678

 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 

-#: sha1-file.c:651
+#: sha1-file.c:704

 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 

-#: sha1-file.c:657
+#: sha1-file.c:710

 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 

-#: sha1-file.c:663
+#: sha1-file.c:716

 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 

-#: sha1-file.c:671
+#: sha1-file.c:724

 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 

-#: sha1-file.c:781
+#: sha1-file.c:838

 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 

-#: sha1-file.c:806
+#: sha1-file.c:863

 msgid "mmap failed"
 msgstr ""
 
 msgid "mmap failed"
 msgstr ""
 

-#: sha1-file.c:973
+#: sha1-file.c:1027

 #, c-format
 msgid "object file %s is empty"
 msgstr ""
 
 #, c-format
 msgid "object file %s is empty"
 msgstr ""
 

-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1151 sha1-file.c:2288

 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 

-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1153 sha1-file.c:2292

 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 

-#: sha1-file.c:1137
+#: sha1-file.c:1195

 msgid "invalid object type"
 msgstr ""
 
 msgid "invalid object type"
 msgstr ""
 

-#: sha1-file.c:1219
+#: sha1-file.c:1279

 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr ""
 
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr ""
 

-#: sha1-file.c:1222
+#: sha1-file.c:1282

 #, c-format
 msgid "unable to unpack %s header"
 msgstr ""
 
 #, c-format
 msgid "unable to unpack %s header"
 msgstr ""
 

-#: sha1-file.c:1228
+#: sha1-file.c:1288

 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr ""
 
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr ""
 

-#: sha1-file.c:1231
+#: sha1-file.c:1291

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

-#: sha1-file.c:1422
+#: sha1-file.c:1481

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

-#: sha1-file.c:1426
+#: sha1-file.c:1485

 #, c-format
 msgid "replacement %s not found for %s"
 msgstr ""
 
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr ""
 

-#: sha1-file.c:1430
+#: sha1-file.c:1489

 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 

-#: sha1-file.c:1434
+#: sha1-file.c:1493

 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 

-#: sha1-file.c:1536
+#: sha1-file.c:1595

 #, c-format
 #, c-format

-msgid "unable to write sha1 filename %s"
+msgid "unable to write file %s"

 msgstr ""
 
 msgstr ""
 

-#: sha1-file.c:1543
+#: sha1-file.c:1602

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

-#: sha1-file.c:1550
+#: sha1-file.c:1609

 msgid "file write error"
 msgstr ""
 
 msgid "file write error"
 msgstr ""
 

-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
+#: sha1-file.c:1628
+msgid "error when closing loose object file"

 msgstr ""
 
 msgstr ""
 

-#: sha1-file.c:1635
+#: sha1-file.c:1693

 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 

-#: sha1-file.c:1637
+#: sha1-file.c:1695

 msgid "unable to create temporary file"
 msgstr ""
 
 msgid "unable to create temporary file"
 msgstr ""
 

-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
+#: sha1-file.c:1719
+msgid "unable to write loose object file"

 msgstr ""
 
 msgstr ""
 

-#: sha1-file.c:1667
+#: sha1-file.c:1725

 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr ""
 
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr ""
 

-#: sha1-file.c:1671
+#: sha1-file.c:1729

 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 

-#: sha1-file.c:1675
+#: sha1-file.c:1733

 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 

-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1743 builtin/pack-objects.c:919

 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 
 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 

-#: sha1-file.c:1760
+#: sha1-file.c:1818

 #, c-format
 #, c-format

-msgid "cannot read sha1_file for %s"
+msgid "cannot read object for %s"

 msgstr ""
 
 msgstr ""
 

-#: sha1-file.c:1805
+#: sha1-file.c:1858

 msgid "corrupt commit"
 msgstr ""
 
 msgid "corrupt commit"
 msgstr ""
 

-#: sha1-file.c:1813
+#: sha1-file.c:1866

 msgid "corrupt tag"
 msgstr ""
 
 msgid "corrupt tag"
 msgstr ""
 

-#: sha1-file.c:1912
+#: sha1-file.c:1965

 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 
 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 

-#: sha1-file.c:1915
+#: sha1-file.c:1968

 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 
 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 

-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2041 sha1-file.c:2050

 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 

-#: sha1-file.c:2003
+#: sha1-file.c:2056

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

-#: sha1-file.c:2027
+#: sha1-file.c:2080

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

-#: sha1-file.c:2029
+#: sha1-file.c:2082

 #, 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:2056 builtin/index-pack.c:154
+#: sha1-file.c:2109 builtin/index-pack.c:154

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

-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2299 sha1-file.c:2351

 #, c-format
 #, c-format

-msgid "sha1 mismatch for %s (expected %s)"
+msgid "hash mismatch for %s (expected %s)"

 msgstr ""
 
 msgstr ""
 

-#: sha1-file.c:2250
+#: sha1-file.c:2323

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

-#: sha1-file.c:2255
+#: sha1-file.c:2328

 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 

-#: sha1-file.c:2261
+#: sha1-file.c:2334

 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 

-#: sha1-file.c:2272
+#: sha1-file.c:2345

 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
 
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
 

-#: sha1-name.c:476
+#: sha1-name.c:448

 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr ""
 
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr ""
 

-#: sha1-name.c:487
+#: sha1-name.c:459

 msgid "The candidates are:"
 msgstr ""
 
 msgid "The candidates are:"
 msgstr ""
 

-#: sha1-name.c:770
+#: sha1-name.c:742

 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"


@@ -5491,80 +5883,90 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 

-#: submodule.c:116 submodule.c:145
+#: submodule.c:114 submodule.c:143

 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 

-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147

 #, 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:156
+#: submodule.c:154

 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 

-#: submodule.c:167
+#: submodule.c:165

 msgid "staging updated .gitmodules failed"
 msgstr ""
 
 msgid "staging updated .gitmodules failed"
 msgstr ""
 

-#: submodule.c:329
+#: submodule.c:327

 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr ""
 

-#: submodule.c:360
+#: submodule.c:358

 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 

-#: submodule.c:857
+#: submodule.c:906

 #, 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:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989

 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 

-#: submodule.c:1404
+#: submodule.c:1477
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr ""
+
+#: submodule.c:1639

 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 

-#: submodule.c:1542
+#: submodule.c:1777

 #, 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:1555
+#: submodule.c:1790

 #, 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:1648
+#: submodule.c:1805
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1895

 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 

-#: submodule.c:1700
+#: submodule.c:1947

 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr ""
 
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr ""
 

-#: submodule.c:1747
+#: submodule.c:1996

 #, 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:1759 submodule.c:1815
+#: submodule.c:2008 submodule.c:2064

 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 

-#: submodule.c:1766
+#: submodule.c:2015

 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"


@@ -5572,16 +5974,16 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
 "'%s'\n"
 msgstr ""
 

-#: submodule.c:1850
+#: submodule.c:2099

 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 

-#: submodule.c:1894
+#: submodule.c:2143

 msgid "could not start ls-files in .."
 msgstr ""
 
 msgid "could not start ls-files in .."
 msgstr ""
 

-#: submodule.c:1933
+#: submodule.c:2182

 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""


@@ -5640,7 +6042,7 @@ msgstr ""
 msgid "could not read from stdin"
 msgstr ""
 
 msgid "could not read from stdin"
 msgstr ""
 

-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701

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


@@ -5679,36 +6081,36 @@ msgstr ""
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 

-#: transport.c:616
+#: transport.c:617

 msgid "could not parse transport.color.* config"
 msgstr ""
 
 msgid "could not parse transport.color.* config"
 msgstr ""
 

-#: transport.c:689
+#: transport.c:690

 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 

-#: transport.c:816
+#: transport.c:817

 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr ""
 

-#: transport.c:882
+#: transport.c:883

 #, c-format
 msgid "transport '%s' not allowed"
 msgstr ""
 
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr ""
 

-#: transport.c:936
+#: transport.c:937

 msgid "git-over-rsync is no longer supported"
 msgstr ""
 
 msgid "git-over-rsync is no longer supported"
 msgstr ""
 

-#: transport.c:1031
+#: transport.c:1032

 #, 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:1035
+#: transport.c:1036

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -5724,19 +6126,19 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: transport.c:1043
+#: transport.c:1044

 msgid "Aborting."
 msgstr ""
 
 msgid "Aborting."
 msgstr ""
 

-#: transport.c:1182
+#: transport.c:1184

 msgid "failed to push all needed submodules"
 msgstr ""
 
 msgid "failed to push all needed submodules"
 msgstr ""
 

-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1317 transport-helper.c:643

 msgid "operation not supported by protocol"
 msgstr ""
 
 msgid "operation not supported by protocol"
 msgstr ""
 

-#: transport.c:1419
+#: transport.c:1421

 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""


@@ -5783,7 +6185,7 @@ msgstr ""
 msgid "error while running fast-import"
 msgstr ""
 
 msgid "error while running fast-import"
 msgstr ""
 

-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:531 transport-helper.c:1097

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


@@ -5806,101 +6208,101 @@ msgstr ""
 msgid "can't connect to subservice %s"
 msgstr ""
 
 msgid "can't connect to subservice %s"
 msgstr ""
 

-#: transport-helper.c:713
+#: transport-helper.c:718

 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 

-#: transport-helper.c:766
+#: transport-helper.c:771

 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr ""
 
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr ""
 

-#: transport-helper.c:827
+#: transport-helper.c:832

 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr ""
 
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr ""
 

-#: transport-helper.c:830
+#: transport-helper.c:835

 #, c-format
 msgid "helper %s does not support --signed"
 msgstr ""
 
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr ""
 

-#: transport-helper.c:833
+#: transport-helper.c:838

 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 

-#: transport-helper.c:840
+#: transport-helper.c:845

 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr ""
 
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr ""
 

-#: transport-helper.c:932
+#: transport-helper.c:937

 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 

-#: transport-helper.c:937
+#: transport-helper.c:942

 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 

-#: transport-helper.c:984
+#: transport-helper.c:989

 msgid "couldn't run fast-export"
 msgstr ""
 
 msgid "couldn't run fast-export"
 msgstr ""
 

-#: transport-helper.c:989
+#: transport-helper.c:994

 msgid "error while running fast-export"
 msgstr ""
 
 msgid "error while running fast-export"
 msgstr ""
 

-#: transport-helper.c:1014
+#: transport-helper.c:1019

 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 "Perhaps you should specify a branch such as 'master'.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 "Perhaps you should specify a branch such as 'master'.\n"
 msgstr ""
 

-#: transport-helper.c:1077
+#: transport-helper.c:1083

 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr ""
 
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr ""
 

-#: transport-helper.c:1231
+#: transport-helper.c:1236

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

-#: transport-helper.c:1258
+#: transport-helper.c:1263

 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 
 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 

-#: transport-helper.c:1307
+#: transport-helper.c:1312

 #, c-format
 msgid "%s thread failed"
 msgstr ""
 
 #, c-format
 msgid "%s thread failed"
 msgstr ""
 

-#: transport-helper.c:1311
+#: transport-helper.c:1316

 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 

-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1335 transport-helper.c:1339

 #, 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:1371
+#: transport-helper.c:1376

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

-#: transport-helper.c:1375
+#: transport-helper.c:1380

 #, c-format
 msgid "%s process failed"
 msgstr ""
 
 #, c-format
 msgid "%s process failed"
 msgstr ""
 

-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1398 transport-helper.c:1407

 msgid "can't start thread for copying data"
 msgstr ""
 
 msgid "can't start thread for copying data"
 msgstr ""
 


@@ -5916,102 +6318,102 @@ msgstr ""
 msgid "empty filename in tree entry"
 msgstr ""
 
 msgid "empty filename in tree entry"
 msgstr ""
 

-#: tree-walk.c:115
+#: tree-walk.c:116

 msgid "too-short tree file"
 msgstr ""
 
 msgid "too-short tree file"
 msgstr ""
 

-#: unpack-trees.c:112
+#: unpack-trees.c:111

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 

-#: unpack-trees.c:114
+#: unpack-trees.c:113

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:117
+#: unpack-trees.c:116

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 

-#: unpack-trees.c:119
+#: unpack-trees.c:118

 #, 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 ""
 

-#: unpack-trees.c:122
+#: unpack-trees.c:121

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 

-#: unpack-trees.c:124
+#: unpack-trees.c:123

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:129
+#: unpack-trees.c:128

 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 

-#: unpack-trees.c:133
+#: unpack-trees.c:132

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 

-#: unpack-trees.c:135
+#: unpack-trees.c:134

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:138
+#: unpack-trees.c:137

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 

-#: unpack-trees.c:140
+#: unpack-trees.c:139

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:143
+#: unpack-trees.c:142

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 

-#: unpack-trees.c:145
+#: unpack-trees.c:144

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:151
+#: unpack-trees.c:150

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "


@@ -6019,7 +6421,7 @@ msgid ""
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 

-#: unpack-trees.c:153
+#: unpack-trees.c:152

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "


@@ -6027,47 +6429,47 @@ msgid ""
 "%%s"
 msgstr ""
 
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:156
+#: unpack-trees.c:155

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 

-#: unpack-trees.c:158
+#: unpack-trees.c:157

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:161
+#: unpack-trees.c:160

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 

-#: unpack-trees.c:163
+#: unpack-trees.c:162

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:171
+#: unpack-trees.c:170

 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 

-#: unpack-trees.c:174
+#: unpack-trees.c:173

 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 

-#: unpack-trees.c:176
+#: unpack-trees.c:175

 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "


@@ -6075,7 +6477,7 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: unpack-trees.c:178
+#: unpack-trees.c:177

 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "


@@ -6083,23 +6485,23 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: unpack-trees.c:180
+#: unpack-trees.c:179

 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 

-#: unpack-trees.c:254
+#: unpack-trees.c:253

 #, c-format
 msgid "Aborting\n"
 msgstr ""
 
 #, c-format
 msgid "Aborting\n"
 msgstr ""
 

-#: unpack-trees.c:336
+#: unpack-trees.c:335

 msgid "Checking out files"
 msgstr ""
 
 msgid "Checking out files"
 msgstr ""
 

-#: unpack-trees.c:368
+#: unpack-trees.c:367

 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"


@@ -6135,7 +6537,7 @@ msgstr ""
 msgid "invalid '..' path segment"
 msgstr ""
 
 msgid "invalid '..' path segment"
 msgstr ""
 

-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:249 builtin/am.c:2094

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


@@ -6179,374 +6581,374 @@ msgstr ""
 msgid "unable to get current working directory"
 msgstr ""
 
 msgid "unable to get current working directory"
 msgstr ""
 

-#: wt-status.c:154
+#: wt-status.c:155

 msgid "Unmerged paths:"
 msgstr ""
 
 msgid "Unmerged paths:"
 msgstr ""
 

-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:182 wt-status.c:209

 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 

-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:184 wt-status.c:211

 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 

-#: wt-status.c:187
+#: wt-status.c:188

 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 

-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:190 wt-status.c:194

 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 

-#: wt-status.c:191
+#: wt-status.c:192

 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:1042
+#: wt-status.c:203 wt-status.c:1046

 msgid "Changes to be committed:"
 msgstr ""
 
 msgid "Changes to be committed:"
 msgstr ""
 

-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:221 wt-status.c:1055

 msgid "Changes not staged for commit:"
 msgstr ""
 
 msgid "Changes not staged for commit:"
 msgstr ""
 

-#: wt-status.c:224
+#: wt-status.c:225

 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 

-#: wt-status.c:226
+#: wt-status.c:227

 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 

-#: wt-status.c:227
+#: wt-status.c:228

 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 

-#: wt-status.c:229
+#: wt-status.c:230

 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 

-#: wt-status.c:241
+#: wt-status.c:242

 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 

-#: wt-status.c:256
+#: wt-status.c:257

 msgid "both deleted:"
 msgstr ""
 
 msgid "both deleted:"
 msgstr ""
 

-#: wt-status.c:258
+#: wt-status.c:259

 msgid "added by us:"
 msgstr ""
 
 msgid "added by us:"
 msgstr ""
 

-#: wt-status.c:260
+#: wt-status.c:261

 msgid "deleted by them:"
 msgstr ""
 
 msgid "deleted by them:"
 msgstr ""
 

-#: wt-status.c:262
+#: wt-status.c:263

 msgid "added by them:"
 msgstr ""
 
 msgid "added by them:"
 msgstr ""
 

-#: wt-status.c:264
+#: wt-status.c:265

 msgid "deleted by us:"
 msgstr ""
 
 msgid "deleted by us:"
 msgstr ""
 

-#: wt-status.c:266
+#: wt-status.c:267

 msgid "both added:"
 msgstr ""
 
 msgid "both added:"
 msgstr ""
 

-#: wt-status.c:268
+#: wt-status.c:269

 msgid "both modified:"
 msgstr ""
 
 msgid "both modified:"
 msgstr ""
 

-#: wt-status.c:278
+#: wt-status.c:279

 msgid "new file:"
 msgstr ""
 
 msgid "new file:"
 msgstr ""
 

-#: wt-status.c:280
+#: wt-status.c:281

 msgid "copied:"
 msgstr ""
 
 msgid "copied:"
 msgstr ""
 

-#: wt-status.c:282
+#: wt-status.c:283

 msgid "deleted:"
 msgstr ""
 
 msgid "deleted:"
 msgstr ""
 

-#: wt-status.c:284
+#: wt-status.c:285

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

-#: wt-status.c:286
+#: wt-status.c:287

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

-#: wt-status.c:288
+#: wt-status.c:289

 msgid "typechange:"
 msgstr ""
 
 msgid "typechange:"
 msgstr ""
 

-#: wt-status.c:290
+#: wt-status.c:291

 msgid "unknown:"
 msgstr ""
 
 msgid "unknown:"
 msgstr ""
 

-#: wt-status.c:292
+#: wt-status.c:293

 msgid "unmerged:"
 msgstr ""
 
 msgid "unmerged:"
 msgstr ""
 

-#: wt-status.c:372
+#: wt-status.c:373

 msgid "new commits, "
 msgstr ""
 
 msgid "new commits, "
 msgstr ""
 

-#: wt-status.c:374
+#: wt-status.c:375

 msgid "modified content, "
 msgstr ""
 
 msgid "modified content, "
 msgstr ""
 

-#: wt-status.c:376
+#: wt-status.c:377

 msgid "untracked content, "
 msgstr ""
 
 msgid "untracked content, "
 msgstr ""
 

-#: wt-status.c:880
+#: wt-status.c:884

 #, 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:912
+#: wt-status.c:916

 msgid "Submodules changed but not updated:"
 msgstr ""
 
 msgid "Submodules changed but not updated:"
 msgstr ""
 

-#: wt-status.c:914
+#: wt-status.c:918

 msgid "Submodule changes to be committed:"
 msgstr ""
 
 msgid "Submodule changes to be committed:"
 msgstr ""
 

-#: wt-status.c:996
+#: wt-status.c:1000

 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:1097
+#: wt-status.c:1101

 msgid "You have unmerged paths."
 msgstr ""
 
 msgid "You have unmerged paths."
 msgstr ""
 

-#: wt-status.c:1100
+#: wt-status.c:1104

 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 

-#: wt-status.c:1102
+#: wt-status.c:1106

 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 

-#: wt-status.c:1106
+#: wt-status.c:1110

 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 

-#: wt-status.c:1109
+#: wt-status.c:1113

 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 

-#: wt-status.c:1118
+#: wt-status.c:1122

 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:1121
+#: wt-status.c:1125

 msgid "The current patch is empty."
 msgstr ""
 
 msgid "The current patch is empty."
 msgstr ""
 

-#: wt-status.c:1125
+#: wt-status.c:1129

 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 

-#: wt-status.c:1127
+#: wt-status.c:1131

 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 

-#: wt-status.c:1129
+#: wt-status.c:1133

 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:1260
+#: wt-status.c:1264

 msgid "git-rebase-todo is missing."
 msgstr ""
 
 msgid "git-rebase-todo is missing."
 msgstr ""
 

-#: wt-status.c:1262
+#: wt-status.c:1266

 msgid "No commands done."
 msgstr ""
 
 msgid "No commands done."
 msgstr ""
 

-#: wt-status.c:1265
+#: wt-status.c:1269

 #, 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:1276
+#: wt-status.c:1280

 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 
 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 

-#: wt-status.c:1281
+#: wt-status.c:1285

 msgid "No commands remaining."
 msgstr ""
 
 msgid "No commands remaining."
 msgstr ""
 

-#: wt-status.c:1284
+#: wt-status.c:1288

 #, 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:1292
+#: wt-status.c:1296

 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:1304
+#: wt-status.c:1308

 #, 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:1309
+#: wt-status.c:1313

 msgid "You are currently rebasing."
 msgstr ""
 
 msgid "You are currently rebasing."
 msgstr ""
 

-#: wt-status.c:1322
+#: wt-status.c:1326

 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1324
+#: wt-status.c:1328

 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 

-#: wt-status.c:1326
+#: wt-status.c:1330

 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:1333
+#: wt-status.c:1337

 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1337
+#: wt-status.c:1341

 #, 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:1342
+#: wt-status.c:1346

 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:1345
+#: wt-status.c:1349

 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:1349
+#: wt-status.c:1353

 #, 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:1354
+#: wt-status.c:1358

 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:1357
+#: wt-status.c:1361

 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:1359
+#: wt-status.c:1363

 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:1368
+#: wt-status.c:1372

 #, 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:1373
+#: wt-status.c:1377

 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 

-#: wt-status.c:1376
+#: wt-status.c:1380

 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 

-#: wt-status.c:1378
+#: wt-status.c:1382

 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:1386
+#: wt-status.c:1390

 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 

-#: wt-status.c:1391
+#: wt-status.c:1395

 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 

-#: wt-status.c:1394
+#: wt-status.c:1398

 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 

-#: wt-status.c:1396
+#: wt-status.c:1400

 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:1406
+#: wt-status.c:1410

 #, 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:1410
+#: wt-status.c:1414

 msgid "You are currently bisecting."
 msgstr ""
 
 msgid "You are currently bisecting."
 msgstr ""
 

-#: wt-status.c:1413
+#: wt-status.c:1417

 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:1611
+#: wt-status.c:1617

 msgid "On branch "
 msgstr ""
 
 msgid "On branch "
 msgstr ""
 

-#: wt-status.c:1618
+#: wt-status.c:1624

 msgid "interactive rebase in progress; onto "
 msgstr ""
 
 msgid "interactive rebase in progress; onto "
 msgstr ""
 

-#: wt-status.c:1620
+#: wt-status.c:1626

 msgid "rebase in progress; onto "
 msgstr ""
 
 msgid "rebase in progress; onto "
 msgstr ""
 

-#: wt-status.c:1625
+#: wt-status.c:1631

 msgid "HEAD detached at "
 msgstr ""
 
 msgid "HEAD detached at "
 msgstr ""
 

-#: wt-status.c:1627
+#: wt-status.c:1633

 msgid "HEAD detached from "
 msgstr ""
 
 msgid "HEAD detached from "
 msgstr ""
 

-#: wt-status.c:1630
+#: wt-status.c:1636

 msgid "Not currently on any branch."
 msgstr ""
 
 msgid "Not currently on any branch."
 msgstr ""
 

-#: wt-status.c:1647
+#: wt-status.c:1653

 msgid "Initial commit"
 msgstr ""
 
 msgid "Initial commit"
 msgstr ""
 

-#: wt-status.c:1648
+#: wt-status.c:1654

 msgid "No commits yet"
 msgstr ""
 
 msgid "No commits yet"
 msgstr ""
 

-#: wt-status.c:1662
+#: wt-status.c:1668

 msgid "Untracked files"
 msgstr ""
 
 msgid "Untracked files"
 msgstr ""
 

-#: wt-status.c:1664
+#: wt-status.c:1670

 msgid "Ignored files"
 msgstr ""
 
 msgid "Ignored files"
 msgstr ""
 

-#: wt-status.c:1668
+#: wt-status.c:1674

 #, 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"


@@ -6554,216 +6956,216 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
 "new files yourself (see 'git help status')."
 msgstr ""
 

-#: wt-status.c:1674
+#: wt-status.c:1680

 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 

-#: wt-status.c:1676
+#: wt-status.c:1682

 msgid " (use -u option to show untracked files)"
 msgstr ""
 
 msgid " (use -u option to show untracked files)"
 msgstr ""
 

-#: wt-status.c:1682
+#: wt-status.c:1688

 msgid "No changes"
 msgstr ""
 
 msgid "No changes"
 msgstr ""
 

-#: wt-status.c:1687
+#: wt-status.c:1693

 #, 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:1690
+#: wt-status.c:1696

 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 

-#: wt-status.c:1693
+#: wt-status.c:1699

 #, 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:1696
+#: wt-status.c:1702

 #, 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:1699
+#: wt-status.c:1705

 #, 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:1702 wt-status.c:1707
+#: wt-status.c:1708 wt-status.c:1713

 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 

-#: wt-status.c:1705
+#: wt-status.c:1711

 #, 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:1709
+#: wt-status.c:1715

 #, 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:1822
+#: wt-status.c:1828

 msgid "No commits yet on "
 msgstr ""
 
 msgid "No commits yet on "
 msgstr ""
 

-#: wt-status.c:1826
+#: wt-status.c:1832

 msgid "HEAD (no branch)"
 msgstr ""
 
 msgid "HEAD (no branch)"
 msgstr ""
 

-#: wt-status.c:1857
+#: wt-status.c:1863

 msgid "different"
 msgstr ""
 
 msgid "different"
 msgstr ""
 

-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1865 wt-status.c:1873

 msgid "behind "
 msgstr ""
 
 msgid "behind "
 msgstr ""
 

-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1868 wt-status.c:1871

 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:2374
+#: wt-status.c:2386

 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 

-#: wt-status.c:2380
+#: wt-status.c:2392

 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 

-#: wt-status.c:2382
+#: wt-status.c:2394

 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 

-#: builtin/add.c:24
+#: builtin/add.c:25

 msgid "git add [<options>] [--] <pathspec>..."
 msgstr ""
 
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/add.c:83
+#: builtin/add.c:84

 #, c-format
 msgid "unexpected diff status %c"
 msgstr ""
 
 #, c-format
 msgid "unexpected diff status %c"
 msgstr ""
 

-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:285

 msgid "updating files failed"
 msgstr ""
 
 msgid "updating files failed"
 msgstr ""
 

-#: builtin/add.c:98
+#: builtin/add.c:99

 #, c-format
 msgid "remove '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "remove '%s'\n"
 msgstr ""
 

-#: builtin/add.c:173
+#: builtin/add.c:174

 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 

-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896

 msgid "Could not read the index"
 msgstr ""
 
 msgid "Could not read the index"
 msgstr ""
 

-#: builtin/add.c:244
+#: builtin/add.c:245

 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr ""
 
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr ""
 

-#: builtin/add.c:248
+#: builtin/add.c:249

 msgid "Could not write patch"
 msgstr ""
 
 msgid "Could not write patch"
 msgstr ""
 

-#: builtin/add.c:251
+#: builtin/add.c:252

 msgid "editing patch failed"
 msgstr ""
 
 msgid "editing patch failed"
 msgstr ""
 

-#: builtin/add.c:254
+#: builtin/add.c:255

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

-#: builtin/add.c:256
+#: builtin/add.c:257

 msgid "Empty patch. Aborted."
 msgstr ""
 
 msgid "Empty patch. Aborted."
 msgstr ""
 

-#: builtin/add.c:261
+#: builtin/add.c:262

 #, c-format
 msgid "Could not apply '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not apply '%s'"
 msgstr ""
 

-#: builtin/add.c:269
+#: builtin/add.c:270

 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: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
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:214 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165

 msgid "dry run"
 msgstr ""
 
 msgid "dry run"
 msgstr ""
 

-#: builtin/add.c:292
+#: builtin/add.c:293

 msgid "interactive picking"
 msgstr ""
 
 msgid "interactive picking"
 msgstr ""
 

-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306

 msgid "select hunks interactively"
 msgstr ""
 
 msgid "select hunks interactively"
 msgstr ""
 

-#: builtin/add.c:294
+#: builtin/add.c:295

 msgid "edit current diff and apply"
 msgstr ""
 
 msgid "edit current diff and apply"
 msgstr ""
 

-#: builtin/add.c:295
+#: builtin/add.c:296

 msgid "allow adding otherwise ignored files"
 msgstr ""
 
 msgid "allow adding otherwise ignored files"
 msgstr ""
 

-#: builtin/add.c:296
+#: builtin/add.c:297

 msgid "update tracked files"
 msgstr ""
 
 msgid "update tracked files"
 msgstr ""
 

-#: builtin/add.c:297
+#: builtin/add.c:298

 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 

-#: builtin/add.c:298
+#: builtin/add.c:299

 msgid "record only the fact that the path will be added later"
 msgstr ""
 
 msgid "record only the fact that the path will be added later"
 msgstr ""
 

-#: builtin/add.c:299
+#: builtin/add.c:300

 msgid "add changes from all tracked and untracked files"
 msgstr ""
 
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 

-#: builtin/add.c:302
+#: builtin/add.c:303

 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 

-#: builtin/add.c:304
+#: builtin/add.c:305

 msgid "don't add, only refresh the index"
 msgstr ""
 
 msgid "don't add, only refresh the index"
 msgstr ""
 

-#: builtin/add.c:305
+#: builtin/add.c:306

 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 

-#: builtin/add.c:306
+#: builtin/add.c:307

 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:990
+#: builtin/add.c:309 builtin/update-index.c:991

 msgid "override the executable bit of the listed files"
 msgstr ""
 
 msgid "override the executable bit of the listed files"
 msgstr ""
 

-#: builtin/add.c:310
+#: builtin/add.c:311

 msgid "warn when adding an embedded repository"
 msgstr ""
 
 msgid "warn when adding an embedded repository"
 msgstr ""
 

-#: builtin/add.c:325
+#: builtin/add.c:326

 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"


@@ -6781,173 +7183,173 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
 "See \"git help submodule\" for more information."
 msgstr ""
 

-#: builtin/add.c:353
+#: builtin/add.c:354

 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 

-#: builtin/add.c:371
+#: builtin/add.c:372

 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr ""
 
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr ""
 

-#: builtin/add.c:379
+#: builtin/add.c:380

 msgid "adding files failed"
 msgstr ""
 
 msgid "adding files failed"
 msgstr ""
 

-#: builtin/add.c:417
+#: builtin/add.c:418

 msgid "-A and -u are mutually incompatible"
 msgstr ""
 
 msgid "-A and -u are mutually incompatible"
 msgstr ""
 

-#: builtin/add.c:424
+#: builtin/add.c:425

 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 

-#: builtin/add.c:428
+#: builtin/add.c:429

 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 

-#: builtin/add.c:443
+#: builtin/add.c:444

 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 

-#: builtin/add.c:444
+#: builtin/add.c:445

 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 

-#: builtin/am.c:363
+#: builtin/am.c:348

 msgid "could not parse author script"
 msgstr ""
 
 msgid "could not parse author script"
 msgstr ""
 

-#: builtin/am.c:447
+#: builtin/am.c:432

 #, 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:488
+#: builtin/am.c:473

 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 

-#: builtin/am.c:525
+#: builtin/am.c:510

 #, 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:551
+#: builtin/am.c:536

 msgid "fseek failed"
 msgstr ""
 
 msgid "fseek failed"
 msgstr ""
 

-#: builtin/am.c:739
+#: builtin/am.c:724

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

-#: builtin/am.c:804
+#: builtin/am.c:789

 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:852
+#: builtin/am.c:837

 msgid "invalid timestamp"
 msgstr ""
 
 msgid "invalid timestamp"
 msgstr ""
 

-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:842 builtin/am.c:854

 msgid "invalid Date line"
 msgstr ""
 
 msgid "invalid Date line"
 msgstr ""
 

-#: builtin/am.c:864
+#: builtin/am.c:849

 msgid "invalid timezone offset"
 msgstr ""
 
 msgid "invalid timezone offset"
 msgstr ""
 

-#: builtin/am.c:957
+#: builtin/am.c:942

 msgid "Patch format detection failed."
 msgstr ""
 
 msgid "Patch format detection failed."
 msgstr ""
 

-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:947 builtin/clone.c:409

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

-#: builtin/am.c:967
+#: builtin/am.c:952

 msgid "Failed to split patches."
 msgstr ""
 
 msgid "Failed to split patches."
 msgstr ""
 

-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1082 builtin/commit.c:371

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

-#: builtin/am.c:1111
+#: builtin/am.c:1096

 #, 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:1112
+#: builtin/am.c:1097

 #, 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:1113
+#: builtin/am.c:1098

 #, 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:1196
+#: builtin/am.c:1181

 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 

-#: builtin/am.c:1224
+#: builtin/am.c:1209

 msgid "Patch is empty."
 msgstr ""
 
 msgid "Patch is empty."
 msgstr ""
 

-#: builtin/am.c:1290
+#: builtin/am.c:1275

 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 

-#: builtin/am.c:1312
+#: builtin/am.c:1297

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

-#: builtin/am.c:1508
+#: builtin/am.c:1493

 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:1510
+#: builtin/am.c:1495

 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 

-#: builtin/am.c:1529
+#: builtin/am.c:1514

 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:1535
+#: builtin/am.c:1520

 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:1561
+#: builtin/am.c:1546

 msgid "Failed to merge in the changes."
 msgstr ""
 
 msgid "Failed to merge in the changes."
 msgstr ""
 

-#: builtin/am.c:1593
+#: builtin/am.c:1578

 msgid "applying to an empty history"
 msgstr ""
 
 msgid "applying to an empty history"
 msgstr ""
 

-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1624 builtin/am.c:1628

 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 

-#: builtin/am.c:1659
+#: builtin/am.c:1644

 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:1664
+#: builtin/am.c:1649

 msgid "Commit Body is:"
 msgstr ""
 
 msgid "Commit Body is:"
 msgstr ""
 


@@ -6955,41 +7357,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:1674
+#: builtin/am.c:1659

 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:1724
+#: builtin/am.c:1709

 #, 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:1764 builtin/am.c:1832
+#: builtin/am.c:1749 builtin/am.c:1817

 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 

-#: builtin/am.c:1781
+#: builtin/am.c:1766

 msgid "No changes -- Patch already applied."
 msgstr ""
 
 msgid "No changes -- Patch already applied."
 msgstr ""
 

-#: builtin/am.c:1787
+#: builtin/am.c:1772

 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 

-#: builtin/am.c:1791
+#: builtin/am.c:1776

 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:1835
+#: builtin/am.c:1820

 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:1842
+#: builtin/am.c:1827

 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 "


@@ -6997,181 +7399,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:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329
+#: builtin/reset.c:337

 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 

-#: builtin/am.c:2001
+#: builtin/am.c:1986

 msgid "failed to clean index"
 msgstr ""
 
 msgid "failed to clean index"
 msgstr ""
 

-#: builtin/am.c:2036
+#: builtin/am.c:2030

 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:2129
+#: builtin/am.c:2123

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

-#: builtin/am.c:2165
+#: builtin/am.c:2159

 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 

-#: builtin/am.c:2166
+#: builtin/am.c:2160

 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 

-#: builtin/am.c:2172
+#: builtin/am.c:2166

 msgid "run interactively"
 msgstr ""
 
 msgid "run interactively"
 msgstr ""
 

-#: builtin/am.c:2174
+#: builtin/am.c:2168

 msgid "historical option -- no-op"
 msgstr ""
 
 msgid "historical option -- no-op"
 msgstr ""
 

-#: builtin/am.c:2176
+#: builtin/am.c:2170

 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 

-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58

 #: builtin/repack.c:306
 msgid "be quiet"
 msgstr ""
 
 #: builtin/repack.c:306
 msgid "be quiet"
 msgstr ""
 

-#: builtin/am.c:2179
+#: builtin/am.c:2173

 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:2182
+#: builtin/am.c:2176

 msgid "recode into utf8 (default)"
 msgstr ""
 
 msgid "recode into utf8 (default)"
 msgstr ""
 

-#: builtin/am.c:2184
+#: builtin/am.c:2178

 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2186
+#: builtin/am.c:2180

 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2188
+#: builtin/am.c:2182

 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2190
+#: builtin/am.c:2184

 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:2193
+#: builtin/am.c:2187

 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:2196
+#: builtin/am.c:2190

 msgid "strip everything before a scissors line"
 msgstr ""
 
 msgid "strip everything before a scissors line"
 msgstr ""
 

-#: 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
+#: builtin/am.c:2192 builtin/am.c:2195 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:2219

 msgid "pass it through git-apply"
 msgstr ""
 
 msgid "pass it through git-apply"
 msgstr ""
 

-#: 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:854
+#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240
+#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062

 #: 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
 #: 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
+#: parse-options.h:144 parse-options.h:146 parse-options.h:266

 msgid "n"
 msgstr ""
 
 msgid "n"
 msgstr ""
 

-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38

 #: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
 msgid "format"
 msgstr ""
 
 #: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
 msgid "format"
 msgstr ""
 

-#: builtin/am.c:2222
+#: builtin/am.c:2216

 msgid "format the patch(es) are in"
 msgstr ""
 
 msgid "format the patch(es) are in"
 msgstr ""
 

-#: builtin/am.c:2228
+#: builtin/am.c:2222

 msgid "override error message when patch failure occurs"
 msgstr ""
 
 msgid "override error message when patch failure occurs"
 msgstr ""
 

-#: builtin/am.c:2230
+#: builtin/am.c:2224

 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 

-#: builtin/am.c:2233
+#: builtin/am.c:2227

 msgid "synonyms for --continue"
 msgstr ""
 
 msgid "synonyms for --continue"
 msgstr ""
 

-#: builtin/am.c:2236
+#: builtin/am.c:2230

 msgid "skip the current patch"
 msgstr ""
 
 msgid "skip the current patch"
 msgstr ""
 

-#: builtin/am.c:2239
+#: builtin/am.c:2233

 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:2242
+#: builtin/am.c:2236

 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:2245
+#: builtin/am.c:2239

 msgid "show the patch being applied."
 msgstr ""
 
 msgid "show the patch being applied."
 msgstr ""
 

-#: builtin/am.c:2249
+#: builtin/am.c:2243

 msgid "lie about committer date"
 msgstr ""
 
 msgid "lie about committer date"
 msgstr ""
 

-#: builtin/am.c:2251
+#: builtin/am.c:2245

 msgid "use current timestamp for author date"
 msgstr ""
 
 msgid "use current timestamp for author date"
 msgstr ""
 

-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274
+#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185
+#: builtin/revert.c:114 builtin/tag.c:402

 msgid "key-id"
 msgstr ""
 
 msgid "key-id"
 msgstr ""
 

-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186

 msgid "GPG-sign commits"
 msgstr ""
 
 msgid "GPG-sign commits"
 msgstr ""
 

-#: builtin/am.c:2257
+#: builtin/am.c:2251

 msgid "(internal use for git-rebase)"
 msgstr ""
 
 msgid "(internal use for git-rebase)"
 msgstr ""
 

-#: builtin/am.c:2275
+#: builtin/am.c:2269

 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:2282
+#: builtin/am.c:2276

 msgid "failed to read the index"
 msgstr ""
 
 msgid "failed to read the index"
 msgstr ""
 

-#: builtin/am.c:2297
+#: builtin/am.c:2291

 #, 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:2321
+#: builtin/am.c:2315

 #, 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:2327
+#: builtin/am.c:2321

 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 


@@ -7192,130 +7594,318 @@ msgstr ""
 msgid "git archive: Remote with no URL"
 msgstr ""
 
 msgid "git archive: Remote with no URL"
 msgstr ""
 

-#: builtin/archive.c:58
+#: builtin/archive.c:61

 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr ""
 
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr ""
 

-#: builtin/archive.c:61
+#: builtin/archive.c:64

 #, c-format
 msgid "git archive: NACK %s"
 msgstr ""
 
 #, c-format
 msgid "git archive: NACK %s"
 msgstr ""
 

-#: builtin/archive.c:64
+#: builtin/archive.c:65

 msgid "git archive: protocol error"
 msgstr ""
 
 msgid "git archive: protocol error"
 msgstr ""
 

-#: builtin/archive.c:68
+#: builtin/archive.c:69

 msgid "git archive: expected a flush"
 msgstr ""
 
 msgid "git archive: expected a flush"
 msgstr ""
 

-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22

 msgid "git bisect--helper --next-all [--no-checkout]"
 msgstr ""
 
 msgid "git bisect--helper --next-all [--no-checkout]"
 msgstr ""
 

-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23

 msgid "git bisect--helper --write-terms <bad_term> <good_term>"
 msgstr ""
 
 msgid "git bisect--helper --write-terms <bad_term> <good_term>"
 msgstr ""
 

-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24

 msgid "git bisect--helper --bisect-clean-state"
 msgstr ""
 
 msgid "git bisect--helper --bisect-clean-state"
 msgstr ""
 

-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:86

 #, c-format
 msgid "'%s' is not a valid term"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr ""
 

-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90

 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr ""
 
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr ""
 

-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100

 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr ""
 
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr ""
 

-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111

 msgid "please use two different terms"
 msgstr ""
 
 msgid "please use two different terms"
 msgstr ""
 

-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118

 msgid "could not open the file BISECT_TERMS"
 msgstr ""
 
 msgid "could not open the file BISECT_TERMS"
 msgstr ""
 

-#: builtin/bisect--helper.c:120
-msgid "perform 'git bisect next'"
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"

 msgstr ""
 
 msgstr ""
 

-#: builtin/bisect--helper.c:122
-msgid "write the terms to .git/BISECT_TERMS"
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"

 msgstr ""
 
 msgstr ""
 

-#: builtin/bisect--helper.c:124
-msgid "cleanup the bisection state"
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid "could not check out original HEAD '%s'. Try 'git bisectreset <commit>'."

 msgstr ""
 
 msgstr ""
 

-#: builtin/bisect--helper.c:126
-msgid "check for expected revs"
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/bisect--helper.c:128
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/bisect--helper.c:143
-msgid "--write-terms requires two arguments"
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/bisect--helper.c:147
-msgid "--bisect-clean-state requires no arguments"
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:31
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:36
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:406
+#: builtin/bisect--helper.c:321

 #, c-format
 #, c-format

-msgid "expecting a color: %s"
+msgid "bisecting only with a %s commit"

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:413
-msgid "must end with a color"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:700
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr ""
+
+#: builtin/bisect--helper.c:379

 #, c-format
 #, c-format

-msgid "invalid color '%s' in color.blame.repeatedLines"
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:718
-msgid "invalid value for blame.coloring"
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:793
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:794
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:795
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:796
-msgid "Show work cost statistics"
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:797
-msgid "Force progress reporting"
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr ""
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr ""
+
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
+msgstr ""
+
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr ""
+
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
+msgstr ""
+
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
+msgstr ""
+
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE "
+msgstr ""
+
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ""
+
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr ""
+
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr ""
+
+#: builtin/blame.c:406
+#, c-format
+msgid "expecting a color: %s"
+msgstr ""
+
+#: builtin/blame.c:413
+msgid "must end with a color"
+msgstr ""
+
+#: builtin/blame.c:700
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr ""
+
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
+msgstr ""
+
+#: builtin/blame.c:793
+msgid "Show blame entries as we find them, incrementally"
+msgstr ""
+
+#: builtin/blame.c:794
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:795
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:796
+msgid "Show work cost statistics"
+msgstr ""
+
+#: builtin/blame.c:797
+msgid "Force progress reporting"

 msgstr ""
 
 #: builtin/blame.c:798
 msgstr ""
 
 #: builtin/blame.c:798


@@ -7406,7 +7996,7 @@ msgstr ""
 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:873
+#: builtin/blame.c:875

 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 


@@ -7418,18 +8008,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
 #. your language may need more or fewer display
 #. columns.
 #.

-#: builtin/blame.c:924
+#: builtin/blame.c:926

 msgid "4 years, 11 months ago"
 msgstr ""
 
 msgid "4 years, 11 months ago"
 msgstr ""
 

-#: builtin/blame.c:1011
+#: builtin/blame.c:1018

 #, 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:1057
+#: builtin/blame.c:1064

 msgid "Blaming lines"
 msgstr ""
 
 msgid "Blaming lines"
 msgstr ""
 


@@ -7620,7 +8210,7 @@ msgstr ""
 msgid "do not use"
 msgstr ""
 
 msgid "do not use"
 msgstr ""
 

-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:602 builtin/rebase--interactive.c:182

 msgid "upstream"
 msgstr ""
 
 msgid "upstream"
 msgstr ""
 


@@ -7719,7 +8309,7 @@ msgid "field name to sort on"
 msgstr ""
 
 #: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
 msgstr ""
 
 #: 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/notes.c:418 builtin/notes.c:581 builtin/notes.c:584

 #: builtin/tag.c:418
 msgid "object"
 msgstr ""
 #: builtin/tag.c:418
 msgid "object"
 msgstr ""


@@ -7737,7 +8327,7 @@ msgstr ""
 msgid "format to use for the output"
 msgstr ""
 
 msgid "format to use for the output"
 msgstr ""
 

-#: builtin/branch.c:660 builtin/clone.c:739
+#: builtin/branch.c:660 builtin/clone.c:746

 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 


@@ -7785,7 +8375,7 @@ msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 

-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:776 builtin/branch.c:799

 #, c-format
 msgid "no such branch '%s'"
 msgstr ""
 #, c-format
 msgid "no such branch '%s'"
 msgstr ""


@@ -7795,24 +8385,24 @@ msgstr ""
 msgid "branch '%s' does not exist"
 msgstr ""
 
 msgid "branch '%s' does not exist"
 msgstr ""
 

-#: builtin/branch.c:792
+#: builtin/branch.c:793

 msgid "too many arguments to unset upstream"
 msgstr ""
 
 msgid "too many arguments to unset upstream"
 msgstr ""
 

-#: builtin/branch.c:796
+#: builtin/branch.c:797

 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:802
+#: builtin/branch.c:803

 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 

-#: builtin/branch.c:812
+#: builtin/branch.c:813

 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:815
+#: builtin/branch.c:816

 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."


@@ -7831,144 +8421,144 @@ msgstr ""
 msgid "Need a repository to unbundle."
 msgstr ""
 
 msgid "Need a repository to unbundle."
 msgstr ""
 

-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:593

 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:588
+#: builtin/cat-file.c:594

 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:609
+#: builtin/cat-file.c:615

 msgid "only one batch option may be specified"
 msgstr ""
 
 msgid "only one batch option may be specified"
 msgstr ""
 

-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:633

 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:628
+#: builtin/cat-file.c:634

 msgid "show object type"
 msgstr ""
 
 msgid "show object type"
 msgstr ""
 

-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:635

 msgid "show object size"
 msgstr ""
 
 msgid "show object size"
 msgstr ""
 

-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:637

 msgid "exit with zero when there's no error"
 msgstr ""
 
 msgid "exit with zero when there's no error"
 msgstr ""
 

-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:638

 msgid "pretty-print object's content"
 msgstr ""
 
 msgid "pretty-print object's content"
 msgstr ""
 

-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:640

 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:636
+#: builtin/cat-file.c:642

 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:637 git-submodule.sh:857
+#: builtin/cat-file.c:643 git-submodule.sh:860

 msgid "blob"
 msgstr ""
 
 msgid "blob"
 msgstr ""
 

-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:644

 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 

-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:646

 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:641
+#: builtin/cat-file.c:647

 msgid "buffer --batch output"
 msgstr ""
 
 msgid "buffer --batch output"
 msgstr ""
 

-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:649

 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:647
+#: builtin/cat-file.c:653

 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:651
+#: builtin/cat-file.c:657

 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:653
+#: builtin/cat-file.c:659

 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 

-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:661

 msgid "do not order --batch-all-objects output"
 msgstr ""
 
 msgid "do not order --batch-all-objects output"
 msgstr ""
 

-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13

 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr ""
 
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr ""
 

-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14

 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr ""
 
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr ""
 

-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21

 msgid "report all attributes set on file"
 msgstr ""
 
 msgid "report all attributes set on file"
 msgstr ""
 

-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22

 msgid "use .gitattributes only from the index"
 msgstr ""
 
 msgid "use .gitattributes only from the index"
 msgstr ""
 

-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102

 msgid "read file names from stdin"
 msgstr ""
 
 msgid "read file names from stdin"
 msgstr ""
 

-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27

 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:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517
+#: builtin/worktree.c:496

 msgid "suppress progress reporting"
 msgstr ""
 
 msgid "suppress progress reporting"
 msgstr ""
 

-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29

 msgid "show non-matching input paths"
 msgstr ""
 
 msgid "show non-matching input paths"
 msgstr ""
 

-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31

 msgid "ignore index when checking"
 msgstr ""
 
 msgid "ignore index when checking"
 msgstr ""
 

-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160

 msgid "cannot specify pathnames with --stdin"
 msgstr ""
 
 msgid "cannot specify pathnames with --stdin"
 msgstr ""
 

-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163

 msgid "-z only makes sense with --stdin"
 msgstr ""
 
 msgid "-z only makes sense with --stdin"
 msgstr ""
 

-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165

 msgid "no path specified"
 msgstr ""
 
 msgid "no path specified"
 msgstr ""
 

-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169

 msgid "--quiet is only valid with a single pathname"
 msgstr ""
 
 msgid "--quiet is only valid with a single pathname"
 msgstr ""
 

-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171

 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 

-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174

 msgid "--non-matching is only valid with --verbose"
 msgstr ""
 
 msgid "--non-matching is only valid with --verbose"
 msgstr ""
 


@@ -7989,164 +8579,185 @@ msgstr ""
 msgid "no contacts specified"
 msgstr ""
 
 msgid "no contacts specified"
 msgstr ""
 

-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131

 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr ""
 
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr ""
 

-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148

 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:161
+#: builtin/checkout-index.c:164

 msgid "check out all files in the index"
 msgstr ""
 
 msgid "check out all files in the index"
 msgstr ""
 

-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165

 msgid "force overwrite of existing files"
 msgstr ""
 
 msgid "force overwrite of existing files"
 msgstr ""
 

-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167

 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:166
+#: builtin/checkout-index.c:169

 msgid "don't checkout new files"
 msgstr ""
 
 msgid "don't checkout new files"
 msgstr ""
 

-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171

 msgid "update stat information in the index file"
 msgstr ""
 
 msgid "update stat information in the index file"
 msgstr ""
 

-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175

 msgid "read list of paths from the standard input"
 msgstr ""
 
 msgid "read list of paths from the standard input"
 msgstr ""
 

-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177

 msgid "write the content to temporary files"
 msgstr ""
 
 msgid "write the content to temporary files"
 msgstr ""
 

-#: 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
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:669

 msgid "string"
 msgstr ""
 
 msgid "string"
 msgstr ""
 

-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179

 msgid "when creating files, prepend <string>"
 msgstr ""
 
 msgid "when creating files, prepend <string>"
 msgstr ""
 

-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181

 msgid "copy out the files from named stage"
 msgstr ""
 
 msgid "copy out the files from named stage"
 msgstr ""
 

-#: builtin/checkout.c:31
+#: builtin/checkout.c:32

 msgid "git checkout [<options>] <branch>"
 msgstr ""
 
 msgid "git checkout [<options>] <branch>"
 msgstr ""
 

-#: builtin/checkout.c:32
+#: builtin/checkout.c:33

 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr ""
 
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr ""
 

-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:147 builtin/checkout.c:181

 #, 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:146 builtin/checkout.c:179
+#: builtin/checkout.c:149 builtin/checkout.c:183

 #, 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:162
+#: builtin/checkout.c:165

 #, 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:206
+#: builtin/checkout.c:210

 #, 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:224
+#: builtin/checkout.c:228

 #, c-format
 msgid "path '%s': cannot merge"
 msgstr ""
 
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr ""
 

-#: builtin/checkout.c:240
+#: builtin/checkout.c:244

 #, 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:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273
+#: builtin/checkout.c:276

 #, 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:274 builtin/checkout.c:277
+#: builtin/checkout.c:279 builtin/checkout.c:282

 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 

-#: builtin/checkout.c:280
+#: builtin/checkout.c:285

 #, 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:349 builtin/checkout.c:356
+#: builtin/checkout.c:354 builtin/checkout.c:361

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

-#: builtin/checkout.c:608
+#: builtin/checkout.c:397
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:402
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:409
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:645

 msgid "you need to resolve your current index first"
 msgstr ""
 
 msgid "you need to resolve your current index first"
 msgstr ""
 

-#: builtin/checkout.c:745
+#: builtin/checkout.c:782

 #, 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:786
+#: builtin/checkout.c:824

 msgid "HEAD is now at"
 msgstr ""
 
 msgid "HEAD is now at"
 msgstr ""
 

-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:828 builtin/clone.c:699

 msgid "unable to update HEAD"
 msgstr ""
 
 msgid "unable to update HEAD"
 msgstr ""
 

-#: builtin/checkout.c:794
+#: builtin/checkout.c:832

 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:797
+#: builtin/checkout.c:835

 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:801
+#: builtin/checkout.c:839

 #, 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:803 builtin/checkout.c:1166
+#: builtin/checkout.c:841 builtin/checkout.c:1212

 #, 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:805
+#: builtin/checkout.c:843

 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:856
+#: builtin/checkout.c:894

 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 

-#: builtin/checkout.c:862
+#: builtin/checkout.c:900

 #, 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"


@@ -8161,7 +8772,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:881
+#: builtin/checkout.c:919

 #, 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"


@@ -8178,166 +8789,173 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:913
+#: builtin/checkout.c:951

 msgid "internal error in revision walk"
 msgstr ""
 
 msgid "internal error in revision walk"
 msgstr ""
 

-#: builtin/checkout.c:917
+#: builtin/checkout.c:955

 msgid "Previous HEAD position was"
 msgstr ""
 
 msgid "Previous HEAD position was"
 msgstr ""
 

-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:983 builtin/checkout.c:1207

 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:1066
+#: builtin/checkout.c:1104

 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 

-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1140
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+
+#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445

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

-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1182

 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 

-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1221

 msgid "paths cannot be used with switching branches"
 msgstr ""
 
 msgid "paths cannot be used with switching branches"
 msgstr ""
 

-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1224 builtin/checkout.c:1228

 #, 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:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240
+#: builtin/checkout.c:1243

 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 

-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1248

 #, 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: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
+#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489
+#: builtin/worktree.c:491

 msgid "branch"
 msgstr ""
 
 msgid "branch"
 msgstr ""
 

-#: builtin/checkout.c:1236
+#: builtin/checkout.c:1282

 msgid "create and checkout a new branch"
 msgstr ""
 
 msgid "create and checkout a new branch"
 msgstr ""
 

-#: builtin/checkout.c:1238
+#: builtin/checkout.c:1284

 msgid "create/reset and checkout a branch"
 msgstr ""
 
 msgid "create/reset and checkout a branch"
 msgstr ""
 

-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1285

 msgid "create reflog for new branch"
 msgstr ""
 
 msgid "create reflog for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1240 builtin/worktree.c:492
+#: builtin/checkout.c:1286 builtin/worktree.c:493

 msgid "detach HEAD at named commit"
 msgstr ""
 
 msgid "detach HEAD at named commit"
 msgstr ""
 

-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1287

 msgid "set upstream info for new branch"
 msgstr ""
 
 msgid "set upstream info for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1243
+#: builtin/checkout.c:1289

 msgid "new-branch"
 msgstr ""
 
 msgid "new-branch"
 msgstr ""
 

-#: builtin/checkout.c:1243
+#: builtin/checkout.c:1289

 msgid "new unparented branch"
 msgstr ""
 
 msgid "new unparented branch"
 msgstr ""
 

-#: builtin/checkout.c:1245
+#: builtin/checkout.c:1291

 msgid "checkout our version for unmerged files"
 msgstr ""
 
 msgid "checkout our version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1248
+#: builtin/checkout.c:1294

 msgid "checkout their version for unmerged files"
 msgstr ""
 
 msgid "checkout their version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1296

 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 

-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1298

 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:1254 builtin/merge.c:275
+#: builtin/checkout.c:1300 builtin/merge.c:276

 msgid "update ignored files (default)"
 msgstr ""
 
 msgid "update ignored files (default)"
 msgstr ""
 

-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
+#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272

 msgid "style"
 msgstr ""
 
 msgid "style"
 msgstr ""
 

-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1303

 msgid "conflict style (merge or diff3)"
 msgstr ""
 
 msgid "conflict style (merge or diff3)"
 msgstr ""
 

-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1306

 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 

-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
+#: builtin/checkout.c:1308
+msgid "do not second guess 'git checkout <no-such-branch>'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/checkout.c:1264
+#: builtin/checkout.c:1310

 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:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141
+#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575

 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr ""
 
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr ""
 

-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1345

 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 

-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1362

 msgid "--track needs a branch name"
 msgstr ""
 
 msgid "--track needs a branch name"
 msgstr ""
 

-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1367

 msgid "missing branch name; try -b"
 msgstr ""
 
 msgid "missing branch name; try -b"
 msgstr ""
 

-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1404

 msgid "invalid path specification"
 msgstr ""
 
 msgid "invalid path specification"
 msgstr ""
 

-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1411

 #, 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:1368
+#: builtin/checkout.c:1415

 #, 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:1372
+#: builtin/checkout.c:1419

 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:1392
+#: builtin/checkout.c:1439

 #, c-format
 msgid ""
 "'%s' matched more than one remote tracking branch.\n"
 #, c-format
 msgid ""
 "'%s' matched more than one remote tracking branch.\n"


@@ -8354,37 +8972,37 @@ msgid ""
 "checkout.defaultRemote=origin in your config."
 msgstr ""
 
 "checkout.defaultRemote=origin in your config."
 msgstr ""
 

-#: builtin/clean.c:27
+#: builtin/clean.c:28

 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 

-#: builtin/clean.c:31
+#: builtin/clean.c:32

 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 

-#: builtin/clean.c:32
+#: builtin/clean.c:33

 #, c-format
 msgid "Would remove %s\n"
 msgstr ""
 
 #, c-format
 msgid "Would remove %s\n"
 msgstr ""
 

-#: builtin/clean.c:33
+#: builtin/clean.c:34

 #, c-format
 msgid "Skipping repository %s\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr ""
 

-#: builtin/clean.c:34
+#: builtin/clean.c:35

 #, c-format
 msgid "Would skip repository %s\n"
 msgstr ""
 
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr ""
 

-#: builtin/clean.c:35
+#: builtin/clean.c:36

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

-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:299 git-add--interactive.perl:579

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -8393,7 +9011,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr ""
 
 "           - (empty) select nothing\n"
 msgstr ""
 

-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:303 git-add--interactive.perl:588

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -8406,38 +9024,38 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr ""
 
 "           - (empty) finish selecting\n"
 msgstr ""
 

-#: builtin/clean.c:518 git-add--interactive.perl:554
+#: builtin/clean.c:519 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:660
+#: builtin/clean.c:661

 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 

-#: builtin/clean.c:697
+#: builtin/clean.c:698

 #, 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:718
+#: builtin/clean.c:719

 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:759
+#: builtin/clean.c:760

 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 

-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:785 git-add--interactive.perl:1717

 #, c-format
 msgid "Bye.\n"
 msgstr ""
 
 #, c-format
 msgid "Bye.\n"
 msgstr ""
 

-#: builtin/clean.c:792
+#: builtin/clean.c:793

 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"


@@ -8448,391 +9066,391 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
 "?                   - help for prompt selection"
 msgstr ""
 

-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:820 git-add--interactive.perl:1793

 msgid "*** Commands ***"
 msgstr ""
 
 msgid "*** Commands ***"
 msgstr ""
 

-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:821 git-add--interactive.perl:1790

 msgid "What now"
 msgstr ""
 
 msgid "What now"
 msgstr ""
 

-#: builtin/clean.c:828
+#: builtin/clean.c:829

 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:844
+#: builtin/clean.c:845

 msgid "No more files to clean, exiting."
 msgstr ""
 
 msgid "No more files to clean, exiting."
 msgstr ""
 

-#: builtin/clean.c:906
+#: builtin/clean.c:907

 msgid "do not print names of files removed"
 msgstr ""
 
 msgid "do not print names of files removed"
 msgstr ""
 

-#: builtin/clean.c:908
+#: builtin/clean.c:909

 msgid "force"
 msgstr ""
 
 msgid "force"
 msgstr ""
 

-#: builtin/clean.c:909
+#: builtin/clean.c:910

 msgid "interactive cleaning"
 msgstr ""
 
 msgid "interactive cleaning"
 msgstr ""
 

-#: builtin/clean.c:911
+#: builtin/clean.c:912

 msgid "remove whole directories"
 msgstr ""
 
 msgid "remove whole directories"
 msgstr ""
 

-#: 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/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169
+#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417

 #: builtin/show-ref.c:178
 msgid "pattern"
 msgstr ""
 
 #: builtin/show-ref.c:178
 msgid "pattern"
 msgstr ""
 

-#: builtin/clean.c:913
+#: builtin/clean.c:914

 msgid "add <pattern> to ignore rules"
 msgstr ""
 
 msgid "add <pattern> to ignore rules"
 msgstr ""
 

-#: builtin/clean.c:914
+#: builtin/clean.c:915

 msgid "remove ignored files, too"
 msgstr ""
 
 msgid "remove ignored files, too"
 msgstr ""
 

-#: builtin/clean.c:916
+#: builtin/clean.c:917

 msgid "remove only ignored files"
 msgstr ""
 
 msgid "remove only ignored files"
 msgstr ""
 

-#: builtin/clean.c:934
+#: builtin/clean.c:935

 msgid "-x and -X cannot be used together"
 msgstr ""
 
 msgid "-x and -X cannot be used together"
 msgstr ""
 

-#: builtin/clean.c:938
+#: builtin/clean.c:939

 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:941
+#: builtin/clean.c:942

 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 

-#: builtin/clone.c:43
+#: builtin/clone.c:44

 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 

-#: builtin/clone.c:88
+#: builtin/clone.c:89

 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:481
+#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481

 msgid "create a bare repository"
 msgstr ""
 
 msgid "create a bare repository"
 msgstr ""
 

-#: builtin/clone.c:93
+#: builtin/clone.c:94

 msgid "create a mirror repository (implies bare)"
 msgstr ""
 
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 

-#: builtin/clone.c:95
+#: builtin/clone.c:96

 msgid "to clone from a local repository"
 msgstr ""
 
 msgid "to clone from a local repository"
 msgstr ""
 

-#: builtin/clone.c:97
+#: builtin/clone.c:98

 msgid "don't use local hardlinks, always copy"
 msgstr ""
 
 msgid "don't use local hardlinks, always copy"
 msgstr ""
 

-#: builtin/clone.c:99
+#: builtin/clone.c:100

 msgid "setup as shared repository"
 msgstr ""
 
 msgid "setup as shared repository"
 msgstr ""
 

-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:102 builtin/clone.c:106

 msgid "pathspec"
 msgstr ""
 
 msgid "pathspec"
 msgstr ""
 

-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:102 builtin/clone.c:106

 msgid "initialize submodules in the clone"
 msgstr ""
 
 msgid "initialize submodules in the clone"
 msgstr ""
 

-#: builtin/clone.c:108
+#: builtin/clone.c:109

 msgid "number of submodules cloned in parallel"
 msgstr ""
 
 msgid "number of submodules cloned in parallel"
 msgstr ""
 

-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:110 builtin/init-db.c:478

 msgid "template-directory"
 msgstr ""
 
 msgid "template-directory"
 msgstr ""
 

-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:111 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:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1860

 msgid "reference repository"
 msgstr ""
 
 msgid "reference repository"
 msgstr ""
 

-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:117 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1862

 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:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3303 builtin/repack.c:329

 msgid "name"
 msgstr ""
 
 msgid "name"
 msgstr ""
 

-#: builtin/clone.c:118
+#: builtin/clone.c:119

 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 

-#: builtin/clone.c:120
+#: builtin/clone.c:121

 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 

-#: builtin/clone.c:122
+#: builtin/clone.c:123

 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:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:218

 msgid "depth"
 msgstr ""
 
 msgid "depth"
 msgstr ""
 

-#: builtin/clone.c:124
+#: builtin/clone.c:125

 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:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292

 msgid "time"
 msgstr ""
 
 msgid "time"
 msgstr ""
 

-#: builtin/clone.c:126
+#: builtin/clone.c:127

 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:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1039

 msgid "revision"
 msgstr ""
 
 msgid "revision"
 msgstr ""
 

-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:129 builtin/fetch.c:147

 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 

-#: builtin/clone.c:130
+#: builtin/clone.c:131

 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 

-#: builtin/clone.c:132
+#: builtin/clone.c:133

 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 

-#: builtin/clone.c:134
+#: builtin/clone.c:135

 msgid "any cloned submodules will be shallow"
 msgstr ""
 
 msgid "any cloned submodules will be shallow"
 msgstr ""
 

-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:136 builtin/init-db.c:487

 msgid "gitdir"
 msgstr ""
 
 msgid "gitdir"
 msgstr ""
 

-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:137 builtin/init-db.c:488

 msgid "separate git dir from working tree"
 msgstr ""
 
 msgid "separate git dir from working tree"
 msgstr ""
 

-#: builtin/clone.c:137
+#: builtin/clone.c:138

 msgid "key=value"
 msgstr ""
 
 msgid "key=value"
 msgstr ""
 

-#: builtin/clone.c:138
+#: builtin/clone.c:139

 msgid "set config inside the new repository"
 msgstr ""
 
 msgid "set config inside the new repository"
 msgstr ""
 

-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231
+#: builtin/push.c:586

 msgid "use IPv4 addresses only"
 msgstr ""
 
 msgid "use IPv4 addresses only"
 msgstr ""
 

-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234
+#: builtin/push.c:588

 msgid "use IPv6 addresses only"
 msgstr ""
 
 msgid "use IPv6 addresses only"
 msgstr ""
 

-#: builtin/clone.c:279
+#: builtin/clone.c:280

 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 

-#: builtin/clone.c:332
+#: builtin/clone.c:333

 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 

-#: builtin/clone.c:404
+#: builtin/clone.c:405

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

-#: builtin/clone.c:412
+#: builtin/clone.c:413

 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 

-#: builtin/clone.c:426
+#: builtin/clone.c:427

 #, c-format
 msgid "failed to stat %s\n"
 msgstr ""
 
 #, c-format
 msgid "failed to stat %s\n"
 msgstr ""
 

-#: builtin/clone.c:443
+#: builtin/clone.c:444

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

-#: builtin/clone.c:448
+#: builtin/clone.c:449

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

-#: builtin/clone.c:452
+#: builtin/clone.c:453

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

-#: builtin/clone.c:478
+#: builtin/clone.c:479

 #, c-format
 msgid "done.\n"
 msgstr ""
 
 #, c-format
 msgid "done.\n"
 msgstr ""
 

-#: builtin/clone.c:492
+#: builtin/clone.c:493

 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr ""
 
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr ""
 

-#: builtin/clone.c:569
+#: builtin/clone.c:570

 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 

-#: builtin/clone.c:680
+#: builtin/clone.c:687

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

-#: builtin/clone.c:730
+#: builtin/clone.c:737

 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:761
+#: builtin/clone.c:768

 msgid "unable to checkout working tree"
 msgstr ""
 
 msgid "unable to checkout working tree"
 msgstr ""
 

-#: builtin/clone.c:806
+#: builtin/clone.c:813

 msgid "unable to write parameters to config file"
 msgstr ""
 
 msgid "unable to write parameters to config file"
 msgstr ""
 

-#: builtin/clone.c:869
+#: builtin/clone.c:876

 msgid "cannot repack to clean up"
 msgstr ""
 
 msgid "cannot repack to clean up"
 msgstr ""
 

-#: builtin/clone.c:871
+#: builtin/clone.c:878

 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 

-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:918 builtin/receive-pack.c:1941

 msgid "Too many arguments."
 msgstr ""
 
 msgid "Too many arguments."
 msgstr ""
 

-#: builtin/clone.c:915
+#: builtin/clone.c:922

 msgid "You must specify a repository to clone."
 msgstr ""
 
 msgid "You must specify a repository to clone."
 msgstr ""
 

-#: builtin/clone.c:928
+#: builtin/clone.c:935

 #, 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:931
+#: builtin/clone.c:938

 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 

-#: builtin/clone.c:944
+#: builtin/clone.c:951

 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 

-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:957 builtin/fetch.c:1608

 #, 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:960
+#: builtin/clone.c:967

 #, 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:970
+#: builtin/clone.c:977

 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 

-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272
+#: builtin/worktree.c:296 builtin/worktree.c:326

 #, 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:990
+#: builtin/clone.c:997

 #, 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:1010
+#: builtin/clone.c:1017

 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:1012
+#: builtin/clone.c:1019

 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:1036
+#: builtin/clone.c:1043

 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:1097
+#: builtin/clone.c:1104

 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:1099
+#: builtin/clone.c:1106

 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:1101
+#: builtin/clone.c:1108

 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:1103
+#: builtin/clone.c:1110

 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:1106
+#: builtin/clone.c:1113

 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 

-#: builtin/clone.c:1111
+#: builtin/clone.c:1118

 msgid "--local is ignored"
 msgstr ""
 
 msgid "--local is ignored"
 msgstr ""
 

-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1192 builtin/clone.c:1200

 #, 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:1192
+#: builtin/clone.c:1203

 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 


@@ -8868,22 +9486,22 @@ msgstr ""
 msgid "--command must be the first argument"
 msgstr ""
 
 msgid "--command must be the first argument"
 msgstr ""
 

-#: builtin/commit.c:40
+#: builtin/commit.c:41

 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr ""
 
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/commit.c:45
+#: builtin/commit.c:46

 msgid "git status [<options>] [--] <pathspec>..."
 msgstr ""
 
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/commit.c:50
+#: builtin/commit.c:51

 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:55
+#: builtin/commit.c:56

 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"


@@ -8892,11 +9510,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: builtin/commit.c:62
+#: builtin/commit.c:63

 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 
 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 

-#: builtin/commit.c:65
+#: builtin/commit.c:66

 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"


@@ -8906,98 +9524,98 @@ msgid ""
 "the remaining commits.\n"
 msgstr ""
 
 "the remaining commits.\n"
 msgstr ""
 

-#: builtin/commit.c:311
+#: builtin/commit.c:312

 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 

-#: builtin/commit.c:352
+#: builtin/commit.c:353

 msgid "unable to create temporary index"
 msgstr ""
 
 msgid "unable to create temporary index"
 msgstr ""
 

-#: builtin/commit.c:358
+#: builtin/commit.c:359

 msgid "interactive add failed"
 msgstr ""
 
 msgid "interactive add failed"
 msgstr ""
 

-#: builtin/commit.c:371
+#: builtin/commit.c:373

 msgid "unable to update temporary index"
 msgstr ""
 
 msgid "unable to update temporary index"
 msgstr ""
 

-#: builtin/commit.c:373
+#: builtin/commit.c:375

 msgid "Failed to update main cache tree"
 msgstr ""
 
 msgid "Failed to update main cache tree"
 msgstr ""
 

-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469

 msgid "unable to write new_index file"
 msgstr ""
 
 msgid "unable to write new_index file"
 msgstr ""
 

-#: builtin/commit.c:450
+#: builtin/commit.c:452

 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 

-#: builtin/commit.c:452
+#: builtin/commit.c:454

 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:460
+#: builtin/commit.c:462

 msgid "cannot read the index"
 msgstr ""
 
 msgid "cannot read the index"
 msgstr ""
 

-#: builtin/commit.c:479
+#: builtin/commit.c:481

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

-#: builtin/commit.c:577
+#: builtin/commit.c:579

 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 

-#: builtin/commit.c:579
+#: builtin/commit.c:581

 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 

-#: builtin/commit.c:598
+#: builtin/commit.c:600

 msgid "malformed --author parameter"
 msgstr ""
 
 msgid "malformed --author parameter"
 msgstr ""
 

-#: builtin/commit.c:650
+#: builtin/commit.c:652

 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:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052

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

-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:701 builtin/shortlog.c:319

 #, 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:701
+#: builtin/commit.c:703

 msgid "could not read log from standard input"
 msgstr ""
 
 msgid "could not read log from standard input"
 msgstr ""
 

-#: builtin/commit.c:705
+#: builtin/commit.c:707

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

-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:736 builtin/commit.c:744

 msgid "could not read SQUASH_MSG"
 msgstr ""
 
 msgid "could not read SQUASH_MSG"
 msgstr ""
 

-#: builtin/commit.c:739
+#: builtin/commit.c:741

 msgid "could not read MERGE_MSG"
 msgstr ""
 
 msgid "could not read MERGE_MSG"
 msgstr ""
 

-#: builtin/commit.c:793
+#: builtin/commit.c:795

 msgid "could not write commit template"
 msgstr ""
 
 msgid "could not write commit template"
 msgstr ""
 

-#: builtin/commit.c:811
+#: builtin/commit.c:813

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -9007,7 +9625,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:816
+#: builtin/commit.c:818

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -9017,14 +9635,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:829
+#: builtin/commit.c:831

 #, 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:837
+#: builtin/commit.c:839

 #, 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"


@@ -9032,346 +9650,346 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
 "An empty message aborts the commit.\n"
 msgstr ""
 

-#: builtin/commit.c:854
+#: builtin/commit.c:856

 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:862
+#: builtin/commit.c:864

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

-#: builtin/commit.c:869
+#: builtin/commit.c:871

 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:887
+#: builtin/commit.c:889

 msgid "Cannot read index"
 msgstr ""
 
 msgid "Cannot read index"
 msgstr ""
 

-#: builtin/commit.c:953
+#: builtin/commit.c:956

 msgid "Error building trees"
 msgstr ""
 
 msgid "Error building trees"
 msgstr ""
 

-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:970 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:1011
+#: builtin/commit.c:1014

 #, 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:1025
+#: builtin/commit.c:1028

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

-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1042 builtin/commit.c:1279

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 

-#: builtin/commit.c:1077
+#: builtin/commit.c:1080

 msgid "--long and -z are incompatible"
 msgstr ""
 
 msgid "--long and -z are incompatible"
 msgstr ""
 

-#: builtin/commit.c:1110
+#: builtin/commit.c:1113

 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:1119
+#: builtin/commit.c:1122

 msgid "You have nothing to amend."
 msgstr ""
 
 msgid "You have nothing to amend."
 msgstr ""
 

-#: builtin/commit.c:1122
+#: builtin/commit.c:1125

 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:1124
+#: builtin/commit.c:1127

 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:1127
+#: builtin/commit.c:1130

 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 

-#: builtin/commit.c:1137
+#: builtin/commit.c:1140

 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:1139
+#: builtin/commit.c:1142

 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:1147
+#: builtin/commit.c:1150

 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:1164
+#: builtin/commit.c:1167

 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:1166
+#: builtin/commit.c:1169

 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:1180 builtin/tag.c:546
+#: builtin/commit.c:1183 builtin/tag.c:546

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 

-#: builtin/commit.c:1185
+#: builtin/commit.c:1188

 msgid "Paths with -a does not make sense."
 msgstr ""
 
 msgid "Paths with -a does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1314 builtin/commit.c:1498

 msgid "show status concisely"
 msgstr ""
 
 msgid "show status concisely"
 msgstr ""
 

-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1316 builtin/commit.c:1500

 msgid "show branch information"
 msgstr ""
 
 msgid "show branch information"
 msgstr ""
 

-#: builtin/commit.c:1315
+#: builtin/commit.c:1318

 msgid "show stash information"
 msgstr ""
 
 msgid "show stash information"
 msgstr ""
 

-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1320 builtin/commit.c:1502

 msgid "compute full ahead/behind values"
 msgstr ""
 
 msgid "compute full ahead/behind values"
 msgstr ""
 

-#: builtin/commit.c:1319
+#: builtin/commit.c:1322

 msgid "version"
 msgstr ""
 
 msgid "version"
 msgstr ""
 

-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561
+#: builtin/worktree.c:640

 msgid "machine-readable output"
 msgstr ""
 
 msgid "machine-readable output"
 msgstr ""
 

-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1325 builtin/commit.c:1506

 msgid "show status in long format (default)"
 msgstr ""
 
 msgid "show status in long format (default)"
 msgstr ""
 

-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1328 builtin/commit.c:1509

 msgid "terminate entries with NUL"
 msgstr ""
 
 msgid "terminate entries with NUL"
 msgstr ""
 

-#: 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:910
+#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118

 #: builtin/tag.c:400
 msgid "mode"
 msgstr ""
 
 #: builtin/tag.c:400
 msgid "mode"
 msgstr ""
 

-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1331 builtin/commit.c:1512

 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:1332
+#: builtin/commit.c:1335

 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:1334 parse-options.h:164
+#: builtin/commit.c:1337 parse-options.h:164

 msgid "when"
 msgstr ""
 
 msgid "when"
 msgstr ""
 

-#: builtin/commit.c:1335
+#: builtin/commit.c:1338

 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:1337
+#: builtin/commit.c:1340

 msgid "list untracked files in columns"
 msgstr ""
 
 msgid "list untracked files in columns"
 msgstr ""
 

-#: builtin/commit.c:1338
+#: builtin/commit.c:1341

 msgid "do not detect renames"
 msgstr ""
 
 msgid "do not detect renames"
 msgstr ""
 

-#: builtin/commit.c:1340
+#: builtin/commit.c:1343

 msgid "detect renames, optionally set similarity index"
 msgstr ""
 
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 

-#: builtin/commit.c:1360
+#: builtin/commit.c:1363

 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 

-#: builtin/commit.c:1465
+#: builtin/commit.c:1468

 msgid "suppress summary after successful commit"
 msgstr ""
 
 msgid "suppress summary after successful commit"
 msgstr ""
 

-#: builtin/commit.c:1466
+#: builtin/commit.c:1469

 msgid "show diff in commit message template"
 msgstr ""
 
 msgid "show diff in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1468
+#: builtin/commit.c:1471

 msgid "Commit message options"
 msgstr ""
 
 msgid "Commit message options"
 msgstr ""
 

-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397

 msgid "read message from file"
 msgstr ""
 
 msgid "read message from file"
 msgstr ""
 

-#: builtin/commit.c:1470
+#: builtin/commit.c:1473

 msgid "author"
 msgstr ""
 
 msgid "author"
 msgstr ""
 

-#: builtin/commit.c:1470
+#: builtin/commit.c:1473

 msgid "override author for commit"
 msgstr ""
 
 msgid "override author for commit"
 msgstr ""
 

-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1474 builtin/gc.c:518

 msgid "date"
 msgstr ""
 
 msgid "date"
 msgstr ""
 

-#: builtin/commit.c:1471
+#: builtin/commit.c:1474

 msgid "override date for commit"
 msgstr ""
 
 msgid "override date for commit"
 msgstr ""
 

-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
+#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409
+#: builtin/notes.c:575 builtin/tag.c:395

 msgid "message"
 msgstr ""
 
 msgid "message"
 msgstr ""
 

-#: builtin/commit.c:1472
+#: builtin/commit.c:1475

 msgid "commit message"
 msgstr ""
 
 msgid "commit message"
 msgstr ""
 

-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478
+#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92

 msgid "commit"
 msgstr ""
 
 msgid "commit"
 msgstr ""
 

-#: builtin/commit.c:1473
+#: builtin/commit.c:1476

 msgid "reuse and edit message from specified commit"
 msgstr ""
 
 msgid "reuse and edit message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1474
+#: builtin/commit.c:1477

 msgid "reuse message from specified commit"
 msgstr ""
 
 msgid "reuse message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1475
+#: builtin/commit.c:1478

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 

-#: builtin/commit.c:1476
+#: builtin/commit.c:1479

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 

-#: builtin/commit.c:1477
+#: builtin/commit.c:1480

 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:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277
+#: builtin/pull.c:156 builtin/revert.c:107

 msgid "add Signed-off-by:"
 msgstr ""
 
 msgid "add Signed-off-by:"
 msgstr ""
 

-#: builtin/commit.c:1479
+#: builtin/commit.c:1482

 msgid "use specified template file"
 msgstr ""
 
 msgid "use specified template file"
 msgstr ""
 

-#: builtin/commit.c:1480
+#: builtin/commit.c:1483

 msgid "force edit of commit"
 msgstr ""
 
 msgid "force edit of commit"
 msgstr ""
 

-#: builtin/commit.c:1481
+#: builtin/commit.c:1484

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: builtin/commit.c:1481 builtin/tag.c:401
+#: builtin/commit.c:1484 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:1482
+#: builtin/commit.c:1485

 msgid "include status in commit message template"
 msgstr ""
 
 msgid "include status in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
+#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186
+#: builtin/revert.c:115

 msgid "GPG sign commit"
 msgstr ""
 
 msgid "GPG sign commit"
 msgstr ""
 

-#: builtin/commit.c:1487
+#: builtin/commit.c:1490

 msgid "Commit contents options"
 msgstr ""
 
 msgid "Commit contents options"
 msgstr ""
 

-#: builtin/commit.c:1488
+#: builtin/commit.c:1491

 msgid "commit all changed files"
 msgstr ""
 
 msgid "commit all changed files"
 msgstr ""
 

-#: builtin/commit.c:1489
+#: builtin/commit.c:1492

 msgid "add specified files to index for commit"
 msgstr ""
 
 msgid "add specified files to index for commit"
 msgstr ""
 

-#: builtin/commit.c:1490
+#: builtin/commit.c:1493

 msgid "interactively add files"
 msgstr ""
 
 msgid "interactively add files"
 msgstr ""
 

-#: builtin/commit.c:1491
+#: builtin/commit.c:1494

 msgid "interactively add changes"
 msgstr ""
 
 msgid "interactively add changes"
 msgstr ""
 

-#: builtin/commit.c:1492
+#: builtin/commit.c:1495

 msgid "commit only specified files"
 msgstr ""
 
 msgid "commit only specified files"
 msgstr ""
 

-#: builtin/commit.c:1493
+#: builtin/commit.c:1496

 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 

-#: builtin/commit.c:1494
+#: builtin/commit.c:1497

 msgid "show what would be committed"
 msgstr ""
 
 msgid "show what would be committed"
 msgstr ""
 

-#: builtin/commit.c:1507
+#: builtin/commit.c:1510

 msgid "amend previous commit"
 msgstr ""
 
 msgid "amend previous commit"
 msgstr ""
 

-#: builtin/commit.c:1508
+#: builtin/commit.c:1511

 msgid "bypass post-rewrite hook"
 msgstr ""
 
 msgid "bypass post-rewrite hook"
 msgstr ""
 

-#: builtin/commit.c:1513
+#: builtin/commit.c:1516

 msgid "ok to record an empty change"
 msgstr ""
 
 msgid "ok to record an empty change"
 msgstr ""
 

-#: builtin/commit.c:1515
+#: builtin/commit.c:1518

 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:1588
+#: builtin/commit.c:1591

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 

-#: builtin/commit.c:1595
+#: builtin/commit.c:1598

 msgid "could not read MERGE_MODE"
 msgstr ""
 
 msgid "could not read MERGE_MODE"
 msgstr ""
 

-#: builtin/commit.c:1614
+#: builtin/commit.c:1617

 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 

-#: builtin/commit.c:1625
+#: builtin/commit.c:1628

 #, 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:1630
+#: builtin/commit.c:1633

 #, 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:1665
+#: builtin/commit.c:1668

 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"


@@ -9398,7 +10016,7 @@ msgstr ""
 
 #: 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/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
+#: builtin/log.c:1553

 msgid "dir"
 msgstr ""
 
 msgid "dir"
 msgstr ""
 


@@ -9588,48 +10206,48 @@ msgstr ""
 msgid "with --get, use default value when missing entry"
 msgstr ""
 
 msgid "with --get, use default value when missing entry"
 msgstr ""
 

-#: builtin/config.c:171
+#: builtin/config.c:172

 #, 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:173
+#: builtin/config.c:174

 #, 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:307
+#: builtin/config.c:308

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

-#: builtin/config.c:343
+#: builtin/config.c:344

 #, 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:400
+#: builtin/config.c:401

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

-#: builtin/config.c:442
+#: builtin/config.c:443

 msgid "unable to parse default color value"
 msgstr ""
 
 msgid "unable to parse default color value"
 msgstr ""
 

-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742

 msgid "not in a git directory"
 msgstr ""
 
 msgid "not in a git directory"
 msgstr ""
 

-#: builtin/config.c:498
+#: builtin/config.c:499

 msgid "writing to stdin is not supported"
 msgstr ""
 
 msgid "writing to stdin is not supported"
 msgstr ""
 

-#: builtin/config.c:501
+#: builtin/config.c:502

 msgid "writing config blobs is not supported"
 msgstr ""
 
 msgid "writing config blobs is not supported"
 msgstr ""
 

-#: builtin/config.c:586
+#: builtin/config.c:587

 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"


@@ -9639,81 +10257,81 @@ msgid ""
 "#\temail = %s\n"
 msgstr ""
 
 "#\temail = %s\n"
 msgstr ""
 

-#: builtin/config.c:610
+#: builtin/config.c:611

 msgid "only one config file at a time"
 msgstr ""
 
 msgid "only one config file at a time"
 msgstr ""
 

-#: builtin/config.c:615
+#: builtin/config.c:616

 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:618
+#: builtin/config.c:619

 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:637
+#: builtin/config.c:638

 msgid "$HOME not set"
 msgstr ""
 
 msgid "$HOME not set"
 msgstr ""
 

-#: builtin/config.c:657
+#: builtin/config.c:658

 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 ""
 
 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
+#: builtin/config.c:688

 msgid "--get-color and variable type are incoherent"
 msgstr ""
 
 msgid "--get-color and variable type are incoherent"
 msgstr ""
 

-#: builtin/config.c:692
+#: builtin/config.c:693

 msgid "only one action at a time"
 msgstr ""
 
 msgid "only one action at a time"
 msgstr ""
 

-#: builtin/config.c:705
+#: builtin/config.c:706

 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:711
+#: builtin/config.c:712

 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:717
+#: builtin/config.c:718

 msgid "--default is only applicable to --get"
 msgstr ""
 
 msgid "--default is only applicable to --get"
 msgstr ""
 

-#: builtin/config.c:730
+#: builtin/config.c:731

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

-#: builtin/config.c:733
+#: builtin/config.c:734

 msgid "error processing config file(s)"
 msgstr ""
 
 msgid "error processing config file(s)"
 msgstr ""
 

-#: builtin/config.c:743
+#: builtin/config.c:744

 msgid "editing stdin is not supported"
 msgstr ""
 
 msgid "editing stdin is not supported"
 msgstr ""
 

-#: builtin/config.c:745
+#: builtin/config.c:746

 msgid "editing blobs is not supported"
 msgstr ""
 
 msgid "editing blobs is not supported"
 msgstr ""
 

-#: builtin/config.c:759
+#: builtin/config.c:760

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

-#: builtin/config.c:772
+#: builtin/config.c:773

 #, 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:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858

 #, c-format
 msgid "no such section: %s"
 msgstr ""
 #, c-format
 msgid "no such section: %s"
 msgstr ""


@@ -9726,289 +10344,289 @@ msgstr ""
 msgid "print sizes in human readable format"
 msgstr ""
 
 msgid "print sizes in human readable format"
 msgstr ""
 

-#: builtin/describe.c:26
+#: builtin/describe.c:27

 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr ""
 
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr ""
 

-#: builtin/describe.c:27
+#: builtin/describe.c:28

 msgid "git describe [<options>] --dirty"
 msgstr ""
 
 msgid "git describe [<options>] --dirty"
 msgstr ""
 

-#: builtin/describe.c:62
+#: builtin/describe.c:63

 msgid "head"
 msgstr ""
 
 msgid "head"
 msgstr ""
 

-#: builtin/describe.c:62
+#: builtin/describe.c:63

 msgid "lightweight"
 msgstr ""
 
 msgid "lightweight"
 msgstr ""
 

-#: builtin/describe.c:62
+#: builtin/describe.c:63

 msgid "annotated"
 msgstr ""
 
 msgid "annotated"
 msgstr ""
 

-#: builtin/describe.c:272
+#: builtin/describe.c:273

 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 
 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 

-#: builtin/describe.c:276
+#: builtin/describe.c:277

 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr ""
 
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr ""
 

-#: builtin/describe.c:278
+#: builtin/describe.c:279

 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 

-#: builtin/describe.c:322
+#: builtin/describe.c:323

 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 

-#: builtin/describe.c:324
+#: builtin/describe.c:325

 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 

-#: builtin/describe.c:378
+#: builtin/describe.c:379

 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 
 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 

-#: builtin/describe.c:404
+#: builtin/describe.c:405

 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
 
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
 

-#: builtin/describe.c:408
+#: builtin/describe.c:409

 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 

-#: builtin/describe.c:438
+#: builtin/describe.c:439

 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 

-#: builtin/describe.c:441
+#: builtin/describe.c:442

 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
 

-#: builtin/describe.c:509
+#: builtin/describe.c:510

 #, c-format
 msgid "describe %s\n"
 msgstr ""
 
 #, c-format
 msgid "describe %s\n"
 msgstr ""
 

-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513 builtin/log.c:516

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

-#: builtin/describe.c:520
+#: builtin/describe.c:521

 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr ""
 
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr ""
 

-#: builtin/describe.c:534
+#: builtin/describe.c:535

 msgid "find the tag that comes after the commit"
 msgstr ""
 
 msgid "find the tag that comes after the commit"
 msgstr ""
 

-#: builtin/describe.c:535
+#: builtin/describe.c:536

 msgid "debug search strategy on stderr"
 msgstr ""
 
 msgid "debug search strategy on stderr"
 msgstr ""
 

-#: builtin/describe.c:536
+#: builtin/describe.c:537

 msgid "use any ref"
 msgstr ""
 
 msgid "use any ref"
 msgstr ""
 

-#: builtin/describe.c:537
+#: builtin/describe.c:538

 msgid "use any tag, even unannotated"
 msgstr ""
 
 msgid "use any tag, even unannotated"
 msgstr ""
 

-#: builtin/describe.c:538
+#: builtin/describe.c:539

 msgid "always use long format"
 msgstr ""
 
 msgid "always use long format"
 msgstr ""
 

-#: builtin/describe.c:539
+#: builtin/describe.c:540

 msgid "only follow first parent"
 msgstr ""
 
 msgid "only follow first parent"
 msgstr ""
 

-#: builtin/describe.c:542
+#: builtin/describe.c:543

 msgid "only output exact matches"
 msgstr ""
 
 msgid "only output exact matches"
 msgstr ""
 

-#: builtin/describe.c:544
+#: builtin/describe.c:545

 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 

-#: builtin/describe.c:546
+#: builtin/describe.c:547

 msgid "only consider tags matching <pattern>"
 msgstr ""
 
 msgid "only consider tags matching <pattern>"
 msgstr ""
 

-#: builtin/describe.c:548
+#: builtin/describe.c:549

 msgid "do not consider tags matching <pattern>"
 msgstr ""
 
 msgid "do not consider tags matching <pattern>"
 msgstr ""
 

-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:424

 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 

-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555

 msgid "mark"
 msgstr ""
 
 msgid "mark"
 msgstr ""
 

-#: builtin/describe.c:552
+#: builtin/describe.c:553

 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 

-#: builtin/describe.c:555
+#: builtin/describe.c:556

 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 

-#: builtin/describe.c:573
+#: builtin/describe.c:574

 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 
 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 

-#: builtin/describe.c:602
+#: builtin/describe.c:603

 msgid "No names found, cannot describe anything."
 msgstr ""
 
 msgid "No names found, cannot describe anything."
 msgstr ""
 

-#: builtin/describe.c:652
+#: builtin/describe.c:654

 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 

-#: builtin/describe.c:654
+#: builtin/describe.c:656

 msgid "--broken is incompatible with commit-ishes"
 msgstr ""
 
 msgid "--broken is incompatible with commit-ishes"
 msgstr ""
 

-#: builtin/diff.c:83
+#: builtin/diff.c:84

 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr ""
 
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr ""
 

-#: builtin/diff.c:234
+#: builtin/diff.c:235

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

-#: builtin/diff.c:363
+#: builtin/diff.c:364

 msgid "Not a git repository"
 msgstr ""
 
 msgid "Not a git repository"
 msgstr ""
 

-#: builtin/diff.c:407
+#: builtin/diff.c:408

 #, c-format
 msgid "invalid object '%s' given."
 msgstr ""
 
 #, c-format
 msgid "invalid object '%s' given."
 msgstr ""
 

-#: builtin/diff.c:416
+#: builtin/diff.c:417

 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr ""
 
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr ""
 

-#: builtin/diff.c:421
+#: builtin/diff.c:422

 #, c-format
 msgid "unhandled object '%s' given."
 msgstr ""
 
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr ""
 

-#: builtin/difftool.c:30
+#: builtin/difftool.c:31

 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 

-#: builtin/difftool.c:260
+#: builtin/difftool.c:261

 #, c-format
 msgid "failed: %d"
 msgstr ""
 
 #, c-format
 msgid "failed: %d"
 msgstr ""
 

-#: builtin/difftool.c:302
+#: builtin/difftool.c:303

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

-#: builtin/difftool.c:304
+#: builtin/difftool.c:305

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

-#: builtin/difftool.c:312
+#: builtin/difftool.c:313

 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr ""
 
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr ""
 

-#: builtin/difftool.c:413
+#: builtin/difftool.c:414

 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
 
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
 

-#: builtin/difftool.c:633
+#: builtin/difftool.c:634

 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr ""
 
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr ""
 

-#: builtin/difftool.c:635
+#: builtin/difftool.c:636

 msgid "working tree file has been left."
 msgstr ""
 
 msgid "working tree file has been left."
 msgstr ""
 

-#: builtin/difftool.c:646
+#: builtin/difftool.c:647

 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr ""
 
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr ""
 

-#: builtin/difftool.c:647
+#: builtin/difftool.c:648

 msgid "you may want to cleanup or recover these."
 msgstr ""
 
 msgid "you may want to cleanup or recover these."
 msgstr ""
 

-#: builtin/difftool.c:696
+#: builtin/difftool.c:697

 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr ""
 
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr ""
 

-#: builtin/difftool.c:698
+#: builtin/difftool.c:699

 msgid "perform a full-directory diff"
 msgstr ""
 
 msgid "perform a full-directory diff"
 msgstr ""
 

-#: builtin/difftool.c:700
+#: builtin/difftool.c:701

 msgid "do not prompt before launching a diff tool"
 msgstr ""
 
 msgid "do not prompt before launching a diff tool"
 msgstr ""
 

-#: builtin/difftool.c:705
+#: builtin/difftool.c:706

 msgid "use symlinks in dir-diff mode"
 msgstr ""
 
 msgid "use symlinks in dir-diff mode"
 msgstr ""
 

-#: builtin/difftool.c:706
+#: builtin/difftool.c:707

 msgid "tool"
 msgstr ""
 
 msgid "tool"
 msgstr ""
 

-#: builtin/difftool.c:707
+#: builtin/difftool.c:708

 msgid "use the specified diff tool"
 msgstr ""
 
 msgid "use the specified diff tool"
 msgstr ""
 

-#: builtin/difftool.c:709
+#: builtin/difftool.c:710

 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 

-#: builtin/difftool.c:712
+#: builtin/difftool.c:713

 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
 
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
 

-#: builtin/difftool.c:715
+#: builtin/difftool.c:716

 msgid "specify a custom command for viewing diffs"
 msgstr ""
 
 msgid "specify a custom command for viewing diffs"
 msgstr ""
 

-#: builtin/difftool.c:739
+#: builtin/difftool.c:740

 msgid "no <tool> given for --tool=<tool>"
 msgstr ""
 
 msgid "no <tool> given for --tool=<tool>"
 msgstr ""
 

-#: builtin/difftool.c:746
+#: builtin/difftool.c:747

 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 


@@ -10016,54 +10634,62 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 

-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1084

 msgid "show progress after <n> objects"
 msgstr ""
 
 msgid "show progress after <n> objects"
 msgstr ""
 

-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1086

 msgid "select handling of signed tags"
 msgstr ""
 
 msgid "select handling of signed tags"
 msgstr ""
 

-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1089

 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 

-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1092

 msgid "Dump marks to this file"
 msgstr ""
 
 msgid "Dump marks to this file"
 msgstr ""
 

-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1094

 msgid "Import marks from this file"
 msgstr ""
 
 msgid "Import marks from this file"
 msgstr ""
 

-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1096

 msgid "Fake a tagger when tags lack one"
 msgstr ""
 
 msgid "Fake a tagger when tags lack one"
 msgstr ""
 

-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1098

 msgid "Output full tree for each commit"
 msgstr ""
 
 msgid "Output full tree for each commit"
 msgstr ""
 

-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1100

 msgid "Use the done feature to terminate the stream"
 msgstr ""
 
 msgid "Use the done feature to terminate the stream"
 msgstr ""
 

-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1101

 msgid "Skip output of blob data"
 msgstr ""
 
 msgid "Skip output of blob data"
 msgstr ""
 

-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1102 builtin/log.c:1601

 msgid "refspec"
 msgstr ""
 
 msgid "refspec"
 msgstr ""
 

-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1103

 msgid "Apply refspec to exported refs"
 msgstr ""
 
 msgid "Apply refspec to exported refs"
 msgstr ""
 

-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1104

 msgid "anonymize output"
 msgstr ""
 
 msgid "anonymize output"
 msgstr ""
 

+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
+msgstr ""
+

 #: builtin/fetch.c:28
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 #: builtin/fetch.c:28
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""


@@ -10080,15 +10706,15 @@ msgstr ""
 msgid "git fetch --all [<options>]"
 msgstr ""
 
 msgid "git fetch --all [<options>]"
 msgstr ""
 

-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:115 builtin/pull.c:195

 msgid "fetch from all remotes"
 msgstr ""
 
 msgid "fetch from all remotes"
 msgstr ""
 

-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:117 builtin/pull.c:198

 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 

-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:119 builtin/pull.c:201

 msgid "path to upload pack on remote end"
 msgstr ""
 
 msgid "path to upload pack on remote end"
 msgstr ""
 


@@ -10100,7 +10726,7 @@ msgstr ""
 msgid "fetch from multiple remotes"
 msgstr ""
 
 msgid "fetch from multiple remotes"
 msgstr ""
 

-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:124 builtin/pull.c:205

 msgid "fetch all tags and associated objects"
 msgstr ""
 
 msgid "fetch all tags and associated objects"
 msgstr ""
 


@@ -10112,7 +10738,7 @@ msgstr ""
 msgid "number of submodules fetched in parallel"
 msgstr ""
 
 msgid "number of submodules fetched in parallel"
 msgstr ""
 

-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:130 builtin/pull.c:208

 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 


@@ -10120,7 +10746,7 @@ msgstr ""
 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:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133

 msgid "on-demand"
 msgstr ""
 
 msgid "on-demand"
 msgstr ""
 


@@ -10128,7 +10754,7 @@ msgstr ""
 msgid "control recursive fetching of submodules"
 msgstr ""
 
 msgid "control recursive fetching of submodules"
 msgstr ""
 

-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:138 builtin/pull.c:216

 msgid "keep downloaded pack"
 msgstr ""
 
 msgid "keep downloaded pack"
 msgstr ""
 


@@ -10136,7 +10762,7 @@ msgstr ""
 msgid "allow updating of HEAD ref"
 msgstr ""
 
 msgid "allow updating of HEAD ref"
 msgstr ""
 

-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219

 msgid "deepen history of shallow clone"
 msgstr ""
 
 msgid "deepen history of shallow clone"
 msgstr ""
 


@@ -10144,7 +10770,7 @@ msgstr ""
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 

-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:151 builtin/pull.c:222

 msgid "convert to a complete repository"
 msgstr ""
 
 msgid "convert to a complete repository"
 msgstr ""
 


@@ -10158,24 +10784,24 @@ msgid ""
 "files)"
 msgstr ""
 
 "files)"
 msgstr ""
 

-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:161 builtin/pull.c:225

 msgid "accept refs that update .git/shallow"
 msgstr ""
 
 msgid "accept refs that update .git/shallow"
 msgstr ""
 

-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:162 builtin/pull.c:227

 msgid "refmap"
 msgstr ""
 
 msgid "refmap"
 msgstr ""
 

-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:163 builtin/pull.c:228

 msgid "specify fetch refmap"
 msgstr ""
 
 msgid "specify fetch refmap"
 msgstr ""
 

-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585

 #: builtin/send-pack.c:172
 msgid "server-specific"
 msgstr ""
 
 #: builtin/send-pack.c:172
 msgid "server-specific"
 msgstr ""
 

-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585

 #: builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr ""
 #: builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr ""


@@ -10184,175 +10810,176 @@ msgstr ""
 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:470
+#: builtin/fetch.c:469

 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 

-#: builtin/fetch.c:609
+#: builtin/fetch.c:608

 #, 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:702
+#: builtin/fetch.c:705

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

-#: builtin/fetch.c:706
+#: builtin/fetch.c:709

 msgid "[up to date]"
 msgstr ""
 
 msgid "[up to date]"
 msgstr ""
 

-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801

 msgid "[rejected]"
 msgstr ""
 
 msgid "[rejected]"
 msgstr ""
 

-#: builtin/fetch.c:720
+#: builtin/fetch.c:723

 msgid "can't fetch in current branch"
 msgstr ""
 
 msgid "can't fetch in current branch"
 msgstr ""
 

-#: builtin/fetch.c:730
+#: builtin/fetch.c:733

 msgid "[tag update]"
 msgstr ""
 
 msgid "[tag update]"
 msgstr ""
 

-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796

 msgid "unable to update local ref"
 msgstr ""
 
 msgid "unable to update local ref"
 msgstr ""
 

-#: builtin/fetch.c:735
+#: builtin/fetch.c:738

 msgid "would clobber existing tag"
 msgstr ""
 
 msgid "would clobber existing tag"
 msgstr ""
 

-#: builtin/fetch.c:757
+#: builtin/fetch.c:760

 msgid "[new tag]"
 msgstr ""
 
 msgid "[new tag]"
 msgstr ""
 

-#: builtin/fetch.c:760
+#: builtin/fetch.c:763

 msgid "[new branch]"
 msgstr ""
 
 msgid "[new branch]"
 msgstr ""
 

-#: builtin/fetch.c:763
+#: builtin/fetch.c:766

 msgid "[new ref]"
 msgstr ""
 
 msgid "[new ref]"
 msgstr ""
 

-#: builtin/fetch.c:802
+#: builtin/fetch.c:796

 msgid "forced update"
 msgstr ""
 
 msgid "forced update"
 msgstr ""
 

-#: builtin/fetch.c:807
+#: builtin/fetch.c:801

 msgid "non-fast-forward"
 msgstr ""
 
 msgid "non-fast-forward"
 msgstr ""
 

-#: builtin/fetch.c:853
+#: builtin/fetch.c:847

 #, 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:874
+#: builtin/fetch.c:868

 #, 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:963 builtin/fetch.c:1085
+#: builtin/fetch.c:959 builtin/fetch.c:1081

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

-#: builtin/fetch.c:974
+#: builtin/fetch.c:970

 #, 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:1055
+#: builtin/fetch.c:1051

 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1052

 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1084

 msgid "[deleted]"
 msgstr ""
 
 msgid "[deleted]"
 msgstr ""
 

-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1085 builtin/remote.c:1036

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1108

 #, 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:1131
+#: builtin/fetch.c:1127

 #, 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:1134
+#: builtin/fetch.c:1130

 #, 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:1433
+#: builtin/fetch.c:1434

 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 

-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1436 builtin/remote.c:100

 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 
 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 

-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1482 builtin/fetch.c:1651

 msgid ""
 msgid ""

-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialclone"

 msgstr ""
 
 msgstr ""
 

-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1506

 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:1541
+#: builtin/fetch.c:1543

 msgid "You need to specify a tag name."
 msgstr ""
 
 msgid "You need to specify a tag name."
 msgstr ""
 

-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1592

 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 

-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1594

 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 

-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1599

 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 

-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1601

 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:1615
+#: builtin/fetch.c:1617

 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 

-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1619

 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 

-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1628

 #, 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:1633
+#: builtin/fetch.c:1635

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 


@@ -10369,138 +10996,319 @@ msgstr ""
 msgid "alias for --log (deprecated)"
 msgstr ""
 
 msgid "alias for --log (deprecated)"
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:678
-msgid "text"
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
+msgstr ""
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr ""
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr ""
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr ""
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr ""
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr ""
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:424
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
+msgstr ""
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
+msgstr ""
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
+msgstr ""
+
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr ""
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr ""
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr ""
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr ""
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:253
+#, c-format
+msgid "missing %s %s"
+msgstr ""
+
+#: builtin/fsck.c:279
+#, c-format
+msgid "unreachable %s %s"
+msgstr ""
+
+#: builtin/fsck.c:298
+#, c-format
+msgid "dangling %s %s"
+msgstr ""
+
+#: builtin/fsck.c:307
+msgid "could not create lost-found"
+msgstr ""
+
+#: builtin/fsck.c:318
+#, c-format
+msgid "could not finish '%s'"
+msgstr ""
+
+#: builtin/fsck.c:335
+#, c-format
+msgid "Checking %s"
+msgstr ""
+
+#: builtin/fsck.c:353
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr ""
+
+#: builtin/fsck.c:372
+#, c-format
+msgid "Checking %s %s"
+msgstr ""
+
+#: builtin/fsck.c:376
+msgid "broken links"
+msgstr ""
+
+#: builtin/fsck.c:385
+#, c-format
+msgid "root %s"
+msgstr ""
+
+#: builtin/fsck.c:393
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:422
+#, c-format
+msgid "%s: object corrupt or missing"

 msgstr ""
 
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:679
-msgid "use <text> as start of message"
+#: builtin/fsck.c:447
+#, c-format
+msgid "%s: invalid reflog entry %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:680
-msgid "file to read from"
+#: builtin/fsck.c:461
+#, c-format
+msgid "Checking reflog %s->%s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/fsck.c:495
+#, c-format
+msgid "%s: invalid sha1 pointer %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/fsck.c:502
+#, c-format
+msgid "%s: not a commit"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/fsck.c:557
+msgid "notice: No default references"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: builtin/fsck.c:572
+#, c-format
+msgid "%s: object corrupt or missing: %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/fsck.c:585
+#, c-format
+msgid "%s: object could not be parsed: %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
+#: builtin/fsck.c:605
+#, c-format
+msgid "bad sha1 file: %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/fsck.c:620
+msgid "Checking object directory"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: builtin/fsck.c:623
+msgid "Checking object directories"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: builtin/fsck.c:638
+#, c-format
+msgid "Checking %s link"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:39 builtin/tag.c:424
-msgid "respect format colors"
+#: builtin/fsck.c:643 builtin/index-pack.c:833
+#, c-format
+msgid "invalid %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:43
-msgid "print only refs which points at the given object"
+#: builtin/fsck.c:650
+#, c-format
+msgid "%s points to something strange (%s)"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:45
-msgid "print only refs that are merged"
+#: builtin/fsck.c:656
+#, c-format
+msgid "%s: detached HEAD points at nothing"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:46
-msgid "print only refs that are not merged"
+#: builtin/fsck.c:660
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:47
-msgid "print only refs which contain the commit"
+#: builtin/fsck.c:672
+msgid "Checking cache tree"

 msgstr ""
 
 msgstr ""
 

-#: builtin/for-each-ref.c:48
-msgid "print only refs which don't contain the commit"
+#: builtin/fsck.c:677
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"

 msgstr ""
 
 msgstr ""
 

-#: builtin/fsck.c:598
-msgid "Checking object directories"
+#: builtin/fsck.c:688
+msgid "non-tree in cache-tree"

 msgstr ""
 
 msgstr ""
 

-#: builtin/fsck.c:693
+#: builtin/fsck.c:719

 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 

-#: builtin/fsck.c:699
+#: builtin/fsck.c:725

 msgid "show unreachable objects"
 msgstr ""
 
 msgid "show unreachable objects"
 msgstr ""
 

-#: builtin/fsck.c:700
+#: builtin/fsck.c:726

 msgid "show dangling objects"
 msgstr ""
 
 msgid "show dangling objects"
 msgstr ""
 

-#: builtin/fsck.c:701
+#: builtin/fsck.c:727

 msgid "report tags"
 msgstr ""
 
 msgid "report tags"
 msgstr ""
 

-#: builtin/fsck.c:702
+#: builtin/fsck.c:728

 msgid "report root nodes"
 msgstr ""
 
 msgid "report root nodes"
 msgstr ""
 

-#: builtin/fsck.c:703
+#: builtin/fsck.c:729

 msgid "make index objects head nodes"
 msgstr ""
 
 msgid "make index objects head nodes"
 msgstr ""
 

-#: builtin/fsck.c:704
+#: builtin/fsck.c:730

 msgid "make reflogs head nodes (default)"
 msgstr ""
 
 msgid "make reflogs head nodes (default)"
 msgstr ""
 

-#: builtin/fsck.c:705
+#: builtin/fsck.c:731

 msgid "also consider packs and alternate objects"
 msgstr ""
 
 msgid "also consider packs and alternate objects"
 msgstr ""
 

-#: builtin/fsck.c:706
+#: builtin/fsck.c:732

 msgid "check only connectivity"
 msgstr ""
 
 msgid "check only connectivity"
 msgstr ""
 

-#: builtin/fsck.c:707
+#: builtin/fsck.c:733

 msgid "enable more strict checking"
 msgstr ""
 
 msgid "enable more strict checking"
 msgstr ""
 

-#: builtin/fsck.c:709
+#: builtin/fsck.c:735

 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 

-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:736 builtin/prune.c:110

 msgid "show progress"
 msgstr ""
 
 msgid "show progress"
 msgstr ""
 

-#: builtin/fsck.c:711
+#: builtin/fsck.c:737

 msgid "show verbose names for reachable objects"
 msgstr ""
 
 msgid "show verbose names for reachable objects"
 msgstr ""
 

-#: builtin/fsck.c:776
+#: builtin/fsck.c:797

 msgid "Checking objects"
 msgstr ""
 
 msgid "Checking objects"
 msgstr ""
 

+#: builtin/fsck.c:825
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:837
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+

 #: builtin/gc.c:34
 msgid "git gc [<options>]"
 msgstr ""
 #: builtin/gc.c:34
 msgid "git gc [<options>]"
 msgstr ""


@@ -10581,21 +11389,21 @@ msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 

-#: builtin/gc.c:670
+#: builtin/gc.c:672

 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 ""
 

-#: builtin/grep.c:28
+#: builtin/grep.c:29

 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 

-#: builtin/grep.c:224
+#: builtin/grep.c:225

 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 

-#: builtin/grep.c:278
+#: builtin/grep.c:279

 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""


@@ -10604,297 +11412,297 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
 #. variable for tweaking threads, currently
 #. grep.threads
 #.

-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2717

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 

-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631

 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 

-#: builtin/grep.c:635
+#: builtin/grep.c:646

 #, 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:701
+#: builtin/grep.c:712

 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 

-#: builtin/grep.c:800
+#: builtin/grep.c:811

 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:802
+#: builtin/grep.c:813

 msgid "find in contents not managed by git"
 msgstr ""
 
 msgid "find in contents not managed by git"
 msgstr ""
 

-#: builtin/grep.c:804
+#: builtin/grep.c:815

 msgid "search in both tracked and untracked files"
 msgstr ""
 
 msgid "search in both tracked and untracked files"
 msgstr ""
 

-#: builtin/grep.c:806
+#: builtin/grep.c:817

 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 

-#: builtin/grep.c:808
+#: builtin/grep.c:819

 msgid "recursively search in each submodule"
 msgstr ""
 
 msgid "recursively search in each submodule"
 msgstr ""
 

-#: builtin/grep.c:811
+#: builtin/grep.c:822

 msgid "show non-matching lines"
 msgstr ""
 
 msgid "show non-matching lines"
 msgstr ""
 

-#: builtin/grep.c:813
+#: builtin/grep.c:824

 msgid "case insensitive matching"
 msgstr ""
 
 msgid "case insensitive matching"
 msgstr ""
 

-#: builtin/grep.c:815
+#: builtin/grep.c:826

 msgid "match patterns only at word boundaries"
 msgstr ""
 
 msgid "match patterns only at word boundaries"
 msgstr ""
 

-#: builtin/grep.c:817
+#: builtin/grep.c:828

 msgid "process binary files as text"
 msgstr ""
 
 msgid "process binary files as text"
 msgstr ""
 

-#: builtin/grep.c:819
+#: builtin/grep.c:830

 msgid "don't match patterns in binary files"
 msgstr ""
 
 msgid "don't match patterns in binary files"
 msgstr ""
 

-#: builtin/grep.c:822
+#: builtin/grep.c:833

 msgid "process binary files with textconv filters"
 msgstr ""
 
 msgid "process binary files with textconv filters"
 msgstr ""
 

-#: builtin/grep.c:824
+#: builtin/grep.c:835

 msgid "search in subdirectories (default)"
 msgstr ""
 
 msgid "search in subdirectories (default)"
 msgstr ""
 

-#: builtin/grep.c:826
+#: builtin/grep.c:837

 msgid "descend at most <depth> levels"
 msgstr ""
 
 msgid "descend at most <depth> levels"
 msgstr ""
 

-#: builtin/grep.c:830
+#: builtin/grep.c:841

 msgid "use extended POSIX regular expressions"
 msgstr ""
 
 msgid "use extended POSIX regular expressions"
 msgstr ""
 

-#: builtin/grep.c:833
+#: builtin/grep.c:844

 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 

-#: builtin/grep.c:836
+#: builtin/grep.c:847

 msgid "interpret patterns as fixed strings"
 msgstr ""
 
 msgid "interpret patterns as fixed strings"
 msgstr ""
 

-#: builtin/grep.c:839
+#: builtin/grep.c:850

 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 

-#: builtin/grep.c:842
+#: builtin/grep.c:853

 msgid "show line numbers"
 msgstr ""
 
 msgid "show line numbers"
 msgstr ""
 

-#: builtin/grep.c:843
+#: builtin/grep.c:854

 msgid "show column number of first match"
 msgstr ""
 
 msgid "show column number of first match"
 msgstr ""
 

-#: builtin/grep.c:844
+#: builtin/grep.c:855

 msgid "don't show filenames"
 msgstr ""
 
 msgid "don't show filenames"
 msgstr ""
 

-#: builtin/grep.c:845
+#: builtin/grep.c:856

 msgid "show filenames"
 msgstr ""
 
 msgid "show filenames"
 msgstr ""
 

-#: builtin/grep.c:847
+#: builtin/grep.c:858

 msgid "show filenames relative to top directory"
 msgstr ""
 
 msgid "show filenames relative to top directory"
 msgstr ""
 

-#: builtin/grep.c:849
+#: builtin/grep.c:860

 msgid "show only filenames instead of matching lines"
 msgstr ""
 
 msgid "show only filenames instead of matching lines"
 msgstr ""
 

-#: builtin/grep.c:851
+#: builtin/grep.c:862

 msgid "synonym for --files-with-matches"
 msgstr ""
 
 msgid "synonym for --files-with-matches"
 msgstr ""
 

-#: builtin/grep.c:854
+#: builtin/grep.c:865

 msgid "show only the names of files without match"
 msgstr ""
 
 msgid "show only the names of files without match"
 msgstr ""
 

-#: builtin/grep.c:856
+#: builtin/grep.c:867

 msgid "print NUL after filenames"
 msgstr ""
 
 msgid "print NUL after filenames"
 msgstr ""
 

-#: builtin/grep.c:859
+#: builtin/grep.c:870

 msgid "show only matching parts of a line"
 msgstr ""
 
 msgid "show only matching parts of a line"
 msgstr ""
 

-#: builtin/grep.c:861
+#: builtin/grep.c:872

 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:862
+#: builtin/grep.c:873

 msgid "highlight matches"
 msgstr ""
 
 msgid "highlight matches"
 msgstr ""
 

-#: builtin/grep.c:864
+#: builtin/grep.c:875

 msgid "print empty line between matches from different files"
 msgstr ""
 
 msgid "print empty line between matches from different files"
 msgstr ""
 

-#: builtin/grep.c:866
+#: builtin/grep.c:877

 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:869
+#: builtin/grep.c:880

 msgid "show <n> context lines before and after matches"
 msgstr ""
 
 msgid "show <n> context lines before and after matches"
 msgstr ""
 

-#: builtin/grep.c:872
+#: builtin/grep.c:883

 msgid "show <n> context lines before matches"
 msgstr ""
 
 msgid "show <n> context lines before matches"
 msgstr ""
 

-#: builtin/grep.c:874
+#: builtin/grep.c:885

 msgid "show <n> context lines after matches"
 msgstr ""
 
 msgid "show <n> context lines after matches"
 msgstr ""
 

-#: builtin/grep.c:876
+#: builtin/grep.c:887

 msgid "use <n> worker threads"
 msgstr ""
 
 msgid "use <n> worker threads"
 msgstr ""
 

-#: builtin/grep.c:877
+#: builtin/grep.c:888

 msgid "shortcut for -C NUM"
 msgstr ""
 
 msgid "shortcut for -C NUM"
 msgstr ""
 

-#: builtin/grep.c:880
+#: builtin/grep.c:891

 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:882
+#: builtin/grep.c:893

 msgid "show the surrounding function"
 msgstr ""
 
 msgid "show the surrounding function"
 msgstr ""
 

-#: builtin/grep.c:885
+#: builtin/grep.c:896

 msgid "read patterns from file"
 msgstr ""
 
 msgid "read patterns from file"
 msgstr ""
 

-#: builtin/grep.c:887
+#: builtin/grep.c:898

 msgid "match <pattern>"
 msgstr ""
 
 msgid "match <pattern>"
 msgstr ""
 

-#: builtin/grep.c:889
+#: builtin/grep.c:900

 msgid "combine patterns specified with -e"
 msgstr ""
 
 msgid "combine patterns specified with -e"
 msgstr ""
 

-#: builtin/grep.c:901
+#: builtin/grep.c:912

 msgid "indicate hit with exit status without output"
 msgstr ""
 
 msgid "indicate hit with exit status without output"
 msgstr ""
 

-#: builtin/grep.c:903
+#: builtin/grep.c:914

 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:905
+#: builtin/grep.c:916

 msgid "show parse tree for grep expression"
 msgstr ""
 
 msgid "show parse tree for grep expression"
 msgstr ""
 

-#: builtin/grep.c:909
+#: builtin/grep.c:920

 msgid "pager"
 msgstr ""
 
 msgid "pager"
 msgstr ""
 

-#: builtin/grep.c:909
+#: builtin/grep.c:920

 msgid "show matching files in the pager"
 msgstr ""
 
 msgid "show matching files in the pager"
 msgstr ""
 

-#: builtin/grep.c:913
+#: builtin/grep.c:924

 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:977
+#: builtin/grep.c:988

 msgid "no pattern given"
 msgstr ""
 
 msgid "no pattern given"
 msgstr ""
 

-#: builtin/grep.c:1013
+#: builtin/grep.c:1024

 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:1020
+#: builtin/grep.c:1032

 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 

-#: builtin/grep.c:1051
+#: builtin/grep.c:1063

 msgid "invalid option combination, ignoring --threads"
 msgstr ""
 
 msgid "invalid option combination, ignoring --threads"
 msgstr ""
 

-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1066 builtin/pack-objects.c:3400

 msgid "no threads support, ignoring --threads"
 msgstr ""
 
 msgid "no threads support, ignoring --threads"
 msgstr ""
 

-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714

 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 

-#: builtin/grep.c:1080
+#: builtin/grep.c:1092

 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:1103
+#: builtin/grep.c:1115

 msgid "option not supported with --recurse-submodules"
 msgstr ""
 
 msgid "option not supported with --recurse-submodules"
 msgstr ""
 

-#: builtin/grep.c:1109
+#: builtin/grep.c:1121

 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:1115
+#: builtin/grep.c:1127

 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:1123
+#: builtin/grep.c:1135

 msgid "both --cached and trees are given"
 msgstr ""
 
 msgid "both --cached and trees are given"
 msgstr ""
 

-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85

 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgstr ""
 
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgstr ""
 

-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86

 msgid "git hash-object  --stdin-paths"
 msgstr ""
 
 msgid "git hash-object  --stdin-paths"
 msgstr ""
 

-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98

 msgid "type"
 msgstr ""
 
 msgid "type"
 msgstr ""
 

-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98

 msgid "object type"
 msgstr ""
 
 msgid "object type"
 msgstr ""
 

-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99

 msgid "write the object into the object database"
 msgstr ""
 
 msgid "write the object into the object database"
 msgstr ""
 

-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101

 msgid "read the object from stdin"
 msgstr ""
 
 msgid "read the object from stdin"
 msgstr ""
 

-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103

 msgid "store file as is without filters"
 msgstr ""
 
 msgid "store file as is without filters"
 msgstr ""
 

-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104

 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 

-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105

 msgid "process file as it were from this path"
 msgstr ""
 
 msgid "process file as it were from this path"
 msgstr ""
 


@@ -10984,12 +11792,12 @@ msgstr ""
 msgid "no info viewer handled the request"
 msgstr ""
 
 msgid "no info viewer handled the request"
 msgstr ""
 

-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:430 builtin/help.c:441 git.c:323

 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr ""
 

-#: builtin/help.c:444
+#: builtin/help.c:444 git.c:347

 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr ""
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr ""


@@ -11037,7 +11845,7 @@ msgstr ""
 msgid "used more bytes than were available"
 msgstr ""
 
 msgid "used more bytes than were available"
 msgstr ""
 

-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:279 builtin/pack-objects.c:599

 msgid "pack too large for current definition of off_t"
 msgstr ""
 
 msgid "pack too large for current definition of off_t"
 msgstr ""
 


@@ -11045,7 +11853,7 @@ msgstr ""
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 

-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:297 builtin/repack.c:250

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


@@ -11108,8 +11916,8 @@ msgstr ""
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 

-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:729 builtin/pack-objects.c:152
+#: builtin/pack-objects.c:212 builtin/pack-objects.c:306

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


@@ -11133,11 +11941,6 @@ msgstr ""
 msgid "fsck error in packed object"
 msgstr ""
 
 msgid "fsck error in packed object"
 msgstr ""
 

-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr ""
-

 #: builtin/index-pack.c:838
 #, c-format
 msgid "Not all child objects of %s are reachable"
 #: builtin/index-pack.c:838
 #, c-format
 msgid "Not all child objects of %s are reachable"


@@ -11175,7 +11978,7 @@ msgstr ""
 msgid "Resolving deltas"
 msgstr ""
 
 msgid "Resolving deltas"
 msgstr ""
 

-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486

 #, c-format
 msgid "unable to create thread: %s"
 msgstr ""
 #, c-format
 msgid "unable to create thread: %s"
 msgstr ""


@@ -11240,7 +12043,7 @@ msgstr ""
 msgid "cannot store index file"
 msgstr ""
 
 msgid "cannot store index file"
 msgstr ""
 

-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""


@@ -11468,502 +12271,502 @@ msgstr ""
 msgid "no input file given for in-place editing"
 msgstr ""
 
 msgid "no input file given for in-place editing"
 msgstr ""
 

-#: builtin/log.c:54
+#: builtin/log.c:55

 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 

-#: builtin/log.c:55
+#: builtin/log.c:56

 msgid "git show [<options>] <object>..."
 msgstr ""
 
 msgid "git show [<options>] <object>..."
 msgstr ""
 

-#: builtin/log.c:99
+#: builtin/log.c:100

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

-#: builtin/log.c:162
+#: builtin/log.c:163

 msgid "suppress diff output"
 msgstr ""
 
 msgid "suppress diff output"
 msgstr ""
 

-#: builtin/log.c:163
+#: builtin/log.c:164

 msgid "show source"
 msgstr ""
 
 msgid "show source"
 msgstr ""
 

-#: builtin/log.c:164
+#: builtin/log.c:165

 msgid "Use mail map file"
 msgstr ""
 
 msgid "Use mail map file"
 msgstr ""
 

-#: builtin/log.c:166
+#: builtin/log.c:167

 msgid "only decorate refs that match <pattern>"
 msgstr ""
 
 msgid "only decorate refs that match <pattern>"
 msgstr ""
 

-#: builtin/log.c:168
+#: builtin/log.c:169

 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 
 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 

-#: builtin/log.c:169
+#: builtin/log.c:170

 msgid "decorate options"
 msgstr ""
 
 msgid "decorate options"
 msgstr ""
 

-#: builtin/log.c:172
+#: builtin/log.c:173

 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:270
+#: builtin/log.c:271

 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 

-#: builtin/log.c:522
+#: builtin/log.c:525

 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 

-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:540 builtin/log.c:634

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

-#: builtin/log.c:655
+#: builtin/log.c:659

 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 
 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 

-#: builtin/log.c:776
+#: builtin/log.c:780

 msgid "format.headers without value"
 msgstr ""
 
 msgid "format.headers without value"
 msgstr ""
 

-#: builtin/log.c:877
+#: builtin/log.c:881

 msgid "name of output directory is too long"
 msgstr ""
 
 msgid "name of output directory is too long"
 msgstr ""
 

-#: builtin/log.c:893
+#: builtin/log.c:897

 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 

-#: builtin/log.c:910
+#: builtin/log.c:914

 msgid "Need exactly one range."
 msgstr ""
 
 msgid "Need exactly one range."
 msgstr ""
 

-#: builtin/log.c:920
+#: builtin/log.c:924

 msgid "Not a range."
 msgstr ""
 
 msgid "Not a range."
 msgstr ""
 

-#: builtin/log.c:1043
+#: builtin/log.c:1047

 msgid "Cover letter needs email format"
 msgstr ""
 
 msgid "Cover letter needs email format"
 msgstr ""
 

-#: builtin/log.c:1119
+#: builtin/log.c:1132

 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 

-#: builtin/log.c:1146
+#: builtin/log.c:1159

 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 

-#: builtin/log.c:1204
+#: builtin/log.c:1217

 msgid "Two output directories?"
 msgstr ""
 
 msgid "Two output directories?"
 msgstr ""
 

-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082

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

-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1334 builtin/notes.c:897 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:1326
+#: builtin/log.c:1339

 msgid "Could not find exact merge base."
 msgstr ""
 
 msgid "Could not find exact merge base."
 msgstr ""
 

-#: builtin/log.c:1330
+#: builtin/log.c:1343

 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:1350
+#: builtin/log.c:1363

 msgid "Failed to find exact merge base"
 msgstr ""
 
 msgid "Failed to find exact merge base"
 msgstr ""
 

-#: builtin/log.c:1361
+#: builtin/log.c:1374

 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:1365
+#: builtin/log.c:1378

 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 

-#: builtin/log.c:1418
+#: builtin/log.c:1431

 msgid "cannot get patch id"
 msgstr ""
 
 msgid "cannot get patch id"
 msgstr ""
 

-#: builtin/log.c:1470
+#: builtin/log.c:1483

 msgid "failed to infer range-diff ranges"
 msgstr ""
 
 msgid "failed to infer range-diff ranges"
 msgstr ""
 

-#: builtin/log.c:1515
+#: builtin/log.c:1528

 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:1518
+#: builtin/log.c:1531

 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 

-#: builtin/log.c:1522
+#: builtin/log.c:1535

 msgid "print patches to standard out"
 msgstr ""
 
 msgid "print patches to standard out"
 msgstr ""
 

-#: builtin/log.c:1524
+#: builtin/log.c:1537

 msgid "generate a cover letter"
 msgstr ""
 
 msgid "generate a cover letter"
 msgstr ""
 

-#: builtin/log.c:1526
+#: builtin/log.c:1539

 msgid "use simple number sequence for output file names"
 msgstr ""
 
 msgid "use simple number sequence for output file names"
 msgstr ""
 

-#: builtin/log.c:1527
+#: builtin/log.c:1540

 msgid "sfx"
 msgstr ""
 
 msgid "sfx"
 msgstr ""
 

-#: builtin/log.c:1528
+#: builtin/log.c:1541

 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 

-#: builtin/log.c:1530
+#: builtin/log.c:1543

 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 

-#: builtin/log.c:1532
+#: builtin/log.c:1545

 msgid "mark the series as Nth re-roll"
 msgstr ""
 
 msgid "mark the series as Nth re-roll"
 msgstr ""
 

-#: builtin/log.c:1534
+#: builtin/log.c:1547

 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1537
+#: builtin/log.c:1550

 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1540
+#: builtin/log.c:1553

 msgid "store resulting files in <dir>"
 msgstr ""
 
 msgid "store resulting files in <dir>"
 msgstr ""
 

-#: builtin/log.c:1543
+#: builtin/log.c:1556

 msgid "don't strip/add [PATCH]"
 msgstr ""
 
 msgid "don't strip/add [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1546
+#: builtin/log.c:1559

 msgid "don't output binary diffs"
 msgstr ""
 
 msgid "don't output binary diffs"
 msgstr ""
 

-#: builtin/log.c:1548
+#: builtin/log.c:1561

 msgid "output all-zero hash in From header"
 msgstr ""
 
 msgid "output all-zero hash in From header"
 msgstr ""
 

-#: builtin/log.c:1550
+#: builtin/log.c:1563

 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:1552
+#: builtin/log.c:1565

 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 

-#: builtin/log.c:1554
+#: builtin/log.c:1567

 msgid "Messaging"
 msgstr ""
 
 msgid "Messaging"
 msgstr ""
 

-#: builtin/log.c:1555
+#: builtin/log.c:1568

 msgid "header"
 msgstr ""
 
 msgid "header"
 msgstr ""
 

-#: builtin/log.c:1556
+#: builtin/log.c:1569

 msgid "add email header"
 msgstr ""
 
 msgid "add email header"
 msgstr ""
 

-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1570 builtin/log.c:1572

 msgid "email"
 msgstr ""
 
 msgid "email"
 msgstr ""
 

-#: builtin/log.c:1557
+#: builtin/log.c:1570

 msgid "add To: header"
 msgstr ""
 
 msgid "add To: header"
 msgstr ""
 

-#: builtin/log.c:1559
+#: builtin/log.c:1572

 msgid "add Cc: header"
 msgstr ""
 
 msgid "add Cc: header"
 msgstr ""
 

-#: builtin/log.c:1561
+#: builtin/log.c:1574

 msgid "ident"
 msgstr ""
 
 msgid "ident"
 msgstr ""
 

-#: builtin/log.c:1562
+#: builtin/log.c:1575

 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:1564
+#: builtin/log.c:1577

 msgid "message-id"
 msgstr ""
 
 msgid "message-id"
 msgstr ""
 

-#: builtin/log.c:1565
+#: builtin/log.c:1578

 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 

-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1579 builtin/log.c:1582

 msgid "boundary"
 msgstr ""
 
 msgid "boundary"
 msgstr ""
 

-#: builtin/log.c:1567
+#: builtin/log.c:1580

 msgid "attach the patch"
 msgstr ""
 
 msgid "attach the patch"
 msgstr ""
 

-#: builtin/log.c:1570
+#: builtin/log.c:1583

 msgid "inline the patch"
 msgstr ""
 
 msgid "inline the patch"
 msgstr ""
 

-#: builtin/log.c:1574
+#: builtin/log.c:1587

 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 

-#: builtin/log.c:1576
+#: builtin/log.c:1589

 msgid "signature"
 msgstr ""
 
 msgid "signature"
 msgstr ""
 

-#: builtin/log.c:1577
+#: builtin/log.c:1590

 msgid "add a signature"
 msgstr ""
 
 msgid "add a signature"
 msgstr ""
 

-#: builtin/log.c:1578
+#: builtin/log.c:1591

 msgid "base-commit"
 msgstr ""
 
 msgid "base-commit"
 msgstr ""
 

-#: builtin/log.c:1579
+#: builtin/log.c:1592

 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 

-#: builtin/log.c:1581
+#: builtin/log.c:1594

 msgid "add a signature from a file"
 msgstr ""
 
 msgid "add a signature from a file"
 msgstr ""
 

-#: builtin/log.c:1582
+#: builtin/log.c:1595

 msgid "don't print the patch filenames"
 msgstr ""
 
 msgid "don't print the patch filenames"
 msgstr ""
 

-#: builtin/log.c:1584
+#: builtin/log.c:1597

 msgid "show progress while generating patches"
 msgstr ""
 
 msgid "show progress while generating patches"
 msgstr ""
 

-#: builtin/log.c:1585
+#: builtin/log.c:1598

 msgid "rev"
 msgstr ""
 
 msgid "rev"
 msgstr ""
 

-#: builtin/log.c:1586
+#: builtin/log.c:1599

 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 

-#: builtin/log.c:1589
+#: builtin/log.c:1602

 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 

-#: builtin/log.c:1591
+#: builtin/log.c:1604

 msgid "percentage by which creation is weighted"
 msgstr ""
 
 msgid "percentage by which creation is weighted"
 msgstr ""
 

-#: builtin/log.c:1666
+#: builtin/log.c:1679

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

-#: builtin/log.c:1681
+#: builtin/log.c:1694

 msgid "-n and -k are mutually exclusive"
 msgstr ""
 
 msgid "-n and -k are mutually exclusive"
 msgstr ""
 

-#: builtin/log.c:1683
+#: builtin/log.c:1696

 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr ""
 
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr ""
 

-#: builtin/log.c:1691
+#: builtin/log.c:1704

 msgid "--name-only does not make sense"
 msgstr ""
 
 msgid "--name-only does not make sense"
 msgstr ""
 

-#: builtin/log.c:1693
+#: builtin/log.c:1706

 msgid "--name-status does not make sense"
 msgstr ""
 
 msgid "--name-status does not make sense"
 msgstr ""
 

-#: builtin/log.c:1695
+#: builtin/log.c:1708

 msgid "--check does not make sense"
 msgstr ""
 
 msgid "--check does not make sense"
 msgstr ""
 

-#: builtin/log.c:1727
+#: builtin/log.c:1740

 msgid "standard output, or directory, which one?"
 msgstr ""
 
 msgid "standard output, or directory, which one?"
 msgstr ""
 

-#: builtin/log.c:1729
+#: builtin/log.c:1742

 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 

-#: builtin/log.c:1816
+#: builtin/log.c:1829

 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 

-#: builtin/log.c:1820
+#: builtin/log.c:1833

 msgid "Interdiff:"
 msgstr ""
 
 msgid "Interdiff:"
 msgstr ""
 

-#: builtin/log.c:1821
+#: builtin/log.c:1834

 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 

-#: builtin/log.c:1827
+#: builtin/log.c:1840

 msgid "--creation-factor requires --range-diff"
 msgstr ""
 
 msgid "--creation-factor requires --range-diff"
 msgstr ""
 

-#: builtin/log.c:1831
+#: builtin/log.c:1844

 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 

-#: builtin/log.c:1839
+#: builtin/log.c:1852

 msgid "Range-diff:"
 msgstr ""
 
 msgid "Range-diff:"
 msgstr ""
 

-#: builtin/log.c:1840
+#: builtin/log.c:1853

 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 

-#: builtin/log.c:1851
+#: builtin/log.c:1864

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

-#: builtin/log.c:1887
+#: builtin/log.c:1900

 msgid "Generating patches"
 msgstr ""
 
 msgid "Generating patches"
 msgstr ""
 

-#: builtin/log.c:1931
+#: builtin/log.c:1944

 msgid "Failed to create output files"
 msgstr ""
 
 msgid "Failed to create output files"
 msgstr ""
 

-#: builtin/log.c:1989
+#: builtin/log.c:2003

 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 

-#: builtin/log.c:2043
+#: builtin/log.c:2057

 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 

-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470

 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
 
 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
 

-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526

 msgid "identify the file status with tags"
 msgstr ""
 
 msgid "identify the file status with tags"
 msgstr ""
 

-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528

 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 

-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530

 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr ""
 
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr ""
 

-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532

 msgid "show cached files in the output (default)"
 msgstr ""
 
 msgid "show cached files in the output (default)"
 msgstr ""
 

-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534

 msgid "show deleted files in the output"
 msgstr ""
 
 msgid "show deleted files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536

 msgid "show modified files in the output"
 msgstr ""
 
 msgid "show modified files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538

 msgid "show other files in the output"
 msgstr ""
 
 msgid "show other files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540

 msgid "show ignored files in the output"
 msgstr ""
 
 msgid "show ignored files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543

 msgid "show staged contents' object name in the output"
 msgstr ""
 
 msgid "show staged contents' object name in the output"
 msgstr ""
 

-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545

 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:546
+#: builtin/ls-files.c:547

 msgid "show 'other' directories' names only"
 msgstr ""
 
 msgid "show 'other' directories' names only"
 msgstr ""
 

-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549

 msgid "show line endings of files"
 msgstr ""
 
 msgid "show line endings of files"
 msgstr ""
 

-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551

 msgid "don't show empty directories"
 msgstr ""
 
 msgid "don't show empty directories"
 msgstr ""
 

-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554

 msgid "show unmerged files in the output"
 msgstr ""
 
 msgid "show unmerged files in the output"
 msgstr ""
 

-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556

 msgid "show resolve-undo information"
 msgstr ""
 
 msgid "show resolve-undo information"
 msgstr ""
 

-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558

 msgid "skip files matching pattern"
 msgstr ""
 
 msgid "skip files matching pattern"
 msgstr ""
 

-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561

 msgid "exclude patterns are read from <file>"
 msgstr ""
 
 msgid "exclude patterns are read from <file>"
 msgstr ""
 

-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564

 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 

-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566

 msgid "add the standard git exclusions"
 msgstr ""
 
 msgid "add the standard git exclusions"
 msgstr ""
 

-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570

 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:572
+#: builtin/ls-files.c:573

 msgid "recurse through submodules"
 msgstr ""
 
 msgid "recurse through submodules"
 msgstr ""
 

-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575

 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:575
+#: builtin/ls-files.c:576

 msgid "tree-ish"
 msgstr ""
 
 msgid "tree-ish"
 msgstr ""
 

-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577

 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:578
+#: builtin/ls-files.c:579

 msgid "show debugging data"
 msgstr ""
 
 msgid "show debugging data"
 msgstr ""
 


@@ -11978,7 +12781,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/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1111

 msgid "exec"
 msgstr ""
 
 msgid "exec"
 msgstr ""
 


@@ -12051,180 +12854,185 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr ""
 
 msgid "empty mbox: '%s'"
 msgstr ""
 

-#: builtin/merge.c:52
+#: builtin/merge.c:53

 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 

-#: builtin/merge.c:53
+#: builtin/merge.c:54

 msgid "git merge --abort"
 msgstr ""
 
 msgid "git merge --abort"
 msgstr ""
 

-#: builtin/merge.c:54
+#: builtin/merge.c:55

 msgid "git merge --continue"
 msgstr ""
 
 msgid "git merge --continue"
 msgstr ""
 

-#: builtin/merge.c:111
+#: builtin/merge.c:112

 msgid "switch `m' requires a value"
 msgstr ""
 
 msgid "switch `m' requires a value"
 msgstr ""
 

-#: builtin/merge.c:177
+#: builtin/merge.c:132

 #, c-format
 #, c-format

-msgid "Could not find merge strategy '%s'.\n"
+msgid "option `%s' requires a value"

 msgstr ""
 
 #: builtin/merge.c:178
 #, c-format
 msgstr ""
 
 #: builtin/merge.c:178
 #, c-format

+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:179
+#, c-format

 msgid "Available strategies are:"
 msgstr ""
 
 msgid "Available strategies are:"
 msgstr ""
 

-#: builtin/merge.c:183
+#: builtin/merge.c:184

 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 

-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:235 builtin/pull.c:144

 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:237 builtin/pull.c:146
+#: builtin/merge.c:238 builtin/pull.c:147

 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:238 builtin/pull.c:149
+#: builtin/merge.c:239 builtin/pull.c:150

 msgid "(synonym to --stat)"
 msgstr ""
 
 msgid "(synonym to --stat)"
 msgstr ""
 

-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:241 builtin/pull.c:153

 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:243 builtin/pull.c:158
+#: builtin/merge.c:244 builtin/pull.c:159

 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:245 builtin/pull.c:161
+#: builtin/merge.c:246 builtin/pull.c:162

 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 

-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:248 builtin/pull.c:165

 msgid "edit message before committing"
 msgstr ""
 
 msgid "edit message before committing"
 msgstr ""
 

-#: builtin/merge.c:248
+#: builtin/merge.c:249

 msgid "allow fast-forward (default)"
 msgstr ""
 
 msgid "allow fast-forward (default)"
 msgstr ""
 

-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:251 builtin/pull.c:171

 msgid "abort if fast-forward is not possible"
 msgstr ""
 
 msgid "abort if fast-forward is not possible"
 msgstr ""
 

-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:255 builtin/pull.c:174

 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:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178
+#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111

 msgid "strategy"
 msgstr ""
 
 msgid "strategy"
 msgstr ""
 

-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:257 builtin/pull.c:179

 msgid "merge strategy to use"
 msgstr ""
 
 msgid "merge strategy to use"
 msgstr ""
 

-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:258 builtin/pull.c:182

 msgid "option=value"
 msgstr ""
 
 msgid "option=value"
 msgstr ""
 

-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:259 builtin/pull.c:183

 msgid "option for selected merge strategy"
 msgstr ""
 
 msgid "option for selected merge strategy"
 msgstr ""
 

-#: builtin/merge.c:260
+#: builtin/merge.c:261

 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:267
+#: builtin/merge.c:268

 msgid "abort the current in-progress merge"
 msgstr ""
 
 msgid "abort the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:269
+#: builtin/merge.c:270

 msgid "continue the current in-progress merge"
 msgstr ""
 
 msgid "continue the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:272 builtin/pull.c:190

 msgid "allow merging unrelated histories"
 msgstr ""
 
 msgid "allow merging unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:277
+#: builtin/merge.c:278

 msgid "verify commit-msg hook"
 msgstr ""
 
 msgid "verify commit-msg hook"
 msgstr ""
 

-#: builtin/merge.c:302
+#: builtin/merge.c:303

 msgid "could not run stash."
 msgstr ""
 
 msgid "could not run stash."
 msgstr ""
 

-#: builtin/merge.c:307
+#: builtin/merge.c:308

 msgid "stash failed"
 msgstr ""
 
 msgid "stash failed"
 msgstr ""
 

-#: builtin/merge.c:312
+#: builtin/merge.c:313

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

-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:335 builtin/merge.c:352

 msgid "read-tree failed"
 msgstr ""
 
 msgid "read-tree failed"
 msgstr ""
 

-#: builtin/merge.c:381
+#: builtin/merge.c:382

 msgid " (nothing to squash)"
 msgstr ""
 
 msgid " (nothing to squash)"
 msgstr ""
 

-#: builtin/merge.c:392
+#: builtin/merge.c:393

 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 

-#: builtin/merge.c:442
+#: builtin/merge.c:443

 #, 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:493
+#: builtin/merge.c:494

 #, 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:580
+#: builtin/merge.c:581

 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 

-#: builtin/merge.c:701
+#: builtin/merge.c:702

 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 

-#: builtin/merge.c:715
+#: builtin/merge.c:716

 #, 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:730
+#: builtin/merge.c:731

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

-#: builtin/merge.c:782
+#: builtin/merge.c:783

 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 

-#: builtin/merge.c:791
+#: builtin/merge.c:792

 #, 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:797
+#: builtin/merge.c:798

 #, 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"


@@ -12234,165 +13042,165 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
 "the commit.\n"
 msgstr ""
 

-#: builtin/merge.c:833
+#: builtin/merge.c:834

 msgid "Empty commit message."
 msgstr ""
 
 msgid "Empty commit message."
 msgstr ""
 

-#: builtin/merge.c:852
+#: builtin/merge.c:853

 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 

-#: builtin/merge.c:905
+#: builtin/merge.c:906

 #, 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:944
+#: builtin/merge.c:945

 msgid "No current branch."
 msgstr ""
 
 msgid "No current branch."
 msgstr ""
 

-#: builtin/merge.c:946
+#: builtin/merge.c:947

 msgid "No remote for the current branch."
 msgstr ""
 
 msgid "No remote for the current branch."
 msgstr ""
 

-#: builtin/merge.c:948
+#: builtin/merge.c:949

 msgid "No default upstream defined for the current branch."
 msgstr ""
 
 msgid "No default upstream defined for the current branch."
 msgstr ""
 

-#: builtin/merge.c:953
+#: builtin/merge.c:954

 #, 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:1010
+#: builtin/merge.c:1011

 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 

-#: builtin/merge.c:1113
+#: builtin/merge.c:1114

 #, 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:1147
+#: builtin/merge.c:1148

 msgid "not something we can merge"
 msgstr ""
 
 msgid "not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1250
+#: builtin/merge.c:1251

 msgid "--abort expects no arguments"
 msgstr ""
 
 msgid "--abort expects no arguments"
 msgstr ""
 

-#: builtin/merge.c:1254
+#: builtin/merge.c:1255

 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:1266
+#: builtin/merge.c:1267

 msgid "--continue expects no arguments"
 msgstr ""
 
 msgid "--continue expects no arguments"
 msgstr ""
 

-#: builtin/merge.c:1270
+#: builtin/merge.c:1271

 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:1286
+#: builtin/merge.c:1287

 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:1293
+#: builtin/merge.c:1294

 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:1296
+#: builtin/merge.c:1297

 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:1305
+#: builtin/merge.c:1306

 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 

-#: builtin/merge.c:1313
+#: builtin/merge.c:1314

 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 

-#: builtin/merge.c:1330
+#: builtin/merge.c:1331

 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 

-#: builtin/merge.c:1332
+#: builtin/merge.c:1333

 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:1337
+#: builtin/merge.c:1338

 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1339
+#: builtin/merge.c:1340

 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:1421
+#: builtin/merge.c:1422

 msgid "refusing to merge unrelated histories"
 msgstr ""
 
 msgid "refusing to merge unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:1430
+#: builtin/merge.c:1431

 msgid "Already up to date."
 msgstr ""
 
 msgid "Already up to date."
 msgstr ""
 

-#: builtin/merge.c:1440
+#: builtin/merge.c:1441

 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 

-#: builtin/merge.c:1482
+#: builtin/merge.c:1483

 #, 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:1489
+#: builtin/merge.c:1490

 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 

-#: builtin/merge.c:1514
+#: builtin/merge.c:1515

 msgid "Already up to date. Yeeah!"
 msgstr ""
 
 msgid "Already up to date. Yeeah!"
 msgstr ""
 

-#: builtin/merge.c:1520
+#: builtin/merge.c:1521

 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 

-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1544 builtin/merge.c:1623

 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 

-#: builtin/merge.c:1547
+#: builtin/merge.c:1548

 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 

-#: builtin/merge.c:1613
+#: builtin/merge.c:1614

 #, 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:1615
+#: builtin/merge.c:1616

 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 

-#: builtin/merge.c:1624
+#: builtin/merge.c:1625

 #, 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:1636
+#: builtin/merge.c:1637

 #, 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 ""


@@ -12475,33 +13283,33 @@ msgstr ""
 msgid "set labels for file1/orig-file/file2"
 msgstr ""
 
 msgid "set labels for file1/orig-file/file2"
 msgstr ""
 

-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46

 #, c-format
 msgid "unknown option %s"
 msgstr ""
 
 #, c-format
 msgid "unknown option %s"
 msgstr ""
 

-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52

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

-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56

 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64

 msgid "not handling anything other than two heads merge."
 msgstr ""
 
 msgid "not handling anything other than two heads merge."
 msgstr ""
 

-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72

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

-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78

 #, c-format
 msgid "Merging %s with %s\n"
 msgstr ""
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr ""


@@ -12514,7 +13322,7 @@ msgstr ""
 msgid "input is NUL terminated"
 msgstr ""
 
 msgid "input is NUL terminated"
 msgstr ""
 

-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26

 msgid "allow missing objects"
 msgstr ""
 
 msgid "allow missing objects"
 msgstr ""
 


@@ -12539,94 +13347,94 @@ msgstr ""
 msgid "unrecognized verb: %s"
 msgstr ""
 
 msgid "unrecognized verb: %s"
 msgstr ""
 

-#: builtin/mv.c:17
+#: builtin/mv.c:18

 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""
 
 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""
 

-#: builtin/mv.c:82
+#: builtin/mv.c:83

 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr ""
 
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr ""
 

-#: builtin/mv.c:84
+#: builtin/mv.c:85

 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 

-#: builtin/mv.c:102
+#: builtin/mv.c:103

 #, c-format
 msgid "%.*s is in index"
 msgstr ""
 
 #, c-format
 msgid "%.*s is in index"
 msgstr ""
 

-#: builtin/mv.c:124
+#: builtin/mv.c:125

 msgid "force move/rename even if target exists"
 msgstr ""
 
 msgid "force move/rename even if target exists"
 msgstr ""
 

-#: builtin/mv.c:126
+#: builtin/mv.c:127

 msgid "skip move/rename errors"
 msgstr ""
 
 msgid "skip move/rename errors"
 msgstr ""
 

-#: builtin/mv.c:168
+#: builtin/mv.c:169

 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 

-#: builtin/mv.c:179
+#: builtin/mv.c:180

 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr ""
 

-#: builtin/mv.c:183
+#: builtin/mv.c:184

 msgid "bad source"
 msgstr ""
 
 msgid "bad source"
 msgstr ""
 

-#: builtin/mv.c:186
+#: builtin/mv.c:187

 msgid "can not move directory into itself"
 msgstr ""
 
 msgid "can not move directory into itself"
 msgstr ""
 

-#: builtin/mv.c:189
+#: builtin/mv.c:190

 msgid "cannot move directory over file"
 msgstr ""
 
 msgid "cannot move directory over file"
 msgstr ""
 

-#: builtin/mv.c:198
+#: builtin/mv.c:199

 msgid "source directory is empty"
 msgstr ""
 
 msgid "source directory is empty"
 msgstr ""
 

-#: builtin/mv.c:223
+#: builtin/mv.c:224

 msgid "not under version control"
 msgstr ""
 
 msgid "not under version control"
 msgstr ""
 

-#: builtin/mv.c:226
+#: builtin/mv.c:227

 msgid "destination exists"
 msgstr ""
 
 msgid "destination exists"
 msgstr ""
 

-#: builtin/mv.c:234
+#: builtin/mv.c:235

 #, c-format
 msgid "overwriting '%s'"
 msgstr ""
 
 #, c-format
 msgid "overwriting '%s'"
 msgstr ""
 

-#: builtin/mv.c:237
+#: builtin/mv.c:238

 msgid "Cannot overwrite"
 msgstr ""
 
 msgid "Cannot overwrite"
 msgstr ""
 

-#: builtin/mv.c:240
+#: builtin/mv.c:241

 msgid "multiple sources for the same target"
 msgstr ""
 
 msgid "multiple sources for the same target"
 msgstr ""
 

-#: builtin/mv.c:242
+#: builtin/mv.c:243

 msgid "destination directory does not exist"
 msgstr ""
 
 msgid "destination directory does not exist"
 msgstr ""
 

-#: builtin/mv.c:249
+#: builtin/mv.c:250

 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 

-#: builtin/mv.c:270
+#: builtin/mv.c:271

 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 

-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513

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


@@ -12817,8 +13625,8 @@ msgid "could not open or read '%s'"
 msgstr ""
 
 #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
 msgstr ""
 
 #: 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
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672

 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr ""
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr ""


@@ -12851,38 +13659,38 @@ msgstr ""
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 

-#: 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
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985

 msgid "too many parameters"
 msgstr ""
 
 msgid "too many parameters"
 msgstr ""
 

-#: builtin/notes.c:389 builtin/notes.c:675
+#: builtin/notes.c:389 builtin/notes.c:678

 #, c-format
 msgid "no note found for object %s."
 msgstr ""
 
 #, c-format
 msgid "no note found for object %s."
 msgstr ""
 

-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576

 msgid "note contents as a string"
 msgstr ""
 
 msgid "note contents as a string"
 msgstr ""
 

-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579

 msgid "note contents in a file"
 msgstr ""
 
 msgid "note contents in a file"
 msgstr ""
 

-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582

 msgid "reuse and edit specified note object"
 msgstr ""
 
 msgid "reuse and edit specified note object"
 msgstr ""
 

-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585

 msgid "reuse specified note object"
 msgstr ""
 
 msgid "reuse specified note object"
 msgstr ""
 

-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588

 msgid "allow storing empty note"
 msgstr ""
 
 msgid "allow storing empty note"
 msgstr ""
 

-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496

 msgid "replace existing notes"
 msgstr ""
 
 msgid "replace existing notes"
 msgstr ""
 


@@ -12893,138 +13701,138 @@ msgid ""
 "existing notes"
 msgstr ""
 
 "existing notes"
 msgstr ""
 

-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544

 #, 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:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902

 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 

-#: builtin/notes.c:495
+#: builtin/notes.c:497

 msgid "read objects from stdin"
 msgstr ""
 
 msgid "read objects from stdin"
 msgstr ""
 

-#: builtin/notes.c:497
+#: builtin/notes.c:499

 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 

-#: builtin/notes.c:515
+#: builtin/notes.c:517

 msgid "too few parameters"
 msgstr ""
 
 msgid "too few parameters"
 msgstr ""
 

-#: builtin/notes.c:536
+#: builtin/notes.c:538

 #, 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:548
+#: builtin/notes.c:550

 #, 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:600
+#: builtin/notes.c:603

 #, 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:695
+#: builtin/notes.c:698

 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr ""
 

-#: builtin/notes.c:697
+#: builtin/notes.c:700

 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr ""
 
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr ""
 

-#: builtin/notes.c:699
+#: builtin/notes.c:702

 msgid "failed to remove 'git notes merge' worktree"
 msgstr ""
 
 msgid "failed to remove 'git notes merge' worktree"
 msgstr ""
 

-#: builtin/notes.c:719
+#: builtin/notes.c:722

 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr ""
 

-#: builtin/notes.c:721
+#: builtin/notes.c:724

 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 

-#: builtin/notes.c:723
+#: builtin/notes.c:726

 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 

-#: builtin/notes.c:736
+#: builtin/notes.c:739

 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr ""
 
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr ""
 

-#: builtin/notes.c:739
+#: builtin/notes.c:742

 msgid "failed to finalize notes merge"
 msgstr ""
 
 msgid "failed to finalize notes merge"
 msgstr ""
 

-#: builtin/notes.c:765
+#: builtin/notes.c:768

 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr ""
 
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr ""
 

-#: builtin/notes.c:781
+#: builtin/notes.c:784

 msgid "General options"
 msgstr ""
 
 msgid "General options"
 msgstr ""
 

-#: builtin/notes.c:783
+#: builtin/notes.c:786

 msgid "Merge options"
 msgstr ""
 
 msgid "Merge options"
 msgstr ""
 

-#: builtin/notes.c:785
+#: builtin/notes.c:788

 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:787
+#: builtin/notes.c:790

 msgid "Committing unmerged notes"
 msgstr ""
 
 msgid "Committing unmerged notes"
 msgstr ""
 

-#: builtin/notes.c:789
+#: builtin/notes.c:792

 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 

-#: builtin/notes.c:791
+#: builtin/notes.c:794

 msgid "Aborting notes merge resolution"
 msgstr ""
 
 msgid "Aborting notes merge resolution"
 msgstr ""
 

-#: builtin/notes.c:793
+#: builtin/notes.c:796

 msgid "abort notes merge"
 msgstr ""
 
 msgid "abort notes merge"
 msgstr ""
 

-#: builtin/notes.c:804
+#: builtin/notes.c:807

 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr ""
 
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr ""
 

-#: builtin/notes.c:809
+#: builtin/notes.c:812

 msgid "must specify a notes ref to merge"
 msgstr ""
 
 msgid "must specify a notes ref to merge"
 msgstr ""
 

-#: builtin/notes.c:833
+#: builtin/notes.c:836

 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 

-#: builtin/notes.c:870
+#: builtin/notes.c:873

 #, 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:873
+#: builtin/notes.c:876

 #, 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:875
+#: builtin/notes.c:878

 #, 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 "


@@ -13032,36 +13840,36 @@ msgid ""
 "abort'.\n"
 msgstr ""
 
 "abort'.\n"
 msgstr ""
 

-#: builtin/notes.c:897
+#: builtin/notes.c:900

 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 

-#: builtin/notes.c:909
+#: builtin/notes.c:912

 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:912
+#: builtin/notes.c:915

 msgid "read object names from the standard input"
 msgstr ""
 
 msgid "read object names from the standard input"
 msgstr ""
 

-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165

 msgid "do not remove, show only"
 msgstr ""
 
 msgid "do not remove, show only"
 msgstr ""
 

-#: builtin/notes.c:951
+#: builtin/notes.c:955

 msgid "report pruned notes"
 msgstr ""
 
 msgid "report pruned notes"
 msgstr ""
 

-#: builtin/notes.c:993
+#: builtin/notes.c:998

 msgid "notes-ref"
 msgstr ""
 
 msgid "notes-ref"
 msgstr ""
 

-#: builtin/notes.c:994
+#: builtin/notes.c:999

 msgid "use notes from <notes-ref>"
 msgstr ""
 
 msgid "use notes from <notes-ref>"
 msgstr ""
 

-#: builtin/notes.c:1029
+#: builtin/notes.c:1034

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


@@ -13076,151 +13884,151 @@ msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 

-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:423

 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 

-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:434

 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 

-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:565

 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 

-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:776

 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 

-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:789

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

-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:793

 #, 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:796
+#: builtin/pack-objects.c:797

 msgid "unable to seek in reused packfile"
 msgstr ""
 
 msgid "unable to seek in reused packfile"
 msgstr ""
 

-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:808

 msgid "unable to read from reused packfile"
 msgstr ""
 
 msgid "unable to read from reused packfile"
 msgstr ""
 

-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:836

 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:848
+#: builtin/pack-objects.c:849

 msgid "Writing objects"
 msgstr ""
 
 msgid "Writing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:911 builtin/update-index.c:89

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

-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:964

 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 

-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1158

 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:1585
+#: builtin/pack-objects.c:1586

 #, 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:1594
+#: builtin/pack-objects.c:1595

 #, 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:1863
+#: builtin/pack-objects.c:1864

 msgid "Counting objects"
 msgstr ""
 
 msgid "Counting objects"
 msgstr ""
 

-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:1994

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

-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2009

 #, 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:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095
+#: builtin/pack-objects.c:2105

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

-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109

 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 

-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2119

 msgid "suboptimal pack - out of memory"
 msgstr ""
 
 msgid "suboptimal pack - out of memory"
 msgstr ""
 

-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2445

 #, 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:2583
+#: builtin/pack-objects.c:2577

 #, 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:2670
+#: builtin/pack-objects.c:2664

 msgid "Compressing objects"
 msgstr ""
 
 msgid "Compressing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2670

 msgid "inconsistency with delta count"
 msgstr ""
 
 msgid "inconsistency with delta count"
 msgstr ""
 

-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2751

 #, 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:2759
+#: builtin/pack-objects.c:2757

 #, 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:2857
+#: builtin/pack-objects.c:2855

 msgid "invalid value for --missing"
 msgstr ""
 
 msgid "invalid value for --missing"
 msgstr ""
 

-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: 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:2947
+#: 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:3032
+#: builtin/pack-objects.c:3030

 msgid "unable to force loose object"
 msgstr ""
 
 msgid "unable to force loose object"
 msgstr ""
 


@@ -13357,84 +14165,88 @@ msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
 #: builtin/pack-objects.c:3296
 msgstr ""
 
 #: builtin/pack-objects.c:3296

-msgid "create thin packs"
+msgid "use the sparse reachability algorithm"

 msgstr ""
 
 #: builtin/pack-objects.c:3298
 msgstr ""
 
 #: builtin/pack-objects.c:3298

-msgid "create packs suitable for shallow fetches"
+msgid "create thin packs"

 msgstr ""
 
 #: builtin/pack-objects.c:3300
 msgstr ""
 
 #: builtin/pack-objects.c:3300

-msgid "ignore packs that have companion .keep file"
+msgid "create packs suitable for shallow fetches"

 msgstr ""
 
 #: builtin/pack-objects.c:3302
 msgstr ""
 
 #: builtin/pack-objects.c:3302

-msgid "ignore this pack"
+msgid "ignore packs that have companion .keep file"

 msgstr ""
 
 #: builtin/pack-objects.c:3304
 msgstr ""
 
 #: builtin/pack-objects.c:3304

-msgid "pack compression level"
+msgid "ignore this pack"

 msgstr ""
 
 #: builtin/pack-objects.c:3306
 msgstr ""
 
 #: builtin/pack-objects.c:3306

-msgid "do not hide commits by grafts"
+msgid "pack compression level"

 msgstr ""
 
 #: builtin/pack-objects.c:3308
 msgstr ""
 
 #: builtin/pack-objects.c:3308

-msgid "use a bitmap index if available to speed up counting objects"
+msgid "do not hide commits by grafts"

 msgstr ""
 
 #: builtin/pack-objects.c:3310
 msgstr ""
 
 #: builtin/pack-objects.c:3310

+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3312

 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:3313
+#: builtin/pack-objects.c:3315

 msgid "handling for missing objects"
 msgstr ""
 
 msgid "handling for missing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3318

 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 

-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3320

 msgid "respect islands during delta compression"
 msgstr ""
 
 msgid "respect islands during delta compression"
 msgstr ""
 

-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3345

 #, 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:3347
+#: builtin/pack-objects.c:3350

 #, 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:3401
+#: builtin/pack-objects.c:3404

 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:3403
+#: builtin/pack-objects.c:3406

 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 

-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3411

 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:3411
+#: builtin/pack-objects.c:3414

 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr ""
 
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr ""
 

-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3420

 msgid "cannot use --filter without --stdout"
 msgstr ""
 
 msgid "cannot use --filter without --stdout"
 msgstr ""
 

-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3479

 msgid "Enumerating objects"
 msgstr ""
 
 msgid "Enumerating objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3498

 #, c-format
 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
 msgstr ""
 #, c-format
 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
 msgstr ""


@@ -13475,74 +14287,74 @@ msgstr ""
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 

-#: builtin/prune.c:129
+#: builtin/prune.c:128

 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 

-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:61 builtin/pull.c:63

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

-#: builtin/pull.c:82
+#: builtin/pull.c:83

 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 

-#: builtin/pull.c:133
+#: builtin/pull.c:134

 msgid "control for recursive fetching of submodules"
 msgstr ""
 
 msgid "control for recursive fetching of submodules"
 msgstr ""
 

-#: builtin/pull.c:137
+#: builtin/pull.c:138

 msgid "Options related to merging"
 msgstr ""
 
 msgid "Options related to merging"
 msgstr ""
 

-#: builtin/pull.c:140
+#: builtin/pull.c:141

 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 
 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 

-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123

 msgid "allow fast-forward"
 msgstr ""
 
 msgid "allow fast-forward"
 msgstr ""
 

-#: builtin/pull.c:176
+#: builtin/pull.c:177

 msgid "automatically stash/stash pop before and after rebase"
 msgstr ""
 
 msgid "automatically stash/stash pop before and after rebase"
 msgstr ""
 

-#: builtin/pull.c:192
+#: builtin/pull.c:193

 msgid "Options related to fetching"
 msgstr ""
 
 msgid "Options related to fetching"
 msgstr ""
 

-#: builtin/pull.c:202
+#: builtin/pull.c:203

 msgid "force overwrite of local branch"
 msgstr ""
 
 msgid "force overwrite of local branch"
 msgstr ""
 

-#: builtin/pull.c:210
+#: builtin/pull.c:211

 msgid "number of submodules pulled in parallel"
 msgstr ""
 
 msgid "number of submodules pulled in parallel"
 msgstr ""
 

-#: builtin/pull.c:305
+#: builtin/pull.c:306

 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 

-#: builtin/pull.c:421
+#: builtin/pull.c:422

 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:423
+#: builtin/pull.c:424

 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:424
+#: builtin/pull.c:425

 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:427
+#: builtin/pull.c:428

 #, 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"


@@ -13550,74 +14362,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:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:433 builtin/rebase.c:956 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:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:435 builtin/pull.c:450 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:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:437 builtin/pull.c:452 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:437 builtin/pull.c:452
+#: builtin/pull.c:438 builtin/pull.c:453

 msgid "See git-pull(1) for details."
 msgstr ""
 
 msgid "See git-pull(1) for details."
 msgstr ""
 

-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455
+#: builtin/rebase.c:962 git-parse-remote.sh:64

 msgid "<remote>"
 msgstr ""
 
 msgid "<remote>"
 msgstr ""
 

-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460
+#: git-legacy-rebase.sh:564 git-parse-remote.sh:65

 msgid "<branch>"
 msgstr ""
 
 msgid "<branch>"
 msgstr ""
 

-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:448 builtin/rebase.c:954 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:456 git-parse-remote.sh:95
+#: builtin/pull.c:457 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:461
+#: builtin/pull.c:462

 #, 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:565
+#: builtin/pull.c:566

 #, c-format
 msgid "unable to access commit %s"
 msgstr ""
 
 #, c-format
 msgid "unable to access commit %s"
 msgstr ""
 

-#: builtin/pull.c:843
+#: builtin/pull.c:844

 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 

-#: builtin/pull.c:891
+#: builtin/pull.c:892

 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 

-#: builtin/pull.c:899
+#: builtin/pull.c:900

 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:902
+#: builtin/pull.c:904

 msgid "pull with rebase"
 msgstr ""
 
 msgid "pull with rebase"
 msgstr ""
 

-#: builtin/pull.c:903
+#: builtin/pull.c:905

 msgid "please commit or stash them."
 msgstr ""
 
 msgid "please commit or stash them."
 msgstr ""
 

-#: builtin/pull.c:928
+#: builtin/pull.c:930

 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"


@@ -13625,7 +14437,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
 "commit %s."
 msgstr ""
 

-#: builtin/pull.c:934
+#: builtin/pull.c:936

 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"


@@ -13636,15 +14448,15 @@ msgid ""
 "to recover."
 msgstr ""
 
 "to recover."
 msgstr ""
 

-#: builtin/pull.c:949
+#: builtin/pull.c:951

 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 

-#: builtin/pull.c:953
+#: builtin/pull.c:955

 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 

-#: builtin/pull.c:960
+#: builtin/pull.c:962

 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 


@@ -13660,13 +14472,13 @@ msgstr ""
 msgid "--delete only accepts plain target ref names"
 msgstr ""
 
 msgid "--delete only accepts plain target ref names"
 msgstr ""
 

-#: builtin/push.c:165
+#: builtin/push.c:167

 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 

-#: builtin/push.c:168
+#: builtin/push.c:170

 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"


@@ -13681,7 +14493,7 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: builtin/push.c:183
+#: builtin/push.c:185

 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"


@@ -13691,7 +14503,7 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 

-#: builtin/push.c:197
+#: builtin/push.c:199

 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"


@@ -13700,12 +14512,12 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr ""
 
 "    git push --set-upstream %s %s\n"
 msgstr ""
 

-#: builtin/push.c:205
+#: builtin/push.c:207

 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 

-#: builtin/push.c:208
+#: builtin/push.c:210

 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"


@@ -13713,12 +14525,12 @@ msgid ""
 "to update which remote branch."
 msgstr ""
 
 "to update which remote branch."
 msgstr ""
 

-#: builtin/push.c:267
+#: builtin/push.c:269

 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 

-#: builtin/push.c:274
+#: builtin/push.c:276

 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"


@@ -13726,7 +14538,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 

-#: builtin/push.c:280
+#: builtin/push.c:282

 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"


@@ -13734,7 +14546,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 

-#: builtin/push.c:286
+#: builtin/push.c:288

 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"


@@ -13743,33 +14555,33 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 

-#: builtin/push.c:293
+#: builtin/push.c:295

 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 

-#: builtin/push.c:296
+#: builtin/push.c:298

 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr ""
 
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr ""
 

-#: builtin/push.c:357
+#: builtin/push.c:359

 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 

-#: builtin/push.c:361
+#: builtin/push.c:364

 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 

-#: builtin/push.c:395
+#: builtin/push.c:398

 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 

-#: builtin/push.c:396
+#: builtin/push.c:399

 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "


@@ -13782,104 +14594,104 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 
 "    git push <name>\n"
 msgstr ""
 

-#: builtin/push.c:551
+#: builtin/push.c:554

 msgid "repository"
 msgstr ""
 
 msgid "repository"
 msgstr ""
 

-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164

 msgid "push all refs"
 msgstr ""
 
 msgid "push all refs"
 msgstr ""
 

-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166

 msgid "mirror all refs"
 msgstr ""
 
 msgid "mirror all refs"
 msgstr ""
 

-#: builtin/push.c:555
+#: builtin/push.c:558

 msgid "delete refs"
 msgstr ""
 
 msgid "delete refs"
 msgstr ""
 

-#: builtin/push.c:556
+#: builtin/push.c:559

 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 

-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167

 msgid "force updates"
 msgstr ""
 
 msgid "force updates"
 msgstr ""
 

-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181

 msgid "<refname>:<expect>"
 msgstr ""
 
 msgid "<refname>:<expect>"
 msgstr ""
 

-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182

 msgid "require old value of ref to be at this value"
 msgstr ""
 
 msgid "require old value of ref to be at this value"
 msgstr ""
 

-#: builtin/push.c:565
+#: builtin/push.c:568

 msgid "control recursive pushing of submodules"
 msgstr ""
 
 msgid "control recursive pushing of submodules"
 msgstr ""
 

-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175

 msgid "use thin pack"
 msgstr ""
 
 msgid "use thin pack"
 msgstr ""
 

-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161

 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr ""
 
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr ""
 

-#: builtin/push.c:570
+#: builtin/push.c:573

 msgid "set upstream for git pull/status"
 msgstr ""
 
 msgid "set upstream for git pull/status"
 msgstr ""
 

-#: builtin/push.c:573
+#: builtin/push.c:576

 msgid "prune locally removed refs"
 msgstr ""
 
 msgid "prune locally removed refs"
 msgstr ""
 

-#: builtin/push.c:575
+#: builtin/push.c:578

 msgid "bypass pre-push hook"
 msgstr ""
 
 msgid "bypass pre-push hook"
 msgstr ""
 

-#: builtin/push.c:576
+#: builtin/push.c:579

 msgid "push missing but relevant tags"
 msgstr ""
 
 msgid "push missing but relevant tags"
 msgstr ""
 

-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169

 msgid "GPG sign the push"
 msgstr ""
 
 msgid "GPG sign the push"
 msgstr ""
 

-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176

 msgid "request atomic transaction on remote side"
 msgstr ""
 
 msgid "request atomic transaction on remote side"
 msgstr ""
 

-#: builtin/push.c:599
+#: builtin/push.c:602

 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 

-#: builtin/push.c:601
+#: builtin/push.c:604

 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 

-#: builtin/push.c:604
+#: builtin/push.c:607

 msgid "--all and --tags are incompatible"
 msgstr ""
 
 msgid "--all and --tags are incompatible"
 msgstr ""
 

-#: builtin/push.c:606
+#: builtin/push.c:609

 msgid "--all can't be combined with refspecs"
 msgstr ""
 
 msgid "--all can't be combined with refspecs"
 msgstr ""
 

-#: builtin/push.c:610
+#: builtin/push.c:613

 msgid "--mirror and --tags are incompatible"
 msgstr ""
 
 msgid "--mirror and --tags are incompatible"
 msgstr ""
 

-#: builtin/push.c:612
+#: builtin/push.c:615

 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 
 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 

-#: builtin/push.c:615
+#: builtin/push.c:618

 msgid "--all and --mirror are incompatible"
 msgstr ""
 
 msgid "--all and --mirror are incompatible"
 msgstr ""
 

-#: builtin/push.c:634
+#: builtin/push.c:637

 msgid "push options must not have new line characters"
 msgstr ""
 
 msgid "push options must not have new line characters"
 msgstr ""
 


@@ -13916,123 +14728,127 @@ msgstr ""
 msgid "need two commit ranges"
 msgstr ""
 
 msgid "need two commit ranges"
 msgstr ""
 

-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41

 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 

-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124

 msgid "write resulting index to <file>"
 msgstr ""
 
 msgid "write resulting index to <file>"
 msgstr ""
 

-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127

 msgid "only empty the index"
 msgstr ""
 
 msgid "only empty the index"
 msgstr ""
 

-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129

 msgid "Merging"
 msgstr ""
 
 msgid "Merging"
 msgstr ""
 

-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131

 msgid "perform a merge in addition to a read"
 msgstr ""
 
 msgid "perform a merge in addition to a read"
 msgstr ""
 

-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133

 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:134
+#: builtin/read-tree.c:135

 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:136
+#: builtin/read-tree.c:137

 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 
 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 

-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138

 msgid "<subdirectory>/"
 msgstr ""
 
 msgid "<subdirectory>/"
 msgstr ""
 

-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139

 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 
 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 

-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142

 msgid "update working tree with merge result"
 msgstr ""
 
 msgid "update working tree with merge result"
 msgstr ""
 

-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144

 msgid "gitignore"
 msgstr ""
 
 msgid "gitignore"
 msgstr ""
 

-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145

 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 
 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 

-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148

 msgid "don't check the working tree after merging"
 msgstr ""
 
 msgid "don't check the working tree after merging"
 msgstr ""
 

-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149

 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:150
+#: builtin/read-tree.c:151

 msgid "skip applying sparse checkout filter"
 msgstr ""
 
 msgid "skip applying sparse checkout filter"
 msgstr ""
 

-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153

 msgid "debug unpack-trees"
 msgstr ""
 
 msgid "debug unpack-trees"
 msgstr ""
 

-#: builtin/rebase.c:29
+#: builtin/rebase.c:30

 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
 "[<branch>]"
 msgstr ""
 
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
 "[<branch>]"
 msgstr ""
 

-#: builtin/rebase.c:31
+#: builtin/rebase.c:32

 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 

-#: builtin/rebase.c:33
+#: builtin/rebase.c:34

 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr ""
 
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr ""
 

-#: builtin/rebase.c:119
+#: builtin/rebase.c:121

 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr ""
 
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr ""
 

-#: builtin/rebase.c:171
+#: builtin/rebase.c:173

 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr ""
 

-#: builtin/rebase.c:186
+#: builtin/rebase.c:188

 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr ""
 

-#: builtin/rebase.c:214
+#: builtin/rebase.c:213

 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 

-#: builtin/rebase.c:259
+#: builtin/rebase.c:289

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

-#: builtin/rebase.c:277
+#: builtin/rebase.c:307

 #, c-format
 msgid "Cannot store %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot store %s"
 msgstr ""
 

-#: builtin/rebase.c:337
+#: builtin/rebase.c:402
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:522

 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"


@@ -14041,11 +14857,19 @@ msgid ""
 "abort\"."
 msgstr ""
 
 "abort\"."
 msgstr ""
 

-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
+#: builtin/rebase.c:603
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase.c:753
+#: builtin/rebase.c:948

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -14056,7 +14880,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: builtin/rebase.c:769
+#: builtin/rebase.c:964

 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"


@@ -14065,168 +14889,180 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: builtin/rebase.c:832
+#: builtin/rebase.c:994
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:998
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1040

 msgid "rebase onto given branch instead of upstream"
 msgstr ""
 
 msgid "rebase onto given branch instead of upstream"
 msgstr ""
 

-#: builtin/rebase.c:834
+#: builtin/rebase.c:1042

 msgid "allow pre-rebase hook to run"
 msgstr ""
 
 msgid "allow pre-rebase hook to run"
 msgstr ""
 

-#: builtin/rebase.c:836
+#: builtin/rebase.c:1044

 msgid "be quiet. implies --no-stat"
 msgstr ""
 
 msgid "be quiet. implies --no-stat"
 msgstr ""
 

-#: builtin/rebase.c:839
+#: builtin/rebase.c:1047

 msgid "display a diffstat of what changed upstream"
 msgstr ""
 
 msgid "display a diffstat of what changed upstream"
 msgstr ""
 

-#: builtin/rebase.c:842
+#: builtin/rebase.c:1050

 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 

-#: builtin/rebase.c:845
+#: builtin/rebase.c:1053

 msgid "add a Signed-off-by: line to each commit"
 msgstr ""
 
 msgid "add a Signed-off-by: line to each commit"
 msgstr ""
 

-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061

 msgid "passed to 'git am'"
 msgstr ""
 
 msgid "passed to 'git am'"
 msgstr ""
 

-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1063 builtin/rebase.c:1065

 msgid "passed to 'git apply'"
 msgstr ""
 
 msgid "passed to 'git apply'"
 msgstr ""
 

-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1067 builtin/rebase.c:1070

 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 

-#: builtin/rebase.c:864
+#: builtin/rebase.c:1072

 msgid "continue"
 msgstr ""
 
 msgid "continue"
 msgstr ""
 

-#: builtin/rebase.c:867
+#: builtin/rebase.c:1075

 msgid "skip current patch and continue"
 msgstr ""
 
 msgid "skip current patch and continue"
 msgstr ""
 

-#: builtin/rebase.c:869
+#: builtin/rebase.c:1077

 msgid "abort and check out the original branch"
 msgstr ""
 
 msgid "abort and check out the original branch"
 msgstr ""
 

-#: builtin/rebase.c:872
+#: builtin/rebase.c:1080

 msgid "abort but keep HEAD where it is"
 msgstr ""
 
 msgid "abort but keep HEAD where it is"
 msgstr ""
 

-#: builtin/rebase.c:873
+#: builtin/rebase.c:1081

 msgid "edit the todo list during an interactive rebase"
 msgstr ""
 
 msgid "edit the todo list during an interactive rebase"
 msgstr ""
 

-#: builtin/rebase.c:876
+#: builtin/rebase.c:1084

 msgid "show the patch file being applied or merged"
 msgstr ""
 
 msgid "show the patch file being applied or merged"
 msgstr ""
 

-#: builtin/rebase.c:879
+#: builtin/rebase.c:1087

 msgid "use merging strategies to rebase"
 msgstr ""
 
 msgid "use merging strategies to rebase"
 msgstr ""
 

-#: builtin/rebase.c:883
+#: builtin/rebase.c:1091

 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 

-#: builtin/rebase.c:887
+#: builtin/rebase.c:1095

 msgid "try to recreate merges instead of ignoring them"
 msgstr ""
 
 msgid "try to recreate merges instead of ignoring them"
 msgstr ""
 

-#: builtin/rebase.c:891
+#: builtin/rebase.c:1099

 msgid "allow rerere to update index with resolved conflict"
 msgstr ""
 
 msgid "allow rerere to update index with resolved conflict"
 msgstr ""
 

-#: builtin/rebase.c:894
+#: builtin/rebase.c:1102

 msgid "preserve empty commits during rebase"
 msgstr ""
 
 msgid "preserve empty commits during rebase"
 msgstr ""
 

-#: builtin/rebase.c:896
+#: builtin/rebase.c:1104

 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 

-#: builtin/rebase.c:902
+#: builtin/rebase.c:1110

 msgid "automatically stash/stash pop before and after"
 msgstr ""
 
 msgid "automatically stash/stash pop before and after"
 msgstr ""
 

-#: builtin/rebase.c:904
+#: builtin/rebase.c:1112

 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 

-#: builtin/rebase.c:908
+#: builtin/rebase.c:1116

 msgid "allow rebasing commits with empty messages"
 msgstr ""
 
 msgid "allow rebasing commits with empty messages"
 msgstr ""
 

-#: builtin/rebase.c:911
+#: builtin/rebase.c:1119

 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 

-#: builtin/rebase.c:914
+#: builtin/rebase.c:1122

 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 

-#: builtin/rebase.c:916
+#: builtin/rebase.c:1124

 msgid "use the given merge strategy"
 msgstr ""
 
 msgid "use the given merge strategy"
 msgstr ""
 

-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1126 builtin/revert.c:112

 msgid "option"
 msgstr ""
 
 msgid "option"
 msgstr ""
 

-#: builtin/rebase.c:919
+#: builtin/rebase.c:1127

 msgid "pass the argument through to the merge strategy"
 msgstr ""
 
 msgid "pass the argument through to the merge strategy"
 msgstr ""
 

-#: builtin/rebase.c:922
+#: builtin/rebase.c:1130

 msgid "rebase all reachable commits up to the root(s)"
 msgstr ""
 
 msgid "rebase all reachable commits up to the root(s)"
 msgstr ""
 

-#: builtin/rebase.c:938
+#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:1149

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

-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1167 git-legacy-rebase.sh:220

 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 

-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1208 git-legacy-rebase.sh:406

 msgid "No rebase in progress?"
 msgstr ""
 
 msgid "No rebase in progress?"
 msgstr ""
 

-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1212 git-legacy-rebase.sh:417

 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 

-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1226 git-legacy-rebase.sh:424

 msgid "Cannot read HEAD"
 msgstr ""
 
 msgid "Cannot read HEAD"
 msgstr ""
 

-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1238 git-legacy-rebase.sh:427

 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 

-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1257

 msgid "could not discard worktree changes"
 msgstr ""
 
 msgid "could not discard worktree changes"
 msgstr ""
 

-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1276

 #, c-format
 msgid "could not move back to %s"
 msgstr ""
 
 #, c-format
 msgid "could not move back to %s"
 msgstr ""
 

-#: builtin/rebase.c:1077 builtin/rm.c:368
+#: builtin/rebase.c:1287 builtin/rm.c:369

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

-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1313

 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"


@@ -14239,329 +15075,327 @@ msgid ""
 "valuable there.\n"
 msgstr ""
 
 "valuable there.\n"
 msgstr ""
 

-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1334

 msgid "switch `C' expects a numerical value"
 msgstr ""
 
 msgid "switch `C' expects a numerical value"
 msgstr ""
 

-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1375

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

-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1397

 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 

-#: builtin/rebase.c:1226
-#, c-format
-msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+#: builtin/rebase.c:1437
+msgid "--reschedule-failed-exec requires an interactive rebase"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase.c:1231
-#, c-format
-msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
+#: builtin/rebase.c:1446
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: builtin/rebase.c:1465
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
+#: builtin/rebase.c:1469 git-legacy-rebase.sh:544
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
+#: builtin/rebase.c:1475
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
+#: builtin/rebase.c:1478
+msgid "cannot combine '--rebase-merges' with '--strategy'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1502

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

-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1508

 msgid "Could not create new root commit"
 msgstr ""
 
 msgid "Could not create new root commit"
 msgstr ""
 

-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1526

 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr ""
 
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr ""
 

-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1533

 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr ""
 
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr ""
 

-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1558

 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr ""
 
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr ""
 

-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1566 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934

 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 

-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1578

 msgid "Could not resolve HEAD to a revision"
 msgstr ""
 
 msgid "Could not resolve HEAD to a revision"
 msgstr ""
 

-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1619 git-legacy-rebase.sh:673

 msgid "Cannot autostash"
 msgstr ""
 
 msgid "Cannot autostash"
 msgstr ""
 

-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1622

 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr ""
 

-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1628

 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr ""
 

-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1631

 #, c-format
 msgid "Created autostash: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr ""
 

-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1634

 msgid "could not reset --hard"
 msgstr ""
 
 msgid "could not reset --hard"
 msgstr ""
 

-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1635 builtin/reset.c:114

 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 
 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 

-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:1651 git-legacy-rebase.sh:682

 msgid "Please commit or stash them."
 msgstr ""
 
 msgid "Please commit or stash them."
 msgstr ""
 

-#: builtin/rebase.c:1458
+#: builtin/rebase.c:1678

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

-#: builtin/rebase.c:1470
+#: builtin/rebase.c:1691

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

-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
+#: builtin/rebase.c:1702 git-legacy-rebase.sh:705

 #, sh-format
 msgid "HEAD is up to date."
 msgstr ""
 
 #, sh-format
 msgid "HEAD is up to date."
 msgstr ""
 

-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1704

 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr ""
 
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr ""
 

-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
+#: builtin/rebase.c:1712 git-legacy-rebase.sh:715

 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 

-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1714

 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr ""
 
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr ""
 

-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:1722 git-legacy-rebase.sh:215

 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 

-#: builtin/rebase.c:1508
+#: builtin/rebase.c:1729

 #, c-format
 msgid "Changes to %s:\n"
 msgstr ""
 
 #, c-format
 msgid "Changes to %s:\n"
 msgstr ""
 

-#: builtin/rebase.c:1511
+#: builtin/rebase.c:1732

 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr ""
 
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr ""
 

-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1757

 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 

-#: builtin/rebase.c:1543
+#: builtin/rebase.c:1765

 msgid "Could not detach HEAD"
 msgstr ""
 
 msgid "Could not detach HEAD"
 msgstr ""
 

-#: builtin/rebase.c:1552
+#: builtin/rebase.c:1774

 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr ""
 
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr ""
 

-#: builtin/rebase--interactive.c:24
+#: builtin/rebase--interactive.c:25

 msgid "no HEAD?"
 msgstr ""
 
 msgid "no HEAD?"
 msgstr ""
 

-#: builtin/rebase--interactive.c:51
+#: builtin/rebase--interactive.c:52

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

-#: builtin/rebase--interactive.c:57
+#: builtin/rebase--interactive.c:58

 msgid "could not mark as interactive"
 msgstr ""
 
 msgid "could not mark as interactive"
 msgstr ""
 

-#: builtin/rebase--interactive.c:101
+#: builtin/rebase--interactive.c:102

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

-#: builtin/rebase--interactive.c:114
+#: builtin/rebase--interactive.c:115

 msgid "could not generate todo list"
 msgstr ""
 
 msgid "could not generate todo list"
 msgstr ""
 

-#: builtin/rebase--interactive.c:129
+#: builtin/rebase--interactive.c:131

 msgid "git rebase--interactive [<options>]"
 msgstr ""
 
 msgid "git rebase--interactive [<options>]"
 msgstr ""
 

-#: builtin/rebase--interactive.c:148
+#: builtin/rebase--interactive.c:150

 msgid "keep empty commits"
 msgstr ""
 
 msgid "keep empty commits"
 msgstr ""
 

-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
+#: builtin/rebase--interactive.c:152 builtin/revert.c:125

 msgid "allow commits with empty messages"
 msgstr ""
 
 msgid "allow commits with empty messages"
 msgstr ""
 

-#: builtin/rebase--interactive.c:151
+#: builtin/rebase--interactive.c:153

 msgid "rebase merge commits"
 msgstr ""
 
 msgid "rebase merge commits"
 msgstr ""
 

-#: builtin/rebase--interactive.c:153
+#: builtin/rebase--interactive.c:155

 msgid "keep original branch points of cousins"
 msgstr ""
 
 msgid "keep original branch points of cousins"
 msgstr ""
 

-#: builtin/rebase--interactive.c:155
+#: builtin/rebase--interactive.c:157

 msgid "move commits that begin with squash!/fixup!"
 msgstr ""
 
 msgid "move commits that begin with squash!/fixup!"
 msgstr ""
 

-#: builtin/rebase--interactive.c:156
+#: builtin/rebase--interactive.c:158

 msgid "sign commits"
 msgstr ""
 
 msgid "sign commits"
 msgstr ""
 

-#: builtin/rebase--interactive.c:158
+#: builtin/rebase--interactive.c:160

 msgid "continue rebase"
 msgstr ""
 
 msgid "continue rebase"
 msgstr ""
 

-#: builtin/rebase--interactive.c:160
+#: builtin/rebase--interactive.c:162

 msgid "skip commit"
 msgstr ""
 
 msgid "skip commit"
 msgstr ""
 

-#: builtin/rebase--interactive.c:161
+#: builtin/rebase--interactive.c:163

 msgid "edit the todo list"
 msgstr ""
 
 msgid "edit the todo list"
 msgstr ""
 

-#: builtin/rebase--interactive.c:163
+#: builtin/rebase--interactive.c:165

 msgid "show the current patch"
 msgstr ""
 
 msgid "show the current patch"
 msgstr ""
 

-#: builtin/rebase--interactive.c:166
+#: builtin/rebase--interactive.c:168

 msgid "shorten commit ids in the todo list"
 msgstr ""
 
 msgid "shorten commit ids in the todo list"
 msgstr ""
 

-#: builtin/rebase--interactive.c:168
+#: builtin/rebase--interactive.c:170

 msgid "expand commit ids in the todo list"
 msgstr ""
 
 msgid "expand commit ids in the todo list"
 msgstr ""
 

-#: builtin/rebase--interactive.c:170
+#: builtin/rebase--interactive.c:172

 msgid "check the todo list"
 msgstr ""
 
 msgid "check the todo list"
 msgstr ""
 

-#: builtin/rebase--interactive.c:172
+#: builtin/rebase--interactive.c:174

 msgid "rearrange fixup/squash lines"
 msgstr ""
 
 msgid "rearrange fixup/squash lines"
 msgstr ""
 

-#: builtin/rebase--interactive.c:174
+#: builtin/rebase--interactive.c:176

 msgid "insert exec commands in todo list"
 msgstr ""
 
 msgid "insert exec commands in todo list"
 msgstr ""
 

-#: builtin/rebase--interactive.c:175
+#: builtin/rebase--interactive.c:177

 msgid "onto"
 msgstr ""
 
 msgid "onto"
 msgstr ""
 

-#: builtin/rebase--interactive.c:177
+#: builtin/rebase--interactive.c:179

 msgid "restrict-revision"
 msgstr ""
 
 msgid "restrict-revision"
 msgstr ""
 

-#: builtin/rebase--interactive.c:177
+#: builtin/rebase--interactive.c:179

 msgid "restrict revision"
 msgstr ""
 
 msgid "restrict revision"
 msgstr ""
 

-#: builtin/rebase--interactive.c:178
+#: builtin/rebase--interactive.c:180

 msgid "squash-onto"
 msgstr ""
 
 msgid "squash-onto"
 msgstr ""
 

-#: builtin/rebase--interactive.c:179
+#: builtin/rebase--interactive.c:181

 msgid "squash onto"
 msgstr ""
 
 msgid "squash onto"
 msgstr ""
 

-#: builtin/rebase--interactive.c:181
+#: builtin/rebase--interactive.c:183

 msgid "the upstream commit"
 msgstr ""
 
 msgid "the upstream commit"
 msgstr ""
 

-#: builtin/rebase--interactive.c:182
+#: builtin/rebase--interactive.c:184

 msgid "head-name"
 msgstr ""
 
 msgid "head-name"
 msgstr ""
 

-#: builtin/rebase--interactive.c:182
+#: builtin/rebase--interactive.c:184

 msgid "head name"
 msgstr ""
 
 msgid "head name"
 msgstr ""
 

-#: builtin/rebase--interactive.c:187
+#: builtin/rebase--interactive.c:189

 msgid "rebase strategy"
 msgstr ""
 
 msgid "rebase strategy"
 msgstr ""
 

-#: builtin/rebase--interactive.c:188
+#: builtin/rebase--interactive.c:190

 msgid "strategy-opts"
 msgstr ""
 
 msgid "strategy-opts"
 msgstr ""
 

-#: builtin/rebase--interactive.c:189
+#: builtin/rebase--interactive.c:191

 msgid "strategy options"
 msgstr ""
 
 msgid "strategy options"
 msgstr ""
 

-#: builtin/rebase--interactive.c:190
+#: builtin/rebase--interactive.c:192

 msgid "switch-to"
 msgstr ""
 
 msgid "switch-to"
 msgstr ""
 

-#: builtin/rebase--interactive.c:191
+#: builtin/rebase--interactive.c:193

 msgid "the branch or commit to checkout"
 msgstr ""
 
 msgid "the branch or commit to checkout"
 msgstr ""
 

-#: builtin/rebase--interactive.c:192
+#: builtin/rebase--interactive.c:194

 msgid "onto-name"
 msgstr ""
 
 msgid "onto-name"
 msgstr ""
 

-#: builtin/rebase--interactive.c:192
+#: builtin/rebase--interactive.c:194

 msgid "onto name"
 msgstr ""
 
 msgid "onto name"
 msgstr ""
 

-#: builtin/rebase--interactive.c:193
+#: builtin/rebase--interactive.c:195

 msgid "cmd"
 msgstr ""
 
 msgid "cmd"
 msgstr ""
 

-#: builtin/rebase--interactive.c:193
+#: builtin/rebase--interactive.c:195

 msgid "the command to run"
 msgstr ""
 
 msgid "the command to run"
 msgstr ""
 

-#: builtin/rebase--interactive.c:220
+#: builtin/rebase--interactive.c:224

 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr ""
 
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr ""
 

-#: builtin/rebase--interactive.c:226
+#: builtin/rebase--interactive.c:230

 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 


@@ -14606,11 +15440,61 @@ msgstr ""
 msgid "You must specify a directory."
 msgstr ""
 
 msgid "You must specify a directory."
 msgstr ""
 

-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr ""
+
+#: builtin/reflog.c:567 builtin/reflog.c:572

 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr ""
 

+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+

 #: builtin/remote.c:16
 msgid "git remote [-v | --verbose]"
 msgstr ""
 #: builtin/remote.c:16
 msgid "git remote [-v | --verbose]"
 msgstr ""


@@ -15115,6 +15999,18 @@ msgid ""
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 

+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:239 builtin/repack.c:411
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+

 #: builtin/repack.c:294
 msgid "pack everything in a single pack"
 msgstr ""
 #: builtin/repack.c:294
 msgid "pack everything in a single pack"
 msgstr ""


@@ -15203,7 +16099,23 @@ msgstr ""
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 

-#: builtin/repack.c:527
+#: builtin/repack.c:420
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:481
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file.  But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+
+#: builtin/repack.c:529

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


@@ -15459,123 +16371,123 @@ msgstr ""
 msgid "'git rerere forget' without paths is deprecated"
 msgstr ""
 
 msgid "'git rerere forget' without paths is deprecated"
 msgstr ""
 

-#: builtin/rerere.c:111
+#: builtin/rerere.c:113

 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr ""
 

-#: builtin/reset.c:31
+#: builtin/reset.c:32

 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:32
+#: builtin/reset.c:33

 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr ""
 
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr ""
 

-#: builtin/reset.c:33
+#: builtin/reset.c:34

 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr ""
 
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr ""
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "mixed"
 msgstr ""
 
 msgid "mixed"
 msgstr ""
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "soft"
 msgstr ""
 
 msgid "soft"
 msgstr ""
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "hard"
 msgstr ""
 
 msgid "hard"
 msgstr ""
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "merge"
 msgstr ""
 
 msgid "merge"
 msgstr ""
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "keep"
 msgstr ""
 
 msgid "keep"
 msgstr ""
 

-#: builtin/reset.c:80
+#: builtin/reset.c:81

 msgid "You do not have a valid HEAD."
 msgstr ""
 
 msgid "You do not have a valid HEAD."
 msgstr ""
 

-#: builtin/reset.c:82
+#: builtin/reset.c:83

 msgid "Failed to find tree of HEAD."
 msgstr ""
 
 msgid "Failed to find tree of HEAD."
 msgstr ""
 

-#: builtin/reset.c:88
+#: builtin/reset.c:89

 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 

-#: builtin/reset.c:192
+#: builtin/reset.c:193

 #, 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:292
+#: builtin/reset.c:293

 msgid "be quiet, only report errors"
 msgstr ""
 
 msgid "be quiet, only report errors"
 msgstr ""
 

-#: builtin/reset.c:294
+#: builtin/reset.c:295

 msgid "reset HEAD and index"
 msgstr ""
 
 msgid "reset HEAD and index"
 msgstr ""
 

-#: builtin/reset.c:295
+#: builtin/reset.c:296

 msgid "reset only HEAD"
 msgstr ""
 
 msgid "reset only HEAD"
 msgstr ""
 

-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300

 msgid "reset HEAD, index and working tree"
 msgstr ""
 
 msgid "reset HEAD, index and working tree"
 msgstr ""
 

-#: builtin/reset.c:301
+#: builtin/reset.c:302

 msgid "reset HEAD but keep local changes"
 msgstr ""
 
 msgid "reset HEAD but keep local changes"
 msgstr ""
 

-#: builtin/reset.c:307
+#: builtin/reset.c:308

 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:325
+#: builtin/reset.c:326

 #, 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:333
+#: builtin/reset.c:334

 #, 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:342
+#: builtin/reset.c:343

 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 

-#: builtin/reset.c:351
+#: builtin/reset.c:352

 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:353
+#: builtin/reset.c:354

 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 

-#: builtin/reset.c:363
+#: builtin/reset.c:364

 #, 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:367
+#: builtin/reset.c:368

 msgid "-N can only be used with --mixed"
 msgstr ""
 
 msgid "-N can only be used with --mixed"
 msgstr ""
 

-#: builtin/reset.c:387
+#: builtin/reset.c:388

 msgid "Unstaged changes after reset:"
 msgstr ""
 
 msgid "Unstaged changes after reset:"
 msgstr ""
 

-#: builtin/reset.c:390
+#: builtin/reset.c:391

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -15584,53 +16496,53 @@ msgid ""
 "to make this the default.\n"
 msgstr ""
 
 "to make this the default.\n"
 msgstr ""
 

-#: builtin/reset.c:400
+#: builtin/reset.c:401

 #, 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:404
+#: builtin/reset.c:405

 msgid "Could not write new index file."
 msgstr ""
 
 msgid "Could not write new index file."
 msgstr ""
 

-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:406

 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 

-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:464

 msgid "object filtering requires --objects"
 msgstr ""
 
 msgid "object filtering requires --objects"
 msgstr ""
 

-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:467

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

-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:508

 msgid "rev-list does not support display of notes"
 msgstr ""
 
 msgid "rev-list does not support display of notes"
 msgstr ""
 

-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:511

 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr ""
 
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr ""
 

-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408

 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr ""
 
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr ""
 

-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413

 msgid "keep the `--` passed as an arg"
 msgstr ""
 
 msgid "keep the `--` passed as an arg"
 msgstr ""
 

-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415

 msgid "stop parsing after the first non-option argument"
 msgstr ""
 
 msgid "stop parsing after the first non-option argument"
 msgstr ""
 

-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418

 msgid "output in stuck long form"
 msgstr ""
 
 msgid "output in stuck long form"
 msgstr ""
 

-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551

 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"


@@ -15655,72 +16567,77 @@ msgstr ""
 msgid "git cherry-pick <subcommand>"
 msgstr ""
 
 msgid "git cherry-pick <subcommand>"
 msgstr ""
 

-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr ""
+
+#: builtin/revert.c:92

 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr ""
 
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr ""
 

-#: builtin/revert.c:100
+#: builtin/revert.c:101

 msgid "end revert or cherry-pick sequence"
 msgstr ""
 
 msgid "end revert or cherry-pick sequence"
 msgstr ""
 

-#: builtin/revert.c:101
+#: builtin/revert.c:102

 msgid "resume revert or cherry-pick sequence"
 msgstr ""
 
 msgid "resume revert or cherry-pick sequence"
 msgstr ""
 

-#: builtin/revert.c:102
+#: builtin/revert.c:103

 msgid "cancel revert or cherry-pick sequence"
 msgstr ""
 
 msgid "cancel revert or cherry-pick sequence"
 msgstr ""
 

-#: builtin/revert.c:103
+#: builtin/revert.c:104

 msgid "don't automatically commit"
 msgstr ""
 
 msgid "don't automatically commit"
 msgstr ""
 

-#: builtin/revert.c:104
+#: builtin/revert.c:105

 msgid "edit the commit message"
 msgstr ""
 
 msgid "edit the commit message"
 msgstr ""
 

-#: builtin/revert.c:107
+#: builtin/revert.c:108

 msgid "parent-number"
 msgstr ""
 
 msgid "parent-number"
 msgstr ""
 

-#: builtin/revert.c:108
+#: builtin/revert.c:109

 msgid "select mainline parent"
 msgstr ""
 
 msgid "select mainline parent"
 msgstr ""
 

-#: builtin/revert.c:110
+#: builtin/revert.c:111

 msgid "merge strategy"
 msgstr ""
 
 msgid "merge strategy"
 msgstr ""
 

-#: builtin/revert.c:112
+#: builtin/revert.c:113

 msgid "option for merge strategy"
 msgstr ""
 
 msgid "option for merge strategy"
 msgstr ""
 

-#: builtin/revert.c:121
+#: builtin/revert.c:122

 msgid "append commit name"
 msgstr ""
 
 msgid "append commit name"
 msgstr ""
 

-#: builtin/revert.c:123
+#: builtin/revert.c:124

 msgid "preserve initially empty commits"
 msgstr ""
 
 msgid "preserve initially empty commits"
 msgstr ""
 

-#: builtin/revert.c:125
+#: builtin/revert.c:126

 msgid "keep redundant, empty commits"
 msgstr ""
 
 msgid "keep redundant, empty commits"
 msgstr ""
 

-#: builtin/revert.c:219
+#: builtin/revert.c:220

 msgid "revert failed"
 msgstr ""
 
 msgid "revert failed"
 msgstr ""
 

-#: builtin/revert.c:232
+#: builtin/revert.c:233

 msgid "cherry-pick failed"
 msgstr ""
 
 msgid "cherry-pick failed"
 msgstr ""
 

-#: builtin/rm.c:18
+#: builtin/rm.c:19

 msgid "git rm [<options>] [--] <file>..."
 msgstr ""
 
 msgid "git rm [<options>] [--] <file>..."
 msgstr ""
 

-#: builtin/rm.c:206
+#: builtin/rm.c:207

 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"


@@ -15730,60 +16647,60 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/rm.c:211
+#: builtin/rm.c:212

 msgid ""
 "\n"
 "(use -f to force removal)"
 msgstr ""
 
 msgid ""
 "\n"
 "(use -f to force removal)"
 msgstr ""
 

-#: builtin/rm.c:215
+#: builtin/rm.c:216

 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229

 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
 msgstr ""
 
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
 msgstr ""
 

-#: builtin/rm.c:225
+#: builtin/rm.c:226

 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/rm.c:241
+#: builtin/rm.c:242

 msgid "do not list removed files"
 msgstr ""
 
 msgid "do not list removed files"
 msgstr ""
 

-#: builtin/rm.c:242
+#: builtin/rm.c:243

 msgid "only remove from the index"
 msgstr ""
 
 msgid "only remove from the index"
 msgstr ""
 

-#: builtin/rm.c:243
+#: builtin/rm.c:244

 msgid "override the up-to-date check"
 msgstr ""
 
 msgid "override the up-to-date check"
 msgstr ""
 

-#: builtin/rm.c:244
+#: builtin/rm.c:245

 msgid "allow recursive removal"
 msgstr ""
 
 msgid "allow recursive removal"
 msgstr ""
 

-#: builtin/rm.c:246
+#: builtin/rm.c:247

 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 

-#: builtin/rm.c:288
+#: builtin/rm.c:289

 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 

-#: builtin/rm.c:306
+#: builtin/rm.c:307

 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 

-#: builtin/rm.c:345
+#: builtin/rm.c:346

 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""


@@ -15856,7 +16773,7 @@ msgstr ""
 msgid "Linewrap output"
 msgstr ""
 
 msgid "Linewrap output"
 msgstr ""
 

-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301

 msgid "too many arguments given outside repository"
 msgstr ""
 
 msgid "too many arguments given outside repository"
 msgstr ""
 


@@ -16040,55 +16957,55 @@ msgstr ""
 msgid "git stripspace [-c | --comment-lines]"
 msgstr ""
 
 msgid "git stripspace [-c | --comment-lines]"
 msgstr ""
 

-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37

 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 

-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40

 msgid "prepend comment character and space to each line"
 msgstr ""
 
 msgid "prepend comment character and space to each line"
 msgstr ""
 

-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943

 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62

 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 

-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100

 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367

 msgid "alternative anchor for relative paths"
 msgstr ""
 
 msgid "alternative anchor for relative paths"
 msgstr ""
 

-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413

 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:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650

 #, 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 ""
 

-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522

 #, c-format
 msgid "Entering '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Entering '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525

 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 

-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:546

 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "


@@ -16096,338 +17013,338 @@ msgid ""
 "."
 msgstr ""
 
 "."
 msgstr ""
 

-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:562

 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:1048
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049

 msgid "Recurse into nested submodules"
 msgstr ""
 
 msgid "Recurse into nested submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:569

 msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
 msgstr ""
 
 msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
 msgstr ""
 

-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:596

 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 

-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:664

 #, 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:667
+#: builtin/submodule--helper.c:668

 #, 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:677
+#: builtin/submodule--helper.c:678

 #, 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:684
+#: builtin/submodule--helper.c:685

 #, 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:706
+#: builtin/submodule--helper.c:707

 msgid "Suppress output for initializing a submodule"
 msgstr ""
 
 msgid "Suppress output for initializing a submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:712

 msgid "git submodule--helper init [<path>]"
 msgstr ""
 
 msgid "git submodule--helper init [<path>]"
 msgstr ""
 

-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910

 #, 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:822
+#: builtin/submodule--helper.c:823

 #, 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:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019

 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185

 msgid "Suppress submodule status output"
 msgstr ""
 
 msgid "Suppress submodule status output"
 msgstr ""
 

-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:875

 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:875
+#: builtin/submodule--helper.c:876

 msgid "recurse into nested submodules"
 msgstr ""
 
 msgid "recurse into nested submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:881

 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:905

 msgid "git submodule--helper name <path>"
 msgstr ""
 
 msgid "git submodule--helper name <path>"
 msgstr ""
 

-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:969

 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:975

 #, 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:988
+#: builtin/submodule--helper.c:989

 #, 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:999
+#: builtin/submodule--helper.c:1000

 #, 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:1046
+#: builtin/submodule--helper.c:1047

 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 
 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 

-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1054

 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1108

 #, 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:1119
+#: builtin/submodule--helper.c:1120

 #, 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:1127
+#: builtin/submodule--helper.c:1128

 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1130

 #, 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:1138
+#: builtin/submodule--helper.c:1141

 #, 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:1154
+#: builtin/submodule--helper.c:1157

 #, 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:1183
+#: builtin/submodule--helper.c:1186

 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:1184
+#: builtin/submodule--helper.c:1187

 msgid "Unregister all submodules"
 msgstr ""
 
 msgid "Unregister all submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1192

 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1206

 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:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304

 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1340

 #, 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:1343
+#: builtin/submodule--helper.c:1347

 #, 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:1366
+#: builtin/submodule--helper.c:1370

 msgid "where the new submodule will be cloned to"
 msgstr ""
 
 msgid "where the new submodule will be cloned to"
 msgstr ""
 

-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1373

 msgid "name of the new submodule"
 msgstr ""
 
 msgid "name of the new submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1376

 msgid "url where to clone the submodule from"
 msgstr ""
 
 msgid "url where to clone the submodule from"
 msgstr ""
 

-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1384

 msgid "depth for shallow clones"
 msgstr ""
 
 msgid "depth for shallow clones"
 msgstr ""
 

-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872

 msgid "force cloning progress"
 msgstr ""
 
 msgid "force cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1392

 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:1419
+#: builtin/submodule--helper.c:1423

 #, 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:1433
+#: builtin/submodule--helper.c:1437

 #, 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:1469
+#: builtin/submodule--helper.c:1473

 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1477

 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1570

 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 

-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1574

 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 

-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1604

 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1633

 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1777

 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 

-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1788

 #, 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:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093

 msgid "path into the working tree"
 msgstr ""
 
 msgid "path into the working tree"
 msgstr ""
 

-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854

 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:1854
+#: builtin/submodule--helper.c:1858

 msgid "rebase, merge, checkout or none"
 msgstr ""
 
 msgid "rebase, merge, checkout or none"
 msgstr ""
 

-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864

 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:1863
+#: builtin/submodule--helper.c:1867

 msgid "parallel jobs"
 msgstr ""
 
 msgid "parallel jobs"
 msgstr ""
 

-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869

 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:1866
+#: builtin/submodule--helper.c:1870

 msgid "don't print cloning progress"
 msgstr ""
 
 msgid "don't print cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877

 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890

 msgid "bad value for update parameter"
 msgstr ""
 
 msgid "bad value for update parameter"
 msgstr ""
 

-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938

 #, 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:2057
+#: builtin/submodule--helper.c:2061

 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094

 msgid "recurse into submodules"
 msgstr ""
 
 msgid "recurse into submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:2096
+#: builtin/submodule--helper.c:2100

 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156

 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 

-#: builtin/submodule--helper.c:2157
+#: builtin/submodule--helper.c:2161

 msgid "git submodule--helper config name [value]"
 msgstr ""
 
 msgid "git submodule--helper config name [value]"
 msgstr ""
 

-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2162

 msgid "git submodule--helper config --check-writeable"
 msgstr ""
 
 msgid "git submodule--helper config --check-writeable"
 msgstr ""
 

-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2179 git-submodule.sh:169

 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 

-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2229 git.c:413 git.c:658

 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 

-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2235

 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""


@@ -16658,242 +17575,242 @@ msgstr ""
 msgid "Unpacking objects"
 msgstr ""
 
 msgid "Unpacking objects"
 msgstr ""
 

-#: builtin/update-index.c:82
+#: builtin/update-index.c:83

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

-#: builtin/update-index.c:98
+#: builtin/update-index.c:99

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

-#: builtin/update-index.c:106
+#: builtin/update-index.c:107

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

-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220

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

-#: builtin/update-index.c:138
+#: builtin/update-index.c:139

 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr ""
 
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr ""
 

-#: builtin/update-index.c:152
+#: builtin/update-index.c:153

 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 

-#: builtin/update-index.c:165
+#: builtin/update-index.c:166

 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 

-#: builtin/update-index.c:178
+#: builtin/update-index.c:179

 msgid "directory stat info changes after updating a file"
 msgstr ""
 
 msgid "directory stat info changes after updating a file"
 msgstr ""
 

-#: builtin/update-index.c:189
+#: builtin/update-index.c:190

 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 

-#: builtin/update-index.c:200
+#: builtin/update-index.c:201

 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 

-#: builtin/update-index.c:213
+#: builtin/update-index.c:214

 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 

-#: builtin/update-index.c:220
+#: builtin/update-index.c:221

 msgid " OK"
 msgstr ""
 
 msgid " OK"
 msgstr ""
 

-#: builtin/update-index.c:588
+#: builtin/update-index.c:589

 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 

-#: builtin/update-index.c:961
+#: builtin/update-index.c:962

 msgid "continue refresh even when index needs update"
 msgstr ""
 
 msgid "continue refresh even when index needs update"
 msgstr ""
 

-#: builtin/update-index.c:964
+#: builtin/update-index.c:965

 msgid "refresh: ignore submodules"
 msgstr ""
 
 msgid "refresh: ignore submodules"
 msgstr ""
 

-#: builtin/update-index.c:967
+#: builtin/update-index.c:968

 msgid "do not ignore new files"
 msgstr ""
 
 msgid "do not ignore new files"
 msgstr ""
 

-#: builtin/update-index.c:969
+#: builtin/update-index.c:970

 msgid "let files replace directories and vice-versa"
 msgstr ""
 
 msgid "let files replace directories and vice-versa"
 msgstr ""
 

-#: builtin/update-index.c:971
+#: builtin/update-index.c:972

 msgid "notice files missing from worktree"
 msgstr ""
 
 msgid "notice files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:973
+#: builtin/update-index.c:974

 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 

-#: builtin/update-index.c:976
+#: builtin/update-index.c:977

 msgid "refresh stat information"
 msgstr ""
 
 msgid "refresh stat information"
 msgstr ""
 

-#: builtin/update-index.c:980
+#: builtin/update-index.c:981

 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 

-#: builtin/update-index.c:984
+#: builtin/update-index.c:985

 msgid "<mode>,<object>,<path>"
 msgstr ""
 
 msgid "<mode>,<object>,<path>"
 msgstr ""
 

-#: builtin/update-index.c:985
+#: builtin/update-index.c:986

 msgid "add the specified entry to the index"
 msgstr ""
 
 msgid "add the specified entry to the index"
 msgstr ""
 

-#: builtin/update-index.c:994
+#: builtin/update-index.c:995

 msgid "mark files as \"not changing\""
 msgstr ""
 
 msgid "mark files as \"not changing\""
 msgstr ""
 

-#: builtin/update-index.c:997
+#: builtin/update-index.c:998

 msgid "clear assumed-unchanged bit"
 msgstr ""
 
 msgid "clear assumed-unchanged bit"
 msgstr ""
 

-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1001

 msgid "mark files as \"index-only\""
 msgstr ""
 
 msgid "mark files as \"index-only\""
 msgstr ""
 

-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1004

 msgid "clear skip-worktree bit"
 msgstr ""
 
 msgid "clear skip-worktree bit"
 msgstr ""
 

-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1007

 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:1008
+#: builtin/update-index.c:1009

 msgid "remove named paths even if present in worktree"
 msgstr ""
 
 msgid "remove named paths even if present in worktree"
 msgstr ""
 

-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1011

 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:1012
+#: builtin/update-index.c:1013

 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:1016
+#: builtin/update-index.c:1017

 msgid "add entries from standard input to the index"
 msgstr ""
 
 msgid "add entries from standard input to the index"
 msgstr ""
 

-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1021

 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:1024
+#: builtin/update-index.c:1025

 msgid "only update entries that differ from HEAD"
 msgstr ""
 
 msgid "only update entries that differ from HEAD"
 msgstr ""
 

-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1029

 msgid "ignore files missing from worktree"
 msgstr ""
 
 msgid "ignore files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1032

 msgid "report actions to standard output"
 msgstr ""
 
 msgid "report actions to standard output"
 msgstr ""
 

-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1034

 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 

-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1038

 msgid "write index in this format"
 msgstr ""
 
 msgid "write index in this format"
 msgstr ""
 

-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1040

 msgid "enable or disable split index"
 msgstr ""
 
 msgid "enable or disable split index"
 msgstr ""
 

-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1042

 msgid "enable/disable untracked cache"
 msgstr ""
 
 msgid "enable/disable untracked cache"
 msgstr ""
 

-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1044

 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 

-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1046

 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 

-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1048

 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:1049
+#: builtin/update-index.c:1050

 msgid "enable or disable file system monitor"
 msgstr ""
 
 msgid "enable or disable file system monitor"
 msgstr ""
 

-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1052

 msgid "mark files as fsmonitor valid"
 msgstr ""
 
 msgid "mark files as fsmonitor valid"
 msgstr ""
 

-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1055

 msgid "clear fsmonitor valid bit"
 msgstr ""
 
 msgid "clear fsmonitor valid bit"
 msgstr ""
 

-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1156

 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:1162
+#: builtin/update-index.c:1165

 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:1173
+#: builtin/update-index.c:1176

 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:1177
+#: builtin/update-index.c:1180

 msgid "Untracked cache disabled"
 msgstr ""
 
 msgid "Untracked cache disabled"
 msgstr ""
 

-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1188

 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:1189
+#: builtin/update-index.c:1192

 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 

-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1200

 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:1201
+#: builtin/update-index.c:1204

 msgid "fsmonitor enabled"
 msgstr ""
 
 msgid "fsmonitor enabled"
 msgstr ""
 

-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1207

 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:1208
+#: builtin/update-index.c:1211

 msgid "fsmonitor disabled"
 msgstr ""
 
 msgid "fsmonitor disabled"
 msgstr ""
 


@@ -16981,293 +17898,293 @@ msgstr ""
 msgid "print tag contents"
 msgstr ""
 
 msgid "print tag contents"
 msgstr ""
 

-#: builtin/worktree.c:17
+#: builtin/worktree.c:18

 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr ""
 
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr ""
 

-#: builtin/worktree.c:18
+#: builtin/worktree.c:19

 msgid "git worktree list [<options>]"
 msgstr ""
 
 msgid "git worktree list [<options>]"
 msgstr ""
 

-#: builtin/worktree.c:19
+#: builtin/worktree.c:20

 msgid "git worktree lock [<options>] <path>"
 msgstr ""
 
 msgid "git worktree lock [<options>] <path>"
 msgstr ""
 

-#: builtin/worktree.c:20
+#: builtin/worktree.c:21

 msgid "git worktree move <worktree> <new-path>"
 msgstr ""
 
 msgid "git worktree move <worktree> <new-path>"
 msgstr ""
 

-#: builtin/worktree.c:21
+#: builtin/worktree.c:22

 msgid "git worktree prune [<options>]"
 msgstr ""
 
 msgid "git worktree prune [<options>]"
 msgstr ""
 

-#: builtin/worktree.c:22
+#: builtin/worktree.c:23

 msgid "git worktree remove [<options>] <worktree>"
 msgstr ""
 
 msgid "git worktree remove [<options>] <worktree>"
 msgstr ""
 

-#: builtin/worktree.c:23
+#: builtin/worktree.c:24

 msgid "git worktree unlock <path>"
 msgstr ""
 
 msgid "git worktree unlock <path>"
 msgstr ""
 

-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:888

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

-#: builtin/worktree.c:79
+#: builtin/worktree.c:80

 #, 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:85
+#: builtin/worktree.c:86

 #, 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:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100

 #, 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:109
+#: builtin/worktree.c:110

 #, 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:117
+#: builtin/worktree.c:118

 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 

-#: builtin/worktree.c:126
+#: builtin/worktree.c:127

 #, 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:165
+#: builtin/worktree.c:166

 msgid "report pruned working trees"
 msgstr ""
 
 msgid "report pruned working trees"
 msgstr ""
 

-#: builtin/worktree.c:167
+#: builtin/worktree.c:168

 msgid "expire working trees older than <time>"
 msgstr ""
 
 msgid "expire working trees older than <time>"
 msgstr ""
 

-#: builtin/worktree.c:234
+#: builtin/worktree.c:235

 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 

-#: builtin/worktree.c:251
+#: builtin/worktree.c:252

 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr ""
 

-#: builtin/worktree.c:256
+#: builtin/worktree.c:257

 #, 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 ""
 
 #, 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
+#: builtin/worktree.c:259

 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 "use 'add -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
 #, 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
+#: builtin/worktree.c:310

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

-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:429 builtin/worktree.c:435

 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 

-#: builtin/worktree.c:430
+#: builtin/worktree.c:431

 #, 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:439
+#: builtin/worktree.c:440

 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 

-#: builtin/worktree.c:445
+#: builtin/worktree.c:446

 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 

-#: builtin/worktree.c:486
+#: builtin/worktree.c:487

 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:489
+#: builtin/worktree.c:490

 msgid "create a new branch"
 msgstr ""
 
 msgid "create a new branch"
 msgstr ""
 

-#: builtin/worktree.c:491
+#: builtin/worktree.c:492

 msgid "create or reset a branch"
 msgstr ""
 
 msgid "create or reset a branch"
 msgstr ""
 

-#: builtin/worktree.c:493
+#: builtin/worktree.c:494

 msgid "populate the new working tree"
 msgstr ""
 
 msgid "populate the new working tree"
 msgstr ""
 

-#: builtin/worktree.c:494
+#: builtin/worktree.c:495

 msgid "keep the new working tree locked"
 msgstr ""
 
 msgid "keep the new working tree locked"
 msgstr ""
 

-#: builtin/worktree.c:497
+#: builtin/worktree.c:498

 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 

-#: builtin/worktree.c:500
+#: builtin/worktree.c:501

 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:508
+#: builtin/worktree.c:509

 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 

-#: builtin/worktree.c:569
+#: builtin/worktree.c:570

 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:669
+#: builtin/worktree.c:670

 msgid "reason for locking"
 msgstr ""
 
 msgid "reason for locking"
 msgstr ""
 

-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789
+#: builtin/worktree.c:916

 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 

-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:684 builtin/worktree.c:717

 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:688
+#: builtin/worktree.c:689

 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 

-#: builtin/worktree.c:690
+#: builtin/worktree.c:691

 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 

-#: builtin/worktree.c:718
+#: builtin/worktree.c:719

 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 

-#: builtin/worktree.c:743
+#: builtin/worktree.c:760

 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:751
+#: builtin/worktree.c:768

 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 

-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:791 builtin/worktree.c:918

 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 

-#: builtin/worktree.c:779
+#: builtin/worktree.c:796

 #, 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:785
+#: builtin/worktree.c:802

 #, c-format
 msgid "target '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "target '%s' already exists"
 msgstr ""
 

-#: builtin/worktree.c:793
+#: builtin/worktree.c:810

 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 

-#: builtin/worktree.c:795
+#: builtin/worktree.c:812

 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 

-#: builtin/worktree.c:798
+#: builtin/worktree.c:815

 #, 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:803
+#: builtin/worktree.c:820

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

-#: builtin/worktree.c:851
+#: builtin/worktree.c:868

 #, 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:855
+#: builtin/worktree.c:872

 #, 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:860
+#: builtin/worktree.c:877

 #, 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:883
+#: builtin/worktree.c:900

 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 

-#: builtin/worktree.c:906
+#: builtin/worktree.c:923

 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 

-#: builtin/worktree.c:908
+#: builtin/worktree.c:925

 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 

-#: builtin/worktree.c:911
+#: builtin/worktree.c:928

 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 

-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15

 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr ""
 
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr ""
 

-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28

 msgid "<prefix>/"
 msgstr ""
 
 msgid "<prefix>/"
 msgstr ""
 

-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29

 msgid "write tree object for a subdirectory <prefix>"
 msgstr ""
 
 msgid "write tree object for a subdirectory <prefix>"
 msgstr ""
 

-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31

 msgid "only useful for debugging"
 msgstr ""
 
 msgid "only useful for debugging"
 msgstr ""
 

-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223

 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"


@@ -17276,7 +18193,7 @@ msgid ""
 "\tchmod 0700 %s"
 msgstr ""
 
 "\tchmod 0700 %s"
 msgstr ""
 

-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272

 msgid "print debugging messages to stderr"
 msgstr ""
 
 msgid "print debugging messages to stderr"
 msgstr ""
 


@@ -17306,93 +18223,139 @@ msgid ""
 "to read about a specific subcommand or concept."
 msgstr ""
 
 "to read about a specific subcommand or concept."
 msgstr ""
 

-#: git.c:173
+#: git.c:174

 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr ""
 
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr ""
 

-#: git.c:187
+#: git.c:188

 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr ""
 
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr ""
 

-#: git.c:201
+#: git.c:202

 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr ""
 
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr ""
 

-#: git.c:215
+#: git.c:216

 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr ""
 
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr ""
 

-#: git.c:237
+#: git.c:238

 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr ""
 
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr ""
 

-#: git.c:275
+#: git.c:276

 #, c-format
 msgid "no directory given for -C\n"
 msgstr ""
 
 #, c-format
 msgid "no directory given for -C\n"
 msgstr ""
 

-#: git.c:300
+#: git.c:301

 #, c-format
 msgid "unknown option: %s\n"
 msgstr ""
 
 #, c-format
 msgid "unknown option: %s\n"
 msgstr ""
 

-#: git.c:719
+#: git.c:342
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:351
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#: git.c:359
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:362
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:437
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:439
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:441
+msgid "close failed on standard output"
+msgstr ""
+
+#: git.c:720

 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 

-#: git.c:802
+#: git.c:770
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:783
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+
+#: git.c:803

 #, 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:814
+#: git.c:815

 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 

-#: http.c:374
+#: http.c:378

 #, 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:395
+#: http.c:399

 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:404
+#: http.c:408

 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:837
+#: http.c:876

 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr ""
 
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr ""
 

-#: http.c:910
+#: http.c:949

 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr ""
 
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr ""
 

-#: http.c:1046
+#: http.c:1085

 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 

-#: http.c:1053
+#: http.c:1092

 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 

-#: http.c:1057
+#: http.c:1096

 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 

-#: http.c:1921
+#: http.c:1959

 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"


@@ -17400,19 +18363,11 @@ msgid ""
 "   redirect: %s"
 msgstr ""
 
 "   redirect: %s"
 msgstr ""
 

-#: remote-curl.c:401
+#: remote-curl.c:455

 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 
 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 

-#: list-objects-filter-options.h:60
-msgid "args"
-msgstr ""
-
-#: list-objects-filter-options.h:61
-msgid "object filtering"
-msgstr ""
-

 #: parse-options.h:154
 msgid "expiry-date"
 msgstr ""
 #: parse-options.h:154
 msgid "expiry-date"
 msgstr ""


@@ -17421,15 +18376,15 @@ msgstr ""
 msgid "no-op (backward compatibility)"
 msgstr ""
 
 msgid "no-op (backward compatibility)"
 msgstr ""
 

-#: parse-options.h:261
+#: parse-options.h:259

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

-#: parse-options.h:263
+#: parse-options.h:261

 msgid "be more quiet"
 msgstr ""
 
 msgid "be more quiet"
 msgstr ""
 

-#: parse-options.h:269
+#: parse-options.h:267

 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 
 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 


@@ -18069,6 +19024,14 @@ msgstr ""
 msgid "An overview of recommended workflows with Git"
 msgstr ""
 
 msgid "An overview of recommended workflows with Git"
 msgstr ""
 

+#: list-objects-filter-options.h:63
+msgid "args"
+msgstr ""
+
+#: list-objects-filter-options.h:64
+msgid "object filtering"
+msgstr ""
+

 #: rerere.h:44
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 #: rerere.h:44
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""


@@ -18084,160 +19047,72 @@ msgstr ""
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr ""
 
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr ""
 

-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr ""
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr ""
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr ""
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr ""
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr ""
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr ""
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101

 #, sh-format
 msgid "Bad rev input: $arg"
 msgstr ""
 
 #, sh-format
 msgid "Bad rev input: $arg"
 msgstr ""
 

-#: git-bisect.sh:265
+#: git-bisect.sh:121

 #, sh-format
 msgid "Bad rev input: $bisected_head"
 msgstr ""
 
 #, sh-format
 msgid "Bad rev input: $bisected_head"
 msgstr ""
 

-#: git-bisect.sh:274
+#: git-bisect.sh:130

 #, sh-format
 msgid "Bad rev input: $rev"
 msgstr ""
 
 #, sh-format
 msgid "Bad rev input: $rev"
 msgstr ""
 

-#: git-bisect.sh:283
+#: git-bisect.sh:139

 #, sh-format
 msgid "'git bisect $TERM_BAD' can take only one argument."
 msgstr ""
 
 #, sh-format
 msgid "'git bisect $TERM_BAD' can take only one argument."
 msgstr ""
 

-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr ""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr ""
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr ""
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr ""
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209

 msgid "No logfile given"
 msgstr ""
 
 msgid "No logfile given"
 msgstr ""
 

-#: git-bisect.sh:423
+#: git-bisect.sh:210

 #, sh-format
 msgid "cannot read $file for replaying"
 msgstr ""
 
 #, sh-format
 msgid "cannot read $file for replaying"
 msgstr ""
 

-#: git-bisect.sh:444
+#: git-bisect.sh:232

 msgid "?? what are you talking about?"
 msgstr ""
 
 msgid "?? what are you talking about?"
 msgstr ""
 

-#: git-bisect.sh:453
+#: git-bisect.sh:241

 msgid "bisect run failed: no command provided."
 msgstr ""
 
 msgid "bisect run failed: no command provided."
 msgstr ""
 

-#: git-bisect.sh:458
+#: git-bisect.sh:246

 #, sh-format
 msgid "running $command"
 msgstr ""
 
 #, sh-format
 msgid "running $command"
 msgstr ""
 

-#: git-bisect.sh:465
+#: git-bisect.sh:253

 #, sh-format
 msgid ""
 "bisect run failed:\n"
 "exit code $res from '$command' is < 0 or >= 128"
 msgstr ""
 
 #, sh-format
 msgid ""
 "bisect run failed:\n"
 "exit code $res from '$command' is < 0 or >= 128"
 msgstr ""
 

-#: git-bisect.sh:491
+#: git-bisect.sh:279

 msgid "bisect run cannot continue any more"
 msgstr ""
 
 msgid "bisect run cannot continue any more"
 msgstr ""
 

-#: git-bisect.sh:497
+#: git-bisect.sh:285

 #, sh-format
 msgid ""
 "bisect run failed:\n"
 "'bisect_state $state' exited with error code $res"
 msgstr ""
 
 #, sh-format
 msgid ""
 "bisect run failed:\n"
 "'bisect_state $state' exited with error code $res"
 msgstr ""
 

-#: git-bisect.sh:504
+#: git-bisect.sh:292

 msgid "bisect run success"
 msgstr ""
 
 msgid "bisect run success"
 msgstr ""
 

-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr ""
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."

 msgstr ""
 
 #: git-merge-octopus.sh:46
 msgstr ""
 
 #: git-merge-octopus.sh:46


@@ -18278,12 +19153,12 @@ msgstr ""
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 

-#: git-legacy-rebase.sh:434
+#: git-legacy-rebase.sh:445

 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 

-#: git-legacy-rebase.sh:460
+#: git-legacy-rebase.sh:471

 #, 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"


@@ -18296,212 +19171,229 @@ msgid ""
 "valuable there."
 msgstr ""
 
 "valuable there."
 msgstr ""
 

-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+#: git-legacy-rebase.sh:523
+msgid ""
+"fatal: cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: git-legacy-rebase.sh:530
+msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+msgstr ""
+
+#: git-legacy-rebase.sh:541
+msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: git-legacy-rebase.sh:550
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: git-legacy-rebase.sh:552
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"

 msgstr ""
 
 msgstr ""
 

-#: git-legacy-rebase.sh:570
+#: git-legacy-rebase.sh:578

 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 

-#: git-legacy-rebase.sh:594
+#: git-legacy-rebase.sh:602

 #, 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-legacy-rebase.sh:597 git-legacy-rebase.sh:601
+#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609

 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 

-#: git-legacy-rebase.sh:606
+#: git-legacy-rebase.sh:614

 #, 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-legacy-rebase.sh:632
+#: git-legacy-rebase.sh:640

 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 

-#: git-legacy-rebase.sh:670
+#: git-legacy-rebase.sh:678

 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 

-#: git-legacy-rebase.sh:699
+#: git-legacy-rebase.sh:707

 #, 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-legacy-rebase.sh:709
+#: git-legacy-rebase.sh:717

 #, 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-legacy-rebase.sh:723
+#: git-legacy-rebase.sh:731

 #, sh-format
 msgid "Changes to $onto:"
 msgstr ""
 
 #, sh-format
 msgid "Changes to $onto:"
 msgstr ""
 

-#: git-legacy-rebase.sh:725
+#: git-legacy-rebase.sh:733

 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 

-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-
-#: git-legacy-rebase.sh:746
+#: git-legacy-rebase.sh:743

 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 

-#: git-stash.sh:61
+#: git-legacy-rebase.sh:757
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr ""
+
+#: git-stash.sh:75

 msgid "git stash clear with parameters is unimplemented"
 msgstr ""
 
 msgid "git stash clear with parameters is unimplemented"
 msgstr ""
 

-#: git-stash.sh:108
+#: git-stash.sh:125

 msgid "You do not have the initial commit yet"
 msgstr ""
 
 msgid "You do not have the initial commit yet"
 msgstr ""
 

-#: git-stash.sh:123
+#: git-stash.sh:140

 msgid "Cannot save the current index state"
 msgstr ""
 
 msgid "Cannot save the current index state"
 msgstr ""
 

-#: git-stash.sh:138
+#: git-stash.sh:155

 msgid "Cannot save the untracked files"
 msgstr ""
 
 msgid "Cannot save the untracked files"
 msgstr ""
 

-#: git-stash.sh:158 git-stash.sh:171
+#: git-stash.sh:175 git-stash.sh:188

 msgid "Cannot save the current worktree state"
 msgstr ""
 
 msgid "Cannot save the current worktree state"
 msgstr ""
 

-#: git-stash.sh:175
+#: git-stash.sh:192

 msgid "No changes selected"
 msgstr ""
 
 msgid "No changes selected"
 msgstr ""
 

-#: git-stash.sh:178
+#: git-stash.sh:195

 msgid "Cannot remove temporary index (can't happen)"
 msgstr ""
 
 msgid "Cannot remove temporary index (can't happen)"
 msgstr ""
 

-#: git-stash.sh:191
+#: git-stash.sh:208

 msgid "Cannot record working tree state"
 msgstr ""
 
 msgid "Cannot record working tree state"
 msgstr ""
 

-#: git-stash.sh:229
+#: git-stash.sh:246

 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""
 
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""
 

-#: git-stash.sh:281
+#: git-stash.sh:298

 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr ""
 
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr ""
 

-#: git-stash.sh:295
+#: git-stash.sh:312

 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 

-#: git-stash.sh:303
+#: git-stash.sh:320

 msgid "No local changes to save"
 msgstr ""
 
 msgid "No local changes to save"
 msgstr ""
 

-#: git-stash.sh:308
+#: git-stash.sh:325

 msgid "Cannot initialize stash"
 msgstr ""
 
 msgid "Cannot initialize stash"
 msgstr ""
 

-#: git-stash.sh:312
+#: git-stash.sh:329

 msgid "Cannot save the current status"
 msgstr ""
 
 msgid "Cannot save the current status"
 msgstr ""
 

-#: git-stash.sh:313
+#: git-stash.sh:330

 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 

-#: git-stash.sh:342
+#: git-stash.sh:359

 msgid "Cannot remove worktree changes"
 msgstr ""
 
 msgid "Cannot remove worktree changes"
 msgstr ""
 

-#: git-stash.sh:490
+#: git-stash.sh:507

 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 
 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 

-#: git-stash.sh:503
+#: git-stash.sh:520

 msgid "No stash entries found."
 msgstr ""
 
 msgid "No stash entries found."
 msgstr ""
 

-#: git-stash.sh:510
+#: git-stash.sh:527

 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 

-#: git-stash.sh:525
+#: git-stash.sh:542

 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 

-#: git-stash.sh:553
+#: git-stash.sh:570

 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr ""
 
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr ""
 

-#: git-stash.sh:564
+#: git-stash.sh:581

 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 

-#: git-stash.sh:572
+#: git-stash.sh:589

 msgid "unable to refresh index"
 msgstr ""
 
 msgid "unable to refresh index"
 msgstr ""
 

-#: git-stash.sh:576
+#: git-stash.sh:593

 msgid "Cannot apply a stash in the middle of a merge"
 msgstr ""
 
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr ""
 

-#: git-stash.sh:584
+#: git-stash.sh:601

 msgid "Conflicts in index. Try without --index."
 msgstr ""
 
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 

-#: git-stash.sh:586
+#: git-stash.sh:603

 msgid "Could not save index tree"
 msgstr ""
 
 msgid "Could not save index tree"
 msgstr ""
 

-#: git-stash.sh:595
+#: git-stash.sh:612

 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 

-#: git-stash.sh:620
+#: git-stash.sh:637

 msgid "Cannot unstage modified files"
 msgstr ""
 
 msgid "Cannot unstage modified files"
 msgstr ""
 

-#: git-stash.sh:635
+#: git-stash.sh:652

 msgid "Index was not unstashed."
 msgstr ""
 
 msgid "Index was not unstashed."
 msgstr ""
 

-#: git-stash.sh:649
+#: git-stash.sh:666

 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 

-#: git-stash.sh:658
+#: git-stash.sh:675

 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 

-#: git-stash.sh:659
+#: git-stash.sh:676

 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 

-#: git-stash.sh:667
+#: git-stash.sh:684

 msgid "No branch name specified"
 msgstr ""
 
 msgid "No branch name specified"
 msgstr ""
 

-#: git-stash.sh:746
+#: git-stash.sh:763

 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""