l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)

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

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

diff --git a/po/git.pot b/po/git.pot
index e4e29ebfd8ce4495fcab8895133c7ce103be0e18..9e836b10b67e83c0e85f4d121abe121f20e19ca6 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: 2016-11-25 22:50+0800\n"
+"POT-Creation-Date: 2017-02-04 13:02+0800\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "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:114 builtin/merge.c:1181
+#: advice.c:114 builtin/merge.c:1206

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


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

-#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986

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


@@ -558,15 +558,16 @@ msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

 msgid "Unable to write new index file"
 msgstr ""
 
 #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
 msgid "Unable to write new index file"
 msgstr ""
 
 #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
-#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
+#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
+#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: git-add--interactive.perl:239

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


@@ -667,8 +668,8 @@ msgid "allow overlapping hunks"
 msgstr ""
 
 #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
 msgstr ""
 
 #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

-#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
-#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
+#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

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


@@ -705,7 +706,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 

-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

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


@@ -726,8 +727,8 @@ msgstr ""
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 

-#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
+#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

 #: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
 #: parse-options.h:153
 #: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
 #: parse-options.h:153


@@ -763,7 +764,7 @@ msgid "list supported archive formats"
 msgstr ""
 
 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
 msgstr ""
 
 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

-#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969

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


@@ -851,7 +852,7 @@ msgstr ""
 #: bisect.c:750
 #, c-format
 msgid ""
 #: bisect.c:750
 #, c-format
 msgid ""

-"Some %s revs are not ancestor of the %s rev.\n"
+"Some %s revs are not ancestors of the %s rev.\n"

 "git bisect cannot work properly in this case.\n"
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""
 "git bisect cannot work properly in this case.\n"
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""


@@ -874,7 +875,7 @@ msgstr ""
 msgid "a %s revision is needed"
 msgstr ""
 
 msgid "a %s revision is needed"
 msgstr ""
 

-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262

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


@@ -1050,7 +1051,7 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 

-#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777

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


@@ -1059,10 +1060,10 @@ msgstr ""
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 

-#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
-#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
+#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348

 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

-#: builtin/merge.c:356 builtin/shortlog.c:170
+#: builtin/merge.c:360 builtin/shortlog.c:177

 msgid "revision walk setup failed"
 msgstr ""
 
 msgid "revision walk setup failed"
 msgstr ""
 


@@ -1101,7 +1102,7 @@ msgstr ""
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 

-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282

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


@@ -1119,13 +1120,13 @@ msgstr ""
 msgid "index-pack died"
 msgstr ""
 
 msgid "index-pack died"
 msgstr ""
 

-#: color.c:290
+#: color.c:300

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

-#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
-#: builtin/am.c:2127
+#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
+#: builtin/am.c:1493 builtin/am.c:2127

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


@@ -1146,123 +1147,133 @@ msgstr ""
 msgid "memory exhausted"
 msgstr ""
 
 msgid "memory exhausted"
 msgstr ""
 

-#: config.c:516
+#: config.c:518

 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr ""
 
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr ""
 

-#: config.c:520
+#: config.c:522

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

-#: config.c:524
+#: config.c:526

 #, c-format
 msgid "bad config line %d in standard input"
 msgstr ""
 
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr ""
 

-#: config.c:528
+#: config.c:530

 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr ""
 
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr ""
 

-#: config.c:532
+#: config.c:534

 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr ""
 
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr ""
 

-#: config.c:536
+#: config.c:538

 #, c-format
 msgid "bad config line %d in %s"
 msgstr ""
 
 #, c-format
 msgid "bad config line %d in %s"
 msgstr ""
 

-#: config.c:655
+#: config.c:657

 msgid "out of range"
 msgstr ""
 
 msgid "out of range"
 msgstr ""
 

-#: config.c:655
+#: config.c:657

 msgid "invalid unit"
 msgstr ""
 
 msgid "invalid unit"
 msgstr ""
 

-#: config.c:661
+#: config.c:663

 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr ""
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr ""
 

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

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 

-#: config.c:669
+#: config.c:671

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 

-#: config.c:672
+#: config.c:674

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 

-#: config.c:675
+#: config.c:677

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 

-#: config.c:678
+#: config.c:680

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 

-#: config.c:681
+#: config.c:683

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 

-#: config.c:768
+#: config.c:770

 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr ""
 

-#: config.c:852 config.c:863
+#: config.c:865 config.c:876

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

-#: config.c:978
+#: config.c:993

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

-#: config.c:1312
+#: config.c:1149
+#, c-format
+msgid "bad pack compression level %d"
+msgstr ""
+
+#: config.c:1339

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

-#: config.c:1362
+#: config.c:1389

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

-#: config.c:1716
+#: config.c:1743

 #, 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:1718
+#: config.c:1745

 #, 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:1777
+#: config.c:1804

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

-#: config.c:2311
+#: config.c:2225 config.c:2450
+#, c-format
+msgid "fstat on %s failed"
+msgstr ""
+
+#: config.c:2343

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

-#: config.c:2313
+#: config.c:2345

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


@@ -1279,7 +1290,7 @@ msgid ""
 "and the repository exists."
 msgstr ""
 
 "and the repository exists."
 msgstr ""
 

-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140

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


@@ -1411,65 +1422,70 @@ msgstr ""
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 

-#: diff.c:283
+#: diff.c:281

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

-#: diff.c:346
+#: diff.c:344

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

-#: diff.c:3087
+#: diff.c:3085

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

-#: diff.c:3412
+#: diff.c:3411

 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:3502
+#: diff.c:3501

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

-#: diff.c:3665
+#: diff.c:3664

 #, 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:3679
+#: diff.c:3678

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

-#: diff.c:4700
+#: diff.c:4695

 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:4703
+#: diff.c:4698

 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:4706
+#: diff.c:4701

 #, 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:1866
+#: dir.c:1863

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

-#: dir.c:1985
+#: dir.c:1982

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

+#: dir.c:2760
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr ""
+

 #: fetch-pack.c:213
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 #: fetch-pack.c:213
 msgid "git fetch-pack: expected shallow list"
 msgstr ""


@@ -1650,63 +1666,68 @@ msgstr ""
 msgid "failed writing detached signature to '%s'"
 msgstr ""
 
 msgid "failed writing detached signature to '%s'"
 msgstr ""
 

-#: grep.c:1782
+#: graph.c:96
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr ""
+
+#: grep.c:1794

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

-#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133

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

-#: grep.c:1810
+#: grep.c:1822

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

-#: help.c:203
+#: help.c:218

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

-#: help.c:210
+#: help.c:225

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

-#: help.c:241
+#: help.c:256

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

-#: help.c:306
+#: help.c:321

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

-#: help.c:361
+#: help.c:376

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

-#: help.c:383
+#: help.c:398

 #, c-format
 msgid ""
 "WARNING: You called a Git command named '%s', which does not exist.\n"
 "Continuing under the assumption that you meant '%s'"
 msgstr ""
 
 #, c-format
 msgid ""
 "WARNING: You called a Git command named '%s', which does not exist.\n"
 "Continuing under the assumption that you meant '%s'"
 msgstr ""
 

-#: help.c:388
+#: help.c:403

 #, c-format
 msgid "in %0.1f seconds automatically..."
 msgstr ""
 
 #, c-format
 msgid "in %0.1f seconds automatically..."
 msgstr ""
 

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

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

-#: help.c:399 help.c:465
+#: help.c:414 help.c:480

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


@@ -1716,7 +1737,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: help.c:461
+#: help.c:476

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


@@ -1766,229 +1787,229 @@ msgstr ""
 msgid "(bad commit)\n"
 msgstr ""
 
 msgid "(bad commit)\n"
 msgstr ""
 

-#: merge-recursive.c:231
+#: merge-recursive.c:231 merge-recursive.c:239

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

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

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

-#: merge-recursive.c:720
+#: merge-recursive.c:727

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

-#: merge-recursive.c:731
+#: merge-recursive.c:738

 #, 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:745 merge-recursive.c:764
+#: merge-recursive.c:752 merge-recursive.c:771

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

-#: merge-recursive.c:754
+#: merge-recursive.c:761

 #, 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:796 builtin/cat-file.c:34
+#: merge-recursive.c:803 builtin/cat-file.c:34

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

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

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

-#: merge-recursive.c:822
+#: merge-recursive.c:829

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

-#: merge-recursive.c:833
+#: merge-recursive.c:840

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

-#: merge-recursive.c:838
+#: merge-recursive.c:845

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

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

-#: merge-recursive.c:982
+#: merge-recursive.c:989

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

-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: merge-recursive.c:1088 merge-recursive.c:1102

 #, 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:1087 merge-recursive.c:1100
+#: merge-recursive.c:1094 merge-recursive.c:1107

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

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

-#: merge-recursive.c:1143
+#: merge-recursive.c:1150

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

-#: merge-recursive.c:1200
+#: merge-recursive.c:1207

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

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

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

-#: merge-recursive.c:1292
+#: merge-recursive.c:1299

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

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

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

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

-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: merge-recursive.c:1560 merge-recursive.c:1774

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

-#: merge-recursive.c:1610
+#: merge-recursive.c:1617

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

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

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

-#: merge-recursive.c:1666
+#: merge-recursive.c:1673

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

-#: merge-recursive.c:1666
+#: merge-recursive.c:1673

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

-#: merge-recursive.c:1676
+#: merge-recursive.c:1683

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

-#: merge-recursive.c:1683
+#: merge-recursive.c:1690

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

-#: merge-recursive.c:1718
+#: merge-recursive.c:1726

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

-#: merge-recursive.c:1732
+#: merge-recursive.c:1740

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

-#: merge-recursive.c:1736 git-submodule.sh:924
+#: merge-recursive.c:1744 git-submodule.sh:930

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

-#: merge-recursive.c:1737
+#: merge-recursive.c:1745

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

-#: merge-recursive.c:1831
+#: merge-recursive.c:1839

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

-#: merge-recursive.c:1857
+#: merge-recursive.c:1865

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

-#: merge-recursive.c:1863
+#: merge-recursive.c:1871

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

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

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

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

-#: merge-recursive.c:1914
+#: merge-recursive.c:1923

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

-#: merge-recursive.c:1923
+#: merge-recursive.c:1932

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

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

-#: merge-recursive.c:2019
+#: merge-recursive.c:2028

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

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

-#: merge-recursive.c:2121
+#: merge-recursive.c:2130

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

-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792

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


@@ -2066,91 +2087,96 @@ msgstr ""
 msgid "Could not make %s writable by group"
 msgstr ""
 
 msgid "Could not make %s writable by group"
 msgstr ""
 

-#: pathspec.c:133
+#: pathspec.c:142

 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 

-#: pathspec.c:143
+#: pathspec.c:149

 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
 
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
 

-#: pathspec.c:177
+#: pathspec.c:188

 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr ""
 
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr ""
 

-#: pathspec.c:183
+#: pathspec.c:201

 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 

-#: pathspec.c:187
+#: pathspec.c:206

 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 

-#: pathspec.c:205
+#: pathspec.c:238

 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 

-#: pathspec.c:230
+#: pathspec.c:293 pathspec.c:315
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr ""
+
+#: pathspec.c:350

 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 

-#: pathspec.c:241
+#: pathspec.c:363

 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr ""
 
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr ""
 

-#: pathspec.c:291
+#: pathspec.c:451

 #, c-format
 #, c-format

-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "'%s' (mnemonic: '%c')"

 msgstr ""
 
 msgstr ""
 

-#: pathspec.c:353
+#: pathspec.c:461

 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 

-#: pathspec.c:408
+#: pathspec.c:511

 msgid ""
 "empty strings as pathspecs will be made invalid in upcoming releases. please "
 "use . instead if you meant to match all paths"
 msgstr ""
 
 msgid ""
 "empty strings as pathspecs will be made invalid in upcoming releases. please "
 "use . instead if you meant to match all paths"
 msgstr ""
 

-#: pathspec.c:440
+#: pathspec.c:535

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

-#: pathspec.c:449
+#: pathspec.c:544

 msgid ""
 "There is nothing to exclude from by :(exclude) patterns.\n"
 "Perhaps you forgot to add either ':/' or '.' ?"
 msgstr ""
 
 msgid ""
 "There is nothing to exclude from by :(exclude) patterns.\n"
 "Perhaps you forgot to add either ':/' or '.' ?"
 msgstr ""
 

-#: pretty.c:971
+#: pretty.c:982

 msgid "unable to parse --pretty format"
 msgstr ""
 
 msgid "unable to parse --pretty format"
 msgstr ""
 

-#: read-cache.c:1315
+#: read-cache.c:1307

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

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

-#: refs.c:576 builtin/merge.c:840
+#: refs.c:576 builtin/merge.c:844

 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr ""
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr ""


@@ -2170,227 +2196,232 @@ msgstr ""
 msgid "could not remove reference %s"
 msgstr ""
 
 msgid "could not remove reference %s"
 msgstr ""
 

-#: ref-filter.c:55
+#: ref-filter.c:56

 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr ""
 
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr ""
 

-#: ref-filter.c:57
+#: ref-filter.c:58

 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 

-#: ref-filter.c:71
+#: ref-filter.c:72

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

-#: ref-filter.c:77
+#: ref-filter.c:78

 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:84
+#: ref-filter.c:85

 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr ""
 
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr ""
 

-#: ref-filter.c:101
+#: ref-filter.c:92
+#, c-format
+msgid "%%(trailers) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:111

 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 

-#: ref-filter.c:103
+#: ref-filter.c:113

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

-#: ref-filter.c:113
+#: ref-filter.c:123

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

-#: ref-filter.c:135
+#: ref-filter.c:145

 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 

-#: ref-filter.c:147
+#: ref-filter.c:157

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

-#: ref-filter.c:151
+#: ref-filter.c:161

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

-#: ref-filter.c:157
+#: ref-filter.c:167

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

-#: ref-filter.c:161
+#: ref-filter.c:171

 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 

-#: ref-filter.c:244
+#: ref-filter.c:255

 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 

-#: ref-filter.c:270
+#: ref-filter.c:281

 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 

-#: ref-filter.c:372
+#: ref-filter.c:383

 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 

-#: ref-filter.c:424
+#: ref-filter.c:435

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

-#: ref-filter.c:878
+#: ref-filter.c:898

 msgid ":strip= requires a positive integer argument"
 msgstr ""
 
 msgid ":strip= requires a positive integer argument"
 msgstr ""
 

-#: ref-filter.c:883
+#: ref-filter.c:903

 #, c-format
 msgid "ref '%s' does not have %ld components to :strip"
 msgstr ""
 
 #, c-format
 msgid "ref '%s' does not have %ld components to :strip"
 msgstr ""
 

-#: ref-filter.c:1046
+#: ref-filter.c:1066

 #, c-format
 msgid "unknown %.*s format %s"
 msgstr ""
 
 #, c-format
 msgid "unknown %.*s format %s"
 msgstr ""
 

-#: ref-filter.c:1066 ref-filter.c:1097
+#: ref-filter.c:1086 ref-filter.c:1117

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

-#: ref-filter.c:1069 ref-filter.c:1100
+#: ref-filter.c:1089 ref-filter.c:1120

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

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

-#: ref-filter.c:1373
+#: ref-filter.c:1410

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

-#: ref-filter.c:1378
+#: ref-filter.c:1415

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

-#: ref-filter.c:1633
+#: ref-filter.c:1670

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

-#: ref-filter.c:1687
+#: ref-filter.c:1734

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

-#: remote.c:746
+#: remote.c:754

 #, 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:750
+#: remote.c:758

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

-#: remote.c:754
+#: remote.c:762

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

-#: remote.c:762
+#: remote.c:770

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

-#: remote.c:1677 remote.c:1720
+#: remote.c:1685 remote.c:1787

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

-#: remote.c:1686
+#: remote.c:1694

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

-#: remote.c:1689
+#: remote.c:1697

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

-#: remote.c:1695
+#: remote.c:1703

 #, 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:1710
+#: remote.c:1718

 #, 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:1725
+#: remote.c:1730

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

-#: remote.c:1736
+#: remote.c:1741

 #, 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:1749
+#: remote.c:1754

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

-#: remote.c:1771
+#: remote.c:1776

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

-#: remote.c:2073
+#: remote.c:2081

 #, 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:2077
+#: remote.c:2085

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

-#: remote.c:2080
+#: remote.c:2088

 #, 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:2084
+#: remote.c:2092

 #, 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:2090
+#: remote.c:2098

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

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

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


@@ -2398,11 +2429,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:2101
+#: remote.c:2109

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

-#: remote.c:2104
+#: remote.c:2112

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


@@ -2413,7 +2444,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:2114
+#: remote.c:2122

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


@@ -2430,11 +2461,11 @@ msgstr ""
 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 
 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 

-#: run-command.c:106
+#: run-command.c:125

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

-#: run-command.c:108
+#: run-command.c:127

 #, c-format
 msgid "dup2(%d,%d) failed"
 msgstr ""
 #, c-format
 msgid "dup2(%d,%d) failed"
 msgstr ""


@@ -2461,81 +2492,93 @@ msgstr ""
 msgid "the receiving end does not support push options"
 msgstr ""
 
 msgid "the receiving end does not support push options"
 msgstr ""
 

-#: sequencer.c:171
+#: sequencer.c:215

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

-#: sequencer.c:171
+#: sequencer.c:217

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

-#: sequencer.c:228
+#: sequencer.c:219
+msgid "rebase -i"
+msgstr ""
+
+#: sequencer.c:221
+#, c-format
+msgid "Unknown action: %d"
+msgstr ""
+
+#: sequencer.c:278

 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:231
+#: sequencer.c:281

 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:244 sequencer.c:1209
+#: sequencer.c:294 sequencer.c:1667

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

-#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
+#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686

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

-#: sequencer.c:251
+#: sequencer.c:301

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

-#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
+#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674

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

-#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
+#: builtin/commit.c:749 builtin/merge.c:1036

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

-#: sequencer.c:305
+#: sequencer.c:355

 #, 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:309
+#: sequencer.c:359

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

-#: sequencer.c:324
+#: sequencer.c:388

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

-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:399
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. * "rebase -i".
+#.
+#: sequencer.c:470

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

-#: sequencer.c:418
+#: sequencer.c:489

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

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

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

-#: sequencer.c:483
+#: sequencer.c:592

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


@@ -2552,172 +2595,369 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:567
+#: sequencer.c:688

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

-#: sequencer.c:572
+#: sequencer.c:693

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

-#: sequencer.c:656
+#: sequencer.c:815
+#, c-format
+msgid ""
+"unexpected 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+
+#: sequencer.c:821
+#, c-format
+msgid ""
+"invalid 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+
+#: sequencer.c:827 sequencer.c:852
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr ""
+
+#: sequencer.c:836
+msgid "need a HEAD to fixup"
+msgstr ""
+
+#: sequencer.c:838
+msgid "could not read HEAD"
+msgstr ""
+
+#: sequencer.c:840
+msgid "could not read HEAD's commit message"
+msgstr ""
+
+#: sequencer.c:846
+#, c-format
+msgid "cannot write '%s'"
+msgstr ""
+
+#: sequencer.c:855 git-rebase--interactive.sh:445
+msgid "This is the 1st commit message:"
+msgstr ""
+
+#: sequencer.c:863
+#, c-format
+msgid "could not read commit message of %s"
+msgstr ""
+
+#: sequencer.c:870
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr ""
+
+#: sequencer.c:875
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr ""
+
+#: sequencer.c:880
+#, c-format
+msgid "unknown command: %d"
+msgstr ""
+
+#: sequencer.c:946

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

-#: sequencer.c:675
+#: sequencer.c:964

 #, 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:683
+#: sequencer.c:972

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

-#: sequencer.c:687
+#: sequencer.c:976

 #, 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:982
+#, 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.
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.

-#: sequencer.c:700
+#: sequencer.c:1001

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

-#: sequencer.c:705
+#: sequencer.c:1063 sequencer.c:1812

 #, c-format
 #, c-format

-msgid "cannot get commit message for %s"
+msgid "could not rename '%s' to '%s'"

 msgstr ""
 
 msgstr ""
 

-#: sequencer.c:797
+#: sequencer.c:1114

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

-#: sequencer.c:798
+#: sequencer.c:1115

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

-#: sequencer.c:833
+#: sequencer.c:1157

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

-#: sequencer.c:843
+#: sequencer.c:1167

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

-#: sequencer.c:850
+#: sequencer.c:1174

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

-#: sequencer.c:944
+#: sequencer.c:1294

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

