l10n: git.pot: v2.17.0 round 1 (132 new, 44 removed)

Generate po/git.pot from v2.17.0-rc0 for git v2.17.0 l10n round 1.

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

diff --git a/po/git.pot b/po/git.pot
index e36d187970974ddf7aafecd708d32e97d15dae39..ab5d1796712b7317bf400cdd49608f13912044fe 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-01-07 07:50+0800\n"
+"POT-Creation-Date: 2018-03-16 07:29+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"


@@ -58,7 +58,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 
 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 

-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251

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


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

-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

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


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

-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

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


@@ -572,11 +572,11 @@ msgstr[1] ""
 msgid "Unable to write new index file"
 msgstr ""
 
 msgid "Unable to write new index file"
 msgstr ""
 

-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

 #: git-add--interactive.perl:197
 msgid "path"
 msgstr ""
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr ""


@@ -589,7 +589,7 @@ msgstr ""
 msgid "apply changes matching the given path"
 msgstr ""
 
 msgid "apply changes matching the given path"
 msgstr ""
 

-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263

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


@@ -629,75 +629,75 @@ msgstr ""
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 

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

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

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

 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:4953
+#: apply.c:4954

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

-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

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

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

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

-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

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

-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035

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

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

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

-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967

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

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

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

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

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

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

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

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

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

-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

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

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

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

 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:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251

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

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

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


@@ -731,7 +731,7 @@ msgstr ""
 msgid "archive format"
 msgstr ""
 
 msgid "archive format"
 msgstr ""
 

-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462

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


@@ -739,11 +739,11 @@ msgstr ""
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 

-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

-#: parse-options.h:153
+#: parse-options.h:165

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


@@ -775,8 +775,8 @@ msgstr ""
 msgid "list supported archive formats"
 msgstr ""
 
 msgid "list supported archive formats"
 msgstr ""
 

-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

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


@@ -825,43 +825,43 @@ msgid ""
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 

-#: bisect.c:458
+#: bisect.c:460

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

-#: bisect.c:666
+#: bisect.c:668

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

-#: bisect.c:720
+#: bisect.c:722

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

-#: bisect.c:744
+#: bisect.c:746

 #, 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:749
+#: bisect.c:751

 #, 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:754
+#: bisect.c:756

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

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


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

-#: bisect.c:775
+#: bisect.c:777

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


@@ -882,38 +882,38 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 

-#: bisect.c:862
+#: bisect.c:850

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

-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

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

-#: bisect.c:930
+#: bisect.c:920

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

-#: bisect.c:960
+#: bisect.c:950

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

-#: bisect.c:979
+#: bisect.c:969

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

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

 #, 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:1006
+#: bisect.c:996

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


@@ -923,43 +923,43 @@ 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:1012
+#: bisect.c:1002

 #, 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:1757
+#: blame.c:1758

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

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

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

-#: blame.c:1788
+#: blame.c:1789

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

-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

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

-#: blame.c:1815
+#: blame.c:1816

 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:1826
+#: blame.c:1827

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

-#: blame.c:1837
+#: blame.c:1838

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


@@ -1098,76 +1098,75 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 

-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

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

-#: bundle.c:140
+#: bundle.c:139

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

-#: bundle.c:193
+#: bundle.c:190

 #, 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:200
+#: bundle.c:197

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

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

 #, 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:261
+#: bundle.c:258

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

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

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

-#: bundle.c:314
+#: bundle.c:311

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

-#: bundle.c:363
+#: bundle.c:360

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

-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

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

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

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

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

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

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

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

-#: color.c:301
+#: color.c:296

 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
 
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
 

-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072

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


@@ -1177,7 +1176,7 @@ msgstr ""
 msgid "%s %s is not a commit!"
 msgstr ""
 
 msgid "%s %s is not a commit!"
 msgstr ""
 

-#: commit.c:1524
+#: commit.c:1506

 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
 msgid ""
 "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"


@@ -1280,65 +1279,65 @@ msgstr ""
 msgid "bad zlib compression level %d"
 msgstr ""
 
 msgid "bad zlib compression level %d"
 msgstr ""
 

-#: config.c:1222
+#: config.c:1225

 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr ""
 

-#: config.c:1378
+#: config.c:1386

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

-#: config.c:1574
+#: config.c:1582

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

-#: config.c:1906
+#: config.c:1914

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

-#: config.c:2093
+#: config.c:2101

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

-#: config.c:2136
+#: config.c:2144

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

-#: config.c:2162
+#: config.c:2170

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

-#: config.c:2187
+#: config.c:2195

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

-#: config.c:2189
+#: config.c:2197

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

-#: config.c:2248
+#: config.c:2256

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

-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816

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

-#: config.c:2698
+#: config.c:2706

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

-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776

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


@@ -1355,46 +1354,46 @@ msgid ""
 "and the repository exists."
 msgstr ""
 
 "and the repository exists."
 msgstr ""
 

-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

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

-#: connected.c:76
+#: connected.c:78

 msgid "Could not run 'git rev-list'"
 msgstr ""
 
 msgid "Could not run 'git rev-list'"
 msgstr ""
 

-#: connected.c:96
+#: connected.c:98

 msgid "failed write to rev-list"
 msgstr ""
 
 msgid "failed write to rev-list"
 msgstr ""
 

-#: connected.c:103
+#: connected.c:105

 msgid "failed to close rev-list's stdin"
 msgstr ""
 
 #: convert.c:205
 #, c-format
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
 #: convert.c:205
 #, c-format

+msgid "CRLF would be replaced by LF in %s."
+msgstr ""
+
+#: convert.c:207
+#, 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 ""
 
 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:209
+#: convert.c:215

 #, c-format
 #, c-format

-msgid "CRLF would be replaced by LF in %s."
+msgid "LF would be replaced by CRLF in %s"

 msgstr ""
 
 msgstr ""
 

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

 #, 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:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr ""
-

 #: date.c:116
 msgid "in the future"
 msgstr ""
 #: date.c:116
 msgid "in the future"
 msgstr ""


@@ -1505,59 +1504,68 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: diff.c:3799
+#: diff.c:3822

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

-#: diff.c:4127
+#: diff.c:4146

 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:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr ""
+
+#: diff.c:4237

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

-#: diff.c:4381
+#: diff.c:4403

 #, 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:4395
+#: diff.c:4417

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

-#: diff.c:5446
+#: diff.c:5493

 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:5449
+#: diff.c:5496

 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:5452
+#: diff.c:5499

 #, 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:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr ""
+
+#: dir.c:2108

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

-#: dir.c:2219
+#: dir.c:2232

 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 

-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029

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

-#: dir.c:3032
+#: dir.c:3054

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


@@ -1576,184 +1584,192 @@ msgstr ""
 msgid "could not stat file '%s'"
 msgstr ""
 
 msgid "could not stat file '%s'"
 msgstr ""
 

-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr ""
+
+#: fetch-pack.c:253

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

-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

 msgstr ""
 
 msgstr ""
 

-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63

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

-#: fetch-pack.c:284
+#: fetch-pack.c:285

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

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

-#: fetch-pack.c:422
+#: fetch-pack.c:428

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

-#: fetch-pack.c:428
+#: fetch-pack.c:434

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

-#: fetch-pack.c:430
+#: fetch-pack.c:436

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

-#: fetch-pack.c:433
+#: fetch-pack.c:439

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

-#: fetch-pack.c:435
+#: fetch-pack.c:441

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

-#: fetch-pack.c:438
+#: fetch-pack.c:444

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

-#: fetch-pack.c:477
+#: fetch-pack.c:485

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

-#: fetch-pack.c:491
+#: fetch-pack.c:499

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

-#: fetch-pack.c:524
+#: fetch-pack.c:532

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

-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229

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

-#: fetch-pack.c:546
+#: fetch-pack.c:554

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

-#: fetch-pack.c:592
+#: fetch-pack.c:600

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

-#: fetch-pack.c:777
+#: fetch-pack.c:788

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

-#: fetch-pack.c:815
+#: fetch-pack.c:829

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

-#: fetch-pack.c:823
+#: fetch-pack.c:837

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

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

 #, 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:911

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

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

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

-#: fetch-pack.c:924
+#: fetch-pack.c:940

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

-#: fetch-pack.c:928
+#: fetch-pack.c:944

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

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

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

-#: fetch-pack.c:937
+#: fetch-pack.c:953

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

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

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

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

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

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

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

-#: fetch-pack.c:953
+#: fetch-pack.c:969

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

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

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

-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:993

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

-#: fetch-pack.c:976
+#: fetch-pack.c:999

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

-#: fetch-pack.c:980
+#: fetch-pack.c:1003

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

-#: fetch-pack.c:982
+#: fetch-pack.c:1005

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

-#: fetch-pack.c:993
+#: fetch-pack.c:1016

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

-#: fetch-pack.c:1005
+#: fetch-pack.c:1028

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

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

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

-#: fetch-pack.c:1189
+#: fetch-pack.c:1212

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

-#: fetch-pack.c:1192
+#: fetch-pack.c:1215

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


@@ -1776,17 +1792,18 @@ msgstr ""
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr ""
 
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr ""
 

-#: grep.c:2017
+#: grep.c:2022

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

-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134

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

-#: grep.c:2045
+#: grep.c:2050

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


@@ -1907,18 +1924,17 @@ msgstr ""
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 

-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582

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

-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"

 msgstr ""
 
 msgstr ""
 

-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"

 msgstr ""
 
 #: lockfile.c:151
 msgstr ""
 
 #: lockfile.c:151


@@ -1942,8 +1958,8 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr ""
 
 msgid "failed to read the cache"
 msgstr ""
 

-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759

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


@@ -1960,239 +1976,239 @@ msgstr ""
 msgid "error building trees"
 msgstr ""
 
 msgid "error building trees"
 msgstr ""
 

-#: merge-recursive.c:752
+#: merge-recursive.c:771

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

-#: merge-recursive.c:763
+#: merge-recursive.c:782

 #, 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:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815

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

-#: merge-recursive.c:786
+#: merge-recursive.c:805

 #, 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:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37

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

-#: merge-recursive.c:830
+#: merge-recursive.c:849

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

-#: merge-recursive.c:854
+#: merge-recursive.c:873

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

-#: merge-recursive.c:865
+#: merge-recursive.c:884

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

-#: merge-recursive.c:870
+#: merge-recursive.c:889

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

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

-#: merge-recursive.c:1014
+#: merge-recursive.c:1034

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

-#: merge-recursive.c:1117
+#: merge-recursive.c:1146

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

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

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

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

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

-#: merge-recursive.c:1168
+#: merge-recursive.c:1197

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

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

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

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

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

-#: merge-recursive.c:1317
+#: merge-recursive.c:1346

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

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

-#: merge-recursive.c:1553
+#: merge-recursive.c:1582

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

-#: merge-recursive.c:1568
+#: merge-recursive.c:1597

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

-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834

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

-#: merge-recursive.c:1632
+#: merge-recursive.c:1661

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

-#: merge-recursive.c:1635
+#: merge-recursive.c:1664

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

-#: merge-recursive.c:1704
+#: merge-recursive.c:1733

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

-#: merge-recursive.c:1704
+#: merge-recursive.c:1733

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

-#: merge-recursive.c:1714
+#: merge-recursive.c:1743

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

-#: merge-recursive.c:1721
+#: merge-recursive.c:1750

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

-#: merge-recursive.c:1757
+#: merge-recursive.c:1786

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

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

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

-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879

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

-#: merge-recursive.c:1776
+#: merge-recursive.c:1805

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

-#: merge-recursive.c:1870
+#: merge-recursive.c:1899

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

-#: merge-recursive.c:1896
+#: merge-recursive.c:1925

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

-#: merge-recursive.c:1902
+#: merge-recursive.c:1931

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

-#: merge-recursive.c:1909
+#: merge-recursive.c:1938

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

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

-#: merge-recursive.c:1958
+#: merge-recursive.c:1987

 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr ""
 
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr ""
 

-#: merge-recursive.c:1962
+#: merge-recursive.c:1991

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

-#: merge-recursive.c:1971
+#: merge-recursive.c:2000

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

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

-#: merge-recursive.c:2081
+#: merge-recursive.c:2110

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

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

-#: merge-recursive.c:2183
+#: merge-recursive.c:2212

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

-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

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


@@ -2209,16 +2225,16 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
 
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
 

-#: notes-utils.c:42
+#: notes-utils.c:43

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

-#: notes-utils.c:101
+#: notes-utils.c:102

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

-#: notes-utils.c:111
+#: notes-utils.c:112

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


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

-#: notes-utils.c:141
+#: notes-utils.c:142

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


@@ -2237,25 +2253,25 @@ msgstr ""
 msgid "unable to parse object: %s"
 msgstr ""
 
 msgid "unable to parse object: %s"
 msgstr ""
 

-#: packfile.c:556
+#: packfile.c:561

 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 

-#: packfile.c:1683
+#: packfile.c:1694

 #, 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:1687
+#: packfile.c:1698

 #, 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:573
+#: parse-options.c:619

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

-#: parse-options.c:592
+#: parse-options.c:638

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


@@ -2263,17 +2279,17 @@ 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:598
+#: parse-options.c:644

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

-#: parse-options.c:601
+#: parse-options.c:647

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

-#: parse-options.c:640
+#: parse-options.c:686

 msgid "-NUM"
 msgstr ""
 
 msgid "-NUM"
 msgstr ""
 


@@ -2362,36 +2378,36 @@ msgstr ""
 msgid "unable to parse --pretty format"
 msgstr ""
 
 msgid "unable to parse --pretty format"
 msgstr ""
 

-#: read-cache.c:1472
+#: read-cache.c:1473

 #, 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:1482
+#: read-cache.c:1483

 #, 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:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

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

-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

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

-#: read-cache.c:2455
+#: read-cache.c:2461

 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 

-#: read-cache.c:2467
+#: read-cache.c:2473

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


@@ -2410,18 +2426,18 @@ msgstr ""
 msgid "could not remove reference %s"
 msgstr ""
 
 msgid "could not remove reference %s"
 msgstr ""
 

-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538

 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 

-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541

 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
 
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
 

-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842

 msgid "gone"
 msgstr ""
 
 msgid "gone"
 msgstr ""
 


@@ -2615,128 +2631,138 @@ msgstr ""
 msgid "(no branch)"
 msgstr ""
 
 msgid "(no branch)"
 msgstr ""
 

-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364

 #, 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:1522
+#: ref-filter.c:1367

 #, 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:1822
+#: ref-filter.c:1819

 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 

-#: ref-filter.c:1889
+#: ref-filter.c:1886

 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 

-#: ref-filter.c:1894
+#: ref-filter.c:1891

 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 

-#: ref-filter.c:2156
+#: ref-filter.c:2152

 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 

-#: ref-filter.c:2250
+#: ref-filter.c:2246

 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 

-#: remote.c:780
+#: remote.c:795

 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 

-#: remote.c:784
+#: remote.c:799

 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 

-#: remote.c:788
+#: remote.c:803

 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 

-#: remote.c:796
+#: remote.c:811

 msgid "Internal error"
 msgstr ""
 
 msgid "Internal error"
 msgstr ""
 

-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828

 msgid "HEAD does not point to a branch"
 msgstr ""
 
 msgid "HEAD does not point to a branch"
 msgstr ""
 

-#: remote.c:1720
+#: remote.c:1735

 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 
 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 

-#: remote.c:1723
+#: remote.c:1738

 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 

-#: remote.c:1729
+#: remote.c:1744

 #, 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:1744
+#: remote.c:1759

 #, 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:1756
+#: remote.c:1771

 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 

-#: remote.c:1767
+#: remote.c:1782

 #, 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:1780
+#: remote.c:1795

 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 

-#: remote.c:1802
+#: remote.c:1817

 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 

-#: remote.c:2106
+#: remote.c:2132

 #, 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:2110
+#: remote.c:2136

 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 

-#: remote.c:2113
+#: remote.c:2139

 #, 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:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr ""
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr ""
+
+#: remote.c:2150

 #, 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:2123
+#: remote.c:2156

 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 

-#: remote.c:2126
+#: remote.c:2159

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


@@ -2744,11 +2770,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:2134
+#: remote.c:2167

 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 

-#: remote.c:2137
+#: remote.c:2170

 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"


@@ -2759,28 +2785,28 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:2147
+#: remote.c:2180

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

-#: revision.c:2268
+#: revision.c:2277

 msgid "your current branch appears to be broken"
 msgstr ""
 
 msgid "your current branch appears to be broken"
 msgstr ""
 

-#: revision.c:2271
+#: revision.c:2280

 #, 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:2465
+#: revision.c:2477

 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 
 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 

-#: run-command.c:645
+#: run-command.c:731

 msgid "open /dev/null failed"
 msgstr ""
 
 msgid "open /dev/null failed"
 msgstr ""
 

-#: run-command.c:1188
+#: run-command.c:1274

 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"


@@ -2788,104 +2814,113 @@ msgid ""
 msgstr ""
 
 #: send-pack.c:141
 msgstr ""
 
 #: send-pack.c:141

+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+
+#: 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:143
+#: send-pack.c:145

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

-#: send-pack.c:306
+#: send-pack.c:308

 msgid "failed to sign the push certificate"
 msgstr ""
 
 msgid "failed to sign the push certificate"
 msgstr ""
 

-#: send-pack.c:419
+#: send-pack.c:421

 msgid "the receiving end does not support --signed push"
 msgstr ""
 
 msgid "the receiving end does not support --signed push"
 msgstr ""
 

-#: send-pack.c:421
+#: send-pack.c:423

 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 

-#: send-pack.c:433
+#: send-pack.c:435

 msgid "the receiving end does not support --atomic push"
 msgstr ""
 
 msgid "the receiving end does not support --atomic push"
 msgstr ""
 

-#: send-pack.c:438
+#: send-pack.c:440

 msgid "the receiving end does not support push options"
 msgstr ""
 
 msgid "the receiving end does not support push options"
 msgstr ""
 

-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr ""
+
+#: sequencer.c:267

 msgid "revert"
 msgstr ""
 
 msgid "revert"
 msgstr ""
 

-#: sequencer.c:220
+#: sequencer.c:269

 msgid "cherry-pick"
 msgstr ""
 
 msgid "cherry-pick"
 msgstr ""
 

-#: sequencer.c:222
+#: sequencer.c:271

 msgid "rebase -i"
 msgstr ""
 
 msgid "rebase -i"
 msgstr ""
 

-#: sequencer.c:224
+#: sequencer.c:273

 #, c-format
 msgid "Unknown action: %d"
 msgstr ""
 
 #, c-format
 msgid "Unknown action: %d"
 msgstr ""
 

-#: sequencer.c:281
+#: sequencer.c:330

 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:284
+#: sequencer.c:333

 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:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245

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

-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

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

-#: sequencer.c:304
+#: sequencer.c:353

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

-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

 #, c-format
 #, c-format

-msgid "failed to finalize '%s'."
+msgid "failed to finalize '%s'"

 msgstr ""
 
 msgstr ""
 

-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047

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

-#: sequencer.c:358
+#: sequencer.c:405

 #, 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:362
+#: sequencer.c:409

 msgid "commit your changes or stash them to proceed."
 msgstr ""
 
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 

-#: sequencer.c:391
+#: sequencer.c:438

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


@@ -2893,20 +2928,20 @@ msgstr ""
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.

-#: sequencer.c:477
+#: sequencer.c:526

 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 

-#: sequencer.c:496
+#: sequencer.c:542

 msgid "could not resolve HEAD commit"
 msgstr ""
 
 msgid "could not resolve HEAD commit"
 msgstr ""
 

-#: sequencer.c:516
+#: sequencer.c:562

 msgid "unable to update cache tree"
 msgstr ""
 
 msgid "unable to update cache tree"
 msgstr ""
 

-#: sequencer.c:600
+#: sequencer.c:658

 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"


@@ -2923,17 +2958,101 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr ""
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr ""
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr ""
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr ""
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr ""
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr ""
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr ""
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr ""
+
+#: sequencer.c:1213

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

-#: sequencer.c:707
+#: sequencer.c:1218

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

-#: sequencer.c:836
+#: sequencer.c:1347

 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"


@@ -2941,7 +3060,7 @@ msgid ""
 "\t%.*s"
 msgstr ""
 
 "\t%.*s"
 msgstr ""
 

-#: sequencer.c:842
+#: sequencer.c:1353

 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"


@@ -2949,240 +3068,244 @@ msgid ""
 "\t%.*s"
 msgstr ""
 
 "\t%.*s"
 msgstr ""
 

-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384

 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 

-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265

 msgid "need a HEAD to fixup"
 msgstr ""
 
 msgid "need a HEAD to fixup"
 msgstr ""
 

-#: sequencer.c:859
+#: sequencer.c:1370

 msgid "could not read HEAD"
 msgstr ""
 
 msgid "could not read HEAD"
 msgstr ""
 

-#: sequencer.c:861
+#: sequencer.c:1372

 msgid "could not read HEAD's commit message"
 msgstr ""
 
 msgid "could not read HEAD's commit message"
 msgstr ""
 

-#: sequencer.c:867
+#: sequencer.c:1378

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

-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452

 msgid "This is the 1st commit message:"
 msgstr ""
 
 msgid "This is the 1st commit message:"
 msgstr ""
 

-#: sequencer.c:884
+#: sequencer.c:1395

 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 
 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 

-#: sequencer.c:891
+#: sequencer.c:1402

 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 

-#: sequencer.c:896
+#: sequencer.c:1407

 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 

-#: sequencer.c:901
+#: sequencer.c:1412

 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 

-#: sequencer.c:967
+#: sequencer.c:1479

 msgid "your index file is unmerged."
 msgstr ""
 
 msgid "your index file is unmerged."
 msgstr ""
 

-#: sequencer.c:986
+#: sequencer.c:1498

 #, 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:994
+#: sequencer.c:1506

 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 

-#: sequencer.c:998
+#: sequencer.c:1510

 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 

-#: sequencer.c:1004
+#: sequencer.c:1516

 #, 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:1023
+#: sequencer.c:1535

 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 

-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397

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

-#: sequencer.c:1137
+#: sequencer.c:1654

 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 

-#: sequencer.c:1138
+#: sequencer.c:1655

 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 

-#: sequencer.c:1180
+#: sequencer.c:1702

 msgid "empty commit set passed"
 msgstr ""
 
 msgid "empty commit set passed"
 msgstr ""
 

-#: sequencer.c:1190
+#: sequencer.c:1712

 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 

-#: sequencer.c:1196
+#: sequencer.c:1718

 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 

-#: sequencer.c:1270
+#: sequencer.c:1792

 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 

-#: sequencer.c:1279
+#: sequencer.c:1801

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

-#: sequencer.c:1322
+#: sequencer.c:1844

 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 

-#: sequencer.c:1330
+#: sequencer.c:1852

 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 

-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

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

-#: sequencer.c:1375
+#: sequencer.c:1906

 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 

-#: sequencer.c:1377
+#: sequencer.c:1908

 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 

-#: sequencer.c:1382
+#: sequencer.c:1913

 msgid "no commits parsed."
 msgstr ""
 
 msgid "no commits parsed."
 msgstr ""
 

-#: sequencer.c:1393
+#: sequencer.c:1924

 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 

-#: sequencer.c:1395
+#: sequencer.c:1926

 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 

-#: sequencer.c:1462
+#: sequencer.c:1993

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

-#: sequencer.c:1465
+#: sequencer.c:1996

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

-#: sequencer.c:1531
+#: sequencer.c:2062

 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 

-#: sequencer.c:1569
+#: sequencer.c:2100

 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 

-#: sequencer.c:1570
+#: sequencer.c:2101

 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 

-#: sequencer.c:1573
+#: sequencer.c:2104

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

-#: sequencer.c:1588
+#: sequencer.c:2118

 msgid "could not lock HEAD"
 msgstr ""
 
 msgid "could not lock HEAD"
 msgstr ""
 

-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761

 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 

-#: sequencer.c:1648
+#: sequencer.c:2175

 msgid "cannot resolve HEAD"
 msgstr ""
 
 msgid "cannot resolve HEAD"
 msgstr ""
 

-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212

 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 

-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720

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

-#: sequencer.c:1673
+#: sequencer.c:2200

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

-#: sequencer.c:1674
+#: sequencer.c:2201

 msgid "unexpected end of file"
 msgstr ""
 
 msgid "unexpected end of file"
 msgstr ""
 

-#: sequencer.c:1680
+#: sequencer.c:2207

 #, 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:1691
+#: sequencer.c:2218

 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:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr ""
+
+#: sequencer.c:2362 sequencer.c:2659

 msgid "cannot read HEAD"
 msgstr ""
 
 msgid "cannot read HEAD"
 msgstr ""
 

-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639

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

-#: sequencer.c:1891
+#: sequencer.c:2421

 msgid "could not read index"
 msgstr ""
 
 msgid "could not read index"
 msgstr ""
 

-#: sequencer.c:1896
+#: sequencer.c:2426

 #, c-format
 msgid ""
 "execution failed: %s\n"
 #, c-format
 msgid ""
 "execution failed: %s\n"


@@ -3192,11 +3315,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:1902
+#: sequencer.c:2432

 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:1908
+#: sequencer.c:2438

 #, c-format
 msgid ""
 "execution succeeded: %s\n"
 #, c-format
 msgid ""
 "execution succeeded: %s\n"


@@ -3207,17 +3330,17 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:1967
+#: sequencer.c:2497

 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 

-#: sequencer.c:1979
+#: sequencer.c:2509

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

-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178

 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"


@@ -3225,108 +3348,103 @@ 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:2064
+#: sequencer.c:2595

 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 

-#: sequencer.c:2106
+#: sequencer.c:2637

 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 

-#: sequencer.c:2136
+#: sequencer.c:2667

 msgid "could not read orig-head"
 msgstr ""
 
 msgid "could not read orig-head"
 msgstr ""
 

-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262

 msgid "could not read 'onto'"
 msgstr ""
 
 msgid "could not read 'onto'"
 msgstr ""
 

-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr ""
-
-#: sequencer.c:2155
+#: sequencer.c:2686

 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 

-#: sequencer.c:2239
+#: sequencer.c:2770

 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 

-#: sequencer.c:2244
+#: sequencer.c:2775

 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 

-#: sequencer.c:2253
+#: sequencer.c:2784

 msgid "cannot amend non-existing commit"
 msgstr ""
 
 msgid "cannot amend non-existing commit"
 msgstr ""
 

-#: sequencer.c:2255
+#: sequencer.c:2786

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

-#: sequencer.c:2257
+#: sequencer.c:2788

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

-#: sequencer.c:2260
+#: sequencer.c:2791

 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:2270
+#: sequencer.c:2801

 msgid "could not commit staged changes."
 msgstr ""
 
 msgid "could not commit staged changes."
 msgstr ""
 

-#: sequencer.c:2350
+#: sequencer.c:2881

 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 

-#: sequencer.c:2354
+#: sequencer.c:2885

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

-#: sequencer.c:2387
+#: sequencer.c:2918

 msgid "can't revert as initial commit"
 msgstr ""
 
 msgid "can't revert as initial commit"
 msgstr ""
 

-#: sequencer.c:2492
+#: sequencer.c:3023

 msgid "make_script: unhandled options"
 msgstr ""
 
 msgid "make_script: unhandled options"
 msgstr ""
 

-#: sequencer.c:2495
+#: sequencer.c:3026

 msgid "make_script: error preparing revisions"
 msgstr ""
 
 msgid "make_script: error preparing revisions"
 msgstr ""
 

-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095

 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 

-#: sequencer.c:2615
+#: sequencer.c:3146

 #, 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:2695
+#: sequencer.c:3212

 #, 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:2702
+#: sequencer.c:3219

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


@@ -3337,7 +3455,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:2714
+#: sequencer.c:3231

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


@@ -3345,21 +3463,26 @@ 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:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
 
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
 

-#: sequencer.c:2775
+#: sequencer.c:3285

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

-#: sequencer.c:2897
+#: sequencer.c:3401

 msgid "the script was already rearranged."
 msgstr ""
 
 msgid "the script was already rearranged."
 msgstr ""
 

+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr ""
+

 #: setup.c:171
 #, c-format
 msgid ""
 #: setup.c:171
 #, c-format
 msgid ""


@@ -3375,6 +3498,11 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 

+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+

 #: setup.c:252
 #, c-format
 msgid ""
 #: setup.c:252
 #, c-format
 msgid ""


@@ -3383,68 +3511,138 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 

-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr ""
+
+#: setup.c:506

 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 

-#: setup.c:509
+#: setup.c:514

 msgid "unknown repository extensions found:"
 msgstr ""
 
 msgid "unknown repository extensions found:"
 msgstr ""
 

-#: setup.c:811
+#: setup.c:533

 #, c-format
 #, c-format

-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "error opening '%s'"

 msgstr ""
 
 msgstr ""
 

-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr ""
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr ""
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr ""
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr ""
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr ""
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr ""
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr ""
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr ""
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr ""
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"

 msgstr ""
 
 msgstr ""
 

-#: setup.c:1052
+#: setup.c:1057

 msgid "Unable to read current working directory"
 msgstr ""
 
 msgid "Unable to read current working directory"
 msgstr ""
 

-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075

 #, c-format
 #, c-format

-msgid "Cannot change to '%s'"
+msgid "cannot change to '%s'"

 msgstr ""
 
 msgstr ""
 

-#: setup.c:1083
+#: setup.c:1088

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"

 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 

-#: setup.c:1167
+#: setup.c:1172

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"

 "The owner of files must always have read and write permissions."
 msgstr ""
 
 "The owner of files must always have read and write permissions."
 msgstr ""
 

-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr ""
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr ""
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr ""
+
+#: sha1_file.c:592

 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 

-#: sha1_file.c:624
+#: sha1_file.c:618

 #, 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:630
+#: sha1_file.c:624

 #, 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:636
+#: sha1_file.c:630

 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 

-#: sha1_file.c:644
+#: sha1_file.c:638

 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""


@@ -3509,7 +3707,7 @@ msgstr ""
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 

-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 


@@ -3533,24 +3731,24 @@ msgstr ""
 msgid "submodule '%s' has dirty index"
 msgstr ""
 
 msgid "submodule '%s' has dirty index"
 msgstr ""
 

-#: submodule.c:1876
+#: submodule.c:1878

 #, 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:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946

 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 

-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256

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

-#: submodule.c:1895
+#: submodule.c:1897

 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"


@@ -3558,20 +3756,20 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
 "'%s'\n"
 msgstr ""
 

-#: submodule.c:1979
+#: submodule.c:1981

 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 

-#: submodule.c:2023
+#: submodule.c:2025

 msgid "could not start ls-files in .."
 msgstr ""
 
 msgid "could not start ls-files in .."
 msgstr ""
 

-#: submodule.c:2043
+#: submodule.c:2045

 msgid "BUG: returned path string doesn't match cwd?"
 msgstr ""
 
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr ""
 

-#: submodule.c:2062
+#: submodule.c:2064

 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""


@@ -3649,14 +3847,14 @@ msgstr ""
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 

-#: transport.c:904
+#: transport.c:916

 #, 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:908
+#: transport.c:920

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -3672,11 +3870,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: transport.c:916
+#: transport.c:928

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

-#: transport-helper.c:1074
+#: transport-helper.c:1079

 #, c-format
 msgid "Could not read ref %s"
 msgstr ""
 #, c-format
 msgid "Could not read ref %s"
 msgstr ""


@@ -3697,98 +3895,98 @@ msgstr ""
 msgid "too-short tree file"
 msgstr ""
 
 msgid "too-short tree file"
 msgstr ""
 

-#: unpack-trees.c:107
+#: unpack-trees.c:108

 #, 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:109
+#: unpack-trees.c:110

 #, 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:112
+#: unpack-trees.c:113

 #, 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:114
+#: unpack-trees.c:115

 #, 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:117
+#: unpack-trees.c:118

 #, 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:119
+#: unpack-trees.c:120

 #, 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:124
+#: unpack-trees.c:125

 #, 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:128
+#: unpack-trees.c:129

 #, 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:130
+#: unpack-trees.c:131

 #, 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:133
+#: unpack-trees.c:134

 #, 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:135
+#: unpack-trees.c:136

 #, 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:138
+#: unpack-trees.c:139

 #, 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:140
+#: unpack-trees.c:141

 #, 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:145
+#: unpack-trees.c:146

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


@@ -3796,7 +3994,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:147
+#: unpack-trees.c:148

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


@@ -3804,47 +4002,47 @@ msgid ""
 "%%s"
 msgstr ""
 
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:150
+#: unpack-trees.c:151

 #, 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:152
+#: unpack-trees.c:153

 #, 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:155
+#: unpack-trees.c:156

 #, 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:157
+#: unpack-trees.c:158

 #, 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:164
+#: unpack-trees.c:165

 #, 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:167
+#: unpack-trees.c:168

 #, 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:169
+#: unpack-trees.c:170

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


@@ -3852,7 +4050,7 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: unpack-trees.c:171
+#: unpack-trees.c:172

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


@@ -3860,19 +4058,19 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: unpack-trees.c:173
+#: unpack-trees.c:174

 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 

-#: unpack-trees.c:250
+#: unpack-trees.c:251

 #, c-format
 msgid "Aborting\n"
 msgstr ""
 
 #, c-format
 msgid "Aborting\n"
 msgstr ""
 

-#: unpack-trees.c:332
+#: unpack-trees.c:333

 msgid "Checking out files"
 msgstr ""
 
 msgid "Checking out files"
 msgstr ""
 


@@ -3905,18 +4103,43 @@ msgstr ""
 msgid "invalid '..' path segment"
 msgstr ""
 
 msgid "invalid '..' path segment"
 msgstr ""
 

-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147

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

+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr ""
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr ""
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr ""
+

 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044

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


@@ -3930,374 +4153,374 @@ msgstr ""
 msgid "unable to get current working directory"
 msgstr ""
 
 msgid "unable to get current working directory"
 msgstr ""
 

-#: wt-status.c:150
+#: wt-status.c:151

 msgid "Unmerged paths:"
 msgstr ""
 
 msgid "Unmerged paths:"
 msgstr ""
 

-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205

 #, 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:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207

 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 

-#: wt-status.c:183
+#: wt-status.c:184

 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 

-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190

 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:187
+#: wt-status.c:188

 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 

-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007

 msgid "Changes to be committed:"
 msgstr ""
 
 msgid "Changes to be committed:"
 msgstr ""
 

-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016

 msgid "Changes not staged for commit:"
 msgstr ""
 
 msgid "Changes not staged for commit:"
 msgstr ""
 

-#: wt-status.c:220
+#: wt-status.c:221

 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:222
+#: wt-status.c:223

 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:223
+#: wt-status.c:224

 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:225
+#: wt-status.c:226

 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:237
+#: wt-status.c:238

 #, 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:252
+#: wt-status.c:253

 msgid "both deleted:"
 msgstr ""
 
 msgid "both deleted:"
 msgstr ""
 

-#: wt-status.c:254
+#: wt-status.c:255

 msgid "added by us:"
 msgstr ""
 
 msgid "added by us:"
 msgstr ""
 

-#: wt-status.c:256
+#: wt-status.c:257

 msgid "deleted by them:"
 msgstr ""
 
 msgid "deleted by them:"
 msgstr ""
 

-#: wt-status.c:258
+#: wt-status.c:259

 msgid "added by them:"
 msgstr ""
 
 msgid "added by them:"
 msgstr ""
 

-#: wt-status.c:260
+#: wt-status.c:261

 msgid "deleted by us:"
 msgstr ""
 
 msgid "deleted by us:"
 msgstr ""
 

-#: wt-status.c:262
+#: wt-status.c:263

 msgid "both added:"
 msgstr ""
 
 msgid "both added:"
 msgstr ""
 

-#: wt-status.c:264
+#: wt-status.c:265

 msgid "both modified:"
 msgstr ""
 
 msgid "both modified:"
 msgstr ""
 

-#: wt-status.c:274
+#: wt-status.c:275

 msgid "new file:"
 msgstr ""
 
 msgid "new file:"
 msgstr ""
 

-#: wt-status.c:276
+#: wt-status.c:277

 msgid "copied:"
 msgstr ""
 
 msgid "copied:"
 msgstr ""
 

-#: wt-status.c:278
+#: wt-status.c:279

 msgid "deleted:"
 msgstr ""
 
 msgid "deleted:"
 msgstr ""
 

-#: wt-status.c:280
+#: wt-status.c:281

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

-#: wt-status.c:282
+#: wt-status.c:283

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

-#: wt-status.c:284
+#: wt-status.c:285

 msgid "typechange:"
 msgstr ""
 
 msgid "typechange:"
 msgstr ""
 

-#: wt-status.c:286
+#: wt-status.c:287

 msgid "unknown:"
 msgstr ""
 
 msgid "unknown:"
 msgstr ""
 

-#: wt-status.c:288
+#: wt-status.c:289

 msgid "unmerged:"
 msgstr ""
 
 msgid "unmerged:"
 msgstr ""
 

-#: wt-status.c:370
+#: wt-status.c:369

 msgid "new commits, "
 msgstr ""
 
 msgid "new commits, "
 msgstr ""
 

-#: wt-status.c:372
+#: wt-status.c:371

 msgid "modified content, "
 msgstr ""
 
 msgid "modified content, "
 msgstr ""
 

-#: wt-status.c:374
+#: wt-status.c:373

 msgid "untracked content, "
 msgstr ""
 
 msgid "untracked content, "
 msgstr ""
 

-#: wt-status.c:824
+#: wt-status.c:847

 #, 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:856
+#: wt-status.c:879

 msgid "Submodules changed but not updated:"
 msgstr ""
 
 msgid "Submodules changed but not updated:"
 msgstr ""
 

-#: wt-status.c:858
+#: wt-status.c:881

 msgid "Submodule changes to be committed:"
 msgstr ""
 
 msgid "Submodule changes to be committed:"
 msgstr ""
 

-#: wt-status.c:940
+#: wt-status.c:963

 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:1053
+#: wt-status.c:1076

 msgid "You have unmerged paths."
 msgstr ""
 
 msgid "You have unmerged paths."
 msgstr ""
 

-#: wt-status.c:1056
+#: wt-status.c:1079

 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 

-#: wt-status.c:1058
+#: wt-status.c:1081

 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 

-#: wt-status.c:1063
+#: wt-status.c:1086

 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 

-#: wt-status.c:1066
+#: wt-status.c:1089

 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 

-#: wt-status.c:1076
+#: wt-status.c:1099

 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:1079
+#: wt-status.c:1102

 msgid "The current patch is empty."
 msgstr ""
 
 msgid "The current patch is empty."
 msgstr ""
 

-#: wt-status.c:1083
+#: wt-status.c:1106

 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 

-#: wt-status.c:1085
+#: wt-status.c:1108

 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 

-#: wt-status.c:1087
+#: wt-status.c:1110

 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:1219
+#: wt-status.c:1242

 msgid "git-rebase-todo is missing."
 msgstr ""
 
 msgid "git-rebase-todo is missing."
 msgstr ""
 

-#: wt-status.c:1221
+#: wt-status.c:1244

 msgid "No commands done."
 msgstr ""
 
 msgid "No commands done."
 msgstr ""
 

-#: wt-status.c:1224
+#: wt-status.c:1247

 #, 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:1235
+#: wt-status.c:1258

 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 
 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 

-#: wt-status.c:1240
+#: wt-status.c:1263

 msgid "No commands remaining."
 msgstr ""
 
 msgid "No commands remaining."
 msgstr ""
 

-#: wt-status.c:1243
+#: wt-status.c:1266

 #, 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:1251
+#: wt-status.c:1274

 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:1264
+#: wt-status.c:1287

 #, 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:1269
+#: wt-status.c:1292

 msgid "You are currently rebasing."
 msgstr ""
 
 msgid "You are currently rebasing."
 msgstr ""
 

-#: wt-status.c:1283
+#: wt-status.c:1306

 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1285
+#: wt-status.c:1308

 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 

-#: wt-status.c:1287
+#: wt-status.c:1310

 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:1293
+#: wt-status.c:1316

 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1297
+#: wt-status.c:1320

 #, 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:1302
+#: wt-status.c:1325

 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:1305
+#: wt-status.c:1328

 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:1309
+#: wt-status.c:1332

 #, 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:1314
+#: wt-status.c:1337

 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:1317
+#: wt-status.c:1340

 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:1319
+#: wt-status.c:1342

 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:1329
+#: wt-status.c:1352

 #, 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:1334
+#: wt-status.c:1357

 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 

-#: wt-status.c:1337
+#: wt-status.c:1360

 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 

-#: wt-status.c:1339
+#: wt-status.c:1362

 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:1348
+#: wt-status.c:1371

 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 

-#: wt-status.c:1353
+#: wt-status.c:1376

 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 

-#: wt-status.c:1356
+#: wt-status.c:1379

 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 

-#: wt-status.c:1358
+#: wt-status.c:1381

 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:1369
+#: wt-status.c:1392

 #, 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:1373
+#: wt-status.c:1396

 msgid "You are currently bisecting."
 msgstr ""
 
 msgid "You are currently bisecting."
 msgstr ""
 

-#: wt-status.c:1376
+#: wt-status.c:1399

 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:1573
+#: wt-status.c:1596

 msgid "On branch "
 msgstr ""
 
 msgid "On branch "
 msgstr ""
 

-#: wt-status.c:1579
+#: wt-status.c:1602

 msgid "interactive rebase in progress; onto "
 msgstr ""
 
 msgid "interactive rebase in progress; onto "
 msgstr ""
 

-#: wt-status.c:1581
+#: wt-status.c:1604

 msgid "rebase in progress; onto "
 msgstr ""
 
 msgid "rebase in progress; onto "
 msgstr ""
 

-#: wt-status.c:1586
+#: wt-status.c:1609

 msgid "HEAD detached at "
 msgstr ""
 
 msgid "HEAD detached at "
 msgstr ""
 

-#: wt-status.c:1588
+#: wt-status.c:1611

 msgid "HEAD detached from "
 msgstr ""
 
 msgid "HEAD detached from "
 msgstr ""
 

-#: wt-status.c:1591
+#: wt-status.c:1614

 msgid "Not currently on any branch."
 msgstr ""
 
 msgid "Not currently on any branch."
 msgstr ""
 

-#: wt-status.c:1611
+#: wt-status.c:1634

 msgid "Initial commit"
 msgstr ""
 
 msgid "Initial commit"
 msgstr ""
 

-#: wt-status.c:1612
+#: wt-status.c:1635

 msgid "No commits yet"
 msgstr ""
 
 msgid "No commits yet"
 msgstr ""
 

-#: wt-status.c:1626
+#: wt-status.c:1649

 msgid "Untracked files"
 msgstr ""
 
 msgid "Untracked files"
 msgstr ""
 

-#: wt-status.c:1628
+#: wt-status.c:1651

 msgid "Ignored files"
 msgstr ""
 
 msgid "Ignored files"
 msgstr ""
 

-#: wt-status.c:1632
+#: wt-status.c:1655

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


@@ -4305,93 +4528,97 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
 "new files yourself (see 'git help status')."
 msgstr ""
 

-#: wt-status.c:1638
+#: wt-status.c:1661

 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 

-#: wt-status.c:1640
+#: wt-status.c:1663

 msgid " (use -u option to show untracked files)"
 msgstr ""
 
 msgid " (use -u option to show untracked files)"
 msgstr ""
 

-#: wt-status.c:1646
+#: wt-status.c:1669

 msgid "No changes"
 msgstr ""
 
 msgid "No changes"
 msgstr ""
 

-#: wt-status.c:1651
+#: wt-status.c:1674

 #, 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:1654
+#: wt-status.c:1677

 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 

-#: wt-status.c:1657
+#: wt-status.c:1680

 #, 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:1660
+#: wt-status.c:1683

 #, 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:1663
+#: wt-status.c:1686

 #, 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:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694

 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 

-#: wt-status.c:1669
+#: wt-status.c:1692

 #, 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:1673
+#: wt-status.c:1696

 #, 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:1785
+#: wt-status.c:1809

 msgid "No commits yet on "
 msgstr ""
 
 msgid "No commits yet on "
 msgstr ""
 

-#: wt-status.c:1789
+#: wt-status.c:1813

 msgid "HEAD (no branch)"
 msgstr ""
 
 msgid "HEAD (no branch)"
 msgstr ""
 

-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr ""
+
+#: wt-status.c:1846 wt-status.c:1854

 msgid "behind "
 msgstr ""
 
 msgid "behind "
 msgstr ""
 

-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852

 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:2318
+#: wt-status.c:2358

 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 

-#: wt-status.c:2324
+#: wt-status.c:2364

 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 

-#: wt-status.c:2326
+#: wt-status.c:2366

 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 

-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440

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


@@ -4405,7 +4632,7 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr ""
 
 msgid "unexpected diff status %c"
 msgstr ""
 

-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257

 msgid "updating files failed"
 msgstr ""
 
 msgid "updating files failed"
 msgstr ""
 


@@ -4453,7 +4680,7 @@ msgstr ""
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 

-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"


@@ -4463,7 +4690,7 @@ msgstr ""
 msgid "interactive picking"
 msgstr ""
 
 msgid "interactive picking"
 msgstr ""
 

-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

 msgid "select hunks interactively"
 msgstr ""
 
 msgid "select hunks interactively"
 msgstr ""
 