-#: sequencer.c:950
-msgid "no commits parsed."
+#: sequencer.c:1302
+#, c-format
+msgid "cannot '%s' without a previous commit"

 msgstr ""
 
 msgstr ""
 

-#: sequencer.c:966
+#: sequencer.c:1334

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

-#: sequencer.c:972
+#: sequencer.c:1341
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr ""
+
+#: sequencer.c:1343

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

-#: sequencer.c:983
+#: sequencer.c:1348
+msgid "no commits parsed."
+msgstr ""
+
+#: sequencer.c:1359

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

-#: sequencer.c:985
+#: sequencer.c:1361

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

-#: sequencer.c:1028
+#: sequencer.c:1424

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

-#: sequencer.c:1031
+#: sequencer.c:1427

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

-#: sequencer.c:1063
+#: sequencer.c:1484

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

-#: sequencer.c:1101
+#: sequencer.c:1522

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

-#: sequencer.c:1102
+#: sequencer.c:1523

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

-#: sequencer.c:1106
+#: sequencer.c:1526

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

-#: sequencer.c:1120
+#: sequencer.c:1540

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

-#: sequencer.c:1151 sequencer.c:1289
+#: sequencer.c:1596 sequencer.c:2150

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

-#: sequencer.c:1153
+#: sequencer.c:1598

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

-#: sequencer.c:1155 sequencer.c:1189
+#: sequencer.c:1600 sequencer.c:1634

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

-#: sequencer.c:1175 builtin/grep.c:578
+#: sequencer.c:1620 builtin/grep.c:904

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

-#: sequencer.c:1177
+#: sequencer.c:1622

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

-#: sequencer.c:1178
+#: sequencer.c:1623

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

-#: sequencer.c:1184
+#: sequencer.c:1629

 #, 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:1354
+#: sequencer.c:1640
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+
+#: sequencer.c:1777 sequencer.c:2049
+msgid "cannot read HEAD"
+msgstr ""
+
+#: sequencer.c:1817 builtin/difftool.c:574
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:1833
+msgid "could not read index"
+msgstr ""
+
+#: sequencer.c:1838
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:1844
+msgid "and made changes to the index and/or the working tree\n"
+msgstr ""
+
+#: sequencer.c:1850
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:1905 git-rebase.sh:168
+#, c-format
+msgid "Applied autostash."
+msgstr ""
+
+#: sequencer.c:1917
+#, c-format
+msgid "cannot store %s"
+msgstr ""
+
+#: sequencer.c:1919 git-rebase.sh:172
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+
+#: sequencer.c:2000
+#, c-format
+msgid "stopped at %s... %.*s"
+msgstr ""
+
+#: sequencer.c:2027
+#, c-format
+msgid "unknown command %d"
+msgstr ""
+
+#: sequencer.c:2057
+msgid "could not read orig-head"
+msgstr ""
+
+#: sequencer.c:2061
+msgid "could not read 'onto'"
+msgstr ""
+
+#: sequencer.c:2068
+#, c-format
+msgid "could not update %s"
+msgstr ""
+
+#: sequencer.c:2075
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr ""
+
+#: sequencer.c:2159
+msgid "cannot rebase: You have unstaged changes."
+msgstr ""
+
+#: sequencer.c:2164
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:2173
+msgid "cannot amend non-existing commit"
+msgstr ""
+
+#: sequencer.c:2175
+#, c-format
+msgid "invalid file: '%s'"
+msgstr ""
+
+#: sequencer.c:2177
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr ""
+
+#: sequencer.c:2180
+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:2190
+msgid "could not commit staged changes."
+msgstr ""
+
+#: sequencer.c:2270

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

-#: sequencer.c:1358
+#: sequencer.c:2274

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

-#: sequencer.c:1391
+#: sequencer.c:2307

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


@@ -2744,82 +2984,82 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 

-#: setup.c:468
+#: setup.c:470

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

-#: setup.c:476
+#: setup.c:478

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

-#: setup.c:762
+#: setup.c:768

 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr ""
 
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr ""
 

-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+#: setup.c:770 setup.c:922 builtin/index-pack.c:1643

 msgid "Cannot come back to cwd"
 msgstr ""
 
 msgid "Cannot come back to cwd"
 msgstr ""
 

-#: setup.c:845
+#: setup.c:852

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

-#: setup.c:920
+#: setup.c:927

 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 

-#: setup.c:927
+#: setup.c:934

 #, c-format
 msgid "Cannot change to '%s/..'"
 msgstr ""
 
 #, c-format
 msgid "Cannot change to '%s/..'"
 msgstr ""
 

-#: setup.c:989
+#: setup.c:996

 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 

-#: sha1_file.c:473
+#: sha1_file.c:490

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

-#: sha1_file.c:499
+#: sha1_file.c:516

 #, 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:505
+#: sha1_file.c:522

 #, 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:511
+#: sha1_file.c:528

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

-#: sha1_file.c:519
+#: sha1_file.c:536

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

-#: sha1_file.c:1159
+#: sha1_file.c:1176

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

-#: sha1_file.c:2592
+#: sha1_file.c:2637

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

-#: sha1_file.c:2596
+#: sha1_file.c:2641

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


@@ -2846,88 +3086,128 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 

-#: submodule.c:64 submodule.c:98
+#: submodule.c:65 submodule.c:99

 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 

-#: submodule.c:68 submodule.c:102
+#: submodule.c:69 submodule.c:103

 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr ""
 
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr ""
 

-#: submodule.c:76
+#: submodule.c:77

 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ""
 
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ""
 

-#: submodule.c:109
+#: submodule.c:110

 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 

-#: submodule.c:120
+#: submodule.c:121

 msgid "staging updated .gitmodules failed"
 msgstr ""
 
 msgid "staging updated .gitmodules failed"
 msgstr ""
 

-#: submodule.c:158
+#: submodule.c:159

 msgid "negative values not allowed for submodule.fetchJobs"
 msgstr ""
 
 msgid "negative values not allowed for submodule.fetchJobs"
 msgstr ""
 

-#: submodule-config.c:358
+#: submodule.c:1184
+#, c-format
+msgid "could not start 'git status in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1197
+#, c-format
+msgid "could not run 'git status in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1398
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+
+#: submodule.c:1410 submodule.c:1471
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr ""
+
+#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
+#: builtin/submodule--helper.c:650
+#, c-format
+msgid "could not create directory '%s'"
+msgstr ""
+
+#: submodule.c:1420
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+
+#: submodule.c:1512
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr ""
+
+#: submodule-config.c:360

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

-#: trailer.c:238
+#: trailer.c:240

 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr ""
 
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr ""
 

-#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
-#: trailer.c:541
+#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
+#: trailer.c:543

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

-#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#: trailer.c:525 trailer.c:530 builtin/remote.c:289

 #, c-format
 msgid "more than one %s"
 msgstr ""
 
 #, c-format
 msgid "more than one %s"
 msgstr ""
 

-#: trailer.c:672
+#: trailer.c:702

 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr ""
 

-#: trailer.c:695
+#: trailer.c:722

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

-#: trailer.c:698
+#: trailer.c:725

 msgid "could not read from stdin"
 msgstr ""
 
 msgid "could not read from stdin"
 msgstr ""
 

-#: trailer.c:929 builtin/am.c:44
+#: trailer.c:949 builtin/am.c:44

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

-#: trailer.c:931
+#: trailer.c:951

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

-#: trailer.c:933
+#: trailer.c:953

 #, c-format
 msgid "file %s is not writable by user"
 msgstr ""
 
 #, c-format
 msgid "file %s is not writable by user"
 msgstr ""
 

-#: trailer.c:945
+#: trailer.c:965

 msgid "could not open temporary file"
 msgstr ""
 
 msgid "could not open temporary file"
 msgstr ""
 

-#: trailer.c:983
+#: trailer.c:1001

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


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

-#: transport.c:817
+#: transport.c:885

 #, 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:821
+#: transport.c:889

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


@@ -2965,7 +3245,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: transport.c:829
+#: transport.c:897

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


@@ -2990,98 +3270,98 @@ msgstr ""
 msgid "too-short tree file"
 msgstr ""
 
 msgid "too-short tree file"
 msgstr ""
 

-#: unpack-trees.c:64
+#: unpack-trees.c:99

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

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

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

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

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

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

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

-"Updating the following directories would lose untracked files in it:\n"
+"Updating the following directories would lose untracked files in them:\n"

 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: unpack-trees.c:85
+#: unpack-trees.c:120

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

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

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

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

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

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

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


@@ -3089,7 +3369,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:104
+#: unpack-trees.c:139

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


@@ -3097,47 +3377,47 @@ msgid ""
 "%%s"
 msgstr ""
 
 "%%s"
 msgstr ""
 

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

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

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

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

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

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

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

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


@@ -3145,7 +3425,7 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: unpack-trees.c:128
+#: unpack-trees.c:163

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


@@ -3153,12 +3433,12 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: unpack-trees.c:205
+#: unpack-trees.c:240

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

-#: unpack-trees.c:237
+#: unpack-trees.c:270

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


@@ -3207,7 +3487,7 @@ msgid "could not open '%s' for writing"
 msgstr ""
 
 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
 msgstr ""
 
 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

-#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

 #: builtin/pull.c:341
 #, c-format
 msgid "could not open '%s' for reading"
 #: builtin/pull.c:341
 #, c-format
 msgid "could not open '%s' for reading"


@@ -3413,178 +3693,182 @@ msgstr ""
 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:1172
+#: wt-status.c:1176
+msgid "git-rebase-todo is missing."
+msgstr ""
+
+#: wt-status.c:1178

 msgid "No commands done."
 msgstr ""
 
 msgid "No commands done."
 msgstr ""
 

-#: wt-status.c:1175
+#: wt-status.c:1181

 #, 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:1186
+#: wt-status.c:1192

 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 
 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 

-#: wt-status.c:1191
+#: wt-status.c:1197

 msgid "No commands remaining."
 msgstr ""
 
 msgid "No commands remaining."
 msgstr ""
 

-#: wt-status.c:1194
+#: wt-status.c:1200

 #, 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:1202
+#: wt-status.c:1208

 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:1215
+#: wt-status.c:1221

 #, 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:1220
+#: wt-status.c:1226

 msgid "You are currently rebasing."
 msgstr ""
 
 msgid "You are currently rebasing."
 msgstr ""
 

-#: wt-status.c:1234
+#: wt-status.c:1240

 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1236
+#: wt-status.c:1242

 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 

-#: wt-status.c:1238
+#: wt-status.c:1244

 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:1244
+#: wt-status.c:1250

 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 

-#: wt-status.c:1248
+#: wt-status.c:1254

 #, 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:1253
+#: wt-status.c:1259

 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:1256
+#: wt-status.c:1262

 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:1260
+#: wt-status.c:1266

 #, 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:1265
+#: wt-status.c:1271

 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:1268
+#: wt-status.c:1274

 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:1270
+#: wt-status.c:1276

 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:1280
+#: wt-status.c:1286

 #, 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:1285
+#: wt-status.c:1291

 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 

-#: wt-status.c:1288
+#: wt-status.c:1294

 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 

-#: wt-status.c:1290
+#: wt-status.c:1296

 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:1299
+#: wt-status.c:1305

 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 

-#: wt-status.c:1304
+#: wt-status.c:1310

 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 

-#: wt-status.c:1307
+#: wt-status.c:1313

 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 

-#: wt-status.c:1309
+#: wt-status.c:1315

 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:1320
+#: wt-status.c:1326

 #, 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:1324
+#: wt-status.c:1330

 msgid "You are currently bisecting."
 msgstr ""
 
 msgid "You are currently bisecting."
 msgstr ""
 

-#: wt-status.c:1327
+#: wt-status.c:1333

 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:1524
+#: wt-status.c:1530

 msgid "On branch "
 msgstr ""
 
 msgid "On branch "
 msgstr ""
 

-#: wt-status.c:1530
+#: wt-status.c:1536

 msgid "interactive rebase in progress; onto "
 msgstr ""
 
 msgid "interactive rebase in progress; onto "
 msgstr ""
 

-#: wt-status.c:1532
+#: wt-status.c:1538

 msgid "rebase in progress; onto "
 msgstr ""
 
 msgid "rebase in progress; onto "
 msgstr ""
 

-#: wt-status.c:1537
+#: wt-status.c:1543

 msgid "HEAD detached at "
 msgstr ""
 
 msgid "HEAD detached at "
 msgstr ""
 

-#: wt-status.c:1539
+#: wt-status.c:1545

 msgid "HEAD detached from "
 msgstr ""
 
 msgid "HEAD detached from "
 msgstr ""
 

-#: wt-status.c:1542
+#: wt-status.c:1548

 msgid "Not currently on any branch."
 msgstr ""
 
 msgid "Not currently on any branch."
 msgstr ""
 

-#: wt-status.c:1560
+#: wt-status.c:1566

 msgid "Initial commit"
 msgstr ""
 
 msgid "Initial commit"
 msgstr ""
 

-#: wt-status.c:1574
+#: wt-status.c:1580

 msgid "Untracked files"
 msgstr ""
 
 msgid "Untracked files"
 msgstr ""
 

-#: wt-status.c:1576
+#: wt-status.c:1582

 msgid "Ignored files"
 msgstr ""
 
 msgid "Ignored files"
 msgstr ""
 

-#: wt-status.c:1580
+#: wt-status.c:1586

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


@@ -3592,92 +3876,92 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
 "new files yourself (see 'git help status')."
 msgstr ""
 

-#: wt-status.c:1586
+#: wt-status.c:1592

 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 

-#: wt-status.c:1588
+#: wt-status.c:1594

 msgid " (use -u option to show untracked files)"
 msgstr ""
 
 msgid " (use -u option to show untracked files)"
 msgstr ""
 

-#: wt-status.c:1594
+#: wt-status.c:1600

 msgid "No changes"
 msgstr ""
 
 msgid "No changes"
 msgstr ""
 

-#: wt-status.c:1599
+#: wt-status.c:1605

 #, 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:1602
+#: wt-status.c:1608

 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 

-#: wt-status.c:1605
+#: wt-status.c:1611

 #, 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:1608
+#: wt-status.c:1614

 #, 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:1611
+#: wt-status.c:1617

 #, 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:1614 wt-status.c:1619
+#: wt-status.c:1620 wt-status.c:1625

 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 

-#: wt-status.c:1617
+#: wt-status.c:1623

 #, 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:1621
+#: wt-status.c:1627

 #, 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:1728
+#: wt-status.c:1734

 msgid "Initial commit on "
 msgstr ""
 
 msgid "Initial commit on "
 msgstr ""
 

-#: wt-status.c:1732
+#: wt-status.c:1738

 msgid "HEAD (no branch)"
 msgstr ""
 
 msgid "HEAD (no branch)"
 msgstr ""
 

-#: wt-status.c:1761
+#: wt-status.c:1767

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

-#: wt-status.c:1763 wt-status.c:1771
+#: wt-status.c:1769 wt-status.c:1777

 msgid "behind "
 msgstr ""
 
 msgid "behind "
 msgstr ""
 

-#: wt-status.c:1766 wt-status.c:1769
+#: wt-status.c:1772 wt-status.c:1775

 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:2270
+#: wt-status.c:2277

 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 

-#: wt-status.c:2276
+#: wt-status.c:2283

 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 

-#: wt-status.c:2278
+#: wt-status.c:2285

 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""


@@ -3709,7 +3993,7 @@ msgstr ""
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 

-#: builtin/add.c:209 builtin/rev-parse.c:840
+#: builtin/add.c:209 builtin/rev-parse.c:845

 msgid "Could not read the index"
 msgstr ""
 
 msgid "Could not read the index"
 msgstr ""
 


@@ -3744,9 +4028,9 @@ msgstr ""
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 

-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
-#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
+#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

 msgid "dry run"
 msgstr ""
 
 msgid "dry run"
 msgstr ""
 


@@ -3754,7 +4038,7 @@ msgstr ""
 msgid "interactive picking"
 msgstr ""
 
 msgid "interactive picking"
 msgstr ""
 

-#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

 msgid "select hunks interactively"
 msgstr ""
 
 msgid "select hunks interactively"
 msgstr ""
 


@@ -3836,7 +4120,7 @@ msgstr ""
 
 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
 
 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

 #: builtin/submodule--helper.c:244
 msgid "index file corrupt"
 msgstr ""
 #: builtin/submodule--helper.c:244
 msgid "index file corrupt"
 msgstr ""


@@ -3953,7 +4237,7 @@ msgstr ""
 msgid "Failed to merge in the changes."
 msgstr ""
 
 msgid "Failed to merge in the changes."
 msgstr ""
 

-#: builtin/am.c:1686 builtin/merge.c:628
+#: builtin/am.c:1686 builtin/merge.c:632

 msgid "git write-tree failed to write a tree"
 msgstr ""
 
 msgid "git write-tree failed to write a tree"
 msgstr ""
 


@@ -3961,8 +4245,8 @@ msgstr ""
 msgid "applying to an empty history"
 msgstr ""
 
 msgid "applying to an empty history"
 msgstr ""
 

-#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
-#: builtin/merge.c:823
+#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/merge.c:827

 msgid "failed to write commit object"
 msgstr ""
 
 msgid "failed to write commit object"
 msgstr ""
 


@@ -4066,7 +4350,7 @@ msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
 #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
 msgstr ""
 
 #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57

-#: builtin/repack.c:172
+#: builtin/repack.c:178

 msgid "be quiet"
 msgstr ""
 
 msgid "be quiet"
 msgstr ""
 


@@ -4109,15 +4393,15 @@ msgid "pass it through git-apply"
 msgstr ""
 
 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
 msgstr ""
 
 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

-#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
-#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
+#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

 #: parse-options.h:132 parse-options.h:134 parse-options.h:245
 msgid "n"
 msgstr ""
 
 #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
 #: parse-options.h:132 parse-options.h:134 parse-options.h:245
 msgid "n"
 msgstr ""
 
 #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

-#: builtin/tag.c:372
+#: builtin/tag.c:387 builtin/verify-tag.c:38

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


@@ -4153,8 +4437,8 @@ msgstr ""
 msgid "use current timestamp for author date"
 msgstr ""
 
 msgid "use current timestamp for author date"
 msgstr ""
 

-#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

 msgid "key-id"
 msgstr ""
 
 msgid "key-id"
 msgstr ""
 


@@ -4251,115 +4535,111 @@ 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:1781
+#: builtin/blame.c:1786

 msgid "Blaming lines"
 msgstr ""
 
 msgid "Blaming lines"
 msgstr ""
 

-#: builtin/blame.c:2577
+#: builtin/blame.c:2582

 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 

-#: builtin/blame.c:2578
+#: builtin/blame.c:2583

 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:2579
+#: builtin/blame.c:2584

 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:2580
+#: builtin/blame.c:2585

 msgid "Show work cost statistics"
 msgstr ""
 
 msgid "Show work cost statistics"
 msgstr ""
 

-#: builtin/blame.c:2581
+#: builtin/blame.c:2586

 msgid "Force progress reporting"
 msgstr ""
 
 msgid "Force progress reporting"
 msgstr ""
 

-#: builtin/blame.c:2582
+#: builtin/blame.c:2587

 msgid "Show output score for blame entries"
 msgstr ""
 
 msgid "Show output score for blame entries"
 msgstr ""
 

-#: builtin/blame.c:2583
+#: builtin/blame.c:2588

 msgid "Show original filename (Default: auto)"
 msgstr ""
 
 msgid "Show original filename (Default: auto)"
 msgstr ""
 

-#: builtin/blame.c:2584
+#: builtin/blame.c:2589

 msgid "Show original linenumber (Default: off)"
 msgstr ""
 
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:2585
+#: builtin/blame.c:2590

 msgid "Show in a format designed for machine consumption"
 msgstr ""
 
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 

-#: builtin/blame.c:2586
+#: builtin/blame.c:2591

 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 

-#: builtin/blame.c:2587
+#: builtin/blame.c:2592

 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:2588
+#: builtin/blame.c:2593

 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 
 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:2589
+#: builtin/blame.c:2594

 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:2590
+#: builtin/blame.c:2595

 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:2591
+#: builtin/blame.c:2596

 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 

-#: builtin/blame.c:2592
+#: builtin/blame.c:2597

 msgid "Ignore whitespace differences"
 msgstr ""
 
 msgid "Ignore whitespace differences"
 msgstr ""
 

-#: builtin/blame.c:2599
-msgid "Use an experimental indent-based heuristic to improve diffs"
-msgstr ""
-
-#: builtin/blame.c:2600
-msgid "Use an experimental blank-line-based heuristic to improve diffs"
+#: builtin/blame.c:2604
+msgid "Use an experimental heuristic to improve diffs"

 msgstr ""
 
 msgstr ""
 