@@ -4574,10 +4801,10 @@ msgstr ""
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 

-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326

 msgid "index file corrupt"
 msgstr ""
 
 msgid "index file corrupt"
 msgstr ""
 


@@ -4629,93 +4856,84 @@ msgstr ""
 msgid "Patch format detection failed."
 msgstr ""
 
 msgid "Patch format detection failed."
 msgstr ""
 

-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405

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

-#: builtin/am.c:1017
+#: builtin/am.c:1018

 msgid "Failed to split patches."
 msgstr ""
 
 msgid "Failed to split patches."
 msgstr ""
 

-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342

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

-#: builtin/am.c:1160
+#: builtin/am.c:1162

 #, 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:1161
+#: builtin/am.c:1163

 #, 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:1162
+#: builtin/am.c:1164

 #, 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:1269
+#: builtin/am.c:1271

 msgid "Patch is empty."
 msgstr ""
 
 msgid "Patch is empty."
 msgstr ""
 

-#: builtin/am.c:1335
+#: builtin/am.c:1337

 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 

-#: builtin/am.c:1357
+#: builtin/am.c:1359

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

-#: builtin/am.c:1550
+#: builtin/am.c:1554

 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:1552
+#: builtin/am.c:1556

 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 

-#: builtin/am.c:1571
+#: builtin/am.c:1575

 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:1577
+#: builtin/am.c:1581

 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:1602
+#: builtin/am.c:1606

 msgid "Failed to merge in the changes."
 msgstr ""
 
 msgid "Failed to merge in the changes."
 msgstr ""
 

-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr ""
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637

 msgid "applying to an empty history"
 msgstr ""
 
 msgid "applying to an empty history"
 msgstr ""
 

-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr ""
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687

 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 

-#: builtin/am.c:1699
+#: builtin/am.c:1703

 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:1704
+#: builtin/am.c:1708

 msgid "Commit Body is:"
 msgstr ""
 
 msgid "Commit Body is:"
 msgstr ""
 


@@ -4723,42 +4941,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:1714
+#: builtin/am.c:1718

 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:1764
+#: builtin/am.c:1768

 #, 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:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879

 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 

-#: builtin/am.c:1820
+#: builtin/am.c:1824

 msgid "No changes -- Patch already applied."
 msgstr ""
 
 msgid "No changes -- Patch already applied."
 msgstr ""
 

-#: builtin/am.c:1828
+#: builtin/am.c:1832

 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 

-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"

 msgstr ""
 
 msgstr ""
 

-#: builtin/am.c:1879
+#: builtin/am.c:1882

 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:1886
+#: builtin/am.c:1889

 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 "


@@ -4766,171 +4983,179 @@ 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:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332

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

-#: builtin/am.c:2045
+#: builtin/am.c:2048

 msgid "failed to clean index"
 msgstr ""
 
 msgid "failed to clean index"
 msgstr ""
 

-#: builtin/am.c:2080
+#: builtin/am.c:2083

 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:2143
+#: builtin/am.c:2174

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

-#: builtin/am.c:2176
+#: builtin/am.c:2210

 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 

-#: builtin/am.c:2177
+#: builtin/am.c:2211

 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 

-#: builtin/am.c:2183
+#: builtin/am.c:2217

 msgid "run interactively"
 msgstr ""
 
 msgid "run interactively"
 msgstr ""
 

-#: builtin/am.c:2185
+#: builtin/am.c:2219

 msgid "historical option -- no-op"
 msgstr ""
 
 msgid "historical option -- no-op"
 msgstr ""
 

-#: builtin/am.c:2187
+#: builtin/am.c:2221

 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 

-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182

 msgid "be quiet"
 msgstr ""
 
 msgid "be quiet"
 msgstr ""
 

-#: builtin/am.c:2190
+#: builtin/am.c:2224

 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:2193
+#: builtin/am.c:2227

 msgid "recode into utf8 (default)"
 msgstr ""
 
 msgid "recode into utf8 (default)"
 msgstr ""
 

-#: builtin/am.c:2195
+#: builtin/am.c:2229

 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2197
+#: builtin/am.c:2231

 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2199
+#: builtin/am.c:2233

 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2201
+#: builtin/am.c:2235

 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:2204
+#: builtin/am.c:2238

 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:2207
+#: builtin/am.c:2241

 msgid "strip everything before a scissors line"
 msgstr ""
 
 msgid "strip everything before a scissors line"
 msgstr ""
 

-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270

 msgid "pass it through git-apply"
 msgstr ""
 
 msgid "pass it through git-apply"
 msgstr ""
 

-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257

 msgid "n"
 msgstr ""
 
 msgid "n"
 msgstr ""
 

-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

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

-#: builtin/am.c:2233
+#: builtin/am.c:2267

 msgid "format the patch(es) are in"
 msgstr ""
 
 msgid "format the patch(es) are in"
 msgstr ""
 

-#: builtin/am.c:2239
+#: builtin/am.c:2273

 msgid "override error message when patch failure occurs"
 msgstr ""
 
 msgid "override error message when patch failure occurs"
 msgstr ""
 

-#: builtin/am.c:2241
+#: builtin/am.c:2275

 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 

-#: builtin/am.c:2244
+#: builtin/am.c:2278

 msgid "synonyms for --continue"
 msgstr ""
 
 msgid "synonyms for --continue"
 msgstr ""
 

-#: builtin/am.c:2247
+#: builtin/am.c:2281

 msgid "skip the current patch"
 msgstr ""
 
 msgid "skip the current patch"
 msgstr ""
 

-#: builtin/am.c:2250
+#: builtin/am.c:2284

 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:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr ""
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr ""
+
+#: builtin/am.c:2294

 msgid "lie about committer date"
 msgstr ""
 
 msgid "lie about committer date"
 msgstr ""
 

-#: builtin/am.c:2256
+#: builtin/am.c:2296

 msgid "use current timestamp for author date"
 msgstr ""
 
 msgid "use current timestamp for author date"
 msgstr ""
 

-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

 msgid "key-id"
 msgstr ""
 
 msgid "key-id"
 msgstr ""
 

-#: builtin/am.c:2259
+#: builtin/am.c:2299

 msgid "GPG-sign commits"
 msgstr ""
 
 msgid "GPG-sign commits"
 msgstr ""
 

-#: builtin/am.c:2262
+#: builtin/am.c:2302

 msgid "(internal use for git-rebase)"
 msgstr ""
 
 msgid "(internal use for git-rebase)"
 msgstr ""
 

-#: builtin/am.c:2280
+#: builtin/am.c:2320

 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:2287
+#: builtin/am.c:2327

 msgid "failed to read the index"
 msgstr ""
 
 msgid "failed to read the index"
 msgstr ""
 

-#: builtin/am.c:2302
+#: builtin/am.c:2342

 #, 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:2326
+#: builtin/am.c:2366

 #, 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:2332
+#: builtin/am.c:2372

 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 


@@ -4952,7 +5177,7 @@ msgid "git archive: Remote with no URL"
 msgstr ""
 
 #: builtin/archive.c:58
 msgstr ""
 
 #: builtin/archive.c:58

-msgid "git archive: expected ACK/NAK, got EOF"
+msgid "git archive: expected ACK/NAK, got a flush packet"

 msgstr ""
 
 #: builtin/archive.c:61
 msgstr ""
 
 #: builtin/archive.c:61


@@ -5039,107 +5264,107 @@ msgstr ""
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr ""
 
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr ""
 

-#: builtin/blame.c:668
+#: builtin/blame.c:677

 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 

-#: builtin/blame.c:669
+#: builtin/blame.c:678

 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:670
+#: builtin/blame.c:679

 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:671
+#: builtin/blame.c:680

 msgid "Show work cost statistics"
 msgstr ""
 
 msgid "Show work cost statistics"
 msgstr ""
 

-#: builtin/blame.c:672
+#: builtin/blame.c:681

 msgid "Force progress reporting"
 msgstr ""
 
 msgid "Force progress reporting"
 msgstr ""
 

-#: builtin/blame.c:673
+#: builtin/blame.c:682

 msgid "Show output score for blame entries"
 msgstr ""
 
 msgid "Show output score for blame entries"
 msgstr ""
 

-#: builtin/blame.c:674
+#: builtin/blame.c:683

 msgid "Show original filename (Default: auto)"
 msgstr ""
 
 msgid "Show original filename (Default: auto)"
 msgstr ""
 

-#: builtin/blame.c:675
+#: builtin/blame.c:684

 msgid "Show original linenumber (Default: off)"
 msgstr ""
 
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:676
+#: builtin/blame.c:685

 msgid "Show in a format designed for machine consumption"
 msgstr ""
 
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 

-#: builtin/blame.c:677
+#: builtin/blame.c:686

 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 

-#: builtin/blame.c:678
+#: builtin/blame.c:687

 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:679
+#: builtin/blame.c:688

 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 
 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:680
+#: builtin/blame.c:689

 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:681
+#: builtin/blame.c:690

 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:682
+#: builtin/blame.c:691

 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:683
+#: builtin/blame.c:692

 msgid "Ignore whitespace differences"
 msgstr ""
 
 msgid "Ignore whitespace differences"
 msgstr ""
 

-#: builtin/blame.c:690
+#: builtin/blame.c:699

 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 
 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 

-#: builtin/blame.c:692
+#: builtin/blame.c:701

 msgid "Spend extra cycles to find better match"
 msgstr ""
 
 msgid "Spend extra cycles to find better match"
 msgstr ""
 

-#: builtin/blame.c:693
+#: builtin/blame.c:702

 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 

-#: builtin/blame.c:694
+#: builtin/blame.c:703

 msgid "Use <file>'s contents as the final image"
 msgstr ""
 
 msgid "Use <file>'s contents as the final image"
 msgstr ""
 

-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705

 msgid "score"
 msgstr ""
 
 msgid "score"
 msgstr ""
 

-#: builtin/blame.c:695
+#: builtin/blame.c:704

 msgid "Find line copies within and across files"
 msgstr ""
 
 msgid "Find line copies within and across files"
 msgstr ""
 

-#: builtin/blame.c:696
+#: builtin/blame.c:705

 msgid "Find line movements within and across files"
 msgstr ""
 
 msgid "Find line movements within and across files"
 msgstr ""
 

-#: builtin/blame.c:697
+#: builtin/blame.c:706

 msgid "n,m"
 msgstr ""
 
 msgid "n,m"
 msgstr ""
 

-#: builtin/blame.c:697
+#: builtin/blame.c:706

 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:744
+#: builtin/blame.c:753

 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 


@@ -5151,18 +5376,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
 #. your language may need more or fewer display
 #. columns.
 #.

-#: builtin/blame.c:795
+#: builtin/blame.c:804

 msgid "4 years, 11 months ago"
 msgstr ""
 
 msgid "4 years, 11 months ago"
 msgstr ""
 

-#: builtin/blame.c:882
+#: builtin/blame.c:890

 #, 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:928
+#: builtin/blame.c:936

 msgid "Blaming lines"
 msgstr ""
 
 msgid "Blaming lines"
 msgstr ""
 


@@ -5441,17 +5666,17 @@ msgstr ""
 msgid "list branches in columns"
 msgstr ""
 
 msgid "list branches in columns"
 msgstr ""
 

-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411

 msgid "key"
 msgstr ""
 
 msgid "key"
 msgstr ""
 

-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412

 msgid "field name to sort on"
 msgstr ""
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
 msgid "field name to sort on"
 msgstr ""
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

-#: builtin/tag.c:408
+#: builtin/tag.c:414

 msgid "object"
 msgstr ""
 
 msgid "object"
 msgstr ""
 


@@ -5459,16 +5684,16 @@ msgstr ""
 msgid "print only branches of the object"
 msgstr ""
 
 msgid "print only branches of the object"
 msgstr ""
 

-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421

 msgid "sorting and filtering are case insensitive"
 msgstr ""
 
 msgid "sorting and filtering are case insensitive"
 msgstr ""
 

-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419

 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr ""
 
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr ""
 

-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735

 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 


@@ -5562,75 +5787,75 @@ msgstr ""
 msgid "Need a repository to unbundle."
 msgstr ""
 
 msgid "Need a repository to unbundle."
 msgstr ""
 

-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523

 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:522
+#: builtin/cat-file.c:524

 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:559
+#: builtin/cat-file.c:561

 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:560
+#: builtin/cat-file.c:562

 msgid "show object type"
 msgstr ""
 
 msgid "show object type"
 msgstr ""
 

-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563

 msgid "show object size"
 msgstr ""
 
 msgid "show object size"
 msgstr ""
 

-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565

 msgid "exit with zero when there's no error"
 msgstr ""
 
 msgid "exit with zero when there's no error"
 msgstr ""
 

-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566

 msgid "pretty-print object's content"
 msgstr ""
 
 msgid "pretty-print object's content"
 msgstr ""
 

-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568

 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:568
+#: builtin/cat-file.c:570

 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:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878

 msgid "blob"
 msgstr ""
 
 msgid "blob"
 msgstr ""
 

-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572

 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 

-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574

 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:573
+#: builtin/cat-file.c:575

 msgid "buffer --batch output"
 msgstr ""
 
 msgid "buffer --batch output"
 msgstr ""
 

-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577

 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:578
+#: builtin/cat-file.c:580

 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:581
+#: builtin/cat-file.c:583

 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:583
+#: builtin/cat-file.c:585

 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 


@@ -5650,7 +5875,7 @@ msgstr ""
 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:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100

 msgid "read file names from stdin"
 msgstr ""
 
 msgid "read file names from stdin"
 msgstr ""
 


@@ -5658,7 +5883,7 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 

-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358

 msgid "suppress progress reporting"
 msgstr ""
 
 msgid "suppress progress reporting"
 msgstr ""
 


@@ -5670,27 +5895,27 @@ msgstr ""
 msgid "ignore index when checking"
 msgstr ""
 
 msgid "ignore index when checking"
 msgstr ""
 

-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159

 msgid "cannot specify pathnames with --stdin"
 msgstr ""
 
 msgid "cannot specify pathnames with --stdin"
 msgstr ""
 

-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162

 msgid "-z only makes sense with --stdin"
 msgstr ""
 
 msgid "-z only makes sense with --stdin"
 msgstr ""
 

-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164

 msgid "no path specified"
 msgstr ""
 
 msgid "no path specified"
 msgstr ""
 

-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168

 msgid "--quiet is only valid with a single pathname"
 msgstr ""
 
 msgid "--quiet is only valid with a single pathname"
 msgstr ""
 

-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170

 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 

-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173

 msgid "--non-matching is only valid with --verbose"
 msgstr ""
 
 msgid "--non-matching is only valid with --verbose"
 msgstr ""
 


@@ -5748,9 +5973,9 @@ msgid "write the content to temporary files"
 msgstr ""
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
 msgstr ""
 
 #: builtin/checkout-index.c:173 builtin/column.c:31

-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570

 msgid "string"
 msgstr ""
 
 msgid "string"
 msgstr ""
 


@@ -5795,80 +6020,80 @@ msgstr ""
 msgid "path '%s': cannot merge"
 msgstr ""
 
 msgid "path '%s': cannot merge"
 msgstr ""
 

-#: builtin/checkout.c:232
+#: builtin/checkout.c:231

 #, 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:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262

 #, 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:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268

 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 

-#: builtin/checkout.c:272
+#: builtin/checkout.c:271

 #, 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:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347

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

-#: builtin/checkout.c:506
+#: builtin/checkout.c:505

 msgid "you need to resolve your current index first"
 msgstr ""
 
 msgid "you need to resolve your current index first"
 msgstr ""
 

-#: builtin/checkout.c:637
+#: builtin/checkout.c:636

 #, 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:678
+#: builtin/checkout.c:677

 msgid "HEAD is now at"
 msgstr ""
 
 msgid "HEAD is now at"
 msgstr ""
 

-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689

 msgid "unable to update HEAD"
 msgstr ""
 
 msgid "unable to update HEAD"
 msgstr ""
 

-#: builtin/checkout.c:686
+#: builtin/checkout.c:685

 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:689
+#: builtin/checkout.c:688

 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:693
+#: builtin/checkout.c:692

 #, 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:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039

 #, 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:697
+#: builtin/checkout.c:696

 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:748
+#: builtin/checkout.c:747

 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 

-#: builtin/checkout.c:754
+#: builtin/checkout.c:753

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


@@ -5883,7 +6108,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:773
+#: builtin/checkout.c:772

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


@@ -5900,160 +6125,160 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:814
+#: builtin/checkout.c:804

 msgid "internal error in revision walk"
 msgstr ""
 
 msgid "internal error in revision walk"
 msgstr ""
 

-#: builtin/checkout.c:818
+#: builtin/checkout.c:808

 msgid "Previous HEAD position was"
 msgstr ""
 
 msgid "Previous HEAD position was"
 msgstr ""
 

-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034

 msgid "You are on a branch yet to be born"
 msgstr ""
 
 msgid "You are on a branch yet to be born"
 msgstr ""
 

-#: builtin/checkout.c:952
+#: builtin/checkout.c:940

 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 

-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249

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

-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009

 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 

-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048

 msgid "paths cannot be used with switching branches"
 msgstr ""
 
 msgid "paths cannot be used with switching branches"
 msgstr ""
 

-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055

 #, 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:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070

 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 

-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075

 #, 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:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389

 msgid "branch"
 msgstr ""
 
 msgid "branch"
 msgstr ""
 

-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108

 msgid "create and checkout a new branch"
 msgstr ""
 
 msgid "create and checkout a new branch"
 msgstr ""
 

-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110

 msgid "create/reset and checkout a branch"
 msgstr ""
 
 msgid "create/reset and checkout a branch"
 msgstr ""
 

-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111

 msgid "create reflog for new branch"
 msgstr ""
 
 msgid "create reflog for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391

 msgid "detach HEAD at named commit"
 msgstr ""
 
 msgid "detach HEAD at named commit"
 msgstr ""
 

-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113

 msgid "set upstream info for new branch"
 msgstr ""
 
 msgid "set upstream info for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115

 msgid "new-branch"
 msgstr ""
 
 msgid "new-branch"
 msgstr ""
 

-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115

 msgid "new unparented branch"
 msgstr ""
 
 msgid "new unparented branch"
 msgstr ""
 

-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116

 msgid "checkout our version for unmerged files"
 msgstr ""
 
 msgid "checkout our version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118

 msgid "checkout their version for unmerged files"
 msgstr ""
 
 msgid "checkout their version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120

 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 

-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122

 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:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239

 msgid "update ignored files (default)"
 msgstr ""
 
 msgid "update ignored files (default)"
 msgstr ""
 

-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263

 msgid "style"
 msgstr ""
 
 msgid "style"
 msgstr ""
 

-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127

 msgid "conflict style (merge or diff3)"
 msgstr ""
 
 msgid "conflict style (merge or diff3)"
 msgstr ""
 

-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130

 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 

-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132

 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 

-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134

 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:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556

 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr ""
 
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr ""
 

-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168

 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 

-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185

 msgid "--track needs a branch name"
 msgstr ""
 
 msgid "--track needs a branch name"
 msgstr ""
 

-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190

 msgid "Missing branch name; try -b"
 msgstr ""
 
 msgid "Missing branch name; try -b"
 msgstr ""
 

-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226

 msgid "invalid path specification"
 msgstr ""
 
 msgid "invalid path specification"
 msgstr ""
 

-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233

 #, 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:1246
+#: builtin/checkout.c:1237

 #, 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:1250
+#: builtin/checkout.c:1241

 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."


@@ -6137,7 +6362,7 @@ msgstr ""
 msgid "Remove %s [y/N]? "
 msgstr ""
 
 msgid "Remove %s [y/N]? "
 msgstr ""
 

-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710

 #, c-format
 msgid "Bye.\n"
 msgstr ""
 #, c-format
 msgid "Bye.\n"
 msgstr ""


@@ -6153,11 +6378,11 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
 "?                   - help for prompt selection"
 msgstr ""
 

-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786

 msgid "*** Commands ***"
 msgstr ""
 
 msgid "*** Commands ***"
 msgstr ""
 

-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783

 msgid "What now"
 msgstr ""
 
 msgid "What now"
 msgstr ""
 


@@ -6187,8 +6412,8 @@ msgstr ""
 msgid "remove whole directories"
 msgstr ""
 
 msgid "remove whole directories"
 msgstr ""
 

-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159

 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"


@@ -6222,315 +6447,319 @@ msgid ""
 "refusing to clean"
 msgstr ""
 
 "refusing to clean"
 msgstr ""
 

-#: builtin/clone.c:39
+#: builtin/clone.c:40

 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 

-#: builtin/clone.c:83
+#: builtin/clone.c:85

 msgid "don't create a checkout"
 msgstr ""
 
 msgid "don't create a checkout"
 msgstr ""
 

-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479

 msgid "create a bare repository"
 msgstr ""
 
 msgid "create a bare repository"
 msgstr ""
 

-#: builtin/clone.c:88
+#: builtin/clone.c:90

 msgid "create a mirror repository (implies bare)"
 msgstr ""
 
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 

-#: builtin/clone.c:90
+#: builtin/clone.c:92

 msgid "to clone from a local repository"
 msgstr ""
 
 msgid "to clone from a local repository"
 msgstr ""
 

-#: builtin/clone.c:92
+#: builtin/clone.c:94

 msgid "don't use local hardlinks, always copy"
 msgstr ""
 
 msgid "don't use local hardlinks, always copy"
 msgstr ""
 

-#: builtin/clone.c:94
+#: builtin/clone.c:96

 msgid "setup as shared repository"
 msgstr ""
 
 msgid "setup as shared repository"
 msgstr ""
 

-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102

 msgid "pathspec"
 msgstr ""
 
 msgid "pathspec"
 msgstr ""
 

-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102

 msgid "initialize submodules in the clone"
 msgstr ""
 
 msgid "initialize submodules in the clone"
 msgstr ""
 

-#: builtin/clone.c:103
+#: builtin/clone.c:105

 msgid "number of submodules cloned in parallel"
 msgstr ""
 
 msgid "number of submodules cloned in parallel"
 msgstr ""
 

-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476

 msgid "template-directory"
 msgstr ""
 
 msgid "template-directory"
 msgstr ""
 

-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477

 msgid "directory from which templates will be used"
 msgstr ""
 
 msgid "directory from which templates will be used"
 msgstr ""
 

-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577

 msgid "reference repository"
 msgstr ""
 
 msgid "reference repository"
 msgstr ""
 

-#: builtin/clone.c:111
+#: builtin/clone.c:113

 msgid "use --reference only while cloning"
 msgstr ""
 
 msgid "use --reference only while cloning"
 msgstr ""
 

-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44

 msgid "name"
 msgstr ""
 
 msgid "name"
 msgstr ""
 

-#: builtin/clone.c:113
+#: builtin/clone.c:115

 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 

-#: builtin/clone.c:115
+#: builtin/clone.c:117

 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 

-#: builtin/clone.c:117
+#: builtin/clone.c:119

 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 

-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813

 #: builtin/pull.c:211
 msgid "depth"
 msgstr ""
 
 #: builtin/pull.c:211
 msgid "depth"
 msgstr ""
 

-#: builtin/clone.c:119
+#: builtin/clone.c:121

 msgid "create a shallow clone of that depth"
 msgstr ""
 
 msgid "create a shallow clone of that depth"
 msgstr ""
 

-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154

 msgid "time"
 msgstr ""
 
 msgid "time"
 msgstr ""
 

-#: builtin/clone.c:121
+#: builtin/clone.c:123

 msgid "create a shallow clone since a specific time"
 msgstr ""
 
 msgid "create a shallow clone since a specific time"
 msgstr ""
 

-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155

 msgid "revision"
 msgstr ""
 
 msgid "revision"
 msgstr ""
 

-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156

 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 

-#: builtin/clone.c:125
+#: builtin/clone.c:127

 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 

-#: builtin/clone.c:127
+#: builtin/clone.c:129

 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:129
+#: builtin/clone.c:131

 msgid "any cloned submodules will be shallow"
 msgstr ""
 
 msgid "any cloned submodules will be shallow"
 msgstr ""
 

-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485

 msgid "gitdir"
 msgstr ""
 
 msgid "gitdir"
 msgstr ""
 

-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486

 msgid "separate git dir from working tree"
 msgstr ""
 
 msgid "separate git dir from working tree"
 msgstr ""
 

-#: builtin/clone.c:132
+#: builtin/clone.c:134

 msgid "key=value"
 msgstr ""
 
 msgid "key=value"
 msgstr ""
 

-#: builtin/clone.c:133
+#: builtin/clone.c:135

 msgid "set config inside the new repository"
 msgstr ""
 
 msgid "set config inside the new repository"
 msgstr ""
 

-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224

 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr ""
 
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr ""
 

-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227

 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr ""
 
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr ""
 

-#: builtin/clone.c:273
+#: builtin/clone.c:276

 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:326
+#: builtin/clone.c:329

 #, 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:398
+#: builtin/clone.c:401

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

-#: builtin/clone.c:406
+#: builtin/clone.c:409

 #, 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:420
+#: builtin/clone.c:423

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

-#: builtin/clone.c:442
+#: builtin/clone.c:445

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

-#: builtin/clone.c:446
+#: builtin/clone.c:449

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

-#: builtin/clone.c:472
+#: builtin/clone.c:475

 #, c-format
 msgid "done.\n"
 msgstr ""
 
 #, c-format
 msgid "done.\n"
 msgstr ""
 

-#: builtin/clone.c:484
+#: builtin/clone.c:489

 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:561
+#: builtin/clone.c:566

 #, 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:656
+#: builtin/clone.c:661

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

-#: builtin/clone.c:672
+#: builtin/clone.c:677

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

-#: builtin/clone.c:721
+#: builtin/clone.c:726

 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:751
+#: builtin/clone.c:756

 msgid "unable to checkout working tree"
 msgstr ""
 
 msgid "unable to checkout working tree"
 msgstr ""
 

-#: builtin/clone.c:796
+#: builtin/clone.c:801

 msgid "unable to write parameters to config file"
 msgstr ""
 
 msgid "unable to write parameters to config file"
 msgstr ""
 

-#: builtin/clone.c:859
+#: builtin/clone.c:864

 msgid "cannot repack to clean up"
 msgstr ""
 
 msgid "cannot repack to clean up"
 msgstr ""
 

-#: builtin/clone.c:861
+#: builtin/clone.c:866

 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 

-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946

 msgid "Too many arguments."
 msgstr ""
 
 msgid "Too many arguments."
 msgstr ""
 

-#: builtin/clone.c:898
+#: builtin/clone.c:910

 msgid "You must specify a repository to clone."
 msgstr ""
 
 msgid "You must specify a repository to clone."
 msgstr ""
 

-#: builtin/clone.c:911
+#: builtin/clone.c:923

 #, 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:914
+#: builtin/clone.c:926

 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 

-#: builtin/clone.c:927
+#: builtin/clone.c:939

 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 

-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455

 #, 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:943
+#: builtin/clone.c:955

 #, 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:953
+#: builtin/clone.c:965

 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 

-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285

 #, 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:971
+#: builtin/clone.c:985

 #, 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:983
+#: builtin/clone.c:1005

 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:985
+#: builtin/clone.c:1007

 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:1009
+#: builtin/clone.c:1031

 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:1071
+#: builtin/clone.c:1093

 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:1073
+#: builtin/clone.c:1095

 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:1075
+#: builtin/clone.c:1097

 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:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1102

 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 

-#: builtin/clone.c:1083
+#: builtin/clone.c:1107

 msgid "--local is ignored"
 msgstr ""
 
 msgid "--local is ignored"
 msgstr ""
 

-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177

 #, 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:1150
+#: builtin/clone.c:1180

 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 


@@ -6566,51 +6795,22 @@ msgstr ""
 msgid "--command must be the first argument"
 msgstr ""
 
 msgid "--command must be the first argument"
 msgstr ""
 

-#: builtin/commit.c:39
+#: builtin/commit.c:37

 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr ""
 
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/commit.c:44
+#: builtin/commit.c:42

 msgid "git status [<options>] [--] <pathspec>..."
 msgstr ""
 
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47

 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:79
+#: builtin/commit.c:52

 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"


@@ -6619,11 +6819,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: builtin/commit.c:86
+#: builtin/commit.c:59

 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 
 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 

-#: builtin/commit.c:89
+#: builtin/commit.c:62

 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"


@@ -6633,98 +6833,98 @@ msgid ""
 "the remaining commits.\n"
 msgstr ""
 
 "the remaining commits.\n"
 msgstr ""
 

-#: builtin/commit.c:318
+#: builtin/commit.c:284

 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 

-#: builtin/commit.c:359
+#: builtin/commit.c:325

 msgid "unable to create temporary index"
 msgstr ""
 
 msgid "unable to create temporary index"
 msgstr ""
 

-#: builtin/commit.c:365
+#: builtin/commit.c:331

 msgid "interactive add failed"
 msgstr ""
 
 msgid "interactive add failed"
 msgstr ""
 

-#: builtin/commit.c:378
+#: builtin/commit.c:344

 msgid "unable to update temporary index"
 msgstr ""
 
 msgid "unable to update temporary index"
 msgstr ""
 

-#: builtin/commit.c:380
+#: builtin/commit.c:346

 msgid "Failed to update main cache tree"
 msgstr ""
 
 msgid "Failed to update main cache tree"
 msgstr ""
 

-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444

 msgid "unable to write new_index file"
 msgstr ""
 
 msgid "unable to write new_index file"
 msgstr ""
 

-#: builtin/commit.c:461
+#: builtin/commit.c:427

 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 

-#: builtin/commit.c:463
+#: builtin/commit.c:429

 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:471
+#: builtin/commit.c:437

 msgid "cannot read the index"
 msgstr ""
 
 msgid "cannot read the index"
 msgstr ""
 

-#: builtin/commit.c:490
+#: builtin/commit.c:456

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

-#: builtin/commit.c:587
+#: builtin/commit.c:553

 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 

-#: builtin/commit.c:589
+#: builtin/commit.c:555

 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 

-#: builtin/commit.c:608
+#: builtin/commit.c:574

 msgid "malformed --author parameter"
 msgstr ""
 
 msgid "malformed --author parameter"
 msgstr ""
 

-#: builtin/commit.c:660
+#: builtin/commit.c:626

 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:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024

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

-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309

 #, 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:711
+#: builtin/commit.c:677

 msgid "could not read log from standard input"
 msgstr ""
 
 msgid "could not read log from standard input"
 msgstr ""
 

-#: builtin/commit.c:715
+#: builtin/commit.c:681

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

-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718

 msgid "could not read SQUASH_MSG"
 msgstr ""
 
 msgid "could not read SQUASH_MSG"
 msgstr ""
 

-#: builtin/commit.c:747
+#: builtin/commit.c:715

 msgid "could not read MERGE_MSG"
 msgstr ""
 
 msgid "could not read MERGE_MSG"
 msgstr ""
 

-#: builtin/commit.c:801
+#: builtin/commit.c:769

 msgid "could not write commit template"
 msgstr ""
 
 msgid "could not write commit template"
 msgstr ""
 

-#: builtin/commit.c:819
+#: builtin/commit.c:787

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -6734,7 +6934,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:824
+#: builtin/commit.c:792

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -6744,14 +6944,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:837
+#: builtin/commit.c:805

 #, 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:844
+#: builtin/commit.c:813

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


@@ -6759,357 +6959,337 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
 "An empty message aborts the commit.\n"
 msgstr ""
 

-#: builtin/commit.c:861
+#: builtin/commit.c:830

 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:869
+#: builtin/commit.c:838

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

-#: builtin/commit.c:876
+#: builtin/commit.c:845

 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:893
+#: builtin/commit.c:862

 msgid "Cannot read index"
 msgstr ""
 
 msgid "Cannot read index"
 msgstr ""
 

-#: builtin/commit.c:959
+#: builtin/commit.c:928

 msgid "Error building trees"
 msgstr ""
 
 msgid "Error building trees"
 msgstr ""
 

-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256

 #, 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:1076
+#: builtin/commit.c:986

 #, 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:1090
+#: builtin/commit.c:1000

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

-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 

-#: builtin/commit.c:1142
+#: builtin/commit.c:1052

 msgid "--long and -z are incompatible"
 msgstr ""
 
 msgid "--long and -z are incompatible"
 msgstr ""
 

-#: builtin/commit.c:1172
+#: builtin/commit.c:1085

 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:1181
+#: builtin/commit.c:1094

 msgid "You have nothing to amend."
 msgstr ""
 
 msgid "You have nothing to amend."
 msgstr ""
 

-#: builtin/commit.c:1184
+#: builtin/commit.c:1097

 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:1186
+#: builtin/commit.c:1099

 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:1189
+#: builtin/commit.c:1102

 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 

-#: builtin/commit.c:1199
+#: builtin/commit.c:1112

 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:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."

 msgstr ""
 
 msgstr ""
 

-#: builtin/commit.c:1209
+#: builtin/commit.c:1122

 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:1226
+#: builtin/commit.c:1139

 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:1228
+#: builtin/commit.c:1141

 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:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 

-#: builtin/commit.c:1245
+#: builtin/commit.c:1160

 msgid "Paths with -a does not make sense."
 msgstr ""
 
 msgid "Paths with -a does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443

 msgid "show status concisely"
 msgstr ""
 
 msgid "show status concisely"
 msgstr ""
 

-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445

 msgid "show branch information"
 msgstr ""
 
 msgid "show branch information"
 msgstr ""
 

-#: builtin/commit.c:1367
+#: builtin/commit.c:1282

 msgid "show stash information"
 msgstr ""
 
 msgid "show stash information"
 msgstr ""
 

-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1286

 msgid "version"
 msgstr ""
 
 msgid "version"
 msgstr ""
 

-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541

 msgid "machine-readable output"
 msgstr ""
 
 msgid "machine-readable output"
 msgstr ""
 

-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451

 msgid "show status in long format (default)"
 msgstr ""
 
 msgid "show status in long format (default)"
 msgstr ""
 

-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454

 msgid "terminate entries with NUL"
 msgstr ""
 
 msgid "terminate entries with NUL"
 msgstr ""
 

-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396

 msgid "mode"
 msgstr ""
 
 msgid "mode"
 msgstr ""
 

-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457

 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:1382
+#: builtin/commit.c:1299

 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:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167

 msgid "when"
 msgstr ""
 
 msgid "when"
 msgstr ""
 

-#: builtin/commit.c:1385
+#: builtin/commit.c:1302

 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:1387
+#: builtin/commit.c:1304

 msgid "list untracked files in columns"
 msgstr ""
 
 msgid "list untracked files in columns"
 msgstr ""
 

-#: builtin/commit.c:1406
+#: builtin/commit.c:1323

 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 

-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr ""
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr ""
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr ""
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr ""
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr ""
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413

 msgid "suppress summary after successful commit"
 msgstr ""
 
 msgid "suppress summary after successful commit"
 msgstr ""
 

-#: builtin/commit.c:1619
+#: builtin/commit.c:1414

 msgid "show diff in commit message template"
 msgstr ""
 
 msgid "show diff in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1621
+#: builtin/commit.c:1416

 msgid "Commit message options"
 msgstr ""
 
 msgid "Commit message options"
 msgstr ""
 

-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393

 msgid "read message from file"
 msgstr ""
 
 msgid "read message from file"
 msgstr ""
 

-#: builtin/commit.c:1623
+#: builtin/commit.c:1418

 msgid "author"
 msgstr ""
 
 msgid "author"
 msgstr ""
 

-#: builtin/commit.c:1623
+#: builtin/commit.c:1418

 msgid "override author for commit"
 msgstr ""
 
 msgid "override author for commit"
 msgstr ""
 

-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359

 msgid "date"
 msgstr ""
 
 msgid "date"
 msgstr ""
 

-#: builtin/commit.c:1624
+#: builtin/commit.c:1419

 msgid "override date for commit"
 msgstr ""
 
 msgid "override date for commit"
 msgstr ""
 

-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391

 msgid "message"
 msgstr ""
 
 msgid "message"
 msgstr ""
 

-#: builtin/commit.c:1625
+#: builtin/commit.c:1420

 msgid "commit message"
 msgstr ""
 
 msgid "commit message"
 msgstr ""
 

-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92

 msgid "commit"
 msgstr ""
 
 msgid "commit"
 msgstr ""
 

-#: builtin/commit.c:1626
+#: builtin/commit.c:1421

 msgid "reuse and edit message from specified commit"
 msgstr ""
 
 msgid "reuse and edit message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1627
+#: builtin/commit.c:1422

 msgid "reuse message from specified commit"
 msgstr ""
 
 msgid "reuse message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1628
+#: builtin/commit.c:1423

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 

-#: builtin/commit.c:1629
+#: builtin/commit.c:1424

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 

-#: builtin/commit.c:1630
+#: builtin/commit.c:1425

 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:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240

 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr ""
 
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr ""
 

-#: builtin/commit.c:1632
+#: builtin/commit.c:1427

 msgid "use specified template file"
 msgstr ""
 
 msgid "use specified template file"
 msgstr ""
 

-#: builtin/commit.c:1633
+#: builtin/commit.c:1428

 msgid "force edit of commit"
 msgstr ""
 
 msgid "force edit of commit"
 msgstr ""
 

-#: builtin/commit.c:1634
+#: builtin/commit.c:1429

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397

 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 

-#: builtin/commit.c:1635
+#: builtin/commit.c:1430

 msgid "include status in commit message template"
 msgstr ""
 
 msgid "include status in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179

 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr ""
 
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr ""
 

-#: builtin/commit.c:1640
+#: builtin/commit.c:1435

 msgid "Commit contents options"
 msgstr ""
 
 msgid "Commit contents options"
 msgstr ""
 

-#: builtin/commit.c:1641
+#: builtin/commit.c:1436

 msgid "commit all changed files"
 msgstr ""
 
 msgid "commit all changed files"
 msgstr ""
 

-#: builtin/commit.c:1642
+#: builtin/commit.c:1437

 msgid "add specified files to index for commit"
 msgstr ""
 
 msgid "add specified files to index for commit"
 msgstr ""
 

-#: builtin/commit.c:1643
+#: builtin/commit.c:1438

 msgid "interactively add files"
 msgstr ""
 
 msgid "interactively add files"
 msgstr ""
 

-#: builtin/commit.c:1644
+#: builtin/commit.c:1439

 msgid "interactively add changes"
 msgstr ""
 
 msgid "interactively add changes"
 msgstr ""
 

-#: builtin/commit.c:1645
+#: builtin/commit.c:1440

 msgid "commit only specified files"
 msgstr ""
 
 msgid "commit only specified files"
 msgstr ""
 

-#: builtin/commit.c:1646
+#: builtin/commit.c:1441

 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 

-#: builtin/commit.c:1647
+#: builtin/commit.c:1442

 msgid "show what would be committed"
 msgstr ""
 
 msgid "show what would be committed"
 msgstr ""
 

-#: builtin/commit.c:1658
+#: builtin/commit.c:1455

 msgid "amend previous commit"
 msgstr ""
 
 msgid "amend previous commit"
 msgstr ""
 

-#: builtin/commit.c:1659
+#: builtin/commit.c:1456

 msgid "bypass post-rewrite hook"
 msgstr ""
 
 msgid "bypass post-rewrite hook"
 msgstr ""
 

-#: builtin/commit.c:1664
+#: builtin/commit.c:1461

 msgid "ok to record an empty change"
 msgstr ""
 
 msgid "ok to record an empty change"
 msgstr ""
 

-#: builtin/commit.c:1666
+#: builtin/commit.c:1463

 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:1696
-msgid "could not parse HEAD commit"
-msgstr ""
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 

-#: builtin/commit.c:1748
+#: builtin/commit.c:1543

 msgid "could not read MERGE_MODE"
 msgstr ""
 
 msgid "could not read MERGE_MODE"
 msgstr ""
 

-#: builtin/commit.c:1767
+#: builtin/commit.c:1562

 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 

-#: builtin/commit.c:1778
+#: builtin/commit.c:1573

 #, 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:1783
+#: builtin/commit.c:1578

 #, 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:1831
+#: builtin/commit.c:1613

 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"


@@ -7325,131 +7505,131 @@ msgstr ""
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 

-#: builtin/describe.c:314
+#: builtin/describe.c:317

 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 

-#: builtin/describe.c:316
+#: builtin/describe.c:319

 #, 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:363
+#: builtin/describe.c:366

 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 
 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 

-#: builtin/describe.c:389
+#: builtin/describe.c:392

 #, 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:393
+#: builtin/describe.c:396

 #, 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:423
+#: builtin/describe.c:426

 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 

-#: builtin/describe.c:426
+#: builtin/describe.c:429

 #, 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:494
+#: builtin/describe.c:497

 #, c-format
 msgid "describe %s\n"
 msgstr ""
 
 #, c-format
 msgid "describe %s\n"
 msgstr ""
 

-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502

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

-#: builtin/describe.c:505
+#: builtin/describe.c:508

 #, 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:519
+#: builtin/describe.c:522

 msgid "find the tag that comes after the commit"
 msgstr ""
 
 msgid "find the tag that comes after the commit"
 msgstr ""
 

-#: builtin/describe.c:520
+#: builtin/describe.c:523

 msgid "debug search strategy on stderr"
 msgstr ""
 
 msgid "debug search strategy on stderr"
 msgstr ""
 

-#: builtin/describe.c:521
+#: builtin/describe.c:524

 msgid "use any ref"
 msgstr ""
 
 msgid "use any ref"
 msgstr ""
 

-#: builtin/describe.c:522
+#: builtin/describe.c:525

 msgid "use any tag, even unannotated"
 msgstr ""
 
 msgid "use any tag, even unannotated"
 msgstr ""
 

-#: builtin/describe.c:523
+#: builtin/describe.c:526

 msgid "always use long format"
 msgstr ""
 
 msgid "always use long format"
 msgstr ""
 

-#: builtin/describe.c:524
+#: builtin/describe.c:527

 msgid "only follow first parent"
 msgstr ""
 
 msgid "only follow first parent"
 msgstr ""
 

-#: builtin/describe.c:527
+#: builtin/describe.c:530

 msgid "only output exact matches"
 msgstr ""
 
 msgid "only output exact matches"
 msgstr ""
 

-#: builtin/describe.c:529
+#: builtin/describe.c:532

 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 

-#: builtin/describe.c:531
+#: builtin/describe.c:534

 msgid "only consider tags matching <pattern>"
 msgstr ""
 
 msgid "only consider tags matching <pattern>"
 msgstr ""
 

-#: builtin/describe.c:533
+#: builtin/describe.c:536

 msgid "do not consider tags matching <pattern>"
 msgstr ""
 
 msgid "do not consider tags matching <pattern>"
 msgstr ""
 

-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406

 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 

-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542

 msgid "mark"
 msgstr ""
 
 msgid "mark"
 msgstr ""
 

-#: builtin/describe.c:537
+#: builtin/describe.c:540

 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 

-#: builtin/describe.c:540
+#: builtin/describe.c:543

 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 

-#: builtin/describe.c:558
+#: builtin/describe.c:561

 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 
 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 

-#: builtin/describe.c:587
+#: builtin/describe.c:590

 msgid "No names found, cannot describe anything."
 msgstr ""
 
 msgid "No names found, cannot describe anything."
 msgstr ""
 

-#: builtin/describe.c:637
+#: builtin/describe.c:640

 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 

-#: builtin/describe.c:639
+#: builtin/describe.c:642

 msgid "--broken is incompatible with commit-ishes"
 msgstr ""
 
 msgid "--broken is incompatible with commit-ishes"
 msgstr ""
 


@@ -7632,272 +7812,281 @@ msgstr ""
 msgid "anonymize output"
 msgstr ""
 
 msgid "anonymize output"
 msgstr ""
 

-#: builtin/fetch.c:24
+#: builtin/fetch.c:25

 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 

-#: builtin/fetch.c:25
+#: builtin/fetch.c:26

 msgid "git fetch [<options>] <group>"
 msgstr ""
 
 msgid "git fetch [<options>] <group>"
 msgstr ""
 

-#: builtin/fetch.c:26
+#: builtin/fetch.c:27

 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 

-#: builtin/fetch.c:27
+#: builtin/fetch.c:28

 msgid "git fetch --all [<options>]"
 msgstr ""
 
 msgid "git fetch --all [<options>]"
 msgstr ""
 

-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188

 msgid "fetch from all remotes"
 msgstr ""
 
 msgid "fetch from all remotes"
 msgstr ""
 

-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191

 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 

-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194

 msgid "path to upload pack on remote end"
 msgstr ""
 
 msgid "path to upload pack on remote end"
 msgstr ""
 

-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196

 msgid "force overwrite of local branch"
 msgstr ""
 
 msgid "force overwrite of local branch"
 msgstr ""
 

-#: builtin/fetch.c:120
+#: builtin/fetch.c:131

 msgid "fetch from multiple remotes"
 msgstr ""
 
 msgid "fetch from multiple remotes"
 msgstr ""
 

-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198

 msgid "fetch all tags and associated objects"
 msgstr ""
 
 msgid "fetch all tags and associated objects"
 msgstr ""
 

-#: builtin/fetch.c:124
+#: builtin/fetch.c:135

 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 

-#: builtin/fetch.c:126
+#: builtin/fetch.c:137

 msgid "number of submodules fetched in parallel"
 msgstr ""
 
 msgid "number of submodules fetched in parallel"
 msgstr ""
 