-#: builtin/blame.c:2602
+#: builtin/blame.c:2606

 msgid "Spend extra cycles to find better match"
 msgstr ""
 
 msgid "Spend extra cycles to find better match"
 msgstr ""
 

-#: builtin/blame.c:2603
+#: builtin/blame.c:2607

 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:2604
+#: builtin/blame.c:2608

 msgid "Use <file>'s contents as the final image"
 msgstr ""
 
 msgid "Use <file>'s contents as the final image"
 msgstr ""
 

-#: builtin/blame.c:2605 builtin/blame.c:2606
+#: builtin/blame.c:2609 builtin/blame.c:2610

 msgid "score"
 msgstr ""
 
 msgid "score"
 msgstr ""
 

-#: builtin/blame.c:2605
+#: builtin/blame.c:2609

 msgid "Find line copies within and across files"
 msgstr ""
 
 msgid "Find line copies within and across files"
 msgstr ""
 

-#: builtin/blame.c:2606
+#: builtin/blame.c:2610

 msgid "Find line movements within and across files"
 msgstr ""
 
 msgid "Find line movements within and across files"
 msgstr ""
 

-#: builtin/blame.c:2607
+#: builtin/blame.c:2611

 msgid "n,m"
 msgstr ""
 
 msgid "n,m"
 msgstr ""
 

-#: builtin/blame.c:2607
+#: builtin/blame.c:2611

 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:2654
+#: builtin/blame.c:2658

 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 


@@ -4369,38 +4649,38 @@ msgstr ""
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.
 #. takes 22 places, is the longest among various forms of
 #. relative timestamps, but your language may need more or
 #. fewer display columns.

-#: builtin/blame.c:2700
+#: builtin/blame.c:2706

 msgid "4 years, 11 months ago"
 msgstr ""
 
 msgid "4 years, 11 months ago"
 msgstr ""
 

-#: builtin/blame.c:2780
+#: builtin/blame.c:2786

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

-#: builtin/blame.c:2800
+#: builtin/blame.c:2806

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

-#: builtin/blame.c:2805
+#: builtin/blame.c:2811

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

-#: builtin/blame.c:2832
+#: builtin/blame.c:2838

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

-#: builtin/blame.c:2843
+#: builtin/blame.c:2849

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

-#: builtin/blame.c:2854
+#: builtin/blame.c:2860

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

-#: builtin/blame.c:2873
+#: builtin/blame.c:2879

 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"


@@ -4572,44 +4852,44 @@ msgstr ""
 msgid "(no branch)"
 msgstr ""
 
 msgid "(no branch)"
 msgstr ""
 

-#: builtin/branch.c:544
+#: builtin/branch.c:535

 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr ""
 
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr ""
 

-#: builtin/branch.c:548
+#: builtin/branch.c:539

 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr ""
 
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr ""
 

-#: builtin/branch.c:563
+#: builtin/branch.c:554

 msgid "cannot rename the current branch while not on any."
 msgstr ""
 
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 

-#: builtin/branch.c:573
+#: builtin/branch.c:564

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

-#: builtin/branch.c:590
+#: builtin/branch.c:581

 msgid "Branch rename failed"
 msgstr ""
 
 msgid "Branch rename failed"
 msgstr ""
 

-#: builtin/branch.c:594
+#: builtin/branch.c:585

 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 

-#: builtin/branch.c:597
+#: builtin/branch.c:588

 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 

-#: builtin/branch.c:604
+#: builtin/branch.c:595

 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 

-#: builtin/branch.c:620
+#: builtin/branch.c:611

 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"


@@ -4617,207 +4897,211 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 

-#: builtin/branch.c:651
+#: builtin/branch.c:643

 msgid "Generic options"
 msgstr ""
 
 msgid "Generic options"
 msgstr ""
 

-#: builtin/branch.c:653
+#: builtin/branch.c:645

 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 

-#: builtin/branch.c:654
+#: builtin/branch.c:646

 msgid "suppress informational messages"
 msgstr ""
 
 msgid "suppress informational messages"
 msgstr ""
 

-#: builtin/branch.c:655
+#: builtin/branch.c:647

 msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
 msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 

-#: builtin/branch.c:657
+#: builtin/branch.c:649

 msgid "change upstream info"
 msgstr ""
 
 msgid "change upstream info"
 msgstr ""
 

-#: builtin/branch.c:659
+#: builtin/branch.c:651

 msgid "upstream"
 msgstr ""
 
 msgid "upstream"
 msgstr ""
 

-#: builtin/branch.c:659
+#: builtin/branch.c:651

 msgid "change the upstream info"
 msgstr ""
 
 msgid "change the upstream info"
 msgstr ""
 

-#: builtin/branch.c:660
+#: builtin/branch.c:652

 msgid "Unset the upstream info"
 msgstr ""
 
 msgid "Unset the upstream info"
 msgstr ""
 

-#: builtin/branch.c:661
+#: builtin/branch.c:653

 msgid "use colored output"
 msgstr ""
 
 msgid "use colored output"
 msgstr ""
 

-#: builtin/branch.c:662
+#: builtin/branch.c:654

 msgid "act on remote-tracking branches"
 msgstr ""
 
 msgid "act on remote-tracking branches"
 msgstr ""
 

-#: builtin/branch.c:664 builtin/branch.c:665
+#: builtin/branch.c:656 builtin/branch.c:657

 msgid "print only branches that contain the commit"
 msgstr ""
 
 msgid "print only branches that contain the commit"
 msgstr ""
 

-#: builtin/branch.c:668
+#: builtin/branch.c:660

 msgid "Specific git-branch actions:"
 msgstr ""
 
 msgid "Specific git-branch actions:"
 msgstr ""
 

-#: builtin/branch.c:669
+#: builtin/branch.c:661

 msgid "list both remote-tracking and local branches"
 msgstr ""
 
 msgid "list both remote-tracking and local branches"
 msgstr ""
 

-#: builtin/branch.c:671
+#: builtin/branch.c:663

 msgid "delete fully merged branch"
 msgstr ""
 
 msgid "delete fully merged branch"
 msgstr ""
 

-#: builtin/branch.c:672
+#: builtin/branch.c:664

 msgid "delete branch (even if not merged)"
 msgstr ""
 
 msgid "delete branch (even if not merged)"
 msgstr ""
 

-#: builtin/branch.c:673
+#: builtin/branch.c:665

 msgid "move/rename a branch and its reflog"
 msgstr ""
 
 msgid "move/rename a branch and its reflog"
 msgstr ""
 

-#: builtin/branch.c:674
+#: builtin/branch.c:666

 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 

-#: builtin/branch.c:675
+#: builtin/branch.c:667

 msgid "list branch names"
 msgstr ""
 
 msgid "list branch names"
 msgstr ""
 

-#: builtin/branch.c:676
+#: builtin/branch.c:668

 msgid "create the branch's reflog"
 msgstr ""
 
 msgid "create the branch's reflog"
 msgstr ""
 

-#: builtin/branch.c:678
+#: builtin/branch.c:670

 msgid "edit the description for the branch"
 msgstr ""
 
 msgid "edit the description for the branch"
 msgstr ""
 

-#: builtin/branch.c:679
+#: builtin/branch.c:671

 msgid "force creation, move/rename, deletion"
 msgstr ""
 
 msgid "force creation, move/rename, deletion"
 msgstr ""
 

-#: builtin/branch.c:680
+#: builtin/branch.c:672

 msgid "print only branches that are merged"
 msgstr ""
 
 msgid "print only branches that are merged"
 msgstr ""
 

-#: builtin/branch.c:681
+#: builtin/branch.c:673

 msgid "print only branches that are not merged"
 msgstr ""
 
 msgid "print only branches that are not merged"
 msgstr ""
 

-#: builtin/branch.c:682
+#: builtin/branch.c:674

 msgid "list branches in columns"
 msgstr ""
 
 msgid "list branches in columns"
 msgstr ""
 

-#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

 msgid "key"
 msgstr ""
 
 msgid "key"
 msgstr ""
 

-#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

 msgid "field name to sort on"
 msgstr ""
 
 msgid "field name to sort on"
 msgstr ""
 

-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

-#: builtin/tag.c:369
+#: builtin/tag.c:384

 msgid "object"
 msgstr ""
 
 msgid "object"
 msgstr ""
 

-#: builtin/branch.c:687
+#: builtin/branch.c:679

 msgid "print only branches of the object"
 msgstr ""
 
 msgid "print only branches of the object"
 msgstr ""
 

-#: builtin/branch.c:705
+#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+msgid "sorting and filtering are case insensitive"
+msgstr ""
+
+#: builtin/branch.c:698

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

-#: builtin/branch.c:709 builtin/clone.c:706
+#: builtin/branch.c:702 builtin/clone.c:706

 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 

-#: builtin/branch.c:729
+#: builtin/branch.c:724

 msgid "--column and --verbose are incompatible"
 msgstr ""
 
 msgid "--column and --verbose are incompatible"
 msgstr ""
 

-#: builtin/branch.c:740 builtin/branch.c:782
+#: builtin/branch.c:735 builtin/branch.c:787

 msgid "branch name required"
 msgstr ""
 
 msgid "branch name required"
 msgstr ""
 

-#: builtin/branch.c:758
+#: builtin/branch.c:763

 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 

-#: builtin/branch.c:763
+#: builtin/branch.c:768

 msgid "cannot edit description of more than one branch"
 msgstr ""
 
 msgid "cannot edit description of more than one branch"
 msgstr ""
 

-#: builtin/branch.c:770
+#: builtin/branch.c:775

 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 

-#: builtin/branch.c:773
+#: builtin/branch.c:778

 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 

-#: builtin/branch.c:788
+#: builtin/branch.c:793

 msgid "too many branches for a rename operation"
 msgstr ""
 
 msgid "too many branches for a rename operation"
 msgstr ""
 

-#: builtin/branch.c:793
+#: builtin/branch.c:798

 msgid "too many branches to set new upstream"
 msgstr ""
 
 msgid "too many branches to set new upstream"
 msgstr ""
 

-#: builtin/branch.c:797
+#: builtin/branch.c:802

 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 

-#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
+#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

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

-#: builtin/branch.c:804
+#: builtin/branch.c:809

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

-#: builtin/branch.c:816
+#: builtin/branch.c:821

 msgid "too many branches to unset upstream"
 msgstr ""
 
 msgid "too many branches to unset upstream"
 msgstr ""
 

-#: builtin/branch.c:820
+#: builtin/branch.c:825

 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 

-#: builtin/branch.c:826
+#: builtin/branch.c:831

 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 

-#: builtin/branch.c:840
+#: builtin/branch.c:845

 msgid "it does not make sense to create 'HEAD' manually"
 msgstr ""
 
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr ""
 

-#: builtin/branch.c:846
+#: builtin/branch.c:851

 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 

-#: builtin/branch.c:849
+#: builtin/branch.c:854

 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
 "track or --set-upstream-to\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
 "track or --set-upstream-to\n"
 msgstr ""
 

-#: builtin/branch.c:866
+#: builtin/branch.c:871

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


@@ -4878,7 +5162,7 @@ msgstr ""
 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:561 git-submodule.sh:923
+#: builtin/cat-file.c:561 git-submodule.sh:929

 msgid "blob"
 msgstr ""
 
 msgid "blob"
 msgstr ""
 


@@ -4934,7 +5218,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:18 builtin/checkout.c:1137 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

 msgid "suppress progress reporting"
 msgstr ""
 
 msgid "suppress progress reporting"
 msgstr ""
 


@@ -5024,9 +5308,9 @@ msgid "write the content to temporary files"
 msgstr ""
 
 #: builtin/checkout-index.c:174 builtin/column.c:30
 msgstr ""
 
 #: builtin/checkout-index.c:174 builtin/column.c:30

-#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
-#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
-#: builtin/worktree.c:469
+#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
+#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
+#: builtin/worktree.c:471

 msgid "string"
 msgstr ""
 
 msgid "string"
 msgstr ""
 


@@ -5101,50 +5385,50 @@ msgstr ""
 msgid "you need to resolve your current index first"
 msgstr ""
 
 msgid "you need to resolve your current index first"
 msgstr ""
 

-#: builtin/checkout.c:624
+#: builtin/checkout.c:625

 #, 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:663
+#: builtin/checkout.c:666

 msgid "HEAD is now at"
 msgstr ""
 
 msgid "HEAD is now at"
 msgstr ""
 

-#: builtin/checkout.c:667 builtin/clone.c:660
+#: builtin/checkout.c:670 builtin/clone.c:660

 msgid "unable to update HEAD"
 msgstr ""
 
 msgid "unable to update HEAD"
 msgstr ""
 

-#: builtin/checkout.c:671
+#: builtin/checkout.c:674

 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:674
+#: builtin/checkout.c:677

 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:678
+#: builtin/checkout.c:681

 #, 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:680 builtin/checkout.c:1069
+#: builtin/checkout.c:683 builtin/checkout.c:1072

 #, 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:682
+#: builtin/checkout.c:685

 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:733
+#: builtin/checkout.c:736

 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 

-#: builtin/checkout.c:739
+#: builtin/checkout.c:742

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


@@ -5159,7 +5443,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:758
+#: builtin/checkout.c:761

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


@@ -5176,162 +5460,162 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:794
+#: builtin/checkout.c:797

 msgid "internal error in revision walk"
 msgstr ""
 
 msgid "internal error in revision walk"
 msgstr ""
 

-#: builtin/checkout.c:798
+#: builtin/checkout.c:801

 msgid "Previous HEAD position was"
 msgstr ""
 
 msgid "Previous HEAD position was"
 msgstr ""
 

-#: builtin/checkout.c:825 builtin/checkout.c:1064
+#: builtin/checkout.c:828 builtin/checkout.c:1067

 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:970
+#: builtin/checkout.c:973

 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 

-#: builtin/checkout.c:1010 builtin/worktree.c:214
+#: builtin/checkout.c:1013 builtin/worktree.c:214

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

-#: builtin/checkout.c:1039
+#: builtin/checkout.c:1042

 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 

-#: builtin/checkout.c:1078
+#: builtin/checkout.c:1081

 msgid "paths cannot be used with switching branches"
 msgstr ""
 
 msgid "paths cannot be used with switching branches"
 msgstr ""
 

-#: builtin/checkout.c:1081 builtin/checkout.c:1085
+#: builtin/checkout.c:1084 builtin/checkout.c:1088

 #, 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:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
-#: builtin/checkout.c:1100
+#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
+#: builtin/checkout.c:1103

 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 

-#: builtin/checkout.c:1105
+#: builtin/checkout.c:1108

 #, 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:1138 builtin/checkout.c:1140 builtin/clone.c:93
+#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
 #: builtin/worktree.c:326
 msgid "branch"
 msgstr ""
 
 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
 #: builtin/worktree.c:326
 msgid "branch"
 msgstr ""
 

-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1142

 msgid "create and checkout a new branch"
 msgstr ""
 
 msgid "create and checkout a new branch"
 msgstr ""
 

-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1144

 msgid "create/reset and checkout a branch"
 msgstr ""
 
 msgid "create/reset and checkout a branch"
 msgstr ""
 

-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145

 msgid "create reflog for new branch"
 msgstr ""
 
 msgid "create reflog for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1143 builtin/worktree.c:328
+#: builtin/checkout.c:1146 builtin/worktree.c:328

 msgid "detach HEAD at named commit"
 msgstr ""
 
 msgid "detach HEAD at named commit"
 msgstr ""
 

-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147

 msgid "set upstream info for new branch"
 msgstr ""
 
 msgid "set upstream info for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1149

 msgid "new-branch"
 msgstr ""
 
 msgid "new-branch"
 msgstr ""
 

-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1149

 msgid "new unparented branch"
 msgstr ""
 
 msgid "new unparented branch"
 msgstr ""
 

-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150

 msgid "checkout our version for unmerged files"
 msgstr ""
 
 msgid "checkout our version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152

 msgid "checkout their version for unmerged files"
 msgstr ""
 
 msgid "checkout their version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1154

 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 

-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1155

 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:1153 builtin/merge.c:231
+#: builtin/checkout.c:1156 builtin/merge.c:235

 msgid "update ignored files (default)"
 msgstr ""
 
 msgid "update ignored files (default)"
 msgstr ""
 

-#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

 msgid "style"
 msgstr ""
 
 msgid "style"
 msgstr ""
 

-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1158

 msgid "conflict style (merge or diff3)"
 msgstr ""
 
 msgid "conflict style (merge or diff3)"
 msgstr ""
 

-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161

 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 

-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1163

 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 

-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1165

 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:1163 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
+#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr ""
 
 #: builtin/send-pack.c:168
 msgid "force progress reporting"
 msgstr ""
 

-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1197

 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 

-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1214

 msgid "--track needs a branch name"
 msgstr ""
 
 msgid "--track needs a branch name"
 msgstr ""
 

-#: builtin/checkout.c:1216
+#: builtin/checkout.c:1219

 msgid "Missing branch name; try -b"
 msgstr ""
 
 msgid "Missing branch name; try -b"
 msgstr ""
 

-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1255

 msgid "invalid path specification"
 msgstr ""
 
 msgid "invalid path specification"
 msgstr ""
 

-#: builtin/checkout.c:1259
+#: builtin/checkout.c:1262

 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
 "Did you intend to checkout '%s' which can not be resolved as commit?"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
 "Did you intend to checkout '%s' which can not be resolved as commit?"
 msgstr ""
 

-#: builtin/checkout.c:1264
+#: builtin/checkout.c:1267

 #, 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:1268
+#: builtin/checkout.c:1271

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


@@ -5367,15 +5651,17 @@ msgstr ""
 msgid "failed to remove %s"
 msgstr ""
 
 msgid "failed to remove %s"
 msgstr ""
 

-#: builtin/clean.c:291
+#: builtin/clean.c:291 git-add--interactive.perl:623
+#, c-format

 msgid ""
 "Prompt help:\n"
 "1          - select a numbered item\n"
 "foo        - select item based on unique prefix\n"
 msgid ""
 "Prompt help:\n"
 "1          - select a numbered item\n"
 "foo        - select item based on unique prefix\n"

-"           - (empty) select nothing"
+"           - (empty) select nothing\n"

 msgstr ""
 
 msgstr ""
 

-#: builtin/clean.c:295
+#: builtin/clean.c:295 git-add--interactive.perl:632
+#, c-format

 msgid ""
 "Prompt help:\n"
 "1          - select a single item\n"
 msgid ""
 "Prompt help:\n"
 "1          - select a single item\n"


@@ -5384,12 +5670,13 @@ msgid ""
 "foo        - select item based on unique prefix\n"
 "-...       - unselect specified items\n"
 "*          - choose all items\n"
 "foo        - select item based on unique prefix\n"
 "-...       - unselect specified items\n"
 "*          - choose all items\n"

-"           - (empty) finish selecting"
+"           - (empty) finish selecting\n"

 msgstr ""
 
 msgstr ""
 

-#: builtin/clean.c:511
-#, c-format
-msgid "Huh (%s)?"
+#: builtin/clean.c:511 git-add--interactive.perl:598
+#: git-add--interactive.perl:603
+#, c-format, perl-format
+msgid "Huh (%s)?\n"

 msgstr ""
 
 #: builtin/clean.c:653
 msgstr ""
 
 #: builtin/clean.c:653


@@ -5412,8 +5699,9 @@ msgstr ""
 msgid "Remove %s [y/N]? "
 msgstr ""
 
 msgid "Remove %s [y/N]? "
 msgstr ""
 

-#: builtin/clean.c:777
-msgid "Bye."
+#: builtin/clean.c:777 git-add--interactive.perl:1669
+#, c-format
+msgid "Bye.\n"

 msgstr ""
 
 #: builtin/clean.c:785
 msgstr ""
 
 #: builtin/clean.c:785


@@ -5427,11 +5715,11 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
 "?                   - help for prompt selection"
 msgstr ""
 

-#: builtin/clean.c:812
+#: builtin/clean.c:812 git-add--interactive.perl:1745

 msgid "*** Commands ***"
 msgstr ""
 
 msgid "*** Commands ***"
 msgstr ""
 

-#: builtin/clean.c:813
+#: builtin/clean.c:813 git-add--interactive.perl:1742

 msgid "What now"
 msgstr ""
 
 msgid "What now"
 msgstr ""
 


@@ -5461,8 +5749,8 @@ msgstr ""
 msgid "remove whole directories"
 msgstr ""
 
 msgid "remove whole directories"
 msgstr ""
 