-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201

 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 

-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126

 msgid "on-demand"
 msgstr ""
 
 msgid "on-demand"
 msgstr ""
 

-#: builtin/fetch.c:130
+#: builtin/fetch.c:143

 msgid "control recursive fetching of submodules"
 msgstr ""
 
 msgid "control recursive fetching of submodules"
 msgstr ""
 

-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209

 msgid "keep downloaded pack"
 msgstr ""
 
 msgid "keep downloaded pack"
 msgstr ""
 

-#: builtin/fetch.c:136
+#: builtin/fetch.c:149

 msgid "allow updating of HEAD ref"
 msgstr ""
 
 msgid "allow updating of HEAD ref"
 msgstr ""
 

-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212

 msgid "deepen history of shallow clone"
 msgstr ""
 
 msgid "deepen history of shallow clone"
 msgstr ""
 

-#: builtin/fetch.c:141
+#: builtin/fetch.c:154

 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 

-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215

 msgid "convert to a complete repository"
 msgstr ""
 
 msgid "convert to a complete repository"
 msgstr ""
 

-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466

 msgid "dir"
 msgstr ""
 
 msgid "dir"
 msgstr ""
 

-#: builtin/fetch.c:150
+#: builtin/fetch.c:163

 msgid "prepend this to submodule path output"
 msgstr ""
 
 msgid "prepend this to submodule path output"
 msgstr ""
 

-#: builtin/fetch.c:153
+#: builtin/fetch.c:166

 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 

-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218

 msgid "accept refs that update .git/shallow"
 msgstr ""
 
 msgid "accept refs that update .git/shallow"
 msgstr ""
 

-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220

 msgid "refmap"
 msgstr ""
 
 msgid "refmap"
 msgstr ""
 

-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221

 msgid "specify fetch refmap"
 msgstr ""
 
 msgid "specify fetch refmap"
 msgstr ""
 

-#: builtin/fetch.c:417
+#: builtin/fetch.c:431

 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 

-#: builtin/fetch.c:535
+#: builtin/fetch.c:549

 #, 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:628
+#: builtin/fetch.c:642

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

-#: builtin/fetch.c:632
+#: builtin/fetch.c:646

 msgid "[up to date]"
 msgstr ""
 
 msgid "[up to date]"
 msgstr ""
 

-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739

 msgid "[rejected]"
 msgstr ""
 
 msgid "[rejected]"
 msgstr ""
 

-#: builtin/fetch.c:646
+#: builtin/fetch.c:660

 msgid "can't fetch in current branch"
 msgstr ""
 
 msgid "can't fetch in current branch"
 msgstr ""
 

-#: builtin/fetch.c:655
+#: builtin/fetch.c:669

 msgid "[tag update]"
 msgstr ""
 
 msgid "[tag update]"
 msgstr ""
 

-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734

 msgid "unable to update local ref"
 msgstr ""
 
 msgid "unable to update local ref"
 msgstr ""
 

-#: builtin/fetch.c:675
+#: builtin/fetch.c:689

 msgid "[new tag]"
 msgstr ""
 
 msgid "[new tag]"
 msgstr ""
 

-#: builtin/fetch.c:678
+#: builtin/fetch.c:692

 msgid "[new branch]"
 msgstr ""
 
 msgid "[new branch]"
 msgstr ""
 

-#: builtin/fetch.c:681
+#: builtin/fetch.c:695

 msgid "[new ref]"
 msgstr ""
 
 msgid "[new ref]"
 msgstr ""
 

-#: builtin/fetch.c:720
+#: builtin/fetch.c:734

 msgid "forced update"
 msgstr ""
 
 msgid "forced update"
 msgstr ""
 

-#: builtin/fetch.c:725
+#: builtin/fetch.c:739

 msgid "non-fast-forward"
 msgstr ""
 
 msgid "non-fast-forward"
 msgstr ""
 

-#: builtin/fetch.c:770
+#: builtin/fetch.c:784

 #, 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:790
+#: builtin/fetch.c:804

 #, 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:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988

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

-#: builtin/fetch.c:889
+#: builtin/fetch.c:903

 #, 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:944
+#: builtin/fetch.c:958

 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:945
+#: builtin/fetch.c:959

 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:977
+#: builtin/fetch.c:991

 msgid "[deleted]"
 msgstr ""
 
 msgid "[deleted]"
 msgstr ""
 

-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015

 #, 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:1020
+#: builtin/fetch.c:1034

 #, 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:1023
+#: builtin/fetch.c:1037

 #, 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:1256
+#: builtin/fetch.c:1277

 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 

-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97

 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 
 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 

-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+
+#: builtin/fetch.c:1350

 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:1299
+#: builtin/fetch.c:1394

 msgid "You need to specify a tag name."
 msgstr ""
 
 msgid "You need to specify a tag name."
 msgstr ""
 

-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439

 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 

-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441

 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 

-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446

 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 

-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448

 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:1364
+#: builtin/fetch.c:1464

 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 

-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466

 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 

-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475

 #, 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:1385
+#: builtin/fetch.c:1482

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 


@@ -7962,7 +8151,7 @@ msgstr ""
 msgid "show only <n> matched refs"
 msgstr ""
 
 msgid "show only <n> matched refs"
 msgstr ""
 

-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420

 msgid "respect format colors"
 msgstr ""
 
 msgid "respect format colors"
 msgstr ""
 


@@ -7986,63 +8175,63 @@ msgstr ""
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
 msgid "print only refs which don't contain the commit"
 msgstr ""
 

-#: builtin/fsck.c:543
+#: builtin/fsck.c:568

 msgid "Checking object directories"
 msgstr ""
 
 msgid "Checking object directories"
 msgstr ""
 

-#: builtin/fsck.c:635
+#: builtin/fsck.c:660

 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 

-#: builtin/fsck.c:641
+#: builtin/fsck.c:666

 msgid "show unreachable objects"
 msgstr ""
 
 msgid "show unreachable objects"
 msgstr ""
 

-#: builtin/fsck.c:642
+#: builtin/fsck.c:667

 msgid "show dangling objects"
 msgstr ""
 
 msgid "show dangling objects"
 msgstr ""
 

-#: builtin/fsck.c:643
+#: builtin/fsck.c:668

 msgid "report tags"
 msgstr ""
 
 msgid "report tags"
 msgstr ""
 

-#: builtin/fsck.c:644
+#: builtin/fsck.c:669

 msgid "report root nodes"
 msgstr ""
 
 msgid "report root nodes"
 msgstr ""
 

-#: builtin/fsck.c:645
+#: builtin/fsck.c:670

 msgid "make index objects head nodes"
 msgstr ""
 
 msgid "make index objects head nodes"
 msgstr ""
 

-#: builtin/fsck.c:646
+#: builtin/fsck.c:671

 msgid "make reflogs head nodes (default)"
 msgstr ""
 
 msgid "make reflogs head nodes (default)"
 msgstr ""
 

-#: builtin/fsck.c:647
+#: builtin/fsck.c:672

 msgid "also consider packs and alternate objects"
 msgstr ""
 
 msgid "also consider packs and alternate objects"
 msgstr ""
 

-#: builtin/fsck.c:648
+#: builtin/fsck.c:673

 msgid "check only connectivity"
 msgstr ""
 
 msgid "check only connectivity"
 msgstr ""
 

-#: builtin/fsck.c:649
+#: builtin/fsck.c:674

 msgid "enable more strict checking"
 msgstr ""
 
 msgid "enable more strict checking"
 msgstr ""
 

-#: builtin/fsck.c:651
+#: builtin/fsck.c:676

 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 

-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108

 msgid "show progress"
 msgstr ""
 
 msgid "show progress"
 msgstr ""
 

-#: builtin/fsck.c:653
+#: builtin/fsck.c:678

 msgid "show verbose names for reachable objects"
 msgstr ""
 
 msgid "show verbose names for reachable objects"
 msgstr ""
 

-#: builtin/fsck.c:714
+#: builtin/fsck.c:742

 msgid "Checking objects"
 msgstr ""
 
 msgid "Checking objects"
 msgstr ""
 


@@ -8082,37 +8271,37 @@ msgstr ""
 msgid "enable auto-gc mode"
 msgstr ""
 
 msgid "enable auto-gc mode"
 msgstr ""
 

-#: builtin/gc.c:364
+#: builtin/gc.c:366

 msgid "force running gc even if there may be another gc running"
 msgstr ""
 
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 

-#: builtin/gc.c:381
+#: builtin/gc.c:384

 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr ""
 

-#: builtin/gc.c:409
+#: builtin/gc.c:412

 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 

-#: builtin/gc.c:411
+#: builtin/gc.c:414

 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 

-#: builtin/gc.c:412
+#: builtin/gc.c:415

 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 

-#: builtin/gc.c:437
+#: builtin/gc.c:440

 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 

-#: builtin/gc.c:481
+#: builtin/gc.c:487

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


@@ -8121,12 +8310,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 

-#: builtin/grep.c:226
+#: builtin/grep.c:225

 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 

-#: builtin/grep.c:284
+#: builtin/grep.c:283

 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""


@@ -8135,280 +8324,280 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
 #. variable for tweaking threads, currently
 #. grep.threads
 #.

-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 

-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622

 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 

-#: builtin/grep.c:630
+#: builtin/grep.c:637

 #, 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:696
+#: builtin/grep.c:703

 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 

-#: builtin/grep.c:783
+#: builtin/grep.c:790

 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:785
+#: builtin/grep.c:792

 msgid "find in contents not managed by git"
 msgstr ""
 
 msgid "find in contents not managed by git"
 msgstr ""
 

-#: builtin/grep.c:787
+#: builtin/grep.c:794

 msgid "search in both tracked and untracked files"
 msgstr ""
 
 msgid "search in both tracked and untracked files"
 msgstr ""
 

-#: builtin/grep.c:789
+#: builtin/grep.c:796

 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 

-#: builtin/grep.c:791
+#: builtin/grep.c:798

 msgid "recursively search in each submodule"
 msgstr ""
 
 msgid "recursively search in each submodule"
 msgstr ""
 

-#: builtin/grep.c:794
+#: builtin/grep.c:801

 msgid "show non-matching lines"
 msgstr ""
 
 msgid "show non-matching lines"
 msgstr ""
 

-#: builtin/grep.c:796
+#: builtin/grep.c:803

 msgid "case insensitive matching"
 msgstr ""
 
 msgid "case insensitive matching"
 msgstr ""
 

-#: builtin/grep.c:798
+#: builtin/grep.c:805

 msgid "match patterns only at word boundaries"
 msgstr ""
 
 msgid "match patterns only at word boundaries"
 msgstr ""
 

-#: builtin/grep.c:800
+#: builtin/grep.c:807

 msgid "process binary files as text"
 msgstr ""
 
 msgid "process binary files as text"
 msgstr ""
 

-#: builtin/grep.c:802
+#: builtin/grep.c:809

 msgid "don't match patterns in binary files"
 msgstr ""
 
 msgid "don't match patterns in binary files"
 msgstr ""
 

-#: builtin/grep.c:805
+#: builtin/grep.c:812

 msgid "process binary files with textconv filters"
 msgstr ""
 
 msgid "process binary files with textconv filters"
 msgstr ""
 

-#: builtin/grep.c:807
+#: builtin/grep.c:814

 msgid "descend at most <depth> levels"
 msgstr ""
 
 msgid "descend at most <depth> levels"
 msgstr ""
 

-#: builtin/grep.c:811
+#: builtin/grep.c:818

 msgid "use extended POSIX regular expressions"
 msgstr ""
 
 msgid "use extended POSIX regular expressions"
 msgstr ""
 

-#: builtin/grep.c:814
+#: builtin/grep.c:821

 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 

-#: builtin/grep.c:817
+#: builtin/grep.c:824

 msgid "interpret patterns as fixed strings"
 msgstr ""
 
 msgid "interpret patterns as fixed strings"
 msgstr ""
 

-#: builtin/grep.c:820
+#: builtin/grep.c:827

 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 

-#: builtin/grep.c:823
+#: builtin/grep.c:830

 msgid "show line numbers"
 msgstr ""
 
 msgid "show line numbers"
 msgstr ""
 

-#: builtin/grep.c:824
+#: builtin/grep.c:831

 msgid "don't show filenames"
 msgstr ""
 
 msgid "don't show filenames"
 msgstr ""
 

-#: builtin/grep.c:825
+#: builtin/grep.c:832

 msgid "show filenames"
 msgstr ""
 
 msgid "show filenames"
 msgstr ""
 

-#: builtin/grep.c:827
+#: builtin/grep.c:834

 msgid "show filenames relative to top directory"
 msgstr ""
 
 msgid "show filenames relative to top directory"
 msgstr ""
 

-#: builtin/grep.c:829
+#: builtin/grep.c:836

 msgid "show only filenames instead of matching lines"
 msgstr ""
 
 msgid "show only filenames instead of matching lines"
 msgstr ""
 

-#: builtin/grep.c:831
+#: builtin/grep.c:838

 msgid "synonym for --files-with-matches"
 msgstr ""
 
 msgid "synonym for --files-with-matches"
 msgstr ""
 

-#: builtin/grep.c:834
+#: builtin/grep.c:841

 msgid "show only the names of files without match"
 msgstr ""
 
 msgid "show only the names of files without match"
 msgstr ""
 

-#: builtin/grep.c:836
+#: builtin/grep.c:843

 msgid "print NUL after filenames"
 msgstr ""
 
 msgid "print NUL after filenames"
 msgstr ""
 

-#: builtin/grep.c:838
+#: builtin/grep.c:846

 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:839
+#: builtin/grep.c:847

 msgid "highlight matches"
 msgstr ""
 
 msgid "highlight matches"
 msgstr ""
 

-#: builtin/grep.c:841
+#: builtin/grep.c:849

 msgid "print empty line between matches from different files"
 msgstr ""
 
 msgid "print empty line between matches from different files"
 msgstr ""
 

-#: builtin/grep.c:843
+#: builtin/grep.c:851

 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:846
+#: builtin/grep.c:854

 msgid "show <n> context lines before and after matches"
 msgstr ""
 
 msgid "show <n> context lines before and after matches"
 msgstr ""
 

-#: builtin/grep.c:849
+#: builtin/grep.c:857

 msgid "show <n> context lines before matches"
 msgstr ""
 
 msgid "show <n> context lines before matches"
 msgstr ""
 

-#: builtin/grep.c:851
+#: builtin/grep.c:859

 msgid "show <n> context lines after matches"
 msgstr ""
 
 msgid "show <n> context lines after matches"
 msgstr ""
 

-#: builtin/grep.c:853
+#: builtin/grep.c:861

 msgid "use <n> worker threads"
 msgstr ""
 
 msgid "use <n> worker threads"
 msgstr ""
 

-#: builtin/grep.c:854
+#: builtin/grep.c:862

 msgid "shortcut for -C NUM"
 msgstr ""
 
 msgid "shortcut for -C NUM"
 msgstr ""
 

-#: builtin/grep.c:857
+#: builtin/grep.c:865

 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:859
+#: builtin/grep.c:867

 msgid "show the surrounding function"
 msgstr ""
 
 msgid "show the surrounding function"
 msgstr ""
 

-#: builtin/grep.c:862
+#: builtin/grep.c:870

 msgid "read patterns from file"
 msgstr ""
 
 msgid "read patterns from file"
 msgstr ""
 

-#: builtin/grep.c:864
+#: builtin/grep.c:872

 msgid "match <pattern>"
 msgstr ""
 
 msgid "match <pattern>"
 msgstr ""
 

-#: builtin/grep.c:866
+#: builtin/grep.c:874

 msgid "combine patterns specified with -e"
 msgstr ""
 
 msgid "combine patterns specified with -e"
 msgstr ""
 

-#: builtin/grep.c:878
+#: builtin/grep.c:886

 msgid "indicate hit with exit status without output"
 msgstr ""
 
 msgid "indicate hit with exit status without output"
 msgstr ""
 

-#: builtin/grep.c:880
+#: builtin/grep.c:888

 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:882
+#: builtin/grep.c:890

 msgid "show parse tree for grep expression"
 msgstr ""
 
 msgid "show parse tree for grep expression"
 msgstr ""
 

-#: builtin/grep.c:886
+#: builtin/grep.c:894

 msgid "pager"
 msgstr ""
 
 msgid "pager"
 msgstr ""
 

-#: builtin/grep.c:886
+#: builtin/grep.c:894

 msgid "show matching files in the pager"
 msgstr ""
 
 msgid "show matching files in the pager"
 msgstr ""
 

-#: builtin/grep.c:889
+#: builtin/grep.c:898

 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:952
+#: builtin/grep.c:962

 msgid "no pattern given."
 msgstr ""
 
 msgid "no pattern given."
 msgstr ""
 

-#: builtin/grep.c:984
+#: builtin/grep.c:994

 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:991
+#: builtin/grep.c:1001

 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 

-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519

 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 

-#: builtin/grep.c:1031
+#: builtin/grep.c:1041

 msgid "no threads support, ignoring --threads"
 msgstr ""
 
 msgid "no threads support, ignoring --threads"
 msgstr ""
 

-#: builtin/grep.c:1055
+#: builtin/grep.c:1065

 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:1078
+#: builtin/grep.c:1088

 msgid "option not supported with --recurse-submodules."
 msgstr ""
 
 msgid "option not supported with --recurse-submodules."
 msgstr ""
 

-#: builtin/grep.c:1084
+#: builtin/grep.c:1094

 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:1090
+#: builtin/grep.c:1100

 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:1098
+#: builtin/grep.c:1108

 msgid "both --cached and trees are given."
 msgstr ""
 
 msgid "both --cached and trees are given."
 msgstr ""
 

-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83

 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:83
+#: builtin/hash-object.c:84

 msgid "git hash-object  --stdin-paths"
 msgstr ""
 
 msgid "git hash-object  --stdin-paths"
 msgstr ""
 

-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96

 msgid "type"
 msgstr ""
 
 msgid "type"
 msgstr ""
 

-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96

 msgid "object type"
 msgstr ""
 
 msgid "object type"
 msgstr ""
 

-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97

 msgid "write the object into the object database"
 msgstr ""
 
 msgid "write the object into the object database"
 msgstr ""
 

-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99

 msgid "read the object from stdin"
 msgstr ""
 
 msgid "read the object from stdin"
 msgstr ""
 

-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101

 msgid "store file as is without filters"
 msgstr ""
 
 msgid "store file as is without filters"
 msgstr ""
 

-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102

 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:102
+#: builtin/hash-object.c:103

 msgid "process file as it were from this path"
 msgstr ""
 
 msgid "process file as it were from this path"
 msgstr ""
 


@@ -8536,152 +8725,152 @@ msgstr ""
 msgid "usage: %s%s"
 msgstr ""
 
 msgid "usage: %s%s"
 msgstr ""
 

-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157

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

-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207

 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 

-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227

 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 
 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 

-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230

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

-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272

 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282

 msgid "early EOF"
 msgstr ""
 
 msgid "early EOF"
 msgstr ""
 

-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283

 msgid "read error on input"
 msgstr ""
 
 msgid "read error on input"
 msgstr ""
 

-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295

 msgid "used more bytes than were available"
 msgstr ""
 
 msgid "used more bytes than were available"
 msgstr ""
 

-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302

 msgid "pack too large for current definition of off_t"
 msgstr ""
 
 msgid "pack too large for current definition of off_t"
 msgstr ""
 

-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93

 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 

-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320

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

-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326

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

-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340

 msgid "pack signature mismatch"
 msgstr ""
 
 msgid "pack signature mismatch"
 msgstr ""
 

-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342

 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 

-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360

 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 

-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481

 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 

-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530

 msgid "offset value overflow for delta base object"
 msgstr ""
 
 msgid "offset value overflow for delta base object"
 msgstr ""
 

-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538

 msgid "delta base offset is out of bound"
 msgstr ""
 
 msgid "delta base offset is out of bound"
 msgstr ""
 

-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546

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

-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577

 msgid "cannot pread pack file"
 msgstr ""
 
 msgid "cannot pread pack file"
 msgstr ""
 

-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579

 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605

 msgid "serious inflate inconsistency"
 msgstr ""
 
 msgid "serious inflate inconsistency"
 msgstr ""
 

-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827

 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 

-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276

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

-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816

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

-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824

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

-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838

 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 

-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853

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

-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856

 msgid "Error in object"
 msgstr ""
 
 msgid "Error in object"
 msgstr ""
 

-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858

 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 

-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961

 msgid "failed to apply delta"
 msgstr ""
 
 msgid "failed to apply delta"
 msgstr ""
 


@@ -8751,77 +8940,81 @@ msgstr ""
 msgid "local object %s is corrupt"
 msgstr ""
 
 msgid "local object %s is corrupt"
 msgstr ""
 

-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422

 #, c-format
 #, c-format

-msgid "cannot write keep file '%s'"
+msgid "cannot write %s file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430

 #, c-format
 #, c-format

-msgid "cannot close written keep file '%s'"
+msgid "cannot close written %s file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1468

 msgid "cannot store pack file"
 msgstr ""
 
 msgid "cannot store pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476

 msgid "cannot store index file"
 msgstr ""
 
 msgid "cannot store index file"
 msgstr ""
 

-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 

-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581

 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583

 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631

 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638

 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"

 msgstr ""
 
 msgstr ""
 

-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747

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

-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763

 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 

-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765

 msgid "--stdin requires a git repository"
 msgstr ""
 
 msgid "--stdin requires a git repository"
 msgstr ""
 

-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771

 msgid "--verify with no packfile name given"
 msgstr ""
 
 msgid "--verify with no packfile name given"
 msgstr ""
 


@@ -8999,346 +9192,346 @@ msgstr ""
 msgid "no input file given for in-place editing"
 msgstr ""
 
 msgid "no input file given for in-place editing"
 msgstr ""
 

-#: builtin/log.c:46
+#: builtin/log.c:48

 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 

-#: builtin/log.c:47
+#: builtin/log.c:49

 msgid "git show [<options>] <object>..."
 msgstr ""
 
 msgid "git show [<options>] <object>..."
 msgstr ""
 

-#: builtin/log.c:91
+#: builtin/log.c:93

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

-#: builtin/log.c:151
+#: builtin/log.c:153

 msgid "suppress diff output"
 msgstr ""
 
 msgid "suppress diff output"
 msgstr ""
 

-#: builtin/log.c:152
+#: builtin/log.c:154

 msgid "show source"
 msgstr ""
 
 msgid "show source"
 msgstr ""
 

-#: builtin/log.c:153
+#: builtin/log.c:155

 msgid "Use mail map file"
 msgstr ""
 
 msgid "Use mail map file"
 msgstr ""
 

-#: builtin/log.c:155
+#: builtin/log.c:157

 msgid "only decorate refs that match <pattern>"
 msgstr ""
 
 msgid "only decorate refs that match <pattern>"
 msgstr ""
 

-#: builtin/log.c:157
+#: builtin/log.c:159

 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 
 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 

-#: builtin/log.c:158
+#: builtin/log.c:160

 msgid "decorate options"
 msgstr ""
 
 msgid "decorate options"
 msgstr ""
 

-#: builtin/log.c:161
+#: builtin/log.c:163

 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:257
+#: builtin/log.c:259

 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 

-#: builtin/log.c:508
+#: builtin/log.c:510

 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 

-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619

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

-#: builtin/log.c:641
+#: builtin/log.c:643

 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 
 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 

-#: builtin/log.c:762
+#: builtin/log.c:764

 msgid "format.headers without value"
 msgstr ""
 
 msgid "format.headers without value"
 msgstr ""
 

-#: builtin/log.c:863
+#: builtin/log.c:865

 msgid "name of output directory is too long"
 msgstr ""
 
 msgid "name of output directory is too long"
 msgstr ""
 

-#: builtin/log.c:879
+#: builtin/log.c:881

 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 

-#: builtin/log.c:896
+#: builtin/log.c:898

 msgid "Need exactly one range."
 msgstr ""
 
 msgid "Need exactly one range."
 msgstr ""
 

-#: builtin/log.c:906
+#: builtin/log.c:908

 msgid "Not a range."
 msgstr ""
 
 msgid "Not a range."
 msgstr ""
 

-#: builtin/log.c:1012
+#: builtin/log.c:1014

 msgid "Cover letter needs email format"
 msgstr ""
 
 msgid "Cover letter needs email format"
 msgstr ""
 

-#: builtin/log.c:1092
+#: builtin/log.c:1095

 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 

-#: builtin/log.c:1119
+#: builtin/log.c:1122

 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 

-#: builtin/log.c:1169
+#: builtin/log.c:1172

 msgid "Two output directories?"
 msgstr ""
 
 msgid "Two output directories?"
 msgstr ""
 

-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946

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

-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522

 #, 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:1291
+#: builtin/log.c:1294

 msgid "Could not find exact merge base."
 msgstr ""
 
 msgid "Could not find exact merge base."
 msgstr ""
 

-#: builtin/log.c:1295
+#: builtin/log.c:1298

 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:1315
+#: builtin/log.c:1318

 msgid "Failed to find exact merge base"
 msgstr ""
 
 msgid "Failed to find exact merge base"
 msgstr ""
 

-#: builtin/log.c:1326
+#: builtin/log.c:1329

 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:1330
+#: builtin/log.c:1333

 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 

-#: builtin/log.c:1379
+#: builtin/log.c:1382

 msgid "cannot get patch id"
 msgstr ""
 
 msgid "cannot get patch id"
 msgstr ""
 

-#: builtin/log.c:1438
+#: builtin/log.c:1441

 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:1441
+#: builtin/log.c:1444

 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 

-#: builtin/log.c:1445
+#: builtin/log.c:1448

 msgid "print patches to standard out"
 msgstr ""
 
 msgid "print patches to standard out"
 msgstr ""
 

-#: builtin/log.c:1447
+#: builtin/log.c:1450

 msgid "generate a cover letter"
 msgstr ""
 
 msgid "generate a cover letter"
 msgstr ""
 

-#: builtin/log.c:1449
+#: builtin/log.c:1452

 msgid "use simple number sequence for output file names"
 msgstr ""
 
 msgid "use simple number sequence for output file names"
 msgstr ""
 

-#: builtin/log.c:1450
+#: builtin/log.c:1453

 msgid "sfx"
 msgstr ""
 
 msgid "sfx"
 msgstr ""
 

-#: builtin/log.c:1451
+#: builtin/log.c:1454

 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 

-#: builtin/log.c:1453
+#: builtin/log.c:1456

 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 

-#: builtin/log.c:1455
+#: builtin/log.c:1458

 msgid "mark the series as Nth re-roll"
 msgstr ""
 
 msgid "mark the series as Nth re-roll"
 msgstr ""
 

-#: builtin/log.c:1457
+#: builtin/log.c:1460

 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1460
+#: builtin/log.c:1463

 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1463
+#: builtin/log.c:1466

 msgid "store resulting files in <dir>"
 msgstr ""
 
 msgid "store resulting files in <dir>"
 msgstr ""
 

-#: builtin/log.c:1466
+#: builtin/log.c:1469

 msgid "don't strip/add [PATCH]"
 msgstr ""
 
 msgid "don't strip/add [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1469
+#: builtin/log.c:1472

 msgid "don't output binary diffs"
 msgstr ""
 
 msgid "don't output binary diffs"
 msgstr ""
 

-#: builtin/log.c:1471
+#: builtin/log.c:1474

 msgid "output all-zero hash in From header"
 msgstr ""
 
 msgid "output all-zero hash in From header"
 msgstr ""
 

-#: builtin/log.c:1473
+#: builtin/log.c:1476

 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:1475
+#: builtin/log.c:1478

 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 

-#: builtin/log.c:1477
+#: builtin/log.c:1480

 msgid "Messaging"
 msgstr ""
 
 msgid "Messaging"
 msgstr ""
 

-#: builtin/log.c:1478
+#: builtin/log.c:1481

 msgid "header"
 msgstr ""
 
 msgid "header"
 msgstr ""
 

-#: builtin/log.c:1479
+#: builtin/log.c:1482

 msgid "add email header"
 msgstr ""
 
 msgid "add email header"
 msgstr ""
 

-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485

 msgid "email"
 msgstr ""
 
 msgid "email"
 msgstr ""
 

-#: builtin/log.c:1480
+#: builtin/log.c:1483

 msgid "add To: header"
 msgstr ""
 
 msgid "add To: header"
 msgstr ""
 

-#: builtin/log.c:1482
+#: builtin/log.c:1485

 msgid "add Cc: header"
 msgstr ""
 
 msgid "add Cc: header"
 msgstr ""
 

-#: builtin/log.c:1484
+#: builtin/log.c:1487

 msgid "ident"
 msgstr ""
 
 msgid "ident"
 msgstr ""
 

-#: builtin/log.c:1485
+#: builtin/log.c:1488

 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:1487
+#: builtin/log.c:1490

 msgid "message-id"
 msgstr ""
 
 msgid "message-id"
 msgstr ""
 

-#: builtin/log.c:1488
+#: builtin/log.c:1491

 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 

-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495

 msgid "boundary"
 msgstr ""
 
 msgid "boundary"
 msgstr ""
 

-#: builtin/log.c:1490
+#: builtin/log.c:1493

 msgid "attach the patch"
 msgstr ""
 
 msgid "attach the patch"
 msgstr ""
 

-#: builtin/log.c:1493
+#: builtin/log.c:1496

 msgid "inline the patch"
 msgstr ""
 
 msgid "inline the patch"
 msgstr ""
 

-#: builtin/log.c:1497
+#: builtin/log.c:1500

 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 

-#: builtin/log.c:1499
+#: builtin/log.c:1502

 msgid "signature"
 msgstr ""
 
 msgid "signature"
 msgstr ""
 

-#: builtin/log.c:1500
+#: builtin/log.c:1503

 msgid "add a signature"
 msgstr ""
 
 msgid "add a signature"
 msgstr ""
 

-#: builtin/log.c:1501
+#: builtin/log.c:1504

 msgid "base-commit"
 msgstr ""
 
 msgid "base-commit"
 msgstr ""
 

-#: builtin/log.c:1502
+#: builtin/log.c:1505

 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 

-#: builtin/log.c:1504
+#: builtin/log.c:1507

 msgid "add a signature from a file"
 msgstr ""
 
 msgid "add a signature from a file"
 msgstr ""
 

-#: builtin/log.c:1505
+#: builtin/log.c:1508

 msgid "don't print the patch filenames"
 msgstr ""
 
 msgid "don't print the patch filenames"
 msgstr ""
 

-#: builtin/log.c:1507
+#: builtin/log.c:1510

 msgid "show progress while generating patches"
 msgstr ""
 
 msgid "show progress while generating patches"
 msgstr ""
 

-#: builtin/log.c:1582
+#: builtin/log.c:1585

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

-#: builtin/log.c:1597
+#: builtin/log.c:1600

 msgid "-n and -k are mutually exclusive."
 msgstr ""
 
 msgid "-n and -k are mutually exclusive."
 msgstr ""
 

-#: builtin/log.c:1599
+#: builtin/log.c:1602

 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr ""
 
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr ""
 

-#: builtin/log.c:1607
+#: builtin/log.c:1610

 msgid "--name-only does not make sense"
 msgstr ""
 
 msgid "--name-only does not make sense"
 msgstr ""
 

-#: builtin/log.c:1609
+#: builtin/log.c:1612

 msgid "--name-status does not make sense"
 msgstr ""
 
 msgid "--name-status does not make sense"
 msgstr ""
 

-#: builtin/log.c:1611
+#: builtin/log.c:1614

 msgid "--check does not make sense"
 msgstr ""
 
 msgid "--check does not make sense"
 msgstr ""
 

-#: builtin/log.c:1641
+#: builtin/log.c:1646

 msgid "standard output, or directory, which one?"
 msgstr ""
 
 msgid "standard output, or directory, which one?"
 msgstr ""
 

-#: builtin/log.c:1643
+#: builtin/log.c:1648

 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 

-#: builtin/log.c:1736
+#: builtin/log.c:1741

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

-#: builtin/log.c:1768
+#: builtin/log.c:1773

 msgid "Generating patches"
 msgstr ""
 
 msgid "Generating patches"
 msgstr ""
 

-#: builtin/log.c:1812
+#: builtin/log.c:1817

 msgid "Failed to create output files"
 msgstr ""
 
 msgid "Failed to create output files"
 msgstr ""
 

-#: builtin/log.c:1862
+#: builtin/log.c:1867

 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 

-#: builtin/log.c:1916
+#: builtin/log.c:1921

 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"


@@ -9487,7 +9680,7 @@ msgstr ""
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 

-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67

 msgid "show underlying ref in addition to the object pointed by it"
 msgstr ""
 
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr ""
 


@@ -9532,180 +9725,180 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr ""
 
 msgid "empty mbox: '%s'"
 msgstr ""
 

-#: builtin/merge.c:48
+#: builtin/merge.c:49

 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 

-#: builtin/merge.c:49
+#: builtin/merge.c:50

 msgid "git merge --abort"
 msgstr ""
 
 msgid "git merge --abort"
 msgstr ""
 

-#: builtin/merge.c:50
+#: builtin/merge.c:51

 msgid "git merge --continue"
 msgstr ""
 
 msgid "git merge --continue"
 msgstr ""
 

-#: builtin/merge.c:107
+#: builtin/merge.c:108

 msgid "switch `m' requires a value"
 msgstr ""
 
 msgid "switch `m' requires a value"
 msgstr ""
 

-#: builtin/merge.c:144
+#: builtin/merge.c:145

 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 

-#: builtin/merge.c:145
+#: builtin/merge.c:146

 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 

-#: builtin/merge.c:150
+#: builtin/merge.c:151

 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 

-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137

 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:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140

 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:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143

 msgid "(synonym to --stat)"
 msgstr ""
 
 msgid "(synonym to --stat)"
 msgstr ""
 

-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146

 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:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152

 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:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155

 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 

-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158

 msgid "edit message before committing"
 msgstr ""
 
 msgid "edit message before committing"
 msgstr ""
 

-#: builtin/merge.c:214
+#: builtin/merge.c:215

 msgid "allow fast-forward (default)"
 msgstr ""
 
 msgid "allow fast-forward (default)"
 msgstr ""
 

-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164

 msgid "abort if fast-forward is not possible"
 msgstr ""
 
 msgid "abort if fast-forward is not possible"
 msgstr ""
 

-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167

 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:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171

 #: builtin/revert.c:109
 msgid "strategy"
 msgstr ""
 
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr ""
 

-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172

 msgid "merge strategy to use"
 msgstr ""
 
 msgid "merge strategy to use"
 msgstr ""
 

-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175

 msgid "option=value"
 msgstr ""
 
 msgid "option=value"
 msgstr ""
 

-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176

 msgid "option for selected merge strategy"
 msgstr ""
 
 msgid "option for selected merge strategy"
 msgstr ""
 

-#: builtin/merge.c:226
+#: builtin/merge.c:227

 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:230
+#: builtin/merge.c:231

 msgid "abort the current in-progress merge"
 msgstr ""
 
 msgid "abort the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:232
+#: builtin/merge.c:233

 msgid "continue the current in-progress merge"
 msgstr ""
 
 msgid "continue the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183

 msgid "allow merging unrelated histories"
 msgstr ""
 
 msgid "allow merging unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:240
+#: builtin/merge.c:241

 msgid "verify commit-msg hook"
 msgstr ""
 
 msgid "verify commit-msg hook"
 msgstr ""
 

-#: builtin/merge.c:265
+#: builtin/merge.c:266

 msgid "could not run stash."
 msgstr ""
 
 msgid "could not run stash."
 msgstr ""
 

-#: builtin/merge.c:270
+#: builtin/merge.c:271

 msgid "stash failed"
 msgstr ""
 
 msgid "stash failed"
 msgstr ""
 

-#: builtin/merge.c:275
+#: builtin/merge.c:276

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

-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315

 msgid "read-tree failed"
 msgstr ""
 
 msgid "read-tree failed"
 msgstr ""
 

-#: builtin/merge.c:344
+#: builtin/merge.c:345

 msgid " (nothing to squash)"
 msgstr ""
 
 msgid " (nothing to squash)"
 msgstr ""
 

-#: builtin/merge.c:355
+#: builtin/merge.c:356

 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 

-#: builtin/merge.c:405
+#: builtin/merge.c:406

 #, 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:455
+#: builtin/merge.c:456

 #, 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:545
+#: builtin/merge.c:546

 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 

-#: builtin/merge.c:667
+#: builtin/merge.c:668

 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 

-#: builtin/merge.c:681
+#: builtin/merge.c:682

 #, 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:696
+#: builtin/merge.c:697

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

-#: builtin/merge.c:748
+#: builtin/merge.c:749

 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 

-#: builtin/merge.c:757
+#: builtin/merge.c:758

 #, 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:763
+#: builtin/merge.c:764

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


@@ -9715,185 +9908,185 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
 "the commit.\n"
 msgstr ""
 

-#: builtin/merge.c:799
+#: builtin/merge.c:800

 msgid "Empty commit message."
 msgstr ""
 
 msgid "Empty commit message."
 msgstr ""
 

-#: builtin/merge.c:819
+#: builtin/merge.c:820

 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 

-#: builtin/merge.c:872
+#: builtin/merge.c:873

 #, 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:911
+#: builtin/merge.c:912

 msgid "No current branch."
 msgstr ""
 
 msgid "No current branch."
 msgstr ""
 

-#: builtin/merge.c:913
+#: builtin/merge.c:914

 msgid "No remote for the current branch."
 msgstr ""
 
 msgid "No remote for the current branch."
 msgstr ""
 

-#: builtin/merge.c:915
+#: builtin/merge.c:916

 msgid "No default upstream defined for the current branch."
 msgstr ""
 
 msgid "No default upstream defined for the current branch."
 msgstr ""
 

-#: builtin/merge.c:920
+#: builtin/merge.c:921

 #, 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:973
+#: builtin/merge.c:974

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

-#: builtin/merge.c:1075
+#: builtin/merge.c:1076

 #, 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:1109
+#: builtin/merge.c:1110

 msgid "not something we can merge"
 msgstr ""
 
 msgid "not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1174
+#: builtin/merge.c:1212

 msgid "--abort expects no arguments"
 msgstr ""
 
 msgid "--abort expects no arguments"
 msgstr ""
 

-#: builtin/merge.c:1178
+#: builtin/merge.c:1216

 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:1190
+#: builtin/merge.c:1228

 msgid "--continue expects no arguments"
 msgstr ""
 
 msgid "--continue expects no arguments"
 msgstr ""
 

-#: builtin/merge.c:1194
+#: builtin/merge.c:1232

 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:1210
+#: builtin/merge.c:1248

 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:1217
+#: builtin/merge.c:1255

 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:1220
+#: builtin/merge.c:1258

 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:1229
+#: builtin/merge.c:1267

 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 

-#: builtin/merge.c:1237
+#: builtin/merge.c:1275

 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 

-#: builtin/merge.c:1254
+#: builtin/merge.c:1292

 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 

-#: builtin/merge.c:1256
+#: builtin/merge.c:1294

 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:1261
+#: builtin/merge.c:1299

 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1263
+#: builtin/merge.c:1301

 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:1297
+#: builtin/merge.c:1335

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

-#: builtin/merge.c:1300
+#: builtin/merge.c:1338

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

-#: builtin/merge.c:1303
+#: builtin/merge.c:1341

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

-#: builtin/merge.c:1306
+#: builtin/merge.c:1344

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

-#: builtin/merge.c:1368
+#: builtin/merge.c:1403

 msgid "refusing to merge unrelated histories"
 msgstr ""
 
 msgid "refusing to merge unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:1377
+#: builtin/merge.c:1412

 msgid "Already up to date."
 msgstr ""
 
 msgid "Already up to date."
 msgstr ""
 

-#: builtin/merge.c:1387
+#: builtin/merge.c:1422

 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 

-#: builtin/merge.c:1428
+#: builtin/merge.c:1463

 #, 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:1435
+#: builtin/merge.c:1470

 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 

-#: builtin/merge.c:1460
+#: builtin/merge.c:1495

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

-#: builtin/merge.c:1466
+#: builtin/merge.c:1501

 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 

-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603

 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 

-#: builtin/merge.c:1493
+#: builtin/merge.c:1528

 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 

-#: builtin/merge.c:1559
+#: builtin/merge.c:1594

 #, 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:1561
+#: builtin/merge.c:1596

 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 

-#: builtin/merge.c:1570
+#: builtin/merge.c:1605

 #, 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:1582
+#: builtin/merge.c:1617

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


@@ -10045,72 +10238,72 @@ msgstr ""
 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:167
+#: builtin/mv.c:168

 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 

-#: builtin/mv.c:178
+#: builtin/mv.c:179

 #, 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:182
+#: builtin/mv.c:183

 msgid "bad source"
 msgstr ""
 
 msgid "bad source"
 msgstr ""
 

-#: builtin/mv.c:185
+#: builtin/mv.c:186

 msgid "can not move directory into itself"
 msgstr ""
 
 msgid "can not move directory into itself"
 msgstr ""
 

-#: builtin/mv.c:188
+#: builtin/mv.c:189

 msgid "cannot move directory over file"
 msgstr ""
 
 msgid "cannot move directory over file"
 msgstr ""
 

-#: builtin/mv.c:197
+#: builtin/mv.c:198

 msgid "source directory is empty"
 msgstr ""
 
 msgid "source directory is empty"
 msgstr ""
 

-#: builtin/mv.c:222
+#: builtin/mv.c:223

 msgid "not under version control"
 msgstr ""
 
 msgid "not under version control"
 msgstr ""
 

-#: builtin/mv.c:225
+#: builtin/mv.c:226

 msgid "destination exists"
 msgstr ""
 
 msgid "destination exists"
 msgstr ""
 

-#: builtin/mv.c:233
+#: builtin/mv.c:234

 #, c-format
 msgid "overwriting '%s'"
 msgstr ""
 
 #, c-format
 msgid "overwriting '%s'"
 msgstr ""
 

-#: builtin/mv.c:236
+#: builtin/mv.c:237

 msgid "Cannot overwrite"
 msgstr ""
 
 msgid "Cannot overwrite"
 msgstr ""
 

-#: builtin/mv.c:239
+#: builtin/mv.c:240

 msgid "multiple sources for the same target"
 msgstr ""
 
 msgid "multiple sources for the same target"
 msgstr ""
 

-#: builtin/mv.c:241
+#: builtin/mv.c:242

 msgid "destination directory does not exist"
 msgstr ""
 
 msgid "destination directory does not exist"
 msgstr ""
 

-#: builtin/mv.c:248
+#: builtin/mv.c:249

 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 

-#: builtin/mv.c:269
+#: builtin/mv.c:270

 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 

-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394

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


@@ -10295,12 +10488,12 @@ msgstr ""
 msgid "the note contents have been left in %s"
 msgstr ""
 
 msgid "the note contents have been left in %s"
 msgstr ""
 

-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506

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

-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509

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


@@ -10534,7 +10727,7 @@ msgstr ""
 msgid "read object names from the standard input"
 msgstr ""
 
 msgid "read object names from the standard input"
 msgstr ""
 

-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160

 msgid "do not remove, show only"
 msgstr ""
 
 msgid "do not remove, show only"
 msgstr ""
 


@@ -10565,182 +10758,186 @@ 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:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198

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

-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791

 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:801
+#: builtin/pack-objects.c:804

 msgid "Writing objects"
 msgstr ""
 
 msgid "Writing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084

 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:2451
+#: builtin/pack-objects.c:2454

 msgid "Compressing objects"
 msgstr ""
 
 msgid "Compressing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625

 msgid "invalid value for --missing"
 msgstr ""
 
 msgid "invalid value for --missing"
 msgstr ""
 

-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928

 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932

 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 

-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962

 msgid "do not show progress meter"
 msgstr ""
 
 msgid "do not show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964

 msgid "show progress meter"
 msgstr ""
 
 msgid "show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966

 msgid "show progress meter during object writing phase"
 msgstr ""
 
 msgid "show progress meter during object writing phase"
 msgstr ""
 

-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969

 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 

-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970

 msgid "version[,offset]"
 msgstr ""
 
 msgid "version[,offset]"
 msgstr ""
 

-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971

 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 

-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974

 msgid "maximum size of each output pack file"
 msgstr ""
 
 msgid "maximum size of each output pack file"
 msgstr ""
 

-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976

 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 

-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978

 msgid "ignore packed objects"
 msgstr ""
 
 msgid "ignore packed objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980

 msgid "limit pack window by objects"
 msgstr ""
 
 msgid "limit pack window by objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982

 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 

-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984

 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 

-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986

 msgid "reuse existing deltas"
 msgstr ""
 
 msgid "reuse existing deltas"
 msgstr ""
 

-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988

 msgid "reuse existing objects"
 msgstr ""
 
 msgid "reuse existing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990

 msgid "use OFS_DELTA objects"
 msgstr ""
 
 msgid "use OFS_DELTA objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992

 msgid "use threads when searching for best delta matches"
 msgstr ""
 
 msgid "use threads when searching for best delta matches"
 msgstr ""
 

-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994

 msgid "do not create an empty pack output"
 msgstr ""
 
 msgid "do not create an empty pack output"
 msgstr ""
 

-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996

 msgid "read revision arguments from standard input"
 msgstr ""
 
 msgid "read revision arguments from standard input"
 msgstr ""
 