-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
-#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176

 msgid "pattern"
 msgstr ""
 
 msgid "pattern"
 msgstr ""
 


@@ -5538,8 +5826,8 @@ msgstr ""
 msgid "directory from which templates will be used"
 msgstr ""
 
 msgid "directory from which templates will be used"
 msgstr ""
 

-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
-#: builtin/submodule--helper.c:954
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:970

 msgid "reference repository"
 msgstr ""
 
 msgid "reference repository"
 msgstr ""
 


@@ -5563,7 +5851,7 @@ msgstr ""
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 

-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999

 #: builtin/pull.c:202
 msgid "depth"
 msgstr ""
 #: builtin/pull.c:202
 msgid "depth"
 msgstr ""


@@ -5572,7 +5860,7 @@ msgstr ""
 msgid "create a shallow clone of that depth"
 msgstr ""
 
 msgid "create a shallow clone of that depth"
 msgstr ""
 

-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

 #: parse-options.h:142
 msgid "time"
 msgstr ""
 #: parse-options.h:142
 msgid "time"
 msgstr ""


@@ -5586,7 +5874,7 @@ msgid "revision"
 msgstr ""
 
 #: builtin/clone.c:102 builtin/fetch.c:125
 msgstr ""
 
 #: builtin/clone.c:102 builtin/fetch.c:125

-msgid "deepen history of shallow clone by excluding rev"
+msgid "deepen history of shallow clone, excluding rev"

 msgstr ""
 
 #: builtin/clone.c:104
 msgstr ""
 
 #: builtin/clone.c:104


@@ -5613,11 +5901,11 @@ msgstr ""
 msgid "set config inside the new repository"
 msgstr ""
 
 msgid "set config inside the new repository"
 msgstr ""
 

-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

 msgid "use IPv4 addresses only"
 msgstr ""
 
 msgid "use IPv4 addresses only"
 msgstr ""
 

-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

 msgid "use IPv6 addresses only"
 msgstr ""
 
 msgid "use IPv6 addresses only"
 msgstr ""
 


@@ -5725,7 +6013,7 @@ msgstr ""
 msgid "repository '%s' does not exist"
 msgstr ""
 
 msgid "repository '%s' does not exist"
 msgstr ""
 

-#: builtin/clone.c:905 builtin/fetch.c:1338
+#: builtin/clone.c:905 builtin/fetch.c:1335

 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""


@@ -5740,8 +6028,9 @@ msgstr ""
 msgid "working tree '%s' already exists."
 msgstr ""
 
 msgid "working tree '%s' already exists."
 msgstr ""
 

-#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
-#: builtin/worktree.c:222 builtin/worktree.c:249
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
+#: builtin/submodule--helper.c:659 builtin/worktree.c:222
+#: builtin/worktree.c:249

 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""


@@ -5970,7 +6259,7 @@ msgstr ""
 msgid "could not lookup commit %s"
 msgstr ""
 
 msgid "could not lookup commit %s"
 msgstr ""
 

-#: builtin/commit.c:704 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:295

 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""


@@ -6054,7 +6343,7 @@ msgstr ""
 msgid "Error building trees"
 msgstr ""
 
 msgid "Error building trees"
 msgstr ""
 

-#: builtin/commit.c:969 builtin/tag.c:266
+#: builtin/commit.c:968 builtin/tag.c:280

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


@@ -6064,7 +6353,7 @@ msgstr ""
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 

-#: builtin/commit.c:1086 builtin/commit.c:1327
+#: builtin/commit.c:1086 builtin/commit.c:1325

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""


@@ -6114,262 +6403,258 @@ msgid "No paths with --include/--only does not make sense."
 msgstr ""
 
 #: builtin/commit.c:1212
 msgstr ""
 
 #: builtin/commit.c:1212

-msgid "Clever... amending the last one with dirty index."
-msgstr ""
-
-#: builtin/commit.c:1214

 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr ""
 
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr ""
 

-#: builtin/commit.c:1226 builtin/tag.c:474
+#: builtin/commit.c:1224 builtin/tag.c:495

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 

-#: builtin/commit.c:1231
+#: builtin/commit.c:1229

 msgid "Paths with -a does not make sense."
 msgstr ""
 
 msgid "Paths with -a does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1341 builtin/commit.c:1617
+#: builtin/commit.c:1339 builtin/commit.c:1612

 msgid "show status concisely"
 msgstr ""
 
 msgid "show status concisely"
 msgstr ""
 

-#: builtin/commit.c:1343 builtin/commit.c:1619
+#: builtin/commit.c:1341 builtin/commit.c:1614

 msgid "show branch information"
 msgstr ""
 
 msgid "show branch information"
 msgstr ""
 

-#: builtin/commit.c:1345
+#: builtin/commit.c:1343

 msgid "version"
 msgstr ""
 
 msgid "version"
 msgstr ""
 

-#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
-#: builtin/worktree.c:440
+#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
+#: builtin/worktree.c:442

 msgid "machine-readable output"
 msgstr ""
 
 msgid "machine-readable output"
 msgstr ""
 

-#: builtin/commit.c:1348 builtin/commit.c:1623
+#: builtin/commit.c:1346 builtin/commit.c:1618

 msgid "show status in long format (default)"
 msgstr ""
 
 msgid "show status in long format (default)"
 msgstr ""
 

-#: builtin/commit.c:1351 builtin/commit.c:1626
+#: builtin/commit.c:1349 builtin/commit.c:1621

 msgid "terminate entries with NUL"
 msgstr ""
 
 msgid "terminate entries with NUL"
 msgstr ""
 

-#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:353
+#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:368

 msgid "mode"
 msgstr ""
 
 msgid "mode"
 msgstr ""
 

-#: builtin/commit.c:1354 builtin/commit.c:1629
+#: builtin/commit.c:1352 builtin/commit.c:1624

 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:1357
+#: builtin/commit.c:1355

 msgid "show ignored files"
 msgstr ""
 
 msgid "show ignored files"
 msgstr ""
 

-#: builtin/commit.c:1358 parse-options.h:155
+#: builtin/commit.c:1356 parse-options.h:155

 msgid "when"
 msgstr ""
 
 msgid "when"
 msgstr ""
 

-#: builtin/commit.c:1359
+#: builtin/commit.c:1357

 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:1361
+#: builtin/commit.c:1359

 msgid "list untracked files in columns"
 msgstr ""
 
 msgid "list untracked files in columns"
 msgstr ""
 

-#: builtin/commit.c:1437
+#: builtin/commit.c:1435

 msgid "couldn't look up newly created commit"
 msgstr ""
 
 msgid "couldn't look up newly created commit"
 msgstr ""
 

-#: builtin/commit.c:1439
+#: builtin/commit.c:1437

 msgid "could not parse newly created commit"
 msgstr ""
 
 msgid "could not parse newly created commit"
 msgstr ""
 

-#: builtin/commit.c:1484
+#: builtin/commit.c:1482

 msgid "detached HEAD"
 msgstr ""
 
 msgid "detached HEAD"
 msgstr ""
 

-#: builtin/commit.c:1487
+#: builtin/commit.c:1485

 msgid " (root-commit)"
 msgstr ""
 
 msgid " (root-commit)"
 msgstr ""
 

-#: builtin/commit.c:1587
+#: builtin/commit.c:1582

 msgid "suppress summary after successful commit"
 msgstr ""
 
 msgid "suppress summary after successful commit"
 msgstr ""
 

-#: builtin/commit.c:1588
+#: builtin/commit.c:1583

 msgid "show diff in commit message template"
 msgstr ""
 
 msgid "show diff in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1590
+#: builtin/commit.c:1585

 msgid "Commit message options"
 msgstr ""
 
 msgid "Commit message options"
 msgstr ""
 

-#: builtin/commit.c:1591 builtin/tag.c:351
+#: builtin/commit.c:1586 builtin/tag.c:366

 msgid "read message from file"
 msgstr ""
 
 msgid "read message from file"
 msgstr ""
 

-#: builtin/commit.c:1592
+#: builtin/commit.c:1587

 msgid "author"
 msgstr ""
 
 msgid "author"
 msgstr ""
 

-#: builtin/commit.c:1592
+#: builtin/commit.c:1587

 msgid "override author for commit"
 msgstr ""
 
 msgid "override author for commit"
 msgstr ""
 

-#: builtin/commit.c:1593 builtin/gc.c:326
+#: builtin/commit.c:1588 builtin/gc.c:333

 msgid "date"
 msgstr ""
 
 msgid "date"
 msgstr ""
 

-#: builtin/commit.c:1593
+#: builtin/commit.c:1588

 msgid "override date for commit"
 msgstr ""
 
 msgid "override date for commit"
 msgstr ""
 

-#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:349
+#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:364

 msgid "message"
 msgstr ""
 
 msgid "message"
 msgstr ""
 

-#: builtin/commit.c:1594
+#: builtin/commit.c:1589

 msgid "commit message"
 msgstr ""
 
 msgid "commit message"
 msgstr ""
 

-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
+#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81

 msgid "commit"
 msgstr ""
 
 msgid "commit"
 msgstr ""
 

-#: builtin/commit.c:1595
+#: builtin/commit.c:1590

 msgid "reuse and edit message from specified commit"
 msgstr ""
 
 msgid "reuse and edit message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1596
+#: builtin/commit.c:1591

 msgid "reuse message from specified commit"
 msgstr ""
 
 msgid "reuse message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1597
+#: builtin/commit.c:1592

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 

-#: builtin/commit.c:1598
+#: builtin/commit.c:1593

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 

-#: builtin/commit.c:1599
+#: builtin/commit.c:1594

 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:1600 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86

 msgid "add Signed-off-by:"
 msgstr ""
 
 msgid "add Signed-off-by:"
 msgstr ""
 

-#: builtin/commit.c:1601
+#: builtin/commit.c:1596

 msgid "use specified template file"
 msgstr ""
 
 msgid "use specified template file"
 msgstr ""
 

-#: builtin/commit.c:1602
+#: builtin/commit.c:1597

 msgid "force edit of commit"
 msgstr ""
 
 msgid "force edit of commit"
 msgstr ""
 

-#: builtin/commit.c:1603
+#: builtin/commit.c:1598

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: builtin/commit.c:1603 builtin/tag.c:354
+#: builtin/commit.c:1598 builtin/tag.c:369

 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 

-#: builtin/commit.c:1604
+#: builtin/commit.c:1599

 msgid "include status in commit message template"
 msgstr ""
 
 msgid "include status in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
+#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166

 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr ""
 
 #: builtin/revert.c:93
 msgid "GPG sign commit"
 msgstr ""
 

-#: builtin/commit.c:1609
+#: builtin/commit.c:1604

 msgid "Commit contents options"
 msgstr ""
 
 msgid "Commit contents options"
 msgstr ""
 

-#: builtin/commit.c:1610
+#: builtin/commit.c:1605

 msgid "commit all changed files"
 msgstr ""
 
 msgid "commit all changed files"
 msgstr ""
 

-#: builtin/commit.c:1611
+#: builtin/commit.c:1606

 msgid "add specified files to index for commit"
 msgstr ""
 
 msgid "add specified files to index for commit"
 msgstr ""
 

-#: builtin/commit.c:1612
+#: builtin/commit.c:1607

 msgid "interactively add files"
 msgstr ""
 
 msgid "interactively add files"
 msgstr ""
 

-#: builtin/commit.c:1613
+#: builtin/commit.c:1608

 msgid "interactively add changes"
 msgstr ""
 
 msgid "interactively add changes"
 msgstr ""
 

-#: builtin/commit.c:1614
+#: builtin/commit.c:1609

 msgid "commit only specified files"
 msgstr ""
 
 msgid "commit only specified files"
 msgstr ""
 

-#: builtin/commit.c:1615
+#: builtin/commit.c:1610

 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 

-#: builtin/commit.c:1616
+#: builtin/commit.c:1611

 msgid "show what would be committed"
 msgstr ""
 
 msgid "show what would be committed"
 msgstr ""
 

-#: builtin/commit.c:1627
+#: builtin/commit.c:1622

 msgid "amend previous commit"
 msgstr ""
 
 msgid "amend previous commit"
 msgstr ""
 

-#: builtin/commit.c:1628
+#: builtin/commit.c:1623

 msgid "bypass post-rewrite hook"
 msgstr ""
 
 msgid "bypass post-rewrite hook"
 msgstr ""
 

-#: builtin/commit.c:1633
+#: builtin/commit.c:1628

 msgid "ok to record an empty change"
 msgstr ""
 
 msgid "ok to record an empty change"
 msgstr ""
 

-#: builtin/commit.c:1635
+#: builtin/commit.c:1630

 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:1664
+#: builtin/commit.c:1659

 msgid "could not parse HEAD commit"
 msgstr ""
 
 msgid "could not parse HEAD commit"
 msgstr ""
 

-#: builtin/commit.c:1712
+#: builtin/commit.c:1707

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 

-#: builtin/commit.c:1719
+#: builtin/commit.c:1714

 msgid "could not read MERGE_MODE"
 msgstr ""
 
 msgid "could not read MERGE_MODE"
 msgstr ""
 

-#: builtin/commit.c:1738
+#: builtin/commit.c:1733

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

-#: builtin/commit.c:1749
+#: builtin/commit.c:1744

 #, 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:1754
+#: builtin/commit.c:1749

 #, 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:1802
+#: builtin/commit.c:1797

 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"


@@ -6705,6 +6990,89 @@ msgstr ""
 msgid "unhandled object '%s' given."
 msgstr ""
 
 msgid "unhandled object '%s' given."
 msgstr ""
 

+#: builtin/difftool.c:28
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr ""
+
+#: builtin/difftool.c:241
+#, c-format
+msgid "failed: %d"
+msgstr ""
+
+#: builtin/difftool.c:342
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+
+#: builtin/difftool.c:567
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr ""
+
+#: builtin/difftool.c:569
+msgid "working tree file has been left."
+msgstr ""
+
+#: builtin/difftool.c:580
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr ""
+
+#: builtin/difftool.c:581
+msgid "you may want to cleanup or recover these."
+msgstr ""
+
+#: builtin/difftool.c:626
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr ""
+
+#: builtin/difftool.c:628
+msgid "perform a full-directory diff"
+msgstr ""
+
+#: builtin/difftool.c:630
+msgid "do not prompt before launching a diff tool"
+msgstr ""
+
+#: builtin/difftool.c:636
+msgid "use symlinks in dir-diff mode"
+msgstr ""
+
+#: builtin/difftool.c:637
+msgid "<tool>"
+msgstr ""
+
+#: builtin/difftool.c:638
+msgid "use the specified diff tool"
+msgstr ""
+
+#: builtin/difftool.c:640
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+
+#: builtin/difftool.c:643
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+
+#: builtin/difftool.c:645
+msgid "<command>"
+msgstr ""
+
+#: builtin/difftool.c:646
+msgid "specify a custom command for viewing diffs"
+msgstr ""
+
+#: builtin/difftool.c:670
+msgid "no <tool> given for --tool=<tool>"
+msgstr ""
+
+#: builtin/difftool.c:677
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr ""
+

 #: builtin/fast-export.c:25
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 #: builtin/fast-export.c:25
 msgid "git fast-export [rev-list-opts]"
 msgstr ""


@@ -6861,171 +7229,171 @@ msgstr ""
 msgid "specify fetch refmap"
 msgstr ""
 
 msgid "specify fetch refmap"
 msgstr ""
 

-#: builtin/fetch.c:398
+#: builtin/fetch.c:395

 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 

-#: builtin/fetch.c:514
+#: builtin/fetch.c:511

 #, 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:607
+#: builtin/fetch.c:604

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

-#: builtin/fetch.c:611
+#: builtin/fetch.c:608

 msgid "[up to date]"
 msgstr ""
 
 msgid "[up to date]"
 msgstr ""
 

-#: builtin/fetch.c:624 builtin/fetch.c:704
+#: builtin/fetch.c:621 builtin/fetch.c:701

 msgid "[rejected]"
 msgstr ""
 
 msgid "[rejected]"
 msgstr ""
 

-#: builtin/fetch.c:625
+#: builtin/fetch.c:622

 msgid "can't fetch in current branch"
 msgstr ""
 
 msgid "can't fetch in current branch"
 msgstr ""
 

-#: builtin/fetch.c:634
+#: builtin/fetch.c:631

 msgid "[tag update]"
 msgstr ""
 
 msgid "[tag update]"
 msgstr ""
 

-#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
-#: builtin/fetch.c:699
+#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
+#: builtin/fetch.c:696

 msgid "unable to update local ref"
 msgstr ""
 
 msgid "unable to update local ref"
 msgstr ""
 

-#: builtin/fetch.c:654
+#: builtin/fetch.c:651

 msgid "[new tag]"
 msgstr ""
 
 msgid "[new tag]"
 msgstr ""
 

-#: builtin/fetch.c:657
+#: builtin/fetch.c:654

 msgid "[new branch]"
 msgstr ""
 
 msgid "[new branch]"
 msgstr ""
 

-#: builtin/fetch.c:660
+#: builtin/fetch.c:657

 msgid "[new ref]"
 msgstr ""
 
 msgid "[new ref]"
 msgstr ""
 

-#: builtin/fetch.c:699
+#: builtin/fetch.c:696

 msgid "forced update"
 msgstr ""
 
 msgid "forced update"
 msgstr ""
 

-#: builtin/fetch.c:704
+#: builtin/fetch.c:701

 msgid "non-fast-forward"
 msgstr ""
 
 msgid "non-fast-forward"
 msgstr ""
 

-#: builtin/fetch.c:749
+#: builtin/fetch.c:746

 #, 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:769
+#: builtin/fetch.c:766

 #, 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:856 builtin/fetch.c:952
+#: builtin/fetch.c:853 builtin/fetch.c:949

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

-#: builtin/fetch.c:867
+#: builtin/fetch.c:864

 #, 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:922
+#: builtin/fetch.c:919

 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:923
+#: builtin/fetch.c:920

 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:955
+#: builtin/fetch.c:952

 msgid "[deleted]"
 msgstr ""
 
 msgid "[deleted]"
 msgstr ""
 

-#: builtin/fetch.c:956 builtin/remote.c:1020
+#: builtin/fetch.c:953 builtin/remote.c:1020

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: builtin/fetch.c:979
+#: builtin/fetch.c:976

 #, 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:998
+#: builtin/fetch.c:995

 #, 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:1001
+#: builtin/fetch.c:998

 #, 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:1077
+#: builtin/fetch.c:1074

 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr ""
 
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr ""
 

-#: builtin/fetch.c:1237
+#: builtin/fetch.c:1234

 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 

-#: builtin/fetch.c:1239 builtin/remote.c:96
+#: builtin/fetch.c:1236 builtin/remote.c:96

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

-#: builtin/fetch.c:1257
+#: builtin/fetch.c:1254

 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:1280
+#: builtin/fetch.c:1277

 msgid "You need to specify a tag name."
 msgstr ""
 
 msgid "You need to specify a tag name."
 msgstr ""
 

-#: builtin/fetch.c:1322
+#: builtin/fetch.c:1319

 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 

-#: builtin/fetch.c:1324
+#: builtin/fetch.c:1321

 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 

-#: builtin/fetch.c:1329
+#: builtin/fetch.c:1326

 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 

-#: builtin/fetch.c:1331
+#: builtin/fetch.c:1328

 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:1353
+#: builtin/fetch.c:1350

 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 

-#: builtin/fetch.c:1355
+#: builtin/fetch.c:1352

 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 

-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1363

 #, 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:1374
+#: builtin/fetch.c:1371

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 


@@ -7090,7 +7458,7 @@ msgstr ""
 msgid "show only <n> matched refs"
 msgstr ""
 
 msgid "show only <n> matched refs"
 msgstr ""
 

-#: builtin/for-each-ref.c:37 builtin/tag.c:372
+#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38

 msgid "format to use for the output"
 msgstr ""
 
 msgid "format to use for the output"
 msgstr ""
 


@@ -7110,63 +7478,63 @@ msgstr ""
 msgid "print only refs which contain the commit"
 msgstr ""
 
 msgid "print only refs which contain the commit"
 msgstr ""
 

-#: builtin/fsck.c:519
+#: builtin/fsck.c:554

 msgid "Checking object directories"
 msgstr ""
 
 msgid "Checking object directories"
 msgstr ""
 

-#: builtin/fsck.c:588
+#: builtin/fsck.c:646

 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 

-#: builtin/fsck.c:594
+#: builtin/fsck.c:652

 msgid "show unreachable objects"
 msgstr ""
 
 msgid "show unreachable objects"
 msgstr ""
 