-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998

 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 

-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001

 msgid "include objects reachable from any reference"
 msgstr ""
 
 msgid "include objects reachable from any reference"
 msgstr ""
 

-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004

 msgid "include objects referred by reflog entries"
 msgstr ""
 
 msgid "include objects referred by reflog entries"
 msgstr ""
 

-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007

 msgid "include objects referred to by the index"
 msgstr ""
 
 msgid "include objects referred to by the index"
 msgstr ""
 

-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010

 msgid "output pack to stdout"
 msgstr ""
 
 msgid "output pack to stdout"
 msgstr ""
 

-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012

 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 

-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014

 msgid "keep unreachable objects"
 msgstr ""
 
 msgid "keep unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016

 msgid "pack loose unreachable objects"
 msgstr ""
 
 msgid "pack loose unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018

 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 

-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021

 msgid "create thin packs"
 msgstr ""
 
 msgid "create thin packs"
 msgstr ""
 

-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023

 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 

-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025

 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 

-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027

 msgid "pack compression level"
 msgstr ""
 
 msgid "pack compression level"
 msgstr ""
 

-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029

 msgid "do not hide commits by grafts"
 msgstr ""
 
 msgid "do not hide commits by grafts"
 msgstr ""
 

-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031

 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033

 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:3010
+#: builtin/pack-objects.c:3036

 msgid "handling for missing objects"
 msgstr ""
 
 msgid "handling for missing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3178

 msgid "Counting objects"
 msgstr ""
 
 msgid "Counting objects"
 msgstr ""
 


@@ -10768,15 +10965,19 @@ msgstr ""
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 

-#: builtin/prune.c:106
+#: builtin/prune.c:107

 msgid "report pruned objects"
 msgstr ""
 
 msgid "report pruned objects"
 msgstr ""
 

-#: builtin/prune.c:109
+#: builtin/prune.c:110

 msgid "expire objects older than <time>"
 msgstr ""
 
 msgid "expire objects older than <time>"
 msgstr ""
 

-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:126

 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 


@@ -10868,7 +11069,7 @@ msgstr ""
 msgid "<remote>"
 msgstr ""
 
 msgid "<remote>"
 msgstr ""
 

-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477

 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""


@@ -10889,27 +11090,27 @@ msgid ""
 "from the remote, but no such ref was fetched."
 msgstr ""
 
 "from the remote, but no such ref was fetched."
 msgstr ""
 

-#: builtin/pull.c:817
+#: builtin/pull.c:819

 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 

-#: builtin/pull.c:865
+#: builtin/pull.c:867

 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 

-#: builtin/pull.c:873
+#: builtin/pull.c:875

 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:876
+#: builtin/pull.c:878

 msgid "pull with rebase"
 msgstr ""
 
 msgid "pull with rebase"
 msgstr ""
 

-#: builtin/pull.c:877
+#: builtin/pull.c:879

 msgid "please commit or stash them."
 msgstr ""
 
 msgid "please commit or stash them."
 msgstr ""
 

-#: builtin/pull.c:902
+#: builtin/pull.c:904

 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"


@@ -10917,7 +11118,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
 "commit %s."
 msgstr ""
 

-#: builtin/pull.c:907
+#: builtin/pull.c:909

 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"


@@ -10928,15 +11129,15 @@ msgid ""
 "to recover."
 msgstr ""
 
 "to recover."
 msgstr ""
 

-#: builtin/pull.c:922
+#: builtin/pull.c:924

 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 

-#: builtin/pull.c:926
+#: builtin/pull.c:928

 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 

-#: builtin/pull.c:933
+#: builtin/pull.c:935

 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 


@@ -11262,39 +11463,43 @@ msgstr ""
 msgid "keep empty commits"
 msgstr ""
 
 msgid "keep empty commits"
 msgstr ""
 

-#: builtin/rebase--helper.c:25
-msgid "continue rebase"
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"

 msgstr ""
 
 #: builtin/rebase--helper.c:27
 msgstr ""
 
 #: builtin/rebase--helper.c:27

+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase--helper.c:29

 msgid "abort rebase"
 msgstr ""
 
 msgid "abort rebase"
 msgstr ""
 

-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32

 msgid "make rebase script"
 msgstr ""
 
 msgid "make rebase script"
 msgstr ""
 

-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34

 msgid "shorten commit ids in the todo list"
 msgstr ""
 
 msgid "shorten commit ids in the todo list"
 msgstr ""
 

-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36

 msgid "expand commit ids in the todo list"
 msgstr ""
 
 msgid "expand commit ids in the todo list"
 msgstr ""
 

-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38

 msgid "check the todo list"
 msgstr ""
 
 msgid "check the todo list"
 msgstr ""
 

-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40

 msgid "skip unnecessary picks"
 msgstr ""
 
 msgid "skip unnecessary picks"
 msgstr ""
 

-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42

 msgid "rearrange fixup/squash lines"
 msgstr ""
 
 msgid "rearrange fixup/squash lines"
 msgstr ""
 

-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44

 msgid "insert exec commands in todo list"
 msgstr ""
 
 msgid "insert exec commands in todo list"
 msgstr ""
 


@@ -11302,7 +11507,7 @@ msgstr ""
 msgid "git receive-pack <git-dir>"
 msgstr ""
 
 msgid "git receive-pack <git-dir>"
 msgstr ""
 

-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841

 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"


@@ -11319,7 +11524,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 

-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861

 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"


@@ -11331,15 +11536,15 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 

-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934

 msgid "quiet"
 msgstr ""
 
 msgid "quiet"
 msgstr ""
 

-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948

 msgid "You must specify a directory."
 msgstr ""
 
 msgid "You must specify a directory."
 msgstr ""
 

-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537

 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr ""
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr ""


@@ -11847,87 +12052,87 @@ 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:168
+#: builtin/repack.c:170

 msgid "pack everything in a single pack"
 msgstr ""
 
 msgid "pack everything in a single pack"
 msgstr ""
 

-#: builtin/repack.c:170
+#: builtin/repack.c:172

 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 

-#: builtin/repack.c:173
+#: builtin/repack.c:175

 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 

-#: builtin/repack.c:175
+#: builtin/repack.c:177

 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:177
+#: builtin/repack.c:179

 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:179
+#: builtin/repack.c:181

 msgid "do not run git-update-server-info"
 msgstr ""
 
 msgid "do not run git-update-server-info"
 msgstr ""
 

-#: builtin/repack.c:182
+#: builtin/repack.c:184

 msgid "pass --local to git-pack-objects"
 msgstr ""
 
 msgid "pass --local to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:184
+#: builtin/repack.c:186

 msgid "write bitmap index"
 msgstr ""
 
 msgid "write bitmap index"
 msgstr ""
 

-#: builtin/repack.c:185
+#: builtin/repack.c:187

 msgid "approxidate"
 msgstr ""
 
 msgid "approxidate"
 msgstr ""
 

-#: builtin/repack.c:186
+#: builtin/repack.c:188

 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 

-#: builtin/repack.c:188
+#: builtin/repack.c:190

 msgid "with -a, repack unreachable objects"
 msgstr ""
 
 msgid "with -a, repack unreachable objects"
 msgstr ""
 

-#: builtin/repack.c:190
+#: builtin/repack.c:192

 msgid "size of the window used for delta compression"
 msgstr ""
 
 msgid "size of the window used for delta compression"
 msgstr ""
 

-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199

 msgid "bytes"
 msgstr ""
 
 msgid "bytes"
 msgstr ""
 

-#: builtin/repack.c:192
+#: builtin/repack.c:194

 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 

-#: builtin/repack.c:194
+#: builtin/repack.c:196

 msgid "limits the maximum delta depth"
 msgstr ""
 
 msgid "limits the maximum delta depth"
 msgstr ""
 

-#: builtin/repack.c:196
+#: builtin/repack.c:198

 msgid "limits the maximum number of threads"
 msgstr ""
 
 msgid "limits the maximum number of threads"
 msgstr ""
 

-#: builtin/repack.c:198
+#: builtin/repack.c:200

 msgid "maximum size of each packfile"
 msgstr ""
 
 msgid "maximum size of each packfile"
 msgstr ""
 

-#: builtin/repack.c:200
+#: builtin/repack.c:202

 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 

-#: builtin/repack.c:210
+#: builtin/repack.c:212

 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 

-#: builtin/repack.c:214
+#: builtin/repack.c:216

 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 

-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148

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


@@ -12008,11 +12213,11 @@ msgstr ""
 msgid "replace the ref if it exists"
 msgstr ""
 
 msgid "replace the ref if it exists"
 msgstr ""
 

-#: builtin/replace.c:443
+#: builtin/replace.c:444

 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 

-#: builtin/replace.c:444
+#: builtin/replace.c:445

 msgid "use this format"
 msgstr ""
 
 msgid "use this format"
 msgstr ""
 


@@ -12070,99 +12275,103 @@ msgstr ""
 msgid "Failed to find tree of %s."
 msgstr ""
 
 msgid "Failed to find tree of %s."
 msgstr ""
 

-#: builtin/reset.c:113
+#: builtin/reset.c:111

 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 
 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 

-#: builtin/reset.c:197
+#: builtin/reset.c:189

 #, 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:297
+#: builtin/reset.c:289

 msgid "be quiet, only report errors"
 msgstr ""
 
 msgid "be quiet, only report errors"
 msgstr ""
 

-#: builtin/reset.c:299
+#: builtin/reset.c:291

 msgid "reset HEAD and index"
 msgstr ""
 
 msgid "reset HEAD and index"
 msgstr ""
 

-#: builtin/reset.c:300
+#: builtin/reset.c:292

 msgid "reset only HEAD"
 msgstr ""
 
 msgid "reset only HEAD"
 msgstr ""
 

-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296

 msgid "reset HEAD, index and working tree"
 msgstr ""
 
 msgid "reset HEAD, index and working tree"
 msgstr ""
 

-#: builtin/reset.c:306
+#: builtin/reset.c:298

 msgid "reset HEAD but keep local changes"
 msgstr ""
 
 msgid "reset HEAD but keep local changes"
 msgstr ""
 

-#: builtin/reset.c:312
+#: builtin/reset.c:304

 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:329
+#: builtin/reset.c:321

 #, 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:337
+#: builtin/reset.c:329

 #, 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:346
+#: builtin/reset.c:338

 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 

-#: builtin/reset.c:355
+#: builtin/reset.c:347

 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:357
+#: builtin/reset.c:349

 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 

-#: builtin/reset.c:367
+#: builtin/reset.c:359

 #, 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:371
+#: builtin/reset.c:363

 msgid "-N can only be used with --mixed"
 msgstr ""
 
 msgid "-N can only be used with --mixed"
 msgstr ""
 

-#: builtin/reset.c:388
+#: builtin/reset.c:380

 msgid "Unstaged changes after reset:"
 msgstr ""
 
 msgid "Unstaged changes after reset:"
 msgstr ""
 

-#: builtin/reset.c:394
+#: builtin/reset.c:386

 #, 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:398
+#: builtin/reset.c:390

 msgid "Could not write new index file."
 msgstr ""
 
 msgid "Could not write new index file."
 msgstr ""
 

-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:455

 msgid "object filtering requires --objects"
 msgstr ""
 
 msgid "object filtering requires --objects"
 msgstr ""
 

-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458

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

-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499

 msgid "rev-list does not support display of notes"
 msgstr ""
 
 msgid "rev-list does not support display of notes"
 msgstr ""
 

-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502

 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr ""
 
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr ""
 


@@ -12260,10 +12469,6 @@ msgstr ""
 msgid "preserve initially empty commits"
 msgstr ""
 
 msgid "preserve initially empty commits"
 msgstr ""
 

-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr ""
-

 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr ""
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr ""


@@ -12589,243 +12794,330 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
 msgid "prepend comment character and space to each line"
 msgstr ""
 

-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669

 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678

 #, 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:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: builtin/submodule--helper.c:96

 #, 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:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198

 msgid "alternative anchor for relative paths"
 msgstr ""
 
 msgid "alternative anchor for relative paths"
 msgstr ""
 

-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409

 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483

 #, 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:464
+#: builtin/submodule--helper.c:498

 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 

-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509

 #, 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:479
+#: builtin/submodule--helper.c:513

 #, 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:489
+#: builtin/submodule--helper.c:523

 #, 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:496
+#: builtin/submodule--helper.c:530

 #, 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:518
+#: builtin/submodule--helper.c:552

 msgid "Suppress output for initializing a submodule"
 msgstr ""
 
 msgid "Suppress output for initializing a submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557

 msgid "git submodule--helper init [<path>]"
 msgstr ""
 
 msgid "git submodule--helper init [<path>]"
 msgstr ""
 

-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747

 #, 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:626
+#: builtin/submodule--helper.c:660

 #, 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:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856

 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021

 msgid "Suppress submodule status output"
 msgstr ""
 
 msgid "Suppress submodule status output"
 msgstr ""
 

-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712

 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:679
+#: builtin/submodule--helper.c:713

 msgid "recurse into nested submodules"
 msgstr ""
 
 msgid "recurse into nested submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718

 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742

 msgid "git submodule--helper name <path>"
 msgstr ""
 
 msgid "git submodule--helper name <path>"
 msgstr ""
 

-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:946
+#, 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:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136

 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172

 #, 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:842
+#: builtin/submodule--helper.c:1179

 #, 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:864
+#: builtin/submodule--helper.c:1201

 msgid "where the new submodule will be cloned to"
 msgstr ""
 
 msgid "where the new submodule will be cloned to"
 msgstr ""
 

-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204

 msgid "name of the new submodule"
 msgstr ""
 
 msgid "name of the new submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207

 msgid "url where to clone the submodule from"
 msgstr ""
 
 msgid "url where to clone the submodule from"
 msgstr ""
 

-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213

 msgid "depth for shallow clones"
 msgstr ""
 
 msgid "depth for shallow clones"
 msgstr ""
 

-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587

 msgid "force cloning progress"
 msgstr ""
 
 msgid "force cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221

 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:915
+#: builtin/submodule--helper.c:1252

 #, 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:930
+#: builtin/submodule--helper.c:1267

 #, 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:995
+#: builtin/submodule--helper.c:1332

 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 

-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336

 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 

-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365

 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394

 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527

 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 

-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538

 #, 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:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788

 msgid "path into the working tree"
 msgstr ""
 
 msgid "path into the working tree"
 msgstr ""
 

-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571

 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:1238
+#: builtin/submodule--helper.c:1575

 msgid "rebase, merge, checkout or none"
 msgstr ""
 
 msgid "rebase, merge, checkout or none"
 msgstr ""
 

-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579

 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:1245
+#: builtin/submodule--helper.c:1582

 msgid "parallel jobs"
 msgstr ""
 
 msgid "parallel jobs"
 msgstr ""
 

-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584

 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:1248
+#: builtin/submodule--helper.c:1585

 msgid "don't print cloning progress"
 msgstr ""
 
 msgid "don't print cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592

 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605

 msgid "bad value for update parameter"
 msgstr ""
 
 msgid "bad value for update parameter"
 msgstr ""
 

-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673

 #, 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:1452
+#: builtin/submodule--helper.c:1789

 msgid "recurse into submodules"
 msgstr ""
 
 msgid "recurse into submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795

 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857

 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 

-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863

 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""


@@ -12916,139 +13208,143 @@ msgstr ""
 msgid "unable to write tag file"
 msgstr ""
 
 msgid "unable to write tag file"
 msgstr ""
 

-#: builtin/tag.c:215
+#: builtin/tag.c:216

 msgid "bad object type."
 msgstr ""
 
 msgid "bad object type."
 msgstr ""
 

-#: builtin/tag.c:261
+#: builtin/tag.c:265

 msgid "no tag message?"
 msgstr ""
 
 msgid "no tag message?"
 msgstr ""
 

-#: builtin/tag.c:268
+#: builtin/tag.c:272

 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
 
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
 

-#: builtin/tag.c:376
+#: builtin/tag.c:381

 msgid "list tag names"
 msgstr ""
 
 msgid "list tag names"
 msgstr ""
 

-#: builtin/tag.c:378
+#: builtin/tag.c:383

 msgid "print <n> lines of each tag message"
 msgstr ""
 
 msgid "print <n> lines of each tag message"
 msgstr ""
 

-#: builtin/tag.c:380
+#: builtin/tag.c:385

 msgid "delete tags"
 msgstr ""
 
 msgid "delete tags"
 msgstr ""
 

-#: builtin/tag.c:381
+#: builtin/tag.c:386

 msgid "verify tags"
 msgstr ""
 
 msgid "verify tags"
 msgstr ""
 

-#: builtin/tag.c:383
+#: builtin/tag.c:388

 msgid "Tag creation options"
 msgstr ""
 
 msgid "Tag creation options"
 msgstr ""
 

-#: builtin/tag.c:385
+#: builtin/tag.c:390

 msgid "annotated tag, needs a message"
 msgstr ""
 
 msgid "annotated tag, needs a message"
 msgstr ""
 

-#: builtin/tag.c:387
+#: builtin/tag.c:392

 msgid "tag message"
 msgstr ""
 
 msgid "tag message"
 msgstr ""
 

-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr ""
+
+#: builtin/tag.c:395

 msgid "annotated and GPG-signed tag"
 msgstr ""
 
 msgid "annotated and GPG-signed tag"
 msgstr ""
 

-#: builtin/tag.c:393
+#: builtin/tag.c:399

 msgid "use another key to sign the tag"
 msgstr ""
 
 msgid "use another key to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:394
+#: builtin/tag.c:400

 msgid "replace the tag if exists"
 msgstr ""
 
 msgid "replace the tag if exists"
 msgstr ""
 

-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368

 msgid "create a reflog"
 msgstr ""
 
 msgid "create a reflog"
 msgstr ""
 

-#: builtin/tag.c:397
+#: builtin/tag.c:403

 msgid "Tag listing options"
 msgstr ""
 
 msgid "Tag listing options"
 msgstr ""
 

-#: builtin/tag.c:398
+#: builtin/tag.c:404

 msgid "show tag list in columns"
 msgstr ""
 
 msgid "show tag list in columns"
 msgstr ""
 

-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407

 msgid "print only tags that contain the commit"
 msgstr ""
 
 msgid "print only tags that contain the commit"
 msgstr ""
 

-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408

 msgid "print only tags that don't contain the commit"
 msgstr ""
 
 msgid "print only tags that don't contain the commit"
 msgstr ""
 

-#: builtin/tag.c:403
+#: builtin/tag.c:409

 msgid "print only tags that are merged"
 msgstr ""
 
 msgid "print only tags that are merged"
 msgstr ""
 

-#: builtin/tag.c:404
+#: builtin/tag.c:410

 msgid "print only tags that are not merged"
 msgstr ""
 
 msgid "print only tags that are not merged"
 msgstr ""
 

-#: builtin/tag.c:409
+#: builtin/tag.c:415

 msgid "print only tags of the object"
 msgstr ""
 
 msgid "print only tags of the object"
 msgstr ""
 

-#: builtin/tag.c:453
+#: builtin/tag.c:459

 msgid "--column and -n are incompatible"
 msgstr ""
 
 msgid "--column and -n are incompatible"
 msgstr ""
 

-#: builtin/tag.c:475
+#: builtin/tag.c:481

 msgid "-n option is only allowed in list mode"
 msgstr ""
 
 msgid "-n option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:477
+#: builtin/tag.c:483

 msgid "--contains option is only allowed in list mode"
 msgstr ""
 
 msgid "--contains option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:479
+#: builtin/tag.c:485

 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 
 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:481
+#: builtin/tag.c:487

 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 
 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:483
+#: builtin/tag.c:489

 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:494
+#: builtin/tag.c:500

 msgid "only one -F or -m option is allowed."
 msgstr ""
 
 msgid "only one -F or -m option is allowed."
 msgstr ""
 

-#: builtin/tag.c:513
+#: builtin/tag.c:519

 msgid "too many params"
 msgstr ""
 
 msgid "too many params"
 msgstr ""
 

-#: builtin/tag.c:519
+#: builtin/tag.c:525

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

-#: builtin/tag.c:524
+#: builtin/tag.c:530

 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 

-#: builtin/tag.c:554
+#: builtin/tag.c:561

 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 

-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498

 msgid "Unpacking objects"
 msgstr ""
 
 msgid "Unpacking objects"
 msgstr ""
 


@@ -13365,7 +13661,7 @@ msgid "print tag contents"
 msgstr ""
 
 #: builtin/worktree.c:17
 msgstr ""
 
 #: builtin/worktree.c:17

-msgid "git worktree add [<options>] <path> [<branch>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"

 msgstr ""
 
 #: builtin/worktree.c:18
 msgstr ""
 
 #: builtin/worktree.c:18


@@ -13377,132 +13673,217 @@ msgid "git worktree lock [<options>] <path>"
 msgstr ""
 
 #: builtin/worktree.c:20
 msgstr ""
 
 #: builtin/worktree.c:20

-msgid "git worktree prune [<options>]"
+msgid "git worktree move <worktree> <new-path>"

 msgstr ""
 
 #: builtin/worktree.c:21
 msgstr ""
 
 #: builtin/worktree.c:21

+msgid "git worktree prune [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr ""
+
+#: builtin/worktree.c:23

 msgid "git worktree unlock <path>"
 msgstr ""
 
 msgid "git worktree unlock <path>"
 msgstr ""
 

-#: builtin/worktree.c:58
+#: builtin/worktree.c:60

 #, 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:64
+#: builtin/worktree.c:66

 #, 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:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80

 #, 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:88
+#: builtin/worktree.c:90

 #, 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:96
+#: builtin/worktree.c:98

 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 

-#: builtin/worktree.c:112
+#: builtin/worktree.c:114

 #, 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:159
+#: builtin/worktree.c:161

 msgid "report pruned working trees"
 msgstr ""
 
 msgid "report pruned working trees"
 msgstr ""
 

-#: builtin/worktree.c:161
+#: builtin/worktree.c:163

 msgid "expire working trees older than <time>"
 msgstr ""
 
 msgid "expire working trees older than <time>"
 msgstr ""
 

-#: builtin/worktree.c:236
+#: builtin/worktree.c:238

 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 

-#: builtin/worktree.c:267
+#: builtin/worktree.c:269

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

-#: builtin/worktree.c:306
+#: builtin/worktree.c:308

 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr ""
 
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr ""
 

-#: builtin/worktree.c:368
+#: builtin/worktree.c:385

 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:370
+#: builtin/worktree.c:388

 msgid "create a new branch"
 msgstr ""
 
 msgid "create a new branch"
 msgstr ""
 

-#: builtin/worktree.c:372
+#: builtin/worktree.c:390

 msgid "create or reset a branch"
 msgstr ""
 
 msgid "create or reset a branch"
 msgstr ""
 

-#: builtin/worktree.c:374
+#: builtin/worktree.c:392

 msgid "populate the new working tree"
 msgstr ""
 
 msgid "populate the new working tree"
 msgstr ""
 

-#: builtin/worktree.c:375
+#: builtin/worktree.c:393

 msgid "keep the new working tree locked"
 msgstr ""
 
 msgid "keep the new working tree locked"
 msgstr ""
 

-#: builtin/worktree.c:377
+#: builtin/worktree.c:395

 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 

-#: builtin/worktree.c:380
+#: builtin/worktree.c:398

 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:388
+#: builtin/worktree.c:406

 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 

-#: builtin/worktree.c:453
+#: builtin/worktree.c:471

 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:553
+#: builtin/worktree.c:571

 msgid "reason for locking"
 msgstr ""
 
 msgid "reason for locking"
 msgstr ""
 

-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809

 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 

-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618

 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:572
+#: builtin/worktree.c:590

 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 

-#: builtin/worktree.c:574
+#: builtin/worktree.c:592

 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 

-#: builtin/worktree.c:602
+#: builtin/worktree.c:620

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

+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr ""
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr ""
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr ""
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr ""
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr ""
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr ""
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr ""
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+

 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr ""
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr ""


@@ -13519,23 +13900,23 @@ msgstr ""
 msgid "only useful for debugging"
 msgstr ""
 
 msgid "only useful for debugging"
 msgstr ""
 

-#: upload-pack.c:24
+#: upload-pack.c:27

 msgid "git upload-pack [<options>] <dir>"
 msgstr ""
 
 msgid "git upload-pack [<options>] <dir>"
 msgstr ""
 

-#: upload-pack.c:1041
+#: upload-pack.c:1070

 msgid "quit after a single request/response exchange"
 msgstr ""
 
 msgid "quit after a single request/response exchange"
 msgstr ""
 

-#: upload-pack.c:1043
+#: upload-pack.c:1072

 msgid "exit immediately after initial ref advertisement"
 msgstr ""
 
 msgid "exit immediately after initial ref advertisement"
 msgstr ""
 

-#: upload-pack.c:1045
+#: upload-pack.c:1074

 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 

-#: upload-pack.c:1047
+#: upload-pack.c:1076

 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr ""
 
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr ""
 


@@ -13552,6 +13933,15 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr ""
 
 msgid "print debugging messages to stderr"
 msgstr ""
 

+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+

 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"


@@ -13559,20 +13949,65 @@ msgid ""
 "to read about a specific subcommand or concept."
 msgstr ""
 
 "to read about a specific subcommand or concept."
 msgstr ""
 

-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr ""
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr ""
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr ""
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr ""
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr ""
+
+#: http.c:342

 #, 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:360
+#: http.c:363

 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:369
+#: http.c:372

 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:1791
+#: http.c:1857

 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"


@@ -13580,16 +14015,16 @@ msgid ""
 "   redirect: %s"
 msgstr ""
 
 "   redirect: %s"
 msgstr ""
 

-#: remote-curl.c:324
+#: remote-curl.c:345

 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 
 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 

-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59

 msgid "args"
 msgstr ""
 
 msgid "args"
 msgstr ""
 

-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60

 msgid "object filtering"
 msgstr ""
 
 msgid "object filtering"
 msgstr ""
 


@@ -13697,23 +14132,23 @@ msgstr ""
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 

-#: parse-options.h:145
+#: parse-options.h:157

 msgid "expiry-date"
 msgstr ""
 
 msgid "expiry-date"
 msgstr ""
 

-#: parse-options.h:160
+#: parse-options.h:172

 msgid "no-op (backward compatibility)"
 msgstr ""
 
 msgid "no-op (backward compatibility)"
 msgstr ""
 

-#: parse-options.h:238
+#: parse-options.h:250

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

-#: parse-options.h:240
+#: parse-options.h:252

 msgid "be more quiet"
 msgstr ""
 
 msgid "be more quiet"
 msgstr ""
 

-#: parse-options.h:246
+#: parse-options.h:258

 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 
 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 


@@ -13926,7 +14361,7 @@ msgstr ""
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 

-#: git-rebase.sh:58
+#: git-rebase.sh:60

 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"


@@ -13935,47 +14370,47 @@ msgid ""
 "abort\"."
 msgstr ""
 
 "abort\"."
 msgstr ""
 

-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409

 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 

-#: git-rebase.sh:171
+#: git-rebase.sh:174

 msgid "Applied autostash."
 msgstr ""
 
 msgid "Applied autostash."
 msgstr ""
 

-#: git-rebase.sh:174
+#: git-rebase.sh:177

 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 

-#: git-rebase.sh:214
+#: git-rebase.sh:218

 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 

-#: git-rebase.sh:219
+#: git-rebase.sh:223

 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 

-#: git-rebase.sh:363
+#: git-rebase.sh:370

 msgid "No rebase in progress?"
 msgstr ""
 
 msgid "No rebase in progress?"
 msgstr ""
 

-#: git-rebase.sh:374
+#: git-rebase.sh:381

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

-#: git-rebase.sh:381
+#: git-rebase.sh:388

 msgid "Cannot read HEAD"
 msgstr ""
 
 msgid "Cannot read HEAD"
 msgstr ""
 

-#: git-rebase.sh:384
+#: git-rebase.sh:391

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

-#: git-rebase.sh:424
+#: git-rebase.sh:435

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


@@ -13988,74 +14423,74 @@ msgid ""
 "valuable there."
 msgstr ""
 
 "valuable there."
 msgstr ""
 

-#: git-rebase.sh:480
+#: git-rebase.sh:491

 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 

-#: git-rebase.sh:504
+#: git-rebase.sh:515

 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 

-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522

 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 

-#: git-rebase.sh:516
+#: git-rebase.sh:527

 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr ""
 
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr ""
 

-#: git-rebase.sh:542
+#: git-rebase.sh:553

 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 

-#: git-rebase.sh:575
+#: git-rebase.sh:586

 msgid "Cannot autostash"
 msgstr ""
 
 msgid "Cannot autostash"
 msgstr ""
 

-#: git-rebase.sh:580
+#: git-rebase.sh:591

 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 

-#: git-rebase.sh:584
+#: git-rebase.sh:595

 msgid "Please commit or stash them."
 msgstr ""
 
 msgid "Please commit or stash them."
 msgstr ""
 

-#: git-rebase.sh:607
+#: git-rebase.sh:618

 #, sh-format
 msgid "HEAD is up to date."
 msgstr ""
 
 #, sh-format
 msgid "HEAD is up to date."
 msgstr ""
 

-#: git-rebase.sh:609
+#: git-rebase.sh:620

 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr ""
 
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr ""
 

-#: git-rebase.sh:617
+#: git-rebase.sh:628

 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 

-#: git-rebase.sh:619
+#: git-rebase.sh:630

 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 

-#: git-rebase.sh:631
+#: git-rebase.sh:642

 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 

-#: git-rebase.sh:640
+#: git-rebase.sh:651

 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 

-#: git-rebase.sh:650
+#: git-rebase.sh:661

 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""


@@ -14123,86 +14558,86 @@ msgstr ""
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 

-#: git-stash.sh:341
+#: git-stash.sh:340

 msgid "Cannot remove worktree changes"
 msgstr ""
 
 msgid "Cannot remove worktree changes"
 msgstr ""
 

-#: git-stash.sh:489
+#: git-stash.sh:488

 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 
 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 

-#: git-stash.sh:502
+#: git-stash.sh:501

 msgid "No stash entries found."
 msgstr ""
 
 msgid "No stash entries found."
 msgstr ""
 

-#: git-stash.sh:509
+#: git-stash.sh:508

 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 

-#: git-stash.sh:524
+#: git-stash.sh:523

 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 

-#: git-stash.sh:552
+#: git-stash.sh:551

 #, 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:563
+#: git-stash.sh:562

 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 

-#: git-stash.sh:571
+#: git-stash.sh:570

 msgid "unable to refresh index"
 msgstr ""
 
 msgid "unable to refresh index"
 msgstr ""
 

-#: git-stash.sh:575
+#: git-stash.sh:574

 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:583
+#: git-stash.sh:582

 msgid "Conflicts in index. Try without --index."
 msgstr ""
 
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 

-#: git-stash.sh:585
+#: git-stash.sh:584

 msgid "Could not save index tree"
 msgstr ""
 
 msgid "Could not save index tree"
 msgstr ""
 

-#: git-stash.sh:594
+#: git-stash.sh:593

 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 

-#: git-stash.sh:619
+#: git-stash.sh:618

 msgid "Cannot unstage modified files"
 msgstr ""
 
 msgid "Cannot unstage modified files"
 msgstr ""
 

-#: git-stash.sh:634
+#: git-stash.sh:633

 msgid "Index was not unstashed."
 msgstr ""
 
 msgid "Index was not unstashed."
 msgstr ""
 

-#: git-stash.sh:648
+#: git-stash.sh:647

 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:657
+#: git-stash.sh:656

 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 

-#: git-stash.sh:658
+#: git-stash.sh:657

 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 

-#: git-stash.sh:666
+#: git-stash.sh:665

 msgid "No branch name specified"
 msgstr ""
 
 msgid "No branch name specified"
 msgstr ""
 

-#: git-stash.sh:745
+#: git-stash.sh:744

 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 


@@ -14289,153 +14724,104 @@ msgstr ""
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 

-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr ""
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584

 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:647
+#: git-submodule.sh:594

 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:652
+#: git-submodule.sh:599

 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:670
+#: git-submodule.sh:617

 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:676
+#: git-submodule.sh:623

 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
 
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
 

-#: git-submodule.sh:683
+#: git-submodule.sh:630

 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:684
+#: git-submodule.sh:631

 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:688
+#: git-submodule.sh:635

 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:689
+#: git-submodule.sh:636

 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:694
+#: git-submodule.sh:641

 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:695
+#: git-submodule.sh:642

 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:700
+#: git-submodule.sh:647

 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:701
+#: git-submodule.sh:648

 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 

-#: git-submodule.sh:732
+#: git-submodule.sh:679

 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:828
+#: git-submodule.sh:775

 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 

-#: git-submodule.sh:880
+#: git-submodule.sh:827

 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 

-#: git-submodule.sh:900
+#: git-submodule.sh:847

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 

-#: git-submodule.sh:903
+#: git-submodule.sh:850

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 

-#: git-submodule.sh:906
+#: git-submodule.sh:853

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 

-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr ""
-

 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."


@@ -14473,7 +14859,7 @@ msgid ""
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213

 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"


@@ -14485,83 +14871,83 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
 "\tgit rebase --continue"
 msgstr ""
 

-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238

 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr ""
 
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr ""
 

-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277

 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319

 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 
 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371

 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373

 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382

 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr ""
 
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr ""
 

-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387

 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405

 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414

 #, sh-format
 msgid "Could not pick $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423

 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr ""
 
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr ""
 

-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428

 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr ""
 
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr ""
 

-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439

 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] ""
 msgstr[1] ""
 
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448

 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 

-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451

 msgid "This is a combination of 2 commits."
 msgstr ""
 
 msgid "This is a combination of 2 commits."
 msgstr ""
 

-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538

 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr ""
 
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567

 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"


@@ -14571,31 +14957,31 @@ msgid ""
 "you are able to reword the commit."
 msgstr ""
 
 "you are able to reword the commit."
 msgstr ""
 

-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582

 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597

 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr ""
 
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr ""
 

-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639

 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 
 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647

 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649

 msgid "and made changes to the index and/or the working tree"
 msgstr ""
 
 msgid "and made changes to the index and/or the working tree"
 msgstr ""
 

-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651

 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"


@@ -14603,7 +14989,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
 msgstr ""
 
 #. TRANSLATORS: after these lines is a command to be issued by the user

-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664

 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"


@@ -14613,29 +14999,29 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
 "\tgit rebase --continue"
 msgstr ""
 

-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675

 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676

 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr ""
 

-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711

 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 

-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735

 msgid "could not detach HEAD"
 msgstr ""
 
 msgid "could not detach HEAD"
 msgstr ""
 

-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771

 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 

-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776

 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"


@@ -14653,21 +15039,21 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793

 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 

-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798

 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 

-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807

 msgid "Could not commit staged changes."
 msgstr ""
 
 msgid "Could not commit staged changes."
 msgstr ""
 

-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836

 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"


@@ -14676,51 +15062,51 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008

 msgid "Could not execute editor"
 msgstr ""
 
 msgid "Could not execute editor"
 msgstr ""
 

-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860

 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 

-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865

 msgid "No HEAD?"
 msgstr ""
 
 msgid "No HEAD?"
 msgstr ""
 

-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866

 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 

-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869

 msgid "Could not mark as interactive"
 msgstr ""
 
 msgid "Could not mark as interactive"
 msgstr ""
 

-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884

 msgid "Could not init rewritten commits"
 msgstr ""
 
 msgid "Could not init rewritten commits"
 msgstr ""
 

-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910

 msgid "Could not generate todo list"
 msgstr ""
 
 msgid "Could not generate todo list"
 msgstr ""
 

-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986

 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991

 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr ""
 
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998

 msgid "Note that empty commits are commented out"
 msgstr ""
 
 msgid "Note that empty commits are commented out"
 msgstr ""
 


@@ -14856,46 +15242,46 @@ msgstr ""
 msgid "No untracked files.\n"
 msgstr ""
 
 msgid "No untracked files.\n"
 msgstr ""
 

-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
 

-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
 

-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
 

-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
 

-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
 

-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078

 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 

-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079

 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085

 #, perl-format
 msgid ""
 "---\n"
 #, perl-format
 msgid ""
 "---\n"


@@ -14905,14 +15291,14 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
 msgstr ""
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093

 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107

 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""


@@ -14923,12 +15309,12 @@ msgstr ""
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.

-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206

 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 

-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215

 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"


@@ -14937,7 +15323,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221

 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"


@@ -14946,7 +15332,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227

 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"


@@ -14955,7 +15341,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233

 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"


@@ -14964,7 +15350,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239

 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"


@@ -14973,7 +15359,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245

 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"


@@ -14982,7 +15368,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251

 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"


@@ -14991,7 +15377,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266

 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"


@@ -15004,195 +15390,211 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
 "? - print help\n"
 msgstr ""
 

-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297

 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 

-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298

 msgid "Apply them to the worktree anyway? "
 msgstr ""
 
 msgid "Apply them to the worktree anyway? "
 msgstr ""
 

-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301

 msgid "Nothing was applied.\n"
 msgstr ""
 
 msgid "Nothing was applied.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312

 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 

-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321

 msgid "Only binary files changed.\n"
 msgstr ""
 
 msgid "Only binary files changed.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323

 msgid "No changes.\n"
 msgstr ""
 
 msgid "No changes.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331

 msgid "Patch update"
 msgstr ""
 
 msgid "Patch update"
 msgstr ""
 

-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383

 #, perl-format
 #, perl-format

-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384

 #, perl-format
 #, perl-format

-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385

 #, perl-format
 #, perl-format

-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388

 #, perl-format
 #, perl-format

-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389

 #, perl-format
 #, perl-format

-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390

 #, perl-format
 #, perl-format

-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393

 #, perl-format
 #, perl-format

-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394

 #, perl-format
 #, perl-format

-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395

 #, perl-format
 #, perl-format

-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398

 #, perl-format
 #, perl-format

-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399

 #, perl-format
 #, perl-format

-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400

 #, perl-format
 #, perl-format

-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403

 #, perl-format
 #, perl-format

-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404

 #, perl-format
 #, perl-format

-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405

 #, perl-format
 #, perl-format

-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408

 #, perl-format
 #, perl-format

-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409

 #, perl-format
 #, perl-format

-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410

 #, perl-format
 #, perl-format

-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413

 #, perl-format
 #, perl-format

-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414

 #, perl-format
 #, perl-format

-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415

 #, perl-format
 #, perl-format

-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

 msgstr ""
 
 msgstr ""
 

-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr ""
+
+#: git-add--interactive.perl:1522

 msgid "go to which hunk (<ret> to see more)? "
 msgstr ""
 
 msgid "go to which hunk (<ret> to see more)? "
 msgstr ""
 

-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524

 msgid "go to which hunk? "
 msgstr ""
 
 msgid "go to which hunk? "
 msgstr ""
 

-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533

 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 

-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538

 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1568

 msgid "search for regex? "
 msgstr ""
 
 msgid "search for regex? "
 msgstr ""
 

-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581

 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 

-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591

 msgid "No hunk matches the given pattern\n"
 msgstr ""
 
 msgid "No hunk matches the given pattern\n"
 msgstr ""
 

-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625

 msgid "No previous hunk\n"
 msgstr ""
 
 msgid "No previous hunk\n"
 msgstr ""
 

-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631

 msgid "No next hunk\n"
 msgstr ""
 
 msgid "No next hunk\n"
 msgstr ""
 

-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1643

 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1699

 msgid "Review diff"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
 msgid "Review diff"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.

-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718

 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"


@@ -15203,84 +15605,90 @@ msgid ""
 "changes\n"
 msgstr ""
 
 "changes\n"
 msgstr ""
 

-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760

 msgid "missing --"
 msgstr ""
 
 msgid "missing --"
 msgstr ""
 

-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756

 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 

-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768

 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
 
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
 

-#: git-send-email.perl:126
+#: git-send-email.perl:130

 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 

-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143

 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 

-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217

 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 

-#: git-send-email.perl:290
+#: git-send-email.perl:294

 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 

-#: git-send-email.perl:295
+#: git-send-email.perl:299

 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 

-#: git-send-email.perl:313
+#: git-send-email.perl:317

 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 
 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 

-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638

 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 

-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+
+#: git-send-email.perl:456

 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:476
+#: git-send-email.perl:485

 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:504
+#: git-send-email.perl:513

 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 

-#: git-send-email.perl:506
+#: git-send-email.perl:515

 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 

-#: git-send-email.perl:508
+#: git-send-email.perl:517

 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 

-#: git-send-email.perl:513
+#: git-send-email.perl:522

 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 

-#: git-send-email.perl:595
+#: git-send-email.perl:604

 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"


@@ -15290,36 +15698,36 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 

-#: git-send-email.perl:616
+#: git-send-email.perl:625

 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 

-#: git-send-email.perl:640
+#: git-send-email.perl:649

 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr ""
 

-#: git-send-email.perl:651
+#: git-send-email.perl:660

 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 

-#: git-send-email.perl:664
+#: git-send-email.perl:673

 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 
 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 

-#: git-send-email.perl:674
+#: git-send-email.perl:683

 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 

-#: git-send-email.perl:684
+#: git-send-email.perl:694

 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"


@@ -15328,41 +15736,37 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 

-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr ""
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718

 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 

-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"

 msgstr ""
 
 msgstr ""
 

-#: git-send-email.perl:754
+#: git-send-email.perl:778

 msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
 #. TRANSLATORS: please keep [y/N] as is.
 msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
 #. TRANSLATORS: please keep [y/N] as is.

-#: git-send-email.perl:786
+#: git-send-email.perl:813

 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 

-#: git-send-email.perl:815
+#: git-send-email.perl:868

 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 

-#: git-send-email.perl:820
+#: git-send-email.perl:873

 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 

-#: git-send-email.perl:828
+#: git-send-email.perl:881

 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"


@@ -15371,20 +15775,20 @@ msgid ""
 "want to send.\n"
 msgstr ""
 
 "want to send.\n"
 msgstr ""
 

-#: git-send-email.perl:847
+#: git-send-email.perl:900

 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 

-#: git-send-email.perl:865
+#: git-send-email.perl:918

 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 

-#: git-send-email.perl:877
+#: git-send-email.perl:930

 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 

-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996

 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""


@@ -15392,16 +15796,16 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.

-#: git-send-email.perl:941
+#: git-send-email.perl:1000

 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 

-#: git-send-email.perl:1262
+#: git-send-email.perl:1317

 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 

-#: git-send-email.perl:1337
+#: git-send-email.perl:1395

 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"


@@ -15418,128 +15822,128 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.

-#: git-send-email.perl:1352
+#: git-send-email.perl:1410

 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr ""
 
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr ""
 

-#: git-send-email.perl:1355
+#: git-send-email.perl:1413

 msgid "Send this email reply required"
 msgstr ""
 
 msgid "Send this email reply required"
 msgstr ""
 

-#: git-send-email.perl:1381
+#: git-send-email.perl:1439

 msgid "The required SMTP server is not properly defined."
 msgstr ""
 
 msgid "The required SMTP server is not properly defined."
 msgstr ""
 

-#: git-send-email.perl:1428
+#: git-send-email.perl:1486

 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 

-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495

 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 

-#: git-send-email.perl:1447
+#: git-send-email.perl:1505

 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 

-#: git-send-email.perl:1465
+#: git-send-email.perl:1523

 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 

-#: git-send-email.perl:1468
+#: git-send-email.perl:1526

 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 

-#: git-send-email.perl:1468
+#: git-send-email.perl:1526

 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 

-#: git-send-email.perl:1470
+#: git-send-email.perl:1528

 msgid "Dry-OK. Log says:\n"
 msgstr ""
 
 msgid "Dry-OK. Log says:\n"
 msgstr ""
 

-#: git-send-email.perl:1470
+#: git-send-email.perl:1528

 msgid "OK. Log says:\n"
 msgstr ""
 
 msgid "OK. Log says:\n"
 msgstr ""
 

-#: git-send-email.perl:1482
+#: git-send-email.perl:1540

 msgid "Result: "
 msgstr ""
 
 msgid "Result: "
 msgstr ""
 

-#: git-send-email.perl:1485
+#: git-send-email.perl:1543

 msgid "Result: OK\n"
 msgstr ""
 
 msgid "Result: OK\n"
 msgstr ""
 

-#: git-send-email.perl:1498
+#: git-send-email.perl:1556

 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 
 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 

-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623

 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1551
+#: git-send-email.perl:1609

 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1599
+#: git-send-email.perl:1657

 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1624
+#: git-send-email.perl:1682

 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1730
+#: git-send-email.perl:1788

 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 

-#: git-send-email.perl:1737
+#: git-send-email.perl:1795

 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1741
+#: git-send-email.perl:1799

 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 

-#: git-send-email.perl:1768
+#: git-send-email.perl:1826

 msgid "cannot send message as 7bit"
 msgstr ""
 
 msgid "cannot send message as 7bit"
 msgstr ""
 

-#: git-send-email.perl:1776
+#: git-send-email.perl:1834

 msgid "invalid transfer encoding"
 msgstr ""
 
 msgid "invalid transfer encoding"
 msgstr ""
 

-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933

 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 

-#: git-send-email.perl:1817
+#: git-send-email.perl:1875

 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 

-#: git-send-email.perl:1833
+#: git-send-email.perl:1891

 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.

-#: git-send-email.perl:1837
+#: git-send-email.perl:1895

 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""