-#: builtin/fsck.c:595
+#: builtin/fsck.c:653

 msgid "show dangling objects"
 msgstr ""
 
 msgid "show dangling objects"
 msgstr ""
 

-#: builtin/fsck.c:596
+#: builtin/fsck.c:654

 msgid "report tags"
 msgstr ""
 
 msgid "report tags"
 msgstr ""
 

-#: builtin/fsck.c:597
+#: builtin/fsck.c:655

 msgid "report root nodes"
 msgstr ""
 
 msgid "report root nodes"
 msgstr ""
 

-#: builtin/fsck.c:598
+#: builtin/fsck.c:656

 msgid "make index objects head nodes"
 msgstr ""
 
 msgid "make index objects head nodes"
 msgstr ""
 

-#: builtin/fsck.c:599
+#: builtin/fsck.c:657

 msgid "make reflogs head nodes (default)"
 msgstr ""
 
 msgid "make reflogs head nodes (default)"
 msgstr ""
 

-#: builtin/fsck.c:600
+#: builtin/fsck.c:658

 msgid "also consider packs and alternate objects"
 msgstr ""
 
 msgid "also consider packs and alternate objects"
 msgstr ""
 

-#: builtin/fsck.c:601
+#: builtin/fsck.c:659

 msgid "check only connectivity"
 msgstr ""
 
 msgid "check only connectivity"
 msgstr ""
 

-#: builtin/fsck.c:602
+#: builtin/fsck.c:660

 msgid "enable more strict checking"
 msgstr ""
 
 msgid "enable more strict checking"
 msgstr ""
 

-#: builtin/fsck.c:604
+#: builtin/fsck.c:662

 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 

-#: builtin/fsck.c:605 builtin/prune.c:107
+#: builtin/fsck.c:663 builtin/prune.c:107

 msgid "show progress"
 msgstr ""
 
 msgid "show progress"
 msgstr ""
 

-#: builtin/fsck.c:606
+#: builtin/fsck.c:664

 msgid "show verbose names for reachable objects"
 msgstr ""
 
 msgid "show verbose names for reachable objects"
 msgstr ""
 

-#: builtin/fsck.c:665
+#: builtin/fsck.c:725

 msgid "Checking objects"
 msgstr ""
 
 msgid "Checking objects"
 msgstr ""
 


@@ -7184,7 +7552,7 @@ msgstr ""
 msgid "insanely long object directory %.*s"
 msgstr ""
 
 msgid "insanely long object directory %.*s"
 msgstr ""
 

-#: builtin/gc.c:290
+#: builtin/gc.c:297

 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"


@@ -7194,275 +7562,291 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: builtin/gc.c:327
+#: builtin/gc.c:334

 msgid "prune unreferenced objects"
 msgstr ""
 
 msgid "prune unreferenced objects"
 msgstr ""
 

-#: builtin/gc.c:329
+#: builtin/gc.c:336

 msgid "be more thorough (increased runtime)"
 msgstr ""
 
 msgid "be more thorough (increased runtime)"
 msgstr ""
 

-#: builtin/gc.c:330
+#: builtin/gc.c:337

 msgid "enable auto-gc mode"
 msgstr ""
 
 msgid "enable auto-gc mode"
 msgstr ""
 

-#: builtin/gc.c:331
+#: builtin/gc.c:338

 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:373
+#: builtin/gc.c:380

 #, 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:375
+#: builtin/gc.c:382

 #, 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:376
+#: builtin/gc.c:383

 #, 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:397
+#: builtin/gc.c:404

 #, 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:441
+#: builtin/gc.c:448

 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 

-#: builtin/grep.c:23
+#: builtin/grep.c:25

 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 

-#: builtin/grep.c:219
+#: builtin/grep.c:232

 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 

-#: builtin/grep.c:277
+#: builtin/grep.c:290

 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
 
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
 

-#: builtin/grep.c:453 builtin/grep.c:488
+#: builtin/grep.c:763 builtin/grep.c:804

 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 

-#: builtin/grep.c:503
+#: builtin/grep.c:823

 #, 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:561
+#: builtin/grep.c:887

 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 

-#: builtin/grep.c:647
+#: builtin/grep.c:973

 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:649
+#: builtin/grep.c:975

 msgid "find in contents not managed by git"
 msgstr ""
 
 msgid "find in contents not managed by git"
 msgstr ""
 

-#: builtin/grep.c:651
+#: builtin/grep.c:977

 msgid "search in both tracked and untracked files"
 msgstr ""
 
 msgid "search in both tracked and untracked files"
 msgstr ""
 

-#: builtin/grep.c:653
+#: builtin/grep.c:979

 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 

-#: builtin/grep.c:656
+#: builtin/grep.c:981
+msgid "recursivley search in each submodule"
+msgstr ""
+
+#: builtin/grep.c:983
+msgid "basename"
+msgstr ""
+
+#: builtin/grep.c:984
+msgid "prepend parent project's basename to output"
+msgstr ""
+
+#: builtin/grep.c:987

 msgid "show non-matching lines"
 msgstr ""
 
 msgid "show non-matching lines"
 msgstr ""
 

-#: builtin/grep.c:658
+#: builtin/grep.c:989

 msgid "case insensitive matching"
 msgstr ""
 
 msgid "case insensitive matching"
 msgstr ""
 

-#: builtin/grep.c:660
+#: builtin/grep.c:991

 msgid "match patterns only at word boundaries"
 msgstr ""
 
 msgid "match patterns only at word boundaries"
 msgstr ""
 

-#: builtin/grep.c:662
+#: builtin/grep.c:993

 msgid "process binary files as text"
 msgstr ""
 
 msgid "process binary files as text"
 msgstr ""
 

-#: builtin/grep.c:664
+#: builtin/grep.c:995

 msgid "don't match patterns in binary files"
 msgstr ""
 
 msgid "don't match patterns in binary files"
 msgstr ""
 

-#: builtin/grep.c:667
+#: builtin/grep.c:998

 msgid "process binary files with textconv filters"
 msgstr ""
 
 msgid "process binary files with textconv filters"
 msgstr ""
 

-#: builtin/grep.c:669
+#: builtin/grep.c:1000

 msgid "descend at most <depth> levels"
 msgstr ""
 
 msgid "descend at most <depth> levels"
 msgstr ""
 

-#: builtin/grep.c:673
+#: builtin/grep.c:1004

 msgid "use extended POSIX regular expressions"
 msgstr ""
 
 msgid "use extended POSIX regular expressions"
 msgstr ""
 

-#: builtin/grep.c:676
+#: builtin/grep.c:1007

 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 

-#: builtin/grep.c:679
+#: builtin/grep.c:1010

 msgid "interpret patterns as fixed strings"
 msgstr ""
 
 msgid "interpret patterns as fixed strings"
 msgstr ""
 

-#: builtin/grep.c:682
+#: builtin/grep.c:1013

 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 

-#: builtin/grep.c:685
+#: builtin/grep.c:1016

 msgid "show line numbers"
 msgstr ""
 
 msgid "show line numbers"
 msgstr ""
 

-#: builtin/grep.c:686
+#: builtin/grep.c:1017

 msgid "don't show filenames"
 msgstr ""
 
 msgid "don't show filenames"
 msgstr ""
 

-#: builtin/grep.c:687
+#: builtin/grep.c:1018

 msgid "show filenames"
 msgstr ""
 
 msgid "show filenames"
 msgstr ""
 

-#: builtin/grep.c:689
+#: builtin/grep.c:1020

 msgid "show filenames relative to top directory"
 msgstr ""
 
 msgid "show filenames relative to top directory"
 msgstr ""
 

-#: builtin/grep.c:691
+#: builtin/grep.c:1022

 msgid "show only filenames instead of matching lines"
 msgstr ""
 
 msgid "show only filenames instead of matching lines"
 msgstr ""
 

-#: builtin/grep.c:693
+#: builtin/grep.c:1024

 msgid "synonym for --files-with-matches"
 msgstr ""
 
 msgid "synonym for --files-with-matches"
 msgstr ""
 

-#: builtin/grep.c:696
+#: builtin/grep.c:1027

 msgid "show only the names of files without match"
 msgstr ""
 
 msgid "show only the names of files without match"
 msgstr ""
 

-#: builtin/grep.c:698
+#: builtin/grep.c:1029

 msgid "print NUL after filenames"
 msgstr ""
 
 msgid "print NUL after filenames"
 msgstr ""
 

-#: builtin/grep.c:700
+#: builtin/grep.c:1031

 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:701
+#: builtin/grep.c:1032

 msgid "highlight matches"
 msgstr ""
 
 msgid "highlight matches"
 msgstr ""
 

-#: builtin/grep.c:703
+#: builtin/grep.c:1034

 msgid "print empty line between matches from different files"
 msgstr ""
 
 msgid "print empty line between matches from different files"
 msgstr ""
 

-#: builtin/grep.c:705
+#: builtin/grep.c:1036

 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:708
+#: builtin/grep.c:1039

 msgid "show <n> context lines before and after matches"
 msgstr ""
 
 msgid "show <n> context lines before and after matches"
 msgstr ""
 

-#: builtin/grep.c:711
+#: builtin/grep.c:1042

 msgid "show <n> context lines before matches"
 msgstr ""
 
 msgid "show <n> context lines before matches"
 msgstr ""
 

-#: builtin/grep.c:713
+#: builtin/grep.c:1044

 msgid "show <n> context lines after matches"
 msgstr ""
 
 msgid "show <n> context lines after matches"
 msgstr ""
 

-#: builtin/grep.c:715
+#: builtin/grep.c:1046

 msgid "use <n> worker threads"
 msgstr ""
 
 msgid "use <n> worker threads"
 msgstr ""
 

-#: builtin/grep.c:716
+#: builtin/grep.c:1047

 msgid "shortcut for -C NUM"
 msgstr ""
 
 msgid "shortcut for -C NUM"
 msgstr ""
 

-#: builtin/grep.c:719
+#: builtin/grep.c:1050

 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:721
+#: builtin/grep.c:1052

 msgid "show the surrounding function"
 msgstr ""
 
 msgid "show the surrounding function"
 msgstr ""
 

-#: builtin/grep.c:724
+#: builtin/grep.c:1055

 msgid "read patterns from file"
 msgstr ""
 
 msgid "read patterns from file"
 msgstr ""
 

-#: builtin/grep.c:726
+#: builtin/grep.c:1057

 msgid "match <pattern>"
 msgstr ""
 
 msgid "match <pattern>"
 msgstr ""
 

-#: builtin/grep.c:728
+#: builtin/grep.c:1059

 msgid "combine patterns specified with -e"
 msgstr ""
 
 msgid "combine patterns specified with -e"
 msgstr ""
 

-#: builtin/grep.c:740
+#: builtin/grep.c:1071

 msgid "indicate hit with exit status without output"
 msgstr ""
 
 msgid "indicate hit with exit status without output"
 msgstr ""
 

-#: builtin/grep.c:742
+#: builtin/grep.c:1073

 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:744
+#: builtin/grep.c:1075

 msgid "show parse tree for grep expression"
 msgstr ""
 
 msgid "show parse tree for grep expression"
 msgstr ""
 

-#: builtin/grep.c:748
+#: builtin/grep.c:1079

 msgid "pager"
 msgstr ""
 
 msgid "pager"
 msgstr ""
 

-#: builtin/grep.c:748
+#: builtin/grep.c:1079

 msgid "show matching files in the pager"
 msgstr ""
 
 msgid "show matching files in the pager"
 msgstr ""
 

-#: builtin/grep.c:751
+#: builtin/grep.c:1082

 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:814
+#: builtin/grep.c:1146

 msgid "no pattern given."
 msgstr ""
 
 msgid "no pattern given."
 msgstr ""
 

-#: builtin/grep.c:846 builtin/index-pack.c:1480
+#: builtin/grep.c:1178 builtin/index-pack.c:1482

 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 

-#: builtin/grep.c:876
+#: builtin/grep.c:1215

 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:902
+#: builtin/grep.c:1238
+msgid "option not supported with --recurse-submodules."
+msgstr ""
+
+#: builtin/grep.c:1244

 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:907
+#: builtin/grep.c:1249

 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:910
+#: builtin/grep.c:1252

 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:918
+#: builtin/grep.c:1260

 msgid "both --cached and trees are given."
 msgstr ""
 
 msgid "both --cached and trees are given."
 msgstr ""
 


@@ -7734,183 +8118,187 @@ msgid "serious inflate inconsistency"
 msgstr ""
 
 #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
 msgstr ""
 
 #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777

-#: builtin/index-pack.c:811 builtin/index-pack.c:820
+#: builtin/index-pack.c:813 builtin/index-pack.c:822

 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 

-#: builtin/index-pack.c:751 builtin/pack-objects.c:166
-#: builtin/pack-objects.c:258
+#: builtin/index-pack.c:751 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256

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

-#: builtin/index-pack.c:817
+#: builtin/index-pack.c:819

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

-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:833

 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 

-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847

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

-#: builtin/index-pack.c:848
+#: builtin/index-pack.c:850

 msgid "Error in object"
 msgstr ""
 
 msgid "Error in object"
 msgstr ""
 

-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:852

 #, 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:922 builtin/index-pack.c:953
+#: builtin/index-pack.c:924 builtin/index-pack.c:955

 msgid "failed to apply delta"
 msgstr ""
 
 msgid "failed to apply delta"
 msgstr ""
 

-#: builtin/index-pack.c:1123
+#: builtin/index-pack.c:1125

 msgid "Receiving objects"
 msgstr ""
 
 msgid "Receiving objects"
 msgstr ""
 

-#: builtin/index-pack.c:1123
+#: builtin/index-pack.c:1125

 msgid "Indexing objects"
 msgstr ""
 
 msgid "Indexing objects"
 msgstr ""
 

-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157

 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 

-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1162

 msgid "cannot fstat packfile"
 msgstr ""
 
 msgid "cannot fstat packfile"
 msgstr ""
 

-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1165

 msgid "pack has junk at the end"
 msgstr ""
 
 msgid "pack has junk at the end"
 msgstr ""
 

-#: builtin/index-pack.c:1174
+#: builtin/index-pack.c:1176

 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 

-#: builtin/index-pack.c:1197
+#: builtin/index-pack.c:1199

 msgid "Resolving deltas"
 msgstr ""
 
 msgid "Resolving deltas"
 msgstr ""
 

-#: builtin/index-pack.c:1208
+#: builtin/index-pack.c:1210

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

-#: builtin/index-pack.c:1250
+#: builtin/index-pack.c:1252

 msgid "confusion beyond insanity"
 msgstr ""
 
 msgid "confusion beyond insanity"
 msgstr ""
 

-#: builtin/index-pack.c:1256
+#: builtin/index-pack.c:1258

 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1270

 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 

-#: builtin/index-pack.c:1272
+#: builtin/index-pack.c:1274

 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1298

 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 

-#: builtin/index-pack.c:1372
+#: builtin/index-pack.c:1374

 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 

-#: builtin/index-pack.c:1396
+#: builtin/index-pack.c:1398

 msgid "error while closing pack file"
 msgstr ""
 
 msgid "error while closing pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1409
+#: builtin/index-pack.c:1411

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

-#: builtin/index-pack.c:1417
+#: builtin/index-pack.c:1419

 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1432

 msgid "cannot store pack file"
 msgstr ""
 
 msgid "cannot store pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1441
+#: builtin/index-pack.c:1443

 msgid "cannot store index file"
 msgstr ""
 
 msgid "cannot store index file"
 msgstr ""
 

-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1476

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 

-#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1486 builtin/index-pack.c:1683

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 

-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544

 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1546

 #, 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:1591
+#: builtin/index-pack.c:1593

 #, 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:1598
+#: builtin/index-pack.c:1600

 #, 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:1611
+#: builtin/index-pack.c:1613

 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr ""
 
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr ""
 

-#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
-#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
+#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
+#: builtin/index-pack.c:1714 builtin/index-pack.c:1718

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

-#: builtin/index-pack.c:1732
+#: builtin/index-pack.c:1734

 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 

-#: builtin/index-pack.c:1740
+#: builtin/index-pack.c:1736
+msgid "--stdin requires a git repository"
+msgstr ""
+
+#: builtin/index-pack.c:1744

 msgid "--verify with no packfile name given"
 msgstr ""
 
 msgid "--verify with no packfile name given"
 msgstr ""
 


@@ -8152,7 +8540,7 @@ msgstr ""
 msgid "Unknown commit %s"
 msgstr ""
 
 msgid "Unknown commit %s"
 msgstr ""
 

-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476

 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""


@@ -8527,35 +8915,35 @@ msgstr ""
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr ""
 
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr ""
 

-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:126

 msgid "only show trees"
 msgstr ""
 
 msgid "only show trees"
 msgstr ""
 

-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:128

 msgid "recurse into subtrees"
 msgstr ""
 
 msgid "recurse into subtrees"
 msgstr ""
 

-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:130

 msgid "show trees when recursing"
 msgstr ""
 
 msgid "show trees when recursing"
 msgstr ""
 

-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:133

 msgid "terminate entries with NUL byte"
 msgstr ""
 
 msgid "terminate entries with NUL byte"
 msgstr ""
 

-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:134

 msgid "include object size"
 msgstr ""
 
 msgid "include object size"
 msgstr ""
 

-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138

 msgid "list only filenames"
 msgstr ""
 
 msgid "list only filenames"
 msgstr ""
 

-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:141

 msgid "use full path names"
 msgstr ""
 
 msgid "use full path names"
 msgstr ""
 

-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:143

 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 


@@ -8571,160 +8959,168 @@ msgstr ""
 msgid "git merge --abort"
 msgstr ""
 
 msgid "git merge --abort"
 msgstr ""
 

-#: builtin/merge.c:102
+#: builtin/merge.c:49
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:104

 msgid "switch `m' requires a value"
 msgstr ""
 
 msgid "switch `m' requires a value"
 msgstr ""
 

-#: builtin/merge.c:139
+#: builtin/merge.c:141

 #, 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:140
+#: builtin/merge.c:142

 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 

-#: builtin/merge.c:145
+#: builtin/merge.c:147

 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 

-#: builtin/merge.c:195 builtin/pull.c:127
+#: builtin/merge.c:197 builtin/pull.c:127

 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:198 builtin/pull.c:130
+#: builtin/merge.c:200 builtin/pull.c:130

 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:199 builtin/pull.c:133
+#: builtin/merge.c:201 builtin/pull.c:133

 msgid "(synonym to --stat)"
 msgstr ""
 
 msgid "(synonym to --stat)"
 msgstr ""
 

-#: builtin/merge.c:201 builtin/pull.c:136
+#: builtin/merge.c:203 builtin/pull.c:136

 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:204 builtin/pull.c:139
+#: builtin/merge.c:206 builtin/pull.c:139

 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:206 builtin/pull.c:142
+#: builtin/merge.c:208 builtin/pull.c:142

 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 

-#: builtin/merge.c:208 builtin/pull.c:145
+#: builtin/merge.c:210 builtin/pull.c:145

 msgid "edit message before committing"
 msgstr ""
 
 msgid "edit message before committing"
 msgstr ""
 

-#: builtin/merge.c:209
+#: builtin/merge.c:211

 msgid "allow fast-forward (default)"
 msgstr ""
 
 msgid "allow fast-forward (default)"
 msgstr ""
 

-#: builtin/merge.c:211 builtin/pull.c:151
+#: builtin/merge.c:213 builtin/pull.c:151

 msgid "abort if fast-forward is not possible"
 msgstr ""
 
 msgid "abort if fast-forward is not possible"
 msgstr ""
 

-#: builtin/merge.c:215 builtin/pull.c:154
+#: builtin/merge.c:217 builtin/pull.c:154

 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:216 builtin/notes.c:774 builtin/pull.c:158
+#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158

 #: builtin/revert.c:89
 msgid "strategy"
 msgstr ""
 
 #: builtin/revert.c:89
 msgid "strategy"
 msgstr ""
 

-#: builtin/merge.c:217 builtin/pull.c:159
+#: builtin/merge.c:219 builtin/pull.c:159

 msgid "merge strategy to use"
 msgstr ""
 
 msgid "merge strategy to use"
 msgstr ""
 

-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:220 builtin/pull.c:162

 msgid "option=value"
 msgstr ""
 
 msgid "option=value"
 msgstr ""
 

-#: builtin/merge.c:219 builtin/pull.c:163
+#: builtin/merge.c:221 builtin/pull.c:163

 msgid "option for selected merge strategy"
 msgstr ""
 
 msgid "option for selected merge strategy"
 msgstr ""
 

-#: builtin/merge.c:221
+#: builtin/merge.c:223

 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:225
+#: builtin/merge.c:227

 msgid "abort the current in-progress merge"
 msgstr ""
 
 msgid "abort the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:227 builtin/pull.c:170
+#: builtin/merge.c:229
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:231 builtin/pull.c:170

 msgid "allow merging unrelated histories"
 msgstr ""
 
 msgid "allow merging unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:255
+#: builtin/merge.c:259

 msgid "could not run stash."
 msgstr ""
 
 msgid "could not run stash."
 msgstr ""
 

-#: builtin/merge.c:260
+#: builtin/merge.c:264

 msgid "stash failed"
 msgstr ""
 
 msgid "stash failed"
 msgstr ""
 

-#: builtin/merge.c:265
+#: builtin/merge.c:269

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

-#: builtin/merge.c:284 builtin/merge.c:301
+#: builtin/merge.c:288 builtin/merge.c:305

 msgid "read-tree failed"
 msgstr ""
 
 msgid "read-tree failed"
 msgstr ""
 

-#: builtin/merge.c:331
+#: builtin/merge.c:335

 msgid " (nothing to squash)"
 msgstr ""
 
 msgid " (nothing to squash)"
 msgstr ""
 

-#: builtin/merge.c:342
+#: builtin/merge.c:346

 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 

-#: builtin/merge.c:392
+#: builtin/merge.c:396

 #, 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:443
+#: builtin/merge.c:447

 #, 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:533
+#: builtin/merge.c:537

 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 

-#: builtin/merge.c:652
+#: builtin/merge.c:656

 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 

-#: builtin/merge.c:666
+#: builtin/merge.c:670

 #, 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:681
+#: builtin/merge.c:685

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

-#: builtin/merge.c:733
+#: builtin/merge.c:737

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

-#: builtin/merge.c:742
+#: builtin/merge.c:746

 #, 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:748
+#: builtin/merge.c:752

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


@@ -8734,183 +9130,195 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
 "the commit.\n"
 msgstr ""
 

-#: builtin/merge.c:772
+#: builtin/merge.c:776

 msgid "Empty commit message."
 msgstr ""
 
 msgid "Empty commit message."
 msgstr ""
 

-#: builtin/merge.c:792
+#: builtin/merge.c:796

 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 

-#: builtin/merge.c:847
+#: builtin/merge.c:851

 #, 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:863
+#: builtin/merge.c:867

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

-#: builtin/merge.c:904
+#: builtin/merge.c:908

 msgid "No current branch."
 msgstr ""
 
 msgid "No current branch."
 msgstr ""
 

-#: builtin/merge.c:906
+#: builtin/merge.c:910

 msgid "No remote for the current branch."
 msgstr ""
 
 msgid "No remote for the current branch."
 msgstr ""
 

-#: builtin/merge.c:908
+#: builtin/merge.c:912

 msgid "No default upstream defined for the current branch."
 msgstr ""
 
 msgid "No default upstream defined for the current branch."
 msgstr ""
 

-#: builtin/merge.c:913
+#: builtin/merge.c:917

 #, 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:960
+#: builtin/merge.c:964

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

-#: builtin/merge.c:1034
+#: builtin/merge.c:1038

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

-#: builtin/merge.c:1061
+#: builtin/merge.c:1065

 #, 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:1095
+#: builtin/merge.c:1099

 msgid "not something we can merge"
 msgstr ""
 
 msgid "not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1162
+#: builtin/merge.c:1167
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1171

 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:1178
+#: builtin/merge.c:1183
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1187
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1203

 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:1185
+#: builtin/merge.c:1210

 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:1188
+#: builtin/merge.c:1213

 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:1197
+#: builtin/merge.c:1222

 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 

-#: builtin/merge.c:1205
+#: builtin/merge.c:1230

 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 

-#: builtin/merge.c:1222
+#: builtin/merge.c:1247

 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 

-#: builtin/merge.c:1224
+#: builtin/merge.c:1249

 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:1229
+#: builtin/merge.c:1254

 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1231
+#: builtin/merge.c:1256

 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:1287
+#: builtin/merge.c:1312

 #, 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:1290
+#: builtin/merge.c:1315

 #, 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:1293
+#: builtin/merge.c:1318

 #, 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:1296
+#: builtin/merge.c:1321

 #, 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:1358
+#: builtin/merge.c:1383

 msgid "refusing to merge unrelated histories"
 msgstr ""
 
 msgid "refusing to merge unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:1367
+#: builtin/merge.c:1392

 msgid "Already up-to-date."
 msgstr ""
 
 msgid "Already up-to-date."
 msgstr ""
 

-#: builtin/merge.c:1377
+#: builtin/merge.c:1402

 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 

-#: builtin/merge.c:1418
+#: builtin/merge.c:1443

 #, 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:1425
+#: builtin/merge.c:1450

 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 

-#: builtin/merge.c:1450
+#: builtin/merge.c:1475

 msgid "Already up-to-date. Yeeah!"
 msgstr ""
 
 msgid "Already up-to-date. Yeeah!"
 msgstr ""
 

-#: builtin/merge.c:1456
+#: builtin/merge.c:1481

 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 

-#: builtin/merge.c:1479 builtin/merge.c:1558
+#: builtin/merge.c:1504 builtin/merge.c:1583

 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 

-#: builtin/merge.c:1483
+#: builtin/merge.c:1508

 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 

-#: builtin/merge.c:1549
+#: builtin/merge.c:1574

 #, 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:1551
+#: builtin/merge.c:1576

 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 

-#: builtin/merge.c:1560
+#: builtin/merge.c:1585

 #, 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:1572
+#: builtin/merge.c:1597

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


@@ -9040,94 +9448,94 @@ msgstr ""
 msgid "allow creation of more than one tree"
 msgstr ""
 
 msgid "allow creation of more than one tree"
 msgstr ""
 

-#: builtin/mv.c:15
+#: builtin/mv.c:16

 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""
 
 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""
 

-#: builtin/mv.c:70
+#: builtin/mv.c:82

 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr ""
 
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr ""
 

-#: builtin/mv.c:72 builtin/rm.c:317
+#: builtin/mv.c:84 builtin/rm.c:290

 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 

-#: builtin/mv.c:90
+#: builtin/mv.c:102

 #, c-format
 msgid "%.*s is in index"
 msgstr ""
 
 #, c-format
 msgid "%.*s is in index"
 msgstr ""
 

-#: builtin/mv.c:112
+#: builtin/mv.c:124

 msgid "force move/rename even if target exists"
 msgstr ""
 
 msgid "force move/rename even if target exists"
 msgstr ""
 

-#: builtin/mv.c:113
+#: builtin/mv.c:125

 msgid "skip move/rename errors"
 msgstr ""
 
 msgid "skip move/rename errors"
 msgstr ""
 

-#: builtin/mv.c:155
+#: builtin/mv.c:167

 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 

-#: builtin/mv.c:166
+#: builtin/mv.c:178

 #, 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:170
+#: builtin/mv.c:182

 msgid "bad source"
 msgstr ""
 
 msgid "bad source"
 msgstr ""
 

-#: builtin/mv.c:173
+#: builtin/mv.c:185

 msgid "can not move directory into itself"
 msgstr ""
 
 msgid "can not move directory into itself"
 msgstr ""
 

-#: builtin/mv.c:176
+#: builtin/mv.c:188

 msgid "cannot move directory over file"
 msgstr ""
 
 msgid "cannot move directory over file"
 msgstr ""
 

-#: builtin/mv.c:185
+#: builtin/mv.c:197

 msgid "source directory is empty"
 msgstr ""
 
 msgid "source directory is empty"
 msgstr ""
 

-#: builtin/mv.c:210
+#: builtin/mv.c:222

 msgid "not under version control"
 msgstr ""
 
 msgid "not under version control"
 msgstr ""
 

-#: builtin/mv.c:213
+#: builtin/mv.c:225

 msgid "destination exists"
 msgstr ""
 
 msgid "destination exists"
 msgstr ""
 

-#: builtin/mv.c:221
+#: builtin/mv.c:233

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

-#: builtin/mv.c:224
+#: builtin/mv.c:236

 msgid "Cannot overwrite"
 msgstr ""
 
 msgid "Cannot overwrite"
 msgstr ""
 

-#: builtin/mv.c:227
+#: builtin/mv.c:239

 msgid "multiple sources for the same target"
 msgstr ""
 
 msgid "multiple sources for the same target"
 msgstr ""
 

-#: builtin/mv.c:229
+#: builtin/mv.c:241

 msgid "destination directory does not exist"
 msgstr ""
 
 msgid "destination directory does not exist"
 msgstr ""
 

-#: builtin/mv.c:236
+#: builtin/mv.c:248

 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 

-#: builtin/mv.c:257
+#: builtin/mv.c:269

 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 

-#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
+#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384

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


@@ -9308,12 +9716,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:233 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:460

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

-#: builtin/notes.c:235 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:463

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


@@ -9577,174 +9985,174 @@ 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:179 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180

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

-#: builtin/pack-objects.c:768
+#: builtin/pack-objects.c:766

 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:781
+#: builtin/pack-objects.c:779

 msgid "Writing objects"
 msgstr ""
 
 msgid "Writing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:1070
+#: builtin/pack-objects.c:1068

 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:2346
+#: builtin/pack-objects.c:2344

 msgid "Compressing objects"
 msgstr ""
 
 msgid "Compressing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2747

 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2763
+#: builtin/pack-objects.c:2751

 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 

-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2781

 msgid "do not show progress meter"
 msgstr ""
 
 msgid "do not show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2783

 msgid "show progress meter"
 msgstr ""
 
 msgid "show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2785

 msgid "show progress meter during object writing phase"
 msgstr ""
 
 msgid "show progress meter during object writing phase"
 msgstr ""
 

-#: builtin/pack-objects.c:2800
+#: builtin/pack-objects.c:2788

 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:2801
+#: builtin/pack-objects.c:2789

 msgid "version[,offset]"
 msgstr ""
 
 msgid "version[,offset]"
 msgstr ""
 

-#: builtin/pack-objects.c:2802
+#: builtin/pack-objects.c:2790

 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:2805
+#: builtin/pack-objects.c:2793

 msgid "maximum size of each output pack file"
 msgstr ""
 
 msgid "maximum size of each output pack file"
 msgstr ""
 

-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2795

 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 

-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2797

 msgid "ignore packed objects"
 msgstr ""
 
 msgid "ignore packed objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2799

 msgid "limit pack window by objects"
 msgstr ""
 
 msgid "limit pack window by objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2801

 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:2815
+#: builtin/pack-objects.c:2803

 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:2817
+#: builtin/pack-objects.c:2805

 msgid "reuse existing deltas"
 msgstr ""
 
 msgid "reuse existing deltas"
 msgstr ""
 

-#: builtin/pack-objects.c:2819
+#: builtin/pack-objects.c:2807

 msgid "reuse existing objects"
 msgstr ""
 
 msgid "reuse existing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2821
+#: builtin/pack-objects.c:2809

 msgid "use OFS_DELTA objects"
 msgstr ""
 
 msgid "use OFS_DELTA objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2811

 msgid "use threads when searching for best delta matches"
 msgstr ""
 
 msgid "use threads when searching for best delta matches"
 msgstr ""
 

-#: builtin/pack-objects.c:2825
+#: builtin/pack-objects.c:2813

 msgid "do not create an empty pack output"
 msgstr ""
 
 msgid "do not create an empty pack output"
 msgstr ""
 

-#: builtin/pack-objects.c:2827
+#: builtin/pack-objects.c:2815

 msgid "read revision arguments from standard input"
 msgstr ""
 
 msgid "read revision arguments from standard input"
 msgstr ""
 

-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2817

 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:2832
+#: builtin/pack-objects.c:2820

 msgid "include objects reachable from any reference"
 msgstr ""
 
 msgid "include objects reachable from any reference"
 msgstr ""
 

-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2823

 msgid "include objects referred by reflog entries"
 msgstr ""
 
 msgid "include objects referred by reflog entries"
 msgstr ""
 

-#: builtin/pack-objects.c:2838
+#: builtin/pack-objects.c:2826

 msgid "include objects referred to by the index"
 msgstr ""
 
 msgid "include objects referred to by the index"
 msgstr ""
 

-#: builtin/pack-objects.c:2841
+#: builtin/pack-objects.c:2829

 msgid "output pack to stdout"
 msgstr ""
 
 msgid "output pack to stdout"
 msgstr ""
 

-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2831

 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:2845
+#: builtin/pack-objects.c:2833

 msgid "keep unreachable objects"
 msgstr ""
 
 msgid "keep unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2835

 msgid "pack loose unreachable objects"
 msgstr ""
 
 msgid "pack loose unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2849
+#: builtin/pack-objects.c:2837

 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 

-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2840

 msgid "create thin packs"
 msgstr ""
 
 msgid "create thin packs"
 msgstr ""
 

-#: builtin/pack-objects.c:2854
+#: builtin/pack-objects.c:2842

 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 

-#: builtin/pack-objects.c:2856
+#: builtin/pack-objects.c:2844

 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 

-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2846

 msgid "pack compression level"
 msgstr ""
 
 msgid "pack compression level"
 msgstr ""
 

-#: builtin/pack-objects.c:2860
+#: builtin/pack-objects.c:2848

 msgid "do not hide commits by grafts"
 msgstr ""
 
 msgid "do not hide commits by grafts"
 msgstr ""
 

-#: builtin/pack-objects.c:2862
+#: builtin/pack-objects.c:2850

 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:2864
+#: builtin/pack-objects.c:2852

 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:2993
+#: builtin/pack-objects.c:2979

 msgid "Counting objects"
 msgstr ""
 
 msgid "Counting objects"
 msgstr ""
 


@@ -9868,7 +10276,7 @@ msgstr ""
 msgid "<remote>"
 msgstr ""
 
 msgid "<remote>"
 msgstr ""
 

-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455

 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""


@@ -10001,12 +10409,12 @@ msgid ""
 "to update which remote branch."
 msgstr ""
 
 "to update which remote branch."
 msgstr ""
 

-#: builtin/push.c:242
+#: builtin/push.c:245

 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 

-#: builtin/push.c:249
+#: builtin/push.c:252

 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"


@@ -10014,7 +10422,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 

-#: builtin/push.c:255
+#: builtin/push.c:258

 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"


@@ -10022,7 +10430,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 

-#: builtin/push.c:261
+#: builtin/push.c:264

 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"


@@ -10031,33 +10439,33 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 

-#: builtin/push.c:268
+#: builtin/push.c:271

 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 

-#: builtin/push.c:271
+#: builtin/push.c:274

 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr ""
 
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr ""
 

-#: builtin/push.c:331
+#: builtin/push.c:334

 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 

-#: builtin/push.c:335
+#: builtin/push.c:338

 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 

-#: builtin/push.c:366
+#: builtin/push.c:369

 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 

-#: builtin/push.c:367
+#: builtin/push.c:370

 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "


@@ -10070,112 +10478,112 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 
 "    git push <name>\n"
 msgstr ""
 

-#: builtin/push.c:385
+#: builtin/push.c:388

 msgid "--all and --tags are incompatible"
 msgstr ""
 
 msgid "--all and --tags are incompatible"
 msgstr ""
 

-#: builtin/push.c:386
+#: builtin/push.c:389

 msgid "--all can't be combined with refspecs"
 msgstr ""
 
 msgid "--all can't be combined with refspecs"
 msgstr ""
 

-#: builtin/push.c:391
+#: builtin/push.c:394

 msgid "--mirror and --tags are incompatible"
 msgstr ""
 
 msgid "--mirror and --tags are incompatible"
 msgstr ""
 

-#: builtin/push.c:392
+#: builtin/push.c:395

 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 
 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 

-#: builtin/push.c:397
+#: builtin/push.c:400

 msgid "--all and --mirror are incompatible"
 msgstr ""
 
 msgid "--all and --mirror are incompatible"
 msgstr ""
 

-#: builtin/push.c:515
+#: builtin/push.c:518

 msgid "repository"
 msgstr ""
 
 msgid "repository"
 msgstr ""
 

-#: builtin/push.c:516 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:161

 msgid "push all refs"
 msgstr ""
 
 msgid "push all refs"
 msgstr ""
 

-#: builtin/push.c:517 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:163

 msgid "mirror all refs"
 msgstr ""
 
 msgid "mirror all refs"
 msgstr ""
 

-#: builtin/push.c:519
+#: builtin/push.c:522

 msgid "delete refs"
 msgstr ""
 
 msgid "delete refs"
 msgstr ""
 

-#: builtin/push.c:520
+#: builtin/push.c:523

 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 

-#: builtin/push.c:523 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:164

 msgid "force updates"
 msgstr ""
 
 msgid "force updates"
 msgstr ""
 

-#: builtin/push.c:525 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:175

 msgid "refname>:<expect"
 msgstr ""
 
 msgid "refname>:<expect"
 msgstr ""
 

-#: builtin/push.c:526 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:176

 msgid "require old value of ref to be at this value"
 msgstr ""
 
 msgid "require old value of ref to be at this value"
 msgstr ""
 

-#: builtin/push.c:529
+#: builtin/push.c:532

 msgid "control recursive pushing of submodules"
 msgstr ""
 
 msgid "control recursive pushing of submodules"
 msgstr ""
 

-#: builtin/push.c:531 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:169

 msgid "use thin pack"
 msgstr ""
 
 msgid "use thin pack"
 msgstr ""
 

-#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158

 #: builtin/send-pack.c:159
 msgid "receive pack program"
 msgstr ""
 
 #: builtin/send-pack.c:159
 msgid "receive pack program"
 msgstr ""
 

-#: builtin/push.c:534
+#: builtin/push.c:537

 msgid "set upstream for git pull/status"
 msgstr ""
 
 msgid "set upstream for git pull/status"
 msgstr ""
 

-#: builtin/push.c:537
+#: builtin/push.c:540

 msgid "prune locally removed refs"
 msgstr ""
 
 msgid "prune locally removed refs"
 msgstr ""
 

-#: builtin/push.c:539
+#: builtin/push.c:542

 msgid "bypass pre-push hook"
 msgstr ""
 
 msgid "bypass pre-push hook"
 msgstr ""
 

-#: builtin/push.c:540
+#: builtin/push.c:543

 msgid "push missing but relevant tags"
 msgstr ""
 
 msgid "push missing but relevant tags"
 msgstr ""
 

-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:166

 msgid "GPG sign the push"
 msgstr ""
 
 msgid "GPG sign the push"
 msgstr ""
 

-#: builtin/push.c:545 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:170

 msgid "request atomic transaction on remote side"
 msgstr ""
 
 msgid "request atomic transaction on remote side"
 msgstr ""
 

-#: builtin/push.c:546
+#: builtin/push.c:549

 msgid "server-specific"
 msgstr ""
 
 msgid "server-specific"
 msgstr ""
 

-#: builtin/push.c:546
+#: builtin/push.c:549

 msgid "option to transmit"
 msgstr ""
 
 msgid "option to transmit"
 msgstr ""
 

-#: builtin/push.c:560
+#: builtin/push.c:563

 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 

-#: builtin/push.c:562
+#: builtin/push.c:565

 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 

-#: builtin/push.c:579
+#: builtin/push.c:584

 msgid "push options must not have new line characters"
 msgstr ""
 
 msgid "push options must not have new line characters"
 msgstr ""
 


@@ -10261,8 +10669,8 @@ msgid ""
 "with what you pushed, and will require 'git reset --hard' to match\n"
 "the work tree to HEAD.\n"
 "\n"
 "with what you pushed, and will require 'git reset --hard' to match\n"
 "the work tree to HEAD.\n"
 "\n"

-"You can set 'receive.denyCurrentBranch' configuration variable to\n"
-"'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"

 "its current branch; however, this is not recommended unless you\n"
 "arranged to update its work tree to match what you pushed in some\n"
 "other way.\n"
 "its current branch; however, this is not recommended unless you\n"
 "arranged to update its work tree to match what you pushed in some\n"
 "other way.\n"


@@ -10796,83 +11204,89 @@ msgstr ""
 msgid "git repack [<options>]"
 msgstr ""
 
 msgid "git repack [<options>]"
 msgstr ""
 

-#: builtin/repack.c:160
+#: builtin/repack.c:22
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes.  Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+
+#: builtin/repack.c:166

 msgid "pack everything in a single pack"
 msgstr ""
 
 msgid "pack everything in a single pack"
 msgstr ""
 

-#: builtin/repack.c:162
+#: builtin/repack.c:168

 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 

-#: builtin/repack.c:165
+#: builtin/repack.c:171

 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 

-#: builtin/repack.c:167
+#: builtin/repack.c:173

 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:169
+#: builtin/repack.c:175

 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:171
+#: builtin/repack.c:177

 msgid "do not run git-update-server-info"
 msgstr ""
 
 msgid "do not run git-update-server-info"
 msgstr ""
 

-#: builtin/repack.c:174
+#: builtin/repack.c:180

 msgid "pass --local to git-pack-objects"
 msgstr ""
 
 msgid "pass --local to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:176
+#: builtin/repack.c:182

 msgid "write bitmap index"
 msgstr ""
 
 msgid "write bitmap index"
 msgstr ""
 

-#: builtin/repack.c:177
+#: builtin/repack.c:183

 msgid "approxidate"
 msgstr ""
 
 msgid "approxidate"
 msgstr ""
 

-#: builtin/repack.c:178
+#: builtin/repack.c:184

 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:180
+#: builtin/repack.c:186

 msgid "with -a, repack unreachable objects"
 msgstr ""
 
 msgid "with -a, repack unreachable objects"
 msgstr ""
 

-#: builtin/repack.c:182
+#: builtin/repack.c:188

 msgid "size of the window used for delta compression"
 msgstr ""
 
 msgid "size of the window used for delta compression"
 msgstr ""
 

-#: builtin/repack.c:183 builtin/repack.c:187
+#: builtin/repack.c:189 builtin/repack.c:193

 msgid "bytes"
 msgstr ""
 
 msgid "bytes"
 msgstr ""
 

-#: builtin/repack.c:184
+#: builtin/repack.c:190

 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:186
+#: builtin/repack.c:192

 msgid "limits the maximum delta depth"
 msgstr ""
 
 msgid "limits the maximum delta depth"
 msgstr ""
 

-#: builtin/repack.c:188
+#: builtin/repack.c:194

 msgid "maximum size of each packfile"
 msgstr ""
 
 msgid "maximum size of each packfile"
 msgstr ""
 

-#: builtin/repack.c:190
+#: builtin/repack.c:196

 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 

-#: builtin/repack.c:200
+#: builtin/repack.c:206

 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 

-#: builtin/repack.c:204
+#: builtin/repack.c:210

 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 

-#: builtin/repack.c:391 builtin/worktree.c:115
+#: builtin/repack.c:400 builtin/worktree.c:115

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


@@ -11098,23 +11512,23 @@ msgstr ""
 msgid "rev-list does not support display of notes"
 msgstr ""
 
 msgid "rev-list does not support display of notes"
 msgstr ""
 

-#: builtin/rev-parse.c:386
+#: builtin/rev-parse.c:391

 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr ""
 
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr ""
 

-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:396

 msgid "keep the `--` passed as an arg"
 msgstr ""
 
 msgid "keep the `--` passed as an arg"
 msgstr ""
 

-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:398

 msgid "stop parsing after the first non-option argument"
 msgstr ""
 
 msgid "stop parsing after the first non-option argument"
 msgstr ""
 

-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:401

 msgid "output in stuck long form"
 msgstr ""
 
 msgid "output in stuck long form"
 msgstr ""
 

-#: builtin/rev-parse.c:527
+#: builtin/rev-parse.c:532

 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"


@@ -11208,23 +11622,7 @@ msgstr ""
 msgid "git rm [<options>] [--] <file>..."
 msgstr ""
 
 msgid "git rm [<options>] [--] <file>..."
 msgstr ""
 

-#: builtin/rm.c:65
-msgid ""
-"the following submodule (or one of its nested submodules)\n"
-"uses a .git directory:"
-msgid_plural ""
-"the following submodules (or one of their nested submodules)\n"
-"use a .git directory:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:71
-msgid ""
-"\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-
-#: builtin/rm.c:230
+#: builtin/rm.c:205

 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"


@@ -11234,60 +11632,65 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/rm.c:235
+#: builtin/rm.c:210

 msgid ""
 "\n"
 "(use -f to force removal)"
 msgstr ""
 
 msgid ""
 "\n"
 "(use -f to force removal)"
 msgstr ""
 

-#: builtin/rm.c:239
+#: builtin/rm.c:214

 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:218 builtin/rm.c:227

 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
 msgstr ""
 
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
 msgstr ""
 

-#: builtin/rm.c:251
+#: builtin/rm.c:224

 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/rm.c:269
+#: builtin/rm.c:242

 msgid "do not list removed files"
 msgstr ""
 
 msgid "do not list removed files"
 msgstr ""
 

-#: builtin/rm.c:270
+#: builtin/rm.c:243

 msgid "only remove from the index"
 msgstr ""
 
 msgid "only remove from the index"
 msgstr ""
 

-#: builtin/rm.c:271
+#: builtin/rm.c:244

 msgid "override the up-to-date check"
 msgstr ""
 
 msgid "override the up-to-date check"
 msgstr ""
 

-#: builtin/rm.c:272
+#: builtin/rm.c:245

 msgid "allow recursive removal"
 msgstr ""
 
 msgid "allow recursive removal"
 msgstr ""
 

-#: builtin/rm.c:274
+#: builtin/rm.c:247

 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 

-#: builtin/rm.c:335
+#: builtin/rm.c:308

 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 

-#: builtin/rm.c:374
+#: builtin/rm.c:347

 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
 
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
 

+#: builtin/rm.c:370
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+

 #: builtin/send-pack.c:18
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 #: builtin/send-pack.c:18
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"


@@ -11316,23 +11719,27 @@ msgstr ""
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr ""
 
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr ""
 

-#: builtin/shortlog.c:242
+#: builtin/shortlog.c:249
+msgid "Group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:251

 msgid "sort output according to the number of commits per author"
 msgstr ""
 
 msgid "sort output according to the number of commits per author"
 msgstr ""
 

-#: builtin/shortlog.c:244
+#: builtin/shortlog.c:253

 msgid "Suppress commit descriptions, only provides commit count"
 msgstr ""
 
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr ""
 

-#: builtin/shortlog.c:246
+#: builtin/shortlog.c:255

 msgid "Show the email address of each author"
 msgstr ""
 
 msgid "Show the email address of each author"
 msgstr ""
 

-#: builtin/shortlog.c:247
+#: builtin/shortlog.c:256

 msgid "w[,i1[,i2]]"
 msgstr ""
 
 msgid "w[,i1[,i2]]"
 msgstr ""
 

-#: builtin/shortlog.c:248
+#: builtin/shortlog.c:257

 msgid "Linewrap output"
 msgstr ""
 
 msgid "Linewrap output"
 msgstr ""
 


@@ -11476,35 +11883,35 @@ msgstr ""
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr ""
 
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr ""
 

-#: builtin/show-ref.c:165
+#: builtin/show-ref.c:159

 msgid "only show tags (can be combined with heads)"
 msgstr ""
 
 msgid "only show tags (can be combined with heads)"
 msgstr ""
 

-#: builtin/show-ref.c:166
+#: builtin/show-ref.c:160

 msgid "only show heads (can be combined with tags)"
 msgstr ""
 
 msgid "only show heads (can be combined with tags)"
 msgstr ""
 

-#: builtin/show-ref.c:167
+#: builtin/show-ref.c:161

 msgid "stricter reference checking, requires exact ref path"
 msgstr ""
 
 msgid "stricter reference checking, requires exact ref path"
 msgstr ""
 

-#: builtin/show-ref.c:170 builtin/show-ref.c:172
+#: builtin/show-ref.c:164 builtin/show-ref.c:166

 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr ""
 
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr ""
 

-#: builtin/show-ref.c:174
+#: builtin/show-ref.c:168

 msgid "dereference tags into object IDs"
 msgstr ""
 
 msgid "dereference tags into object IDs"
 msgstr ""
 

-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:170

 msgid "only show SHA1 hash using <n> digits"
 msgstr ""
 
 msgid "only show SHA1 hash using <n> digits"
 msgstr ""
 

-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:174

 msgid "do not print results to stdout (useful with --verify)"
 msgstr ""
 
 msgid "do not print results to stdout (useful with --verify)"
 msgstr ""
 

-#: builtin/show-ref.c:182
+#: builtin/show-ref.c:176

 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 


@@ -11524,12 +11931,12 @@ 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:24 builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062

 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071

 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""


@@ -11539,8 +11946,7 @@ msgstr ""
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
-#: builtin/submodule--helper.c:590
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592

 msgid "alternative anchor for relative paths"
 msgstr ""
 
 msgid "alternative anchor for relative paths"
 msgstr ""
 


@@ -11548,191 +11954,199 @@ msgstr ""
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
+#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347

 #, 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:369
+#: builtin/submodule--helper.c:373

 #, 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:373
+#: builtin/submodule--helper.c:377

 #, 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:383
+#: builtin/submodule--helper.c:387

 #, 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:390
+#: builtin/submodule--helper.c:394

 #, 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:409
+#: builtin/submodule--helper.c:410

 msgid "Suppress output for initializing a submodule"
 msgstr ""
 
 msgid "Suppress output for initializing a submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:414
+#: builtin/submodule--helper.c:415

 msgid "git submodule--helper init [<path>]"
 msgstr ""
 
 msgid "git submodule--helper init [<path>]"
 msgstr ""
 

-#: builtin/submodule--helper.c:435
+#: builtin/submodule--helper.c:436

 msgid "git submodule--helper name <path>"
 msgstr ""
 
 msgid "git submodule--helper name <path>"
 msgstr ""
 

-#: builtin/submodule--helper.c:441
+#: builtin/submodule--helper.c:442

 #, 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:524 builtin/submodule--helper.c:527
+#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528

 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:564

 #, 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:570
+#: builtin/submodule--helper.c:571

 #, 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:593
+#: builtin/submodule--helper.c:595

 msgid "where the new submodule will be cloned to"
 msgstr ""
 
 msgid "where the new submodule will be cloned to"
 msgstr ""
 

-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:598

 msgid "name of the new submodule"
 msgstr ""
 
 msgid "name of the new submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:601

 msgid "url where to clone the submodule from"
 msgstr ""
 
 msgid "url where to clone the submodule from"
 msgstr ""
 

-#: builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:607

 msgid "depth for shallow clones"
 msgstr ""
 
 msgid "depth for shallow clones"
 msgstr ""
 

-#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980

 msgid "force cloning progress"
 msgstr ""
 
 msgid "force cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615

 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:638 builtin/submodule--helper.c:648
-#, c-format
-msgid "could not create directory '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:644
+#: builtin/submodule--helper.c:646

 #, 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:660
+#: builtin/submodule--helper.c:662

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

-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667

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

-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:674

 #, 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:726
+#: builtin/submodule--helper.c:742

 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 

-#: builtin/submodule--helper.c:730
+#: builtin/submodule--helper.c:746

 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 

-#: builtin/submodule--helper.c:756
+#: builtin/submodule--helper.c:772

 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:777
+#: builtin/submodule--helper.c:793

 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:913
+#: builtin/submodule--helper.c:929

 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 

-#: builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:940

 #, 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:945
+#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105

 msgid "path into the working tree"
 msgstr ""
 
 msgid "path into the working tree"
 msgstr ""
 

-#: builtin/submodule--helper.c:948
+#: builtin/submodule--helper.c:964

 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:952
+#: builtin/submodule--helper.c:968

 msgid "rebase, merge, checkout or none"
 msgstr ""
 
 msgid "rebase, merge, checkout or none"
 msgstr ""
 

-#: builtin/submodule--helper.c:956
+#: builtin/submodule--helper.c:972

 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:959
+#: builtin/submodule--helper.c:975

 msgid "parallel jobs"
 msgstr ""
 
 msgid "parallel jobs"
 msgstr ""
 

-#: builtin/submodule--helper.c:961
+#: builtin/submodule--helper.c:977

 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:962
+#: builtin/submodule--helper.c:978

 msgid "don't print cloning progress"
 msgstr ""
 
 msgid "don't print cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:985

 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:979
+#: builtin/submodule--helper.c:995

 msgid "bad value for update parameter"
 msgstr ""
 
 msgid "bad value for update parameter"
 msgstr ""
 

-#: builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:1066

 #, 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:1100
+#: builtin/submodule--helper.c:1106
+msgid "recurse into submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1112
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1157

 msgid "submodule--helper subcommand must be called with a subcommand"
 msgstr ""
 
 msgid "submodule--helper subcommand must be called with a subcommand"
 msgstr ""
 

-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1164
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr ""
+
+#: builtin/submodule--helper.c:1170

 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""


@@ -11782,25 +12196,25 @@ msgid ""
 msgstr ""
 
 #: builtin/tag.c:27
 msgstr ""
 
 #: builtin/tag.c:27

-msgid "git tag -v <tagname>..."
+msgid "git tag -v [--format=<format>] <tagname>..."

 msgstr ""
 
 msgstr ""
 

-#: builtin/tag.c:81
+#: builtin/tag.c:82

 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr ""
 
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr ""
 

-#: builtin/tag.c:86
+#: builtin/tag.c:87

 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 
 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 

-#: builtin/tag.c:101
+#: builtin/tag.c:102

 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 

-#: builtin/tag.c:117
+#: builtin/tag.c:131

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


@@ -11809,7 +12223,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 

-#: builtin/tag.c:121
+#: builtin/tag.c:135

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


@@ -11819,138 +12233,138 @@ msgid ""
 "want to.\n"
 msgstr ""
 
 "want to.\n"
 msgstr ""
 

-#: builtin/tag.c:199
+#: builtin/tag.c:213

 msgid "unable to sign the tag"
 msgstr ""
 
 msgid "unable to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:201
+#: builtin/tag.c:215

 msgid "unable to write tag file"
 msgstr ""
 
 msgid "unable to write tag file"
 msgstr ""
 

-#: builtin/tag.c:226
+#: builtin/tag.c:240

 msgid "bad object type."
 msgstr ""
 
 msgid "bad object type."
 msgstr ""
 

-#: builtin/tag.c:239
+#: builtin/tag.c:253

 msgid "tag header too big."
 msgstr ""
 
 msgid "tag header too big."
 msgstr ""
 

-#: builtin/tag.c:275
+#: builtin/tag.c:289

 msgid "no tag message?"
 msgstr ""
 
 msgid "no tag message?"
 msgstr ""
 

-#: builtin/tag.c:281
+#: builtin/tag.c:295

 #, 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:339
+#: builtin/tag.c:354

 msgid "list tag names"
 msgstr ""
 
 msgid "list tag names"
 msgstr ""
 

-#: builtin/tag.c:341
+#: builtin/tag.c:356

 msgid "print <n> lines of each tag message"
 msgstr ""
 
 msgid "print <n> lines of each tag message"
 msgstr ""
 

-#: builtin/tag.c:343
+#: builtin/tag.c:358

 msgid "delete tags"
 msgstr ""
 
 msgid "delete tags"
 msgstr ""
 

-#: builtin/tag.c:344
+#: builtin/tag.c:359

 msgid "verify tags"
 msgstr ""
 
 msgid "verify tags"
 msgstr ""
 

-#: builtin/tag.c:346
+#: builtin/tag.c:361

 msgid "Tag creation options"
 msgstr ""
 
 msgid "Tag creation options"
 msgstr ""
 

-#: builtin/tag.c:348
+#: builtin/tag.c:363

 msgid "annotated tag, needs a message"
 msgstr ""
 
 msgid "annotated tag, needs a message"
 msgstr ""
 

-#: builtin/tag.c:350
+#: builtin/tag.c:365

 msgid "tag message"
 msgstr ""
 
 msgid "tag message"
 msgstr ""
 

-#: builtin/tag.c:352
+#: builtin/tag.c:367

 msgid "annotated and GPG-signed tag"
 msgstr ""
 
 msgid "annotated and GPG-signed tag"
 msgstr ""
 

-#: builtin/tag.c:356
+#: builtin/tag.c:371

 msgid "use another key to sign the tag"
 msgstr ""
 
 msgid "use another key to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:357
+#: builtin/tag.c:372

 msgid "replace the tag if exists"
 msgstr ""
 
 msgid "replace the tag if exists"
 msgstr ""
 

-#: builtin/tag.c:358 builtin/update-ref.c:368
+#: builtin/tag.c:373 builtin/update-ref.c:368

 msgid "create a reflog"
 msgstr ""
 
 msgid "create a reflog"
 msgstr ""
 

-#: builtin/tag.c:360
+#: builtin/tag.c:375

 msgid "Tag listing options"
 msgstr ""
 
 msgid "Tag listing options"
 msgstr ""
 

-#: builtin/tag.c:361
+#: builtin/tag.c:376

 msgid "show tag list in columns"
 msgstr ""
 
 msgid "show tag list in columns"
 msgstr ""
 

-#: builtin/tag.c:362 builtin/tag.c:363
+#: builtin/tag.c:377 builtin/tag.c:378

 msgid "print only tags that contain the commit"
 msgstr ""
 
 msgid "print only tags that contain the commit"
 msgstr ""
 

-#: builtin/tag.c:364
+#: builtin/tag.c:379

 msgid "print only tags that are merged"
 msgstr ""
 
 msgid "print only tags that are merged"
 msgstr ""
 

-#: builtin/tag.c:365
+#: builtin/tag.c:380

 msgid "print only tags that are not merged"
 msgstr ""
 
 msgid "print only tags that are not merged"
 msgstr ""
 

-#: builtin/tag.c:370
+#: builtin/tag.c:385

 msgid "print only tags of the object"
 msgstr ""
 
 msgid "print only tags of the object"
 msgstr ""
 

-#: builtin/tag.c:399
+#: builtin/tag.c:415

 msgid "--column and -n are incompatible"
 msgstr ""
 
 msgid "--column and -n are incompatible"
 msgstr ""
 

-#: builtin/tag.c:419
+#: builtin/tag.c:437

 msgid "-n option is only allowed with -l."
 msgstr ""
 
 msgid "-n option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:421
+#: builtin/tag.c:439

 msgid "--contains option is only allowed with -l."
 msgstr ""
 
 msgid "--contains option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:423
+#: builtin/tag.c:441

 msgid "--points-at option is only allowed with -l."
 msgstr ""
 
 msgid "--points-at option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:425
+#: builtin/tag.c:443

 msgid "--merged and --no-merged option are only allowed with -l"
 msgstr ""
 
 msgid "--merged and --no-merged option are only allowed with -l"
 msgstr ""
 

-#: builtin/tag.c:433
+#: builtin/tag.c:454

 msgid "only one -F or -m option is allowed."
 msgstr ""
 
 msgid "only one -F or -m option is allowed."
 msgstr ""
 

-#: builtin/tag.c:452
+#: builtin/tag.c:473

 msgid "too many params"
 msgstr ""
 
 msgid "too many params"
 msgstr ""
 

-#: builtin/tag.c:458
+#: builtin/tag.c:479

 #, 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:463
+#: builtin/tag.c:484

 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 

-#: builtin/tag.c:491
+#: builtin/tag.c:512

 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""


@@ -12137,23 +12551,23 @@ msgstr ""
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 

-#: builtin/update-index.c:1119
+#: builtin/update-index.c:1120

 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
 
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
 

-#: builtin/update-index.c:1123
+#: builtin/update-index.c:1124

 msgid "Untracked cache disabled"
 msgstr ""
 
 msgid "Untracked cache disabled"
 msgstr ""
 

-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1132

 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
 
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
 

-#: builtin/update-index.c:1135
+#: builtin/update-index.c:1136

 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""


@@ -12202,7 +12616,7 @@ msgstr ""
 msgid "print commit contents"
 msgstr ""
 
 msgid "print commit contents"
 msgstr ""
 

-#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:37

 msgid "print raw gpg status output"
 msgstr ""
 
 msgid "print raw gpg status output"
 msgstr ""
 


@@ -12218,11 +12632,11 @@ msgstr ""
 msgid "show statistics only"
 msgstr ""
 
 msgid "show statistics only"
 msgstr ""
 

-#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v | --verbose] <tag>..."
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."

 msgstr ""
 
 msgstr ""
 

-#: builtin/verify-tag.c:34
+#: builtin/verify-tag.c:36

 msgid "print tag contents"
 msgstr ""
 
 msgid "print tag contents"
 msgstr ""
 


@@ -12306,30 +12720,30 @@ msgstr ""
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 

-#: builtin/worktree.c:470
+#: builtin/worktree.c:472

 msgid "reason for locking"
 msgstr ""
 
 msgid "reason for locking"
 msgstr ""
 

-#: builtin/worktree.c:482 builtin/worktree.c:515
+#: builtin/worktree.c:484 builtin/worktree.c:517

 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 

-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:486 builtin/worktree.c:519

 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:489
+#: builtin/worktree.c:491

 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 

-#: builtin/worktree.c:491
+#: builtin/worktree.c:493

 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 

-#: builtin/worktree.c:519
+#: builtin/worktree.c:521

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


@@ -12354,19 +12768,19 @@ msgstr ""
 msgid "git upload-pack [<options>] <dir>"
 msgstr ""
 
 msgid "git upload-pack [<options>] <dir>"
 msgstr ""
 

-#: upload-pack.c:1028
+#: upload-pack.c:1036

 msgid "quit after a single request/response exchange"
 msgstr ""
 
 msgid "quit after a single request/response exchange"
 msgstr ""
 

-#: upload-pack.c:1030
+#: upload-pack.c:1038

 msgid "exit immediately after initial ref advertisement"
 msgstr ""
 
 msgid "exit immediately after initial ref advertisement"
 msgstr ""
 

-#: upload-pack.c:1032
+#: upload-pack.c:1040

 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:1034
+#: upload-pack.c:1042

 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr ""
 
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr ""
 


@@ -12390,14 +12804,27 @@ msgid ""
 "to read about a specific subcommand or concept."
 msgstr ""
 
 "to read about a specific subcommand or concept."
 msgstr ""
 

-#: http.c:342
+#: http.c:344

 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:351
+#: http.c:353

 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:1713
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+
+#: remote-curl.c:319
+#, c-format
+msgid "redirecting to %s"
+msgstr ""
+

 #: common-cmds.h:9
 msgid "start a working area (see also: git help tutorial)"
 msgstr ""
 #: common-cmds.h:9
 msgid "start a working area (see also: git help tutorial)"
 msgstr ""


@@ -12746,7 +13173,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:56
+#: git-rebase.sh:57

 msgid ""
 "When you have resolved this problem, run \"git rebase --continue\".\n"
 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
 msgid ""
 "When you have resolved this problem, run \"git rebase --continue\".\n"
 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"


@@ -12754,54 +13181,43 @@ msgid ""
 "\"."
 msgstr ""
 
 "\"."
 msgstr ""
 

-#: git-rebase.sh:156 git-rebase.sh:395
+#: git-rebase.sh:157 git-rebase.sh:396

 #, 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:167
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase.sh:170
+#: git-rebase.sh:171

 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 

-#: git-rebase.sh:171
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-
-#: git-rebase.sh:210
+#: git-rebase.sh:211

 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 

-#: git-rebase.sh:215
+#: git-rebase.sh:216

 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:356
+#: git-rebase.sh:357

 msgid "No rebase in progress?"
 msgstr ""
 
 msgid "No rebase in progress?"
 msgstr ""
 

-#: git-rebase.sh:367
+#: git-rebase.sh:368

 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:374
+#: git-rebase.sh:375

 msgid "Cannot read HEAD"
 msgstr ""
 
 msgid "Cannot read HEAD"
 msgstr ""
 

-#: git-rebase.sh:377
+#: git-rebase.sh:378

 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:414
+#: git-rebase.sh:418

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


@@ -12814,64 +13230,64 @@ msgid ""
 "valuable there."
 msgstr ""
 
 "valuable there."
 msgstr ""
 

-#: git-rebase.sh:465
+#: git-rebase.sh:469

 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr ""
 
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr ""
 

-#: git-rebase.sh:489
+#: git-rebase.sh:493

 #, 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:492 git-rebase.sh:496
+#: git-rebase.sh:496 git-rebase.sh:500

 #, 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:501
+#: git-rebase.sh:505

 #, 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:524
+#: git-rebase.sh:528

 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr ""
 
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr ""
 

-#: git-rebase.sh:557
+#: git-rebase.sh:561

 msgid "Cannot autostash"
 msgstr ""
 
 msgid "Cannot autostash"
 msgstr ""
 

-#: git-rebase.sh:562
+#: git-rebase.sh:566

 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 

-#: git-rebase.sh:566
+#: git-rebase.sh:570

 msgid "Please commit or stash them."
 msgstr ""
 
 msgid "Please commit or stash them."
 msgstr ""
 

-#: git-rebase.sh:586
+#: git-rebase.sh:590

 #, 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:590
+#: git-rebase.sh:594

 #, 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:601
+#: git-rebase.sh:605

 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 

-#: git-rebase.sh:610
+#: git-rebase.sh:614

 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:620
+#: git-rebase.sh:624

 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""


@@ -13034,21 +13450,26 @@ msgstr ""
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 

-#: git-submodule.sh:184
+#: git-submodule.sh:181

 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 

-#: git-submodule.sh:194
+#: git-submodule.sh:191

 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 

-#: git-submodule.sh:211
+#: git-submodule.sh:210

 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr ""
 
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr ""
 

-#: git-submodule.sh:215
+#: git-submodule.sh:213
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr ""
+
+#: git-submodule.sh:218

 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"


@@ -13056,22 +13477,22 @@ msgid ""
 "Use -f if you really want to add it."
 msgstr ""
 
 "Use -f if you really want to add it."
 msgstr ""
 

-#: git-submodule.sh:233
+#: git-submodule.sh:236

 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr ""
 
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr ""
 

-#: git-submodule.sh:235
+#: git-submodule.sh:238

 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr ""
 
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr ""
 

-#: git-submodule.sh:243
+#: git-submodule.sh:246

 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 

-#: git-submodule.sh:245
+#: git-submodule.sh:248

 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"


@@ -13082,184 +13503,184 @@ msgid ""
 "option."
 msgstr ""
 
 "option."
 msgstr ""
 

-#: git-submodule.sh:251
+#: git-submodule.sh:254

 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 

-#: git-submodule.sh:263
+#: git-submodule.sh:266

 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:268
+#: git-submodule.sh:271

 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:277
+#: git-submodule.sh:280

 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:324
+#: git-submodule.sh:327

 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:344
+#: git-submodule.sh:347

 #, sh-format
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 
 #, sh-format
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 

-#: git-submodule.sh:415
+#: git-submodule.sh:418

 #, sh-format
 msgid "pathspec and --all are incompatible"
 msgstr ""
 
 #, sh-format
 msgid "pathspec and --all are incompatible"
 msgstr ""
 

-#: git-submodule.sh:420
+#: git-submodule.sh:423

 #, sh-format
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 
 #, sh-format
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 

-#: git-submodule.sh:440
+#: git-submodule.sh:443

 #, 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 ""
 
 #, 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:448
+#: git-submodule.sh:451

 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
 "discard them"
 msgstr ""
 
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
 "discard them"
 msgstr ""
 

-#: git-submodule.sh:451
+#: git-submodule.sh:454

 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:452
+#: git-submodule.sh:455

 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:455
+#: git-submodule.sh:458

 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:464
+#: git-submodule.sh:467

 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:617
+#: git-submodule.sh:623

 #, 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:627
+#: git-submodule.sh:633

 #, 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:632
+#: git-submodule.sh:638

 #, 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:650
+#: git-submodule.sh:656

 #, 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:656
+#: git-submodule.sh:662

 #, 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:663
+#: git-submodule.sh:669

 #, 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:664
+#: git-submodule.sh:670

 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:668
+#: git-submodule.sh:674

 #, 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:669
+#: git-submodule.sh:675

 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:674
+#: git-submodule.sh:680

 #, 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:675
+#: git-submodule.sh:681

 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:680
+#: git-submodule.sh:686

 #, 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:681
+#: git-submodule.sh:687

 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 

-#: git-submodule.sh:712
+#: git-submodule.sh:718

 #, 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:820
+#: git-submodule.sh:826

 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:872
+#: git-submodule.sh:878

 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 

-#: git-submodule.sh:892
+#: git-submodule.sh:898

 #, 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:895
+#: git-submodule.sh:901

 #, 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:898
+#: git-submodule.sh:904

 #, 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:1045
+#: git-submodule.sh:1051

 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:1112
+#: git-submodule.sh:1118

 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr ""
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr ""


@@ -13374,26 +13795,22 @@ msgid_plural "This is a combination of $count commits."
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-rebase--interactive.sh:440
+#: git-rebase--interactive.sh:441

 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 

-#: git-rebase--interactive.sh:443
-msgid "This is a combination of 2 commits."
-msgstr ""
-

 #: git-rebase--interactive.sh:444
 #: git-rebase--interactive.sh:444

-msgid "This is the 1st commit message:"
+msgid "This is a combination of 2 commits."

 msgstr ""
 
 msgstr ""
 

-#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
-#: git-rebase--interactive.sh:530
+#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
+#: git-rebase--interactive.sh:531

 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr ""
 
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:558
+#: git-rebase--interactive.sh:559

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


@@ -13403,31 +13820,31 @@ msgid ""
 "you are able to reword the commit."
 msgstr ""
 
 "you are able to reword the commit."
 msgstr ""
 

-#: git-rebase--interactive.sh:573
+#: git-rebase--interactive.sh:574

 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:588
+#: git-rebase--interactive.sh:589

 #, 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:630
+#: git-rebase--interactive.sh:631

 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 
 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:638
+#: git-rebase--interactive.sh:639

 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:641

 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:642
+#: git-rebase--interactive.sh:643

 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"


@@ -13435,7 +13852,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:655
+#: git-rebase--interactive.sh:656

 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"


@@ -13445,49 +13862,49 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
 "\tgit rebase --continue"
 msgstr ""
 

-#: git-rebase--interactive.sh:666
+#: git-rebase--interactive.sh:667

 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668

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

-#: git-rebase--interactive.sh:702
+#: git-rebase--interactive.sh:703

 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 

-#: git-rebase--interactive.sh:749
+#: git-rebase--interactive.sh:750

 msgid "Could not skip unnecessary pick commands"
 msgstr ""
 
 msgid "Could not skip unnecessary pick commands"
 msgstr ""
 

-#: git-rebase--interactive.sh:907
+#: git-rebase--interactive.sh:908

 #, sh-format
 msgid ""
 "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
 " - $line"
 msgstr ""
 
 #, sh-format
 msgid ""
 "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
 " - $line"
 msgstr ""
 

-#: git-rebase--interactive.sh:940
+#: git-rebase--interactive.sh:941

 #, sh-format
 msgid ""
 "Warning: the command isn't recognized in the following line:\n"
 " - $line"
 msgstr ""
 
 #, sh-format
 msgid ""
 "Warning: the command isn't recognized in the following line:\n"
 " - $line"
 msgstr ""
 

-#: git-rebase--interactive.sh:979
+#: git-rebase--interactive.sh:980

 msgid "could not detach HEAD"
 msgstr ""
 
 msgid "could not detach HEAD"
 msgstr ""
 

-#: git-rebase--interactive.sh:1017
+#: git-rebase--interactive.sh:1018

 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):"
 msgstr ""
 
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):"
 msgstr ""
 

-#: git-rebase--interactive.sh:1025
+#: git-rebase--interactive.sh:1026

 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 "\n"
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 "\n"


@@ -13496,28 +13913,28 @@ msgid ""
 "The possible behaviours are: ignore, warn, error."
 msgstr ""
 
 "The possible behaviours are: ignore, warn, error."
 msgstr ""
 

-#: git-rebase--interactive.sh:1036
+#: git-rebase--interactive.sh:1037

 #, sh-format
 msgid ""
 "Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
 "Ignoring."
 msgstr ""
 
 #, sh-format
 msgid ""
 "Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
 "Ignoring."
 msgstr ""
 

-#: git-rebase--interactive.sh:1053
+#: git-rebase--interactive.sh:1054

 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'."
 msgstr ""
 
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'."
 msgstr ""
 

-#: git-rebase--interactive.sh:1054
+#: git-rebase--interactive.sh:1055

 msgid "Or you can abort the rebase with 'git rebase --abort'."
 msgstr ""
 
 msgid "Or you can abort the rebase with 'git rebase --abort'."
 msgstr ""
 

-#: git-rebase--interactive.sh:1078
+#: git-rebase--interactive.sh:1079

 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 

-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:1084

 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"


@@ -13535,21 +13952,21 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:1100
+#: git-rebase--interactive.sh:1101

 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:1105
+#: git-rebase--interactive.sh:1106

 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:1110 git-rebase--interactive.sh:1114
+#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115

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

-#: git-rebase--interactive.sh:1138
+#: git-rebase--interactive.sh:1139

 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"


@@ -13558,47 +13975,47 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304
+#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305

 msgid "Could not execute editor"
 msgstr ""
 
 msgid "Could not execute editor"
 msgstr ""
 

-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1160

 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 

-#: git-rebase--interactive.sh:1164
+#: git-rebase--interactive.sh:1165

 msgid "No HEAD?"
 msgstr ""
 
 msgid "No HEAD?"
 msgstr ""
 

-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1166

 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 

-#: git-rebase--interactive.sh:1167
+#: git-rebase--interactive.sh:1168

 msgid "Could not mark as interactive"
 msgstr ""
 
 msgid "Could not mark as interactive"
 msgstr ""
 

-#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
+#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183

 msgid "Could not init rewritten commits"
 msgstr ""
 
 msgid "Could not init rewritten commits"
 msgstr ""
 

-#: git-rebase--interactive.sh:1282
+#: git-rebase--interactive.sh:1283

 #, 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:1287
+#: git-rebase--interactive.sh:1288

 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:1294
+#: git-rebase--interactive.sh:1295

 msgid "Note that empty commits are commented out"
 msgstr ""
 
 msgid "Note that empty commits are commented out"
 msgstr ""
 


@@ -13658,3 +14075,767 @@ msgstr ""
 #: git-sh-setup.sh:377
 msgid "Unable to determine absolute path of git directory"
 msgstr ""
 #: git-sh-setup.sh:377
 msgid "Unable to determine absolute path of git directory"
 msgstr ""

+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:238
+#, perl-format
+msgid "%12s %12s %s"
+msgstr ""
+
+#: git-add--interactive.perl:239
+msgid "staged"
+msgstr ""
+
+#: git-add--interactive.perl:239
+msgid "unstaged"
+msgstr ""
+
+#: git-add--interactive.perl:297 git-add--interactive.perl:322
+msgid "binary"
+msgstr ""
+
+#: git-add--interactive.perl:306 git-add--interactive.perl:360
+msgid "nothing"
+msgstr ""
+
+#: git-add--interactive.perl:342 git-add--interactive.perl:357
+msgid "unchanged"
+msgstr ""
+
+#: git-add--interactive.perl:653
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:656
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:659
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:662
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:671
+msgid "Update"
+msgstr ""
+
+#: git-add--interactive.perl:683
+msgid "Revert"
+msgstr ""
+
+#: git-add--interactive.perl:706
+#, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr ""
+
+#: git-add--interactive.perl:717
+msgid "Add untracked"
+msgstr ""
+
+#: git-add--interactive.perl:723
+msgid "No untracked files.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1039
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+
+#: git-add--interactive.perl:1042
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+
+#: git-add--interactive.perl:1045
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+
+#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+
+#: git-add--interactive.perl:1051
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding"
+msgstr ""
+
+#: git-add--interactive.perl:1054
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+
+#: git-add--interactive.perl:1067
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1068
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1074
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1082
+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:1096
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr ""
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. 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:1187
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+
+#: git-add--interactive.perl:1196
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1202
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1208
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1214
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1220
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1226
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1232
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1241
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+
+#: git-add--interactive.perl:1272
+msgid "The selected hunks do not apply to the index!\n"
+msgstr ""
+
+#: git-add--interactive.perl:1273
+msgid "Apply them to the worktree anyway? "
+msgstr ""
+
+#: git-add--interactive.perl:1276
+msgid "Nothing was applied.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1287
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr ""
+
+#: git-add--interactive.perl:1296
+msgid "Only binary files changed.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1298
+msgid "No changes.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1306
+msgid "Patch update"
+msgstr ""
+
+#: git-add--interactive.perl:1358
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1359
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1363
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1364
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1365
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1368
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1369
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1370
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1373
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1374
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1375
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1378
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1379
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1380
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1383
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1384
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1385
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1388
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1389
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1390
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1493
+msgid "go to which hunk (<ret> to see more)? "
+msgstr ""
+
+#: git-add--interactive.perl:1495
+msgid "go to which hunk? "
+msgstr ""
+
+#: git-add--interactive.perl:1504
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr ""
+
+#: git-add--interactive.perl:1509
+#, 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:1535
+msgid "search for regex? "
+msgstr ""
+
+#: git-add--interactive.perl:1548
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr ""
+
+#: git-add--interactive.perl:1558
+msgid "No hunk matches the given pattern\n"
+msgstr ""
+
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+msgid "No previous hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+msgid "No next hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1606
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1658
+msgid "Review diff"
+msgstr ""
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1677
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"revert        - revert staged set of changes back to the HEAD version\n"
+"patch         - pick hunks and update selectively\n"
+"diff\t      - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+
+#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
+#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
+#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+msgid "missing --"
+msgstr ""
+
+#: git-add--interactive.perl:1715
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr ""
+
+#: git-send-email.perl:121
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr ""
+
+#: git-send-email.perl:128 git-send-email.perl:134
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr ""
+
+#: git-send-email.perl:202 git-send-email.perl:208
+msgid "the editor exited uncleanly, aborting everything"
+msgstr ""
+
+#: git-send-email.perl:282
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+
+#: git-send-email.perl:287
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr ""
+
+#: git-send-email.perl:305
+msgid "--dump-aliases incompatible with other options\n"
+msgstr ""
+
+#: git-send-email.perl:368 git-send-email.perl:623
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr ""
+
+#: git-send-email.perl:437
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:466
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:498
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:500
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:502
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:507
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr ""
+
+#: git-send-email.perl:589
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+
+#: git-send-email.perl:610
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr ""
+
+#: git-send-email.perl:634
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+
+#: git-send-email.perl:645
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+
+#: git-send-email.perl:658
+#, perl-format
+msgid "No subject line in %s?"
+msgstr ""
+
+#: git-send-email.perl:668
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr ""
+
+#: git-send-email.perl:678
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+
+#: git-send-email.perl:701
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr ""
+
+#: git-send-email.perl:704
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr ""
+
+#: git-send-email.perl:739
+msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+msgstr ""
+
+#: git-send-email.perl:748
+msgid "Summary email is empty, skipping it\n"
+msgstr ""
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:780
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr ""
+
+#: git-send-email.perl:809
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+
+#: git-send-email.perl:814
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr ""
+
+#: git-send-email.perl:822
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+
+#: git-send-email.perl:841
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr ""
+
+#: git-send-email.perl:859
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr ""
+
+#: git-send-email.perl:871
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+
+#: git-send-email.perl:921 git-send-email.perl:929
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr ""
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:933
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr ""
+
+#: git-send-email.perl:1234
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr ""
+
+#: git-send-email.perl:1309
+msgid ""
+"    The Cc list above has been expanded by additional\n"
+"    addresses found in the patch commit message. By default\n"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+
+#. 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:1324
+msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+msgstr ""
+
+#: git-send-email.perl:1327
+msgid "Send this email reply required"
+msgstr ""
+
+#: git-send-email.perl:1353
+msgid "The required SMTP server is not properly defined."
+msgstr ""
+
+#: git-send-email.perl:1397
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr ""
+
+#: git-send-email.perl:1403
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+
+#: git-send-email.perl:1421
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr ""
+
+#: git-send-email.perl:1424
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr ""
+
+#: git-send-email.perl:1424
+#, perl-format
+msgid "Sent %s\n"
+msgstr ""
+
+#: git-send-email.perl:1426
+msgid "Dry-OK. Log says:\n"
+msgstr ""
+
+#: git-send-email.perl:1426
+msgid "OK. Log says:\n"
+msgstr ""
+
+#: git-send-email.perl:1438
+msgid "Result: "
+msgstr ""
+
+#: git-send-email.perl:1441
+msgid "Result: OK\n"
+msgstr ""
+
+#: git-send-email.perl:1454
+#, perl-format
+msgid "can't open file %s"
+msgstr ""
+
+#: git-send-email.perl:1501 git-send-email.perl:1521
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1507
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1555
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1578
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1676
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr ""
+
+#: git-send-email.perl:1683
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1687
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr ""
+
+#: git-send-email.perl:1714
+msgid "cannot send message as 7bit"
+msgstr ""
+
+#: git-send-email.perl:1722
+msgid "invalid transfer encoding"
+msgstr ""
+
+#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr ""
+
+#: git-send-email.perl:1744
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr ""
+
+#: git-send-email.perl:1760
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr ""
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1764
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr ""